@gct-paas/word 0.1.30 → 0.1.32

package/dist/index.es.js

@@ -20594,7 +20594,8 @@ function safeParseJson(data, fallback = null, validator2) {
 }
 function generateValuePath(fieldLink, subFieldKey) {
   if (subFieldKey) {
-    return `$.${subFieldKey}[n].${fieldLink}`;
+    const connector = subFieldKey.includes(":") ? "" : "[n]";
+    return `$.${subFieldKey}${connector}.${fieldLink}`;
   } else {
     return `$.${fieldLink}`;
   }
@@ -26668,12 +26669,6 @@ function distributeInteger(total, count) {
   }
   return result;
 }
-const mainData2WordData = (data) => {
-  const entries = Object.entries(data).map(([key, value]) => {
-    return [`$.${key}`, value];
-  });
-  return Object.fromEntries(entries);
-};
 class TextUtil {
   /** 字体度量缓存限制 */
   static FONT_METRICS_CACHE_LIMIT = 80;
@@ -38116,21 +38111,13 @@ class InsertField extends CommandBase {
     const cursor = this.doc.cursorManager;
     const { nodeId, offset: offset2, side } = cursor.getCursor();
     const {
-      valuePath: _valuePath,
-      widgetMeta,
-      mainModelFields
+      valuePath,
+      widgetMeta
     } = this.payload;
     const mapper = this.doc.layoutMapper;
     const node = mapper.getBaseMetaNodeById(nodeId);
     const run = node.raw;
     const wp = mapper.getModelNodeById(run.parent.modelRef.id);
-    let valuePath = _valuePath;
-    if (run.modelRef?.valuePath2D) {
-      const [subTableKey, dataGroup2DKey] = run.modelRef.valuePath2D.replace("$.", "").split(":") || [];
-      const subTableModelKey = mainModelFields.find((f) => f.key === subTableKey)?.bindInfo;
-      const dataGroup2DModelKey = mainModelFields.find((f) => f.key === dataGroup2DKey)?.bindInfo;
-      valuePath = `$.${subTableModelKey}:${dataGroup2DModelKey}.${valuePath.replace("$.", "")}`;
-    }
     const wr = new WrField({ text: valuePath, valuePath, widgetMeta });
     if (!this.validateFieldPath(valuePath, wp)) {
       console.warn("字段路径不合法，无法插入字段", valuePath);
@@ -40640,8 +40627,8 @@ class TextHandler {
     return id;
   }
   static get2DInfo(context) {
-    const { xDataIndex, yDataIndex, valuePath } = context.cell?.subRenderer || {};
-    return { xDataIndex, yDataIndex, valuePath2D: valuePath };
+    const { xDataIndex, yDataIndex } = context.cell?.subRenderer || {};
+    return { xDataIndex, yDataIndex };
   }
   /**
    * 合并部分run
@@ -40846,8 +40833,8 @@ class FieldBaseHandler {
     return id;
   }
   static get2DInfo(context) {
-    const { xDataIndex, yDataIndex, valuePath } = context.cell?.subRenderer || {};
-    return { xDataIndex, yDataIndex, valuePath2D: valuePath };
+    const { xDataIndex, yDataIndex } = context.cell?.subRenderer || {};
+    return { xDataIndex, yDataIndex };
   }
   static getValue(ctx, valuePath) {
     const { context } = ctx;
@@ -45926,6 +45913,7 @@ class DataManager {
   /**
    * 设置整个原始数据
    * @param data 新的 JSON 数据
+   * @param defaultsMap 默认值， 字段值为 undefined 时才懒填充，不覆盖接口数据
    */
   setRawData(data, defaultsMap) {
     const oldData = this.rawData;
@@ -45935,6 +45923,58 @@ class DataManager {
       this.setDefaults(defaultsMap);
     }
   }
+  /**
+   * 将初始化数据直接写入 rawData（仅填充空值，不覆盖接口数据）
+   * 与 defaults（懒填充）不同，此方法在初始化阶段一次性写入
+   *
+   * 支持两种子表路径形式：
+   * - `[n]` 通配符：展开到 rawData 中已有的每一行（无则创建一行），如 `$.sub[n].field`
+   * - 真实下标：直接写入指定行，如 `$.sub[0].field`
+   *
+   * 处理顺序：先展开 `[n]` 通配符，再写入真实下标路径。
+   * 这样可以保证：参数映射（`[n]`）先铺好默认值，自定义数据源（真实下标）再精确覆盖。
+   */
+  applyInitData(initDataMap) {
+    for (const [path2, value] of Object.entries(initDataMap)) {
+      if (value === void 0 || value === null) continue;
+      if (path2.includes("[n]")) {
+        this.applyInitDataWildcard(path2, value);
+      }
+    }
+    for (const [path2, value] of Object.entries(initDataMap)) {
+      if (value === void 0 || value === null) continue;
+      if (!path2.includes("[n]")) {
+        const existing = this.getByPath(this.rawData, path2);
+        if (existing === void 0 || existing === null) {
+          try {
+            this.setByPath(this.rawData, path2, value);
+          } catch (e) {
+            console.warn(`applyInitData: failed to set path "${path2}"`, e);
+          }
+        }
+      }
+    }
+  }
+  applyInitDataWildcard(path2, value) {
+    const match = path2.match(/^\$\.([^[.]+)\[n\]/);
+    if (!match) return;
+    const subTableKey = match[1];
+    let subTableArray = this.rawData?.[subTableKey];
+    if (!Array.isArray(subTableArray) || subTableArray.length === 0) {
+      subTableArray = [{ ...DEFAULT_EMPTY_ITEM }];
+    }
+    for (let i = 0; i < subTableArray.length; i++) {
+      const realPath = replacePathIndexPlaceholder(i, path2);
+      const existing = this.getByPath(this.rawData, realPath);
+      if (existing === void 0 || existing === null) {
+        try {
+          this.setByPath(this.rawData, realPath, value);
+        } catch (e) {
+          console.warn(`applyInitData: failed to set path "${realPath}"`, e);
+        }
+      }
+    }
+  }
   /**
    * 内部方法：根据路径获取值
    */
@@ -50226,6 +50266,28 @@ const apiFetchers = {
         totalCount: totalCount || 0
       };
     },
+    fetchOne: async (id) => {
+      if (!id) return {};
+      const result = await api.apaas.modelComprehensive.postBizServiceModelCategoryModelKeyBsKey(
+        {
+          modelCategory: API_CONFIG.ENTITY_CATEGORY,
+          modelKey: API_CONFIG.LOT_DEFAULTS.modelKey,
+          bsKey: API_CONFIG.LOT_DEFAULTS.bsKey
+        },
+        {},
+        {
+          query: { "material_no_.like": id },
+          pageSize: 20,
+          pageNo: 1
+        }
+      );
+      const { data = [], totalPage, dict, totalCount } = result || {};
+      return {
+        data: transformSourceDataList(data || [], dict) || [],
+        totalPage,
+        totalCount: totalCount || 0
+      };
+    },
     transformers: {
       toOptions(items) {
         const transformer = createTransformer("material_no_", "material_no_");
@@ -50430,7 +50492,7 @@ async function fetchLabelAndFill(defaults2, valuePath, id, fetcher, props, fallb
   defaults2 ??= {};
   defaults2[valuePath] = id;
   try {
-    const isSingle = fetcher === "rdo2ref";
+    const isSingle = fetcher === "rdo2ref" || fetcher === "lot2sn";
     const result = isSingle ? await apiFetchers[fetcher].getOptionById(id, props) : await apiFetchers[fetcher].getOptionByIds(getValue$1(id, true), props);
     const list = Array.isArray(result) ? result : result ? [result] : [];
     const labels = list.map((i) => i?.label).filter(Boolean);
@@ -50447,7 +50509,7 @@ async function fetchLabelAndFill(defaults2, valuePath, id, fetcher, props, fallb
   }
   return defaults2;
 }
-async function enrichApiDefaultValues(defaults2, rule, valuePath, fieldMeta, context, loadFieldByKey) {
+async function enrichApiDefaultValues(defaults2, rule, valuePath, fieldMeta, context, loadFieldByKey, options) {
   if (!rule || !("fetcher" in rule)) {
     return defaults2;
   }
@@ -50468,7 +50530,8 @@ async function enrichApiDefaultValues(defaults2, rule, valuePath, fieldMeta, con
     return defaults2;
   }
   const apiRule = rule;
-  if (apiRule.onlyMainModelFieldsCanRequest && fieldMeta.subFieldKey) {
+  const allowSubModelRequest = options?.allowSubModelRequest ?? false;
+  if (apiRule.onlyMainModelFieldsCanRequest && fieldMeta.subFieldKey && !allowSubModelRequest) {
     return defaults2;
   }
   const modelKey = getLastSegment(fieldMeta.modelLink);
@@ -50504,7 +50567,16 @@ async function fetchAutofillSource(field, context) {
   return data;
 }
 async function computeFieldDefaultValue(params) {
-  const { fieldType, fieldMeta, valuePath, value, props, getFieldManifest, loadFieldByKey } = params;
+  const {
+    fieldType,
+    fieldMeta,
+    valuePath,
+    value,
+    props,
+    getFieldManifest,
+    loadFieldByKey,
+    allowSubModelRequest
+  } = params;
   const result = {};
   const manifest2 = getFieldManifest(fieldType);
   const rule = manifest2?.computed?.defaultValueRule;
@@ -50533,7 +50605,10 @@ async function computeFieldDefaultValue(params) {
       valuePath,
       fieldMeta,
       fakeContext,
-      loadFieldByKey
+      loadFieldByKey,
+      {
+        allowSubModelRequest
+      }
     );
   }
   Object.assign(result, defaults2);
@@ -51007,14 +51082,6 @@ const builtinFieldColumns = [
     name: "字段类型"
   }
 ];
-const DEFAULT_FROM_STATE = {
-  _DICT: {},
-  //翻译的字段
-  _OPCT: {},
-  //关联模型字段完全体
-  _MCTABLE: {}
-  // 物料消耗表业务数据
-};
 function getDefaultQueryIdsByFieldType(payload) {
   const defaultQueryIds = {
     [FIELD_TYPE.MATERIAL_NO]: payload.materialNumber,
@@ -51069,13 +51136,13 @@ async function loadDefaultValuesByFields(instances, ctx, context, masterSlaveLis
   await Promise.all(promises);
   return defaultDataMap;
 }
-const handleParameterMapping = (parameterMapping, paramsConfig, subTableInfo, fieldPermission) => {
+const handleParameterMapping = async (parameterMapping, paramsConfig, fieldPermission, instances, ctx) => {
   if (!parameterMapping.length || !paramsConfig) {
     return {};
   }
   const referenceMap = new Map(Object.entries(paramsConfig));
-  const paramMap = { ...cloneDeep(DEFAULT_FROM_STATE) };
-  const subMappedFields = {};
+  const paramMap = {};
+  console.log("TJ::parameterMapping", parameterMapping);
   const paramsMapList = parameterMapping.map((item) => {
     return item.toFields.map((f) => {
       return {
@@ -51099,90 +51166,75 @@ const handleParameterMapping = (parameterMapping, paramsConfig, subTableInfo, fi
       return item?.paramMapType === type4 === isBuiltin && (!field || !field.readonly);
     })
   );
-  const processParamItem = (item) => {
+  const processParamItem = async (item) => {
     if (!referenceMap.has(item.formKey)) return;
     const value = referenceMap.get(item.formKey);
-    const formattedValue = toFormatValue(item.fieldType, value);
-    const target = item?.subModel ? (subMappedFields[item.subFieldKey] ??= {}, subMappedFields[item.subFieldKey]) : paramMap;
-    merge(target, { [item.field]: formattedValue });
-  };
-  [...builtinParams, ...compParams].forEach(processParamItem);
-  Object.entries(subMappedFields).forEach(([key, value]) => {
-    const subTableConfig = subTableInfo.find(({ field }) => field === key);
-    if (!subTableConfig) return;
-    const data = [value];
-    let data2d;
-    const { childInitRowLen, key: tableKey } = subTableConfig;
-    const is2DTable = subTableConfig.subTable2d && tableKey === "dyn" || subTableConfig.checkTable2d && tableKey === "newfixed";
-    if (is2DTable) {
-      const emptyList = Array.from({ length: childInitRowLen });
-      data2d = data.map((fInfo) => {
-        const group_ = `${tableKey}${uuid()}`;
-        return emptyList.map((_2) => {
-          return {
-            ...fInfo,
-            group_
-          };
-        });
-      }).flat();
+    const valuePath = generateValuePath(item.field, item?.subModel ? item.subFieldKey : "");
+    const widget = instances.find((instance2) => {
+      const fieldMeta = instance2.widgetMeta?.field;
+      if (item?.subModel) {
+        return item.field === getLastSegment(fieldMeta?.fieldLink) && item.subFieldKey === fieldMeta?.subFieldKey;
+      }
+      return item.field === getLastSegment(fieldMeta?.fieldLink) && !fieldMeta?.subFieldKey;
+    });
+    if (widget) {
+      const computed2 = await computeFieldDefaultValue({
+        fieldType: item.fieldType,
+        fieldMeta: widget.widgetMeta.field,
+        valuePath,
+        value: toFormatValue(item.fieldType, value),
+        props: widget.widgetMeta.props ?? {},
+        getFieldManifest: ctx.getFieldManifest.bind(ctx),
+        loadFieldByKey: async (modelKey, fieldKey) => ctx.runtime.loadFieldByKey(modelKey, fieldKey),
+        allowSubModelRequest: true
+      });
+      merge(paramMap, computed2);
+    } else {
+      merge(paramMap, { [valuePath]: toFormatValue(item.fieldType, value) });
     }
-    merge(paramMap, {
-      [key]: {
-        data: data2d || data,
-        dict: {}
-      }
-    });
-  });
+  };
+  await Promise.all([...builtinParams, ...compParams].map(processParamItem));
   return paramMap;
 };
-const getFormDataItem = (onFieldMap, subTableInfo, result) => {
-  const formDataItem = { ...cloneDeep(DEFAULT_FROM_STATE) };
-  if (result?.data?.length) {
-    const firstData = cloneDeep(result.data[0]);
-    onFieldMap.forEach((item) => {
-      if (item.subModel === 0) {
-        const mappedFields = item.fields.reduce(
-          (prev, { isFieldModel, leftFieldKey, fieldLink, rightFieldKey }) => {
-            prev[leftFieldKey] = isFieldModel ? firstData?.__FOREIGN__?.[fieldLink] : firstData[rightFieldKey];
-            return prev;
-          },
-          {}
-        );
-        merge(formDataItem, mappedFields);
-      } 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;
-            },
-            {}
-          )
-        );
-        let fieldList2d;
-        if (sInfo.subTable2d && sInfo.key === "dyn" || sInfo.checkTable2d && sInfo.key === "newfixed") {
-          const emptyList = Array.from({ length: sInfo.childInitRowLen });
-          fieldList2d = fieldList.map((fInfo) => {
-            const group_ = `${sInfo.key}${uuid()}`;
-            return emptyList.map((_2) => {
-              return {
-                ...fInfo,
-                group_
-              };
-            });
-          }).flat();
+const buildPathMapFromApiResult = (onFieldMap, result, subTableInfo) => {
+  const pathMap = {};
+  const { data = [], dict = {} } = result;
+  if (!data?.length) return pathMap;
+  const getLabelFromDict = (srcKey, value) => {
+    const entry = dict?.[srcKey]?.[value];
+    if (entry == null) return void 0;
+    return Array.isArray(entry) ? entry[0] : entry;
+  };
+  onFieldMap.forEach((item) => {
+    if (item.subModel === 0) {
+      const firstRow = data[0];
+      item.fields.forEach(({ isFieldModel, leftFieldKey, fieldLink, rightFieldKey }) => {
+        const srcKey = rightFieldKey;
+        const value = isFieldModel ? firstRow?.__FOREIGN__?.[fieldLink] : firstRow?.[srcKey];
+        if (value != null) {
+          const valuePath = generateValuePath(leftFieldKey, "");
+          pathMap[valuePath] = value;
+          const label = getLabelFromDict(srcKey, value);
+          if (label != null) pathMap[`${valuePath}_lb_`] = label;
         }
-        merge(formDataItem, {
-          [item.subFieldKey]: {
-            data: fieldList2d || fieldList,
-            dict: result.dict ?? {}
+      });
+    } else if (item.subModel === 1) {
+      data.forEach(
+        (rowData, index2) => item.fields.forEach(({ isFieldModel, leftFieldKey, fieldLink, rightFieldKey }) => {
+          const srcKey = rightFieldKey;
+          const value = isFieldModel ? rowData?.__FOREIGN__?.[fieldLink] : rowData?.[srcKey];
+          if (value != null) {
+            const valuePath = generateValuePath(leftFieldKey, item.subFieldKey);
+            const runtimeValuePath = replacePathIndexPlaceholder(index2, valuePath);
+            pathMap[runtimeValuePath] = value;
+            const label = getLabelFromDict(srcKey, value);
+            if (label != null) pathMap[`${runtimeValuePath}_lb_`] = label;
           }
-        });
-      }
-    });
-  }
-  return formDataItem;
+        })
+      );
+    }
+  });
+  return pathMap;
 };
 const handleCustomDataSource = async (customDataSource, paramsConfig, subTableInfo, instanceId) => {
   if (!customDataSource.length || !paramsConfig) {
@@ -51237,24 +51289,15 @@ const handleCustomDataSource = async (customDataSource, paramsConfig, subTableIn
       metaInfo = await api.apaas.modelMeta.getInfo({ id: info.joinModelKey });
     }
     if (metaInfo && metaInfo.type === "RDO" && info.joinModelKey === "em_product") {
-      const promise = api.apaas.onlineFormInstance.getGetRelatedProduct({
-        id: instanceId
-      }).then((res) => {
-        return getFormDataItem(info.onFieldMap, subTableInfo, {
-          data: res ? [res] : []
-        });
-      });
+      const promise = api.apaas.onlineFormInstance.getGetRelatedProduct({ id: instanceId }).then(
+        (res) => buildPathMapFromApiResult(info.onFieldMap, { data: res ? [res] : [] })
+      );
       promises.push(promise);
     } else if (info.joinModelType === JoinModelTypeEum.SqlModel) {
       if (finalSQL) {
-        const promise = api.apaas.dataSource.postSelect({
-          key: info.joinModelKey,
-          sql: finalSQL
-        }).then((res) => {
-          return getFormDataItem(info.onFieldMap, subTableInfo, {
-            data: res ?? []
-          });
-        });
+        const promise = api.apaas.dataSource.postSelect({ key: info.joinModelKey, sql: finalSQL }).then(
+          (res) => buildPathMapFromApiResult(info.onFieldMap, { data: res ?? [] })
+        );
         promises.push(promise);
       }
     } else if (info.joinModelType === JoinModelTypeEum.IpaasModel) {
@@ -51267,36 +51310,30 @@ const handleCustomDataSource = async (customDataSource, paramsConfig, subTableIn
           queryParameters: metaIpaas.metaQuery,
           uriParameters: metaIpaas.metaUri
         }).then((res) => {
-          const formDataItem = { ...cloneDeep(DEFAULT_FROM_STATE) };
+          const ipaasPathMap = {};
           info.onFieldMap.forEach((item) => {
             if (item.subModel === 0) {
-              const mappedFields = jsonSchemaUtils.processJsonSchemaSubModel0(item, res);
-              merge(formDataItem, mappedFields);
-            } else if (item.subModel === 1) {
-              const sInfo = subTableInfo.find((aa2) => aa2.field === item.subFieldKey) || {};
-              const fieldList = jsonSchemaUtils.processJsonSchemaSubModel1(item, res);
-              let fieldList2d;
-              if (sInfo.subTable2d && sInfo.key === "dyn" || sInfo.checkTable2d && sInfo.key === "newfixed") {
-                const emptyList = Array.from({ length: sInfo.childInitRowLen });
-                fieldList2d = fieldList.map((fInfo) => {
-                  const group_ = `${sInfo.key}${uuid()}`;
-                  return emptyList.map((_2) => {
-                    return {
-                      ...fInfo,
-                      group_
-                    };
-                  });
-                }).flat();
-              }
-              merge(formDataItem, {
-                [item.subFieldKey]: {
-                  data: fieldList2d || fieldList,
-                  dict: {}
+              const fields = jsonSchemaUtils.processJsonSchemaSubModel0(item, res);
+              Object.entries(fields).forEach(([key, value]) => {
+                if (value != null) {
+                  const valuePath = generateValuePath(key, "");
+                  ipaasPathMap[valuePath] = value;
                 }
               });
+            } else if (item.subModel === 1) {
+              let rows = jsonSchemaUtils.processJsonSchemaSubModel1(item, res);
+              rows.forEach((rowData, index2) => {
+                Object.entries(rowData).forEach(([key, value]) => {
+                  if (value != null) {
+                    const valuePath = generateValuePath(key, item.subFieldKey);
+                    const runtimeValuePath = replacePathIndexPlaceholder(index2, valuePath);
+                    ipaasPathMap[runtimeValuePath] = value;
+                  }
+                });
+              });
             }
           });
-          return formDataItem;
+          return ipaasPathMap;
         });
         promises.push(promise);
       }
@@ -51306,8 +51343,9 @@ const handleCustomDataSource = async (customDataSource, paramsConfig, subTableIn
           protocolKey: info.joinModelKey,
           instId: instanceId
         });
-        const promise = getFormDataItem(info.onFieldMap, subTableInfo, res);
-        promises.push(promise);
+        promises.push(
+          Promise.resolve(buildPathMapFromApiResult(info.onFieldMap, res))
+        );
       }
     } else {
       const query = info.query.filter((item) => {
@@ -51341,24 +51379,23 @@ const handleCustomDataSource = async (customDataSource, paramsConfig, subTableIn
             foreignFields
           },
           ...params
-        }).then((res) => {
-          return getFormDataItem(info.onFieldMap, subTableInfo, res);
-        });
+        }).then((res) => buildPathMapFromApiResult(info.onFieldMap, res));
         promises.push(promise);
       }
     }
   }
-  return Promise.all(promises);
+  const results = await Promise.all(promises);
+  return results.reduce((merged, map2) => merge(merged, map2), {});
 };
-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(
+const loadDataInitValues = async (dataInitConfig, paramsConfig, subTableInfo, fieldPermission, instanceId, instances, ctx) => {
+  if (!dataInitConfig) return { paramMap: {}, dsRawData: {} };
+  const { parameterMapping = [], customDataSource = [] } = dataInitConfig || {};
+  const paramMap = await handleParameterMapping(
     parameterMapping,
     paramsConfig,
-    subTableInfo,
-    fieldPermission
+    fieldPermission,
+    instances,
+    ctx
   );
   const dsMap = await handleCustomDataSource(
     customDataSource,
@@ -51366,10 +51403,7 @@ const loadDataInitValues = async (runtimeJson, paramsConfig, subTableInfo, field
     subTableInfo,
     instanceId
   );
-  return {
-    ...mainData2WordData(paramMap),
-    ...mainData2WordData(dsMap)
-  };
+  return { paramMap, dsMap };
 };
 const collectLinkedModelFields = (instances) => {
   const mainFields = /* @__PURE__ */ new Set();
@@ -51557,15 +51591,17 @@ async function initializeDocumentEngine(props, payload, result) {
     masterSlaveList
   );
   console.log("默认值集合 ===>", defaultDataMap);
-  const dataInitMap = await loadDataInitValues(
-    requestInfo.runtimeJson || "",
+  const { paramMap, dsMap } = await loadDataInitValues(
+    cloneRuntimeJson?.document?.config?.dataInit,
     paramsConfig,
-    [],
-    // JSW TODO: subTableInfo
+    docModel.getSubTableInfoList(),
     JSON.parse(requestInfo.processFieldPermission || "[]"),
-    id
+    id,
+    instances,
+    payload.ctx
   );
-  console.log("数据初始化集合 ===>", dataInitMap);
+  console.log("TJ::数据初始化集合/参数映射 ===>", paramMap);
+  console.log("TJ::数据初始化集合/自定义数据源 ===>", dsMap);
   const interfaceData = await fetchRenderData({
     info: requestInfo,
     fetchConfig: {
@@ -51599,10 +51635,8 @@ async function initializeDocumentEngine(props, payload, result) {
     docRuntimeMeta,
     fieldModelQuery: payload.ctx.runtime
   });
-  doc.dataManager.setRawData(rawData, {
-    ...defaultDataMap,
-    ...dataInitMap
-  });
+  doc.dataManager.setRawData(rawData, defaultDataMap);
+  doc.dataManager.applyInitData({ ...paramMap, ...dsMap });
   doc.docRuntimeMeta.handleInfo.initRawDataSnapshot = cloneDeep(doc.dataManager.getRawData());
   const docInfo = snapshotDocInfo(doc);
   return {
@@ -55673,10 +55707,11 @@ const _sfc_main$2D = /* @__PURE__ */ defineComponent({
         dataGroup2DList.push({
           subTableId: cell.subRenderer.id,
           subTableType: cell.subRenderer.type,
+          subTableValuePath: cell.subRenderer.valuePath,
           dataGroup2DAreaRange: cell.subRenderer?.dataGroup2DAreaRange
         });
       });
-      dataGroup2DList.forEach(({ subTableId, subTableType, dataGroup2DAreaRange }) => {
+      dataGroup2DList.forEach(({ subTableId, subTableType, subTableValuePath, dataGroup2DAreaRange }) => {
         if (!dataGroup2DAreaRange?.start) return;
         const {
           start: { row: startRow, col: startCol },
@@ -55695,6 +55730,7 @@ const _sfc_main$2D = /* @__PURE__ */ defineComponent({
                 subRenderer: {
                   id: subTableId,
                   type: subTableType,
+                  valuePath: subTableValuePath,
                   dataIndex: fakeDataIndex,
                   xDataIndex: fakeDataIndex
                 }
@@ -55941,7 +55977,11 @@ const _sfc_main$2D = /* @__PURE__ */ defineComponent({
                     pos: dataGroupTypePos.value[id],
                     onMouseenter: ($event) => onMouseenter(id, "data-group-first"),
                     onMouseleave,
-                    onClick: ($event) => handleAction(layer.type, { regionId: id, subFieldKey: layer.valuePath })
+                    onClick: ($event) => handleAction(layer.type, {
+                      regionId: id,
+                      subFieldKey: layer.valuePath,
+                      isDataGroup2DClicked: true
+                    })
                   }, null, 8, ["uuid", "isPreview", "layer", "pos", "onMouseenter", "onClick"])) : createCommentVNode("", true)
                 ]),
                 _: 2
@@ -59763,15 +59803,20 @@ const _sfc_main$2i = /* @__PURE__ */ defineComponent({
     const createFieldToWidget = createDesignFieldToWidgetFactory(designCtx.getFieldManifest);
     const subFieldKey = computed(() => {
       if (!interCtx.panelData) return "";
-      const s = getLastSegment(interCtx.panelData.context.subFieldKey);
-      return s.includes(":") ? s.split(":")[0] : s;
+      return getLastSegment(interCtx.panelData.context.subFieldKey);
     });
     const modelKey = computed(() => {
       if (!interCtx.panelData) return "";
       const mainModelKey = interCtx.panelData.context.mainModelKey;
       if (!mainModelKey) return "";
-      if (subFieldKey.value) {
-        const field = designCtx.runtime.getFieldList(mainModelKey)?.find((f) => f.key === subFieldKey.value);
+      const fullSubKey = subFieldKey.value;
+      if (fullSubKey) {
+        let singleSubKey = fullSubKey;
+        if (fullSubKey.includes(":")) {
+          const keyIndex = interCtx.panelData.context.isDataGroup2DClicked ? 1 : 0;
+          singleSubKey = fullSubKey.split(":")[keyIndex];
+        }
+        const field = designCtx.runtime.getFieldList(mainModelKey)?.find((f) => f.key === singleSubKey);
         return field?.bindInfo ?? "";
       }
       return mainModelKey;
@@ -59884,7 +59929,7 @@ const _sfc_main$2i = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ToolkitContentFields = /* @__PURE__ */ _export_sfc(_sfc_main$2i, [["__scopeId", "data-v-c740a237"]]);
+const ToolkitContentFields = /* @__PURE__ */ _export_sfc(_sfc_main$2i, [["__scopeId", "data-v-3fbe453b"]]);
 function createDesignPaperWidgetToWidgetFactory(getPaperWidgetManifest) {
   return function(widget, opts = {}) {
     const manifest2 = getPaperWidgetManifest(widget.type);
@@ -60046,21 +60091,12 @@ const _sfc_main$2g = /* @__PURE__ */ defineComponent({
           title: "",
           onClose: _cache[4] || (_cache[4] = ($event) => handleToolkitClose("data-init")),
           onVisibleChange: _cache[5] || (_cache[5] = ($event) => handleVisibleChange("data-init", $event))
-        }),
-        createVNode(ToolkitItem, {
-          noDropdown: "",
-          icon: "icon-shujumoxing",
-          version: "v1",
-          label: "数据加载",
-          title: "",
-          onClose: _cache[6] || (_cache[6] = ($event) => handleToolkitClose("data-load")),
-          onVisibleChange: _cache[7] || (_cache[7] = ($event) => handleVisibleChange("data-load", $event))
         })
       ]);
     };
   }
 });
-const Toolkit = /* @__PURE__ */ _export_sfc(_sfc_main$2g, [["__scopeId", "data-v-dddcd6f8"]]);
+const Toolkit = /* @__PURE__ */ _export_sfc(_sfc_main$2g, [["__scopeId", "data-v-7ebf8ab6"]]);
 const _hoisted_1$1A = { class: "designer_panel-wrapper" };
 const _hoisted_2$10 = { class: "panel-breadcrumb" };
 const _hoisted_3$L = {
@@ -61665,8 +61701,6 @@ const _sfc_main$22 = /* @__PURE__ */ defineComponent({
   setup(__props) {
     const { docInst } = useDocPubApiContext();
     const interCtx = useInteractionContext();
-    const modelKey = toRef(docInst.value, "mainModelKey");
-    const { fields: mainModelFields } = useModelData(modelKey);
     const pageStageRef = ref(null);
     const scrollRef = ref(null);
     function canDrop(e, isOutOfFlow) {
@@ -61701,7 +61735,6 @@ const _sfc_main$22 = /* @__PURE__ */ defineComponent({
           docInst.value.execute(CommandType.insertField, {
             valuePath: widgetMeta.field?.valuePath,
             widgetMeta,
-            mainModelFields: mainModelFields.value || [],
             doCallback(data) {
               if (!data) return;
               const focus = Array.isArray(data) ? data[data.length - 1] : data;
@@ -61791,7 +61824,7 @@ const _sfc_main$22 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const EditableCanvas = /* @__PURE__ */ _export_sfc(_sfc_main$22, [["__scopeId", "data-v-02d21574"]]);
+const EditableCanvas = /* @__PURE__ */ _export_sfc(_sfc_main$22, [["__scopeId", "data-v-85f53514"]]);
 const useDocDesignLayoutProps = () => {
   const provideProps = (props) => {
     provide(DOC_DESIGN_LAYOUT_PROPS, props);
@@ -61886,7 +61919,7 @@ const _hoisted_7$b = { style: { "padding": "0 12px" } };
 const _sfc_main$21 = /* @__PURE__ */ defineComponent({
   __name: "doc-design-layout",
   props: {
-    IOTPermission: { type: Boolean, default: true }
+    IOTPermission: { type: Boolean, default: false }
   },
   setup(__props, { expose: __expose }) {
     const props = __props;
@@ -61920,10 +61953,6 @@ const _sfc_main$21 = /* @__PURE__ */ defineComponent({
     const onImportTemplate = () => {
       handleUploadFile();
     };
-    const onImportData = (mainData) => {
-      const data = mainData2WordData(mainData);
-      docInst.value?.dataManager.patch(data);
-    };
     onFileUpload(async (files) => {
       const file = files?.[0];
       if (!file) return;
@@ -61948,8 +61977,7 @@ const _sfc_main$21 = /* @__PURE__ */ defineComponent({
       }
     );
     __expose({
-      onImportTemplate,
-      onImportData
+      onImportTemplate
     });
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(GctLayout), {
@@ -62005,7 +62033,7 @@ const _sfc_main$21 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const docDesignLayout = /* @__PURE__ */ _export_sfc(_sfc_main$21, [["__scopeId", "data-v-041003c9"]]);
+const docDesignLayout = /* @__PURE__ */ _export_sfc(_sfc_main$21, [["__scopeId", "data-v-744401de"]]);
 function convertPxToPaperSize(pageSize, customSize) {
   if (pageSize === PageSizeEnumConst.A3) {
     return {
@@ -63030,6 +63058,13 @@ const manifest$A = {
   defaultProps: {
     ...commonDefaultProps,
     autofillRules: []
+  },
+  computed: {
+    defaultValueRule: {
+      type: "api",
+      fetcher: "ref",
+      onlyMainModelFieldsCanRequest: true
+    }
   }
 };
 const __vite_glob_0_13$2 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
@@ -63071,6 +63106,13 @@ const manifest$y = {
   defaultProps: {
     ...commonDefaultProps,
     autofillRules: []
+  },
+  computed: {
+    defaultValueRule: {
+      type: "api",
+      fetcher: "ref",
+      onlyMainModelFieldsCanRequest: true
+    }
   }
 };
 const __vite_glob_0_15$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
@@ -63225,6 +63267,13 @@ const manifest$r = {
   defaultProps: {
     ...commonDefaultProps,
     autofillRules: []
+  },
+  computed: {
+    defaultValueRule: {
+      type: "api",
+      fetcher: "ref",
+      onlyMainModelFieldsCanRequest: true
+    }
   }
 };
 const __vite_glob_0_22 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
@@ -63244,6 +63293,13 @@ const manifest$q = {
   defaultProps: {
     ...commonDefaultProps,
     autofillRules: []
+  },
+  computed: {
+    defaultValueRule: {
+      type: "api",
+      fetcher: "rdo2ref",
+      onlyMainModelFieldsCanRequest: true
+    }
   }
 };
 const __vite_glob_0_23 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
@@ -63262,6 +63318,13 @@ const manifest$p = {
   propsSchema: "schema:field-business",
   defaultProps: {
     ...commonDefaultProps
+  },
+  computed: {
+    defaultValueRule: {
+      type: "api",
+      fetcher: "lot2sn",
+      onlyMainModelFieldsCanRequest: true
+    }
   }
 };
 const __vite_glob_0_24 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
@@ -63303,6 +63366,13 @@ const manifest$n = {
   defaultProps: {
     ...commonDefaultProps,
     autofillRules: []
+  },
+  computed: {
+    defaultValueRule: {
+      type: "api",
+      fetcher: "ref",
+      onlyMainModelFieldsCanRequest: true
+    }
   }
 };
 const __vite_glob_0_26 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
@@ -63415,7 +63485,10 @@ const manifest$i = {
     ...styleDefaultProps
   },
   computed: {
-    defaultValueRule: labelResolveEnumConfig,
+    defaultValueRule: {
+      ...labelResolveEnumConfig,
+      isMulti: true
+    },
     propRules: {
       computedOptions: optionsMapEnumConfig
     }
@@ -63551,6 +63624,13 @@ const manifest$c = {
   defaultProps: {
     ...commonDefaultProps,
     autofillRules: []
+  },
+  computed: {
+    defaultValueRule: {
+      type: "api",
+      fetcher: "ref",
+      onlyMainModelFieldsCanRequest: true
+    }
   }
 };
 const __vite_glob_0_37 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
@@ -67405,14 +67485,17 @@ const _sfc_main$1y = /* @__PURE__ */ defineComponent({
     const designCtx = useDesignSuiteContext();
     const getFieldOptions = (modelKey) => {
       if (!modelKey) return [];
-      return designCtx.runtime.getFieldList(modelKey).filter((f) => f.createTime === "USER_DEFINED").map(({ key, name }) => ({ label: name, value: key }));
+      return designCtx.runtime.getFieldList(modelKey).filter((f) => f.createType === "USER_DEFINED").map(({ key, name }) => ({ label: name, value: key }));
     };
     const props = __props;
     const sheetReadonly = ref(false);
     const optionsMap = computed(() => {
       const { mainModelKey, subFieldKey } = props.active.context;
+      if (!mainModelKey || !subFieldKey) {
+        return { row: [], col: [] };
+      }
       const mainFields = designCtx.runtime.getFieldList(mainModelKey);
-      const [rowFieldKey, colFieldKey] = subFieldKey?.replace("$.", "").split(":") ?? [];
+      const [rowFieldKey, colFieldKey] = subFieldKey.replace("$.", "").split(":") ?? [];
       const rowModelKey = mainFields.find((f) => f.key === rowFieldKey)?.bindInfo;
       const colModelKey = mainFields.find((f) => f.key === colFieldKey)?.bindInfo;
       return {
@@ -67489,11 +67572,11 @@ const _sfc_main$1y = /* @__PURE__ */ defineComponent({
                     size: "small",
                     allowClear: "",
                     disabled: sheetReadonly.value,
-                    value: unref(regionProps).refColField,
-                    "onUpdate:value": _cache[1] || (_cache[1] = ($event) => unref(regionProps).refColField = $event),
+                    modelValue: unref(regionProps).refColField,
+                    "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => unref(regionProps).refColField = $event),
                     placeholder: "请选择关联主键",
                     options: optionsMap.value.col
-                  }, null, 8, ["disabled", "value", "options"])
+                  }, null, 8, ["disabled", "modelValue", "options"])
                 ]),
                 _: 1
               }),
@@ -67506,11 +67589,11 @@ const _sfc_main$1y = /* @__PURE__ */ defineComponent({
                     size: "small",
                     allowClear: "",
                     disabled: sheetReadonly.value,
-                    value: unref(regionProps).refRowField,
-                    "onUpdate:value": _cache[2] || (_cache[2] = ($event) => unref(regionProps).refRowField = $event),
+                    modelValue: unref(regionProps).refRowField,
+                    "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => unref(regionProps).refRowField = $event),
                     placeholder: "请选择动态表关联关系建立",
                     options: optionsMap.value.row
-                  }, null, 8, ["disabled", "value", "options"])
+                  }, null, 8, ["disabled", "modelValue", "options"])
                 ]),
                 _: 1
               })
@@ -67522,7 +67605,7 @@ const _sfc_main$1y = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const DataGroup2DPanel = /* @__PURE__ */ _export_sfc(_sfc_main$1y, [["__scopeId", "data-v-09b6985e"]]);
+const DataGroup2DPanel = /* @__PURE__ */ _export_sfc(_sfc_main$1y, [["__scopeId", "data-v-6a36dc19"]]);
 const schema$6 = {
   key: "data-group-2d.basic",
   title: [