fix: update utc plugin to support keepLocalTime .utc(true) (#1080)

iamkun · web-flow · commit 5ce4e0d2f552 · 2020-09-28T10:13:41.000+08:00
diff --git a/src/plugin/utc/index.js b/src/plugin/utc/index.js
@@ -7,8 +7,12 @@ export default (option, Dayjs, dayjs) => {
     return new Dayjs(cfg) // eslint-disable-line no-use-before-define
   }
 
-  proto.utc = function () {
-    return dayjs(this.toDate(), { locale: this.$L, utc: true })
+  proto.utc = function (keepLocalTime) {
+    const ins = dayjs(this.toDate(), { locale: this.$L, utc: true })
+    if (keepLocalTime) {
+      return ins.add(this.utcOffset(), MIN)
+    }
+    return ins
   }
 
   proto.local = function () {
diff --git a/test/plugin/utc.test.js b/test/plugin/utc.test.js
@@ -1,8 +1,8 @@
 import MockDate from 'mockdate'
 import moment from 'moment'
 import dayjs from '../../src'
-import utc from '../../src/plugin/utc'
 import customParseFormat from '../../src/plugin/customParseFormat'
+import utc from '../../src/plugin/utc'
 
 dayjs.extend(utc)
 
@@ -250,3 +250,19 @@ describe('Diff', () => {
       .toBe(moment.utc(d1).diff(d2, 'm'))
   })
 })
+
+it('utc keepLocalTime', () => {
+  const t = '2016-05-03 22:15:01'
+  const d = dayjs(t).utc(true)
+  const m = moment(t).utc(true)
+  const fd = d.format()
+  const dd = d.toDate()
+  const vd = d.valueOf()
+  const fm = m.format()
+  const dm = m.toDate()
+  const vm = m.valueOf()
+  expect(fd).toEqual(fm)
+  expect(fd).toEqual('2016-05-03T22:15:01Z')
+  expect(dd).toEqual(dm)
+  expect(vd).toEqual(vm)
+})
diff --git a/types/plugin/utc.d.ts b/types/plugin/utc.d.ts
@@ -6,7 +6,7 @@ export = plugin
 declare module 'dayjs' {
   interface Dayjs {
     
-    utc(): Dayjs
+    utc(keepLocalTime?: boolean): Dayjs
     
     local(): Dayjs
 

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,12 @@ export default (option, Dayjs, dayjs) => {`
`7`	`7`	`return new Dayjs(cfg) // eslint-disable-line no-use-before-define`
`8`	`8`	`}`
`9`	`9`
`10`		`- proto.utc = function () {`
`11`		`- return dayjs(this.toDate(), { locale: this.$L, utc: true })`
	`10`	`+ proto.utc = function (keepLocalTime) {`
	`11`	`+ const ins = dayjs(this.toDate(), { locale: this.$L, utc: true })`
	`12`	`+ if (keepLocalTime) {`
	`13`	`+ return ins.add(this.utcOffset(), MIN)`
	`14`	`+ }`
	`15`	`+ return ins`
`12`	`16`	`}`
`13`	`17`
`14`	`18`	`proto.local = function () {`