@gct-paas/word 0.1.25 → 0.1.27

package/dist/index.es.js

@@ -27393,6 +27393,240 @@ function isClickPaperWidgetAllNode(node) {
   const raw = node.raw;
   return raw.isPageWidgetRun;
 }
+const EmptySymbolTypeConst = {
+  "/": "/",
+  "--": "--",
+  "——": "——",
+  NA: "NA",
+  "N/A": "N/A"
+};
+const ViewStateTypeConst = {
+  /** 文本显示 */
+  Readonly: "readonly",
+  /** 组件显示-禁用 */
+  Disabled: "disabled",
+  /** 组件显示-跟随设计 */
+  Auto: "auto"
+};
+const RenderCompTypeConst = {
+  /** 圆形 */
+  Radio: "radio",
+  /** 方形 */
+  Checkbox: "checkbox",
+  /** 下拉 */
+  Select: "select"
+};
+const BooleanShowModeTypeConst = {
+  /** 只显示真 */
+  OnlyTrue: "onlyTrue",
+  /** 只显示真 */
+  OnlyFalse: "onlyFalse",
+  /** 同时显示真和假 */
+  Both: "both"
+};
+const LabelPositionTypeConst = {
+  /** 文字在前 */
+  Before: "before",
+  /** 文字在后 */
+  After: "after"
+};
+const OrientationTypeConst = {
+  /** 纵 */
+  Portrait: "portrait",
+  /** 横 */
+  Landscape: "landscape"
+};
+const DecimalDisplayModeTypeConst = {
+  /** 显示百分比（%） */
+  PERCENT: "percent",
+  /** 显示原始数值 */
+  ORIGIN: "origin"
+};
+const RangeValidateModeTypeConst = {
+  /** 不校验 */
+  No_Validate: "NoValidate",
+  /** 固定输入校验 */
+  Fixed_Number: "FixedNumber",
+  /** 变量校验 */
+  Variable_Validate: "VariableValidate"
+};
+const FieldSysVarDefaultValueConst = {
+  NULL: "",
+  /** 系统登录用户 */
+  CURRENT_USER: "CURRENT_USER",
+  /** 当前登录用户主部门 */
+  CURRENT_ORG: "CURRENT_ORG"
+};
+const SignatureNumberTypeConst = {
+  /** 单人签名 */
+  SIGNATURE_SINGLE: "signature_single",
+  /** 多人签名 */
+  SIGNATURE_MULTIPLE: "signature_multiple"
+};
+const SignatureTypeConst = {
+  /** 仅签名 */
+  SIGNATURE_ONLY: "signature_only",
+  /** 签名及日期 */
+  SIGNATURE_DATE: "signature_date",
+  /** 签名及日期时间 */
+  SIGNATURE_DATETIME: "signature_datetime"
+};
+const SignatureTimeTypeConst = {
+  /** 跟随签名 */
+  FOLLOW_SIGNATURE: "follow_signature",
+  /** 填充新字段 */
+  POPULATE_FIELD: "populate_field"
+};
+const SignDisplayTypeConst = {
+  /** 垂直显示 */
+  VERTICAL: "vertical",
+  /** 水平显示 */
+  HORIZONTAL: "horizontal"
+};
+const ImageDisplayModeConst = {
+  /** 自定义 */
+  CUSTOM: "CUSTOM",
+  /** 自适应 */
+  ADAPTIVE: "ADAPTIVE"
+};
+const FieldDependencyTypeConst = {
+  /**隐藏 */
+  Hidden: "hidden",
+  /**只读 */
+  Readonly: "readonly",
+  /**禁用 */
+  Disabled: "disabled",
+  /**必填 */
+  Required: "required",
+  /**赋值 */
+  Assignment: "assignment"
+};
+const AssignmentStrategyTypeConst = {
+  /**始终覆盖 */
+  AlwaysCover: "alwaysCover",
+  /**不覆盖已修改 */
+  NotCovered: "notCovered"
+};
+const FormTypeConst = {
+  /** 基础表单 */
+  BASE: "BASE",
+  /** 流程表单 */
+  PROCESS: "PROCESS",
+  /** 视图表单 */
+  VIEW: "VIEW",
+  /** 文本表单 */
+  TEXT: "TEXT",
+  /** 文件表单 */
+  FILE: "FILE"
+};
+const ViewTypeConst = {
+  /** 视图模型（查询视图） */
+  VIEW_MODEL: "VIEW_MODEL",
+  /** SQL数据视图 */
+  VIEW_SQL: "SQL",
+  /** 自定义模型 */
+  VIEW_JS: "JS"
+};
+const BwipCodeTypeConst = {
+  Code39: "code39",
+  Code128: "code128",
+  QRCode: "qrcode",
+  GS1DataMatrix: "gs1datamatrix"
+};
+const ValueTypeConst = {
+  /** 固定值 */
+  Fixed: "fixed",
+  /** 字段 */
+  Field: "field",
+  /** 公式 */
+  Formula: "formula"
+};
+const ImageSizeModeTypeConst = {
+  /** 自适应，响应式的适应外层容器的大小 */
+  RESPONSIVE: "responsive",
+  /** 固定值，高宽设了多少就是多少 */
+  FIXED: "fixed"
+};
+const DiagonalDirectionTypeConst = {
+  /** 从左上到右下  */
+  Forward: "forward",
+  /** 从右上到左下 / */
+  Backward: "backward"
+};
+function resolveDisplayStatusFromAuth(options) {
+  const { info, readonlyString, editString } = options;
+  if (isEmpty(info)) return null;
+  if (info.edit && !info.readonly) {
+    return editString;
+  }
+  if (info.readonly && !info.edit) {
+    return readonlyString;
+  }
+  return null;
+}
+function isWidgetMetaInteractionBlockedInFillMode(doc, widgetMeta) {
+  if (!doc.isInFillMode() || !widgetMeta) return false;
+  const state = resolveWidgetState({
+    doc,
+    viewState: widgetMeta.props.viewState,
+    required: widgetMeta.props.required,
+    newRequired: widgetMeta.props.newSpecificConfig?.newRequired,
+    readonly: widgetMeta.props.readonly,
+    newReadonly: widgetMeta.props.newSpecificConfig?.newReadonly,
+    disabled: widgetMeta.props.disabled,
+    newDisabled: widgetMeta.props.newSpecificConfig?.newDisabled,
+    cannotInput: widgetMeta.props.cannotInput,
+    isLinkedModelField: widgetMeta.field?.isLinkedModelField,
+    fieldLink: widgetMeta.field?.fieldLink || "",
+    modelLink: widgetMeta.field?.modelLink || ""
+  });
+  const isReadonly = state.displayStatus === "readonly-component" || state.displayStatus === "readonly-text";
+  return state.disabled || isReadonly;
+}
+function resolveWidgetState(ctx) {
+  const required4 = ctx.doc.isInEditMode() ? !!ctx.required : !!ctx.newRequired;
+  let readonly2 = false;
+  if (ctx.doc.isInEditMode()) {
+    readonly2 = false;
+  } else if (ctx.doc.isInPrintMode()) {
+    readonly2 = true;
+  } else if (ctx.newReadonly !== void 0) {
+    readonly2 = !!ctx.newReadonly;
+  }
+  const disabled = ctx.doc.isInEditMode() ? !!ctx.disabled : !!ctx.newDisabled;
+  const readonlyString = ctx.viewState === ViewStateTypeConst.Disabled || ctx.viewState === ViewStateTypeConst.Auto ? "readonly-component" : "readonly-text";
+  const editString = readonly2 ? "readonly-component" : "edit-component";
+  let displayStatus;
+  const fromAuth = resolveDisplayStatusFromAuth({
+    info: ctx.doc.docRuntimeMeta.handleInfo.bpmnFieldAuthMap?.[`${ctx.modelLink}.${ctx.fieldLink}`],
+    readonlyString,
+    editString
+  });
+  if (ctx.isLinkedModelField || ctx.cannotInput) {
+    displayStatus = readonlyString;
+  } else if (ctx.doc.mode === DocModeTypeConst.Print) {
+    displayStatus = readonlyString;
+  } else if (ctx.doc.mode === DocModeTypeConst.Fill) {
+    if (fromAuth) {
+      displayStatus = fromAuth;
+    } else if (ctx.doc.formType !== FormTypeConst.PROCESS) {
+      displayStatus = editString;
+    } else {
+      const bpmnType = ctx.doc.docRuntimeMeta.handleInfo?.bpmnType;
+      const isReadonlyNode = bpmnType === "bpmnApproval" || bpmnType === "bpmnJudge";
+      displayStatus = isReadonlyNode ? readonlyString : editString;
+    }
+  } else {
+    displayStatus = editString;
+  }
+  const finalDisabled = displayStatus === "edit-component" ? disabled : ctx.viewState === ViewStateTypeConst.Disabled || disabled;
+  return {
+    required: required4,
+    readonly: readonly2,
+    disabled: finalDisabled,
+    displayStatus
+  };
+}
 class TextHitHandler {
   handleHitDetection(doc, node, actualX, actualY) {
     const base = getBaseMetaInfo(node);
@@ -27435,6 +27669,9 @@ class TextHitHandler {
     if (doc.isInFillMode() && !isClickSelectAllNode(node)) {
       return null;
     }
+    if (doc.isInFillMode() && isClickSelectAllNode(node) && validateTextWidgetMarker(node.raw, true) && isWidgetMetaInteractionBlockedInFillMode(doc, node.raw.widgetMeta)) {
+      return null;
+    }
     if (Array.isArray(node.charOffsets) && node.charOffsets.length > 0) {
       return resolveCharHit(node, base, actualX);
     }
@@ -30708,166 +30945,81 @@ function toFixedPoint(str, e, z2) {
   return str;
 }
 var BigNumber = clone();
-const EmptySymbolTypeConst = {
-  "/": "/",
-  "--": "--",
-  "——": "——",
-  NA: "NA",
-  "N/A": "N/A"
-};
-const ViewStateTypeConst = {
-  /** 文本显示 */
-  Readonly: "readonly",
-  /** 组件显示-禁用 */
-  Disabled: "disabled",
-  /** 组件显示-跟随设计 */
-  Auto: "auto"
-};
-const RenderCompTypeConst = {
-  /** 圆形 */
-  Radio: "radio",
-  /** 方形 */
-  Checkbox: "checkbox",
-  /** 下拉 */
-  Select: "select"
-};
-const BooleanShowModeTypeConst = {
-  /** 只显示真 */
-  OnlyTrue: "onlyTrue",
-  /** 只显示真 */
-  OnlyFalse: "onlyFalse",
-  /** 同时显示真和假 */
-  Both: "both"
-};
-const LabelPositionTypeConst = {
-  /** 文字在前 */
-  Before: "before",
-  /** 文字在后 */
-  After: "after"
-};
-const OrientationTypeConst = {
-  /** 纵 */
-  Portrait: "portrait",
-  /** 横 */
-  Landscape: "landscape"
-};
-const DecimalDisplayModeTypeConst = {
-  /** 显示百分比（%） */
-  PERCENT: "percent",
-  /** 显示原始数值 */
-  ORIGIN: "origin"
-};
-const RangeValidateModeTypeConst = {
-  /** 不校验 */
-  No_Validate: "NoValidate",
-  /** 固定输入校验 */
-  Fixed_Number: "FixedNumber",
-  /** 变量校验 */
-  Variable_Validate: "VariableValidate"
-};
-const FieldSysVarDefaultValueConst = {
-  NULL: "",
-  /** 系统登录用户 */
-  CURRENT_USER: "CURRENT_USER",
-  /** 当前登录用户主部门 */
-  CURRENT_ORG: "CURRENT_ORG"
-};
-const SignatureNumberTypeConst = {
-  /** 单人签名 */
-  SIGNATURE_SINGLE: "signature_single",
-  /** 多人签名 */
-  SIGNATURE_MULTIPLE: "signature_multiple"
-};
-const SignatureTypeConst = {
-  /** 仅签名 */
-  SIGNATURE_ONLY: "signature_only",
-  /** 签名及日期 */
-  SIGNATURE_DATE: "signature_date",
-  /** 签名及日期时间 */
-  SIGNATURE_DATETIME: "signature_datetime"
-};
-const SignatureTimeTypeConst = {
-  /** 跟随签名 */
-  FOLLOW_SIGNATURE: "follow_signature",
-  /** 填充新字段 */
-  POPULATE_FIELD: "populate_field"
-};
-const SignDisplayTypeConst = {
-  /** 垂直显示 */
-  VERTICAL: "vertical",
-  /** 水平显示 */
-  HORIZONTAL: "horizontal"
-};
-const ImageDisplayModeConst = {
-  /** 自定义 */
-  CUSTOM: "CUSTOM",
-  /** 自适应 */
-  ADAPTIVE: "ADAPTIVE"
-};
-const FieldDependencyTypeConst = {
-  /**隐藏 */
-  Hidden: "hidden",
-  /**只读 */
-  Readonly: "readonly",
-  /**禁用 */
-  Disabled: "disabled",
-  /**必填 */
-  Required: "required",
-  /**赋值 */
-  Assignment: "assignment"
-};
-const AssignmentStrategyTypeConst = {
-  /**始终覆盖 */
-  AlwaysCover: "alwaysCover",
-  /**不覆盖已修改 */
-  NotCovered: "notCovered"
-};
-const FormTypeConst = {
-  /** 基础表单 */
-  BASE: "BASE",
-  /** 流程表单 */
-  PROCESS: "PROCESS",
-  /** 视图表单 */
-  VIEW: "VIEW",
-  /** 文本表单 */
-  TEXT: "TEXT",
-  /** 文件表单 */
-  FILE: "FILE"
-};
-const ViewTypeConst = {
-  /** 视图模型（查询视图） */
-  VIEW_MODEL: "VIEW_MODEL",
-  /** SQL数据视图 */
-  VIEW_SQL: "SQL",
-  /** 自定义模型 */
-  VIEW_JS: "JS"
-};
-const BwipCodeTypeConst = {
-  Code39: "code39",
-  Code128: "code128",
-  QRCode: "qrcode",
-  GS1DataMatrix: "gs1datamatrix"
-};
-const ValueTypeConst = {
-  /** 固定值 */
-  Fixed: "fixed",
-  /** 字段 */
-  Field: "field",
-  /** 公式 */
-  Formula: "formula"
-};
-const ImageSizeModeTypeConst = {
-  /** 自适应，响应式的适应外层容器的大小 */
-  RESPONSIVE: "responsive",
-  /** 固定值，高宽设了多少就是多少 */
-  FIXED: "fixed"
-};
-const DiagonalDirectionTypeConst = {
-  /** 从左上到右下  */
-  Forward: "forward",
-  /** 从右上到左下 / */
-  Backward: "backward"
-};
+var FIELD_TYPE = /* @__PURE__ */ ((FIELD_TYPE2) => {
+  FIELD_TYPE2["PRIMARY_KEY"] = "primary_key";
+  FIELD_TYPE2["ASSOCIATED_PRIMARY_KEY"] = "associated_primary_key";
+  FIELD_TYPE2["TEXT"] = "text";
+  FIELD_TYPE2["LONG_TEXT"] = "long_text";
+  FIELD_TYPE2["INTEGER"] = "integer";
+  FIELD_TYPE2["LONG"] = "long";
+  FIELD_TYPE2["DOUBLE"] = "double";
+  FIELD_TYPE2["DECIMAL"] = "decimal";
+  FIELD_TYPE2["BOOLEAN"] = "boolean";
+  FIELD_TYPE2["DATE"] = "date";
+  FIELD_TYPE2["TIME"] = "time";
+  FIELD_TYPE2["DATE_TIME"] = "date_time";
+  FIELD_TYPE2["IMAGE"] = "image";
+  FIELD_TYPE2["ATTACHMENT"] = "attachment";
+  FIELD_TYPE2["SERIAL"] = "serial_number";
+  FIELD_TYPE2["MASTERSLAVE"] = "master_slave";
+  FIELD_TYPE2["USER"] = "user";
+  FIELD_TYPE2["USER_MULTI"] = "user_multi";
+  FIELD_TYPE2["ORG"] = "org";
+  FIELD_TYPE2["ORG_MULTI"] = "org_multi";
+  FIELD_TYPE2["ENUM"] = "enum";
+  FIELD_TYPE2["ENUM_MULTI"] = "enum_multi";
+  FIELD_TYPE2["OPTION"] = "option";
+  FIELD_TYPE2["OPTION_MULTI"] = "option_multi";
+  FIELD_TYPE2["REF"] = "ref";
+  FIELD_TYPE2["REF_MULTI"] = "ref_multi";
+  FIELD_TYPE2["RDO_REF"] = "rdo_ref";
+  FIELD_TYPE2["EXPRESSION"] = "expression";
+  FIELD_TYPE2["EXPRESSION_CONDITION"] = "expression_condition";
+  FIELD_TYPE2["FUNCTION"] = "function";
+  FIELD_TYPE2["AGG"] = "agg";
+  FIELD_TYPE2["ESOP"] = "esop";
+  FIELD_TYPE2["TRANSACTION"] = "transaction";
+  FIELD_TYPE2["LABEL_TEMPLATE"] = "label_template";
+  FIELD_TYPE2["LABEL_TEMPLATE_REF"] = "label_template_ref";
+  FIELD_TYPE2["SERIALRULE"] = "serial_number_rule";
+  FIELD_TYPE2["PRINTER"] = "printer";
+  FIELD_TYPE2["MESSAGE_TMPL"] = "message_tmpl";
+  FIELD_TYPE2["RANGE_USER"] = "range_user";
+  FIELD_TYPE2["SIGNATURE"] = "electronic_signature";
+  FIELD_TYPE2["ONLINE_FORM_TEMPLATE"] = "online_form_tmpl";
+  FIELD_TYPE2["E_DHR_TEMPLATE"] = "edhr_tmpl";
+  FIELD_TYPE2["DATA_TABLE_FORMULA"] = "data_table_formula";
+  FIELD_TYPE2["READONLYCMP"] = "readonlycmp";
+  FIELD_TYPE2["MATERIAL_NO"] = "material_no";
+  FIELD_TYPE2["PRODUCT"] = "product";
+  FIELD_TYPE2["DEVICE"] = "device";
+  FIELD_TYPE2["Biz_Process"] = "biz_process";
+  FIELD_TYPE2["Approval_Process"] = "approval_process";
+  FIELD_TYPE2["MFG_ORDER"] = "mfg_order";
+  FIELD_TYPE2["RECORD_NO"] = "record_no";
+  FIELD_TYPE2["TRACE_DATE"] = "trace_date";
+  FIELD_TYPE2["ROUTING_OPERATION"] = "routing_operation";
+  FIELD_TYPE2["GOOD_QTY"] = "good_qty";
+  FIELD_TYPE2["NOT_GOOD_QTY"] = "not_good_qty";
+  FIELD_TYPE2["REPORT_START_TIME"] = "report_start_time";
+  FIELD_TYPE2["REPORT_END_TIME"] = "report_end_time";
+  FIELD_TYPE2["WORK_HOURS"] = "work_hours";
+  FIELD_TYPE2["PRODUCTION_DATE"] = "production_date";
+  FIELD_TYPE2["REPORTER"] = "reporter";
+  FIELD_TYPE2["NOT_GOOD_REASON"] = "not_good_reason";
+  FIELD_TYPE2["NOT_GOOD_GROUP"] = "not_good_group";
+  FIELD_TYPE2["SCRAP_REASON"] = "scrap_reason";
+  FIELD_TYPE2["SCRAP_GROUP"] = "scrap_group";
+  FIELD_TYPE2["SCRAP_QTY"] = "scrap_qty";
+  FIELD_TYPE2["SCRAP_MATERIAL"] = "scrap_material";
+  FIELD_TYPE2["SCRAP_MATERIAL_NO"] = "scrap_material_no";
+  FIELD_TYPE2["DESTRUCTIVE_TEST_QTY"] = "destructive_test_qty";
+  FIELD_TYPE2["PRODUCT_CHECK_QTY"] = "product_check_qty";
+  FIELD_TYPE2["MATERIAL_CHECK_QTY"] = "material_check_qty";
+  FIELD_TYPE2["DEVICE_REF"] = "device_ref";
+  FIELD_TYPE2["DEVICE_REF_MULTI"] = "device_ref_multi";
+  return FIELD_TYPE2;
+})(FIELD_TYPE || {});
 function getValue$1(value, multiple) {
   if (multiple) {
     return Array.isArray(value) ? value : value?.split(",").filter((i) => !isNil(i)) ?? [];
@@ -30916,6 +31068,18 @@ function toBoolean(value) {
   }
   return Boolean(parseInt(value));
 }
+function toFormatValue(fieldType, value) {
+  if ([FIELD_TYPE.INTEGER, FIELD_TYPE.LONG].includes(fieldType)) {
+    const _val_ = parseInt(value);
+    return isNaN(_val_) ? null : _val_;
+  } else if (fieldType === FIELD_TYPE.DECIMAL) {
+    const _val_ = parseFloat(value);
+    return isNaN(_val_) ? null : _val_;
+  } else if (fieldType === FIELD_TYPE.BOOLEAN) {
+    return toBoolean(value);
+  }
+  return value;
+}
 function toDictValue(field, value, row) {
   const dictValue = row?._DICT?.[field]?.[value];
   if (Array.isArray(dictValue)) {
@@ -42309,7 +42473,8 @@ class TableExpander {
   initializeBoundedItemDataIndex() {
     this.table.bounded.forEach((region) => {
       if (region.itemRegion) {
-        const map2 = this.computeDataIndexMap(region, region.itemRegion);
+        const fillDirection = region.widgetMeta?.props?.fillDirection ?? "x";
+        const map2 = this.computeDataIndexMap(region, region.itemRegion, fillDirection);
         map2.forEach((obj, key) => {
           this.boundedCellDataIndexMap.set(key, {
             dataIndex: obj.dataIndex,
@@ -42319,10 +42484,22 @@ class TableExpander {
       }
     });
   }
+  // [数据关联]上、下超出子表范围的部分需要撑开
+  getDataGroup2DItemRange(range3, itemRange) {
+    const {
+      start: { row: startRow },
+      end: { row: endRow }
+    } = itemRange;
+    const expandedRange = cloneDeep(pick(range3, "start", "end"));
+    expandedRange.start.row = startRow;
+    expandedRange.end.row = endRow;
+    return expandedRange;
+  }
   initializeDataGroup2DDataIndex() {
     this.table.checkTable.forEach((region) => {
       if (region.itemRegion) {
-        const map2 = this.computeDataIndexMap(region, region.itemRegion);
+        const expandedRange = this.getDataGroup2DItemRange(region, region.itemRegion);
+        const map2 = this.computeDataIndexMap(expandedRange, region.itemRegion);
         map2.forEach((obj, key) => {
           this.checkTableCellDataIndexMap.set(key, {
             dataIndex: obj.dataIndex,
@@ -42333,7 +42510,8 @@ class TableExpander {
     });
     this.table._2DTable.forEach((region) => {
       if (region.itemRegion) {
-        const map2 = this.computeDataIndexMap(region, region.itemRegion);
+        const expandedRange = this.getDataGroup2DItemRange(region, region.itemRegion);
+        const map2 = this.computeDataIndexMap(expandedRange, region.itemRegion);
         map2.forEach((obj, key) => {
           this._2DTableCellDataIndexMap.set(key, {
             dataIndex: obj.dataIndex,
@@ -42580,16 +42758,18 @@ class TableExpander {
    *
    * @param range - 整体范围 {start:{row,col} end:{row,col}}，表示需要分配数据项的总区域
    * @param itemRange - 局部范围 {start:{row,col} end:{row,col}}，表示一个数据项的模板大小
+   * @param fillDirection - `x`：先横向扩展再换行；`y`：先纵向扩展再换列（与 `x` 的行列外层循环互为镜像）
    * @returns Map，key 为字符串 "row,col"，值为对应的数据索引
    *
-   * 算法说明：
+   * 横向（x）算法：
    * 1. 局部范围内的单元格数据索引为 0
    * 2. 从局部范围右侧开始，按 itemWidth 宽度逐个扩展数据项
-   * 3. 当同一行内无法再放置更多数据项时（列数不足），换行到下一个 itemHeight 行
-   * 4. 换行后从整体范围的最左侧列开始继续扩展，而不是从局部范围的列开始
-   * 5. 如果行数超出整体范围则停止
+   * 3. 当同一行带内无法再放置更多数据项时，换到下一个 itemHeight 行带
+   * 4. 换行后从整体范围的最左侧列开始继续扩展
+   *
+   * 纵向（y）算法：与 x 对称——先在模板列宽内从模板下方按 itemHeight 向下铺，再换到下一组列（列宽对齐 itemWidth），新一组列从整体范围最顶行重新起铺。
    */
-  computeDataIndexMap(range3, itemRange) {
+  computeDataIndexMap(range3, itemRange, fillDirection = "x") {
     const indexMap = /* @__PURE__ */ new Map();
     const itemWidth = itemRange.end.col - itemRange.start.col + 1;
     const itemHeight = itemRange.end.row - itemRange.start.row + 1;
@@ -42602,28 +42782,43 @@ class TableExpander {
     }
     const tlr = itemRange.start.row;
     const tlc = itemRange.start.col;
+    const stampBlock = (blockTopRow, blockLeftCol, di) => {
+      for (let r = blockTopRow; r < blockTopRow + itemHeight; r++) {
+        for (let c2 = blockLeftCol; c2 < blockLeftCol + itemWidth; c2++) {
+          const refR = tlr + r - blockTopRow;
+          const refC = tlc + c2 - blockLeftCol;
+          const refCell = this.table.getChildAt(refR).getChildAt(refC);
+          indexMap.set(`${r},${c2}`, {
+            dataIndex: di,
+            refPos: `${refR},${refC}`,
+            refCellId: refCell.id
+          });
+        }
+      }
+    };
     let dataIndex = 1;
-    let currentRow = itemRange.start.row;
-    let currentCol = itemRange.end.col + 1;
-    while (currentRow + itemHeight - 1 <= range3.end.row) {
+    if (fillDirection === "x") {
+      let currentRow = itemRange.start.row;
+      let currentCol = itemRange.end.col + 1;
+      while (currentRow + itemHeight - 1 <= range3.end.row) {
+        while (currentCol + itemWidth - 1 <= range3.end.col) {
+          stampBlock(currentRow, currentCol, dataIndex++);
+          currentCol += itemWidth;
+        }
+        currentRow += itemHeight;
+        currentCol = range3.start.col;
+      }
+    } else {
+      let currentCol = itemRange.start.col;
+      let currentRow = itemRange.end.row + 1;
       while (currentCol + itemWidth - 1 <= range3.end.col) {
-        for (let r = currentRow; r < currentRow + itemHeight; r++) {
-          for (let c2 = currentCol; c2 < currentCol + itemWidth; c2++) {
-            const refR = tlr + r - currentRow;
-            const refC = tlc + c2 - currentCol;
-            const refCell = this.table.getChildAt(refR).getChildAt(refC);
-            indexMap.set(`${r},${c2}`, {
-              dataIndex,
-              refPos: `${refR},${refC}`,
-              refCellId: refCell.id
-            });
-          }
+        while (currentRow + itemHeight - 1 <= range3.end.row) {
+          stampBlock(currentRow, currentCol, dataIndex++);
+          currentRow += itemHeight;
         }
         currentCol += itemWidth;
-        dataIndex++;
+        currentRow = range3.start.row;
       }
-      currentRow += itemHeight;
-      currentCol = range3.start.col;
     }
     return indexMap;
   }
@@ -42673,7 +42868,9 @@ class TableInfoProvider {
         xDataIndex: cell.xDataIndex,
         yDataIndex: cell.yDataIndex,
         valuePath: region?.valuePath,
-        widgetMeta: region?.widgetMeta
+        widgetMeta: region?.widgetMeta,
+        // 数据关联
+        dataGroup2DRange: pick(region?.itemRegion, "start", "end")
       };
     } else if (cell.boundedId) {
       const region = this.wtbl.getBoundedById(cell.boundedId);
@@ -42691,7 +42888,9 @@ class TableInfoProvider {
         type: "check-table",
         dataIndex: cell.dataIndex,
         valuePath: region?.valuePath,
-        widgetMeta: region?.widgetMeta
+        widgetMeta: region?.widgetMeta,
+        // 数据关联
+        dataGroup2DRange: pick(region?.itemRegion, "start", "end")
       };
     } else if (cell.headerId) {
       return {
@@ -44390,6 +44589,18 @@ class InteractionController {
   clearActiveTableId() {
     this.doc.interactionManager.clear("activeTableId");
   }
+  /** 填报模式下点击只读/禁用组件：与点空白一致，收起字段焦点并回到纸张 */
+  settleFillModeNonInteractiveField(secRefId) {
+    this.onActivePanelData({
+      type: this.doc.interactionManager.get("isHeaderFooterEdit") ? "panel:paper-header-footer" : "panel:paper",
+      extra: { secRefId }
+    });
+    this.onFocusWidget({ modelId: "", focusTick: 0 });
+    this.doc.eventManager.cursorController.applyCursorPhase({
+      phase: "preview",
+      syncCaret: true
+    });
+  }
   syncActiveTableByMeta(meta) {
     if (!meta?.line || meta.line.lineType !== "tablerow" || isClickPaperWidgetAllNode(meta)) {
       this.clearActiveTableId();
@@ -44411,7 +44622,13 @@ class InteractionController {
     }
     if (meta) {
       if (isClickSelectAllNode(meta)) {
-        const widgetMeta = meta.raw.widgetMeta;
+        const raw = meta.raw;
+        const blockedInFill = isFillMode && isWidgetMetaInteractionBlockedInFillMode(this.doc, raw.widgetMeta);
+        if (blockedInFill) {
+          this.settleFillModeNonInteractiveField(meta.secRefId);
+          return;
+        }
+        const widgetMeta = raw.widgetMeta;
         this.onActivePanelData({
           type: "panel:widget",
           modelId: meta.raw?.modelRef?.id,
@@ -44435,6 +44652,11 @@ class InteractionController {
         );
         if (tableMeta && cellMeta && cellMeta.isSubRenderer) {
           if (isClickPaperWidgetAllNode(meta)) {
+            const raw = meta.raw;
+            if (isFillMode && isWidgetMetaInteractionBlockedInFillMode(this.doc, raw.widgetMeta)) {
+              this.settleFillModeNonInteractiveField(meta.secRefId);
+              return;
+            }
             this.onActivePanelData({
               type: "panel:widget",
               modelId: meta.raw?.modelRef?.id,
@@ -44465,6 +44687,12 @@ class InteractionController {
         }
       }
       if (isClickPaperWidgetAllNode(meta)) {
+        const raw = meta.raw;
+        const wm = raw.pageWidgetMeta ?? raw.widgetMeta;
+        if (isFillMode && isWidgetMetaInteractionBlockedInFillMode(this.doc, wm)) {
+          this.settleFillModeNonInteractiveField(meta.secRefId);
+          return;
+        }
         this.onActivePanelData({
           type: "panel:widget",
           modelId: meta.raw?.modelRef?.id,
@@ -44551,61 +44779,6 @@ class InteractionController {
   destroy() {
   }
 }
-function resolveDisplayStatusFromAuth(options) {
-  const { info, readonlyString, editString } = options;
-  if (isEmpty(info)) return null;
-  if (info.edit && !info.readonly) {
-    return editString;
-  }
-  if (info.readonly && !info.edit) {
-    return readonlyString;
-  }
-  return null;
-}
-function resolveWidgetState(ctx) {
-  const required4 = ctx.doc.isInEditMode() ? !!ctx.required : !!ctx.newRequired;
-  let readonly2 = false;
-  if (ctx.doc.isInEditMode()) {
-    readonly2 = false;
-  } else if (ctx.doc.isInPrintMode()) {
-    readonly2 = true;
-  } else if (ctx.newReadonly !== void 0) {
-    readonly2 = !!ctx.newReadonly;
-  }
-  const disabled = ctx.doc.isInEditMode() ? !!ctx.disabled : !!ctx.newDisabled;
-  const readonlyString = ctx.viewState === ViewStateTypeConst.Disabled || ctx.viewState === ViewStateTypeConst.Auto ? "readonly-component" : "readonly-text";
-  const editString = readonly2 ? "readonly-component" : "edit-component";
-  let displayStatus;
-  const fromAuth = resolveDisplayStatusFromAuth({
-    info: ctx.doc.docRuntimeMeta.handleInfo.bpmnFieldAuthMap?.[`${ctx.modelLink}.${ctx.fieldLink}`],
-    readonlyString,
-    editString
-  });
-  if (ctx.isLinkedModelField || ctx.cannotInput) {
-    displayStatus = readonlyString;
-  } else if (ctx.doc.mode === DocModeTypeConst.Print) {
-    displayStatus = readonlyString;
-  } else if (ctx.doc.mode === DocModeTypeConst.Fill) {
-    if (fromAuth) {
-      displayStatus = fromAuth;
-    } else if (ctx.doc.formType !== FormTypeConst.PROCESS) {
-      displayStatus = editString;
-    } else {
-      const bpmnType = ctx.doc.docRuntimeMeta.handleInfo?.bpmnType;
-      const isReadonlyNode = bpmnType === "bpmnApproval" || bpmnType === "bpmnJudge";
-      displayStatus = isReadonlyNode ? readonlyString : editString;
-    }
-  } else {
-    displayStatus = editString;
-  }
-  const finalDisabled = displayStatus === "edit-component" ? disabled : ctx.viewState === ViewStateTypeConst.Disabled || disabled;
-  return {
-    required: required4,
-    readonly: readonly2,
-    disabled: finalDisabled,
-    displayStatus
-  };
-}
 class InteractionPolicy {
   doc;
   constructor(doc) {
@@ -46082,6 +46255,8 @@ class Doc {
   id;
   /** 渲染模式 */
   mode;
+  /** 按钮区渲染模式 */
+  btnRenderModeType;
   /** 是否是设计器预览模式 */
   preview;
   model;
@@ -46127,6 +46302,7 @@ class Doc {
   constructor(options) {
     this.id = uuid();
     this.mode = options.mode ?? DocModeTypeConst.Edit;
+    this.btnRenderModeType = options.btnRenderModeType;
     this.preview = options.preview ?? false;
     this.model = options.model;
     this.mainModelKey = options.mainModelKey;
@@ -46175,8 +46351,11 @@ class Doc {
     this.model = model;
     this.layout();
   }
-  setMode(modeType) {
+  setMode(modeType, updateButton = false) {
     this.mode = modeType;
+    if (updateButton) {
+      this.btnRenderModeType = modeType;
+    }
     this.layout();
   }
   /** 触发布局计算 */
@@ -49216,81 +49395,6 @@ async function processDocumentRequest(props, payload, id) {
   } finally {
   }
 }
-var FIELD_TYPE = /* @__PURE__ */ ((FIELD_TYPE2) => {
-  FIELD_TYPE2["PRIMARY_KEY"] = "primary_key";
-  FIELD_TYPE2["ASSOCIATED_PRIMARY_KEY"] = "associated_primary_key";
-  FIELD_TYPE2["TEXT"] = "text";
-  FIELD_TYPE2["LONG_TEXT"] = "long_text";
-  FIELD_TYPE2["INTEGER"] = "integer";
-  FIELD_TYPE2["LONG"] = "long";
-  FIELD_TYPE2["DOUBLE"] = "double";
-  FIELD_TYPE2["DECIMAL"] = "decimal";
-  FIELD_TYPE2["BOOLEAN"] = "boolean";
-  FIELD_TYPE2["DATE"] = "date";
-  FIELD_TYPE2["TIME"] = "time";
-  FIELD_TYPE2["DATE_TIME"] = "date_time";
-  FIELD_TYPE2["IMAGE"] = "image";
-  FIELD_TYPE2["ATTACHMENT"] = "attachment";
-  FIELD_TYPE2["SERIAL"] = "serial_number";
-  FIELD_TYPE2["MASTERSLAVE"] = "master_slave";
-  FIELD_TYPE2["USER"] = "user";
-  FIELD_TYPE2["USER_MULTI"] = "user_multi";
-  FIELD_TYPE2["ORG"] = "org";
-  FIELD_TYPE2["ORG_MULTI"] = "org_multi";
-  FIELD_TYPE2["ENUM"] = "enum";
-  FIELD_TYPE2["ENUM_MULTI"] = "enum_multi";
-  FIELD_TYPE2["OPTION"] = "option";
-  FIELD_TYPE2["OPTION_MULTI"] = "option_multi";
-  FIELD_TYPE2["REF"] = "ref";
-  FIELD_TYPE2["REF_MULTI"] = "ref_multi";
-  FIELD_TYPE2["RDO_REF"] = "rdo_ref";
-  FIELD_TYPE2["EXPRESSION"] = "expression";
-  FIELD_TYPE2["EXPRESSION_CONDITION"] = "expression_condition";
-  FIELD_TYPE2["FUNCTION"] = "function";
-  FIELD_TYPE2["AGG"] = "agg";
-  FIELD_TYPE2["ESOP"] = "esop";
-  FIELD_TYPE2["TRANSACTION"] = "transaction";
-  FIELD_TYPE2["LABEL_TEMPLATE"] = "label_template";
-  FIELD_TYPE2["LABEL_TEMPLATE_REF"] = "label_template_ref";
-  FIELD_TYPE2["SERIALRULE"] = "serial_number_rule";
-  FIELD_TYPE2["PRINTER"] = "printer";
-  FIELD_TYPE2["MESSAGE_TMPL"] = "message_tmpl";
-  FIELD_TYPE2["RANGE_USER"] = "range_user";
-  FIELD_TYPE2["SIGNATURE"] = "electronic_signature";
-  FIELD_TYPE2["ONLINE_FORM_TEMPLATE"] = "online_form_tmpl";
-  FIELD_TYPE2["E_DHR_TEMPLATE"] = "edhr_tmpl";
-  FIELD_TYPE2["DATA_TABLE_FORMULA"] = "data_table_formula";
-  FIELD_TYPE2["READONLYCMP"] = "readonlycmp";
-  FIELD_TYPE2["MATERIAL_NO"] = "material_no";
-  FIELD_TYPE2["PRODUCT"] = "product";
-  FIELD_TYPE2["DEVICE"] = "device";
-  FIELD_TYPE2["Biz_Process"] = "biz_process";
-  FIELD_TYPE2["Approval_Process"] = "approval_process";
-  FIELD_TYPE2["MFG_ORDER"] = "mfg_order";
-  FIELD_TYPE2["RECORD_NO"] = "record_no";
-  FIELD_TYPE2["TRACE_DATE"] = "trace_date";
-  FIELD_TYPE2["ROUTING_OPERATION"] = "routing_operation";
-  FIELD_TYPE2["GOOD_QTY"] = "good_qty";
-  FIELD_TYPE2["NOT_GOOD_QTY"] = "not_good_qty";
-  FIELD_TYPE2["REPORT_START_TIME"] = "report_start_time";
-  FIELD_TYPE2["REPORT_END_TIME"] = "report_end_time";
-  FIELD_TYPE2["WORK_HOURS"] = "work_hours";
-  FIELD_TYPE2["PRODUCTION_DATE"] = "production_date";
-  FIELD_TYPE2["REPORTER"] = "reporter";
-  FIELD_TYPE2["NOT_GOOD_REASON"] = "not_good_reason";
-  FIELD_TYPE2["NOT_GOOD_GROUP"] = "not_good_group";
-  FIELD_TYPE2["SCRAP_REASON"] = "scrap_reason";
-  FIELD_TYPE2["SCRAP_GROUP"] = "scrap_group";
-  FIELD_TYPE2["SCRAP_QTY"] = "scrap_qty";
-  FIELD_TYPE2["SCRAP_MATERIAL"] = "scrap_material";
-  FIELD_TYPE2["SCRAP_MATERIAL_NO"] = "scrap_material_no";
-  FIELD_TYPE2["DESTRUCTIVE_TEST_QTY"] = "destructive_test_qty";
-  FIELD_TYPE2["PRODUCT_CHECK_QTY"] = "product_check_qty";
-  FIELD_TYPE2["MATERIAL_CHECK_QTY"] = "material_check_qty";
-  FIELD_TYPE2["DEVICE_REF"] = "device_ref";
-  FIELD_TYPE2["DEVICE_REF_MULTI"] = "device_ref_multi";
-  return FIELD_TYPE2;
-})(FIELD_TYPE || {});
 class RequestCache {
   pendingMap = /* @__PURE__ */ new Map();
   cacheMap = /* @__PURE__ */ new Map();
@@ -50702,32 +50806,6 @@ const DEFAULT_FROM_STATE = {
   _MCTABLE: {}
   // 物料消耗表业务数据
 };
-const renderUtils = {
-  getBoolValue: (value) => {
-    if (isNil(value)) {
-      return null;
-    }
-    if (value === "true" || value === "false") {
-      return JSON.parse(value);
-    }
-    if (isNaN(parseInt(value))) {
-      return Boolean(value);
-    }
-    return Boolean(parseInt(value));
-  },
-  formatValue: (fieldType, value) => {
-    if ([FIELD_TYPE.INTEGER, FIELD_TYPE.LONG].includes(fieldType)) {
-      const _val_ = parseInt(value);
-      return isNaN(_val_) ? void 0 : _val_;
-    } else if (fieldType === FIELD_TYPE.DECIMAL) {
-      const _val_ = parseFloat(value);
-      return isNaN(_val_) ? void 0 : _val_;
-    } else if (fieldType === FIELD_TYPE.BOOLEAN) {
-      return renderUtils.getBoolValue(value);
-    }
-    return value;
-  }
-};
 function getDefaultQueryIdsByFieldType(payload) {
   const defaultQueryIds = {
     [FIELD_TYPE.MATERIAL_NO]: payload.materialNumber,
@@ -50815,7 +50893,7 @@ const handleParameterMapping = (parameterMapping, paramsConfig, subTableInfo, fi
   const processParamItem = (item) => {
     if (!referenceMap.has(item.formKey)) return;
     const value = referenceMap.get(item.formKey);
-    const formattedValue = renderUtils.formatValue(item.fieldType, value);
+    const formattedValue = toFormatValue(item.fieldType, value);
     const target = item?.subModel ? (subMappedFields[item.subFieldKey] ??= {}, subMappedFields[item.subFieldKey]) : paramMap;
     merge(target, { [item.field]: formattedValue });
   };
@@ -50865,10 +50943,13 @@ const getFormDataItem = (onFieldMap, subTableInfo, result) => {
       } else if (item.subModel === 1) {
         const sInfo = subTableInfo.find((aa2) => aa2.field === item.subFieldKey) || {};
         const fieldList = result.data.map(
-          (data) => item.fields.reduce((prev, { isFieldModel, leftFieldKey, fieldLink, rightFieldKey }) => {
-            prev[leftFieldKey] = isFieldModel ? data?.__FOREIGN__?.[fieldLink] : data[rightFieldKey];
-            return prev;
-          }, {})
+          (data) => item.fields.reduce(
+            (prev, { isFieldModel, leftFieldKey, fieldLink, rightFieldKey }) => {
+              prev[leftFieldKey] = isFieldModel ? data?.__FOREIGN__?.[fieldLink] : data[rightFieldKey];
+              return prev;
+            },
+            {}
+          )
         );
         let fieldList2d;
         if (sInfo.subTable2d && sInfo.key === "dyn" || sInfo.checkTable2d && sInfo.key === "newfixed") {
@@ -51063,12 +51144,19 @@ const handleCustomDataSource = async (customDataSource, paramsConfig, subTableIn
 const loadDataInitValues = async (runtimeJson, paramsConfig, subTableInfo, fieldPermission, instanceId) => {
   const { document: document2 } = JSON.parse(runtimeJson || "{}");
   if (!document2?.config?.dataInit) return {};
-  const {
-    parameterMapping = [],
-    customDataSource = []
-  } = document2.config.dataInit;
-  const paramMap = handleParameterMapping(parameterMapping, paramsConfig, subTableInfo, fieldPermission);
-  const dsMap = await handleCustomDataSource(customDataSource, paramsConfig, subTableInfo, instanceId);
+  const { parameterMapping = [], customDataSource = [] } = document2.config.dataInit;
+  const paramMap = handleParameterMapping(
+    parameterMapping,
+    paramsConfig,
+    subTableInfo,
+    fieldPermission
+  );
+  const dsMap = await handleCustomDataSource(
+    customDataSource,
+    paramsConfig,
+    subTableInfo,
+    instanceId
+  );
   return {
     ...mainData2WordData(paramMap),
     ...mainData2WordData(dsMap)
@@ -51228,7 +51316,10 @@ async function fetchRenderData(payload) {
 function snapshotDocInfo(docInst) {
   return {
     pages: docInst?.pages ?? [],
-    updateTick: docInst?.updateTick ?? 0
+    updateTick: docInst?.updateTick ?? 0,
+    mode: docInst?.mode ?? null,
+    modeLabel: docInst?.modeLabel ?? "",
+    btnRenderModeType: docInst?.btnRenderModeType ?? null
   };
 }
 async function initializeDocumentEngine(props, payload, result) {
@@ -51283,7 +51374,6 @@ async function initializeDocumentEngine(props, payload, result) {
   const docRuntimeMeta = {
     ...requestInfo,
     handleInfo: {
-      btnRenderModeType: result.btnModelType,
       bpmnType: result.bpmnType,
       bpmnFieldAuthMap: result.bpmnFieldAuthMap,
       initDocModelJson: JSON.stringify(docModel.toXmlJson())
@@ -51292,6 +51382,7 @@ async function initializeDocumentEngine(props, payload, result) {
   const doc = new Doc({
     model: docModel,
     mode: fillModeType,
+    btnRenderModeType: result.btnModelType,
     mainModelKey,
     formType: requestInfo.formType || FormTypeConst.BASE,
     preview: payload.isPreview,
@@ -54792,6 +54883,7 @@ const builtinComponents = {
   [BuiltinComponentTypeConst.InlineImage]: _sfc_main$2K,
   [BuiltinComponentTypeConst.Text]: _sfc_main$2J
 };
+const OUTLINE_BORDER_INSET = 1;
 const borderConfig = {
   outer: {
     color: "rgb(128, 128, 128)",
@@ -54899,7 +54991,6 @@ function createTableOutlineLayer(options) {
   const minY = Math.min(...cells.map((c2) => c2.y));
   const maxX = Math.max(...cells.map((c2) => c2.x + c2.width));
   const maxY = Math.max(...cells.map((c2) => c2.y + c2.height));
-  Math.min(...cells.map((c2) => c2.layoutX));
   const minLY = Math.min(...cells.map((c2) => c2.layoutY));
   const maxLX = Math.max(...cells.map((c2) => c2.layoutX + c2.width));
   const maxLY = Math.max(...cells.map((c2) => c2.layoutY + c2.height));
@@ -54961,43 +55052,47 @@ function buildPosMap(layers, getRect, toDom) {
   }
   return res;
 }
-function buildDataIndexLayers(type4, cellsWithId, opts, extra) {
-  const getDIVal = (cell) => {
-    return type4 === "2d-table" && opts.isEdit ? cell.subRenderer?.xDataIndex : cell.subRenderer?.dataIndex;
+function getDataIndexLayersMap({
+  type: type4,
+  cells,
+  isEdit,
+  convertExtraProps
+}) {
+  const getDataIndex = (cell) => {
+    return type4 === "2d-table" && isEdit ? cell.subRenderer?.xDataIndex : cell.subRenderer?.dataIndex;
   };
-  const cells = cellsWithId.filter(
-    (cell) => getDIVal(cell) != null && cell?.subRenderer?.type === type4
+  const _cells = cells.filter(
+    (cell) => getDataIndex(cell) != null && cell?.subRenderer?.type === type4
   );
-  if (!cells.length) return {};
+  if (!_cells.length) return {};
   const grouped = groupBy(
-    cells,
-    (cell) => `${cell.subRenderer.id}_dataIndex${getDIVal(cell)}`
-  );
-  return Object.fromEntries(
-    Object.entries(grouped).map(([id, cells2]) => {
-      const firstCell = cells2[0];
-      const lastCell = cells2[cells2.length - 1];
-      const isZeroGroup = getDIVal(firstCell) === 0;
-      const bgLayer = createTableOutlineLayer({
-        cells: mapCellsToOutlineCells(cells2),
-        inset: opts.GROUP_BG_INSET
-      });
-      const borderLayer = isZeroGroup ? createTableOutlineLayer({
-        cells: mapCellsToOutlineCells(cells2),
-        inset: opts.BORDER_INSET
-      }) : { hLines: [], vLines: [], backgroundRect: null, labelPos: void 0 };
-      return [
-        id,
-        {
-          ...borderLayer,
-          ...extra(firstCell),
-          showBorder: isZeroGroup,
-          placeholderBjRect: bgLayer.backgroundRect,
-          lastCell
-        }
-      ];
-    })
+    _cells,
+    (cell) => `${cell.subRenderer.id}_dataIndex${getDataIndex(cell)}`
   );
+  const layersMapEntries = Object.entries(grouped).map(([id, __cells]) => {
+    const firstCell = __cells[0];
+    const lastCell = __cells[__cells.length - 1];
+    const isFirstDataGroup = getDataIndex(firstCell) === 0;
+    const bgLayer = createTableOutlineLayer({
+      cells: mapCellsToOutlineCells(__cells),
+      inset: 4
+    });
+    const borderLayer = isFirstDataGroup ? createTableOutlineLayer({
+      cells: mapCellsToOutlineCells(__cells),
+      inset: OUTLINE_BORDER_INSET
+    }) : { hLines: [], vLines: [], backgroundRect: null, labelPos: void 0 };
+    return [
+      id,
+      {
+        ...borderLayer,
+        ...convertExtraProps(firstCell),
+        showBorder: isFirstDataGroup,
+        placeholderBjRect: bgLayer.backgroundRect,
+        lastCell
+      }
+    ];
+  });
+  return Object.fromEntries(layersMapEntries);
 }
 const baseCanvasAttrs = {
   /** 不参与事件命中检测 */
@@ -55268,8 +55363,6 @@ const _sfc_main$2D = /* @__PURE__ */ defineComponent({
   }
 });
 const PlaceholderLabel = /* @__PURE__ */ _export_sfc(_sfc_main$2D, [["__scopeId", "data-v-0efd8725"]]);
-const BORDER_INSET$1 = 1;
-const GROUP_BG_INSET$1 = 4;
 const TAG_WIDTH = 56;
 const TAG_HEIGHT = 22;
 const _sfc_main$2C = /* @__PURE__ */ defineComponent({
@@ -55302,7 +55395,7 @@ const _sfc_main$2C = /* @__PURE__ */ defineComponent({
     });
     const isActive = (id) => interCtx.panelData?.context.regionId === id;
     const isHovered = (id, type4) => hoverTarget.value === type4 && targetId.value === id;
-    const cellsWithId = computed(
+    const subTableCells = computed(
       () => props.rows.flatMap(
         (row) => row.cells.filter((cell) => cell?.subRenderer?.id).map((cell) => ({
           ...cell,
@@ -55322,12 +55415,12 @@ const _sfc_main$2C = /* @__PURE__ */ defineComponent({
       };
     });
     const outlineLayers = computed(() => {
-      const grouped = groupBy(cellsWithId.value, (cell) => cell.subRenderer.id);
+      const grouped = groupBy(subTableCells.value, (cell) => cell.subRenderer.id);
       return Object.fromEntries(
         Object.entries(grouped).map(([id, cells]) => {
           const outline = createTableOutlineLayer({
             cells: mapCellsToOutlineCells(cells),
-            inset: BORDER_INSET$1
+            inset: OUTLINE_BORDER_INSET
           });
           return [
             id,
@@ -55340,89 +55433,77 @@ const _sfc_main$2C = /* @__PURE__ */ defineComponent({
         })
       );
     });
-    const fixedTableDataGroupLayers = computed(
-      () => buildDataIndexLayers(
-        "fixed-table",
-        cellsWithId.value,
-        {
-          BORDER_INSET: BORDER_INSET$1,
-          GROUP_BG_INSET: GROUP_BG_INSET$1,
-          isEdit: props.doc.mode === DocModeTypeConst.Edit
-        },
-        (cell) => ({
+    const fixedTableDataGroupLayersMap = computed(
+      () => getDataIndexLayersMap({
+        type: "fixed-table",
+        cells: subTableCells.value,
+        isEdit: props.doc.mode === DocModeTypeConst.Edit,
+        convertExtraProps: (cell) => ({
           type: "data-group",
           valuePath: cell.subRenderer.valuePath,
           placeholder: `${cell.subRenderer.dataIndex}`
         })
-      )
+      })
     );
-    const checkTableDataGroup2DLayers = computed(
-      () => buildDataIndexLayers(
-        "check-table",
-        cellsWithId.value,
-        {
-          BORDER_INSET: BORDER_INSET$1,
-          GROUP_BG_INSET: GROUP_BG_INSET$1,
-          isEdit: props.doc.mode === DocModeTypeConst.Edit
-        },
-        (cell) => ({
+    const checkTableDataGroup2DLayersMap = computed(
+      () => getDataIndexLayersMap({
+        type: "check-table",
+        cells: subTableCells.value,
+        isEdit: props.doc.mode === DocModeTypeConst.Edit,
+        convertExtraProps: (cell) => ({
           type: "data-group-2d",
           valuePath: cell.subRenderer.valuePath,
           placeholder: `${cell.subRenderer.dataIndex}`
         })
-      )
+      })
     );
-    const _2DTableDataGroup2DLayers = computed(
-      () => buildDataIndexLayers(
-        "2d-table",
-        cellsWithId.value,
-        {
-          BORDER_INSET: BORDER_INSET$1,
-          GROUP_BG_INSET: GROUP_BG_INSET$1,
-          isEdit: props.doc.mode === DocModeTypeConst.Edit
-        },
-        (cell) => ({
+    const _2DTableDataGroup2DLayersMap = computed(
+      () => getDataIndexLayersMap({
+        type: "2d-table",
+        cells: subTableCells.value,
+        isEdit: props.doc.mode === DocModeTypeConst.Edit,
+        convertExtraProps: (cell) => ({
           type: "data-group-2d",
           valuePath: cell.subRenderer.valuePath,
           placeholder: `${cell.subRenderer.xDataIndex}`
         })
-      )
+      })
     );
     const tableTypePos = computed(
       () => buildPosMap(
         outlineLayers.value,
         (l2) => l2.labelPos,
-        (p) => labelPosToDom(p, BORDER_INSET$1)
+        (p) => labelPosToDom(p)
       )
     );
     const dataGroupTypePos = computed(
       () => buildPosMap(
         {
-          ...fixedTableDataGroupLayers.value,
-          ...checkTableDataGroup2DLayers.value,
-          ..._2DTableDataGroup2DLayers.value
+          ...fixedTableDataGroupLayersMap.value,
+          ...checkTableDataGroup2DLayersMap.value,
+          ..._2DTableDataGroup2DLayersMap.value
         },
         (l2) => l2.labelPos,
-        (p) => labelPosToDom(p, BORDER_INSET$1)
+        (p) => labelPosToDom(p)
       )
     );
     const dataGroupPlaceholderPos = computed(
       () => buildPosMap(
         {
-          ...fixedTableDataGroupLayers.value,
-          ...checkTableDataGroup2DLayers.value,
-          ..._2DTableDataGroup2DLayers.value
+          ...fixedTableDataGroupLayersMap.value,
+          ...checkTableDataGroup2DLayersMap.value,
+          ..._2DTableDataGroup2DLayersMap.value
         },
         (l2) => l2.lastCell,
         (p) => centerRectToDom(p)
       )
     );
-    function labelPosToDom(labelPos, inset = 0) {
+    function labelPosToDom(labelPos) {
       const base = pageBaseOffset.value;
       if (!base) return null;
       return {
         left: `${labelPos.x + base.leftBase - TAG_WIDTH}px`,
-        top: `${labelPos.y1 + base.topBase + inset}px`,
+        top: `${labelPos.y1 + base.topBase + OUTLINE_BORDER_INSET}px`,
         width: `${TAG_WIDTH}px`,
         height: `${TAG_HEIGHT}px`
       };
@@ -55517,9 +55598,9 @@ const _sfc_main$2C = /* @__PURE__ */ defineComponent({
           }, 1024);
         }), 128)),
         (openBlock(true), createElementBlock(Fragment, null, renderList([
-          fixedTableDataGroupLayers.value,
-          checkTableDataGroup2DLayers.value,
-          _2DTableDataGroup2DLayers.value
+          fixedTableDataGroupLayersMap.value,
+          checkTableDataGroup2DLayersMap.value,
+          _2DTableDataGroup2DLayersMap.value
         ], (layers, layersIndex) => {
           return openBlock(), createElementBlock(Fragment, { key: layersIndex }, [
             (openBlock(true), createElementBlock(Fragment, null, renderList(layers, (layer, id) => {
@@ -56378,8 +56459,6 @@ const _sfc_main$2x = /* @__PURE__ */ defineComponent({
   }
 });
 const SubTableAction = /* @__PURE__ */ _export_sfc(_sfc_main$2x, [["__scopeId", "data-v-adc8fb9a"]]);
-const BORDER_INSET = 1;
-const GROUP_BG_INSET = 4;
 const _sfc_main$2w = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: {
@@ -56420,22 +56499,18 @@ const _sfc_main$2w = /* @__PURE__ */ defineComponent({
       };
     });
     const buildDataIndexLayersWith = (type4) => {
-      return buildDataIndexLayers(
-        type4,
-        cellsWithId.value,
-        {
-          BORDER_INSET,
-          GROUP_BG_INSET,
-          isEdit: props.doc.mode === DocModeTypeConst.Edit
-        },
-        () => ({
+      return getDataIndexLayersMap({
+        type: type4,
+        cells: cellsWithId.value,
+        isEdit: props.doc.mode === DocModeTypeConst.Edit,
+        convertExtraProps: () => ({
           type: type4,
           placeholder: "",
           valuePath: ""
         })
-      );
+      });
     };
-    const subTableDataIndexLayers = computed(() => {
+    const subTableOutlineLayersMap = computed(() => {
       return {
         ...buildDataIndexLayersWith("dynamic-table"),
         ...buildDataIndexLayersWith("2d-table")
@@ -56444,13 +56519,13 @@ const _sfc_main$2w = /* @__PURE__ */ defineComponent({
     const subTableActionPos = computed(() => {
       const res = {};
       const ACTION_WIDTH = 24;
-      for (const [id, layer] of Object.entries(subTableDataIndexLayers.value)) {
+      for (const [id, layer] of Object.entries(subTableOutlineLayersMap.value)) {
         const lastCell = layer.lastCell;
         if (!lastCell) continue;
         const base = pageBaseOffset.value;
         if (base) {
           res[id] = {
-            left: `${lastCell.layoutX + base.leftBase + lastCell.width + BORDER_INSET}px`,
+            left: `${lastCell.layoutX + base.leftBase + lastCell.width + OUTLINE_BORDER_INSET}px`,
             top: `${lastCell.layoutY + base.topBase + lastCell.height - ACTION_WIDTH}px`
           };
         }
@@ -56459,7 +56534,7 @@ const _sfc_main$2w = /* @__PURE__ */ defineComponent({
     });
     return (_ctx, _cache) => {
       const _component_v_group = resolveComponent("v-group");
-      return openBlock(true), createElementBlock(Fragment, null, renderList(subTableDataIndexLayers.value, (subLayer, subId) => {
+      return openBlock(true), createElementBlock(Fragment, null, renderList(subTableOutlineLayersMap.value, (subLayer, subId) => {
         return openBlock(), createBlock(_component_v_group, {
           key: subId,
           config: baseLayerProps
@@ -57020,12 +57095,12 @@ function useDocController(factory2, ops) {
             return doc.pages.find((p) => p.section.refId === id) ?? null;
           }
         },
-        // 响应式状态
         docRuntimeMeta: doc.docRuntimeMeta,
-        mode: computed(() => doc.mode),
-        modeLabel: computed(() => doc.modeLabel),
-        updateTick: computed(() => doc.updateTick),
-        pages: computed(() => doc.pages),
+        mode: computed(() => factory2.docInfo.value.mode),
+        modeLabel: computed(() => factory2.docInfo.value.modeLabel),
+        btnRenderModeType: computed(() => factory2.docInfo.value.btnRenderModeType),
+        updateTick: computed(() => factory2.docInfo.value.updateTick),
+        pages: computed(() => factory2.docInfo.value.pages),
         // Doc 内置命令系统
         execute(command, payload) {
           doc.execute(command, payload);
@@ -57036,8 +57111,8 @@ function useDocController(factory2, ops) {
         redo() {
           doc.redo();
         },
-        setMode(mode) {
-          doc.setMode(mode);
+        setMode(mode, updateButton = false) {
+          doc.setMode(mode, updateButton);
         },
         setModel(model) {
           doc.setModel(model);
@@ -58606,7 +58681,7 @@ const _sfc_main$2l = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SetTableHeaderFormModal = /* @__PURE__ */ _export_sfc(_sfc_main$2l, [["__scopeId", "data-v-e376bf97"]]);
+const SetTableHeaderFormModal = /* @__PURE__ */ _export_sfc(_sfc_main$2l, [["__scopeId", "data-v-d5785019"]]);
 const _hoisted_1$1F = { class: "items-container" };
 const _hoisted_2$14 = { class: "ribbon-tab-item" };
 const _hoisted_3$P = { class: "ribbon-tab-item" };
@@ -59019,7 +59094,7 @@ const _sfc_main$2k = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const WordTable = /* @__PURE__ */ _export_sfc(_sfc_main$2k, [["__scopeId", "data-v-66a2a1b2"]]);
+const WordTable = /* @__PURE__ */ _export_sfc(_sfc_main$2k, [["__scopeId", "data-v-880a7ed3"]]);
 const _hoisted_1$1E = { class: "ribbon" };
 const _hoisted_2$13 = { class: "ribbon-content-wrapper" };
 const _sfc_main$2j = /* @__PURE__ */ defineComponent({
@@ -60414,7 +60489,7 @@ const _sfc_main$28 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const TableMenu = /* @__PURE__ */ _export_sfc(_sfc_main$28, [["__scopeId", "data-v-05c3a67d"]]);
+const TableMenu = /* @__PURE__ */ _export_sfc(_sfc_main$28, [["__scopeId", "data-v-8bfe3f32"]]);
 const OFFSET = 4;
 const _sfc_main$27 = /* @__PURE__ */ defineComponent({
   __name: "index",
@@ -66792,7 +66867,7 @@ const _sfc_main$1y = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", _hoisted_1$1h, [
         createVNode(unref(GctCollapse), {
-          title: "动态分组配置",
+          title: "数据分组配置",
           class: "panel-collapse is-first"
         }, {
           default: withCtx(() => [
@@ -66849,7 +66924,7 @@ const _sfc_main$1y = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const DataGroupPanel = /* @__PURE__ */ _export_sfc(_sfc_main$1y, [["__scopeId", "data-v-a04ec532"]]);
+const DataGroupPanel = /* @__PURE__ */ _export_sfc(_sfc_main$1y, [["__scopeId", "data-v-4572267c"]]);
 const schema$7 = {
   key: "data-group.basic",
   title: [