From 04675e4154d99aa4105ee9fb82004564f9495b0b Mon Sep 17 00:00:00 2001
From: vdpAdmin <vdpadmin@163.com>
Date: Fri, 21 Oct 2022 14:29:27 +0800
Subject: [PATCH] =?UTF-8?q?2022.10.21=E6=9B=B4=E6=96=B0=EF=BC=9A=201.=20gr?=
 =?UTF-8?q?id-item=E7=BB=84=E4=BB=B6=E6=94=B9=E5=90=8D=E6=88=90vf-grid-ite?=
 =?UTF-8?q?m=EF=BC=8C=E4=BB=A5=E8=A7=A3=E5=86=B3=E4=B8=8EVueLayoutGrid?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=86=B2=E7=AA=81=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=9B=202.=20SvgIcon=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 +-
 src/components/form-designer/index.vue                    | 2 ++
 src/components/form-designer/toolbar-panel/index.vue      | 3 ++-
 src/components/form-designer/widget-panel/index.vue       | 2 ++
 .../form-render/container-item/grid-col-item.vue          | 2 +-
 src/components/form-render/container-item/grid-item.vue   | 2 +-
 src/components/form-render/container-item/tab-item.vue    | 2 +-
 .../form-render/container-item/table-cell-item.vue        | 2 +-
 src/components/form-render/index.vue                      | 4 ++++
 src/components/form-render/refMixin.js                    | 8 ++++++++
 src/extension/samples/card/card-item.vue                  | 2 +-
 src/icons/index.js                                        | 6 ------
 12 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 0364be9..f84b517 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
 
 
 ### 立即体验VForm Pro高级版（提供商业支持）
