From 84b09f0dd09878f12a1ee365c18f88366513c938 Mon Sep 17 00:00:00 2001
From: shangbin <shangbin03@meituan.com>
Date: Mon, 13 Dec 2021 18:58:30 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E9=80=82=E9=85=8Dantd-vue3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                 | 178 ++++++++++++++++++++++++------
 package.json                      |  10 +-
 src/main.js                       |   4 +
 src/rawComponents/antd/button.vue |  54 +++------
 4 files changed, 167 insertions(+), 79 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 068719b..0847487 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,6 +4,40 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@ant-design/colors": {
+      "version": "6.0.0",
+      "resolved": "https://r.cnpmjs.org/@ant-design/colors/download/@ant-design/colors-6.0.0.tgz",
+      "integrity": "sha1-m5NmJXz/zEfbQrnQIDu1ksE8Apg=",
+      "requires": {
+        "@ctrl/tinycolor": "^3.4.0"
+      }
+    },
+    "@ant-design/icons-svg": {
+      "version": "4.2.1",
+      "resolved": "https://r.cnpmjs.org/@ant-design/icons-svg/download/@ant-design/icons-svg-4.2.1.tgz",
+      "integrity": "sha1-hjDajrRHGkqr2u19H/apfcss8Fo="
+    },
+    "@ant-design/icons-vue": {
+      "version": "6.0.1",
+      "resolved": "https://r.cnpmjs.org/@ant-design/icons-vue/download/@ant-design/icons-vue-6.0.1.tgz",
+      "integrity": "sha1-nYBMPHTSz6+XyxjlgtO5QAk09f0=",
+      "requires": {
+        "@ant-design/colors": "^5.0.0",
+        "@ant-design/icons-svg": "^4.0.0",
+        "@types/lodash": "^4.14.165",
+        "lodash": "^4.17.15"
+      },
+      "dependencies": {
+        "@ant-design/colors": {
+          "version": "5.1.1",
+          "resolved": "https://r.cnpmjs.org/@ant-design/colors/download/@ant-design/colors-5.1.1.tgz",
+          "integrity": "sha1-gAshhrHifmZDLmfQPtlq8+IdiUA=",
+          "requires": {
+            "@ctrl/tinycolor": "^3.3.1"
+          }
+        }
+      }
+    },
     "@babel/code-frame": {
       "version": "7.16.0",
       "resolved": "https://r.cnpmjs.org/@babel/code-frame/download/@babel/code-frame-7.16.0.tgz",
@@ -1128,6 +1162,11 @@
         "to-fast-properties": "^2.0.0"
       }
     },
+    "@ctrl/tinycolor": {
+      "version": "3.4.0",
+      "resolved": "https://r.cnpmjs.org/@ctrl/tinycolor/download/@ctrl/tinycolor-3.4.0.tgz",
+      "integrity": "sha1-w8WuVDyJfKqcKmhjC+01W+X5mQ8="
+    },
     "@element-plus/icons": {
       "version": "0.0.11",
       "resolved": "https://rg.cnpmjs.org/@element-plus/icons/download/@element-plus/icons-0.0.11.tgz",
@@ -1259,6 +1298,15 @@
         "any-observable": "^0.3.0"
       }
     },
+    "@simonwep/pickr": {
+      "version": "1.8.2",
+      "resolved": "https://r.cnpmjs.org/@simonwep/pickr/download/@simonwep/pickr-1.8.2.tgz",
+      "integrity": "sha1-ltyGZ1lA18rWPWnCIIPdHLuXl8s=",
+      "requires": {
+        "core-js": "^3.15.1",
+        "nanopop": "^2.1.0"
+      }
+    },
     "@soda/friendly-errors-webpack-plugin": {
       "version": "1.8.1",
       "resolved": "https://r.cnpmjs.org/@soda/friendly-errors-webpack-plugin/download/@soda/friendly-errors-webpack-plugin-1.8.1.tgz",
@@ -1411,6 +1459,11 @@
       "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
       "dev": true
     },
+    "@types/lodash": {
+      "version": "4.14.178",
+      "resolved": "https://rg.cnpmjs.org/@types/lodash/download/@types/lodash-4.14.178.tgz",
+      "integrity": "sha512-0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw=="
+    },
     "@types/mime": {
       "version": "1.3.2",
       "resolved": "https://r.cnpmjs.org/@types/mime/download/@types/mime-1.3.2.tgz",
@@ -2414,46 +2467,29 @@
         "color-convert": "^1.9.0"
       }
     },
