cloud-web-corejs 1.0.54-dev.13 → 1.0.54-dev.130

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

@@ -2,7 +2,8 @@
   <vxe-grid :ref="widget.id" v-bind="vxeOption" :auto-resize="true" v-show="!widget.options.hidden"
             @resizable-change="$vxeTableUtil.onColumnWitchChange" @custom="$vxeTableUtil.customHandle"
             @checkbox-change="handleCheckboxChange" @checkbox-all="handleCheckboxAll"
-            @cell-dblclick="handleCellDblclick" :class="dataTableConfig.class" :data="fieldModel">
+            @cell-dblclick="handleCellDblclick" :class="dataTableConfig.class" :data="fieldModel"
+            :span-method="mergeRowMethod">
     <template #form>
       <!--            <div v-if="widget.options.showSearchArea" class="clearfix screen-btns">
                     <div class="fl">
@@ -99,7 +100,7 @@
                     </template>
                   </div>-->
 
-      <tableForm v-if="widget.options.isQueryTable" :formData.sync="formModel"
+      <tableForm v-if="widget.options.isQueryTable" :formData.sync="formModel" :xform="true"
                  @searchEvent="searchEvent" @resetEvent="resetEvent" @advancedClear="advancedClear"
                  @settingConfirm="tableFormSettingConfirm">
         <template #buttonLeft>
@@ -148,7 +149,7 @@
           </vxe-button>
         </template>
 
-        <template v-for="(subWidget, swIdx) in widget.widgetList" v-slot:[subWidget.options.name]="{slotFormData}">
+        <template v-for="(subWidget, swIdx) in widget.widgetList" v-slot:[subWidget.options.name]>
           <component
             v-if="'container' !== subWidget.category"
             :key="swIdx"
@@ -191,7 +192,7 @@
         :field="fieldWidget"
         :form-model="globalModel.formModel"
         :designer="null"
-        :key="fieldWidget.id"
+        :key="fieldWidget.id+'-'+obj.rowIndex"
         :parent-widget="widget"
         :columnConfig="obj.column.params.columnConfig"
         :subFormRowIndex="obj.rowIndex"
@@ -209,7 +210,7 @@
         :field="obj.column.params.widget"
         :form-model="globalModel.formModel"
         :designer="null"
-        :key="obj.column.params.widget.id"
+        :key="obj.column.params.widget.id+'-'+obj.rowIndex"
         :parent-widget="widget"
         :columnConfig="obj.column.params.columnConfig"
         :subFormRowIndex="obj.rowIndex"
@@ -227,7 +228,7 @@
         :field="obj.column.params.editWidget"
         :form-model="globalModel.formModel"
         :designer="null"
-        :key="obj.column.params.editWidget.id"
+        :key="obj.column.params.editWidget.id+'-'+obj.rowIndex"
         :parent-widget="widget"
         :columnConfig="obj.column.params.columnConfig"
         :subFormRowIndex="obj.rowIndex"