@gct-paas/excel 0.1.40-beta.21 → 0.1.40-beta.24

package/dist/{index-BBnCJHvC.js → index-BCpitZ3H.js}

@@ -1,13 +1,13 @@
 import * as Vue from "vue";
 import { createVNode, computed, unref, ref as ref$1, defineComponent, onMounted, resolveComponent, openBlock, createElementBlock, withCtx, watch, toRaw, inject, reactive, createBlock, Fragment, renderList, createTextVNode, toDisplayString as toDisplayString$1, createCommentVNode, createElementVNode, normalizeClass, h, normalizeStyle, watchEffect, renderSlot, shallowRef, defineAsyncComponent, resolveDynamicComponent, mergeProps, normalizeProps, guardReactiveProps, onUnmounted, Text, nextTick, onBeforeUnmount, withModifiers, withDirectives, vShow, Teleport, getCurrentScope, onScopeDispose, getCurrentInstance as getCurrentInstance$1, withKeys, vModelText, isRef, provide, isVNode as isVNode$1, createApp, render, TransitionGroup, toRefs, useAttrs, createSlots, useCssVars, onBeforeMount, toRef, mergeDefaults, toHandlers, Transition, useModel, mergeModels as mergeModels$1, onErrorCaptured, markRaw } from "vue";
-import { g as getAllDataProfiles, i as isDataTableProfile, a as getProfile, b as isBusinessSubTableProfile, c as getProfileByTableType, r as resolveCreateTargetByTableType, d as getBusinessProfileByRefModelType, S as SUB_TABLE_PANEL_TYPE_NAME, e as expandAutofillTemplates, f as resolveAutofillToField, h as SubTableType, j as getAllBusinessRefModelTypes, D as DateObjectContext, k as isBlank$1, F as FIELD_TYPE, l as isSameFieldValue$1, m as runDateObjectHandler, n as companionIdKey, o as companionLabelKey, p as api, I as Icon$1, w as warning, u as useInsertStyles, s as svgBaseProps, P as PaginationFormat, q as PaperWidgeType, B as BwipCodeType, L as LineType, t as PageSizeEnum, O as Orientation, v as src, T as TRACE_FIELD_TYPES, x as BUSINESS_FIELD_TYPES, y as resolveFieldRenderComponent, C as ComponentTypeEnum, z as parse$2, A as estraverse, E as Syntax, G as isDynamicCreateTarget, H as CellType, J as isDynamicCellSubTable, K as ParamModelTypeEnum, M as FieldTypeToJs, N as CreateType, Q as uuid2, R as useModal, U as requireEstraverse, V as commonjsGlobal, W as getDefaultExportFromCjs, X as PaperWidgeValueType, Y as onlineFormMasterModelTypeEnum, Z as WAREHOUSE_FIELD_TYPES, _ as UniqueConstraintType, $ as FieldDefaultValueTypeEnum, a0 as FormTypeEnum, a1 as mitt, a2 as isDateObjectField, a3 as PlatformEnum, a4 as LabelPosition, a5 as BooleanShowMode, a6 as SignatureImageDirectionEnum, a7 as FallbackSignTypeEnum, a8 as SignatureNumberTypeEnum, a9 as SignatureTimeTypeEnum, aa as SignShowTypeEnum, ab as SignatureTypeEnum, ac as useNamespace, ad as _export_sfc, ae as normalizeFieldType, af as PaperSizeMap, ag as getFieldMain, ah as buildUUID, ai as FieldIconMap, aj as BigNumber, ak as FieldSysVarDefaultValueEnum, al as CellWidgetViewState, am as DiagonalDirection, an as WidgetImageSizeMode, ao as LineDirection, ap as TimeDiffFormat, aq as DiagonalVertex, ar as resolveDiagonalVertex, as as getThemeColorByTableType, at as ViewTypeEnum, au as isDynamicSubTablePanelType, av as isFixedSubTablePanelType, aw as ExpressionModeEnum, ax as ReturnTypeEnum, ay as ExpressionTabEnum, az as RangeValidateMode, aA as RangeCompareOp, aB as getExclusiveBusinessTypeTokens, aC as getSubTableTypeByRefModelType, aD as findFieldMain, aE as DecimalDisplayMode$1, aF as ImageDisplayModeEnum, aG as FormDesignEnum, aH as BASIC_FIELD_TYPES, aI as getAllTableProfiles, aJ as getAugmentedNamespace, aK as transformUtils, aL as EmptySymbol, aM as ASSIGNMENTSTRATEGY_ENUM, aN as Dependency_ENUM, aO as EntityModelCategoryEnum, aP as resolveLotDisplayLabel, aQ as CheckDsTypeEnum, aR as DeviceLink, aS as DeviceParamsTypeTitle, aT as AITooltips, aU as DenoiseMethodOptions, aV as BinarizeMethodOptions, aW as JoinModelTypeEum, aX as sqlUtils, aY as DateFormat, aZ as withRequestCache, a_ as LOT_CONTAINER_ROLE, a$ as buildLotSnListQuery, b0 as renderUtils, b1 as resolveLotRecordByValue, b2 as materialCheck, b3 as getLotLockedReason, b4 as validateReinspectionDate, b5 as ProductionIdentificationTypeEnum, b6 as BindCmpStyleEnum, b7 as getParseRuleInfo, b8 as getParseRuleValue, b9 as normalizeRefLoaderResult, ba as STOCKTAKE_DIMENSION, bb as F, bc as resolveStocktakeSelectApi, bd as normalizeProductionContainerOptions, be as buildProductionLotListQuery, bf as refUtils, bg as buildInspectionLotListQuery, bh as buildDeviceFilterQuery, bi as DEVICE_GROUP_QUERY_KEY, bj as getRowId, bk as findRuntimeTableRow, bl as RenderModeEnum, bm as findRuntimeParentRow, bn as useOnlineFormTransformField2Component, bo as FormulaRuleFieldKeyEnum, bp as formulaRuleFieldDict, bq as resolveDesignPanelFeatures, br as BIZ_TABLE_CONFIG_SEED_TYPES, bs as STOCKTAKE_DIMENSION_OPTIONS, bt as isRepeatingSubTablePanelType, bu as uuid2$1 } from "./dynamic-table-action.vue_vue_type_style_index_0_scoped_8710052f_lang-DqGN_0-g.js";
+import { g as getAllDataProfiles, i as isDataTableProfile, a as getProfile, b as isBusinessSubTableProfile, c as getProfileByTableType, r as resolveCreateTargetByTableType, d as getBusinessProfileByRefModelType, S as SUB_TABLE_PANEL_TYPE_NAME, e as expandAutofillTemplates, f as resolveAutofillToField, h as SubTableType, j as getAllBusinessRefModelTypes, D as DateObjectContext, k as isBlank$1, F as FIELD_TYPE, l as isSameFieldValue$1, m as runDateObjectHandler, n as companionIdKey, o as companionLabelKey, p as api, I as Icon$1, w as warning, u as useInsertStyles, s as svgBaseProps, P as PaginationFormat, q as PaperWidgeType, B as BwipCodeType, L as LineType, t as PageSizeEnum, O as Orientation, v as src, T as TRACE_FIELD_TYPES, x as BUSINESS_FIELD_TYPES, y as resolveFieldRenderComponent, C as ComponentTypeEnum, z as parse$2, A as estraverse, E as Syntax, G as isDynamicCreateTarget, H as CellType, J as isDynamicCellSubTable, K as ParamModelTypeEnum, M as FieldTypeToJs, N as CreateType, Q as uuid2, R as useModal, U as requireEstraverse, V as commonjsGlobal, W as getDefaultExportFromCjs, X as PaperWidgeValueType, Y as onlineFormMasterModelTypeEnum, Z as WAREHOUSE_FIELD_TYPES, _ as UniqueConstraintType, $ as FieldDefaultValueTypeEnum, a0 as FormTypeEnum, a1 as mitt, a2 as isDateObjectField, a3 as PlatformEnum, a4 as LabelPosition, a5 as BooleanShowMode, a6 as SignatureImageDirectionEnum, a7 as FallbackSignTypeEnum, a8 as SignatureNumberTypeEnum, a9 as SignatureTimeTypeEnum, aa as SignShowTypeEnum, ab as SignatureTypeEnum, ac as useNamespace, ad as _export_sfc, ae as normalizeFieldType, af as PaperSizeMap, ag as getFieldMain, ah as buildUUID, ai as FieldIconMap, aj as BigNumber, ak as FieldSysVarDefaultValueEnum, al as CellWidgetViewState, am as DiagonalDirection, an as WidgetImageSizeMode, ao as LineDirection, ap as TimeDiffFormat, aq as DiagonalVertex, ar as resolveDiagonalVertex, as as getThemeColorByTableType, at as ViewTypeEnum, au as isDynamicSubTablePanelType, av as isFixedSubTablePanelType, aw as ExpressionModeEnum, ax as ReturnTypeEnum, ay as ExpressionTabEnum, az as RangeValidateMode, aA as RangeCompareOp, aB as getExclusiveBusinessTypeTokens, aC as getSubTableTypeByRefModelType, aD as findFieldMain, aE as DecimalDisplayMode$1, aF as ImageDisplayModeEnum, aG as FormDesignEnum, aH as BASIC_FIELD_TYPES, aI as buildDeviceFilterQuery, aJ as refUtils, aK as getAllTableProfiles, aL as getAugmentedNamespace, aM as transformUtils, aN as EmptySymbol, aO as ASSIGNMENTSTRATEGY_ENUM, aP as Dependency_ENUM, aQ as EntityModelCategoryEnum, aR as resolveLotDisplayLabel, aS as CheckDsTypeEnum, aT as DeviceLink, aU as DeviceParamsTypeTitle, aV as AITooltips, aW as DenoiseMethodOptions, aX as BinarizeMethodOptions, aY as JoinModelTypeEum, aZ as sqlUtils, a_ as DateFormat, a$ as withRequestCache, b0 as LOT_CONTAINER_ROLE, b1 as buildLotSnListQuery, b2 as renderUtils, b3 as resolveLotRecordByValue, b4 as materialCheck, b5 as getLotLockedReason, b6 as validateReinspectionDate, b7 as buildMaterialLotListQuery, b8 as ProductionIdentificationTypeEnum, b9 as BindCmpStyleEnum, ba as getParseRuleInfo, bb as getParseRuleValue, bc as normalizeRefLoaderResult, bd as STOCKTAKE_DIMENSION, be as F, bf as resolveStocktakeSelectApi, bg as normalizeProductionContainerOptions, bh as buildProductionLotListQuery, bi as buildInspectionLotListQuery, bj as DEVICE_GROUP_QUERY_KEY, bk as getRowId, bl as findRuntimeTableRow, bm as RenderModeEnum, bn as findRuntimeParentRow, bo as useOnlineFormTransformField2Component, bp as FormulaRuleFieldKeyEnum, bq as formulaRuleFieldDict, br as resolveDesignPanelFeatures, bs as BIZ_TABLE_CONFIG_SEED_TYPES, bt as STOCKTAKE_DIMENSION_OPTIONS, bu as isRepeatingSubTablePanelType, bv as uuid2$1 } from "./dynamic-table-action.vue_vue_type_style_index_0_scoped_8710052f_lang-BsyVWing.js";
 import { range as range$1, cloneDeep, get as get$4, merge, isEmpty, zip, pick, omit, has, debounce, isNil, times, clone as clone$3, differenceBy, last, mapValues, set as set$2, hasIn, isEqual } from "lodash-es";
 import dayjs from "dayjs";
 import { useFormBaseModal, DataSourceChangeEvent, getBuiltinContextFields, DataSources, FieldFills, closeAllFormBaseModal, FormBaseModalPlugin } from "@gct-paas/form-base";
 import * as Antd from "ant-design-vue";
