Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0

nezha-fronted/package-lock.json

@@ -4284,11 +4284,6 @@
         "minimalistic-crypto-utils": "^1.0.0"
       }
     },
-    "emitter-component": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/emitter-component/-/emitter-component-1.1.1.tgz",
-      "integrity": "sha1-Bl4tvtaVm/RwZ57avq95gdEAOrY="
-    },
     "emoji-regex": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
@@ -6675,11 +6670,6 @@
         "pify": "^3.0.0"
       }
     },
-    "hammerjs": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
-      "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
-    },
     "handle-thing": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz",
@@ -7704,11 +7694,6 @@
         "verror": "1.10.0"
       }
     },
-    "keycharm": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/keycharm/-/keycharm-0.2.0.tgz",
-      "integrity": "sha1-+m6i5DuQpoAohD0n8gddNajD5vk="
-    },
     "keyv": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz",
@@ -11725,14 +11710,6 @@
       "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
       "dev": true
     },
-    "propagating-hammerjs": {
-      "version": "1.4.7",
-      "resolved": "https://registry.npmjs.org/propagating-hammerjs/-/propagating-hammerjs-1.4.7.tgz",
-      "integrity": "sha512-oW9Wd+W2Tp5uOz6Fh4mEU7p+FoyU85smLH/mPga83Loh0pHa6AH4ZHGywvwMk3TWP31l7iUsvJyW265p4Ipwrg==",
-      "requires": {
-        "hammerjs": "^2.0.8"
-      }
-    },
     "proxy-addr": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz",
@@ -14317,23 +14294,6 @@
         "extsprintf": "^1.2.0"
       }
     },
-    "vis": {
-      "version": "4.21.0-EOL",
-      "resolved": "https://registry.npmjs.org/vis/-/vis-4.21.0-EOL.tgz",
-      "integrity": "sha512-JVS1mywKg5S88XbkDJPfCb3n+vlg5fMA8Ae2hzs3KHAwD4ryM5qwlbFZ6ReDfY8te7I4NLCpuCoywJQEehvJlQ==",
-      "requires": {
-        "emitter-component": "^1.1.1",
-        "hammerjs": "^2.0.8",
-        "keycharm": "^0.2.0",
-        "moment": "^2.18.1",
-        "propagating-hammerjs": "^1.4.6"
-      }
-    },
-    "vis-network": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/vis-network/-/vis-network-8.3.2.tgz",
-      "integrity": "sha512-vJDctP2gZzZbpgpB+MJxNudsqRGdkRablwdLOWd6yZKZQuEBZltOJSBaSCsyQVMD1gY8mjuYhNRoIcy7g+PDvQ=="
-    },
     "vm-browserify": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",

nezha-fronted/package.json

@@ -33,8 +33,6 @@
     "pl-table": "^2.5.8",
     "quill": "^1.3.7",
     "v-selectpage": "^2.1.4",
-    "vis": "^4.21.0-EOL",
-    "vis-network": "^8.3.2",
     "vue": "^2.5.2",
     "vue-color": "^2.8.1",
     "vue-countupjs": "^1.0.0",
@@ -55,8 +53,8 @@
     "babel-loader": "^7.1.1",
     "babel-plugin-syntax-jsx": "^6.18.0",
     "babel-plugin-transform-runtime": "^6.22.0",
-    "babel-plugin-transform-vue-jsx": "^3.5.0",
-    "babel-preset-env": "^1.3.2",
+    "babel-plugin-transform-vue-jsx": "^3.7.0",
+    "babel-preset-env": "^1.7.0",
     "babel-preset-stage-2": "^6.22.0",
     "chalk": "^2.0.1",
     "copy-webpack-plugin": "^4.0.1",

nezha-fronted/src/libs/bus.js

@@ -261,7 +261,7 @@ export default new Vue({
     // 将本地时区转为系统配置的时区
     computeTimezone: function (sourceTime) {
       let offset = localStorage.getItem('nz-sys-timezone')
-      offset = moment.tz(offset).zoneAbbr()
+      offset = moment.tz(offset).format('Z')
       if (offset && offset !== 'undefined') {
         offset = Number.parseInt(offset)
         const date = new Date(sourceTime)
@@ -297,7 +297,7 @@ export default new Vue({
     },
     UTCTimeToConfigTimezone (utcTime) {
       let offset = localStorage.getItem('nz-sys-timezone')
-      offset = moment.tz(offset).zoneAbbr()
+      offset = moment.tz(offset).format('Z')
       if (offset && offset !== 'undefined') {
         let time = utcTime
         if (typeof time === 'string' && /(\d+?-){2}\d+?\s(\d+?:)*\d+/.test(time)) {
@@ -312,7 +312,7 @@ export default new Vue({
     },
     configTimezoneToUTCTime: function (configTime) {
       let offset = localStorage.getItem('nz-sys-timezone')
-      offset = moment.tz(offset).zoneAbbr()
+      offset = moment.tz(offset).format('Z')
       if (offset && offset !== 'undefined') {
         let time = configTime
         if (typeof time === 'string' && /(\d+?-){2}\d+?\s(\d+?:)*\d+/.test(time)) {