cloud-web-corejs 1.0.54-dev.25 → 1.0.54-dev.251

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"
+            >
     <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"
@@ -166,7 +167,6 @@
         </template>
 
         <template #searchWidget="{searchColumn}">
-          {{ searchColumn.widget.type }}
           <component
             :is="searchColumn.widget.type + '-widget'"
             :field="searchColumn.widget"
@@ -183,15 +183,16 @@
         </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">
+<!--    <template v-for="fieldWidget in widgets" v-slot:[fieldWidget.id]="obj">
       <component
         :is="getColumnWidgetName(fieldWidget)"
         :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"
@@ -202,18 +203,20 @@
           <slot :name="slot" v-bind="scope"/>
         </template>
       </component>
-    </template>
+    </template>-->
     <template #widget="obj">
       <component
+        v-if="!!fieldSchemaMap[obj.row._X_ROW_KEY]"
         :is="getColumnWidgetName(obj.column.params.widget)"
-        :field="obj.column.params.widget"
+        :field="fieldSchemaMap[obj.row._X_ROW_KEY][obj.column.params.widget.id]"
         :form-model="globalModel.formModel"
         :designer="null"
-        :key="obj.column.params.widget.id"
+        :key="fieldSchemaMap[obj.row._X_ROW_KEY][obj.column.params.widget.id].id"
         :parent-widget="widget"
         :columnConfig="obj.column.params.columnConfig"
         :subFormRowIndex="obj.rowIndex"
         :formItemProp="getColumnProp(widget,obj)"
+        :subFormRowId="obj.row._X_ROW_KEY"
         :tableParam="obj"
       >
         <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
@@ -221,16 +224,43 @@
         </template>
       </component>
     </template>
+    <template #widgetList="obj">
+      <div>
+        <template v-for="(fieldWidget,index) in obj.column.params.widgetList">
+          <component
+            v-if="!!fieldSchemaMap[obj.row._X_ROW_KEY]"
+            :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"
+            :subFormRowId="obj.row._X_ROW_KEY"
+            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>
+        </template>
+
+      </div>
+    </template>
     <template #editWidget="obj">
       <component
+        v-if="!!fieldSchemaMap[obj.row._X_ROW_KEY]"
         :is="getColumnWidgetName(obj.column.params.editWidget)"
-        :field="obj.column.params.editWidget"
+        :field="fieldSchemaMap[obj.row._X_ROW_KEY][obj.column.params.editWidget.id]"
         :form-model="globalModel.formModel"
         :designer="null"
-        :key="obj.column.params.editWidget.id"
+        :key="fieldSchemaMap[obj.row._X_ROW_KEY][obj.column.params.editWidget.id].id"
         :parent-widget="widget"
         :columnConfig="obj.column.params.columnConfig"
         :subFormRowIndex="obj.rowIndex"
+        :subFormRowId="obj.row._X_ROW_KEY"
         :formItemProp="getColumnProp(widget, obj,true)"
         :tableParam="obj"
       >
@@ -260,7 +290,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>
@@ -310,13 +340,13 @@ export default {
   },
   mixins: [dataTableMixin],
   computed: {
-    heightStyle() {
+    /*heightStyle() {
       let tableHeight = this.widget.options.tableHeight;
       if (tableHeight && (tableHeight == 'auto' || tableHeight.slice(-1) == '%')) {
         return 'height:100%';
       }
       return '';
-    }
+    }*/
   }
 };
 </script>