From da39f3bc904ca2d80f432a31709725f9a57deb19 Mon Sep 17 00:00:00 2001
From: kailong321200875 <321200875@qq.com>
Date: Wed, 21 Sep 2022 10:47:42 +0800
Subject: [PATCH] fix: fix bug

---
 package.json                         | 50 ++++++++++++++--------------
 src/components/Dialog/src/Dialog.vue |  2 +-
 src/components/Editor/src/Editor.vue |  2 +-
 src/components/Form/src/Form.vue     |  4 ---
 4 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/package.json b/package.json
index 1ccd1a4..dbfccfd 100644
--- a/package.json
+++ b/package.json
@@ -26,27 +26,27 @@
     "p": "plop"
   },
   "dependencies": {
-    "@iconify/iconify": "^2.2.1",
-    "@vueuse/core": "^9.1.1",
-    "@wangeditor/editor": "^5.1.14",
+    "@iconify/iconify": "^3.0.0",
+    "@vueuse/core": "^9.2.0",
+    "@wangeditor/editor": "^5.1.18",
     "@wangeditor/editor-for-vue": "^5.1.10",
-    "@zxcvbn-ts/core": "^2.0.4",
+    "@zxcvbn-ts/core": "^2.0.5",
     "animate.css": "^4.1.1",
     "axios": "^0.27.2",
     "echarts": "^5.3.3",
     "echarts-wordcloud": "^2.0.0",
-    "element-plus": "2.2.15",
+    "element-plus": "2.2.17",
     "intro.js": "^6.0.0",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.0",
     "mockjs": "^1.1.0",
     "nprogress": "^0.2.0",
-    "pinia": "^2.0.21",
+    "pinia": "^2.0.22",
     "pinia-plugin-persist": "^1.0.0",
     "qrcode": "^1.5.1",
     "qs": "^6.11.0",
     "url": "^0.11.0",
-    "vue": "3.2.37",
+    "vue": "3.2.39",
     "vue-i18n": "9.2.2",
     "vue-router": "^4.1.5",
     "vue-types": "^4.2.1",
@@ -55,25 +55,25 @@
   "devDependencies": {
     "@commitlint/cli": "^17.1.2",
     "@commitlint/config-conventional": "^17.1.0",
-    "@iconify/json": "^2.1.100",
+    "@iconify/json": "^2.1.110",
     "@intlify/vite-plugin-vue-i18n": "^6.0.1",
     "@purge-icons/generated": "^0.9.0",
     "@types/intro.js": "^5.1.0",
     "@types/lodash-es": "^4.17.6",
-    "@types/node": "^18.7.13",
+    "@types/node": "^18.7.18",
     "@types/nprogress": "^0.2.0",
     "@types/qrcode": "^1.5.0",
     "@types/qs": "^6.9.7",
-    "@typescript-eslint/eslint-plugin": "^5.35.1",
-    "@typescript-eslint/parser": "^5.35.1",
-    "@vitejs/plugin-vue": "^3.0.3",
-    "@vitejs/plugin-vue-jsx": "^2.0.0",
-    "autoprefixer": "^10.4.8",
-    "eslint": "^8.23.0",
+    "@typescript-eslint/eslint-plugin": "^5.38.0",
+    "@typescript-eslint/parser": "^5.38.0",
+    "@vitejs/plugin-vue": "^3.1.0",
+    "@vitejs/plugin-vue-jsx": "^2.0.1",
+    "autoprefixer": "^10.4.12",
+    "eslint": "^8.23.1",
     "eslint-config-prettier": "^8.5.0",
-    "eslint-define-config": "^1.6.0",
+    "eslint-define-config": "^1.7.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-vue": "^9.4.0",
+    "eslint-plugin-vue": "^9.5.1",
     "husky": "^8.0.1",
     "less": "^4.1.3",
     "lint-staged": "^13.0.3",
@@ -83,24 +83,24 @@
     "postcss-less": "^6.0.0",
     "prettier": "^2.7.1",
     "rimraf": "^3.0.2",
-    "rollup": "^2.78.1",
-    "stylelint": "^14.11.0",
+    "rollup": "^2.79.0",
+    "stylelint": "^14.12.0",
     "stylelint-config-html": "^1.1.0",
     "stylelint-config-prettier": "^9.0.3",
     "stylelint-config-recommended": "^9.0.0",
     "stylelint-config-standard": "^28.0.0",
     "stylelint-order": "^5.0.0",
-    "typescript": "4.8.2",
-    "unplugin-vue-macros": "^0.11.0",
-    "vite": "3.0.9",
+    "typescript": "4.8.3",
+    "unplugin-vue-macros": "^0.11.2",
+    "vite": "3.1.3",
     "vite-plugin-eslint": "^1.8.1",
     "vite-plugin-html": "^3.2.0",
     "vite-plugin-mock": "^2.9.6",
-    "vite-plugin-purge-icons": "^0.9.0",
+    "vite-plugin-purge-icons": "^0.9.1",
     "vite-plugin-style-import": "2.0.0",
     "vite-plugin-svg-icons": "^2.0.1",
-    "vite-plugin-windicss": "^1.8.7",
-    "vue-tsc": "^0.40.4",
+    "vite-plugin-windicss": "^1.8.8",
+    "vue-tsc": "^0.40.13",
     "windicss": "^3.5.6",
     "windicss-analysis": "^0.3.5"
   },
diff --git a/src/components/Dialog/src/Dialog.vue b/src/components/Dialog/src/Dialog.vue
index 4e030ad..25d375b 100644
--- a/src/components/Dialog/src/Dialog.vue
+++ b/src/components/Dialog/src/Dialog.vue
@@ -72,7 +72,7 @@ const dialogStyle = computed(() => {
         </slot>
         <Icon
           v-if="fullscreen"
-          class="mr-18px cursor-pointer is-hover mt-2px"
+          class="mr-18px cursor-pointer is-hover mt-2px z-10"
           :icon="isFullscreen ? 'zmdi:fullscreen-exit' : 'zmdi:fullscreen'"
           color="var(--el-color-info)"
           @click="toggleFull"
diff --git a/src/components/Editor/src/Editor.vue b/src/components/Editor/src/Editor.vue
index 9254803..f45b096 100644
--- a/src/components/Editor/src/Editor.vue
+++ b/src/components/Editor/src/Editor.vue
@@ -116,7 +116,7 @@ defineExpose({
 </script>
 
 <template>
-  <div class="border-1 border-solid border-[var(--tags-view-border-color)]">
+  <div class="border-1 border-solid border-[var(--tags-view-border-color)] z-3000">
     <!-- 工具栏 -->
     <Toolbar
       :editor="editorRef"
diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue
index ff45674..fee05df 100644
--- a/src/components/Form/src/Form.vue
+++ b/src/components/Form/src/Form.vue
@@ -181,10 +181,6 @@ export default defineComponent({
         item?.componentProps?.options
       ) {
         slotsMap.default = () => renderOptions(item)
-      } else if (item.componentProps?.slots) {
-        // 非Options的组件，通过slots配置，渲染组件
-        // 例如 componentProps{slots:{append: ()=>h('span',null,'appendComponent')}}
-        Object.entries(item.componentProps.slots).forEach((slot) => (slotsMap[slot[0]] = slot[1]))
       }
 
       const formItemSlots: Recordable = setFormItemSlots(slots, item.field)