From 7982a55ac46fad2ea595cfc752f143ecc397177b Mon Sep 17 00:00:00 2001
From: vdpAdmin <vdpadmin@163.com>
Date: Fri, 21 Oct 2022 13:45:46 +0800
Subject: [PATCH] =?UTF-8?q?SvgIcon=E7=BB=84=E4=BB=B6=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=B3=A8=E5=86=8C=EF=BC=8C=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E5=B1=80=E9=83=A8=E6=B3=A8=E5=86=8C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                                   | 2 +-
 install-render.js                                           | 3 ---
 install.js                                                  | 4 ----
 .../form-widget/container-widget/container-wrapper.vue      | 4 ++++
 .../form-widget/container-widget/grid-col-widget.vue        | 2 ++
 .../form-widget/container-widget/table-cell-widget.vue      | 2 ++
 .../form-widget/field-widget/form-item-wrapper.vue          | 4 ++++
 .../form-designer/form-widget/field-widget/input-widget.vue | 2 ++
 .../form-widget/field-widget/picture-upload-widget.vue      | 2 ++
 .../form-widget/field-widget/static-content-wrapper.vue     | 6 +++++-
 .../field-file-upload/file-upload-fileTypes-editor.vue      | 4 ++++
 .../picture-upload-fileTypes-editor.vue                     | 4 ++++
 .../setting-panel/property-editor/name-editor.vue           | 4 ++++
 .../setting-panel/property-editor/validation-editor.vue     | 6 +++++-
 src/components/form-designer/toolbar-panel/index.vue        | 2 ++
 src/components/form-designer/widget-panel/index.vue         | 2 ++
 src/components/form-render/container-item/sub-form-item.vue | 3 ++-
 src/main.js                                                 | 2 --
 18 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index c7af726..206cd53 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 [在线Demo](http://120.92.142.115:81/vform3/)
  
  ### 立即体验VForm 3 Pro高级版（提供商业支持）
- [VForm 3 Pro Demo](http://120.92.142.115:81/vform3pro/)
+ [VForm 3 Pro Demo](https://vform666.com/pages/pro/)
  
 ### 适合Vue 2的版本看这里
 [点此查看](https://gitee.com/vdpadmin/variant-form)
diff --git a/install-render.js b/install-render.js
index 3b75670..8ca25a1 100644
--- a/install-render.js
+++ b/install-render.js
@@ -4,7 +4,6 @@ import VFormRender from '@/components/form-render/index.vue'
 import ContainerItems from '@/components/form-render/container-item/index'
 
 import {registerIcon} from '@/utils/el-icons'
-import SvgIcon from '@/components/svg-icon'  //svg组件
 import 'virtual:svg-icons-register'
 import '@/iconfont/iconfont.css'
 
@@ -17,7 +16,6 @@ VFormRender.install = function (app) {
 
   app.use(ContainerItems)
   registerIcon(app)
-  app.component('svg-icon', SvgIcon)
   app.component(VFormRender.name, VFormRender)
 }
 
@@ -31,7 +29,6 @@ const install = (app) => {
 
   app.use(ContainerItems)
   registerIcon(app)
-  app.component('svg-icon', SvgIcon)
   components.forEach(component => {
     app.component(component.name, component)
   })
diff --git a/install.js b/install.js
index f2b7758..49d2bfc 100644
--- a/install.js
+++ b/install.js
@@ -5,7 +5,6 @@ import VFormRender from '@/components/form-render/index.vue'
 
 import Draggable from '@/../lib/vuedraggable/dist/vuedraggable.umd.js'
 import {registerIcon} from '@/utils/el-icons'
-import SvgIcon from '@/components/svg-icon'  //svg组件
 import 'virtual:svg-icons-register'
 import '@/iconfont/iconfont.css'
 
@@ -27,7 +26,6 @@ VFormDesigner.install = function (app) {
 
   registerIcon(app)
   app.component('draggable', Draggable)
-  app.component('svg-icon', SvgIcon)
   app.component(VFormDesigner.name, VFormDesigner)
 }
 
@@ -38,7 +36,6 @@ VFormRender.install = function (app) {
   app.use(ContainerItems)
 
   registerIcon(app)
-  app.component('svg-icon', SvgIcon)
   app.component(VFormRender.name, VFormRender)
 }
 
@@ -57,7 +54,6 @@ const install = (app) => {
 
   registerIcon(app)
   app.component('draggable', Draggable)
-  app.component('svg-icon', SvgIcon)
 
   components.forEach(component => {
     app.component(component.name, component)
diff --git a/src/components/form-designer/form-widget/container-widget/container-wrapper.vue b/src/components/form-designer/form-widget/container-widget/container-wrapper.vue
index 6c96fac..a0eb7bc 100644
--- a/src/components/form-designer/form-widget/container-widget/container-wrapper.vue
+++ b/src/components/form-designer/form-widget/container-widget/container-wrapper.vue
@@ -42,10 +42,14 @@
 <script>
   import i18n from "@/utils/i18n";
   import containerMixin from "@/components/form-designer/form-widget/container-widget/containerMixin";
+  import SvgIcon from '@/components/svg-icon'
 
   export default {
     name: "container-wrapper",
     mixins: [i18n, containerMixin],
+    components: {
+      SvgIcon
+    },
     props: {
       widget: Object,
       parentWidget: Object,
diff --git a/src/components/form-designer/form-widget/container-widget/grid-col-widget.vue b/src/components/form-designer/form-widget/container-widget/grid-col-widget.vue
index 2b29c6a..9f76533 100644
--- a/src/components/form-designer/form-widget/container-widget/grid-col-widget.vue
+++ b/src/components/form-designer/form-widget/container-widget/grid-col-widget.vue
@@ -46,6 +46,7 @@
   import i18n from "@/utils/i18n";
   import FieldComponents from '@/components/form-designer/form-widget/field-widget/index'
   import refMixinDesign from "@/components/form-designer/refMixinDesign"
+  import SvgIcon from '@/components/svg-icon'
 
   export default {
     name: "GridColWidget",
@@ -54,6 +55,7 @@
     inject: ['refList'],
     components: {
       ...FieldComponents,
+      SvgIcon,
     },
     props: {
       widget: Object,
diff --git a/src/components/form-designer/form-widget/container-widget/table-cell-widget.vue b/src/components/form-designer/form-widget/container-widget/table-cell-widget.vue
index 97a8d93..4a899ac 100644
--- a/src/components/form-designer/form-widget/container-widget/table-cell-widget.vue
+++ b/src/components/form-designer/form-widget/container-widget/table-cell-widget.vue
@@ -58,6 +58,7 @@
   import i18n from "@/utils/i18n"
   import FieldComponents from '@/components/form-designer/form-widget/field-widget/index'
   import refMixinDesign from "@/components/form-designer/refMixinDesign"
+  import SvgIcon from '@/components/svg-icon'
 
   export default {
     name: "TableCellWidget",
@@ -66,6 +67,7 @@
     inject: ['refList'],
     components: {
       ...FieldComponents,
+      SvgIcon,
     },
     props: {
       widget: Object,
diff --git a/src/components/form-designer/form-widget/field-widget/form-item-wrapper.vue b/src/components/form-designer/form-widget/field-widget/form-item-wrapper.vue
index 1caa16c..e4998e2 100644
--- a/src/components/form-designer/form-widget/field-widget/form-item-wrapper.vue
+++ b/src/components/form-designer/form-widget/field-widget/form-item-wrapper.vue
@@ -62,10 +62,14 @@
 
 <script>
   import i18n from "@/utils/i18n";
+  import SvgIcon from '@/components/svg-icon'
 
   export default {
     name: "form-item-wrapper",
     mixins: [i18n],
+    components: {
+      SvgIcon
+    },
     props: {
       field: Object,
       designer: Object,
diff --git a/src/components/form-designer/form-widget/field-widget/input-widget.vue b/src/components/form-designer/form-widget/field-widget/input-widget.vue
index 3c21855..c175737 100644
--- a/src/components/form-designer/form-widget/field-widget/input-widget.vue
+++ b/src/components/form-designer/form-widget/field-widget/input-widget.vue
@@ -27,6 +27,7 @@
   import emitter from '@/utils/emitter'
   import i18n, {translate} from "@/utils/i18n";
   import fieldMixin from "@/components/form-designer/form-widget/field-widget/fieldMixin";
+  import SvgIcon from "@/components/svg-icon/index";
 
   export default {
     name: "input-widget",
@@ -60,6 +61,7 @@
     },
     components: {
       FormItemWrapper,
+      SvgIcon,
     },
     data() {
       return {
diff --git a/src/components/form-designer/form-widget/field-widget/picture-upload-widget.vue b/src/components/form-designer/form-widget/field-widget/picture-upload-widget.vue
index 59f9c23..650fd15 100644
--- a/src/components/form-designer/form-widget/field-widget/picture-upload-widget.vue
+++ b/src/components/form-designer/form-widget/field-widget/picture-upload-widget.vue
@@ -58,6 +58,7 @@
   import i18n, {translate} from "@/utils/i18n";
   import {deepClone} from "@/utils/util";
   import fieldMixin from "@/components/form-designer/form-widget/field-widget/fieldMixin";
+  import SvgIcon from "@/components/svg-icon/index";
 
   export default {
     name: "picture-upload-widget",
@@ -91,6 +92,7 @@
     },
     components: {
       FormItemWrapper,
+      SvgIcon,
     },
     data() {
       return {
diff --git a/src/components/form-designer/form-widget/field-widget/static-content-wrapper.vue b/src/components/form-designer/form-widget/field-widget/static-content-wrapper.vue
index 391dc43..6620d31 100644
--- a/src/components/form-designer/form-widget/field-widget/static-content-wrapper.vue
+++ b/src/components/form-designer/form-widget/field-widget/static-content-wrapper.vue
@@ -29,11 +29,15 @@
 </template>
 
 <script>
-  import i18n from "@/utils/i18n";
+  import i18n from "@/utils/i18n"
+  import SvgIcon from '@/components/svg-icon'
 
   export default {
     name: "static-content-wrapper",
     mixins: [i18n],
+    components: {
+      SvgIcon
+    },
     props: {
       field: Object,
       designer: Object,
diff --git a/src/components/form-designer/setting-panel/property-editor/field-file-upload/file-upload-fileTypes-editor.vue b/src/components/form-designer/setting-panel/property-editor/field-file-upload/file-upload-fileTypes-editor.vue
index 57b7b27..d08c650 100644
--- a/src/components/form-designer/setting-panel/property-editor/field-file-upload/file-upload-fileTypes-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/field-file-upload/file-upload-fileTypes-editor.vue
@@ -19,10 +19,14 @@
 
 <script>
   import i18n from "@/utils/i18n"
+  import SvgIcon from "@/components/svg-icon/index";
 
   export default {
     name: "file-upload-fileTypes-editor",
     mixins: [i18n],
+    components: {
+      SvgIcon
+    },
     props: {
       designer: Object,
       selectedWidget: Object,
diff --git a/src/components/form-designer/setting-panel/property-editor/field-picture-upload/picture-upload-fileTypes-editor.vue b/src/components/form-designer/setting-panel/property-editor/field-picture-upload/picture-upload-fileTypes-editor.vue
index 97d9adc..1b689d7 100644
--- a/src/components/form-designer/setting-panel/property-editor/field-picture-upload/picture-upload-fileTypes-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/field-picture-upload/picture-upload-fileTypes-editor.vue
@@ -19,10 +19,14 @@
 
 <script>
   import i18n from "@/utils/i18n"
+  import SvgIcon from "@/components/svg-icon/index";
 
   export default {
     name: "picture-upload-fileTypes-editor",
     mixins: [i18n],
+    components: {
+      SvgIcon
+    },
     props: {
       designer: Object,
       selectedWidget: Object,
diff --git a/src/components/form-designer/setting-panel/property-editor/name-editor.vue b/src/components/form-designer/setting-panel/property-editor/name-editor.vue
index 97c829a..9805370 100644
--- a/src/components/form-designer/setting-panel/property-editor/name-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/name-editor.vue
@@ -21,10 +21,14 @@
 <script>
   import i18n from "@/utils/i18n"
   import {isEmptyStr} from "@/utils/util"
+  import SvgIcon from "@/components/svg-icon/index";
 
   export default {
     name: "name-editor",
     mixins: [i18n],
+    components: {
+      SvgIcon
+    },
     props: {
       designer: Object,
       selectedWidget: Object,
diff --git a/src/components/form-designer/setting-panel/property-editor/validation-editor.vue b/src/components/form-designer/setting-panel/property-editor/validation-editor.vue
index c5a29d7..0d4f365 100644
--- a/src/components/form-designer/setting-panel/property-editor/validation-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/validation-editor.vue
@@ -6,7 +6,7 @@
           <svg-icon icon-class="el-info" /></el-tooltip>
       </span>
     </template>
-    <el-select v-model="optionModel.validation" filterable allow-create default-first-option>
+    <el-select v-model="optionModel.validation" filterable clearable allow-create default-first-option>
       <el-option v-for="(fv, fvIdx) in fieldValidators"
                  :key="fvIdx"
                  :label="fv.label"
@@ -18,10 +18,14 @@
 
 <script>
   import i18n from "@/utils/i18n"
+  import SvgIcon from "@/components/svg-icon/index";
 
   export default {
     name: "validation-editor",
     mixins: [i18n],
+    components: {
+      SvgIcon
+    },
     props: {
       designer: Object,
       selectedWidget: Object,
diff --git a/src/components/form-designer/toolbar-panel/index.vue b/src/components/form-designer/toolbar-panel/index.vue
index fa3c6c8..a9690a9 100644
--- a/src/components/form-designer/toolbar-panel/index.vue
+++ b/src/components/form-designer/toolbar-panel/index.vue
@@ -201,6 +201,7 @@
   import loadBeautifier from "@/utils/beautifierLoader"
   import { saveAs } from 'file-saver'
   import axios from 'axios'
+  import SvgIcon from "@/components/svg-icon/index";
 
   export default {
     name: "ToolbarPanel",
@@ -209,6 +210,7 @@
       VFormRender,
       CodeEditor,
       Clipboard,
+      SvgIcon,
     },
     props: {
       designer: Object
diff --git a/src/components/form-designer/widget-panel/index.vue b/src/components/form-designer/widget-panel/index.vue
index 37cc2e3..be73da5 100644
--- a/src/components/form-designer/widget-panel/index.vue
+++ b/src/components/form-designer/widget-panel/index.vue
@@ -96,6 +96,7 @@
   import {addWindowResizeHandler, generateId} from "@/utils/util"
   import i18n from "@/utils/i18n"
   import axios from 'axios'
+  import SvgIcon from "@/components/svg-icon/index";
 
   // import ftImg1 from '@/assets/ft-images/t1.png'
   // import ftImg2 from '@/assets/ft-images/t2.png'
@@ -110,6 +111,7 @@
     name: "FieldPanel",
     mixins: [i18n],
     components: {
+      SvgIcon
     },
     props: {
       designer: Object,
diff --git a/src/components/form-render/container-item/sub-form-item.vue b/src/components/form-render/container-item/sub-form-item.vue
index 080c751..a865007 100644
--- a/src/components/form-render/container-item/sub-form-item.vue
+++ b/src/components/form-render/container-item/sub-form-item.vue
@@ -70,7 +70,7 @@
   import ContainerItemWrapper from './container-item-wrapper'
   import containerItemMixin from './containerItemMixin'
   import FieldComponents from '@/components/form-designer/form-widget/field-widget/index'
-  import eventBus from "@/utils/event-bus"
+  import SvgIcon from "@/components/svg-icon/index";
 
   export default {
     name: "sub-form-item",
@@ -79,6 +79,7 @@
     components: {
       ContainerItemWrapper,
       ...FieldComponents,
+      SvgIcon,
     },
     props: {
       widget: Object,
diff --git a/src/main.js b/src/main.js
index 7e70afc..a48e6e1 100644
--- a/src/main.js
+++ b/src/main.js
@@ -7,7 +7,6 @@ import '@/styles/index.scss'
 import '@/iconfont/iconfont.css'
 import Draggable from '@/../lib/vuedraggable/dist/vuedraggable.umd.js'
 import {registerIcon} from '@/utils/el-icons'
-import SvgIcon from '@/components/svg-icon'  //svg组件
 import 'virtual:svg-icons-register'
 
 import ContainerWidgets from '@/components/form-designer/form-widget/container-widget/index'
@@ -26,7 +25,6 @@ const vfApp = createApp(App)
 vfApp.use(ElementPlus)
 registerIcon(vfApp)
 vfApp.component('draggable', Draggable)
-vfApp.component('svg-icon', SvgIcon)
 addDirective(vfApp)
 installI18n(vfApp)