cloud-web-corejs 1.0.54-dev.146 → 1.0.54-dev.149

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

@@ -5,13 +5,13 @@ import containerItemMixin from "./containerItemMixin";
 
 import * as formatUtil from "../../../../components/xform/utils/format.js";
 import tableConfig from "../../../../components/table/config.js";
-import { extendDeeply } from "../../../../utils/index.js";
+import {extendDeeply} from "../../../../utils/index.js";
 import {
   assembleAxiosConfig,
   getReportGlobalMap,
   generateId,
 } from "../../../../components/xform/utils/util";
-import { tableTreeMixins } from "../../../../mixins/tableTree/index.js";
+import {tableTreeMixins} from "../../../../mixins/tableTree/index.js";
 
 let modules = {};
 const baseRefUtil = {
@@ -106,6 +106,7 @@ modules = {
       tableConfig: {},
       showTableFormDialogContent: true,
       widgetMap: {},
+      rowWidgetList:[]
     };
   },
   watch: {
@@ -141,7 +142,7 @@ modules = {
       return void 0 === this.widget.options.buttonsColumnFixed
         ? "right"
         : !!this.widget.options.buttonsColumnFixed &&
-            this.widget.options.buttonsColumnFixed;
+        this.widget.options.buttonsColumnFixed;
     },
     formModel: {
       cache: !1,
@@ -184,24 +185,35 @@ modules = {
       let name = params.widget.options.name;
       return this.getWidgetRefByTableRow(index, name);
     },
-    getRowWidget(rowParam) {
+    getRowWidget(rowParam, fieldWidget) {
       let row = rowParam.row;
       let params = rowParam.column.params;
-      let key = this.getRowRefKey(row, params.widget.options.name);
+      let name = fieldWidget ? fieldWidget.options.name : params.widget.options.name;
+      let key = this.getRowRefKey(row, name);
       let widget = this.widgetMap[key];
       if (!widget) {
         this.$set(
           this.widgetMap,
           key,
-          this.$baseLodash.cloneDeep(params.widget)
+          this.$baseLodash.cloneDeep(fieldWidget ? fieldWidget : params.widget)
         );
       }
+
       return this.widgetMap[key];
     },
-    getRowWidgetKey(rowParam) {
+    getRowWidgetOption(rowParam, fieldWidget) {
+      let widget = this.getRowWidget(rowParam, fieldWidget);
+      let field = widget.category == 'container' ? 'widget' : 'field'
+      let option = {
+        [field]:widget
+      }
+      return option
+    },
+    getRowWidgetKey(rowParam, fieldWidget) {
       let row = rowParam.row;
       let params = rowParam.column.params;
-      let key = this.getRowRefKey(row, params.widget.options.name);
+      let name = fieldWidget ? fieldWidget.options.name : params.widget.options.name;
+      let key = this.getRowRefKey(row, name);
       return key;
     },
     getGridTableName() {
@@ -221,6 +233,7 @@ modules = {
     },
     setValue(val) {
       // console.log("rows:",val);
+      this.clearRowWidgets()
       let rows = val || [];
       this.formModel[this.fieldKeyName] = rows;
       let $grid = this.getGridTable();
@@ -237,7 +250,7 @@ modules = {
     selectWidget: function (e) {
       this.designer.setSelected(e);
     },
-    formatterValue: function ({ cellValue, row, column }) {
+    formatterValue: function ({cellValue, row, column}) {
       if (cellValue === null || cellValue === undefined) return cellValue;
 
       if (column.params && column.params.formatS)
@@ -323,10 +336,11 @@ modules = {
       let formRef = this.getFormRef();
       let parentTarget = formRef.$attrs["parent-target"];
       parentTarget &&
-        parentTarget.$attrs.openEditDialog &&
-        parentTarget.$attrs.openEditDialog(row, param);
+      parentTarget.$attrs.openEditDialog &&
+      parentTarget.$attrs.openEditDialog(row, param);
+    },
+    importExcel() {
     },
-    importExcel() {},
     getGrid(that, tableRef) {
       var $grid;
       if (Array.isArray(that.$refs[tableRef])) {
@@ -359,6 +373,7 @@ modules = {
       return conditions;
     },
     createColumns() {
+      let rowWidgetList = [];
       let tableColumns = this.widget.options.tableColumns;
       let newColumns = [];
       newColumns.push({
@@ -383,6 +398,7 @@ modules = {
             isItemLine: t.isItemLine,
             footerDataType: t.footerDataType,
             footerMethodConfg: t.footerMethodConfg,
+            widgetList: t.widgetList
           },
           visible: t.show,
           slots: {},
@@ -416,6 +432,19 @@ modules = {
           }
         }
         col = addColumProperty(col, t);
+
+        if(col.params.widget){
+          rowWidgetList.push(col.params.widget)
+        }
+        if(col.params.editWidget){
+          rowWidgetList.push(col.params.editWidget)
+        }
+        if(col.params.widgetList && col.params.widgetList.length){
+          col.params.widgetList.forEach((item) => {
+            rowWidgetList.push(item)
+          })
+
+        }
         return col;
       };
 
@@ -423,7 +452,7 @@ modules = {
         let columnOption;
         let widget;
         let columnWidgetConfig = this.getColumnWidgetConfig(t);
-        let { columnSelectedWidget, columnEditFields } = columnWidgetConfig;
+        let {columnSelectedWidget, columnEditFields} = columnWidgetConfig;
         if (columnSelectedWidget) {
           widget = columnSelectedWidget;
           columnOption = widget.options;
@@ -431,7 +460,7 @@ modules = {
           columnOption = {};
         }
 
-        let { columnSelectedWidget: editWidget } = this.getColumnWidgetConfig(
+        let {columnSelectedWidget: editWidget} = this.getColumnWidgetConfig(
           t,
           true
         );
@@ -456,10 +485,12 @@ modules = {
             col.slots.default = "widget";
           } else if (t.formatS == "editTreeButtonGroup") {
             col.slots.default = "editTreeButtonGroup";
+          } else if (t.formatS == "widgetRender") {
+            col.slots.default = "widgetList";
           }
 
           if (editWidget) {
-            col.editRender = { name: "input" };
+            col.editRender = {name: "input"};
             // col.slots.edit = editWidget.id;
             col.slots.edit = "editWidget";
           }
@@ -494,6 +525,7 @@ modules = {
           }
         }
       }
+      this.rowWidgetList = rowWidgetList;
       return this.$baseLodash.cloneDeep(newColumns);
     },
     initTableList() {
@@ -511,6 +543,7 @@ modules = {
       let dataId = this.formDataId;
       let accessScript = this.widget.options.accessScript;
       let searchColumns = null;
+
       if (isQueryTable) {
         path = "#";
         paramFun = () => {
@@ -550,9 +583,9 @@ modules = {
             valueFormat: options.valueFormat ?? null,
           };
           let typeMap = {
-            input: { type: "input" },
-            number: { type: "number" },
-            inputBatch: { type: "inputBatch" },
+            input: {type: "input"},
+            number: {type: "number"},
+            inputBatch: {type: "inputBatch"},
             date: {
               type: "date",
               widgetType: options.type,
@@ -568,7 +601,7 @@ modules = {
             "date-range": {
               type: "date",
               widgetType: "daterange",
-              widgetConfig: { ...dateConfig, isRange: true },
+              widgetConfig: {...dateConfig, isRange: true},
             },
             "time-range": {
               type: "time",
@@ -665,7 +698,7 @@ modules = {
           parentField: "f_parent",
           transform: true,
           expandAll: true,
-          loadMethod({ $table, row }) {
+          loadMethod({$table, row}) {
             // 模拟后台接口
             let $grid = that.getGridTable();
             let parentField = $grid.treeConfig.parentField;
@@ -755,7 +788,7 @@ modules = {
           let $grid = this.getGridTable();
           let pageSize = param.size;
           let currentPage = param.current;
-          let page = { pageSize, currentPage };
+          let page = {pageSize, currentPage};
           let customParam = {
             config: {
               modal: false,
@@ -784,7 +817,7 @@ modules = {
           },
           ajax: {
             // 接收 Promise 对象
-            query: ({ page, sorts, filters, form, param, customParam }) => {
+            query: ({page, sorts, filters, form, param, customParam}) => {
               let formData = tableOption.param ? tableOption.param() || {} : {};
               const queryParams = Object.assign({}, formData);
 
@@ -799,7 +832,7 @@ modules = {
 
               // 处理筛选条件
               if (filters) {
-                filters.forEach(({ property, values }) => {
+                filters.forEach(({property, values}) => {
                   queryParams[property] = values.join(",");
                 });
               }
@@ -821,151 +854,6 @@ modules = {
               let accessReturnType = this.widget.options.accessReturnType || 2;
               let scriptCode = this.getScriptCode();
               return new Promise((resolve, reject) => {
-                /*let items = [
-                  {
-                    "create_by": "admin",
-                    "object_foreign_id": 224,
-                    "f_code": "202501068569",
-                    "f_grade": "1",
-                    "f_name": "呃呃呃呃呃呃俄文",
-                    "company_code": "mk1",
-                    "id": 95,
-                    "modify_by": "admin",
-                    "create_date": "2025-01-06 17:53:34",
-                    "f_flag": "A",
-                    "modify_date": "2025-01-16 21:11:44"
-                  },
-                  {
-                    "create_by": "admin",
-                    "object_foreign_id": 224,
-                    "f_code": "202501068569",
-                    "f_grade": "1",
-                    "f_name": "呃呃呃呃呃呃俄文",
-                    "company_code": "mk1",
-                    "id": 10095,
-                    "modify_by": "admin",
-                    "create_date": "2025-01-06 17:53:34",
-                    "f_flag": "A",
-                    "modify_date": "2025-01-16 21:11:44"
-                  },
-                  {
-                    "create_by": "admin",
-                    "object_foreign_id": 221,
-                    "f_code": "202501037347",
-                    "f_grade": "1",
-                    "f_name": "张三",
-                    "company_code": "mk1",
-                    "id": 92,
-                    "modify_by": "admin",
-                    "create_date": "2025-01-03 17:49:55",
-                    "f_flag": "A",
-                    "modify_date": "2025-01-05 17:21:46"
-                  },
-                  {
-                    "create_by": "admin",
-                    "object_foreign_id": 222,
-                    "f_code": "202501037348",
-                    "f_grade": "2",
-                    "f_name": "李四",
-                    "company_code": "mk1",
-                    "id": 93,
-                    "modify_by": "admin",
-                    "create_date": "2025-01-03 17:49:55",
-                    "f_flag": "A",
-                    "modify_date": "2025-01-03 17:49:55"
-                  },
-                  {
-                    "create_by": "admin",
-                    "object_foreign_id": 222,
-                    "f_code": "202501037348",
-                    "f_grade": "2",
-                    "f_name": "李四",
-                    "company_code": "mk1",
-                    "id": 10093,
-                    "modify_by": "admin",
-                    "create_date": "2025-01-03 17:49:55",
-                    "f_flag": "A",
-                    "modify_date": "2025-01-03 17:49:55"
-                  },
-                  {
-                    "create_by": "admin",
-                    "object_foreign_id": 223,
-                    "f_code": "202501037349",
-                    "f_grade": "3",
-                    "f_name": "王五",
-                    "company_code": "mk1",
-                    "id": 94,
-                    "modify_by": "admin",
-                    "create_date": "2025-01-03 17:49:55",
-                    "f_flag": "A",
-                    "modify_date": "2025-01-03 17:49:55"
-                  },
-                  {
-                    "create_by": "admin",
-                    "object_foreign_id": 218,
-                    "f_code": "202501037340",
-                    "f_grade": "4",
-                    "f_name": "林一",
-                    "company_code": "mk1",
-                    "id": 89,
-                    "modify_by": "admin",
-                    "create_date": "2025-01-03 15:02:31",
-                    "f_flag": "A",
-                    "modify_date": "2025-01-03 15:02:31"
-                  },
-                  {
-                    "create_by": "admin",
-                    "object_foreign_id": 219,
-                    "f_code": "202501037341",
-                    "f_grade": "3",
-                    "f_name": "林二",
-                    "company_code": "mk1",
-                    "id": 90,
-                    "modify_by": "admin",
-                    "create_date": "2025-01-03 15:02:31",
-                    "f_flag": "A",
-                    "modify_date": "2025-01-03 15:02:31"
-                  }
-                ];
-                let currentId = 0;
-                let records = [];
-                for(let i=0;i<50;i++){
-                  let newItems = items.map((item,index)=>{
-                    let flag = (index+1)%2!=0;
-                    let line = flag ? index : (index-1)
-                    let f_code = '10000'+i+''+line;
-                    currentId++
-                    return {
-                      ...item,
-                      id:currentId,
-                      f_code
-                    };
-                  })
-                  records.push(...newItems)
-                }
-
-                let res = {
-                  "time": "2025-03-21 11:24:55",
-                  "type": "success",
-                  "content": "success",
-                  "objx": {
-                    "records": [],
-                    "total": 77,
-                    "size": 100,
-                    "current": 1,
-                    "orders": [],
-                    "optimizeCountSql": true,
-                    "hitCount": false,
-                    "countId": null,
-                    "maxLimit": null,
-                    "searchCount": true,
-                    "pages": 1
-                  },
-                  "rmid": null
-                };
-                res.objx.records = records
-                resolve(res);
-                return*/
                 let reqData = {
                   ...queryParams,
                 };
@@ -974,6 +862,7 @@ modules = {
                   let toDo = () => {
                     // let f = new Function("dataId", "formCode", "param", "done", accessScript);
                     let done = (res) => {
+                      this.clearRowWidgets();
                       resolve(res);
                       if (res.type == "success") {
                         let rows = res.objx
@@ -991,8 +880,8 @@ modules = {
                               .map((item) => item[parentField]);
                             let expandRows = expandIds.length
                               ? rows.filter((item) =>
-                                  expandIds.includes(item.id)
-                                )
+                                expandIds.includes(item.id)
+                              )
                               : [];
                             if (expandAll && expandRows.length) {
                               that.$nextTick(() => {
@@ -1089,7 +978,7 @@ modules = {
           .map((item) => item.params.columnId);
         if (footerColumnIds.length) {
           tableOption.config.footerMethod = (param) => {
-            let { columns: column1s, data } = param;
+            let {columns: column1s, data} = param;
             return [
               column1s.map((column, columnIndex) => {
                 let columnId = column.params?.columnId;
@@ -1141,7 +1030,7 @@ modules = {
       return count;
     },
     getSearchFormData() {
-      let map = { condition: [] };
+      let map = {condition: []};
       let formData = this.globalModel.formModel;
       let widgetList = this.widget.widgetList;
       if (!!widgetList && widgetList.length > 0) {
@@ -1351,7 +1240,7 @@ modules = {
           param = item.accessParam;
         }
       } else {
-        param = { id: dataId };
+        param = {id: dataId};
       }
       return param;
     },
@@ -1363,12 +1252,12 @@ modules = {
       let tableRef = this.getTableRef();
       let serviceName = this.getFormRef().reportTemplate.serviceName;
       option.prefix = option.prefix || "/" + serviceName;
-      this.$excelExport({ targetRef: tableRef, ...option });
+      this.$excelExport({targetRef: tableRef, ...option});
     },
     async deleteRow(row, rowIndex) {
       let isTreeTable = this.widget.options.isTreeTable;
       if (isTreeTable) {
-        this.removeTreeRow({ row });
+        this.removeTreeRow({row});
         return;
       }
       let $grid = this.getGridTable();
@@ -1383,6 +1272,7 @@ modules = {
       this.$nextTick(() => {
         this.handleWbs();
       });
+      this.deleteRowWidgets(row)
     },
     createNewTableData(isEdit) {
       let vailColumns = this.widget.options.tableColumns.filter(
@@ -1554,7 +1444,7 @@ modules = {
           columnSelectedWidget.options.labelHidden = true;
         }
       }
-      return { columnSelectedWidget, columnEditFields };
+      return {columnSelectedWidget, columnEditFields};
     },
     getColumnProp(widget, obj, isEdit) {
       if (!widget) {
@@ -1590,7 +1480,11 @@ modules = {
     },
     getColumnWidgetName(e) {
       if (e && e.type) {
-        return e.type + "-widget";
+        if (e.category == "container") {
+          return this.getContainerWidgetName(e);
+        } else {
+          return e.type + "-widget";
+        }
       }
     },
     getGridTable() {
@@ -1623,7 +1517,7 @@ modules = {
       let formRef = this.getFormRef();
       let dataTableConfig = formRef.$attrs.dataTableOption || {};
       dataTableConfig.onCheckboxChange &&
-        dataTableConfig.onCheckboxChange(param);
+      dataTableConfig.onCheckboxChange(param);
     },
     handleCheckboxAll(param) {
       if (this.widget.options.onCheckboxAll) {
@@ -1851,15 +1745,18 @@ modules = {
         let loopDo = (item) => {
           if (item.id) delIds.push(item.id);
           item[childrenField] &&
-            item[childrenField].forEach((subItem) => {
-              loopDo(subItem);
-            });
+          item[childrenField].forEach((subItem) => {
+            loopDo(subItem);
+          });
         };
         loopDo(row);
       }
       delIds.forEach((id) => {
         let index = tableRows.findIndex((item) => item.id === id);
+        let delRow = tableRows[index];
         tableRows.splice(index, 1);
+        this.deleteRowWidgets(delRow)
+
       });
       this.$nextTick(() => {
         this.handleWbs();
@@ -1972,10 +1869,10 @@ modules = {
         item.f_wbs = wbs;
         map[item._X_ROW_KEY] = wbs;
         item[childrenField] &&
-          item[childrenField].forEach((subitem, subindex) => {
-            let sub_wbs = wbs + "." + (subindex + 1) + "";
-            loopDo(subitem, sub_wbs);
-          });
+        item[childrenField].forEach((subitem, subindex) => {
+          let sub_wbs = wbs + "." + (subindex + 1) + "";
+          loopDo(subitem, sub_wbs);
+        });
       };
       fullData.forEach((item, index) => {
         let wbs = index + 1 + "";
@@ -2130,7 +2027,7 @@ modules = {
     },
     // 通用行合并函数（将相同多列数据合并为一行）
     mergeRowMethod(tableParam) {
-      let { row, _rowIndex, column, visibleData } = tableParam;
+      let {row, _rowIndex, column, visibleData} = tableParam;
       let mergeRowEnabled = this.widget.options.mergeRowEnabled || false;
       let unikey = this.widget.options.mergeRowKey;
       const cellValue = row[unikey];
@@ -2139,39 +2036,91 @@ modules = {
         const prevRow = visibleData[_rowIndex - 1];
         let nextRow = visibleData[_rowIndex + 1];
         if (prevRow && prevRow[unikey] === cellValue) {
-          return { rowspan: 0, colspan: 0 };
+          return {rowspan: 0, colspan: 0};
         } else {
           let countRowspan = 1;
           while (nextRow && nextRow[unikey] === cellValue) {
             nextRow = visibleData[++countRowspan + _rowIndex];
           }
           if (countRowspan > 1) {
-            return { rowspan: countRowspan, colspan: 1 };
+            return {rowspan: countRowspan, colspan: 1};
           }
         }
       } else {
         // return { rowspan: 1, colspan: 1 }
       }
     },
-    mergeRowMethod2({ row, _rowIndex, column, visibleData }) {
+    mergeRowMethod2({row, _rowIndex, column, visibleData}) {
       const fields = ["key"];
       const cellValue = row[column.field];
       if (cellValue && fields.includes(column.field)) {
         const prevRow = visibleData[_rowIndex - 1];
         let nextRow = visibleData[_rowIndex + 1];
         if (prevRow && prevRow[column.field] === cellValue) {
-          return { rowspan: 0, colspan: 0 };
+          return {rowspan: 0, colspan: 0};
         } else {
           let countRowspan = 1;
           while (nextRow && nextRow[column.field] === cellValue) {
             nextRow = visibleData[++countRowspan + _rowIndex];
           }
           if (countRowspan > 1) {
-            return { rowspan: countRowspan, colspan: 1 };
+            return {rowspan: countRowspan, colspan: 1};
           }
         }
       }
     },
+
+    /**begin*/
+    /*initFieldSchemaData() {  //初始化fieldSchemaData！！！
+
+      let rowWidgetList = this.rowWidgetList
+      let rows = this.getValue();
+      let rowLength = rows.length
+      this.widgetMap = {}  //清除数组必须用splice，length=0不会响应式更新！！
+      if (rowLength > 0) {
+        for (let i = 0; i < rowLength; i++) {
+          let row = rows[i];
+          let fieldSchemas = []
+          rowWidgetList.forEach(swItem => {
+            fieldSchemas.push( this.cloneFieldSchema(swItem) )
+          })
+          let keyVal = row._X_ROW_KEY;
+          this.widgetMap[keyVal] = fieldSchemas;
+        }
+      }
+    },
+
+    addToFieldSchemaData(row) {
+      let fieldSchemas = []
+      this.rowWidgetList.forEach(swItem => {
+        fieldSchemas.push( this.cloneFieldSchema(swItem) )
+      })
+
+      let keyVal = row._X_ROW_KEY;
+      this.widgetMap[keyVal] = fieldSchemas;
+    },
+
+    deleteFromFieldSchemaData(row) {
+      let keyVal = row._X_ROW_KEY;
+      delete this.widgetMap[keyVal] ;
+    },
+
+    cloneFieldSchema(fieldWidget) {
+      let newFieldSchema = this.$baseLodash.cloneDeep(fieldWidget)
+      newFieldSchema.id = fieldWidget.type + generateId()
+      return newFieldSchema
+    },*/
+    clearRowWidgets(){
+      this.widgetMap = {};
+    },
+    deleteRowWidgets(row) {
+      this.rowWidgetList.forEach(widget=>{
+        let key = this.getRowRefKey(row, widget.options.name);
+        delete this.widgetMap[key];
+      })
+    }
+    /**end*/
+
   },
 };
 

package/src/components/xform/form-render/container-item/grid-col-item.vue

@@ -5,7 +5,7 @@
       <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"
-                          :index-of-parent-list="swIdx" :parent-widget="widget">
+                          :index-of-parent-list="swIdx" :parent-widget="widget" :tableParam="tableParam" :formItemProp="formItemProp">
             <!-- 递归传递插槽！！！ -->
             <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
               <slot :name="slot" v-bind="scope"/>
@@ -14,7 +14,7 @@
         </template>
         <template v-else>
           <component :is="subWidget.type + '-widget'" :field="subWidget" :designer="null" :key="swIdx" :parent-list="widget.widgetList"
-                        :index-of-parent-list="swIdx" :parent-widget="widget">
+                        :index-of-parent-list="swIdx" :parent-widget="widget" :tableParam="tableParam" :formItemProp="formItemProp">
             <!-- 递归传递插槽！！！ -->
             <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
               <slot :name="slot" v-bind="scope"/>
@@ -54,7 +54,14 @@
         type: String,
         default: null
       },
-
+      tableParam: {
+        type: Object,
+        default: null,
+      },
+      formItemProp: {
+        type: String,
+        default: null,
+      },
     },
     inject: ['refList', 'globalModel', 'previewState'],
     data() {

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

@@ -7,7 +7,7 @@
       <template v-for="(colWidget, colIdx) in widget.cols">
         <grid-col-item :widget="colWidget" :key="colIdx" :parent-list="widget.cols"
                        :index-of-parent-list="colIdx" :parent-widget="widget"
-                       :col-height="widget.options.colHeight">
+                       :col-height="widget.options.colHeight" :tableParam="tableParam" :formItemProp="formItemProp">
           <!-- 递归传递插槽！！！ -->
           <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
             <slot :name="slot" v-bind="scope"/>