cloud-web-corejs 1.0.281 → 1.1.0-dev.4

package/src/components/xform/form-designer/setting-panel/propertyRegister.js

@@ -27,6 +27,7 @@ const COMMON_PROPERTIES = {
   border: "border-editor",
   labelWidth: "labelWidth-editor",
   labelHidden: "labelHidden-editor",
+  h5Span: "h5Span-editor",
   rows: "rows-editor",
   required: "required-editor",
   // 'requiredHint': 'requiredHint-editor',
@@ -71,6 +72,7 @@ const COMMON_PROPERTIES = {
   fileTypes: "fileTypes-editor",
   customClass: "customClass-editor",
   styleTitClass: "styleTitClass-editor",
+  styleTempClass: "styleTempClass-editor",
   styleTableClass: "styleTableClass-editor",
   iconClass: "iconClass-editor",
   echartHeight: "echartHeight-editor",
@@ -108,6 +110,7 @@ const COMMON_PROPERTIES = {
   pull: "pull-editor",
   height: "height-editor",
   detailContainer: "detail-editor",
+  detailTempContainer: "detail-temp-editor",
   detailPlainContainer: "detail-plain-editor",
   detailPaneContainer: "detail-pane-editor",
   vabSearchField: "vabSearchField-editor",
@@ -121,6 +124,7 @@ const COMMON_PROPERTIES = {
   detailH5Container: "detail-h5-editor",
   h5Card: "h5-card-editor",
   listH5: "list-h5-editor",
+  itemStyle: "itemStyle-editor",
   formScriptEnabled: "formScriptEnabled-editor",
   textFlag: "textFlag-editor",
   showRuleFlag: "showRuleFlag-editor",

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -445,6 +445,26 @@ export const containers = [
       customClass: ""
     }
   },*/
+  {
+    type: "detail-temp",
+    category: "container",
+    icon: "form",
+    commonFlag: !0,
+    layoutType: "PC",
+    panes: [],
+    widgetList: [],
+    options: {
+      name: "",
+      hidden: !1,
+      label: "模板模块",
+      detailTempContainer: true,
+      styleTempClass: 'd-temp-1',
+      customClass: "",
+      wfEnabled: false,
+      onCreated: "",
+      onMounted: "",
+    },
+  },
   {
     type: "detail",
     category: "container",
@@ -548,6 +568,7 @@ export const containers = [
       detailH5Container: true,
       // colHeight: null,
       customClass: "",
+      // 底栏平铺个数不做成选项，写死在 detail-h5-item 的 H5_BOTTOM_MAX_BUTTONS（=3）
       wfEnabled: false,
       onCreated: "",
       onMounted: "",
@@ -573,6 +594,8 @@ export const containers = [
       listH5: true,
       // colHeight: null,
       customClass: "",
+      // 明细行样式：'plain'=原有朴素列表（默认，保持存量表现）；'card'=卡片皮肤
+      itemStyle: "plain",
       isQueryTable: false,
 
       accessUrl: null,
@@ -3318,6 +3341,10 @@ export const advancedFields = [
       showImageAtTable: false,
       selectExportItemFlag: 1,
       exportItemConditionEnabled: !1,
+      // 按钮级明细导出配置：三项各自独立，留空的那项沿用数据表格属性上维护的
+      exportItemColumns: [],
+      exportItemScriptCode: null,
+      exportItemParam: "",
 
       onCreated: "",
       onMounted: "",
@@ -4544,6 +4571,7 @@ export const widgetPanelOrder = {
     "detail-tabs",
     "detail-plain",
     "detail-pane",
+    "detail-temp",
     "tree-pane",
     "tree",
     "vf-dialog",
@@ -4625,18 +4653,46 @@ export const widgetPanelOrder = {
   ],
 };
 
+/**
+ * H5 版式：所有表单字段统一具备 h5Span（整宽/半宽）。
+ *
+ * 为什么用后处理而不是在 42 个字段定义里逐个展开 ...defaultH5Config：
+ *   1) 一处逻辑覆盖全部字段，不会漏；
+ *   2) 顺带覆盖 extension 通过 add*Schema 动态注册的组件；
+ *   3) 用函数调用而非展开运算符，不踩本文件头部注释里那个 Babel TDZ 的坑。
+ *
+ * 属性面板显不显示「H5 占宽」由 designer.hasConfig 决定，它查的是**原型 widget
+ * 的 options**（不是实例），所以必须在这里写进原型。
+ * 详见 docs/2026-08 xform H5 P0 实现规格.md §3.1。
+ */
+export const defaultH5Config = {
+  h5Span: "full", // 'full' | 'half'
+};
+
+function applyH5FieldDefaults(schema) {
+  if (!schema || !schema.formItemFlag || !schema.options) return schema;
+  if (!Object.prototype.hasOwnProperty.call(schema.options, "h5Span")) {
+    Object.assign(schema.options, defaultH5Config);
+  }
+  return schema;
+}
+
+[basicFields, advancedFields, businessFields, customFields].forEach((list) =>
+  list.forEach(applyH5FieldDefaults)
+);
+
 export function addContainerWidgetSchema(containerSchema) {
   containers.push(containerSchema);
 }
 
 export function addBasicFieldSchema(fieldSchema) {
-  basicFields.push(fieldSchema);
+  basicFields.push(applyH5FieldDefaults(fieldSchema));
 }
 
 export function addAdvancedFieldSchema(fieldSchema) {
-  advancedFields.push(fieldSchema);
+  advancedFields.push(applyH5FieldDefaults(fieldSchema));
 }
 
 export function addCustomWidgetSchema(widgetSchema) {
-  customFields.push(widgetSchema);
+  customFields.push(applyH5FieldDefaults(widgetSchema));
 }

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

@@ -68,6 +68,7 @@ import {
   isTemporaryTreeKey,
   syncTreeKeyReferences,
   sanitizeTreeRow,
+  stripTreeContainers,
 } from "../../utils/treeTableUtil";
 import { tableTreeMixins } from "../../../../mixins/tableTree/index.js";
 
@@ -2442,76 +2443,7 @@ modules = {
         };
       }
 
-      let exportItemConfig = null;
-      if (
-        this.widget.options.exportItemColumns &&
-        this.widget.options.exportItemColumns.length > 0
-      ) {
-        let formatKeys = [
-          "d1",
-          "d2",
-          "d3",
-          "d4",
-          "d5",
-          "n1",
-          "n2",
-          "n3",
-          "n4",
-          "n5",
-          "n6",
-          "n7",
-        ];
-        let exportItemColumns = this.widget.options.exportItemColumns.map(
-          (item) => {
-            let columnSlots = null;
-            let columnParams = {};
-            if (item.formatS === "render") {
-              let r = item.render
-                ? new Function("params", "h", item.render)
-                : null;
-              columnSlots = {
-                default: (params, h) => {
-                  return r ? r.call(this, params, h) : "";
-                },
-              };
-            } else if (formatKeys.includes(item.formatS)) {
-              columnSlots = {
-                default: (params, h) => {
-                  let cellValue = params.row[params.column.field];
-                  return this.getFormatterValue(
-                    cellValue,
-                    item.formatS,
-                    item.utcTransformEnabled
-                  );
-                },
-              };
-            }
-            if (item.exportType) {
-              columnParams.exportType = item.exportType;
-            }
-            return {
-              id: item.id,
-              title: item.title,
-              field: item.field,
-              params: columnParams,
-              slots: columnSlots,
-            };
-          }
-        );
-        exportItemConfig = {
-          scriptCode:
-            this.widget.options.exportItemScriptCode ||
-            this.widget.options.formScriptCode,
-          columns: exportItemColumns,
-          param: () => {
-            if (this.widget.options.exportItemParam) {
-              return this.handleCustomParam(
-                this.widget.options.exportItemParam
-              );
-            }
-          },
-        };
-      }
+      let exportItemConfig = this.buildExportItemConfig();
       let rowConfig = {};
       if (this.widget.options.tableRowHeight) {
         rowConfig.height = this.widget.options.tableRowHeight;
@@ -3228,7 +3160,9 @@ modules = {
       if (isItemExport(exportType)) {
         let $grid = this.getGridTable();
         let originOption = $grid.params.originOption;
-        let exportItemConfig = originOption.exportItemConfig || {};
+        // 导出按钮上单独维护了明细列时，配置随导出参数下发，优先于表格属性那套
+        let btnConfig = customParam?.exportParam?.exportItemConfig;
+        let exportItemConfig = btnConfig || originOption.exportItemConfig || {};
         if (exportItemConfig.scriptCode) {
           scriptCode = exportItemConfig.scriptCode;
         }
@@ -3339,30 +3273,134 @@ modules = {
       let tableRef = this.widget.id;
       return tableRef;
     },
-    /** 导出前按脱敏规则剔除列，实现见 textMaskUtil.markMaskedExportColumns。 */
-    markMaskedColumnsForExport() {
+    /**
+     * 导出前按脱敏规则剔除列，实现见 textMaskUtil.markMaskedExportColumns。
+     * @param {Array} [exportItemColumns] 本次明细导出实际使用的列；不传则取表格属性上配的那套。
+     */
+    markMaskedColumnsForExport(exportItemColumns) {
       markMaskedExportColumns(
         this.getGridTable(),
         buildTextMaskContext(
           this.getFormRef(),
           this.$store.getters.companyCode
-        )
+        ),
+        exportItemColumns
       );
     },
+    /**
+     * 明细导出列配置 → vxe 列：formatS/render 转成渲染插槽，exportType 落到 params。
+     * @param {Array} rawColumns 设计器维护的明细导出列。
+     * @returns {Array} vxe 列定义。
+     */
+    buildExportItemColumns(rawColumns) {
+      let formatKeys = [
+        "d1",
+        "d2",
+        "d3",
+        "d4",
+        "d5",
+        "n1",
+        "n2",
+        "n3",
+        "n4",
+        "n5",
+        "n6",
+        "n7",
+      ];
+      return rawColumns.map((item) => {
+        let columnSlots = null;
+        let columnParams = {};
+        if (item.formatS === "render") {
+          let r = item.render ? new Function("params", "h", item.render) : null;
+          columnSlots = {
+            default: (params, h) => {
+              return r ? r.call(this, params, h) : "";
+            },
+          };
+        } else if (formatKeys.includes(item.formatS)) {
+          columnSlots = {
+            default: (params, h) => {
+              let cellValue = params.row[params.column.field];
+              return this.getFormatterValue(
+                cellValue,
+                item.formatS,
+                item.utcTransformEnabled
+              );
+            },
+          };
+        }
+        if (item.exportType) {
+          columnParams.exportType = item.exportType;
+        }
+        return {
+          id: item.id,
+          title: item.title,
+          field: item.field,
+          params: columnParams,
+          slots: columnSlots,
+        };
+      });
+    },
+    /**
+     * 组装一份明细导出配置。导出列、脚本编码、自定义导出参数三项都可以由导出按钮单独维护，
+     * 各自独立生效：按钮留空的那一项回落到表格属性，三项都留空就是表格属性上原来那套。
+     * @param {Object} [overrides] 按钮级配置。
+     * @param {Array} [overrides.columns] 明细导出列。
+     * @param {String} [overrides.scriptCode] 明细导出脚本编码。
+     * @param {String} [overrides.paramScript] 明细导出查询参数脚本。
+     * @returns {Object|null} 两处都没维护列时返回 null。
+     */
+    buildExportItemConfig(overrides) {
+      let options = this.widget.options;
+      let o = overrides || {};
+      let hasColumns = o.columns && o.columns.length;
+      let columns = hasColumns ? o.columns : options.exportItemColumns;
+      if (!columns || !columns.length) return null;
+      let scriptCode = o.scriptCode || options.exportItemScriptCode;
+      let paramScript = o.paramScript || options.exportItemParam;
+      return {
+        scriptCode: scriptCode || options.formScriptCode,
+        columns: this.buildExportItemColumns(columns),
+        // 取数参数脚本与表格上其它脚本一样走 handleCustomEvent（它负责注入 dataId /
+        // formCode 并统一弹前端脚本异常）。原先写的 handleCustomParam 全库没有定义，
+        // 配了「明细导出查询参数」的表格一点导出就抛 TypeError。
+        param: () => {
+          if (paramScript) {
+            return this.handleCustomEvent(paramScript);
+          }
+        },
+      };
+    },
     /**
      * 使用统一 Excel 导出器导出当前表格。
      * @param {Object} option 导出参数；prefix 为空时自动使用当前服务前缀。
+     *   option.exportItemColumns / exportItemScriptCode / exportItemParam 为按钮上维护的
+     *   明细导出列、脚本编码与取数参数脚本，三项各自独立：传了哪项就以哪项为准（同一张表格
+     *   可以挂多个明细导出按钮、各导各自的列、各走各自的脚本），组装成 exportItemConfig 随
+     *   导出参数下发，下游（字段选择弹框 / 分页取数 / 脱敏剔除）一律优先读它，读不到才回落
+     *   表格属性那套。
      */
     exportData(option) {
-      this.markMaskedColumnsForExport();
+      let exportOption = { ...option };
+      let itemColumns = exportOption.exportItemColumns;
+      let itemScriptCode = exportOption.exportItemScriptCode;
+      let itemParam = exportOption.exportItemParam;
+      delete exportOption.exportItemColumns;
+      delete exportOption.exportItemScriptCode;
+      delete exportOption.exportItemParam;
+      let hasOverride = itemColumns?.length || itemScriptCode || itemParam;
+      if (isItemExport(exportOption.type) && hasOverride) {
+        exportOption.exportItemConfig = this.buildExportItemConfig({
+          columns: itemColumns,
+          scriptCode: itemScriptCode,
+          paramScript: itemParam,
+        });
+      }
+      this.markMaskedColumnsForExport(exportOption.exportItemConfig?.columns);
       let tableRef = this.getTableRef();
       let serviceName = this.getFormRef().reportTemplate.serviceName;
-      option.prefix = option.prefix || "/" + serviceName;
-      let exportTableTarget = this.$refs.exportTable;
-      let getExportTableRef = () => {
-        return exportTableTarget;
-      };
-      this.$excelExport({ targetRef: tableRef, ...option });
+      exportOption.prefix = exportOption.prefix || "/" + serviceName;
+      this.$excelExport({ targetRef: tableRef, ...exportOption });
     },
     async deleteRow(row, rowIndex) {
       let isTreeTable = this.widget.options.isTreeTable;
@@ -3533,7 +3571,7 @@ modules = {
         let newData = this.createNewTableData();
         tableRows.push(newData);
       }
-      this.setValue(tableRows);
+      this.setValue(this.stripTreeContainerRows(tableRows));
       this.$nextTick(() => {
         this.handleWbs();
       });
@@ -4520,7 +4558,7 @@ modules = {
               await reconcileGrid.clearActived();
             }
             if (rebuildTreeAfterSave && !responseAlreadyApplied) {
-              this.setValue(treeTableRows);
+              this.setValue(this.stripTreeContainerRows(treeTableRows));
               treeSnapshotApplied = true;
               await new Promise((resolve) => this.$nextTick(resolve));
             }
@@ -4692,7 +4730,7 @@ modules = {
         } else {
           tableRows.splice(0, 0, newRow);
         }
-        this.setValue(tableRows);
+        this.setValue(this.stripTreeContainerRows(tableRows));
         this.$nextTick(() => {
           this.handleWbs();
           if (isEditTable) {
@@ -4714,7 +4752,7 @@ modules = {
           } else {
             tableRows.splice(0, 0, newRow);
           }
-          this.setValue(tableRows);
+          this.setValue(this.stripTreeContainerRows(tableRows));
           this.$nextTick(() => {
             this.handleWbs();
             // setValue 已浅克隆所有行，obj.row 是失效引用，须按 _X_ROW_KEY 找回新行
@@ -4802,7 +4840,7 @@ modules = {
       });
       this.validateNewTreeRows(newRows, treeContext);
       tableRows.push(...newRows);
-      this.setValue(tableRows);
+      this.setValue(this.stripTreeContainerRows(tableRows));
       this.$nextTick(() => {
         this.handleWbs();
         if (parent) {
@@ -4811,6 +4849,26 @@ modules = {
         }
       });
     },
+    /**
+     * 去掉 VXE 建树时写回行对象的容器字段（children / mapChildren）。
+     *
+     * 删除、排序这类「改扁平数组再整表重载」的操作必须先剥容器：容器是上一次
+     * 渲染的产物，已被移出数组的节点仍挂在存活父行下，setValue 里的
+     * canonicalizeTreeInput 会顺着容器把它们收回来，删除与排序因此静默失效。
+     *
+     * 只对 isTreeTable（强制 transform，父子关系由 parentField 表达）生效；
+     * 靠 children 表达层级的表原样返回，剥掉会丢层级。
+     * @param {Array} rows 取自表单模型的扁平活动行。
+     * @returns {Array} 可安全交给 setValue 的行数组。
+     */
+    stripTreeContainerRows(rows) {
+      if (!this.widget.options.isTreeTable) {
+        return rows || [];
+      }
+      return stripTreeContainers(rows || [], {
+        fields: this.getTreeFields(),
+      });
+    },
     /**
      * 收集节点全部后代的 _X_ROW_KEY（不含节点自身）。
      * 兼容嵌套结构（children 字段）与扁平结构（parentField 关联）两种数据形态。
@@ -4890,7 +4948,7 @@ modules = {
         });
       }
       let newRows = tableRows.filter((item) => !delKeys.has(item._X_ROW_KEY));
-      this.setValue(newRows);
+      this.setValue(this.stripTreeContainerRows(newRows));
       this.$nextTick(() => {
         this.handleWbs();
       });
@@ -5148,7 +5206,7 @@ modules = {
         } else {
           tableRows.splice(0, 0, newRow);
         }
-        this.setValue(tableRows);
+        this.setValue(this.stripTreeContainerRows(tableRows));
         this.$nextTick(() => {
           this.handleWbs();
         });
@@ -5165,7 +5223,7 @@ modules = {
           } else {
             tableRows.splice(0, 0, newRow);
           }
-          this.setValue(tableRows);
+          this.setValue(this.stripTreeContainerRows(tableRows));
           this.$nextTick(() => {
             this.handleWbs();
             // setValue 已浅克隆所有行，obj.row 是失效引用，须按 _X_ROW_KEY 找回新行
@@ -5362,7 +5420,7 @@ modules = {
             );
             tableRows.splice(currentIndex, 1);
             tableRows.splice(prevIndex, 0, row);
-            this.setValue(tableRows);
+            this.setValue(this.stripTreeContainerRows(tableRows));
             this.$nextTick(() => {
               this.handleWbs();
             });
@@ -5411,7 +5469,7 @@ modules = {
             );
             tableRows.splice(currentIndex, 1);
             tableRows.splice(nextIndex, 0, row);
-            this.setValue(tableRows);
+            this.setValue(this.stripTreeContainerRows(tableRows));
             this.$nextTick(() => {
               this.handleWbs();
             });
@@ -5488,7 +5546,7 @@ modules = {
         rows.forEach((row, index1) => {
           items.splice(index + index1, 0, row);
         });
-        this.setValue(items);
+        this.setValue(this.stripTreeContainerRows(items));
         this.$nextTick(() => {
           this.handleWbs();
         });
@@ -5783,7 +5841,7 @@ modules = {
       if (this.designState) return;
       this.$on("setFormData", (o) => {
         let rows = this.formModel[this.fieldKeyName] || [];
-        this.setValue(rows);
+        this.setValue(this.stripTreeContainerRows(rows));
       });
     },
     /** @param {Object} widget 组件 schema。@param {Array<String>} ignoreFields 忽略字段。@returns {Boolean} 是否处理禁用状态。 */