From e8db3e31b4d689d7b29a605233b3e6fb95f45f2f Mon Sep 17 00:00:00 2001 From: shangbin Date: Mon, 13 Dec 2021 19:33:05 +0800 Subject: [PATCH] =?UTF-8?q?update:=20=E5=90=88=E5=B9=B6antd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 152 +++++++++++++++++++++++++++++++++++- package.json | 7 +- src/libs/UIComponentInit.js | 19 +++++ src/main.js | 17 +--- 4 files changed, 174 insertions(+), 21 deletions(-) create mode 100644 src/libs/UIComponentInit.js diff --git a/package-lock.json b/package-lock.json index 5a2c747..c7e1d6d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1120,7 +1120,6 @@ "version": "7.16.3", "resolved": "https://r.cnpmjs.org/@babel/runtime/download/@babel/runtime-7.16.3.tgz", "integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==", - "dev": true, "requires": { "regenerator-runtime": "^0.13.4" } @@ -1290,6 +1289,148 @@ "resolved": "https://rg.cnpmjs.org/@popperjs/core/download/@popperjs/core-2.11.0.tgz", "integrity": "sha512-zrsUxjLOKAzdewIDRWy9nsV1GQsKBCWaGwsZQlCgr6/q+vjyZhFgqedLfFBuI9anTPEUT4APq9Mu0SZBTzIcGQ==" }, + "@rollup/plugin-dynamic-import-vars": { + "version": "1.4.1", + "resolved": "https://rg.cnpmjs.org/@rollup/plugin-dynamic-import-vars/download/@rollup/plugin-dynamic-import-vars-1.4.1.tgz", + "integrity": "sha1-720ELNgmugXfaXXIomEnAM8IIM4=", + "dev": true, + "requires": { + "@rollup/pluginutils": "^3.1.0", + "estree-walker": "^2.0.1", + "globby": "^11.0.1", + "magic-string": "^0.25.7" + }, + "dependencies": { + "@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://r.cnpmjs.org/@nodelib/fs.stat/download/@nodelib/fs.stat-2.0.5.tgz", + "integrity": "sha1-W9Jir5Tp0lvR5xsF3u1Eh2oiLos=", + "dev": true + }, + "array-union": { + "version": "2.1.0", + "resolved": "https://r.cnpmjs.org/array-union/download/array-union-2.1.0.tgz", + "integrity": "sha1-t5hCCtvrHego2ErNii4j0+/oXo0=", + "dev": true + }, + "braces": { + "version": "3.0.2", + "resolved": "https://r.cnpmjs.org/braces/download/braces-3.0.2.tgz", + "integrity": "sha1-NFThpGLujVmeI23zNs2epPiv4Qc=", + "dev": true, + "requires": { + "fill-range": "^7.0.1" + } + }, + "dir-glob": { + "version": "3.0.1", + "resolved": "https://r.cnpmjs.org/dir-glob/download/dir-glob-3.0.1.tgz", + "integrity": "sha1-Vtv3PZkqSpO6FYT0U0Bj/S5BcX8=", + "dev": true, + "requires": { + "path-type": "^4.0.0" + } + }, + "fast-glob": { + "version": "3.2.7", + "resolved": "https://r.cnpmjs.org/fast-glob/download/fast-glob-3.2.7.tgz", + "integrity": "sha1-/Wy3otfpqnp4RhEehaGW1rL3ZqE=", + "dev": true, + "requires": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.4" + } + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://r.cnpmjs.org/fill-range/download/fill-range-7.0.1.tgz", + "integrity": "sha1-GRmmp8df44ssfHflGYU12prN2kA=", + "dev": true, + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "globby": { + "version": "11.0.4", + "resolved": "https://r.cnpmjs.org/globby/download/globby-11.0.4.tgz", + "integrity": "sha1-LLr/d8Lypi5x6bKBOme5ejowAaU=", + "dev": true, + "requires": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.1.1", + "ignore": "^5.1.4", + "merge2": "^1.3.0", + "slash": "^3.0.0" + } + }, + "ignore": { + "version": "5.1.9", + "resolved": "https://r.cnpmjs.org/ignore/download/ignore-5.1.9.tgz", + "integrity": "sha1-nsGly+jhRG7GDUQgBg1Dqm5zgvs=", + "dev": true + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://r.cnpmjs.org/is-number/download/is-number-7.0.0.tgz", + "integrity": "sha1-dTU0W4lnNNX4DE0GxQlVUnoU8Ss=", + "dev": true + }, + "micromatch": { + "version": "4.0.4", + "resolved": "https://r.cnpmjs.org/micromatch/download/micromatch-4.0.4.tgz", + "integrity": "sha1-iW1Rnf6dsl/OlM63pQCRm/iB6/k=", + "dev": true, + "requires": { + "braces": "^3.0.1", + "picomatch": "^2.2.3" + } + }, + "path-type": { + "version": "4.0.0", + "resolved": "https://r.cnpmjs.org/path-type/download/path-type-4.0.0.tgz", + "integrity": "sha1-hO0BwKe6OAr+CdkKjBgNzZ0DBDs=", + "dev": true + }, + "slash": { + "version": "3.0.0", + "resolved": "https://r.cnpmjs.org/slash/download/slash-3.0.0.tgz", + "integrity": "sha1-ZTm+hwwWWtvVJAIg2+Nh8bxNRjQ=", + "dev": true + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://r.cnpmjs.org/to-regex-range/download/to-regex-range-5.0.1.tgz", + "integrity": "sha1-FkjESq58jZiKMmAY7XL1tN0DkuQ=", + "dev": true, + "requires": { + "is-number": "^7.0.0" + } + } + } + }, + "@rollup/pluginutils": { + "version": "3.1.0", + "resolved": "https://r.cnpmjs.org/@rollup/pluginutils/download/@rollup/pluginutils-3.1.0.tgz", + "integrity": "sha1-cGtFJO5tyLEDs8mVUz5a1oDAK5s=", + "dev": true, + "requires": { + "@types/estree": "0.0.39", + "estree-walker": "^1.0.1", + "picomatch": "^2.2.2" + }, + "dependencies": { + "estree-walker": { + "version": "1.0.1", + "resolved": "https://r.cnpmjs.org/estree-walker/download/estree-walker-1.0.1.tgz", + "integrity": "sha1-MbxdYSyWtwQQa0d+bdXYqhOMtwA=", + "dev": true + } + } + }, "@samverschueren/stream-to-observable": { "version": "0.3.1", "resolved": "https://r.cnpmjs.org/@samverschueren/stream-to-observable/download/@samverschueren/stream-to-observable-0.3.1.tgz", @@ -1406,6 +1547,12 @@ "@types/node": "*" } }, + "@types/estree": { + "version": "0.0.39", + "resolved": "https://r.cnpmjs.org/@types/estree/download/@types/estree-0.0.39.tgz", + "integrity": "sha1-4Xfmme4bjCLSMXTKqnQiZEOJUJ8=", + "dev": true + }, "@types/express": { "version": "4.17.13", "resolved": "https://r.cnpmjs.org/@types/express/download/@types/express-4.17.13.tgz", @@ -11351,8 +11498,7 @@ "regenerator-runtime": { "version": "0.13.9", "resolved": "https://r.cnpmjs.org/regenerator-runtime/download/regenerator-runtime-0.13.9.tgz", - "integrity": "sha1-iSV0Kpj/2QgUmI11Zq0wyjsmO1I=", - "dev": true + "integrity": "sha1-iSV0Kpj/2QgUmI11Zq0wyjsmO1I=" }, "regenerator-transform": { "version": "0.14.5", diff --git a/package.json b/package.json index 6c8228f..a82d470 100644 --- a/package.json +++ b/package.json @@ -54,6 +54,7 @@ }, "devDependencies": { "@babel/generator": "^7.11.6", + "@rollup/plugin-dynamic-import-vars": "^1.4.1", "@vue/cli-plugin-babel": "^4.2.0", "@vue/cli-plugin-eslint": "^4.2.0", "@vue/cli-plugin-pwa": "^4.2.0", @@ -63,11 +64,11 @@ "eslint": "^6.7.2", "eslint-plugin-import": "^2.20.1", "eslint-plugin-vue": "^6.1.2", + "is-obj": "^3.0.0", + "is-regexp": "^3.0.0", "lint-staged": "^9.5.0", "sass": "^1.25.0", - "sass-loader": "^8.0.2", - "is-obj": "^3.0.0", - "is-regexp": "^3.0.0" + "sass-loader": "^8.0.2" }, "eslintConfig": { "root": true, diff --git a/src/libs/UIComponentInit.js b/src/libs/UIComponentInit.js new file mode 100644 index 0000000..50940f0 --- /dev/null +++ b/src/libs/UIComponentInit.js @@ -0,0 +1,19 @@ +// 其它UI组件库应该在这里集成 +function loadVant() { + const vantLoadPromise = (() => import("vant"))(); + (() => import("vant/lib/index.css"))(); + vantLoadPromise.then((vantModule) => { + self.globalApp.use(vantModule); + }); +} + +function loadAntD() { + const vantLoadPromise = (() => import("ant-design-vue"))(); + (() => import("ant-design-vue/dist/antd.css"))(); + vantLoadPromise.then((vantModule) => { + self.globalApp.use(vantModule); + }); +} + +loadAntD(); +loadVant(); diff --git a/src/main.js b/src/main.js index f895a53..3244a43 100644 --- a/src/main.js +++ b/src/main.js @@ -8,17 +8,13 @@ import { Refresh, Minus, } from "@element-plus/icons"; - import "element-plus/dist/index.css"; -import APP from "./App.vue"; -import Antd from 'ant-design-vue'; -import 'ant-design-vue/dist/antd.css'; +import APP from "./App.vue"; function createBaseApp(renderComponent = {}) { const app = createApp(renderComponent); app.use(ElementPlus); - app.use(Antd); app.component("question-filled", QuestionFilled); app.component("circle-plus", CirclePlus); @@ -38,13 +34,4 @@ self.createBaseApp = createBaseApp; self.globalApp = globalApp; // 内部需要使用Vuex import("@/libs/store.js"); - -function loadVant() { - const vantLoadPromise = (() => import("vant"))(); - (() => import("vant/lib/index.css"))(); - vantLoadPromise.then((vantModule) => { - self.globalApp.use(vantModule); - }); -} - -loadVant(); +import("@/libs/UIComponentInit.js"); \ No newline at end of file