From 1fe41fa768a3df03e3e58c4709a68783f3288202 Mon Sep 17 00:00:00 2001 From: shangbin Date: Fri, 10 Dec 2021 18:30:03 +0800 Subject: [PATCH] fix: all elementui problem --- master_vue3.diff | 1847 +++++++++++++++++++++++ src/rawComponents/element/container.vue | 8 +- src/rawComponents/element/final.vue | 8 +- src/rawComponents/element/form-base.vue | 219 +-- src/rawComponents/element/icon.vue | 24 +- src/rawComponents/element/index.vue | 36 +- 6 files changed, 2010 insertions(+), 132 deletions(-) create mode 100644 master_vue3.diff diff --git a/master_vue3.diff b/master_vue3.diff new file mode 100644 index 0000000..8643c9f --- /dev/null +++ b/master_vue3.diff @@ -0,0 +1,1847 @@ +diff --git a/package.json b/package.json +index 4d30ebf..481c92d 100644 +--- a/package.json ++++ b/package.json +@@ -9,7 +9,8 @@ + ], + "main": "./dist/vcc.umd.min.js", + "scripts": { +- "serve": "vue-cli-service serve --open --port 8008", ++ "dev": "vite --port 8008", ++ "serve": "vite --port 8008", + "build:release": "vue-cli-service build", + "build": "vue-cli-service build --report --target lib --name vcc './src/components-v2/VCC.vue' && node ./src/script/distClear.js", + "build:win": "vue-cli-service build --report --target lib --name vcc ./src/components-v2/VCC.vue && node ./src/script/distClear.js", +@@ -21,13 +22,16 @@ + "debugParser": "node ./src/test/parserJsCode.js" + }, + "dependencies": { +- "ant-design-vue": "^1.7.2", ++ "@element-plus/icons": "0.0.11", ++ "@vitejs/plugin-vue": "^1.10.0", ++ "@vue/compiler-sfc": "^3.2.22", + "axios": "^0.21.4", ++ "codemirror-editor-vue3": "^0.2.4", + "copy-to-clipboard": "^3.3.1", +- "crypto-random-string": "^3.3.0", ++ "crypto-random-string": "^3.3.1", + "css": "^3.0.0", ++ "element-plus": "^1.2.0-beta.3", + "css-scoped": "^1.0.0", +- "element-ui": "^2.15.6", + "escodegen": "^2.0.0", + "espree": "^7.3.0", + "eventemitter3": "^4.0.7", +@@ -35,16 +39,17 @@ + "fs-extra": "^9.0.1", + "glob": "^7.1.6", + "keymaster": "^1.6.2", +- "lodash": "^4.17.20", ++ "lodash-es": "^4.17.21", ++ "nanoid": "^3.1.30", + "prettier": "^2.4.0", +- "prismjs": "^1.20.0", + "split.js": "^1.6.2", +- "stringify-object": "^3.3.0", + "vant": "^2.10.7", +- "vue": "^2.6.14", +- "vue-codemirror": "^4.0.6", +- "vue-github-button": "^1.3.0", +- "vue-nestable": "^2.6.0" ++ "vite": "^2.6.14", ++ "vue": "^3.2.22", ++ "vuedraggable": "^4.1.0", ++ "vuex": "^4.0.2", ++ "vue-template-compiler": "^2.6.14", ++ "vue-github-button": "^1.3.0" + }, + "devDependencies": { + "@babel/generator": "^7.11.6", +@@ -60,7 +65,8 @@ + "lint-staged": "^9.5.0", + "sass": "^1.25.0", + "sass-loader": "^8.0.2", +- "vue-template-compiler": "^2.6.14" ++ "is-obj": "^3.0.0", ++ "is-regexp": "^3.0.0" + }, + "eslintConfig": { + "root": true, +diff --git a/public/index.html b/public/index.html +index 851ae63..2d5bb51 100644 +--- a/public/index.html ++++ b/public/index.html +@@ -11,7 +11,7 @@ + +-
++
+ + + +diff --git a/src/App.vue b/src/App.vue +index 272d6ee..7122e26 100644 +--- a/src/App.vue ++++ b/src/App.vue +@@ -3,12 +3,13 @@ + + + ++ +\ No newline at end of file +diff --git a/src/libs/bundle-core-esm.js b/src/libs/bundle-core-esm.js +index bd90e71..784c93d 100644 +--- a/src/libs/bundle-core-esm.js ++++ b/src/libs/bundle-core-esm.js +@@ -1,16 +1,15 @@ + //该文件会遍历Object,获取关键的class,事件,data, 最终拼装为一个完整的SFC文件 +- +-import stringifyObject from 'stringify-object'; +-import _ from 'lodash'; ++import stringifyObject from '@/libs/stringify-object' ++import merge from 'lodash-es/merge'; ++import cloneDeep from 'lodash-es/cloneDeep'; + import prettier from 'prettier/standalone.js'; + import parserBabel from 'prettier/parser-babel.js'; + + // 导出组件模板文件 + + function vueTemplate () { +- return ` +-