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

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 = {
@@ -141,7 +141,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 +184,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() {
@@ -237,7 +248,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 +334,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])) {
@@ -383,6 +395,7 @@ modules = {
             isItemLine: t.isItemLine,
             footerDataType: t.footerDataType,
             footerMethodConfg: t.footerMethodConfg,
+            widgetList: t.widgetList
           },
           visible: t.show,
           slots: {},
@@ -423,7 +436,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 +444,7 @@ modules = {
           columnOption = {};
         }
 
-        let { columnSelectedWidget: editWidget } = this.getColumnWidgetConfig(
+        let {columnSelectedWidget: editWidget} = this.getColumnWidgetConfig(
           t,
           true
         );
@@ -456,10 +469,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";
           }
@@ -550,9 +565,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 +583,7 @@ modules = {
             "date-range": {
               type: "date",
               widgetType: "daterange",
-              widgetConfig: { ...dateConfig, isRange: true },
+              widgetConfig: {...dateConfig, isRange: true},
             },
             "time-range": {
               type: "time",
@@ -665,7 +680,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 +770,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 +799,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 +814,7 @@ modules = {
 
               // 处理筛选条件
               if (filters) {
-                filters.forEach(({ property, values }) => {
+                filters.forEach(({property, values}) => {
                   queryParams[property] = values.join(",");
                 });
               }
@@ -991,8 +1006,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 +1104,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 +1156,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 +1366,7 @@ modules = {
           param = item.accessParam;
         }
       } else {
-        param = { id: dataId };
+        param = {id: dataId};
       }
       return param;
     },
@@ -1363,12 +1378,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();
@@ -1554,7 +1569,7 @@ modules = {
           columnSelectedWidget.options.labelHidden = true;
         }
       }
-      return { columnSelectedWidget, columnEditFields };
+      return {columnSelectedWidget, columnEditFields};
     },
     getColumnProp(widget, obj, isEdit) {
       if (!widget) {
@@ -1590,7 +1605,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 +1642,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,9 +1870,9 @@ 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);
       }
@@ -1972,10 +1991,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 +2149,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,35 +2158,35 @@ 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};
           }
         }
       }

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,10 @@
         type: String,
         default: null
       },
-
+      tableParam: {
+        type: Object,
+        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"/>

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

@@ -1,22 +1,27 @@
 <template>
   <container-item-wrapper :widget="widget" :class="widget.options.isFullscreen ? 'full-height':''">
     <div :key="widget.id" class="tab-container" v-show="!widget.options.hidden">
-      <el-tabs v-model="activeTabName" :type="widget.displayType" :ref="widget.id" :class="[customClass,widget.options.tabClass]"  :style="{'height': widget.options.isFullscreen ? '' : widget.options.height}">
-        <el-tab-pane v-for="(tab, index) in visibleTabs" :key="index" :label="getI18nLabel(tab.options.label)" :disabled="tab.options.disabled" :name="tab.options.name">
+      <el-tabs v-model="activeTabName" :type="widget.displayType" :ref="widget.id"
+               :class="[customClass,widget.options.tabClass]"
+               :style="{'height': widget.options.isFullscreen ? '' : widget.options.height}">
+        <el-tab-pane v-for="(tab, index) in visibleTabs" :key="index" :label="getI18nLabel(tab.options.label)"
+                     :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" :index-of-parent-list="swIdx" :parent-widget="widget">
+              <component :is="subWidget.type + '-item'" :widget="subWidget" :key="swIdx" :parent-list="tab.widgetList"
+                         :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" />
+                  <slot :name="slot" v-bind="scope"/>
                 </template>
               </component>
             </template>
             <template v-else>
-              <component :is="subWidget.type + '-widget'" :field="subWidget" :key="swIdx" :parent-list="tab.widgetList" :index-of-parent-list="swIdx" :parent-widget="widget">
+              <component :is="subWidget.type + '-widget'" :field="subWidget" :key="swIdx" :parent-list="tab.widgetList"
+                         :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" />
+                  <slot :name="slot" v-bind="scope"/>
                 </template>
               </component>
             </template>

package/src/components/xform/form-render/container-item/table-cell-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" :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"/>
@@ -26,42 +26,44 @@
 </template>
 
 <script>
-  import emitter from '../../../../components/xform/utils/emitter'
-  import i18n from "../../../../components/xform/utils/i18n"
-  import refMixin from "../../../../components/xform/form-render/refMixin"
-  import FieldComponents from '../../../../components/xform/form-designer/form-widget/field-widget/index'
+import emitter from '../../../../components/xform/utils/emitter'
+import i18n from "../../../../components/xform/utils/i18n"
+import refMixin from "../../../../components/xform/form-render/refMixin"
+import FieldComponents from '../../../../components/xform/form-designer/form-widget/field-widget/index'
 
-  export default {
-    name: "TableCellItem",
-    componentName: "ContainerItem",
-    mixins: [emitter, i18n, refMixin],
-    components: {
-      ...FieldComponents,
-    },
-    props: {
-      widget: Object,
-
-      rowIndex: Number,
-      colIndex: Number,
-    },
-    inject: ['refList', 'globalModel'],
-    computed: {
-      customClass() {
-        return this.widget.options.customClass || ''
-      },
-      tdClass(){
-        return (this.colIndex+1)%2 ==0 ? "":"odd"
-      },
+export default {
+  name: "TableCellItem",
+  componentName: "ContainerItem",
+  mixins: [emitter, i18n, refMixin],
+  components: {
+    ...FieldComponents,
+  },
+  props: {
+    widget: Object,
 
+    rowIndex: Number,
+    colIndex: Number,
+    tableParam: {
+      type: Object,
+      default: null,
+    }
+  },
+  inject: ['refList', 'globalModel'],
+  computed: {
+    customClass() {
+      return this.widget.options.customClass || ''
     },
-    created() {
-      /* tableCell不生成组件引用，故无须调用initRefList！！ */
-      //this.initRefList()
+    tdClass() {
+      return (this.colIndex + 1) % 2 == 0 ? "" : "odd"
     },
-    methods: {
 
-    }
-  }
+  },
+  created() {
+    /* tableCell不生成组件引用，故无须调用initRefList！！ */
+    //this.initRefList()
+  },
+  methods: {}
+}
 </script>
 
 <style lang="scss" scoped>

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

@@ -3,12 +3,14 @@
 
     <div :key="widget.id" class="table-container"
          v-show="!widget.options.hidden">
-      <table :ref="widget.id" class="table-layout table-d-box" :class="[customClass,widget.options.styleTableClass]" :style="tableStyle">
+      <table :ref="widget.id" class="table-layout table-d-box" :class="[customClass,widget.options.styleTableClass]"
+             :style="tableStyle">
         <tbody>
         <tr v-for="(row, rowIdx) in widget.rows" :key="row.id">
           <template v-for="(colWidget, colIdx) in row.cols">
             <table-cell-item v-if="!colWidget.merged" :widget="colWidget" :key="colIdx" :parent-list="widget.cols"
-                             :row-index="rowIdx" :col-index="colIdx" :parent-widget="widget">
+                             :row-index="rowIdx" :col-index="colIdx" :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"/>