-import { message, Modal, Empty, InputSearch, Cascader, ConfigProvider, Tooltip as Tooltip$1, Input, Tree, Transfer, Select, Tag, Form, AutoComplete, TimePicker, DatePicker, Textarea, TreeSelect, CheckboxGroup, Checkbox, Radio, RadioGroup, Alert } from "ant-design-vue";
-import { b as bindFormulaCacheInvalidation, c as currentParamsConfig, M as MAX_RUNTIME_SHEETS, a as MAX_RUNTIME_SHEET_TITLE_LENGTH, d as MULTI_SHEET_SCHEMA_VERSION, n as normalizeGridColumnWidth, g as getParseFormulaVarInfos, e as getBusinessFieldKey, f as createRuntimeDocumentV2, h as clampSealPosition, i as normalizeSealDiameter, j as normalizeFieldWidth, D as DEFAULT_BOOLEAN_FIELD_WIDTH, k as isCellAutoLineBreak, B as BorderTD, u as useFormModel, l as useFormTmplConfig, m as findFieldProfile, o as normalizeHistoricalBusinessRow, p as DeviceLinkTmplUtil, q as normalizeAIOcrTmpl, r as useWidgetStaticAttrs, s as useRuntimeInstanceServices, t as setSelectValidatorId, v as setSelectAnnotationId, w as useRuntimeRowState, x as getObjectBomMaterialLotQuery, y as buildObjectLotExtraQuery, z as resolveObjectFieldKeys, F as FormModelController, A as MaterialConsumptionPatternEnum, C as validateObjectBomForScan, E as resolveObjectBomEntry, G as runWithFillProduct, H as useNocodeFormWidget, I as applyConsumeObjectTraceChange, J as getObjectBomProductQuery, K as EMPTY_PRODUCT_VERSION_ID, L as normalizeHistoricalAutofillRow, N as readSealValue, O as isSealStamped, P as stampSealValue, Q as isValidSealValue, R as clearSealValue, S as parseRuntimeFieldPath, T as NCB_PROVIDE, U as calculateFormula, V as useStyles, W as useDependency, X as useFieldPresentation, Y as useRuntimeEditorFlusher, Z as RuntimeFormStateStore, _ as createRuntimeInstanceContext, $ as RuntimeInstanceRegistry, a0 as ScanParamType, a1 as RequiredQtyCalcRule, a2 as MBRender, a3 as MCRender, a4 as moveSealValue, a5 as DocumentPaper, a6 as DynamicTableAction, a7 as _sfc_main$6B } from "./dynamic-table-action-D-e5iLib.js";
-import { S as SEARCH_SEVICE, u as useWebUpload, V as VersionSelect, C as CloseOutlined, E as EmptyImg$2, _ as _sfc_main$6A, P as ProductTypeEnum } from "./online-form-model-select.vue_vue_type_script_setup_true_name_online-form-model-select_lang-DcYth63e.js";
+import { message, Modal, Alert, Empty, InputSearch, Cascader, ConfigProvider, Tooltip as Tooltip$1, Input, Tree, Transfer, Select, Tag, Form, AutoComplete, TimePicker, DatePicker, Textarea, TreeSelect, CheckboxGroup, Checkbox, Radio, RadioGroup } from "ant-design-vue";
+import { b as bindFormulaCacheInvalidation, c as currentParamsConfig, M as MAX_RUNTIME_SHEETS, a as MAX_RUNTIME_SHEET_TITLE_LENGTH, g as getBusinessFieldKey, d as MULTI_SHEET_SCHEMA_VERSION, n as normalizeGridColumnWidth, e as getParseFormulaVarInfos, f as createRuntimeDocumentV2, h as clampSealPosition, i as normalizeSealDiameter, j as normalizeFieldWidth, D as DEFAULT_BOOLEAN_FIELD_WIDTH, k as isCellAutoLineBreak, B as BorderTD, u as useFormModel, l as useFormTmplConfig, m as findFieldProfile, o as normalizeHistoricalBusinessRow, p as DeviceLinkTmplUtil, q as normalizeAIOcrTmpl, r as useWidgetStaticAttrs, s as useRuntimeInstanceServices, t as setSelectValidatorId, v as setSelectAnnotationId, w as useRuntimeRowState, x as getObjectBomMaterialLotQuery, y as buildObjectLotExtraQuery, z as resolveObjectFieldKeys, F as FormModelController, A as MaterialConsumptionPatternEnum, C as validateObjectBomForScan, E as resolveObjectBomEntry, G as runWithFillProduct, H as useNocodeFormWidget, I as applyConsumeObjectTraceChange, J as getObjectBomProductQuery, K as EMPTY_PRODUCT_VERSION_ID, L as normalizeHistoricalAutofillRow, N as readSealValue, O as isSealStamped, P as stampSealValue, Q as isValidSealValue, R as clearSealValue, S as parseRuntimeFieldPath, T as NCB_PROVIDE, U as calculateFormula, V as useStyles, W as useDependency, X as useFieldPresentation, Y as useRuntimeEditorFlusher, Z as RuntimeFormStateStore, _ as createRuntimeInstanceContext, $ as RuntimeInstanceRegistry, a0 as ScanParamType, a1 as RequiredQtyCalcRule, a2 as MBRender, a3 as MCRender, a4 as moveSealValue, a5 as DocumentPaper, a6 as DynamicTableAction, a7 as _sfc_main$6C } from "./dynamic-table-action-JR8LU5WT.js";
+import { S as SEARCH_SEVICE, u as useWebUpload, V as VersionSelect, C as CloseOutlined, E as EmptyImg$2, _ as _sfc_main$6B, P as ProductTypeEnum } from "./online-form-model-select.vue_vue_type_script_setup_true_name_online-form-model-select_lang-DjI5GeWt.js";
 import { HttpUtil } from "@gct-paas/api";
 import { Tooltip, Grid, Table, Column, Icon as Icon$2, Edit, Validator, VxeGrid } from "vxe-table";
 import { useModal as useModal$1, t as t$2 } from "@gct-paas/core";
@@ -2016,7 +2016,7 @@ function openWindow(url, opt) {
 const FieldPropLabels = Object.entries(FIELD_PROP_LABEL_MAP);
 const FieldTypeLabels = Object.entries(FIELD_TYPE_LABEL_MAP);
 async function createWorkbook() {
-  const ExcelJs = (await import("./exceljs.min-CyjI4C57.js").then((n) => n.e)).default;
+  const ExcelJs = (await import("./exceljs.min-wPuo8a9q.js").then((n) => n.e)).default;
   return new ExcelJs.Workbook();
 }
 class XlsxParser {
@@ -2042,66 +2042,95 @@ class XlsxParser {
     });
     return paperFields;
   }