-<<<<<<< HEAD
     "ant-design-vue": {
-      "version": "1.7.8",
-      "resolved": "https://rg.cnpmjs.org/ant-design-vue/download/ant-design-vue-1.7.8.tgz",
-      "integrity": "sha1-Grv4a2ik9bEAC+oEh7gDHcAAFmE=",
+      "version": "3.0.0-alpha.14",
+      "resolved": "https://rg.cnpmjs.org/ant-design-vue/download/ant-design-vue-3.0.0-alpha.14.tgz",
+      "integrity": "sha512-PmK8I90CMEwij+wFU52nPFi5PgRNlEzyHoF7gB2a7fU5m248OhTorQ9Rv3QqBwC1kjp4a2GpaFR2uvP0Mbu70Q==",
       "requires": {
-        "@ant-design/icons": "^2.1.1",
-        "@ant-design/icons-vue": "^2.0.0",
-        "@simonwep/pickr": "~1.7.0",
-        "add-dom-event-listener": "^1.0.2",
+        "@ant-design/colors": "^6.0.0",
+        "@ant-design/icons-vue": "^6.0.0",
+        "@babel/runtime": "^7.10.5",
+        "@simonwep/pickr": "~1.8.0",
         "array-tree-filter": "^2.1.0",
-        "async-validator": "^3.0.3",
-        "babel-helper-vue-jsx-merge-props": "^2.0.3",
-        "babel-runtime": "6.x",
-        "classnames": "^2.2.5",
-        "component-classes": "^1.2.6",
-        "dom-align": "^1.10.4",
-        "dom-closest": "^0.2.0",
+        "async-validator": "^4.0.0",
+        "dayjs": "^1.10.5",
+        "dom-align": "^1.12.1",
         "dom-scroll-into-view": "^2.0.0",
-        "enquire.js": "^2.1.6",
-        "intersperse": "^1.0.0",
-        "is-mobile": "^2.2.1",
-        "is-negative-zero": "^2.0.0",
-        "ismobilejs": "^1.0.0",
-        "json2mq": "^0.2.0",
-        "lodash": "^4.17.5",
-        "moment": "^2.21.0",
-        "mutationobserver-shim": "^0.3.2",
-        "node-emoji": "^1.10.0",
-        "omit.js": "^1.0.0",
-        "raf": "^3.4.0",
+        "lodash": "^4.17.21",
+        "lodash-es": "^4.17.15",
         "resize-observer-polyfill": "^1.5.1",
+        "scroll-into-view-if-needed": "^2.2.25",
         "shallow-equal": "^1.0.0",
-        "shallowequal": "^1.0.2",
-        "vue-ref": "^2.0.0",
+        "vue-types": "^3.0.0",
         "warning": "^4.0.0"
       }
     },
-=======
->>>>>>> vue3
     "any-observable": {
       "version": "0.3.0",
       "resolved": "https://r.cnpmjs.org/any-observable/download/any-observable-0.3.0.tgz",
@@ -2540,6 +2576,11 @@
         "is-string": "^1.0.7"
       }
     },
+    "array-tree-filter": {
+      "version": "2.1.0",
+      "resolved": "https://r.cnpmjs.org/array-tree-filter/download/array-tree-filter-2.1.0.tgz",
+      "integrity": "sha1-hzrAD+yDdJ8lWsjdCDgUtPYykZA="
+    },
     "array-union": {
       "version": "1.0.2",
       "resolved": "https://r.cnpmjs.org/array-union/download/array-union-1.0.2.tgz",
@@ -3915,6 +3956,11 @@
         }
       }
     },
+    "compute-scroll-into-view": {
+      "version": "1.0.17",
+      "resolved": "https://r.cnpmjs.org/compute-scroll-into-view/download/compute-scroll-into-view-1.0.17.tgz",
+      "integrity": "sha1-aojxis2dQunPS6pr7H4FImB6t6s="
+    },
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://r.cnpmjs.org/concat-map/download/concat-map-0.0.1.tgz",
@@ -4190,8 +4236,7 @@
     "core-js": {
       "version": "3.19.3",
       "resolved": "https://rg.cnpmjs.org/core-js/download/core-js-3.19.3.tgz",
-      "integrity": "sha512-LeLBMgEGSsG7giquSzvgBrTS7V5UL6ks3eQlUSbN8dJStlLFiRzUm5iqsRyzUB8carhfKjkJ2vzKqE6z1Vga9g==",
-      "dev": true
+      "integrity": "sha512-LeLBMgEGSsG7giquSzvgBrTS7V5UL6ks3eQlUSbN8dJStlLFiRzUm5iqsRyzUB8carhfKjkJ2vzKqE6z1Vga9g=="
     },
     "core-js-compat": {
       "version": "3.19.3",
@@ -5026,6 +5071,11 @@
         "esutils": "^2.0.2"
       }
     },