-[Pro Demo](http://120.92.142.115/pro)
+[Pro Demo](https://vform666.com/pages/pro/)
 
 
 ### Vue 3正式版已发布
diff --git a/src/components/form-designer/index.vue b/src/components/form-designer/index.vue
index 8df1dc4..2928ff4 100644
--- a/src/components/form-designer/index.vue
+++ b/src/components/form-designer/index.vue
@@ -75,6 +75,7 @@
   import {MOCK_CASE_URL, VARIANT_FORM_VERSION} from "@/utils/config"
   import i18n, { changeLocale } from "@/utils/i18n"
   import axios from "axios"
+  import SvgIcon from '@/components/svg-icon'
 
   export default {
     name: "VFormDesigner",
@@ -85,6 +86,7 @@
       ToolbarPanel,
       SettingPanel,
       VFormWidget,
+      SvgIcon,
     },
     props: {
       /* 后端字段列表API */
diff --git a/src/components/form-designer/toolbar-panel/index.vue b/src/components/form-designer/toolbar-panel/index.vue
index 2928824..bf5e203 100644
--- a/src/components/form-designer/toolbar-panel/index.vue
+++ b/src/components/form-designer/toolbar-panel/index.vue
@@ -179,7 +179,7 @@
   import {genSFC} from "@/utils/sfc-generator";
   import loadBeautifier from "@/utils/beautifierLoader";
   import { saveAs } from 'file-saver'
-  import axios from "axios"
+  import SvgIcon from '@/components/svg-icon'
 
   export default {
     name: "ToolbarPanel",
@@ -188,6 +188,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 3f5252a..7b6dc89 100644
--- a/src/components/form-designer/widget-panel/index.vue
+++ b/src/components/form-designer/widget-panel/index.vue
@@ -89,6 +89,7 @@
   import {addWindowResizeHandler} from "@/utils/util"
   import i18n from "@/utils/i18n"
   import axios from "axios"
+  import SvgIcon from '@/components/svg-icon'
 
   // import ftImg1 from '@/assets/ft-images/t1.png'
   // import ftImg2 from '@/assets/ft-images/t2.png'
@@ -104,6 +105,7 @@
     mixins: [i18n],
     components: {
       Draggable,
+      SvgIcon,
     },
     props: {
       designer: Object,
diff --git a/src/components/form-render/container-item/grid-col-item.vue b/src/components/form-render/container-item/grid-col-item.vue
index f49a496..280138e 100644
--- a/src/components/form-render/container-item/grid-col-item.vue
+++ b/src/components/form-render/container-item/grid-col-item.vue
@@ -4,7 +4,7 @@
     <template v-if="!!widget.widgetList && (widget.widgetList.length > 0)">
       <template v-for="(subWidget, swIdx) in widget.widgetList">
         <template v-if="'container' === subWidget.category">
-          <component :is="subWidget.type + '-item'" :widget="subWidget" :key="swIdx" :parent-list="widget.widgetList"
+          <component :is="getComponentByContainer(subWidget)" :widget="subWidget" :key="swIdx" :parent-list="widget.widgetList"
                           :index-of-parent-list="swIdx" :parent-widget="widget">
             <!-- 递归传递插槽！！！ -->
             <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
diff --git a/src/components/form-render/container-item/grid-item.vue b/src/components/form-render/container-item/grid-item.vue
index 6cc2a33..5488fb9 100644
--- a/src/components/form-render/container-item/grid-item.vue
+++ b/src/components/form-render/container-item/grid-item.vue
@@ -28,7 +28,7 @@
   import containerItemMixin from "./containerItemMixin"
 
   export default {
-    name: "grid-item",
+    name: "vf-grid-item", //grid-item跟VueGridLayout全局注册组件重名，故特殊处理！！
     componentName: 'ContainerItem',
     mixins: [emitter, i18n, refMixin, containerItemMixin],
     components: {
diff --git a/src/components/form-render/container-item/tab-item.vue b/src/components/form-render/container-item/tab-item.vue
index 1e1171b..2a5267b 100644
--- a/src/components/form-render/container-item/tab-item.vue
+++ b/src/components/form-render/container-item/tab-item.vue
@@ -8,7 +8,7 @@
                      :disabled="tab.options.disabled" :name="tab.options.name">
           <template v-for="(subWidget, swIdx) in tab.widgetList">
             <template v-if="'container' === subWidget.category">
-              <component :is="subWidget.type + '-item'" :widget="subWidget" :key="swIdx" :parent-list="tab.widgetList"
+              <component :is="getComponentByContainer(subWidget)" :widget="subWidget" :key="swIdx" :parent-list="tab.widgetList"
                               :index-of-parent-list="swIdx" :parent-widget="widget">
                 <!-- 递归传递插槽！！！ -->
                 <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
diff --git a/src/components/form-render/container-item/table-cell-item.vue b/src/components/form-render/container-item/table-cell-item.vue
index 723c49c..9dd1305 100644
--- a/src/components/form-render/container-item/table-cell-item.vue
+++ b/src/components/form-render/container-item/table-cell-item.vue
@@ -4,7 +4,7 @@
       :style="{width: widget.options.cellWidth + ' !important' || '', height: widget.options.cellHeight + ' !important' || ''}">
     <template v-for="(subWidget, swIdx) in widget.widgetList">
       <template v-if="'container' === subWidget.category">
-        <component :is="subWidget.type + '-item'" :widget="subWidget" :key="swIdx" :parent-list="widget.widgetList"
+        <component :is="getComponentByContainer(subWidget)" :widget="subWidget" :key="swIdx" :parent-list="widget.widgetList"
                         :index-of-parent-list="swIdx" :parent-widget="widget">
           <!-- 递归传递插槽！！！ -->
           <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
diff --git a/src/components/form-render/index.vue b/src/components/form-render/index.vue
index 8114849..44742a5 100644
--- a/src/components/form-render/index.vue
+++ b/src/components/form-render/index.vue
@@ -166,6 +166,10 @@
       },
 
       getContainerWidgetName(widget) {
+        if (widget.type === 'grid') {  //grid-item跟VueGridLayout全局注册组件重名，故特殊处理！！
+          return 'vf-grid-item'
+        }
+
         return widget.type + '-item'
       },
 
diff --git a/src/components/form-render/refMixin.js b/src/components/form-render/refMixin.js
index 6565565..e129ea1 100644
--- a/src/components/form-render/refMixin.js
+++ b/src/components/form-render/refMixin.js
@@ -18,5 +18,13 @@ export default {
       return this.refList['v_form_ref']
     },
 
+    getComponentByContainer(con) {
+      if (con.type === 'grid') {  //grid-item跟VueGridLayout全局注册组件重名，故特殊处理！！
+        return 'vf-grid-item'
+      }
+
+      return con.type + '-item'
+    },
+
   }
 }
diff --git a/src/extension/samples/card/card-item.vue b/src/extension/samples/card/card-item.vue
index 37ee892..e80dbf8 100644
--- a/src/extension/samples/card/card-item.vue
+++ b/src/extension/samples/card/card-item.vue
@@ -11,7 +11,7 @@
       <template v-if="!!widget.widgetList && (widget.widgetList.length > 0)">
         <template v-for="(subWidget, swIdx) in widget.widgetList">
           <template v-if="'container' === subWidget.category">
-            <component :is="subWidget.type + '-item'" :widget="subWidget" :key="swIdx" :parent-list="widget.widgetList"
+            <component :is="getComponentByContainer(subWidget)" :widget="subWidget" :key="swIdx" :parent-list="widget.widgetList"
                        :index-of-parent-list="swIdx" :parent-widget="widget">
               <!-- 递归传递插槽！！！ -->
               <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
diff --git a/src/icons/index.js b/src/icons/index.js
index 3a96311..4c4c36e 100644
--- a/src/icons/index.js
+++ b/src/icons/index.js
@@ -1,9 +1,3 @@
-import Vue from 'vue'
-import SvgIcon from '@/components/svg-icon'// svg组件
-
-// register globally
-Vue.component('svg-icon', SvgIcon)
-
 const requireAll = requireContext => requireContext.keys().map(requireContext)
 const req = require.context('./svg', false, /\.svg$/)
 requireAll(req)