-  static async xlsx2Sheets(file, keyList = []) {
+  static async xlsx2Sheets(file, keyList = [], options = {}) {
     const workbook = await createWorkbook();
     const xlsxData = await workbook.xlsx.load(file);
+    const warnings = [];
     const fieldSheetName = $t("sys.onlineForm.formFields");
     const fieldSheet = workbook.getWorksheet(fieldSheetName);
-    const fields = fieldSheet ? XlsxParser.sheetToFields(fieldSheet, keyList) : null;
+    const withFields = options.withFields !== false;
+    const fields = withFields && fieldSheet ? XlsxParser.sheetToFields(fieldSheet, keyList, warnings) : null;
     const candidates = workbook.worksheets.filter((sheet) => sheet.name !== fieldSheetName);
     const hidden = candidates.filter(
       (sheet) => sheet.state === "hidden" || sheet.state === "veryHidden"
     );
     if (hidden.length) {
-      throw new Error(`不支持导入隐藏工作表：${hidden.map((sheet) => sheet.name).join("、")}`);
+      warnings.push(`已跳过隐藏工作表：${hidden.map((sheet) => sheet.name).join("、")}。`);
     }
-    if (!candidates.length) throw new Error("Excel 中没有可导入的工作表");
-    if (candidates.length > MAX_RUNTIME_SHEETS) {
-      throw new Error(`每份表单最多支持 ${MAX_RUNTIME_SHEETS} 个工作表`);
+    const visible = candidates.filter((sheet) => !hidden.includes(sheet));
+    if (!visible.length) throw new Error("Excel 中没有可导入的可见工作表");
+    if (visible.length > MAX_RUNTIME_SHEETS) {
+      warnings.push(
+        `最多导入 ${MAX_RUNTIME_SHEETS} 个工作表，已跳过：${visible.slice(MAX_RUNTIME_SHEETS).map((sheet) => sheet.name).join("、")}。`
+      );
     }
     const names = /* @__PURE__ */ new Set();
-    const sheets = candidates.map((worksheet) => {
-      const title = worksheet.name.trim();
-      if (!title || title.length > MAX_RUNTIME_SHEET_TITLE_LENGTH) {
-        throw new Error(
-          `工作表名称必须为 1 到 ${MAX_RUNTIME_SHEET_TITLE_LENGTH} 个字符：${worksheet.name}`
-        );
+    const fieldOwners = /* @__PURE__ */ new Map();
+    const sheets = [];
+    let remainingCells = 3e4;
+    for (const worksheet of visible.slice(0, MAX_RUNTIME_SHEETS)) {
+      if (!remainingCells) {
+        warnings.push(`工作表「${worksheet.name}」未导入：整份表单已达到 30000 个单元格上限。`);
+        continue;
+      }
+      const base = worksheet.name.trim().slice(0, MAX_RUNTIME_SHEET_TITLE_LENGTH) || "工作表";
+      let title = base;
+      let suffix = 2;
+      while (names.has(title)) {
+        const tail = ` (${suffix++})`;
+        title = base.slice(0, MAX_RUNTIME_SHEET_TITLE_LENGTH - tail.length) + tail;
+      }
+      if (title !== worksheet.name) {
+        warnings.push(`工作表「${worksheet.name}」将重命名为「${title}」。`);
       }
-      if (names.has(title)) throw new Error(`工作表名称重复：${title}`);
       names.add(title);
-      const rowCount = worksheet.dimensions?.bottom ?? worksheet.rowCount ?? 0;
-      const colCount = worksheet.dimensions?.right ?? worksheet.columnCount ?? 0;
-      if (rowCount > 300 || colCount > 75) {
-        throw new Error(
-          `工作表「${title}」超出导入限制：当前 ${rowCount} 行 × ${colCount} 列，最多 300 行 × 75 列`
+      if (!worksheet.actualRowCount) {
+        warnings.push(`工作表「${title}」为空，将按空白工作表导入。`);
+      }
+      const rowCount = Math.max(1, worksheet.dimensions?.bottom ?? worksheet.rowCount ?? 1);
+      const colCount = Math.max(1, worksheet.dimensions?.right ?? worksheet.columnCount ?? 1);
+      const cols = Math.min(colCount, 75, remainingCells);
+      const rows = Math.min(rowCount, 300, Math.floor(remainingCells / cols));
+      if (rows < rowCount || cols < colCount) {
+        warnings.push(
+          `工作表「${title}」原为 ${rowCount} 行 × ${colCount} 列，仅导入前 ${rows} 行 × ${cols} 列，超出范围的内容将不导入（每表最多 300 行 × 75 列，合计最多 30000 格）。`
         );
       }
-      let formulaCell = "";
-      worksheet.eachRow((row) => {
-        row.eachCell((cell) => {
-          if (!formulaCell && cell.value && typeof cell.value === "object" && "formula" in cell.value) {
-            formulaCell = cell.address;
+      const paper2 = XlsxParser.sheetToPaper(worksheet, xlsxData, { rows, cols });
+      remainingCells -= rows * cols;
+      let formulaCount = 0;
+      worksheet.eachRow((row, rowNumber) => {
+        if (rowNumber > rows) return;
+        row.eachCell((cell, colNumber) => {
+          if (colNumber <= cols && cell.address === cell.master.address && cell.formula) {
+            formulaCount++;
           }
         });
       });
-      if (formulaCell) throw new Error(`工作表「${title}」包含公式单元格 ${formulaCell}`);
-      const paper2 = XlsxParser.sheetToPaper(worksheet, xlsxData);
-      return {
-        title,
-        paper: paper2,
-        paperFields: XlsxParser.extractPaperFields(paper2, fields)
-      };
-    });
-    const totalCells = sheets.reduce(
-      (sum, sheet) => sum + sheet.paper.cells.reduce((n, row) => n + row.length, 0),
-      0
-    );
-    if (totalCells > 3e4) throw new Error("整份表单最多支持 30000 个静态单元格");
-    return { sheets, fields };
+      if (formulaCount) {
+        warnings.push(
+          `工作表「${title}」的 ${formulaCount} 个公式单元格将按静态文本导入，不再自动计算；图片公式不会还原为图片。`
+        );
+      }
+      const paperFields = XlsxParser.extractPaperFields(paper2, fields).filter((field) => {
+        const key = field.fieldKey || field.fieldName;
+        const owner = fieldOwners.get(key);
+        if (owner) {
+          warnings.push(
+            `字段「${field.fieldName || key}」重复出现：保留「${owner}」的首处绑定，「${title}」第 ${field.y} 行第 ${field.x} 列按静态文本导入。`
+          );
+          return false;
+        }
+        fieldOwners.set(key, title);
+        return true;
+      });
+      sheets.push({ title, paper: paper2, paperFields });
+    }
+    return { sheets, fields, warnings };
   }
-  static sheetToPaper(paperSheet, xlsxData) {
-    const SheetRowCount = Math.min(paperSheet.dimensions?.bottom ?? 0, 300);
-    const SheetColCount = Math.min(paperSheet.dimensions?.right ?? 0, 75);
+  static sheetToPaper(paperSheet, xlsxData, size) {
+    const SheetRowCount = size?.rows ?? Math.max(1, Math.min(paperSheet.dimensions?.bottom ?? 1, 300));
+    const SheetColCount = size?.cols ?? Math.max(1, Math.min(paperSheet.dimensions?.right ?? 1, 75));
     const paper2 = {};
     const { defaultRowHeight, defaultColWidth } = paperSheet.properties;
     const defaultRowHeightPx = parseInt(src(`${defaultRowHeight}pt`));
@@ -2115,7 +2144,7 @@ class XlsxParser {
     paper2.rows = rows;
     const cols = [];
     Array(SheetColCount).fill("").forEach((c, i) => {
-      const { width } = paperSheet.columns[i];
+      const width = paperSheet.columns?.[i]?.width;
       const _w = width ?? defaultColWidth;
       cols.push({
         // width: _w === undefined ? 80 : Math.floor(_w * 7 + 5),
@@ -2131,7 +2160,7 @@ class XlsxParser {
       Array(SheetColCount).fill("").forEach((_2, colIndex) => {
         const cell = paperSheet._rows[rowIndex]._cells[colIndex];
         if (!cell) return;
-        const { alignment, border, fill, font } = cell.style;
+        const { alignment, fill, font } = cell.style;
         const cellName = cell._address;
         const cellStyle = {
           "text-align": alignment?.horizontal ?? "left",
@@ -2147,7 +2176,10 @@ class XlsxParser {
         cells[rowIndex][colIndex].style = cellStyle;
         if (cellName !== cell.master.address) return;
         let cellValue = "";
-        if (typeof cell.value !== "object") {
+        if (cell.formula) {
+          const result = cell.result;
+          cellValue = result == null ? `=${cell.formula}` : typeof result === "object" && "error" in result ? result.error : String(result);
+        } else if (typeof cell.value !== "object") {
           cellValue = cell.value;
         } else if (typeof cell.text !== "object") {
           cellValue = cell.text;
@@ -2174,10 +2206,10 @@ class XlsxParser {
         const cell = paperSheet._rows[rowIndex]._cells[colIndex];
         if (!cell) return;
         const { border } = cell.style;
-        !!border?.top && CellBorder.setTop(colIndex + 1, rowIndex + 1, paper2);
-        !!border?.bottom && CellBorder.setBottom(colIndex + 1, rowIndex + 1, paper2);
-        !!border?.left && CellBorder.setLeft(colIndex + 1, rowIndex + 1, paper2);
-        !!border?.right && CellBorder.setRight(colIndex + 1, rowIndex + 1, paper2);
+        if (border?.top) CellBorder.setTop(colIndex + 1, rowIndex + 1, paper2);
+        if (border?.bottom) CellBorder.setBottom(colIndex + 1, rowIndex + 1, paper2);
+        if (border?.left) CellBorder.setLeft(colIndex + 1, rowIndex + 1, paper2);
+        if (border?.right) CellBorder.setRight(colIndex + 1, rowIndex + 1, paper2);
       });
     });
     const medias = (xlsxData.media ?? []).map((m) => {
@@ -2199,6 +2231,7 @@ class XlsxParser {
       const tlNativeCol = range2?.tl?.nativeCol ?? 0;
       const brNativeRow = range2?.br?.nativeRow ?? tlNativeRow;
       const brNativeCol = range2?.br?.nativeCol ?? tlNativeCol;
+      if (tlNativeRow >= SheetRowCount || tlNativeCol >= SheetColCount) return;
       const rowSpan = Math.max(0, brNativeRow - tlNativeRow);
       const colSpan = Math.max(0, brNativeCol - tlNativeCol);
       const imageLayout = {
@@ -2245,12 +2278,12 @@ class XlsxParser {
    * @param sheet
    * @returns
    */
-  static sheetToFields(sheet, keyList) {
+  static sheetToFields(sheet, keyList, warnings = []) {
     const SheetRowCount = Math.min(sheet.rowCount, 300);
     const SheetColCount = Math.min(sheet.columnCount, 10);
     const colFieldPropMap = /* @__PURE__ */ new Map();
     Array(SheetColCount).fill("").forEach((_, colIndex) => {
-      const cell = sheet._rows[0]._cells[colIndex];
+      const cell = sheet._rows[0]?._cells[colIndex];
       const fieldProp = FieldPropLabels.find(
         (f) => f[1] === (cell?.text ?? "").replaceAll("*", "").trim()
       );
@@ -2258,6 +2291,12 @@ class XlsxParser {
         colFieldPropMap.set(colIndex, fieldProp[0]);
       }
     });
+    if (![...colFieldPropMap.values()].includes("key") || ![...colFieldPropMap.values()].includes("name")) {
+      warnings.push(
+        `工作表「${sheet.name}」缺少字段标识或名称表头，已忽略字段配置，保留表单文本。`
+      );
+      return [];
+    }
     const fields = [];
     Array(SheetRowCount).fill("").forEach((_, rowIndex) => {
       if (rowIndex === 0) return;
@@ -2269,6 +2308,10 @@ class XlsxParser {
           field[colFieldPropMap.get(colIndex)] = cell?.text ?? "";
         }
       });
+      if (!field.key || !field.name) {
+        warnings.push(`字段配置第 ${rowIndex + 1} 行缺少字段标识或名称，已跳过该行。`);
+        return;
+      }
       fields.push(field);
     });
     const cloneKeyList = [...keyList];
@@ -2344,39 +2387,39 @@ class XlsxParser {
 }
 function asyncImportClassModules() {
   const modules = /* @__PURE__ */ Object.assign({
-    "./_field_/auto-complete/index.ts": () => import("./index-SsQpzWJV.js").then((m) => m["default"]),
-    "./_field_/datepicker/index.ts": () => import("./index-BTvFf_Od.js").then((m) => m["default"]),
-    "./_field_/datetimepicker/index.ts": () => import("./index-CJZP3Y8A.js").then((m) => m["default"]),
-    "./_field_/department/index.ts": () => import("./index-Cbfa0l4P.js").then((m) => m["default"]),
-    "./_field_/enum-select/index.ts": () => import("./index-_lobWWTu.js").then((m) => m["default"]),
-    "./_field_/input/index.ts": () => import("./index-WGbD1Pm6.js").then((m) => m["default"]),
-    "./_field_/inputdouble/index.ts": () => import("./index-CxthKExE.js").then((m) => m["default"]),
-    "./_field_/inputnumber/index.ts": () => import("./index-v-rdo6ME.js").then((m) => m["default"]),
-    "./_field_/rdo-select/index.ts": () => import("./index-4b7WInws.js").then((m) => m["default"]),
-    "./_field_/seal/index.ts": () => import("./index-CrNQ4fzl.js").then((m) => m["default"]),
-    "./_field_/select/index.ts": () => import("./index-DgcqMrSq.js").then((m) => m["default"]),
-    "./_field_/sign/index.ts": () => import("./index-DphJXlye.js").then((m) => m["default"]),
-    "./_field_/switch/index.ts": () => import("./index-C03h1mdc.js").then((m) => m["default"]),
-    "./_field_/textarea/index.ts": () => import("./index-DNODemiT.js").then((m) => m["default"]),
-    "./_field_/timepicker/index.ts": () => import("./index-Ddsrowty.js").then((m) => m["default"]),
-    "./_field_/upload-file/index.ts": () => import("./index-D9jgkb7e.js").then((m) => m["default"]),
-    "./_field_/upload-image/index.ts": () => import("./index-CCAULEff.js").then((m) => m["default"]),
-    "./_field_/userpicker/index.ts": () => import("./index-BCl6C48o.js").then((m) => m["default"]),
-    "./_widget_/barcode/index.ts": () => import("./index-DK_goJxq.js").then((m) => m["default"]),
-    "./_widget_/combine-fields/index.ts": () => import("./index-DSTGDFEt.js").then((m) => m["default"]),
-    "./_widget_/diagonal/index.ts": () => import("./index-8ar-Bsw7.js").then((m) => m["default"]),
-    "./_widget_/dyn-value/index.ts": () => import("./index-DOKlk-Nf.js").then((m) => m["default"]),
-    "./_widget_/image/index.ts": () => import("./index--BSSsMvy.js").then((m) => m["default"]),
-    "./_widget_/line/index.ts": () => import("./index-DpCJBo9U.js").then((m) => m["default"]),
-    "./_widget_/power/index.ts": () => import("./index-CjK1DtkT.js").then((m) => m["default"]),
-    "./_widget_/qrcode/index.ts": () => import("./index-C4cVVxUT.js").then((m) => m["default"]),
-    "./_widget_/ro/index.ts": () => import("./index-17hYBH0H.js").then((m) => m["default"]),
-    "./_widget_/serialnumber/index.ts": () => import("./index-BOOwVQlO.js").then((m) => m["default"]),
-    "./_widget_/sub-table/index.ts": () => import("./index-CToveeX8.js").then((m) => m["default"]),
-    "./_widget_/timediff/index.ts": () => import("./index-DHBkzfbv.js").then((m) => m["default"]),
-    "./paper/index.ts": () => import("./index-CKCRmqHx.js").then((m) => m["default"]),
-    "./td/index.ts": () => import("./index-DU5m20W6.js").then((m) => m["default"]),
-    "./tr/index.ts": () => import("./index-D6YZXtdZ.js").then((m) => m["default"])
+    "./_field_/auto-complete/index.ts": () => import("./index-BIitBpK7.js").then((m) => m["default"]),
+    "./_field_/datepicker/index.ts": () => import("./index-Ds8UpdFP.js").then((m) => m["default"]),
+    "./_field_/datetimepicker/index.ts": () => import("./index-LiOm5nws.js").then((m) => m["default"]),
+    "./_field_/department/index.ts": () => import("./index-B_95dIym.js").then((m) => m["default"]),
+    "./_field_/enum-select/index.ts": () => import("./index-BX8xuu9v.js").then((m) => m["default"]),
+    "./_field_/input/index.ts": () => import("./index-Bk67ggPI.js").then((m) => m["default"]),
+    "./_field_/inputdouble/index.ts": () => import("./index-37J1K1W1.js").then((m) => m["default"]),
+    "./_field_/inputnumber/index.ts": () => import("./index-BoZN_3QI.js").then((m) => m["default"]),
+    "./_field_/rdo-select/index.ts": () => import("./index-C5izC2Mm.js").then((m) => m["default"]),
+    "./_field_/seal/index.ts": () => import("./index-BxaqeEUh.js").then((m) => m["default"]),
+    "./_field_/select/index.ts": () => import("./index-eLwoxKzH.js").then((m) => m["default"]),
+    "./_field_/sign/index.ts": () => import("./index-sIW7hZFQ.js").then((m) => m["default"]),
+    "./_field_/switch/index.ts": () => import("./index-Cg8xpa-X.js").then((m) => m["default"]),
+    "./_field_/textarea/index.ts": () => import("./index-CpdA5MDE.js").then((m) => m["default"]),
+    "./_field_/timepicker/index.ts": () => import("./index-9ipSNY71.js").then((m) => m["default"]),
+    "./_field_/upload-file/index.ts": () => import("./index-KMB2TBbZ.js").then((m) => m["default"]),
+    "./_field_/upload-image/index.ts": () => import("./index-CX2lK91Y.js").then((m) => m["default"]),
+    "./_field_/userpicker/index.ts": () => import("./index-C1b5ADFV.js").then((m) => m["default"]),
+    "./_widget_/barcode/index.ts": () => import("./index-D3cPbNne.js").then((m) => m["default"]),
+    "./_widget_/combine-fields/index.ts": () => import("./index-up8dW1VW.js").then((m) => m["default"]),
+    "./_widget_/diagonal/index.ts": () => import("./index-PVGqEoN1.js").then((m) => m["default"]),
+    "./_widget_/dyn-value/index.ts": () => import("./index-Pgworj4S.js").then((m) => m["default"]),
+    "./_widget_/image/index.ts": () => import("./index-D-WSp3EA.js").then((m) => m["default"]),
+    "./_widget_/line/index.ts": () => import("./index-C6oivLbu.js").then((m) => m["default"]),
+    "./_widget_/power/index.ts": () => import("./index-DozFqpk2.js").then((m) => m["default"]),
+    "./_widget_/qrcode/index.ts": () => import("./index-DEMinegB.js").then((m) => m["default"]),
+    "./_widget_/ro/index.ts": () => import("./index-B9hIqELW.js").then((m) => m["default"]),
+    "./_widget_/serialnumber/index.ts": () => import("./index-YteSvWxT.js").then((m) => m["default"]),
+    "./_widget_/sub-table/index.ts": () => import("./index-CpQiCEe7.js").then((m) => m["default"]),
+    "./_widget_/timediff/index.ts": () => import("./index-PUFY8idd.js").then((m) => m["default"]),
+    "./paper/index.ts": () => import("./index-Cmr9DRpz.js").then((m) => m["default"]),
+    "./td/index.ts": () => import("./index-DUma1ZGa.js").then((m) => m["default"]),
+    "./tr/index.ts": () => import("./index-DZb9l6Gw.js").then((m) => m["default"])
   });
   return modules;
 }
@@ -3592,6 +3635,45 @@ class ImgParser {
     });
   }
 }
+function getCellFieldPlacements(paper2) {
+  const placements = [];
+  (paper2.cells ?? []).forEach((row, rowIndex) => {
+    row.forEach((cell, colIndex) => {
+      if (!cell) return;
+      const x = colIndex + 1;
+      const y = rowIndex + 1;
+      const hidden = (paper2.mergedCells ?? []).some(
+        (range2) => range2.l <= x && range2.r >= x && range2.t <= y && range2.b >= y && (range2.l !== x || range2.t !== y)
+      );
+      for (const content of [cell, ...cell.multiFieldsContent ?? []]) {
+        if (content.type && content.type !== CellType.Field) continue;
+        if (content.fieldMeta?.field) placements.push({ cell, content, hidden });
+      }
+    });
+  });
+  return placements;
+}
+function clearHiddenCellFieldPlacements(paper2, field) {
+  const key = getBusinessFieldKey({
+    modelKey: field.model ?? field.modelLink,
+    fieldId: field.field
+  });
+  for (const { cell, content, hidden } of getCellFieldPlacements(paper2)) {
+    if (!hidden) continue;
+    const meta = content.fieldMeta;
+    if (getBusinessFieldKey({ modelKey: meta.model ?? meta.modelLink, fieldId: meta.field }) !== key) {
+      continue;
+    }
+    if (content === cell) {
+      cell.type = CellType.Default;
+      cell.fieldMeta = void 0;
+      cell.fieldWidget = void 0;
+    } else {
+      const contents = cell.multiFieldsContent;
+      contents.splice(contents.indexOf(content), 1);
+    }
+  }
+}
 const Default_Apis = {
   getFieldMetaList: api.apaas.fieldMeta.getList,
   getModelMetaSubModelList: api.apaas.modelComprehensive.getSubModelList,
@@ -4111,8 +4193,8 @@ function normalizePaperGrid(paper2) {
   paper2.fixedTables = (Array.isArray(paper2.fixedTables) ? paper2.fixedTables : []).map((table) => normalizeTable(table, rowCount, colCount)).filter((table) => !!table);
   return paper2;
 }
-const _hoisted_1$3C = { class: "p24px" };
-const _sfc_main$6z = /* @__PURE__ */ defineComponent({
+const _hoisted_1$3D = { class: "p24px" };
+const _sfc_main$6A = /* @__PURE__ */ defineComponent({
   __name: "add-sheet",
   props: {
     modal: {},
@@ -4138,7 +4220,7 @@ const _sfc_main$6z = /* @__PURE__ */ defineComponent({
       const _component_a_input = resolveComponent("a-input");
       const _component_a_form_item = resolveComponent("a-form-item");
       const _component_a_form = resolveComponent("a-form");
-      return openBlock(), createElementBlock("div", _hoisted_1$3C, [
+      return openBlock(), createElementBlock("div", _hoisted_1$3D, [
         createVNode(_component_a_form, {
           ref_key: "formRef",
           ref: formRef,
@@ -10033,21 +10115,18 @@ const designerSheetsSnapshot = () => sheetsData$1.value.map(({ sheetId, title, p
   title,
   paper: cloneDeep(paper2)
 }));
-function getPlacedFieldCounts(sheets) {
+function getPlacedFieldCounts(sheets, includeHidden = false) {
   const counts = /* @__PURE__ */ new Map();
   sheets.forEach((sheet) => {
-    (sheet.paper.cells ?? []).flat().forEach((cell) => {
-      for (const content of [cell, ...cell?.multiFieldsContent ?? []]) {
-        if (content?.type && content.type !== CellType.Field) continue;
-        const meta = content?.fieldMeta;
-        if (!meta?.field) continue;
-        const key = getBusinessFieldKey({
-          modelKey: meta.model ?? meta.modelLink,
-          fieldId: meta.field
-        });
-        counts.set(key, (counts.get(key) ?? 0) + 1);
-      }
-    });
+    for (const { content, hidden } of getCellFieldPlacements(sheet.paper)) {
+      if (hidden && !includeHidden) continue;
+      const meta = content.fieldMeta;
+      const key = getBusinessFieldKey({
+        modelKey: meta.model ?? meta.modelLink,
+        fieldId: meta.field
+      });
+      counts.set(key, (counts.get(key) ?? 0) + 1);
+    }
   });
   return counts;
 }
@@ -10192,7 +10271,7 @@ const useAllSpreadSheets = () => {
       return;
     }
     const res = await window.NocodeAdapter.utils.overlay.modal(
-      _sfc_main$6z,
+      _sfc_main$6A,
       {
         data,
         validator: (rule, value) => {
@@ -10315,7 +10394,7 @@ const useAllSpreadSheets = () => {
     }
     const names = /* @__PURE__ */ new Set();
     let staticCellCount = 0;
-    const savedFieldCounts = getPlacedFieldCounts(cloneSheetsData.value);
+    const savedFieldCounts = getPlacedFieldCounts(cloneSheetsData.value, true);
     const fieldOwners = /* @__PURE__ */ new Map();
     const subTables = /* @__PURE__ */ new Map();
     sheetsData$1.value.forEach((sheet) => {
@@ -10343,10 +10422,9 @@ const useAllSpreadSheets = () => {
         }
         fieldOwners.set(key, { sheetTitle: previous?.sheetTitle ?? sheet.title, count });
       };
-      (sheet.paper.cells ?? []).flat().forEach((cell) => {
-        registerField(cell);
-        cell?.multiFieldsContent?.forEach(registerField);
-      });
+      for (const { content, hidden } of getCellFieldPlacements(sheet.paper)) {
+        if (!hidden) registerField(content);
+      }
       [...sheet.paper.dynamicTables ?? [], ...sheet.paper.fixedTables ?? []].forEach(
         (table) => {
           if (!table.field) return;
@@ -10617,7 +10695,7 @@ const useAllSpreadSheets = () => {
     removeField: removeField2
   };
 };
-const _sfc_main$6y = /* @__PURE__ */ defineComponent({
+const _sfc_main$6z = /* @__PURE__ */ defineComponent({
   __name: "table-modal",
   props: {
     type: { default: SubTableType.DEFAULT }
@@ -10821,7 +10899,7 @@ const _sfc_main$6y = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const _sfc_main$6x = /* @__PURE__ */ defineComponent({
+const _sfc_main$6y = /* @__PURE__ */ defineComponent({
   __name: "thead-modal",
   setup(__props) {
     const { selection: selection2, paper: paper2, platformType: platformType2, isTextOnlineForm: isTextOnlineForm2 } = useSpreadSheet();
@@ -11372,7 +11450,7 @@ function parseHtml(html) {
     mergedCells
   };
 }
-const _sfc_main$6w = /* @__PURE__ */ defineComponent({
+const _sfc_main$6x = /* @__PURE__ */ defineComponent({
   __name: "field-edit-modal",
   props: {
     field: {}
@@ -11462,7 +11540,54 @@ const _sfc_main$6w = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const FieldEditModal = /* @__PURE__ */ _export_sfc(_sfc_main$6w, [["__scopeId", "data-v-1eaa22cd"]]);
+const FieldEditModal = /* @__PURE__ */ _export_sfc(_sfc_main$6x, [["__scopeId", "data-v-1eaa22cd"]]);
+const _hoisted_1$3C = { class: "xlsx-import-summary" };
+const _hoisted_2$2x = { class: "xlsx-import-summary__warnings" };
+const _hoisted_3$1U = { class: "xlsx-import-summary__heading" };
+const _hoisted_4$1l = { class: "xlsx-import-summary__sheets" };
+const _sfc_main$6w = /* @__PURE__ */ defineComponent({
+  __name: "xlsx-import-summary",
+  props: {
+    sheets: {},
+    warnings: {}
+  },
+  setup(__props) {
+    return (_ctx, _cache) => {
+      return openBlock(), createElementBlock("div", _hoisted_1$3C, [
+        __props.warnings.length ? (openBlock(), createBlock(unref(Alert), {
+          key: 0,
+          type: "warning",
+          "show-icon": ""
+        }, {
+          message: withCtx(() => [..._cache[0] || (_cache[0] = [
+            createTextVNode("以下内容已做兼容处理，可以继续导入", -1)
+          ])]),
+          description: withCtx(() => [
+            createElementVNode("ul", _hoisted_2$2x, [
+              (openBlock(true), createElementBlock(Fragment, null, renderList(__props.warnings, (warning2, index2) => {
+                return openBlock(), createElementBlock("li", { key: index2 }, toDisplayString$1(warning2), 1);
+              }), 128))
+            ])
+          ]),
+          _: 1
+        })) : createCommentVNode("", true),
+        createElementVNode("div", _hoisted_3$1U, "将导入 " + toDisplayString$1(__props.sheets.length) + " 个工作表", 1),
+        createElementVNode("ul", _hoisted_4$1l, [
+          (openBlock(true), createElementBlock(Fragment, null, renderList(__props.sheets, (sheet) => {
+            return openBlock(), createElementBlock("li", {
+              key: sheet.title
+            }, [
+              createElementVNode("span", null, toDisplayString$1(sheet.title), 1),
+              createElementVNode("span", null, toDisplayString$1(sheet.rows) + " 行 × " + toDisplayString$1(sheet.cols) + " 列 · " + toDisplayString$1(sheet.fields) + " 个字段绑定", 1)
+            ]);
+          }), 128))
+        ]),
+        _cache[1] || (_cache[1] = createElementVNode("p", { class: "xlsx-import-summary__replace" }, "导入后将替换当前设计稿，请确认以上处理结果。", -1))
+      ]);
+    };
+  }
+});
+const XlsxImportSummary = /* @__PURE__ */ _export_sfc(_sfc_main$6w, [["__scopeId", "data-v-e66e3c0e"]]);
 let doc$1;
 const topPublishVersions = ref$1([]);
 const currentVersion = ref$1();
@@ -12454,7 +12579,7 @@ function useSpreadSheet() {
     }
     if (checkSelectionConflict(selection$1)) return;
     const { ok, data } = await window.NocodeAdapter.utils.overlay.modal(
-      _sfc_main$6y,
+      _sfc_main$6z,
       { type: type2 },
       { title: `添加${$t("sys.onlineForm.subTableType." + type2)}`, width: "640px" }
     );
@@ -12526,7 +12651,7 @@ function useSpreadSheet() {
       return;
     }
     const { ok, data } = await window.NocodeAdapter.utils.overlay.modal(
-      _sfc_main$6x,
+      _sfc_main$6y,
       {},
       {
         title: $t("sys.onlineForm.addHeader"),
@@ -12783,22 +12908,24 @@ function useSpreadSheet() {
     const size = [w - padding.l - padding.r + "mm", paperHeight - padding.t - padding.b + "mm"];
     const { modelMetaMap: modelMetaMap2, refreshModelFields: refreshModelFields2 } = useModelFields();
     const keyList = (modelMetaMap2.value[doc.value.modelKey]?.fields ?? []).map((i) => i.key);
-    const imported = await XlsxParser.xlsx2Sheets(file, payload?.withFields ? keyList : []);
+    const imported = await XlsxParser.xlsx2Sheets(file, payload?.withFields ? keyList : [], {
+      withFields: !!payload?.withFields
+    });
     imported.sheets.forEach((sheet) => XlsxParser.contentFitToPaper(sheet.paper, size));
     const confirmed = await new Promise((resolve) => {
       Modal.confirm({
         title: `确认替换为 ${imported.sheets.length} 个工作表`,
-        content: h(
-          "div",
-          imported.sheets.map(
-            (sheet) => h(
-              "div",
-              { style: "margin: 4px 0;" },
-              `${sheet.title}：${sheet.paper.rows.length} 行 × ${sheet.paper.cols.length} 列，${sheet.paperFields.length} 个字段绑定`
-            )
-          )
-        ),
-        okText: $t("sys.okText"),
+        width: 680,
+        content: h(XlsxImportSummary, {
+          sheets: imported.sheets.map((sheet) => ({
+            title: sheet.title,
+            rows: sheet.paper.rows.length,
+            cols: sheet.paper.cols.length,
+            fields: sheet.paperFields.length
+          })),
+          warnings: imported.warnings
+        }),
+        okText: imported.warnings.length ? "继续导入" : "导入",
         cancelText: $t("sys.cancel"),
         zIndex: 2e3,
         onOk: () => resolve(true),
@@ -12817,20 +12944,6 @@ function useSpreadSheet() {
         }
         return result;
       };
-      const importedFieldOwners = /* @__PURE__ */ new Map();
-      imported.sheets.forEach((sheet) => {
-        sheet.paperFields.forEach((field) => {
-          const key = field.fieldKey || field.fieldName;
-          if (!key) return;
-          const owner = importedFieldOwners.get(key);
-          if (owner) {
-            throw new Error(
-              `字段「${key}」重复出现（${owner}、${sheet.title}），同一字段只能导入一次`
-            );
-          }
-          importedFieldOwners.set(key, sheet.title);
-        });
-      });
       imported.fields?.forEach((item) => {
         const { type: type2, key, name: rawName, required, uniqueConstraint, disabled } = item;
         if (!key || !rawName) {
@@ -13244,6 +13357,7 @@ function useSpreadSheet() {
       }
     }
     const fieldWidget = getFieldWidget2(bindField);
+    sheetsData.value.forEach((sheet) => clearHiddenCellFieldPlacements(sheet.paper, bindField));
     const content = {
       type: CellType.Field,
       fieldMeta: bindField,
@@ -14650,15 +14764,15 @@ const _sfc_main$6m = /* @__PURE__ */ defineComponent({
     const value = computed(() => {
       const dateWidget = props2.fieldWidget;
       if (dateWidget.defaultSystemDate) {
-        const fallback = iconType.value === "time" ? "HH:mm:ss" : iconType.value === "datetime" ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD";
-        return dayjs().format(dateWidget.format || fallback);
+        iconType.value === "time" ? "HH:mm:ss" : iconType.value === "datetime" ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD";
+        return void 0;
       }
       const defaultValue = props2.fieldWidget.defaultValue;
       if (defaultValue === FieldSysVarDefaultValueEnum.CURRENT_USER) {
-        return $t("sys.sysCurrentUser");
+        return void 0;
       }
       if (defaultValue === FieldSysVarDefaultValueEnum.CURRENT_ORG) {
-        return $t("sys.sysCurrentOrg");
+        return void 0;
       }
       if (["fw:select", "fw:tree-select", "fw:rdo-select"].includes(props2.design ?? "fw:select")) {
         return void 0;
@@ -14684,7 +14798,7 @@ const _sfc_main$6m = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const FakeSelect = /* @__PURE__ */ _export_sfc(_sfc_main$6m, [["__scopeId", "data-v-34a104c8"]]);
+const FakeSelect = /* @__PURE__ */ _export_sfc(_sfc_main$6m, [["__scopeId", "data-v-a6a3e9c6"]]);
 const _sfc_main$6l = /* @__PURE__ */ defineComponent({
   __name: "radio-icon",
   props: {
@@ -14790,6 +14904,12 @@ const _sfc_main$6j = /* @__PURE__ */ defineComponent({
       }));
     });
     const selectedValues = computed(() => {
+      const fieldType = props2.fieldMeta?.fieldType;
+      if ([FIELD_TYPE.ENUM, FIELD_TYPE.ENUM_MULTI, FIELD_TYPE.OPTION, FIELD_TYPE.OPTION_MULTI].includes(
+        fieldType
+      )) {
+        return [];
+      }
       if (isBoolean2.value) {
         return [booleanWidget.value.defaultValue];
       }
@@ -14885,7 +15005,7 @@ const _sfc_main$6j = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const FakeOptionSelect = /* @__PURE__ */ _export_sfc(_sfc_main$6j, [["__scopeId", "data-v-2b593d5a"]]);
+const FakeOptionSelect = /* @__PURE__ */ _export_sfc(_sfc_main$6j, [["__scopeId", "data-v-d12ad167"]]);
 const FieldDesignComponents = {
   "fw:input": FakeInput,
   "fw:number": FakeNumberInput,
@@ -14917,7 +15037,8 @@ const _sfc_main$6i = /* @__PURE__ */ defineComponent({
   props: {
     fieldWidget: {},
     fieldMeta: {},
-    autoLineBreak: { type: Boolean }
+    autoLineBreak: { type: Boolean },
+    inCombinedFields: { type: Boolean }
   },
   setup(__props) {
     const ns = useNamespace("cell");
@@ -14972,6 +15093,11 @@ const _sfc_main$6i = /* @__PURE__ */ defineComponent({
     const preserveAffixWidth = computed(
       () => !readonly.value && hasAnyAffix.value && !wrapAffix.value
     );
+    const preserveOptionWidth = computed(
+      () => props2.inCombinedFields && !props2.autoLineBreak && !readonly.value && props2.fieldWidget.category === CellWidgetCategory.Enum && [CellWidgetRenderComp.Radio, CellWidgetRenderComp.Checkbox].includes(
+        props2.fieldWidget.renderComp
+      )
+    );
     const wrapperSizeStyle = computed(() => ({
       width: wrapAffix.value ? "fit-content" : readonly.value ? void 0 : preserveAffixWidth.value ? "max-content" : `${normalizedCompWidth.value}px`
     }));
@@ -15009,7 +15135,8 @@ const _sfc_main$6i = /* @__PURE__ */ defineComponent({
             "cell-widget-design--with-prefix": hasOuterPrefix.value,
             "cell-widget-design--with-suffix": hasOuterSuffix.value,
             "cell-widget-design--fixed-affix": preserveAffixWidth.value,
-            "cell-widget-design--wrap-affix": wrapAffix.value
+            "cell-widget-design--wrap-affix": wrapAffix.value,
+            "cell-widget-design--unwrapped-options": preserveOptionWidth.value
           }
         ]),
         style: normalizeStyle([styleVars.value, wrapperSizeStyle.value])
@@ -15029,7 +15156,7 @@ const _sfc_main$6i = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const CellWidgetDesign = /* @__PURE__ */ _export_sfc(_sfc_main$6i, [["__scopeId", "data-v-e83b495f"]]);
+const CellWidgetDesign = /* @__PURE__ */ _export_sfc(_sfc_main$6i, [["__scopeId", "data-v-0c318157"]]);
 const cellWidgetDesign = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   default: CellWidgetDesign
@@ -16063,7 +16190,7 @@ function asyncImportWidgetConfigList() {
   return widgetConfigList;
 }
 function asyncImportWidgetDesign() {
-  const modules = /* @__PURE__ */ Object.assign({ "../__cell_widgets__/cell-widget-design.vue": () => Promise.resolve().then(() => cellWidgetDesign), "../__cell_widgets__/seal/seal-design.vue": () => import("./seal-design-DjQNPduq.js"), "./barcode/barcode-design.vue": () => import("./barcode-design-l3rdfj4B.js"), "./diagonal/diagonal-design.vue": () => import("./diagonal-design-BPLxs9ji.js"), "./image/image-design.vue": () => import("./image-design-D0wFVrcv.js"), "./line/line-design.vue": () => Promise.resolve().then(() => lineDesign), "./pagination/pagination-design.vue": () => import("./pagination-design-DGqFvJxx.js"), "./paper-widget-design.vue": () => import("./paper-widget-design-DrRVelBu.js"), "./power/power-design.vue": () => Promise.resolve().then(() => powerDesign), "./qrcode/qrcode-design.vue": () => import("./qrcode-design-Ck2_tB4Q.js"), "./rangelimit/rangelimit-design.vue": () => Promise.resolve().then(() => rangelimitDesign), "./serialnumber/serialnumber-design.vue": () => import("./serialnumber-design-BvJSmeFY.js"), "./text/text-design.vue": () => import("./text-design-CPMzgWXN.js"), "./timediff/timediff-design.vue": () => import("./timediff-design-CWiKmA7W.js") });
+  const modules = /* @__PURE__ */ Object.assign({ "../__cell_widgets__/cell-widget-design.vue": () => Promise.resolve().then(() => cellWidgetDesign), "../__cell_widgets__/seal/seal-design.vue": () => import("./seal-design-BRJgX3Fr.js"), "./barcode/barcode-design.vue": () => import("./barcode-design-CHbO1c-N.js"), "./diagonal/diagonal-design.vue": () => import("./diagonal-design-CwaKPsqR.js"), "./image/image-design.vue": () => import("./image-design-g9R_z-IY.js"), "./line/line-design.vue": () => Promise.resolve().then(() => lineDesign), "./pagination/pagination-design.vue": () => import("./pagination-design-BasHtAud.js"), "./paper-widget-design.vue": () => import("./paper-widget-design-BWJtqIvf.js"), "./power/power-design.vue": () => Promise.resolve().then(() => powerDesign), "./qrcode/qrcode-design.vue": () => import("./qrcode-design-hSEE0IFK.js"), "./rangelimit/rangelimit-design.vue": () => Promise.resolve().then(() => rangelimitDesign), "./serialnumber/serialnumber-design.vue": () => import("./serialnumber-design-C92sT5qW.js"), "./text/text-design.vue": () => import("./text-design-DaxQodcl.js"), "./timediff/timediff-design.vue": () => import("./timediff-design-D84T_Isx.js") });
   const widgetDesignMap = Object.keys(modules).reduce((map2, path) => {
     const mKey = path.match(/\/([a-z]+)-design\.vue$/)?.[1];
     if (mKey) {
@@ -22006,7 +22133,8 @@ const _sfc_main$5$ = /* @__PURE__ */ defineComponent({
                   key: 1,
                   "field-widget": item.fieldWidget,
                   "field-meta": item.fieldMeta,
-                  "auto-line-break": isAutoLineBreak.value
+                  "auto-line-break": isAutoLineBreak.value,
+                  "in-combined-fields": ""
                 }, null, 8, ["field-widget", "field-meta", "auto-line-break"])) : createCommentVNode("", true)
               ], 64);
             }), 128))
@@ -22051,7 +22179,7 @@ const _sfc_main$5$ = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SpreadSheetCell = /* @__PURE__ */ _export_sfc(_sfc_main$5$, [["__scopeId", "data-v-f8007289"]]);
+const SpreadSheetCell = /* @__PURE__ */ _export_sfc(_sfc_main$5$, [["__scopeId", "data-v-38a0d106"]]);
 const ThresholdValue = 8;
 function getOffsetValue(left, width, points) {
   let offset2 = left;
@@ -39389,13 +39517,28 @@ function useDefaultValueOptions({ source, getFields, fetchPage }) {
       const searchKeys = ["code_", "name_"].filter((key) => keys2.includes(key));
       if (!searchKeys.length) keyword2.value = "";
       const conditions = keyword2.value ? searchKeys.map((key) => `${key}.like`) : [];
-      const page = await fetchPage(modelKey, {
+      if (modelKey === "em_device") {
+        conditions.push("asset_number_.like");
+      }
+      let bodyData = {
         pageNo: currentPage,
         pageSize: PAGE_SIZE,
         sorts: SORTS,
         query: Object.fromEntries(conditions.map((key) => [key, keyword2.value])),
         ...conditions.length > 1 ? { exp: `OR(${conditions.join(",")})` } : {}
-      });
+      };
+      if (modelKey === "em_device") {
+        const { queryData, exp: deviceExp } = buildDeviceFilterQuery();
+        bodyData = {
+          ...bodyData,
+          query: {
+            ...queryData,
+            ...bodyData.query
+          },
+          exp: keyword2.value ? refUtils.splicingExp(deviceExp, bodyData.exp) : deviceExp
+        };
+      }
+      const page = await fetchPage(modelKey, bodyData);
       if (!isCurrent()) return;
       if (!Array.isArray(page?.data)) throw new Error("Invalid default value page");
       const merged = new Map(options.value.map((option2) => [option2.value, option2]));
@@ -39604,11 +39747,11 @@ const _sfc_main$4v = /* @__PURE__ */ defineComponent({
       FIELD_TYPE.SHOPFLOOR,
       FIELD_TYPE.WAREHOUSE,
       FIELD_TYPE.TARGET_WAREHOUSE,
-      FIELD_TYPE.ROUTING_OPERATION,
-      FIELD_TYPE.NOT_GOOD_GROUP,
-      FIELD_TYPE.NOT_GOOD_REASON,
-      FIELD_TYPE.SCRAP_GROUP,
-      FIELD_TYPE.SCRAP_REASON
+      FIELD_TYPE.ROUTING_OPERATION
+      // FIELD_TYPE.NOT_GOOD_GROUP,
+      // FIELD_TYPE.NOT_GOOD_REASON,
+      // FIELD_TYPE.SCRAP_GROUP,
+      // FIELD_TYPE.SCRAP_REASON,
     ];
     const defaultValueVisible = useDefaultValueVisibility(() => props2.fieldMeta);
     const showType = computed(() => {
@@ -39618,6 +39761,19 @@ const _sfc_main$4v = /* @__PURE__ */ defineComponent({
       const isShowBizType = showTypes.includes(bizType);
       return isShowType || isShowBizType;
     });
+    const typeBizMaps = {
+      [FIELD_TYPE.ROUTING_OPERATION]: {
+        bsKey: "biz_list_available_operations",
+        body: {
+          query: {
+            type_: "NODE_SPEC"
+          }
+        }
+      },
+      [FIELD_TYPE.DEVICE]: {
+        bsKey: "biz_form_device_search"
+      }
+    };
     const { modelMetaMap: modelMetaMap2 } = useModelFields();
     const {
       options,
@@ -39649,10 +39805,22 @@ const _sfc_main$4v = /* @__PURE__ */ defineComponent({
         return fields.map((field) => field.key).filter((key) => !!key);
       },
       async fetchPage(modelKey, body) {
+        const { fieldType, bizType } = props2.fieldMeta;
+        const cusBiz = typeBizMaps[bizType || fieldType];
         return await api.apaas.modelComprehensive.postBizServiceModelCategoryModelKeyBsKey(
-          { modelCategory: "entity", modelKey, bsKey: "listByPage" },
+          {
+            modelCategory: "entity",
+            modelKey,
+            bsKey: cusBiz?.bsKey || "listByPage"
+          },
           {},
-          body
+          {
+            ...body,
+            query: {
+              ...body.query || {},
+              ...cusBiz?.body?.query || {}
+            }
+          }
         );
       }
     });
@@ -39701,6 +39869,7 @@ const _sfc_main$4v = /* @__PURE__ */ defineComponent({
             "default-active-first-option": false,
             "label-in-value": "",
             style: { "width": "100%" },
+            allowClear: "",
             onChange: handleChange,
             onDropdownVisibleChange: unref(handleOpen),
             onPopupScroll: unref(handleScroll),
@@ -39750,7 +39919,7 @@ const _sfc_main$4v = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const DefaultValueSelectEditor = /* @__PURE__ */ _export_sfc(_sfc_main$4v, [["__scopeId", "data-v-c4be7b0d"]]);
+const DefaultValueSelectEditor = /* @__PURE__ */ _export_sfc(_sfc_main$4v, [["__scopeId", "data-v-43b7850e"]]);
 const _hoisted_1$2w = { class: "flex justify-between items-center" };
 const _sfc_main$4u = /* @__PURE__ */ defineComponent({
   __name: "ref-props",
@@ -55660,15 +55829,14 @@ const _sfc_main$3C = /* @__PURE__ */ defineComponent({
 示例：PROCESSPARAMCHECK('gycs',灭菌参数) 返回 true`,
                 definition: "declare function PROCESSPARAMCHECK(key:string; value: number): Promise<boolean | null>;"
               },
-              {
-                id: "DEVICEPARAMCHECK",
-                returnType: "boolean",
-                args: ["id", "key", "value"],
-                desc: `DEVICEPARAMCHECK(设备字段,参数字段KEY,参数字段)
-根据表单填报的设备参数实际值，与该参数配置的上限和下限进行比较，判断参数是否合格。
-示例：DEVICEPARAMCHECK(设备字段,'sbcs',运行转速) 返回 true`,
-                definition: "declare function DEVICEPARAMCHECK(id:string; key:string, value: number): Promise<boolean | null>;"
-              },
+              // {
+              //   id: 'DEVICEPARAMCHECK',
+              //   returnType: 'boolean',
+              //   args: ['id', 'key', 'value'],
+              //   desc: `DEVICEPARAMCHECK(设备字段,参数字段KEY,参数字段)\n根据表单填报的设备参数实际值，与该参数配置的上限和下限进行比较，判断参数是否合格。\n示例：DEVICEPARAMCHECK(设备字段,'sbcs',运行转速) 返回 true`,
+              //   definition:
+              //     'declare function DEVICEPARAMCHECK(id:string; key:string, value: number): Promise<boolean | null>;',
+              // },
               {
                 id: "INSPECTIONPARAMCHECK",
                 returnType: "boolean",
@@ -55876,7 +56044,7 @@ const _sfc_main$3C = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const addDependencyModal = /* @__PURE__ */ _export_sfc(_sfc_main$3C, [["__scopeId", "data-v-d15f9081"]]);
+const addDependencyModal = /* @__PURE__ */ _export_sfc(_sfc_main$3C, [["__scopeId", "data-v-eec1bc1b"]]);
 const _hoisted_1$29 = { class: "text-[#C3C3C3] text-12px mb8px" };
 const _hoisted_2$1y = { class: "ks-row" };
 const _hoisted_3$1c = { class: "mr-auto" };
@@ -56641,7 +56809,7 @@ const _sfc_main$3v = /* @__PURE__ */ defineComponent({
   }
 });
 function asyncImportWidgetProp() {
-  const modules = /* @__PURE__ */ Object.assign({ "./widget-barcode.vue": () => import("./widget-barcode-CHBw2stC.js"), "./widget-diagonal.vue": () => import("./widget-diagonal-NClGO5Rn.js"), "./widget-image.vue": () => import("./widget-image-_Nb1X3Xz.js"), "./widget-line.vue": () => import("./widget-line-Bipjn0YA.js"), "./widget-pagination.vue": () => import("./widget-pagination-B_Pse1Fh.js"), "./widget-power.vue": () => import("./widget-power-DKccfSH2.js"), "./widget-qrcode.vue": () => import("./widget-qrcode-D-9tBxgw.js"), "./widget-rangelimit.vue": () => import("./widget-rangelimit-BpOZXTEa.js"), "./widget-serialnumber.vue": () => import("./widget-serialnumber-zGQ-Z_UV.js"), "./widget-text.vue": () => import("./widget-text-CVJ1-3y3.js"), "./widget-timediff.vue": () => import("./widget-timediff-CBonTDnJ.js") });
+  const modules = /* @__PURE__ */ Object.assign({ "./widget-barcode.vue": () => import("./widget-barcode-CN13ewGl.js"), "./widget-diagonal.vue": () => import("./widget-diagonal-DMki09VI.js"), "./widget-image.vue": () => import("./widget-image-BP_4rlRW.js"), "./widget-line.vue": () => import("./widget-line-BkbZEHCt.js"), "./widget-pagination.vue": () => import("./widget-pagination-Bo31Q_F-.js"), "./widget-power.vue": () => import("./widget-power-DNaqREkx.js"), "./widget-qrcode.vue": () => import("./widget-qrcode-DLGoKdnQ.js"), "./widget-rangelimit.vue": () => import("./widget-rangelimit-CwI-0gsT.js"), "./widget-serialnumber.vue": () => import("./widget-serialnumber-4TPNnZeQ.js"), "./widget-text.vue": () => import("./widget-text-kjnijcMF.js"), "./widget-timediff.vue": () => import("./widget-timediff-CZAMM1f0.js") });
   const widgetPropMap = Object.keys(modules).reduce((map2, path) => {
     const mKey = path.match(/\/widget-([a-z]+)\.vue$/)?.[1];
     if (mKey) {
@@ -66240,7 +66408,7 @@ const _sfc_main$2y = /* @__PURE__ */ defineComponent({
                 onSelect: onClearAll
               }, null, 8, ["value"]),
               _cache[9] || (_cache[9] = createElementVNode("div", { class: "split" }, null, -1)),
-              joinModelType.value === unref(JoinModelTypeEum).FormModel ? (openBlock(), createBlock(unref(_sfc_main$6A), {
+              joinModelType.value === unref(JoinModelTypeEum).FormModel ? (openBlock(), createBlock(unref(_sfc_main$6B), {
                 key: 0,
                 class: "custom-select",
                 placeholder: _ctx.$t("sys.cardDesign.form.modelRequired"),
@@ -69669,23 +69837,11 @@ const _sfc_main$2e = /* @__PURE__ */ defineComponent({
       keyword: void 0
     });
     const manualInputValue = computed(() => String(searchForm.value.keyword ?? "").trim());
-    const searchField = [
-      "name_.like",
-      "product_id_code_.like",
-      "product_id_name_.like",
-      "spec_.like"
-    ];
     const fetcher = async ({ keyword: keyword2 = "", pageNo, pageSize: pageSize2 }) => {
-      const queryData = keyword2 && String(keyword2).trim() ? searchField.reduce((total, fieldKey) => {
-        total[fieldKey.includes(".") ? fieldKey : `${fieldKey}.like`] = keyword2;
-        return total;
-      }, {}) : {};
+      const { queryData, exp } = buildMaterialLotListQuery(keyword2, props2.extraQuery);
       const res = await renderUtils.requestMaterialLotOptions({
-        exp: keyword2 ? `OR(${searchField.join(",")})` : void 0,
-        queryData: {
-          ...queryData,
-          ...props2.extraQuery
-        },
+        exp,
+        queryData,
         pageNo,
         pageSize: pageSize2
       });
@@ -69813,7 +69969,7 @@ const _sfc_main$2e = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const MaterialLotSelectTable = /* @__PURE__ */ _export_sfc(_sfc_main$2e, [["__scopeId", "data-v-d5b1328d"]]);
+const MaterialLotSelectTable = /* @__PURE__ */ _export_sfc(_sfc_main$2e, [["__scopeId", "data-v-be7eefec"]]);
 const _sfc_main$2d = /* @__PURE__ */ defineComponent({
   __name: "trace-material-lot-select",
   props: {
@@ -70732,6 +70888,9 @@ const _sfc_main$28 = /* @__PURE__ */ defineComponent({
     const emit2 = __emit;
     const currentValue = computed({
       get() {
+        if (props2.value === void 0 || props2.value === null || props2.value === "") {
+          return [];
+        }
         if (props2.value && !Array.isArray(props2.value) && props2.mode !== "multiple") {
           return [props2.value];
         }
@@ -70772,7 +70931,7 @@ const _sfc_main$28 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const CheckboxSwitch$1 = /* @__PURE__ */ _export_sfc(_sfc_main$28, [["__scopeId", "data-v-4c31c26d"]]);
+const CheckboxSwitch$1 = /* @__PURE__ */ _export_sfc(_sfc_main$28, [["__scopeId", "data-v-784964bd"]]);
 const _sfc_main$27 = /* @__PURE__ */ defineComponent({
   __name: "radio-enum",
   props: {
@@ -74299,7 +74458,7 @@ const VuePdf = /* @__PURE__ */ defineComponent({
   }
 });
 const VueVideoPlayer = defineAsyncComponent(
-  () => import("./VueVideoPlayer-D5zE_mXQ.js")
+  () => import("./VueVideoPlayer-yISI5amX.js")
 );
 const _hoisted_1$18 = {
   key: 0,
@@ -77896,12 +78055,8 @@ const _sfc_main$1F = /* @__PURE__ */ defineComponent({
         ...props2.widget,
         props: {
           ...props2.widget.props,
-          displayFields: [
-            { key: "code_", name: $t("sys.edhr.field.code") },
-            { key: "product_id_name_", name: "产品名称" },
-            { key: "product_id_code_", name: "产品编码" },
-            { key: "product_id_spec_", name: "产品规格" },
-            { key: "qty_", name: "数量" }
+          displayFields: props2.widget.props.displayFields ?? [
+            { key: "code_", name: $t("sys.edhr.field.code") }
           ],
           quickSearchable: true,
           quickSearchField,
@@ -78154,7 +78309,7 @@ const _sfc_main$1F = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const selectRender = /* @__PURE__ */ _export_sfc(_sfc_main$1F, [["__scopeId", "data-v-b59a242d"]]);
+const selectRender = /* @__PURE__ */ _export_sfc(_sfc_main$1F, [["__scopeId", "data-v-b2337210"]]);
 const __vite_glob_0_10 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   default: selectRender
@@ -84534,6 +84689,8 @@ const _sfc_main$1u = /* @__PURE__ */ defineComponent({
             default: withCtx(() => [
               createVNode(unref(CellMedia), {
                 class: normalizeClass([
+                  "image-cell-content",
+                  images.value.length && isAdaptive.value && "is-adaptive",
                   !images.value.length && unref(showRequired) && "is-show-required",
                   unref(realFieldId),
                   unref(showDisplayStatus),
@@ -84594,7 +84751,7 @@ const _sfc_main$1u = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const uploadImageRender = /* @__PURE__ */ _export_sfc(_sfc_main$1u, [["__scopeId", "data-v-e83e65ec"]]);
+const uploadImageRender = /* @__PURE__ */ _export_sfc(_sfc_main$1u, [["__scopeId", "data-v-8a9e24fe"]]);
 const __vite_glob_0_16 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   default: uploadImageRender
@@ -84931,6 +85088,7 @@ const _sfc_main$1q = /* @__PURE__ */ defineComponent({
     const { fields } = reactive(props2.widget.props);
     const dataRelationShip = inject(NCB_PROVIDE.DATA_RELATION_SHIP);
     const isPreview = computed(() => dataRelationShip?.renderModeType === RenderModeEnum.ViewMode);
+    const preserveOptionWidth = (fieldWidget) => fieldWidget.component === ComponentTypeEnum.EnumSelect && "bindCompStyleType" in fieldWidget.props && (fieldWidget.props.bindCompStyleType === BindCmpStyleEnum.CMP_RADIO || fieldWidget.props.bindCompStyleType === BindCmpStyleEnum.CMP_CHECKBOX) && !isCellAutoLineBreak(fieldWidget.style);
     const wrapFields = computed(() => isCellAutoLineBreak(props2.widget.style));
     const layoutStyle = computed(() => {
       const { textAlign, verticalAlign } = props2.widget.style ?? {};
@@ -84965,6 +85123,9 @@ const _sfc_main$1q = /* @__PURE__ */ defineComponent({
               style: normalizeStyle({ width: `${unref(normalizeSpacerWidth)(fieldWidget.props.spacerWidth)}px` })
             }, null, 4)) : (openBlock(), createBlock(_sfc_main$1c, {
               key: 1,
+              class: normalizeClass({
+                "combine-fields-item--unwrapped-options": preserveOptionWidth(fieldWidget)
+              }),
               widget: fieldWidget,
               formData: __props.formData,
               subtableFieldId: __props.subtableFieldId,
@@ -84972,14 +85133,14 @@ const _sfc_main$1q = /* @__PURE__ */ defineComponent({
               realColIndex: __props.realColIndex,
               pageRowIndex: __props.pageRowIndex,
               childSubTableDataIndex: __props.childSubTableDataIndex
-            }, null, 8, ["widget", "formData", "subtableFieldId", "realRowIndex", "realColIndex", "pageRowIndex", "childSubTableDataIndex"]))
+            }, null, 8, ["class", "widget", "formData", "subtableFieldId", "realRowIndex", "realColIndex", "pageRowIndex", "childSubTableDataIndex"]))
           ], 64);
         }), 128))
       ], 6);
     };
   }
 });
-const combineFieldsRender = /* @__PURE__ */ _export_sfc(_sfc_main$1q, [["__scopeId", "data-v-fdb6cdd3"]]);
+const combineFieldsRender = /* @__PURE__ */ _export_sfc(_sfc_main$1q, [["__scopeId", "data-v-fdb7c6dd"]]);
 const __vite_glob_0_19 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   default: combineFieldsRender
@@ -86690,6 +86851,7 @@ function useObjectInitModal() {
     );
     const bomEntry = {
       ...pick(result, bomKeys),
+      force_loading_enabled_: false,
       id_: existing?.objectBomConfig?.entries_?.[0]?.id_
     };
     result.objectBomConfig = {
@@ -95815,8 +95977,8 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
       printTask = (async () => {
         if (document.activeElement instanceof HTMLElement) document.activeElement.blur();
         await nextTick();
-        const { printRuntimeInstance } = await import("./print-runtime-instance-D4Pj5Qhr.js");
-        const { default: renderer } = await import("./print-snapshot-renderer-De-pf1K_.js");
+        const { printRuntimeInstance } = await import("./print-runtime-instance-OTdo3422.js");
+        const { default: renderer } = await import("./print-snapshot-renderer-ByiTyPun.js");
         if (abort.signal.aborted) throw new Error("打印已取消");
         printRenderer.value = markRaw(renderer);
         await printRuntimeInstance(
@@ -95963,7 +96125,7 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
     provide(NCB_PROVIDE.RUNTIME_INSTANCE_REGISTRY, runtimeRegistry);
     initWebPaasUploadApis();
     return (_ctx, _cache) => {
-      return openBlock(), createBlock(unref(_sfc_main$6B), {
+      return openBlock(), createBlock(unref(_sfc_main$6C), {
         loading: __props.loading,
         "has-data": __props.hasData,
         error: unref(runtimeRegistry).loadState.error?.message