+    "dom-align": {
+      "version": "1.12.2",
+      "resolved": "https://r.cnpmjs.org/dom-align/download/dom-align-1.12.2.tgz",
+      "integrity": "sha1-D4Fk69DJwhsMeQMQSTzYVYkqzUs="
+    },
     "dom-converter": {
       "version": "0.2.0",
       "resolved": "https://r.cnpmjs.org/dom-converter/download/dom-converter-0.2.0.tgz",
@@ -5035,6 +5085,11 @@
         "utila": "~0.4"
       }
     },
+    "dom-scroll-into-view": {
+      "version": "2.0.1",
+      "resolved": "https://r.cnpmjs.org/dom-scroll-into-view/download/dom-scroll-into-view-2.0.1.tgz",
+      "integrity": "sha1-DezIUigB/Y0/HGujVadNOCxfmJs="
+    },
     "dom-serializer": {
       "version": "0.2.2",
       "resolved": "https://r.cnpmjs.org/dom-serializer/download/dom-serializer-0.2.2.tgz",
@@ -7932,8 +7987,7 @@
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://r.cnpmjs.org/js-tokens/download/js-tokens-4.0.0.tgz",
-      "integrity": "sha1-GSA/tZmR35jjoocFDUZHzerzJJk=",
-      "dev": true
+      "integrity": "sha1-GSA/tZmR35jjoocFDUZHzerzJJk="
     },
     "js-yaml": {
       "version": "3.14.1",
@@ -8751,6 +8805,14 @@
       "integrity": "sha512-G6A/nJLRgWOuuwdNuA6koovfEV1YpqqAG4pRUlFaz3jj2QNZ8M4vBqnVA+HBTmU/AMNUtlOsMmSpF6NyOjztbA==",
       "dev": true
     },
+    "loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://r.cnpmjs.org/loose-envify/download/loose-envify-1.4.0.tgz",
+      "integrity": "sha1-ce5R+nvkyuwaY4OffmgtgTLTDK8=",
+      "requires": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      }
+    },
     "lower-case": {
       "version": "1.1.4",
       "resolved": "https://r.cnpmjs.org/lower-case/download/lower-case-1.1.4.tgz",
@@ -9147,6 +9209,11 @@
         "to-regex": "^3.0.1"
       }
     },
+    "nanopop": {
+      "version": "2.1.0",
+      "resolved": "https://r.cnpmjs.org/nanopop/download/nanopop-2.1.0.tgz",
+      "integrity": "sha1-I0dlE87iQFiIr9LopLVAZrcLnmA="
+    },
     "natural-compare": {
       "version": "1.4.0",
       "resolved": "https://r.cnpmjs.org/natural-compare/download/natural-compare-1.4.0.tgz",
@@ -11507,6 +11574,11 @@
       "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
       "dev": true
     },
+    "resize-observer-polyfill": {
+      "version": "1.5.1",
+      "resolved": "https://r.cnpmjs.org/resize-observer-polyfill/download/resize-observer-polyfill-1.5.1.tgz",
+      "integrity": "sha1-DpAg3T0hAkRY1OvSfiPkAmmBBGQ="
+    },
     "resolve": {
       "version": "1.20.0",
       "resolved": "https://r.cnpmjs.org/resolve/download/resolve-1.20.0.tgz",
@@ -11698,6 +11770,14 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "scroll-into-view-if-needed": {
+      "version": "2.2.28",
+      "resolved": "https://r.cnpmjs.org/scroll-into-view-if-needed/download/scroll-into-view-if-needed-2.2.28.tgz",
+      "integrity": "sha1-WhWy9YpSZCyIyOylhGROAXA9ZFo=",
+      "requires": {
+        "compute-scroll-into-view": "^1.0.17"
+      }
+    },
     "select-hose": {
       "version": "2.0.0",
       "resolved": "https://r.cnpmjs.org/select-hose/download/select-hose-2.0.0.tgz",
@@ -11914,6 +11994,11 @@
         "kind-of": "^6.0.2"
       }
     },
