From 9d87969c6c259f26993881b5d49416da366bfea5 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Thu, 25 Apr 2019 11:06:08 +0800 Subject: [PATCH 01/57] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=AD=E6=B3=95?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: ecb807d1a265844f9078e85db7d3f4285affbf53 [formerly ecb807d1a265844f9078e85db7d3f4285affbf53 [formerly ecb807d1a265844f9078e85db7d3f4285affbf53 [formerly ecb807d1a265844f9078e85db7d3f4285affbf53 [formerly eb9b8c56dfca090281ea394d95da5a3b9353afbb [formerly f702a19dd7174e65c94529e936f7dafbb5973113]]]]] Former-commit-id: 4c42036493543c43ad82d94e18d6b22c570ae60d Former-commit-id: 43ad41e42c2a2e5716a623dc8baca26ce128c81b Former-commit-id: aec386caeeed35f0a117223495076249fe3fca60 [formerly f6f63af1bb4fad2a6a9f8a4d59e4f1bae9a2b05a] Former-commit-id: 93dc8238167351eaf310d1a4f35427b008644aaa Former-commit-id: d8b18eb6233b5372a1264352bb5c62f99111170d Former-commit-id: 6eb7887b1244269c1ca25c78095c5f8a3da406f6 Former-commit-id: 618f57bc9eeb1ceced7f9080af71bbe12beee77b Former-commit-id: dd6ffb6e8f13410a99459b8c96cd5efbbff795a6 --- src/views/system/index/components/d2-badge/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/system/index/components/d2-badge/index.vue b/src/views/system/index/components/d2-badge/index.vue index fd9c4d55..b012eb0d 100644 --- a/src/views/system/index/components/d2-badge/index.vue +++ b/src/views/system/index/components/d2-badge/index.vue @@ -24,7 +24,7 @@ p { margin: 0px; margin-bottom: 2px; - :nth-last-child() { + &:last-child { margin-bottom: 0px; } a { From b3a9c1d4a3dca67d18bf7a50957e13c1e98c07fb Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Thu, 25 Apr 2019 11:07:12 +0800 Subject: [PATCH 02/57] =?UTF-8?q?=E6=9C=80=E6=96=B0=E4=BE=9D=E8=B5=96=20+?= =?UTF-8?q?=20dartsass?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 93f980842897d398426bdf67204152311bae1c4c [formerly f0799584b13831ddba4142a93ab55216c51a320d] [formerly 93f980842897d398426bdf67204152311bae1c4c [formerly f0799584b13831ddba4142a93ab55216c51a320d] [formerly 93f980842897d398426bdf67204152311bae1c4c [formerly f0799584b13831ddba4142a93ab55216c51a320d] [formerly f0799584b13831ddba4142a93ab55216c51a320d [formerly 629ba2e9708fc2bfb003a085b5abcd06e246bf3d [formerly 05b1cdd9c9ee503759d8bb798948df59fe6bcedd]]]]] Former-commit-id: 0ab568fc23eb70003d3d0711566075644e24f7ea Former-commit-id: d583d94d755fbd3dd027163b416bca4fd368081f Former-commit-id: 2bf9134a11e3cfcbbd7e53f9ffd88645cdd9dd23 [formerly d77acf9aeb26a0f4bdc0f646a75bd8a10b607710] Former-commit-id: a22b9c1e5e2f8a711be86b20e1c4af27a6eacf5d Former-commit-id: 4fc0df4fac16d71db13a6117a1def8665630c022 Former-commit-id: 26ac6bbaea165ae7fd4a2b8ba8d55dd472190077 Former-commit-id: f49c32f9d39e9d8b51b49607d06c65435662eb19 Former-commit-id: 3b642a01e36f932b5b5500ba6fb188d2edb93c18 --- babel.config.js | 4 -- package-lock.json.REMOVED.git-id | 2 +- package.json | 94 ++++++++++++++------------------ 3 files changed, 43 insertions(+), 57 deletions(-) diff --git a/babel.config.js b/babel.config.js index eceb4cef..ba179669 100644 --- a/babel.config.js +++ b/babel.config.js @@ -1,9 +1,5 @@ module.exports = { presets: [ '@vue/app' - ], - plugins: [ - // https://babeljs.io/docs/en/babel-plugin-transform-runtime/ - '@babel/plugin-transform-runtime' ] } diff --git a/package-lock.json.REMOVED.git-id b/package-lock.json.REMOVED.git-id index f3f6c2ff..afb96d0c 100644 --- a/package-lock.json.REMOVED.git-id +++ b/package-lock.json.REMOVED.git-id @@ -1 +1 @@ -4bf0a6ad67e67ee39dd5594ca0e4d1965d5a2de6 \ No newline at end of file +37a0bf8c45158e97c62ed1be6466ad1ad977e544 \ No newline at end of file diff --git a/package.json b/package.json index ef647820..05f0ed5c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,6 @@ { "name": "d2-admin", "version": "1.6.18", - "private": true, "scripts": { "serve": "vue-cli-service serve --open", "start": "npm run serve", @@ -13,72 +12,63 @@ "test:unit": "vue-cli-service test:unit" }, "dependencies": { - "@babel/runtime": "^7.2.0", "@d2-admin/filters-dayjs": "^1.0.3", - "@d2-projects/d2-crud": "^2.0.3", + "@d2-projects/d2-crud": "^2.0.5", "@d2-projects/vue-table-export": "^1.0.1", "@d2-projects/vue-table-import": "^1.0.0", - "axios": "^0.17.1", - "better-scroll": "^1.12.1", - "clipboard-polyfill": "^2.4.1", - "countup.js": "^1.9.3", - "dayjs": "^1.6.7", - "echarts": "^4.1.0", - "element-ui": "^2.4.11", + "axios": "^0.18.0", + "better-scroll": "^1.15.2", + "clipboard-polyfill": "^2.8.0", + "core-js": "^2.6.5", + "countup.js": "^2.0.4", + "dayjs": "^1.8.12", + "echarts": "^4.2.1", + "element-ui": "^2.7.2", "flex.css": "^1.1.7", - "fuse.js": "^3.2.1", - "github-markdown-css": "^2.10.0", - "highlight.js": "^9.12.0", - "hotkeys-js": "^3.3.6", + "fuse.js": "^3.4.4", + "github-markdown-css": "^3.0.1", + "highlight.js": "^9.15.6", + "hotkeys-js": "^3.6.2", "js-cookie": "^2.2.0", - "lodash": "^4.17.10", + "lodash": "^4.17.11", "lowdb": "^1.0.0", - "marked": "^0.3.9", + "marked": "^0.6.2", "mockjs": "^1.0.1-beta3", "nprogress": "^0.2.0", - "qs": "^6.6.0", - "quill": "^1.3.4", - "screenfull": "^4.0.0", + "qs": "^6.7.0", + "quill": "^1.3.6", + "screenfull": "^4.2.0", "simplemde": "^1.11.2", - "ua-parser-js": "^0.7.18", - "v-charts": "^1.17.6", - "v-contextmenu": "^2.7.0", - "vue": "^2.5.17", - "vue-grid-layout": "^2.1.11", - "vue-i18n": "^7.4.2", + "ua-parser-js": "^0.7.19", + "v-charts": "^1.19.0", + "v-contextmenu": "^2.8.0", + "vue": "^2.6.10", + "vue-grid-layout": "^2.3.4", + "vue-i18n": "^8.10.0", "vue-json-tree-view": "^2.1.4", - "vue-router": "^3.0.1", - "vue-splitpane": "^1.0.2", - "vue-ueditor-wrap": "^1.5.0", + "vue-router": "^3.0.3", + "vue-splitpane": "^1.0.4", + "vue-ueditor-wrap": "^2.4.1", "vuex": "^3.0.1" }, "devDependencies": { - "@babel/plugin-transform-runtime": "^7.2.0", "@kazupon/vue-i18n-loader": "^0.3.0", - "@vue/cli-plugin-babel": "^3.0.0", - "@vue/cli-plugin-eslint": "^3.0.0", - "@vue/cli-plugin-unit-jest": "^3.2.3", - "@vue/cli-service": "^3.0.0", - "@vue/eslint-config-standard": "^3.0.0", - "@vue/test-utils": "^1.0.0-beta.28", + "@vue/cli-plugin-babel": "^3.6.0", + "@vue/cli-plugin-eslint": "^3.6.0", + "@vue/cli-plugin-unit-jest": "^3.6.0", + "@vue/cli-service": "^3.6.0", + "@vue/eslint-config-standard": "^4.0.0", + "@vue/test-utils": "1.0.0-beta.29", "babel-core": "7.0.0-bridge.0", - "babel-jest": "^23.0.1", - "lint-staged": "^7.2.0", - "node-sass": "^4.9.0", - "sass-loader": "^7.0.1", - "svg-sprite-loader": "^3.8.0", + "babel-eslint": "^10.0.1", + "babel-jest": "^23.6.0", + "eslint": "^5.16.0", + "eslint-plugin-vue": "^5.0.0", + "sass": "^1.18.0", + "sass-loader": "^7.1.0", + "svg-sprite-loader": "^4.1.3", "text-loader": "0.0.1", - "uglifyjs-webpack-plugin": "^2.1.1", - "vue-template-compiler": "^2.5.17" - }, - "lint-staged": { - "*.js": [ - "vue-cli-service lint", - "git add" - ], - "*.vue": [ - "vue-cli-service lint", - "git add" - ] + "uglifyjs-webpack-plugin": "^2.1.2", + "vue-template-compiler": "^2.5.21" } } From 605c7e5db9f32ed306150f10a2cd15405783b830 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Sat, 27 Apr 2019 20:08:40 +0800 Subject: [PATCH 03/57] =?UTF-8?q?=E4=BD=BF=E7=94=A8=20$options.=5F=5Ffile?= =?UTF-8?q?=20=E5=AE=9E=E7=8E=B0=E6=9B=B4=E7=AE=80=E5=8D=95=E7=9A=84?= =?UTF-8?q?=E6=BA=90=E7=A0=81=E6=9F=A5=E7=9C=8B=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 4c6a0a1f72e1f512b919b934d8483ed430b54766 [formerly f1a4641c19751caddc88308bd8e29fb337f88982] [formerly 4c6a0a1f72e1f512b919b934d8483ed430b54766 [formerly f1a4641c19751caddc88308bd8e29fb337f88982] [formerly 4c6a0a1f72e1f512b919b934d8483ed430b54766 [formerly f1a4641c19751caddc88308bd8e29fb337f88982] [formerly f1a4641c19751caddc88308bd8e29fb337f88982 [formerly 065fde485c713b3ae79131d9da1234dfcbc73cc4 [formerly 470fef55bcb2073a14b6fcc998caabcb83a1097c]]]]] Former-commit-id: c239db922bd8bd06fb68041118a2d25a9c7b475d Former-commit-id: ac5808e62e6ac021da35462b59a04004d62db2dc Former-commit-id: 7890270a60f4db69526403a56cb2dd4feb662e27 [formerly 7b8dd27f1eb72f5e3748d8174fa69c801a73ce1a] Former-commit-id: 027ba79fa86ad1be42f14ef03afebde0cc6ed924 Former-commit-id: 0425a72d2e2b3536fb2ac74199ede23a1e4bea96 Former-commit-id: 96bdce03185ba3befec93d08016d63c7c3c2030a Former-commit-id: e988828be9b03917a9579651a2912d2ed840fb7d Former-commit-id: 07646c36ed91ea4e1efac1bdf1b16b84d8d32eaa --- .../d2-container/components/d2-source.vue | 15 ++------------- src/components/d2-container/index.js | 4 +--- src/views/demo/business/index/index.vue | 3 +-- .../demo/business/issues/142/edit-cache-db.vue | 6 ------ src/views/demo/business/issues/142/edit.vue | 6 ------ src/views/demo/business/issues/142/index.vue | 3 +-- src/views/demo/business/table/1/index.vue | 3 +-- src/views/demo/charts/index/index.vue | 3 +-- src/views/demo/charts/list/bar/demo1/index.vue | 3 +-- src/views/demo/charts/list/bar/demo2/index.vue | 3 +-- src/views/demo/charts/list/bar/demo3/index.vue | 3 +-- src/views/demo/charts/list/bar/demo4/index.vue | 3 +-- src/views/demo/charts/list/bar/demo5/index.vue | 3 +-- src/views/demo/charts/list/candle/demo1/index.vue | 3 +-- src/views/demo/charts/list/candle/demo2/index.vue | 3 +-- src/views/demo/charts/list/candle/demo3/index.vue | 3 +-- src/views/demo/charts/list/funnel/demo1/index.vue | 3 +-- src/views/demo/charts/list/funnel/demo2/index.vue | 3 +-- src/views/demo/charts/list/gauge/demo1/index.vue | 3 +-- .../demo/charts/list/heatmap/demo1/index.vue | 3 +-- .../demo/charts/list/heatmap/demo2/index.vue | 3 +-- .../demo/charts/list/histogram/demo1/index.vue | 3 +-- .../demo/charts/list/histogram/demo2/index.vue | 3 +-- .../demo/charts/list/histogram/demo3/index.vue | 3 +-- .../demo/charts/list/histogram/demo4/index.vue | 3 +-- .../demo/charts/list/histogram/demo5/index.vue | 3 +-- .../demo/charts/list/histogram/demo6/index.vue | 3 +-- src/views/demo/charts/list/line/demo1/index.vue | 3 +-- src/views/demo/charts/list/line/demo2/index.vue | 3 +-- src/views/demo/charts/list/line/demo3/index.vue | 3 +-- src/views/demo/charts/list/line/demo4/index.vue | 3 +-- src/views/demo/charts/list/line/demo5/index.vue | 3 +-- src/views/demo/charts/list/map/demo1/index.vue | 3 +-- src/views/demo/charts/list/map/demo2/index.vue | 3 +-- src/views/demo/charts/list/map/demo3/index.vue | 3 +-- src/views/demo/charts/list/pie/demo1/index.vue | 3 +-- src/views/demo/charts/list/pie/demo2/index.vue | 3 +-- src/views/demo/charts/list/pie/demo3/index.vue | 3 +-- src/views/demo/charts/list/pie/demo4/index.vue | 3 +-- src/views/demo/charts/list/pie/demo5/index.vue | 3 +-- src/views/demo/charts/list/pie/demo6/index.vue | 3 +-- src/views/demo/charts/list/radar/demo1/index.vue | 3 +-- src/views/demo/charts/list/ring/demo1/index.vue | 3 +-- src/views/demo/charts/list/ring/demo2/index.vue | 3 +-- src/views/demo/charts/list/ring/demo3/index.vue | 3 +-- src/views/demo/charts/list/ring/demo4/index.vue | 3 +-- src/views/demo/charts/list/ring/demo5/index.vue | 3 +-- src/views/demo/charts/list/sankey/demo1/index.vue | 3 +-- .../demo/charts/list/scatter/demo1/index.vue | 3 +-- .../demo/charts/list/scatter/demo2/index.vue | 3 +-- src/views/demo/charts/list/tree/demo1/index.vue | 3 +-- .../demo/charts/list/waterfall/demo1/index.vue | 3 +-- src/views/demo/components/container/api.vue | 3 +-- src/views/demo/components/container/card-bs.vue | 2 +- src/views/demo/components/container/card-slot.vue | 2 +- src/views/demo/components/container/card.vue | 2 +- src/views/demo/components/container/full-bs.vue | 2 +- src/views/demo/components/container/full-slot.vue | 2 +- src/views/demo/components/container/full.vue | 2 +- src/views/demo/components/container/ghost-bs.vue | 2 +- .../demo/components/container/ghost-slot.vue | 2 +- src/views/demo/components/container/ghost.vue | 2 +- .../components/contextmenu/custom-trigger.vue | 7 +------ .../demo/components/contextmenu/disabled.vue | 7 +------ src/views/demo/components/contextmenu/divier.vue | 7 +------ src/views/demo/components/contextmenu/group.vue | 2 +- src/views/demo/components/contextmenu/simple.vue | 7 +------ src/views/demo/components/contextmenu/submenu.vue | 7 +------ src/views/demo/components/countup/index.vue | 3 +-- src/views/demo/components/editor-quill/index.vue | 3 +-- .../demo/components/editor-simpleMDE/index.vue | 3 +-- .../demo/components/editor-ueditor/index.vue | 3 +-- src/views/demo/components/highlight/index.vue | 3 +-- src/views/demo/components/icon/icon-svg.vue | 2 +- src/views/demo/components/icon/icon.vue | 2 +- src/views/demo/components/icon/list.vue | 3 +-- src/views/demo/components/icon/select-svg.vue | 3 +-- src/views/demo/components/icon/select.vue | 3 +-- src/views/demo/components/index/index.vue | 3 +-- src/views/demo/components/json-tree/index.vue | 3 +-- src/views/demo/components/layout/grid.vue | 3 +-- src/views/demo/components/layout/splitpane.vue | 7 +------ src/views/demo/components/markdown/source.vue | 3 +-- src/views/demo/components/markdown/url.vue | 2 +- src/views/demo/d2-crud/demo1/index.vue | 3 +-- src/views/demo/d2-crud/demo10/index.vue | 3 +-- src/views/demo/d2-crud/demo11/index.vue | 3 +-- src/views/demo/d2-crud/demo12/index.vue | 3 +-- src/views/demo/d2-crud/demo13/index.vue | 3 +-- src/views/demo/d2-crud/demo14/index.vue | 3 +-- src/views/demo/d2-crud/demo15/index.vue | 3 +-- src/views/demo/d2-crud/demo16/index.vue | 3 +-- src/views/demo/d2-crud/demo17/index.vue | 3 +-- src/views/demo/d2-crud/demo18/index.vue | 3 +-- src/views/demo/d2-crud/demo19/index.vue | 3 +-- src/views/demo/d2-crud/demo2/index.vue | 3 +-- src/views/demo/d2-crud/demo20/index.vue | 3 +-- src/views/demo/d2-crud/demo21/index.vue | 3 +-- src/views/demo/d2-crud/demo22/index.vue | 3 +-- src/views/demo/d2-crud/demo23/index.vue | 3 +-- src/views/demo/d2-crud/demo24/index.vue | 3 +-- src/views/demo/d2-crud/demo25/index.vue | 3 +-- src/views/demo/d2-crud/demo26/index.vue | 3 +-- src/views/demo/d2-crud/demo27/index.vue | 3 +-- src/views/demo/d2-crud/demo28/index.vue | 3 +-- src/views/demo/d2-crud/demo29/index.vue | 3 +-- src/views/demo/d2-crud/demo3/index.vue | 3 +-- src/views/demo/d2-crud/demo30/index.vue | 3 +-- src/views/demo/d2-crud/demo31/index.vue | 3 +-- src/views/demo/d2-crud/demo4/index.vue | 3 +-- src/views/demo/d2-crud/demo5/index.vue | 3 +-- src/views/demo/d2-crud/demo6/index.vue | 3 +-- src/views/demo/d2-crud/demo7/index.vue | 3 +-- src/views/demo/d2-crud/demo8/index.vue | 3 +-- src/views/demo/d2-crud/demo9/index.vue | 3 +-- src/views/demo/d2-crud/index/index.vue | 3 +-- src/views/demo/element/basic-button/index.vue | 2 +- src/views/demo/element/basic-color/index.vue | 2 +- src/views/demo/element/basic-container/index.vue | 2 +- src/views/demo/element/basic-icon/index.vue | 2 +- src/views/demo/element/basic-layout/index.vue | 2 +- src/views/demo/element/basic-typography/index.vue | 3 +-- src/views/demo/element/data-badge/index.vue | 2 +- src/views/demo/element/data-pagination/index.vue | 2 +- src/views/demo/element/data-progress/index.vue | 2 +- src/views/demo/element/data-table/index.vue | 3 +-- src/views/demo/element/data-tag/index.vue | 2 +- src/views/demo/element/data-tree/index.vue | 2 +- src/views/demo/element/form-cascader/index.vue | 2 +- src/views/demo/element/form-checkbox/index.vue | 3 +-- .../demo/element/form-color-picker/index.vue | 2 +- src/views/demo/element/form-date-picker/index.vue | 2 +- .../demo/element/form-datetime-picker/index.vue | 2 +- src/views/demo/element/form-form/index.vue | 2 +- .../demo/element/form-input-number/index.vue | 2 +- .../element/form-input/index.vue.REMOVED.git-id | 2 +- src/views/demo/element/form-radio/index.vue | 3 +-- src/views/demo/element/form-rate/index.vue | 2 +- src/views/demo/element/form-select/index.vue | 2 +- src/views/demo/element/form-slider/index.vue | 2 +- src/views/demo/element/form-switch/index.vue | 2 +- src/views/demo/element/form-time-picker/index.vue | 2 +- src/views/demo/element/form-transfer/index.vue | 2 +- src/views/demo/element/form-upload/index.vue | 2 +- src/views/demo/element/index/index.vue | 3 +-- .../demo/element/navigation-breadcrumb/index.vue | 2 +- .../demo/element/navigation-dropdown/index.vue | 2 +- src/views/demo/element/navigation-menu/index.vue | 2 +- src/views/demo/element/navigation-steps/index.vue | 2 +- src/views/demo/element/navigation-tabs/index.vue | 2 +- src/views/demo/element/notice-alert/index.vue | 2 +- src/views/demo/element/notice-loading/index.vue | 2 +- .../demo/element/notice-message-box/index.vue | 2 +- src/views/demo/element/notice-message/index.vue | 2 +- .../demo/element/notice-notification/index.vue | 2 +- src/views/demo/element/others-card/index.vue | 2 +- src/views/demo/element/others-carousel/index.vue | 2 +- src/views/demo/element/others-collapse/index.vue | 2 +- src/views/demo/element/others-dialog/index.vue | 2 +- src/views/demo/element/others-popover/index.vue | 2 +- src/views/demo/element/others-tooltip/index.vue | 2 +- src/views/demo/filters/day/index.vue | 2 +- src/views/demo/filters/index/index.vue | 3 +-- src/views/demo/frame/d2-doc/index.vue | 2 +- src/views/demo/frame/html/index.vue | 2 +- src/views/demo/frame/index/index.vue | 3 +-- src/views/demo/playground/db/all/index.vue | 3 +-- .../demo/playground/db/page-public/index.vue | 3 +-- .../playground/db/page-snapshot-public/index.vue | 3 +-- .../playground/db/page-snapshot-user/index.vue | 3 +-- src/views/demo/playground/db/page-user/index.vue | 3 +-- src/views/demo/playground/db/public/index.vue | 3 +-- src/views/demo/playground/db/user/index.vue | 3 +-- src/views/demo/playground/env/index.vue | 3 +-- src/views/demo/playground/index/index.vue | 3 +-- src/views/demo/playground/log/ajax/index.vue | 7 +------ src/views/demo/playground/log/console/index.vue | 7 +------ src/views/demo/playground/log/error/index.vue | 7 +------ src/views/demo/playground/log/log/index.vue | 3 +-- src/views/demo/playground/page-argu/get.vue | 7 +------ src/views/demo/playground/page-argu/send.vue | 3 +-- src/views/demo/playground/page-cache/off.vue | 3 +-- src/views/demo/playground/page-cache/on.vue | 3 +-- src/views/demo/playground/page-cache/params.vue | 3 +-- .../demo/playground/store/fullscreen/index.vue | 7 +------ src/views/demo/playground/store/gray/index.vue | 3 +-- src/views/demo/playground/store/menu/index.vue | 3 +-- src/views/demo/playground/store/page/index.vue | 3 +-- src/views/demo/playground/store/size/index.vue | 3 +-- src/views/demo/playground/store/theme/index.vue | 3 +-- .../demo/playground/store/transition/index.vue | 7 +------ src/views/demo/playground/store/ua/index.vue | 7 +------ src/views/demo/plugins/better-scroll/base.vue | 3 +-- src/views/demo/plugins/better-scroll/to.vue | 3 +-- .../demo/plugins/clipboard-polyfill/index.vue | 3 +-- src/views/demo/plugins/day/index.vue | 3 +-- src/views/demo/plugins/export/table.vue | 3 +-- src/views/demo/plugins/export/txt.vue | 3 +-- src/views/demo/plugins/i18n/demo1.vue | 2 +- src/views/demo/plugins/i18n/demo2.vue | 2 +- src/views/demo/plugins/import/csv.vue | 3 +-- src/views/demo/plugins/import/xlsx.vue | 3 +-- src/views/demo/plugins/index/index.vue | 3 +-- src/views/demo/plugins/js-cookie/index.vue | 7 +------ src/views/demo/plugins/mock/ajax.vue | 3 +-- src/views/demo/plugins/mock/dpd.vue | 3 +-- src/views/demo/plugins/mock/dtd.vue | 3 +-- src/views/system/index/page.vue | 2 +- vue.config.js | 4 ---- 209 files changed, 207 insertions(+), 437 deletions(-) diff --git a/src/components/d2-container/components/d2-source.vue b/src/components/d2-container/components/d2-source.vue index 0ce2b05a..e96191d0 100644 --- a/src/components/d2-container/components/d2-source.vue +++ b/src/components/d2-container/components/d2-source.vue @@ -10,13 +10,6 @@ + diff --git a/src/views/system/index/page.vue b/src/views/system/index/page.vue index deac0acd..424032da 100644 --- a/src/views/system/index/page.vue +++ b/src/views/system/index/page.vue @@ -23,19 +23,16 @@ - diff --git a/src/i18n.js b/src/i18n.js index 4098f333..09581b33 100644 --- a/src/i18n.js +++ b/src/i18n.js @@ -1,5 +1,6 @@ import Vue from 'vue' import VueI18n from 'vue-i18n' +import util from '@/libs/util' Vue.use(VueI18n) @@ -24,7 +25,7 @@ Vue.prototype.$languages = Object.keys(messages).map(langlage => ({ })) export default new VueI18n({ - locale: process.env.VUE_APP_I18N_LOCALE || 'en', + locale: util.cookies.get('lang') || process.env.VUE_APP_I18N_LOCALE, fallbackLocale: process.env.VUE_APP_I18N_FALLBACK_LOCALE || 'en', messages }) From 99e805803901ef60c063202eb327d83ad5ff6f6e Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Wed, 22 May 2019 16:43:31 +0800 Subject: [PATCH 50/57] no message Former-commit-id: 81ed749f0cc0919e3560d59536a7a2bfb3d32cec [formerly 81ed749f0cc0919e3560d59536a7a2bfb3d32cec [formerly 81ed749f0cc0919e3560d59536a7a2bfb3d32cec [formerly 81ed749f0cc0919e3560d59536a7a2bfb3d32cec [formerly efed8ea3185d767af26a8c7ac0022056443ccddf [formerly d2ef4da90c85f2aaffe40ad9582961b86fcf79e6]]]]] Former-commit-id: dafb9ad722dc1cbfafbe7e935de82bce4c332178 Former-commit-id: 0af9a05e9e579c3c65a39c0fba5f23c9a0da64a2 Former-commit-id: c2f06e6fa5c46fd71c14f7a24a17644873855fc8 [formerly cd9acd8f3b7207615d4c94cbca727c36e8d7bf24] Former-commit-id: e9bafe627ad08e8d749003ccdc89a7102c8a7d50 Former-commit-id: 78a36587924dd602ff6e162bb7e7db4e324aaec7 Former-commit-id: 8c626144ba89409472f214b95a075e6917235600 Former-commit-id: 2a7f31432021e3ac207f813730311db6a30ccdcc Former-commit-id: 4feb9a4d4a6fb4accd617a1c90ce7cdb81fd591c --- .env | 4 ++-- src/i18n.js | 2 +- vue.config.js | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.env b/.env index 8ad3bfc8..c9de428d 100644 --- a/.env +++ b/.env @@ -1,5 +1,5 @@ VUE_APP_TITLE=D2Admin VUE_APP_API=/api/ VUE_APP_REPO=https://github.com/d2-projects/d2-admin -VUE_APP_I18N_LOCALE=zh-chs -VUE_APP_I18N_FALLBACK_LOCALE=en +VUE_APP_I18N_LOCALE=en +VUE_APP_I18N_FALLBACK_LOCALE=zh-chs diff --git a/src/i18n.js b/src/i18n.js index 09581b33..d80c7edb 100644 --- a/src/i18n.js +++ b/src/i18n.js @@ -26,6 +26,6 @@ Vue.prototype.$languages = Object.keys(messages).map(langlage => ({ export default new VueI18n({ locale: util.cookies.get('lang') || process.env.VUE_APP_I18N_LOCALE, - fallbackLocale: process.env.VUE_APP_I18N_FALLBACK_LOCALE || 'en', + fallbackLocale: process.env.VUE_APP_I18N_FALLBACK_LOCALE, messages }) diff --git a/vue.config.js b/vue.config.js index cb5c5de8..1f5200af 100644 --- a/vue.config.js +++ b/vue.config.js @@ -110,8 +110,8 @@ module.exports = { // i18n pluginOptions: { i18n: { - locale: 'zh-chs', - fallbackLocale: 'en', + locale: 'en', + fallbackLocale: 'zh-chs', localeDir: 'locales', enableInSFC: true } From 4f10422099c7c69a941eb1a84e24f0e5842477d8 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Wed, 22 May 2019 16:59:04 +0800 Subject: [PATCH 51/57] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=99=BB=E9=99=86?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E9=AA=8C=E8=AF=81=E7=A0=81=E7=9A=84=E5=89=8D?= =?UTF-8?q?=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 4a0989e66cf6858397485e006dc1cabf4316df8c [formerly cae2640ec6ad26cf0468f16e6425f0c5b14246dd] [formerly 4a0989e66cf6858397485e006dc1cabf4316df8c [formerly cae2640ec6ad26cf0468f16e6425f0c5b14246dd] [formerly 4a0989e66cf6858397485e006dc1cabf4316df8c [formerly cae2640ec6ad26cf0468f16e6425f0c5b14246dd] [formerly cae2640ec6ad26cf0468f16e6425f0c5b14246dd [formerly 86793934b6ef47771ec578375db23ca2e314ee6a [formerly 87865bde9701e595bbe0e92a996a2fe42618338f]]]]] Former-commit-id: b3b8e8433389ff061bd1f45e99f84ae452022d74 Former-commit-id: b7db1ea3d490af65e161db5680e3f8966427574c Former-commit-id: 9ea4f917801ef2392322db4244aed60ed88e751e [formerly ff9ae4b43ecd3f718b8daa1215a0f33ca6f56ee1] Former-commit-id: e81e1c0076b24752fbe09af5a813c1291ccefce8 Former-commit-id: 0b414789822a172fc0e93ba9da6dd7ed93d9c40f Former-commit-id: cd6eb7d9c5499c14da2b1363fe5518f078e89db3 Former-commit-id: 9052029c68c313f73ce3c3120f593a12bc4154c4 Former-commit-id: 638258ed5e79ad146539671e5477d8ed1de022f9 --- locales.babel.REMOVED.git-id | 2 +- src/locales/en.json | 5 +---- src/locales/ja.json | 5 +---- src/locales/zh-chs.json | 5 +---- src/locales/zh-cht.json | 5 +---- src/views/system/login/page.vue.REMOVED.git-id | 2 +- 6 files changed, 6 insertions(+), 18 deletions(-) diff --git a/locales.babel.REMOVED.git-id b/locales.babel.REMOVED.git-id index 9f036f7b..1e658171 100644 --- a/locales.babel.REMOVED.git-id +++ b/locales.babel.REMOVED.git-id @@ -1 +1 @@ -b6bb25353a9e136a4ba55d703d528bc069f5b6d6 \ No newline at end of file +01cede45bbfef9e10f690f2a87ed7e1f9d395c8e \ No newline at end of file diff --git a/src/locales/en.json b/src/locales/en.json index 243039d6..5e5ced7a 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -105,12 +105,9 @@ "username": "Username" }, "placeholder": { - "code": "- - - -", + "code": "Verification code", "password": "Password", "username": "Username" - }, - "prepend": { - "code": "Code" } }, "motto": { diff --git a/src/locales/ja.json b/src/locales/ja.json index 939891b2..7c64c05b 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -105,12 +105,9 @@ "username": "ユーザー名" }, "placeholder": { - "code": " - - - - ", + "code": "確認コード", "password": "パスワード", "username": "ユーザー名" - }, - "prepend": { - "code": "確認コード" } }, "motto": { diff --git a/src/locales/zh-chs.json b/src/locales/zh-chs.json index 0d31d52e..1c7d2274 100644 --- a/src/locales/zh-chs.json +++ b/src/locales/zh-chs.json @@ -105,12 +105,9 @@ "username": "用户名" }, "placeholder": { - "code": "- - - -", + "code": "验证码", "password": "密码", "username": "用户名" - }, - "prepend": { - "code": "验证码" } }, "motto": { diff --git a/src/locales/zh-cht.json b/src/locales/zh-cht.json index 5471b632..9fdfb529 100644 --- a/src/locales/zh-cht.json +++ b/src/locales/zh-cht.json @@ -105,12 +105,9 @@ "username": "用戶名" }, "placeholder": { - "code": "- - - -", + "code": "驗證碼", "password": "密碼", "username": "用戶名" - }, - "prepend": { - "code": "驗證碼" } }, "motto": { diff --git a/src/views/system/login/page.vue.REMOVED.git-id b/src/views/system/login/page.vue.REMOVED.git-id index 3011145b..4f3c138b 100644 --- a/src/views/system/login/page.vue.REMOVED.git-id +++ b/src/views/system/login/page.vue.REMOVED.git-id @@ -1 +1 @@ -d6bf19e1aedf9bb938dc54b2f593b5d782650496 \ No newline at end of file +db2d307416fb79fcd0bff7e7592d7663a8217567 \ No newline at end of file From 17234a7d4c3d6417d63575c29a7b8b4edd9a0419 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Wed, 22 May 2019 17:08:34 +0800 Subject: [PATCH 52/57] no message Former-commit-id: 56a69d9a9d40f3a9412c7e542db8fe8aa341ae25 [formerly 21c2d18cf03d3b5649b0f58249c9aa5d1c3c3025] [formerly 56a69d9a9d40f3a9412c7e542db8fe8aa341ae25 [formerly 21c2d18cf03d3b5649b0f58249c9aa5d1c3c3025] [formerly 56a69d9a9d40f3a9412c7e542db8fe8aa341ae25 [formerly 21c2d18cf03d3b5649b0f58249c9aa5d1c3c3025] [formerly 21c2d18cf03d3b5649b0f58249c9aa5d1c3c3025 [formerly 7358a1805ac5b4047fa458f11e736bf492b26eb6 [formerly ab5531b24b9811b76a8107edea026984401d3f83]]]]] Former-commit-id: f0cf027cca2cb345424ec9c4f5052ad1c4dd90c4 Former-commit-id: 3c4551974b10562073c694a4183c70853b454197 Former-commit-id: cb784472389fa92cc5e551f6758ee80dd282590f [formerly c04bb8de98cd255a5fd9bb19766fea8eb859763f] Former-commit-id: e486f60ce33d257f2f96fc258c6a93f8995f288f Former-commit-id: e6880c7e5c74c7bd850e27600620e0a2ea15a35e Former-commit-id: 8ec56322572b8d71adb06a509d347b7662a26d6a Former-commit-id: 67cfdeccced4a3707b863d081dd8e48286bcca29 Former-commit-id: 498861f1509cff0641281960911bcabb1d51b85e --- d2-admin.babel.REMOVED.git-id | 1 + locales.babel.REMOVED.git-id | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 d2-admin.babel.REMOVED.git-id delete mode 100644 locales.babel.REMOVED.git-id diff --git a/d2-admin.babel.REMOVED.git-id b/d2-admin.babel.REMOVED.git-id new file mode 100644 index 00000000..9489bc1d --- /dev/null +++ b/d2-admin.babel.REMOVED.git-id @@ -0,0 +1 @@ +4861c1a3f31b58bb0ba69bd08b93c2403c09bdbc \ No newline at end of file diff --git a/locales.babel.REMOVED.git-id b/locales.babel.REMOVED.git-id deleted file mode 100644 index 1e658171..00000000 --- a/locales.babel.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -01cede45bbfef9e10f690f2a87ed7e1f9d395c8e \ No newline at end of file From 2cda830782555035ef0b7778d82fd447398e953d Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Wed, 22 May 2019 17:30:45 +0800 Subject: [PATCH 53/57] no message Former-commit-id: b5eeb34e7cbad914af2f8eb56b616ced81ce2f1a [formerly b5eeb34e7cbad914af2f8eb56b616ced81ce2f1a [formerly b5eeb34e7cbad914af2f8eb56b616ced81ce2f1a [formerly b5eeb34e7cbad914af2f8eb56b616ced81ce2f1a [formerly eb77d53ee717df3adf51a1bc9d4748b159a2f33b [formerly e7aeb884b2f80894bdb0b29ff1061393537ae311]]]]] Former-commit-id: 53d046259727d28cfc5e4a7c5c5908a5a5a90533 Former-commit-id: 87616398174d815c7c2224a305b21f89545c6b32 Former-commit-id: 111ab8f44ec3c21af352b9b4e6afce8c549b153e [formerly f5134480d3e8029b7f096fbd9ef4694a7414cb52] Former-commit-id: 9c4aade4bcb7a8c7bbba613999a94050d4eef8ab Former-commit-id: f2c1527858a2a8b0a9cb0cde7fa3ec5c2b70f4ed Former-commit-id: b947c9e2a7058d1791cf39636747eebb085e7931 Former-commit-id: 3d4e1d4a594799f20b2b927e269efaac3a28df6e Former-commit-id: 826facbc90b1f5c4f5c396d8ded28cba8ad3fe07 --- d2-admin.babel.REMOVED.git-id | 2 +- src/locales/en.json | 8 ++++++-- src/locales/ja.json | 8 ++++++-- src/locales/zh-chs.json | 8 ++++++-- src/locales/zh-cht.json | 8 ++++++-- src/views/system/login/page.vue.REMOVED.git-id | 2 +- 6 files changed, 26 insertions(+), 10 deletions(-) diff --git a/d2-admin.babel.REMOVED.git-id b/d2-admin.babel.REMOVED.git-id index 9489bc1d..c99c01f7 100644 --- a/d2-admin.babel.REMOVED.git-id +++ b/d2-admin.babel.REMOVED.git-id @@ -1 +1 @@ -4861c1a3f31b58bb0ba69bd08b93c2403c09bdbc \ No newline at end of file +1fa97eb3669d03dfd3beba1ab093345500f40c4c \ No newline at end of file diff --git a/src/locales/en.json b/src/locales/en.json index 5e5ced7a..47cf9201 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -1,8 +1,12 @@ { "_name": "English", "public": { - "error-message": { - "form-not-valid": "Form Check Failure" + "message": { + "error": { + "form": { + "invalid": "Form verification failed, please check" + } + } }, "notify": { "special": { diff --git a/src/locales/ja.json b/src/locales/ja.json index 7c64c05b..19be6a4c 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -1,8 +1,12 @@ { "_name": "日本語", "public": { - "error-message": { - "form-not-valid": "フォームの検証に失敗しました" + "message": { + "error": { + "form": { + "invalid": "フォームの確認に失敗しました。確認してください" + } + } }, "notify": { "special": { diff --git a/src/locales/zh-chs.json b/src/locales/zh-chs.json index 1c7d2274..637b1cb2 100644 --- a/src/locales/zh-chs.json +++ b/src/locales/zh-chs.json @@ -1,8 +1,12 @@ { "_name": "简体中文", "public": { - "error-message": { - "form-not-valid": "表单校验失败" + "message": { + "error": { + "form": { + "invalid": "表单校验失败，请检查" + } + } }, "notify": { "special": { diff --git a/src/locales/zh-cht.json b/src/locales/zh-cht.json index 9fdfb529..310e3246 100644 --- a/src/locales/zh-cht.json +++ b/src/locales/zh-cht.json @@ -1,8 +1,12 @@ { "_name": "繁體中文", "public": { - "error-message": { - "form-not-valid": "表單校驗失敗" + "message": { + "error": { + "form": { + "invalid": "表單校驗失敗，請檢查" + } + } }, "notify": { "special": { diff --git a/src/views/system/login/page.vue.REMOVED.git-id b/src/views/system/login/page.vue.REMOVED.git-id index 4f3c138b..5bb1cc98 100644 --- a/src/views/system/login/page.vue.REMOVED.git-id +++ b/src/views/system/login/page.vue.REMOVED.git-id @@ -1 +1 @@ -db2d307416fb79fcd0bff7e7592d7663a8217567 \ No newline at end of file +79e5cb61969ad81e9de47b2dfc6ca33133c77a23 \ No newline at end of file From 3fb609aed643cf363047707c73feede9dc12ec55 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Wed, 22 May 2019 17:35:58 +0800 Subject: [PATCH 54/57] no message Former-commit-id: d9e64006f301b79c5d66643a3d357848baf59873 [formerly d9e64006f301b79c5d66643a3d357848baf59873 [formerly d9e64006f301b79c5d66643a3d357848baf59873 [formerly d9e64006f301b79c5d66643a3d357848baf59873 [formerly 89895ad0d6361d3432518ae9028445aef67ffa65 [formerly 3530946ffa887baf02fd63e2e93c32a387db9a17]]]]] Former-commit-id: 85545f94dfdce2773f82edaa9156f83a9cb8e669 Former-commit-id: db1cc6760396cd39fac4af32400c2e17a6206cfd Former-commit-id: a8d7249c431807080f5451a38128848ec74b6562 [formerly f45071e8207051678c4c57a325fe7ba711173224] Former-commit-id: 15860f9dab62b6a8ff14f44cf9328344cfdab496 Former-commit-id: 4df3ec8ff501ad53d0a01f4330c2209ab8320741 Former-commit-id: b6643f2df5375c0f9ae66566e3fac41cbc1a11e0 Former-commit-id: 8613c7683e0b1ee3abceb78ff92cb69e8809f757 Former-commit-id: 5c6a5b95d8e8b19bfc7f0d0a196cd3217a24289e --- src/locales/en.json | 30 +++++++++++++++--------------- src/locales/ja.json | 30 +++++++++++++++--------------- src/locales/zh-chs.json | 2 +- src/locales/zh-cht.json | 32 ++++++++++++++++---------------- 4 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/locales/en.json b/src/locales/en.json index 47cf9201..a7e12967 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -12,16 +12,16 @@ "special": { "upload": { "error": { - "message": "", - "title": "" + "message": "Data upload failed", + "title": "Upload failed" }, "start": { - "message": "", - "title": "" + "message": "Uploading data, please wait", + "title": "Start upload" }, "success": { - "message": "", - "title": "" + "message": "Successful data upload", + "title": "Successful upload" } } } @@ -68,22 +68,22 @@ "log": { "notify": { "more": { - "message": "", - "title": "" + "message": "The full log content has been printed to the console", + "title": "log details" } }, "table": { - "empty-text": "", + "empty-text": "No log information yet", "label": { - "component": "", - "message": "", - "more": "", - "time": "", - "url": "" + "component": "Trigger component", + "message": "Information", + "more": "check the detail information", + "time": "time", + "url": "Trigger page" } }, "upload": { - "button": "" + "button": "Upload {number} data" } }, "login": { diff --git a/src/locales/ja.json b/src/locales/ja.json index 19be6a4c..8fc26c90 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -12,16 +12,16 @@ "special": { "upload": { "error": { - "message": "", - "title": "" + "message": "データのアップロードに失敗しました", + "title": "アップロードに失敗しました" }, "start": { - "message": "", - "title": "" + "message": "データをアップロードしています。しばらくお待ちください", + "title": "アップロードを開始" }, "success": { - "message": "", - "title": "" + "message": "データのアップロードに成功しました", + "title": "アップロード成功" } } } @@ -68,22 +68,22 @@ "log": { "notify": { "more": { - "message": "", - "title": "" + "message": "ログ全体の内容がコンソールに出力されました", + "title": "ログ詳細" } }, "table": { - "empty-text": "", + "empty-text": "ログ情報はまだありません", "label": { - "component": "", - "message": "", - "more": "", - "time": "", - "url": "" + "component": "トリガーコンポーネント", + "message": "情報", + "more": "詳細を見る", + "time": "時間", + "url": "トリガーページ" } }, "upload": { - "button": "" + "button": " {number} データをアップロード" } }, "login": { diff --git a/src/locales/zh-chs.json b/src/locales/zh-chs.json index 637b1cb2..f5cb506d 100644 --- a/src/locales/zh-chs.json +++ b/src/locales/zh-chs.json @@ -27,7 +27,7 @@ } }, "rules": { - "required": "请输入{name}" + "required": "请输入 {name}" } }, "views": { diff --git a/src/locales/zh-cht.json b/src/locales/zh-cht.json index 310e3246..c88715da 100644 --- a/src/locales/zh-cht.json +++ b/src/locales/zh-cht.json @@ -12,22 +12,22 @@ "special": { "upload": { "error": { - "message": "", - "title": "" + "message": "數據上傳失敗", + "title": "上傳失敗" }, "start": { - "message": "", - "title": "" + "message": "正在上傳數據，請稍後", + "title": "開始上傳" }, "success": { - "message": "", - "title": "" + "message": "數據上傳成功", + "title": "上傳成功" } } } }, "rules": { - "required": "請輸入{name}" + "required": "請輸入 {name}" } }, "views": { @@ -68,22 +68,22 @@ "log": { "notify": { "more": { - "message": "", - "title": "" + "message": "完整的日誌內容已經打印到控制台", + "title": "日誌詳情" } }, "table": { - "empty-text": "", + "empty-text": "暫無日誌信息", "label": { - "component": "", - "message": "", - "more": "", - "time": "", - "url": "" + "component": "觸發組件", + "message": "信息", + "more": "查看詳細信息", + "time": "時間", + "url": "觸發頁面" } }, "upload": { - "button": "" + "button": "上傳 {number} 條數據" } }, "login": { From 9441c4f614b13461bcc87fe0d725b470ca34f471 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Wed, 22 May 2019 23:34:02 +0800 Subject: [PATCH 55/57] =?UTF-8?q?=E5=A4=9A=E5=9B=BD=E8=AF=AD=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: a2da9834cf7ab29e8ccb11a961702fe6ad72194c [formerly a2da9834cf7ab29e8ccb11a961702fe6ad72194c [formerly a2da9834cf7ab29e8ccb11a961702fe6ad72194c [formerly a2da9834cf7ab29e8ccb11a961702fe6ad72194c [formerly d5496bc086c4f30bf93e78dc952a96e1290d7741 [formerly 109a1551c774eda4def5d60bcad6a7e6bf067427]]]]] Former-commit-id: 5fb4b686b2a55e26e84b807e9ac89ce2507e60ae Former-commit-id: 616a6efcf8a6ae1c3dac361188d6cdb20babbcee Former-commit-id: b36b72c56e7bde000543b82710ebf5adb1e6af7e [formerly 73df28172659ebd186166f10a018df24dd9e82c3] Former-commit-id: ea8cd53cb57d1ecfd6319e49a82e79e898a4d2d5 Former-commit-id: e374d75e19fd117a62d4e4039c6c4a0a5f9c12dc Former-commit-id: 9baa5c79336a57dbc908b2d9829145f19b353277 Former-commit-id: bbd4b1a8abed87e1e07ce8b8c60935819113f182 Former-commit-id: 71e567542049cc37cc88c05185c220aeee3564ab --- d2-admin.babel.REMOVED.git-id | 2 +- src/locales/en.json | 17 ++++++ src/locales/ja.json | 17 ++++++ src/locales/zh-chs.json | 17 ++++++ src/locales/zh-cht.json | 17 ++++++ .../d2-help/image/qq.jpg.REMOVED.git-id | 1 + .../d2-help/image/we.jpg.REMOVED.git-id | 1 + .../system/index/components/d2-help/index.vue | 58 +++++++++++++++++++ src/views/system/index/page.vue | 3 + 9 files changed, 132 insertions(+), 1 deletion(-) create mode 100644 src/views/system/index/components/d2-help/image/qq.jpg.REMOVED.git-id create mode 100644 src/views/system/index/components/d2-help/image/we.jpg.REMOVED.git-id create mode 100644 src/views/system/index/components/d2-help/index.vue diff --git a/d2-admin.babel.REMOVED.git-id b/d2-admin.babel.REMOVED.git-id index c99c01f7..9d2a0dfe 100644 --- a/d2-admin.babel.REMOVED.git-id +++ b/d2-admin.babel.REMOVED.git-id @@ -1 +1 @@ -1fa97eb3669d03dfd3beba1ab093345500f40c4c \ No newline at end of file +df03a79f990d713d14c11639842ec15c84f45469 \ No newline at end of file diff --git a/src/locales/en.json b/src/locales/en.json index a7e12967..b1b92126 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -44,6 +44,23 @@ "sub-title": "Elegant mid-background integration solution", "title": "D2 Admin" }, + "help": { + "button": "need any help", + "dialog": { + "link": { + "text": { + "doc": "Document", + "issues": "Historical question", + "new-issue": "Ask a question on Github" + } + }, + "sub-title": { + "doc": "Here are some references", + "join-chat-group": "Ask other users or authors" + }, + "title": "Help" + } + }, "page": { "link": { "href": { diff --git a/src/locales/ja.json b/src/locales/ja.json index 8fc26c90..3264a679 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -44,6 +44,23 @@ "sub-title": "エレガントなミッドバックグラウンド統合ソリューション", "title": "D2 Admin" }, + "help": { + "button": "助けが必要ですか？", + "dialog": { + "link": { + "text": { + "doc": "文書", + "issues": "歴史的な質問", + "new-issue": "Githubで質問する" + } + }, + "sub-title": { + "doc": "ここにいくつかの参照があります", + "join-chat-group": "他のユーザーや作者に尋ねる" + }, + "title": "ヘルプ" + } + }, "page": { "link": { "href": { diff --git a/src/locales/zh-chs.json b/src/locales/zh-chs.json index f5cb506d..c6cb19ec 100644 --- a/src/locales/zh-chs.json +++ b/src/locales/zh-chs.json @@ -44,6 +44,23 @@ "sub-title": "优雅的中后台集成方案", "title": "D2 Admin" }, + "help": { + "button": "需要帮助吗", + "dialog": { + "link": { + "text": { + "doc": "文档", + "issues": "历史提问", + "new-issue": "在 Github 提问" + } + }, + "sub-title": { + "doc": "这里有一些参考资料", + "join-chat-group": "询问其它使用者或作者" + }, + "title": "帮助" + } + }, "page": { "link": { "href": { diff --git a/src/locales/zh-cht.json b/src/locales/zh-cht.json index c88715da..33b4585e 100644 --- a/src/locales/zh-cht.json +++ b/src/locales/zh-cht.json @@ -44,6 +44,23 @@ "sub-title": "優雅的中後台集成方案", "title": "D2 Admin" }, + "help": { + "button": "需要幫助嗎", + "dialog": { + "link": { + "text": { + "doc": "文檔", + "issues": "歷史提問", + "new-issue": "在 Github 提問" + } + }, + "sub-title": { + "doc": "這裡有一些參考資料", + "join-chat-group": "詢問其它使用者或作者" + }, + "title": "幫助" + } + }, "page": { "link": { "href": { diff --git a/src/views/system/index/components/d2-help/image/qq.jpg.REMOVED.git-id b/src/views/system/index/components/d2-help/image/qq.jpg.REMOVED.git-id new file mode 100644 index 00000000..a957a237 --- /dev/null +++ b/src/views/system/index/components/d2-help/image/qq.jpg.REMOVED.git-id @@ -0,0 +1 @@ +b27de32f6832b50dc5b8b1dc613060a81f88a8e9 \ No newline at end of file diff --git a/src/views/system/index/components/d2-help/image/we.jpg.REMOVED.git-id b/src/views/system/index/components/d2-help/image/we.jpg.REMOVED.git-id new file mode 100644 index 00000000..b485920f --- /dev/null +++ b/src/views/system/index/components/d2-help/image/we.jpg.REMOVED.git-id @@ -0,0 +1 @@ +12bb778e8779f32a46ee756e6dbb890024b40f5d \ No newline at end of file diff --git a/src/views/system/index/components/d2-help/index.vue b/src/views/system/index/components/d2-help/index.vue new file mode 100644 index 00000000..1a5759d5 --- /dev/null +++ b/src/views/system/index/components/d2-help/index.vue @@ -0,0 +1,58 @@ + + + diff --git a/src/views/system/index/page.vue b/src/views/system/index/page.vue index d457561d..d8b31d0d 100644 --- a/src/views/system/index/page.vue +++ b/src/views/system/index/page.vue @@ -35,6 +35,7 @@ + @@ -42,10 +43,12 @@ + +