cloud-web-corejs 1.0.79 → 1.0.81

package/src/components/xform/form-render/container-item/data-table-item.vue

@@ -149,22 +149,22 @@
           </vxe-button>
         </template>
 
-          <template v-for="(subWidget, swIdx) in widget.widgetList" v-slot:[subWidget.options.name]>
-            <component
-              v-if="'container' !== subWidget.category"
-              :key="swIdx"
-              :is="subWidget.type + '-widget'"
-              :field="subWidget"
-              :designer="null"
-              :parent-list="subWidget.widgetList"
-              :parent-widget="widget"
-            >
-              <!-- 递归传递插槽！！！ -->
-              <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
-                <slot :name="slot" v-bind="scope"/>
-              </template>
-            </component>
-          </template>
+        <template v-for="(subWidget, swIdx) in widget.widgetList" v-slot:[subWidget.options.name]>
+          <component
+            v-if="'container' !== subWidget.category"
+            :key="swIdx"
+            :is="subWidget.type + '-widget'"
+            :field="subWidget"
+            :designer="null"
+            :parent-list="subWidget.widgetList"
+            :parent-widget="widget"
+          >
+            <!-- 递归传递插槽！！！ -->
+            <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
+              <slot :name="slot" v-bind="scope"/>
+            </template>
+          </component>
+        </template>
 
         <template #searchWidget="{searchColumn}">
           <component
@@ -183,7 +183,8 @@
         </template>
 
       </tableForm>
-      <treeMoveDialog v-if="showTreeMoveDialog" :visiable.sync="showTreeMoveDialog" :rows.sync="sortRows" :parent-target="_self" @confirm="confirmTreeMoveDialog"></treeMoveDialog>
+      <treeMoveDialog v-if="showTreeMoveDialog" :visiable.sync="showTreeMoveDialog" :rows.sync="sortRows"
+                      :parent-target="_self" @confirm="confirmTreeMoveDialog"></treeMoveDialog>
     </template>
     <template v-for="fieldWidget in widgets" v-slot:[fieldWidget.id]="obj">
       <component
@@ -209,7 +210,7 @@
         :field="getRowWidget(obj)"
         :form-model="globalModel.formModel"
         :designer="null"
-        :key="obj.column.params.widget.id+'-'+obj.rowIndex"
+        :key="getRowWidgetKey(obj)"
         :parent-widget="widget"
         :columnConfig="obj.column.params.columnConfig"
         :subFormRowIndex="obj.rowIndex"
@@ -221,13 +222,34 @@
         </template>
       </component>
     </template>
+    <template #widgetList="obj">
+      <div>
+        <component
+          v-for="(fieldWidget,index) in obj.column.params.widgetList"
+          :is="getColumnWidgetName(fieldWidget)"
+          v-bind="getRowWidgetOption(obj,fieldWidget)"
+          :form-model="globalModel.formModel"
+          :designer="null"
+          :key="getRowWidgetKey(obj,fieldWidget)"
+          :parent-widget="widget"
+          :columnConfig="obj.column.params.columnConfig"
+          :subFormRowIndex="obj.rowIndex"
+          formItemProp="false"
+          :tableParam="obj"
+        >
+          <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
+            <slot :name="slot" v-bind="scope" :tableParam="obj"/>
+          </template>
+        </component>
+      </div>
+    </template>
     <template #editWidget="obj">
       <component
         :is="getColumnWidgetName(obj.column.params.editWidget)"
-        :field="obj.column.params.editWidget"
+        :field="getRowWidget(obj,obj.column.params.editWidget)"
         :form-model="globalModel.formModel"
         :designer="null"
-        :key="obj.column.params.editWidget.id+'-'+obj.rowIndex"
+        :key="getRowWidgetKey(obj,obj.column.params.editWidget)"
         :parent-widget="widget"
         :columnConfig="obj.column.params.columnConfig"
         :subFormRowIndex="obj.rowIndex"
@@ -260,7 +282,7 @@
             <el-tooltip :enterable="false" effect="dark" content="新增" placement="top"
                         popper-class="tooltip-skin"><i class="el-icon-circle-plus-outline"></i></el-tooltip>
           </a>
-          <a @click="editRowEvent(obj)" class="a-link" data-tit="行编辑" v-if="obj.row && obj.row.parent !== 0">
+          <a @click="editRowEvent(obj)" class="a-link" data-tit="行编辑">
             <el-tooltip :enterable="false" effect="dark" content="行编辑" placement="top"
                         popper-class="tooltip-skin"><i class="el-icon-edit-outline"></i></el-tooltip>
           </a>