From 38af2fd516a4b78d728dc4b6762449a6525d6552 Mon Sep 17 00:00:00 2001
From: vdpAdmin <vdpadmin@163.com>
Date: Fri, 21 Oct 2022 14:47:49 +0800
Subject: [PATCH] =?UTF-8?q?grid-item=E7=BB=84=E4=BB=B6=E6=94=B9=E5=90=8D?=
 =?UTF-8?q?=E4=B8=BAvf-grid-item=EF=BC=8C=E4=BB=A5=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E4=B8=8EVueLayoutGrid=E7=BB=84=E4=BB=B6=E5=86=B2=E7=AA=81?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../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 +-
 7 files changed, 17 insertions(+), 5 deletions(-)

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 0d67c2f..53fe34b 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($slots)" 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 8968cab..ad47894 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 207034b..278951f 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($slots)" 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 a94cfd9..3520cac 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($slots)" v-slot:[slot]="scope">
diff --git a/src/components/form-render/index.vue b/src/components/form-render/index.vue
index 408f495..078f4c8 100644
--- a/src/components/form-render/index.vue
+++ b/src/components/form-render/index.vue
@@ -164,6 +164,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 cddfbcf..5b14f13 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 1da41b8..e452535 100644
--- a/src/extension/samples/card/card-item.vue
+++ b/src/extension/samples/card/card-item.vue
@@ -19,7 +19,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($slots)" v-slot:[slot]="scope">