diff --git a/package.json b/package.json index f888ff97e..d0be0f042 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "vue-i18n-report": "vue-i18n-extract report -v './src/**/*.?(js|vue)' -l './src/i18n/langs/**/*.json'" }, "dependencies": { + "@ztree/ztree_v3": "3.5.44", "axios": "0.18.1", "deepmerge": "^4.2.2", "echarts": "^4.7.0", @@ -39,6 +40,7 @@ "lodash.set": "^4.3.2", "lodash.topairs": "^4.3.0", "lodash.values": "^4.3.0", + "moment-parseformat": "^3.0.0", "normalize.css": "7.0.0", "nprogress": "0.2.0", "path-to-regexp": "2.4.0", @@ -47,13 +49,13 @@ "vue-cookie": "^1.1.4", "vue-echarts": "^5.0.0-beta.0", "vue-i18n": "^8.15.5", + "vue-moment": "^4.1.0", "vue-router": "3.0.6", "vue-select": "^3.9.5", "vuejs-logger": "^1.5.4", "vuex": "3.1.0", "xterm": "^4.5.0", - "xterm-addon-fit": "^0.3.0", - "@ztree/ztree_v3": "3.5.44" + "xterm-addon-fit": "^0.3.0" }, "devDependencies": { "@babel/core": "7.0.0", diff --git a/src/main.js b/src/main.js index dc0ff8cbc..b77c4340e 100644 --- a/src/main.js +++ b/src/main.js @@ -40,7 +40,8 @@ Vue.config.productionTip = false import VueCookie from 'vue-cookie' Vue.use(VueCookie) window.$cookie = VueCookie - +import VueMoment from 'vue-moment' +Vue.use(VueMoment) // logger import VueLogger from 'vuejs-logger' import loggerOptions from './utils/logger' diff --git a/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue b/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue index 9e82d205d..90d669c52 100644 --- a/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue +++ b/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue @@ -23,7 +23,7 @@ export default { initial: { is_active: true, actions: ['all', 'connect', 'updownload', 'upload_file', 'download_file'], - date_start: '2020-06-18 00:00:00 +0800', + date_start: this.$moment().format('YYYY-MM-DD HH:mm:ss ZZ'), date_expired: '2099-12-31 00:00:00 +0800', nodes: nodesInitial, assets: assetsInitial diff --git a/yarn.lock b/yarn.lock index 3bd45af7c..6c64a75b6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6573,6 +6573,16 @@ mockjs@1.0.1-beta3: dependencies: commander "*" +moment-parseformat@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/moment-parseformat/-/moment-parseformat-3.0.0.tgz#3a1dc438b4bc073b7e93cc298cfb6c5daac26dba" + integrity sha512-dVgXe6b6DLnv4CHG7a1zUe5mSXaIZ3c6lSHm/EKeVeQI2/4pwe0VRde8OyoCE1Ro2lKT5P6uT9JElF7KDLV+jw== + +moment@^2.19.2: + version "2.26.0" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.26.0.tgz#5e1f82c6bafca6e83e808b30c8705eed0dcbd39a" + integrity sha512-oIixUO+OamkUkwjhAVE18rAMfRJNsNe/Stid/gwHSOfHrOtw9EhAY2AHvdKZ/k/MggcYELFCJz/Sn2pL8b8JMw== + move-concurrently@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92" @@ -9686,6 +9696,13 @@ vue-loader@^15.7.0: vue-hot-reload-api "^2.3.0" vue-style-loader "^4.1.0" +vue-moment@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/vue-moment/-/vue-moment-4.1.0.tgz#092a8ff723a96c6f85a0a8e23ad30f0bf320f3b0" + integrity sha512-Gzisqpg82ItlrUyiD9d0Kfru+JorW2o4mQOH06lEDZNgxci0tv/fua1Hl0bo4DozDV2JK1r52Atn/8QVCu8qQw== + dependencies: + moment "^2.19.2" + vue-router@3.0.6: version "3.0.6" resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.0.6.tgz#2e4f0f9cbb0b96d0205ab2690cfe588935136ac3"