@gct-paas/word 0.1.41 → 0.1.43

package/dist/core/data/DataManager.d.ts

@@ -175,8 +175,10 @@ export declare class DataManager {
      */
     applyInitData(initDataMap: Record<string, any>): void;
     /**
-     * 补齐二维/检验表的关联轴子表（如 f_ewblink / f_jianyan2）到动态关联铺砖槽位数。
-     * 不处理主体轴（如 f_ewb / f_jianyan1），避免覆盖接口行或误扩纵向轴。
+     * 按版面铺砖槽位补齐子表行数：
+     * - 固定表：按槽位补齐自身子表行
+     * - 二维/检验表：仅补齐关联轴（如 f_ewblink / f_jianyan2）
+     *   不处理主体轴（如 f_ewb / f_jianyan1），避免覆盖接口行或误扩纵向轴。
      */
     private syncSubTableRowsToLayout;
     /** 子表在 rawData 中的行数（支持尚未转成数组的 { data: [] } 接口形态，此时返回 0 且不在此阶段强转） */

package/dist/index.es.js

@@ -32089,11 +32089,20 @@ class Enter extends CommandBase {
     const { nodeId, offset: offset2, side } = cursor.getCursor();
     const mapper = this.doc.layoutMapper;
     const run = mapper.getLayoutNodeById(nodeId);
+    const wpId = run?.parent?.modelRef?.id;
+    if (!run || !wpId) {
+      this.isTerminated = true;
+      return null;
+    }
     if (!this.doc.eventManager.policy.canInput(run)) {
       this.isTerminated = true;
       return null;
     }
-    const wp = mapper.getModelNodeById(run.parent.modelRef.id);
+    const wp = mapper.getModelNodeById(wpId);
+    if (!wp) {
+      this.isTerminated = true;
+      return null;
+    }
     let targetModelIndex = 0;
     if (!run.isPlaceholderRun) {
       if (run.isWidgetRun || run.isPageWidgetRun) {
@@ -40350,6 +40359,7 @@ class CommandManager {
   compositionUpdate(text) {
   }
   compositionEnd(text) {
+    if (!text) return;
     this.doc.commandManager.execute(CommandType.insertText, {
       text
     });
@@ -41252,22 +41262,29 @@ class FieldBaseHandler {
   }
   static getNoValueLabel(ctx) {
     const { context, wr } = ctx;
+    const widgetMeta = wr.widgetMeta;
     if (context.doc.mode === DocModeTypeConst.Print) {
-      return { label: wr.widgetMeta?.props.emptySymbol ?? "", type: "noneLabel" };
-    } else {
-      if (wr.widgetMeta?.props?.placeholder) {
-        return {
-          label: wr.widgetMeta.props.placeholder,
-          type: "placeholder"
-        };
-      } else if (wr.widgetMeta?.extra?.biz?.fieldIdentity?.label) {
-        return {
-          label: wr.widgetMeta.extra.biz.fieldIdentity.label,
-          type: "fieldName"
-        };
-      }
+      return {
+        label: widgetMeta?.props.emptySymbol ?? "",
+        type: "noneLabel"
+      };
     }
-    return {
+    const candidates = [
+      {
+        label: widgetMeta?.props?.newSpecificConfig?.newPlaceholder,
+        type: "placeholder"
+      },
+      {
+        label: widgetMeta?.props?.placeholder,
+        type: "placeholder"
+      },
+      {
+        label: widgetMeta?.extra?.biz?.fieldIdentity?.label,
+        type: "fieldName"
+      }
+    ];
+    const matched = candidates.find((item) => item.label);
+    return matched ?? {
       label: "--",
       type: "default"
     };
@@ -42524,7 +42541,7 @@ const FIELD_TYPE_TO_FW = {
   [FIELD_TYPE.INTEGER]: "fw:number",
   [FIELD_TYPE.LONG]: "fw:number",
   [FIELD_TYPE.DOUBLE]: "fw:double",
-  [FIELD_TYPE.DECIMAL]: "fw:double",
+  [FIELD_TYPE.DECIMAL]: "fw:number",
   [FIELD_TYPE.BOOLEAN]: "fw:enum",
   [FIELD_TYPE.DATE]: "fw:date",
   [FIELD_TYPE.DATE_TIME]: "fw:date-time",
@@ -46540,10 +46557,11 @@ class IMEHandler {
     this.eventManager.doc.commandManager.compositionUpdate(data);
   }
   handleCompositionEnd(payload) {
-    const data = payload?.data ?? this.lastComposedText ?? "";
+    const data = payload?.data !== null && payload?.data !== void 0 ? payload.data : this.lastComposedText ?? "";
     this.lastComposedText = null;
     this.isComposing = false;
     this.lastCompositionCommitTime = performance.now();
+    if (!data) return;
     this.eventManager.doc.commandManager.compositionEnd(data);
   }
   handleInput(payload) {
@@ -46572,6 +46590,7 @@ class IMEHandler {
       case "delete":
         break;
       case "enter":
+        if (this.isComposing) return;
         doc.commandManager.execute(CommandType.enter);
         break;
       case "tab":
@@ -47621,23 +47640,31 @@ class DataManager {
     this.syncSubTableRowsToLayout();
   }
   /**
-   * 补齐二维/检验表的关联轴子表（如 f_ewblink / f_jianyan2）到动态关联铺砖槽位数。
-   * 不处理主体轴（如 f_ewb / f_jianyan1），避免覆盖接口行或误扩纵向轴。
+   * 按版面铺砖槽位补齐子表行数：
+   * - 固定表：按槽位补齐自身子表行
+   * - 二维/检验表：仅补齐关联轴（如 f_ewblink / f_jianyan2）
+   *   不处理主体轴（如 f_ewb / f_jianyan1），避免覆盖接口行或误扩纵向轴。
    */
   syncSubTableRowsToLayout() {
     const listSubTables = this.doc?.model?.getSubTableInfoList;
     if (typeof listSubTables !== "function") return;
     for (const info of listSubTables.call(this.doc?.model)) {
-      if (!info.field || !["check-table-2d-link", "sub-table-2d-link"].includes(info.subType)) {
+      if (!info.field) {
         continue;
       }
-      const linkFieldKey = info.field;
-      const layoutRows = this.doc?.model?.getSubTableLayoutSlotCount(linkFieldKey) ?? 0;
+      const subTableKey = info.field;
+      const layoutRows = this.doc?.model?.getSubTableLayoutSlotCount(subTableKey) ?? 0;
       if (layoutRows <= 0) continue;
-      const dataRows = this.countSubTableDataRows(linkFieldKey);
+      const dataRows = this.countSubTableDataRows(subTableKey);
       const targetRows = Math.max(dataRows, layoutRows);
       if (targetRows <= dataRows) continue;
-      this.ensureCheckTableLinkLayoutRows(linkFieldKey, targetRows);
+      if (["check-table-2d-link", "sub-table-2d-link"].includes(info.subType)) {
+        this.ensureCheckTableLinkLayoutRows(subTableKey, targetRows);
+        continue;
+      }
+      if (info.subType === "fixed-table") {
+        this.ensureSubTableRowCount(subTableKey, targetRows, true);
+      }
     }
   }
   /** 子表在 rawData 中的行数（支持尚未转成数组的 { data: [] } 接口形态，此时返回 0 且不在此阶段强转） */
@@ -48242,9 +48269,6 @@ class InteractionManager {
     this.batcher = new Transaction((q2) => {
       this.broadcastChange(q2.type, q2.prev, q2.reason);
     });
-    setTimeout(() => {
-      this.emitChange("panelData", null);
-    });
   }
   /** 获取 interaction */
   get(type4) {
@@ -48588,10 +48612,14 @@ function useInteraction(docRef) {
       "focusAnnotationId",
       "annotationList"
     ];
+    const setState = (type4, value) => {
+      state[type4] = value;
+    };
     interactionTypes.forEach((type4) => {
       try {
+        setState(type4, doc.interactionManager.get(type4));
         const off2 = doc.eventManager.eventBus.on(`${type4}:change`, (payload) => {
-          state[type4] = payload?.value ?? null;
+          setState(type4, payload?.value);
         });
         unsubscribes.push(off2);
       } catch {
@@ -51102,8 +51130,18 @@ const _sfc_main$2X = /* @__PURE__ */ defineComponent({
       lastComposedText.value = data;
       dispatch("ime:compositionupdate", { data });
     }
+    function resolveCompositionEndData(e) {
+      if (e.data !== null && e.data !== void 0) {
+        return e.data;
+      }
+      const fromTextarea = ta2.value?.value ?? "";
+      if (fromTextarea !== lastComposedText.value) {
+        lastComposedText.value = fromTextarea;
+      }
+      return lastComposedText.value ?? "";
+    }
     function onCompositionEnd(e) {
-      const data = e.data ?? lastComposedText.value ?? "";
+      const data = resolveCompositionEndData(e);
       isComposing.value = false;
       pos.opacity = props.idleOpacity;
       lastComposedText.value = "";
@@ -51132,6 +51170,7 @@ const _sfc_main$2X = /* @__PURE__ */ defineComponent({
           }
           break;
         case "Enter":
+          if (isComposing.value) return;
           e.preventDefault();
           dispatch("ime:keydown", { type: "enter" });
           break;
@@ -51179,9 +51218,10 @@ const _sfc_main$2X = /* @__PURE__ */ defineComponent({
     function onBlur(e) {
       if (isComposing.value) {
         isComposing.value = false;
-        dispatch("ime:compositionend", { data: lastComposedText.value });
+        const data = ta2.value?.value ?? lastComposedText.value ?? "";
         lastComposedText.value = "";
         lastCompositionCommitTime.value = performance.now();
+        dispatch("ime:compositionend", { data });
       }
       dispatch("ime:blur", {});
     }
@@ -51280,7 +51320,7 @@ const _sfc_main$2X = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const HiddenInput = /* @__PURE__ */ _export_sfc(_sfc_main$2X, [["__scopeId", "data-v-58dae928"]]);
+const HiddenInput = /* @__PURE__ */ _export_sfc(_sfc_main$2X, [["__scopeId", "data-v-72d0b6f5"]]);
 function useLatestRequest(execFn) {
   let lastReqId = 0;
   const loading = ref(false);
@@ -100137,6 +100177,63 @@ async function waitForDataManagerSettle() {
 function syncInitRawDataSnapshot(doc) {
   doc.docRuntimeMeta.handleInfo.initRawDataSnapshot = cloneDeep(doc.dataManager.getRawData());
 }
+function useSpecificConfig(options) {
+  const { widget, fieldInfo } = options;
+  const resolvedFieldInfo = fieldInfo?.value ?? fieldInfo;
+  const specificFieldConfig = resolvedFieldInfo?.specificConfig;
+  const specificConfig = widget.widgetMeta?.props.newSpecificConfig;
+  if (!specificConfig) return;
+  const widgetMeta = widget.widgetMeta;
+  const widgetType = widgetMeta?.type;
+  switch (widgetType) {
+    case "fw:input": {
+      const fieldType = widgetMeta?.field?.fieldType;
+      if (fieldType === FIELD_TYPE.RECORD_NO && specificFieldConfig?.signGenerate === "snRule") {
+        Object.assign(specificConfig, {
+          newDisabled: true,
+          newPlaceholder: "记录单号自动生成，无需填写"
+        });
+      }
+      break;
+    }
+    case "fw:number": {
+      const { digits, rulesForRounding } = specificFieldConfig ?? {};
+      if (digits !== void 0) {
+        specificConfig.digits = digits;
+      }
+      specificConfig.rulesForRounding = rulesForRounding ?? 6;
+      break;
+    }
+  }
+}
+function resolveFieldInfo(options) {
+  if (options.fieldInfo) return options.fieldInfo;
+  const runtime = options.ctx?.runtime;
+  const field = options.widget?.widgetMeta?.field;
+  const modelKey = getLastSegment(field?.modelLink);
+  const fieldKey = getLastSegment(field?.fieldLink);
+  if (!runtime || !modelKey || !fieldKey) return void 0;
+  const list = runtime.getFieldList(modelKey) ?? [];
+  return list.find((item) => item.key === fieldKey);
+}
+function applyWidgetRuntimeInitializer(options) {
+  const fieldInfo = resolveFieldInfo(options);
+  useSpecificConfig({
+    ...options,
+    fieldInfo
+  });
+}
+function useWidgetInitializer(options) {
+  const init2 = (isSupport) => {
+    if (!isSupport) {
+      return;
+    }
+    applyWidgetRuntimeInitializer(options);
+  };
+  return {
+    init: init2
+  };
+}
 function snapshotDocInfo(docInst) {
   return {
     pages: docInst?.pages ?? [],
@@ -100162,8 +100259,18 @@ async function initializeDocumentEngine(props, payload, result) {
   const runtimeJsonForModel = expandCheckTableRuntimeJson(cloneRuntimeJson, {
     itemCountByRegionId
   });
+  const checkTableRegions = listCheckTableRegionsInRuntimeJson(runtimeJsonForModel);
+  const linkFieldKey = checkTableRegions[0]?.linkFieldKey;
   const docModel = ModelConverter.toModel(runtimeJsonForModel);
   const instances = docModel.getWidgetInstances();
+  if (fillModeType !== DocModeTypeConst.Edit) {
+    instances.forEach((instance2) => {
+      applyWidgetRuntimeInitializer({
+        widget: instance2,
+        ctx: payload.ctx
+      });
+    });
+  }
   const defaultQueryIds = getDefaultQueryIdsByFieldType({
     materialNumber: paramsConfig?.materialNo || requestInfo.materialNo,
     productId: paramsConfig?.productId,
@@ -100178,8 +100285,6 @@ async function initializeDocumentEngine(props, payload, result) {
     defaultQueryIds,
     masterSlaveList
   );
-  const checkTableRegions = listCheckTableRegionsInRuntimeJson(runtimeJsonForModel);
-  const linkFieldKey = checkTableRegions[0]?.linkFieldKey;
   mergeCheckTableItemInfosIntoDefaults(defaultDataMap, runtimeJsonForModel, checkTableItemInfos, {
     layoutColumnCount: linkFieldKey ? docModel.getSubTableLayoutSlotCount(linkFieldKey) : 0
   });
@@ -102804,30 +102909,6 @@ function useDependency(doc, widget, ctx) {
     initDependency
   };
 }
-function useSpecificConfig(options) {
-  const { widget, fieldInfo } = options;
-  const widgetType = widget.widgetMeta?.type;
-  if (widgetType !== "fw:number") {
-    return;
-  }
-  const specificConfig = widget.widgetMeta.props.newSpecificConfig;
-  const digits = fieldInfo?.value?.specificConfig?.digits;
-  if (digits !== void 0) {
-    specificConfig.digits = digits;
-  }
-  specificConfig.rulesForRounding = fieldInfo?.value?.specificConfig?.rulesForRounding ?? 6;
-}
-function useWidgetInitializer(options) {
-  const init2 = (isSupport) => {
-    if (!isSupport) {
-      return;
-    }
-    useSpecificConfig(options);
-  };
-  return {
-    init: init2
-  };
-}
 const _sfc_main$2Q = /* @__PURE__ */ defineComponent({
   __name: "overlay-render",
   props: {
@@ -102864,7 +102945,8 @@ const _sfc_main$2Q = /* @__PURE__ */ defineComponent({
     const { init: init2 } = useWidgetInitializer({
       doc: props.doc,
       widget: props.widget,
-      fieldInfo
+      fieldInfo,
+      ctx: designCtx
     });
     init2(props.isLastWidgetId);
     const { validateField } = createFormValidator();
@@ -113089,7 +113171,8 @@ const _sfc_main$1X = /* @__PURE__ */ defineComponent({
       showDisabled,
       showReadonly,
       widgetProps,
-      widgetType
+      widgetType,
+      fieldMeta
     } = useWidgetStaticAttrs(props.widget);
     const CurrentComp = computed(() => {
       if (widgetType.value === "fw:file") {
@@ -113108,12 +113191,16 @@ const _sfc_main$1X = /* @__PURE__ */ defineComponent({
     const optionValue = computed(() => props.widget?.widgetOption?.value);
     const modelValue = computed({
       get() {
+        let value;
         if (docInst.value.isInEditMode()) {
-          const value2 = docInst.value?.dataManager?.getDefault(runtimeValuePath.value);
-          return toBoolean(getValue$1(value2, isMultiple.value));
+          value = docInst.value?.dataManager?.getDefault(runtimeValuePath.value);
+        } else {
+          value = docInst.value?.dataManager?.get(runtimeValuePath.value);
         }
-        const value = docInst.value?.dataManager?.get(runtimeValuePath.value);
-        return toBoolean(getValue$1(value, isMultiple.value));
+        if (fieldMeta.value?.fieldType === FIELD_TYPE.BOOLEAN) {
+          value = toBoolean(value);
+        }
+        return getValue$1(value, isMultiple.value);
       },
       set(v) {
         const data = setValue(v, runtimeValuePath.value, {
@@ -113301,13 +113388,6 @@ const _sfc_main$1U = /* @__PURE__ */ defineComponent({
       () => props.modelId === interCtx.panelData?.modelId || props.modelId === interCtx.hoverModelId
     );
     const colors = computed(() => {
-      if (showRequired.value) {
-        return {
-          text: "#f26c6c",
-          line: "#f26c6c",
-          bg: isActive.value ? "rgba(255, 230, 230, 1)" : "rgba(255, 242, 242, 1)"
-        };
-      }
       if (showDisabled.value) {
         return {
           text: "#c9c9c9",
@@ -113322,6 +113402,13 @@ const _sfc_main$1U = /* @__PURE__ */ defineComponent({
           bg: isActive.value ? "#f5f7fa" : "#fafafa"
         };
       }
+      if (showRequired.value) {
+        return {
+          text: "#f26c6c",
+          line: "#f26c6c",
+          bg: isActive.value ? "rgba(255, 230, 230, 1)" : "rgba(255, 242, 242, 1)"
+        };
+      }
       return {
         text: "#999999",
         line: "#999999",

package/dist/runtime/factories/useWidgetInitializer.d.ts

@@ -1,10 +1,12 @@
 import { Doc } from '../../core';
 export interface WidgetInitializerOptions {
-    doc: Doc;
+    doc?: Doc;
     widget: any;
     fieldInfo?: any;
     ctx?: any;
 }
+/** 运行时执行单个 widget 初始化 */
+export declare function applyWidgetRuntimeInitializer(options: WidgetInitializerOptions): void;
 /** widget 运行时初始化 */
 export declare function useWidgetInitializer(options: WidgetInitializerOptions): {
     init: (isSupport: boolean) => void;

package/dist/word.css

@@ -7572,7 +7572,7 @@ textarea[data-v-57fe54a3]::placeholder {
 .avatar--horizontal .avatar__name[data-v-b2773d93] {
   margin-left: 6px;
 }
-.hidden-input[data-v-58dae928] {
+.hidden-input[data-v-72d0b6f5] {
   position: absolute;
   resize: none;
   border: none;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/word",
-  "version": "0.1.41",
+  "version": "0.1.43",
   "description": "GCT 在线 word",
   "keywords": [
     "vue",