From 173a14d50b4d5bd699f1af59849b02ce64801c05 Mon Sep 17 00:00:00 2001 From: rongxingsun Date: Mon, 10 Jun 2019 13:43:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E9=A2=9C=E8=89=B2build?= =?UTF-8?q?=E6=97=B6=E6=8A=A5=E9=94=99=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 768fabdf4d364bfce679d3572b206f5f1777aacc [formerly 768fabdf4d364bfce679d3572b206f5f1777aacc [formerly 768fabdf4d364bfce679d3572b206f5f1777aacc [formerly 768fabdf4d364bfce679d3572b206f5f1777aacc [formerly 72b3934dd49c7b6d71c9b1c9d00d5de8c03db2fb [formerly bcad0db545c4fadcc7001347893a893079d11d5d]]]]] Former-commit-id: b3343ec2b44275d1426d6514be5484b2c3647822 Former-commit-id: f86eba05d51b33b7569c8094d467a23c594c1a70 Former-commit-id: 3720ab63c219d7be6ca57a20ef0cc6df04d06bd2 [formerly c315e84bb96d806f641a1771bd229f71a38e1996] Former-commit-id: fa57cfb3ea4e091db8f4021d07c59a285b380ad5 Former-commit-id: 5d30ae8f09f2a1678176d3bc5aa80050159d3ce7 Former-commit-id: edf2e6102189f083eb3747066fcebfbb613a0889 Former-commit-id: 5ac7f68fe4eea940b5c2db19b4b825a79bd55144 Former-commit-id: 74abf0f02d647d54a0db5a1ff76746e073565a4d --- package.json | 46 +++++++++---------- .../components/header-color/index.vue | 2 +- vue.config.js | 5 ++ yarn.lock.REMOVED.git-id | 2 +- 4 files changed, 29 insertions(+), 26 deletions(-) diff --git a/package.json b/package.json index 95f3f592..23cbf612 100644 --- a/package.json +++ b/package.json @@ -15,22 +15,21 @@ }, "dependencies": { "@d2-admin/filters-dayjs": "^1.0.3", - "@d2-projects/d2-crud": "^2.0.5", + "@d2-projects/d2-crud": "^2.1.1", "@d2-projects/vue-table-export": "^1.0.1", "@d2-projects/vue-table-import": "^1.0.0", - "axios": "^0.18.0", + "axios": "^0.19.0", "better-scroll": "^1.15.2", - "clipboard-polyfill": "^2.8.0", - "core-js": "^2.6.5", + "clipboard-polyfill": "^2.8.1", "countup.js": "^2.0.4", - "dayjs": "^1.8.12", + "dayjs": "^1.8.14", "echarts": "^4.2.1", "element-ui": "^2.9.1", "flex.css": "^1.1.7", - "fuse.js": "^3.4.4", + "fuse.js": "^3.4.5", "github-markdown-css": "^3.0.1", - "highlight.js": "^9.15.6", - "hotkeys-js": "^3.6.2", + "highlight.js": "^9.15.8", + "hotkeys-js": "^3.6.11", "js-cookie": "^2.2.0", "lodash": "^4.17.11", "lowdb": "^1.0.0", @@ -41,38 +40,37 @@ "quill": "^1.3.6", "screenfull": "^4.2.0", "simplemde": "^1.11.2", - "ua-parser-js": "^0.7.19", + "ua-parser-js": "^0.7.20", "v-charts": "^1.19.0", "v-contextmenu": "^2.8.0", "vue": "^2.6.10", "vue-grid-layout": "^2.3.4", - "vue-i18n": "^8.0.0", + "vue-i18n": "^8.11.2", "vue-json-tree-view": "^2.1.4", - "vue-router": "^3.0.3", + "vue-router": "^3.0.6", "vue-splitpane": "^1.0.4", "vue-ueditor-wrap": "^2.4.1", - "vuex": "^3.0.1" + "vuex": "^3.1.1" }, "devDependencies": { "@kazupon/vue-i18n-loader": "^0.3.0", - "@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/cli-plugin-babel": "^3.8.0", + "@vue/cli-plugin-eslint": "^3.8.0", + "@vue/cli-plugin-unit-jest": "^3.8.0", + "@vue/cli-service": "^3.8.0", "@vue/eslint-config-standard": "^4.0.0", "@vue/test-utils": "1.0.0-beta.29", - "babel-core": "7.0.0-bridge.0", "babel-eslint": "^10.0.1", - "babel-jest": "^23.6.0", + "babel-jest": "^24.8.0", "eslint": "^5.16.0", - "eslint-plugin-vue": "^5.0.0", - "sass": "^1.18.0", + "eslint-plugin-vue": "^5.2.2", + "sass": "^1.21.0", "sass-loader": "^7.1.0", - "svg-sprite-loader": "^4.1.3", + "svg-sprite-loader": "^4.1.6", "text-loader": "0.0.1", - "uglifyjs-webpack-plugin": "^2.1.2", + "uglifyjs-webpack-plugin": "^2.1.3", "vue-cli-plugin-i18n": "^0.6.0", - "vue-template-compiler": "^2.5.21", - "webpack-theme-color-replacer": "^1.2.1" + "vue-template-compiler": "^2.6.10", + "webpack-theme-color-replacer": "^1.2.5" } } diff --git a/src/layout/header-aside/components/header-color/index.vue b/src/layout/header-aside/components/header-color/index.vue index dfac4060..fc956dc2 100644 --- a/src/layout/header-aside/components/header-color/index.vue +++ b/src/layout/header-aside/components/header-color/index.vue @@ -34,7 +34,7 @@ export default { oldColors: [...forElementUI.getElementUISeries(curColor)], newColors: [...forElementUI.getElementUISeries(newColor)] } - client.changer.changeColor(options, Promise) + client.changer.changeColor(options) } } } diff --git a/vue.config.js b/vue.config.js index cf540f99..316e2d13 100644 --- a/vue.config.js +++ b/vue.config.js @@ -29,6 +29,10 @@ module.exports = { } } }, + // node_modules 需要babel成es5的包 + transpileDependencies: [ + 'webpack-theme-color-replacer' + ], configureWebpack: { plugins: [ new ThemeColorReplacer({ @@ -36,6 +40,7 @@ module.exports = { matchColors: [ ...forElementUI.getElementUISeries(process.env.VUE_APP_ELEMENT_COLOR) // Element-ui主色系列 ], + externalCssFiles: ['./node_modules/element-ui/lib/theme-chalk/index.css'], // optional, String or string array. Set external css files (such as cdn css) to extract colors. changeSelector: forElementUI.changeSelector }) ] diff --git a/yarn.lock.REMOVED.git-id b/yarn.lock.REMOVED.git-id index f7ddd3f3..048f4d17 100644 --- a/yarn.lock.REMOVED.git-id +++ b/yarn.lock.REMOVED.git-id @@ -1 +1 @@ -12deef00e0a1116ba0392a3851989164ee601528 \ No newline at end of file +b90ddad21ccad6e1a280693fba504af4a91c6fd3 \ No newline at end of file