+    "shallow-equal": {
+      "version": "1.2.1",
+      "resolved": "https://r.cnpmjs.org/shallow-equal/download/shallow-equal-1.2.1.tgz",
+      "integrity": "sha1-TBar+lYEOqINBQMk76aJQLDaedo="
+    },
     "shebang-command": {
       "version": "1.2.0",
       "resolved": "https://r.cnpmjs.org/shebang-command/download/shebang-command-1.2.0.tgz",
@@ -13641,6 +13726,21 @@
       "integrity": "sha1-HuO8mhbsv1EYvjNLsV+cRvgvWCU=",
       "dev": true
     },
+    "vue-types": {
+      "version": "3.0.2",
+      "resolved": "https://r.cnpmjs.org/vue-types/download/vue-types-3.0.2.tgz",
+      "integrity": "sha1-7BbgXUEsA4Ji/B76TOuWR+f7YB0=",
+      "requires": {
+        "is-plain-object": "3.0.1"
+      },
+      "dependencies": {
+        "is-plain-object": {
+          "version": "3.0.1",
+          "resolved": "https://r.cnpmjs.org/is-plain-object/download/is-plain-object-3.0.1.tgz",
+          "integrity": "sha1-Zi2S0kwKpDAkB7DUXSHyJRyF+Fs="
+        }
+      }
+    },
     "vuedraggable": {
       "version": "4.1.0",
       "resolved": "https://rg.cnpmjs.org/vuedraggable/download/vuedraggable-4.1.0.tgz",
@@ -13657,6 +13757,14 @@
         "@vue/devtools-api": "^6.0.0-beta.11"
       }
     },
+    "warning": {
+      "version": "4.0.3",
+      "resolved": "https://r.cnpmjs.org/warning/download/warning-4.0.3.tgz",
+      "integrity": "sha1-Fungd+uKhtavfWSqHgX9hbRnjKM=",
+      "requires": {
+        "loose-envify": "^1.0.0"
+      }
+    },
     "watchpack": {
       "version": "1.7.5",
       "resolved": "https://rg.cnpmjs.org/watchpack/download/watchpack-1.7.5.tgz",
diff --git a/package.json b/package.json
index 9b1823e..d8a42bb 100644
--- a/package.json
+++ b/package.json
@@ -22,17 +22,17 @@
     "debugParser": "node ./src/test/parserJsCode.js"
   },
   "dependencies": {
-    "ant-design-vue": "^1.7.8",
     "@element-plus/icons": "0.0.11",
     "@vitejs/plugin-vue": "^1.10.0",
     "@vue/compiler-sfc": "^3.2.22",
+    "ant-design-vue": "^3.0.0-alpha.14",
     "axios": "^0.21.4",
     "codemirror-editor-vue3": "^0.2.4",
     "copy-to-clipboard": "^3.3.1",
     "crypto-random-string": "^3.3.1",
     "css": "^3.0.0",
-    "element-plus": "^1.2.0-beta.3",
     "css-scoped": "^1.0.0",
+    "element-plus": "^1.2.0-beta.3",
     "escodegen": "^2.0.0",
     "espree": "^7.3.0",
     "eventemitter3": "^4.0.7",
@@ -47,10 +47,10 @@
     "vant": "^2.10.7",
     "vite": "^2.6.14",
     "vue": "^3.2.22",
-    "vuedraggable": "^4.1.0",
-    "vuex": "^4.0.2",
+    "vue-github-button": "^1.3.0",
     "vue-template-compiler": "^2.6.14",
-    "vue-github-button": "^1.3.0"
+    "vuedraggable": "^4.1.0",
+    "vuex": "^4.0.2"
   },
   "devDependencies": {
     "@babel/generator": "^7.11.6",
diff --git a/src/main.js b/src/main.js
index 5d21b76..f649ed5 100644
--- a/src/main.js
+++ b/src/main.js
@@ -5,9 +5,13 @@ import { QuestionFilled, CirclePlus, DocumentCopy, Delete, Refresh, Minus } from
 import "element-plus/dist/index.css";
 import APP from "./App.vue";
 
+import Antd from 'ant-design-vue';
+import 'ant-design-vue/dist/antd.css';
+
 function createBaseApp(renderComponent = {}) {
   const app = createApp(renderComponent);
   app.use(ElementPlus);
+  app.use(Antd);
 
   app.component("question-filled", QuestionFilled);
   app.component("circle-plus", CirclePlus);
diff --git a/src/rawComponents/antd/button.vue b/src/rawComponents/antd/button.vue
index ae260cb..cbd249a 100644
--- a/src/rawComponents/antd/button.vue
+++ b/src/rawComponents/antd/button.vue
@@ -3,51 +3,27 @@
     <div lc_id="jr3zjZhDqz">
       <div class="demonstration-antd" lc_id="fRuphkeIKC">Button 按钮</div>
       <div lc_id="k+t156NFRt">
-        <a-button type="primary" lc-mark lc_id="NT+hTWS70C">Primary</a-button>
-        <a-button lc-mark lc_id="H0OdlntRuU">Default</a-button>
-        <a-button type="dashed" lc-mark lc_id="HfCkDXAjeL">Dashed</a-button>
-        <a-button type="danger" lc-mark lc_id="E40JXI4Cy0">Danger</a-button>
-        <a-config-provider :auto-insert-space-in-button="false" lc-mark lc_id="oyVejV1NjF">
-          <a-button type="primary" lc_id="2FflgjN2k0">按钮</a-button>
-        </a-config-provider>
-        <a-button type="primary" lc-mark lc_id="tyIuitGX1x">按钮</a-button>
-        <a-button type="link" lc-mark lc_id="4heYqBMoxv">Link</a-button>
+        <a-button lc-mark type="primary">Primary Button</a-button>
+        <a-button lc-mark>Default Button</a-button>
+        <a-button lc-mark type="dashed">Dashed Button</a-button>
+        <a-button lc-mark type="text">Text Button</a-button>
+        <a-button lc-mark type="link">Link Button</a-button>
+
+        <a-button lc-mark type="primary" danger>Primary</a-button>
+        <a-button lc-mark danger>Default</a-button>
       </div>
     </div>
     <div lc_id="O9JGjMpAKq">
       <div class="demonstration-antd" lc_id="4rqJIQ2Mzz">ButtonGroup 按钮组</div>
       <div lc_id="pONPOBBNro">
-        <a-button-group lc-mark lc_id="Ou7TN/X5cu">
-          <a-button lc_id="v5cwPJqlSK">Cancel</a-button>
-          <a-button type="primary" lc_id="kVmP3mlW9o">OK</a-button>
-        </a-button-group>
-        <a-button-group lc_id="0mCSL8qPRS">
-          <a-button disabled lc_id="1Gghgrmucm">L</a-button>
-          <a-button disabled lc_id="G3Hnc0O355">M</a-button>
-          <a-button disabled lc_id="0/6bzjO5xc">R</a-button>
-        </a-button-group>
-        <a-button-group lc_id="FHndrH667q">
-          <a-button type="primary" lc_id="wgenNoPVkg">L</a-button>
-          <a-button lc_id="UwftiZkKU1">M</a-button>
-          <a-button lc_id="I1OCAcVowf">M</a-button>
-          <a-button type="dashed" lc_id="R3iHWxC0kN">R</a-button>
-        </a-button-group>
-        <a-button-group lc-mark lc_id="GrY4whWnQs">
-          <a-button type="primary" lc_id="HwKnK5eGeM">
-            <a-icon type="left" lc_id="LsiVRANHOs">Go back</a-icon>
-          </a-button>
-          <a-button type="primary" lc_id="rWXCxtsc9U">
-            Go forward <a-icon type="right" lc_id="djTXwQkA3n"></a-icon>
-          </a-button>
-        </a-button-group>
-        <a-button-group lc-mark lc_id="zt68434RkC">
-          <a-button type="primary" icon="cloud" lc_id="hUkxSWHSXD">
-            <a-button type="primary" icon="cloud-download" lc_id="1xvGiQ+xtD"></a-button>
-          </a-button>
-        </a-button-group>
+        <a-button lc-mark type="primary" block>Primary</a-button>
+        <a-button lc-mark block>Default</a-button>
+        <a-button lc-mark type="dashed" block>Dashed</a-button>
+        <a-button lc-mark danger block>Danger</a-button>
+        <a-button lc-mark type="link" block>Link</a-button>
       </div>
     </div>
-</div>
+  </div>
 
 </template>
 <script>
@@ -71,7 +47,7 @@ export default {
     onButtonClick() { },
   },
   fillter: {},
-}  
+}
 </script>
 <style scoped>
 .container {