@gct-paas/excel 0.1.20 → 0.1.22

package/dist/base/index.es.js

@@ -1,12 +1,29 @@
-import { av as fetchHistoryConsume, aw as isBomGranted, F as FIELD_TYPE, i as api, am as getParseRuleInfo, an as getParseRuleValue, ax as calcFillData, ay as extractKeywordFromQueryData, v as FormTypeEnum, az as transformUtils, g as SubTableType, aj as NCB_PROVIDE, aA as settleAndValidateDisplay, aB as unregisterValidationContext, aC as clearFormRules, aD as registerValidationContext, e as ComponentTypeEnum, aq as RenderModeEnum, aE as requestFullValidation, aF as requestDisplayValidation, aG as closeValidatorPopovers, aH as baseDataUtils, aI as getRawFormRuleMeta, aJ as enrichFormChangeRowDetails, aK as settleAfterModeSwitch, aL as calcUtils, a2 as CheckDsTypeEnum, ag as renderUtils, H as PlatformEnum, aM as uuid2, aN as normalizeToArray, aO as safeParseArray, aP as BpmnNodeTypeEnum, aQ as mergeByMultiKey, au as useNocodeEmitter, a1 as EntityModelCategoryEnum, aR as getRowId } from "../dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-OPdk2I5p.js";
-import { a5, a7, ah, y, aS, aT, B, aU, h, J, aV, aW, aX, af, ai, a6, a3, a4, K, aY, ar, N, aZ, $, a9, x, M, L, a_, a$, O, b, P, a0, a, m, a8, b0, b1, ap, D, z, A, E, b2, T, V, W, b3, b4, b5, b6, b7, b8, b9, ba, bb, bc, bd, be, bf, bg, bh, bi, bj, bk, bl, bm, bn, bo, bp, ak, bq, br, al, bs, bt, bu, bv, bw, ad, bx, ac, aa, n, ao, ae, ab } from "../dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-OPdk2I5p.js";
-import { M as MaterialConsumptionPatternEnum, g as MaterialConsumeTableController, S as SubTableCore, h as SubTableActionMenuTypeEnum, i as getMenuByAction, j as SubTableActionEnum, k as getCopySubMenu, l as getInsertSubMenu, m as useMaterialBalance, v as validate, n as commonUtils } from "../dynamic-table-action-mGrBO_bn.js";
-import { B as B2, o, D as D2, _, p, e, q, f, F, r, s, c, a as a2, t, u, b as b10, d } from "../dynamic-table-action-mGrBO_bn.js";
-import { ref, provide, watch, computed } from "vue";
+import { av as fetchHistoryConsume, aw as isBomGranted, F as FIELD_TYPE, i as api, am as getParseRuleInfo, an as getParseRuleValue, ax as calcFillData, ay as extractKeywordFromQueryData, t as FormTypeEnum, az as transformUtils, g as SubTableType, aj as NCB_PROVIDE, aA as settleAndValidateDisplay, aB as unregisterValidationContext, aC as clearFormRules, aD as registerValidationContext, e as ComponentTypeEnum, aq as RenderModeEnum, aE as requestFullValidation, aF as requestDisplayValidation, aG as closeValidatorPopovers, aH as baseDataUtils, aI as getRawFormRuleMeta, aJ as enrichFormChangeRowDetails, aK as settleAfterModeSwitch, aL as calcUtils, a2 as CheckDsTypeEnum, ag as renderUtils, E as PlatformEnum, aM as uuid2, aN as normalizeToArray, aO as safeParseArray, aP as BpmnNodeTypeEnum, aQ as mergeByMultiKey, au as useNocodeEmitter, a1 as EntityModelCategoryEnum, aR as getRowId, aS as collectFormChangeFieldLocations, aT as nextFormChangeRowViewHistoryId } from "../dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-BfGYCqH5.js";
+import { a5, a7, ah, x, aU, aV, B, aW, h, H, aX, aY, aZ, af, ai, a6, a3, a4, I, K, a_, ar, N, a$, $, a9, w, J, L, b0, b1, O, b, P, a0, a, m, a8, b2, b3, ap, A, y, z, D, b4, T, V, W, b5, b6, b7, b8, b9, ba, bb, bc, bd, be, bf, bg, bh, bi, bj, bk, bl, bm, bn, bo, bp, bq, ak, br, bs, al, bt, bu, bv, M, bw, bx, ad, by, ac, aa, u, ao, ae, ab } from "../dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-BfGYCqH5.js";
+import { M as MaterialConsumptionPatternEnum, g as MaterialConsumeTableController, S as SubTableCore, h as SubTableActionMenuTypeEnum, i as getMenuByAction, j as SubTableActionEnum, k as getCopySubMenu, l as getInsertSubMenu, m as useMaterialBalance, v as validate, n as commonUtils } from "../dynamic-table-action-CbHoY76E.js";
+import { B as B2, o, D as D2, _, p, e, q, f, F, r, I as I2, s, c, a as a2, t, u as u2, b as b10, d } from "../dynamic-table-action-CbHoY76E.js";
+import { ref, provide, watch, computed, onBeforeMount } from "vue";
 import { defaults, pick, merge, has, isEmpty, cloneDeep, debounce } from "lodash-es";
 import dayjs from "dayjs";
-import { B as B3, C, F as F2, a as a10, M as M2, c as c2, f as f2 } from "../form-annotation-controller-DDDyHAwe.js";
-import { B as B4, F as F3, I, M as M3, b as b11, u as u2 } from "../mb-render-D_uumPQr.js";
+import { B as B3, F as F2, M as M2, b as b11, u as u3 } from "../mb-render-JGHghp5L.js";
+var MaterialStatusEnum = /* @__PURE__ */ ((MaterialStatusEnum2) => {
+  MaterialStatusEnum2["LOT"] = "LOT";
+  MaterialStatusEnum2["SN"] = "SN";
+  MaterialStatusEnum2["FORM"] = "FORM";
+  MaterialStatusEnum2["PRODUCT_RELEASE"] = "PRODUCT_RELEASE";
+  MaterialStatusEnum2["LOT_SN_APPEND"] = "LOT_SN_APPEND";
+  MaterialStatusEnum2["TXN"] = "TXN";
+  MaterialStatusEnum2["DHR"] = "DHR";
+  MaterialStatusEnum2["NOTEBOOK"] = "NOTEBOOK";
+  MaterialStatusEnum2["REWORK"] = "REWORK";
+  return MaterialStatusEnum2;
+})(MaterialStatusEnum || {});
+var FillingTypeEnum = /* @__PURE__ */ ((FillingTypeEnum2) => {
+  FillingTypeEnum2["UNFILLED"] = "UNFILLED";
+  FillingTypeEnum2["CREATED"] = "CREATED";
+  FillingTypeEnum2["COMPLETED"] = "COMPLETED";
+  return FillingTypeEnum2;
+})(FillingTypeEnum || {});
 function useLatestRequest(execFn) {
   let lastReqId = 0;
   const loading = ref(false);
@@ -172,7 +189,7 @@ class FormTmplBomController {
   }
   async submitValidate() {
     const results = await Promise.allSettled(
-      Object.values(this.tableControllers).map((c3) => c3.submitValidate())
+      Object.values(this.tableControllers).map((c2) => c2.submitValidate())
     );
     const successful = results.filter((result) => result.status === "fulfilled").map((result) => result.value);
     const fieldArr = successful.filter(Boolean);
@@ -1041,11 +1058,11 @@ const fillFromOption$1 = [
     toField: F$1.qty
   }
 ];
-function applyFillFromOption$1(A2, B5) {
+function applyFillFromOption$1(A2, B4) {
   const writableA = A2;
   fillFromOption$1.forEach(({ optionField, toField }) => {
-    if (has(B5, optionField)) {
-      writableA[toField] = B5[optionField];
+    if (has(B4, optionField)) {
+      writableA[toField] = B4[optionField];
     }
   });
   return A2;
@@ -1253,7 +1270,7 @@ class SterilizeBatchTableCore extends SubTableCore {
     this.tableData = [...this.showTableData, applyFillFromOption$1({}, merged)];
   }
 }
-const F4 = {
+const F3 = {
   /** 物料 */
   product: "product_id_",
   /** 物料名称 */
@@ -1278,160 +1295,160 @@ const F4 = {
   materialContainerNoId: "material_container_no__id_"
 };
 const PRETREATMENT_ALWAYS_DISABLED_FIELDS = [
-  F4.productCode,
-  F4.productSpec,
-  F4.productName
+  F3.productCode,
+  F3.productSpec,
+  F3.productName
 ];
 const CLEAR_ON_MFG_ORDER_EMPTY = [
-  F4.mfgOrderCode,
-  F4.product,
-  F4.productName,
-  F4.productCode,
-  F4.productSpec,
-  F4.qty,
-  F4.productionDate
+  F3.mfgOrderCode,
+  F3.product,
+  F3.productName,
+  F3.productCode,
+  F3.productSpec,
+  F3.qty,
+  F3.productionDate
 ];
 const CLEAR_ON_PROD_CONTAINER_EMPTY = [
-  F4.product,
-  F4.productName,
-  F4.productCode,
-  F4.productSpec,
-  F4.qty,
-  F4.mfgOrderCode,
-  F4.mfgOrder,
-  F4.productionDate
+  F3.product,
+  F3.productName,
+  F3.productCode,
+  F3.productSpec,
+  F3.qty,
+  F3.mfgOrderCode,
+  F3.mfgOrder,
+  F3.productionDate
 ];
 const CLEAR_ON_MATERIAL_CONTAINER_EMPTY = [
-  F4.product,
-  F4.productName,
-  F4.productCode,
-  F4.productSpec,
-  F4.qty,
-  F4.mfgOrderCode,
-  F4.mfgOrder,
-  F4.productionDate,
-  F4.materialContainerNoId,
-  F4.productionContainer
+  F3.product,
+  F3.productName,
+  F3.productCode,
+  F3.productSpec,
+  F3.qty,
+  F3.mfgOrderCode,
+  F3.mfgOrder,
+  F3.productionDate,
+  F3.materialContainerNoId,
+  F3.productionContainer
 ];
 const CLEAR_ON_MFG_ORDER_SELECT = [
-  F4.productionContainer,
-  F4.materialContainerNo,
-  F4.materialContainerNoId
+  F3.productionContainer,
+  F3.materialContainerNo,
+  F3.materialContainerNoId
 ];
 const CLEAR_ON_PROD_CONTAINER_SELECT = [
-  F4.mfgOrder,
-  F4.mfgOrderCode,
-  F4.materialContainerNo,
-  F4.materialContainerNoId
+  F3.mfgOrder,
+  F3.mfgOrderCode,
+  F3.materialContainerNo,
+  F3.materialContainerNoId
 ];
 const CLEAR_ON_MATERIAL_CONTAINER_SELECT = [
-  F4.productionContainer,
-  F4.mfgOrder,
-  F4.mfgOrderCode
+  F3.productionContainer,
+  F3.mfgOrder,
+  F3.mfgOrderCode
 ];
 const fillFromOption = [
   {
-    optionField: F4.product,
-    toField: F4.product
+    optionField: F3.product,
+    toField: F3.product
   },
   {
-    optionField: F4.productName,
-    toField: F4.productName
+    optionField: F3.productName,
+    toField: F3.productName
   },
   {
-    optionField: F4.productCode,
-    toField: F4.productCode
+    optionField: F3.productCode,
+    toField: F3.productCode
   },
   {
-    optionField: F4.productSpec,
-    toField: F4.productSpec
+    optionField: F3.productSpec,
+    toField: F3.productSpec
   },
   {
-    optionField: F4.mfgOrder,
-    toField: F4.mfgOrder
+    optionField: F3.mfgOrder,
+    toField: F3.mfgOrder
   },
   {
-    optionField: F4.mfgOrderCode,
-    toField: F4.mfgOrderCode
+    optionField: F3.mfgOrderCode,
+    toField: F3.mfgOrderCode
   },
   {
     optionField: "real_start_date_",
-    toField: F4.productionDate
+    toField: F3.productionDate
   },
   {
-    optionField: F4.qty,
-    toField: F4.qty
+    optionField: F3.qty,
+    toField: F3.qty
   }
 ];
 const fillFromMfgOrderOption = [
   {
     optionField: "id_",
-    toField: F4.mfgOrder
+    toField: F3.mfgOrder
   },
   {
     optionField: "code_",
-    toField: F4.mfgOrderCode
+    toField: F3.mfgOrderCode
   },
   {
-    optionField: F4.product,
-    toField: F4.product
+    optionField: F3.product,
+    toField: F3.product
   },
   {
-    optionField: F4.productName,
-    toField: F4.productName
+    optionField: F3.productName,
+    toField: F3.productName
   },
   {
-    optionField: F4.productCode,
-    toField: F4.productCode
+    optionField: F3.productCode,
+    toField: F3.productCode
   },
   {
-    optionField: F4.productSpec,
-    toField: F4.productSpec
+    optionField: F3.productSpec,
+    toField: F3.productSpec
   },
   {
     optionField: "real_start_date_",
-    toField: F4.productionDate
+    toField: F3.productionDate
   },
   {
-    optionField: F4.qty,
-    toField: F4.qty
+    optionField: F3.qty,
+    toField: F3.qty
   }
 ];
 const fillFromProductOption = [
   {
     optionField: "name_",
-    toField: F4.productName
+    toField: F3.productName
   },
   {
     optionField: "code_",
-    toField: F4.productCode
+    toField: F3.productCode
   },
   {
     optionField: "spec_",
-    toField: F4.productSpec
+    toField: F3.productSpec
   }
 ];
-const CLEAR_ON_PRODUCT_EMPTY = [F4.productName, F4.productCode, F4.productSpec];
-function applyFillFromMapping(A2, B5, mapping) {
+const CLEAR_ON_PRODUCT_EMPTY = [F3.productName, F3.productCode, F3.productSpec];
+function applyFillFromMapping(A2, B4, mapping) {
   const writableA = A2;
   mapping.forEach(({ optionField, toField }) => {
-    if (has(B5, optionField)) {
-      writableA[toField] = B5[optionField];
+    if (has(B4, optionField)) {
+      writableA[toField] = B4[optionField];
     }
   });
   return A2;
 }
-function applyFillFromOption(A2, B5) {
-  return applyFillFromMapping(A2, B5, fillFromOption);
+function applyFillFromOption(A2, B4) {
+  return applyFillFromMapping(A2, B4, fillFromOption);
 }
-function applyFillFromProductOption(A2, B5) {
-  return applyFillFromMapping(A2, B5, fillFromProductOption);
+function applyFillFromProductOption(A2, B4) {
+  return applyFillFromMapping(A2, B4, fillFromProductOption);
 }
-function applyFillFromMfgOrderOption(A2, B5) {
-  applyFillFromMapping(A2, B5, fillFromMfgOrderOption);
+function applyFillFromMfgOrderOption(A2, B4) {
+  applyFillFromMapping(A2, B4, fillFromMfgOrderOption);
   const writableA = A2;
-  if (!has(B5, "code_") && (B5.label != null || B5.__LABEL__ != null)) {
-    writableA[F4.mfgOrderCode] = B5.label ?? B5.__LABEL__;
+  if (!has(B4, "code_") && (B4.label != null || B4.__LABEL__ != null)) {
+    writableA[F3.mfgOrderCode] = B4.label ?? B4.__LABEL__;
   }
   return A2;
 }
@@ -1676,24 +1693,24 @@ class PretreatmentListTableCore extends SubTableCore {
     if (PRETREATMENT_ALWAYS_DISABLED_FIELDS.includes(field)) {
       result.disabled = true;
     }
-    if (field === F4.product) {
-      const hasNo = rowData[F4.materialContainerNo] != null && rowData[F4.materialContainerNo] !== "";
-      const idEmpty = rowData[F4.materialContainerNoId] == null || rowData[F4.materialContainerNoId] === "";
+    if (field === F3.product) {
+      const hasNo = rowData[F3.materialContainerNo] != null && rowData[F3.materialContainerNo] !== "";
+      const idEmpty = rowData[F3.materialContainerNoId] == null || rowData[F3.materialContainerNoId] === "";
       result.disabled = !(hasNo && idEmpty);
     }
     return result;
   }
   calcFieldDataSource = (params) => {
     const { field } = params;
-    if (field === F4.productionContainer) return createProductionContainerLoader();
-    if (field === F4.mfgOrder) return createMfgOrderLoader();
-    if (field === F4.materialContainerNo) return createMaterialContainerLoader();
+    if (field === F3.productionContainer) return createProductionContainerLoader();
+    if (field === F3.mfgOrder) return createMfgOrderLoader();
+    if (field === F3.materialContainerNo) return createMaterialContainerLoader();
   };
   handleChange = (params) => {
     const { field, option, value, rowData } = params;
     const writable = rowData;
     const hasValue = value != null && value !== "";
-    if (field === F4.mfgOrder) {
+    if (field === F3.mfgOrder) {
       if (option) {
         applyFillFromMfgOrderOption(rowData, option._item ?? option);
       }
@@ -1708,7 +1725,7 @@ class PretreatmentListTableCore extends SubTableCore {
       }
       return;
     }
-    if (field === F4.productionContainer) {
+    if (field === F3.productionContainer) {
       if (option) {
         applyFillFromOption(rowData, option._item ?? option);
       }
@@ -1723,7 +1740,7 @@ class PretreatmentListTableCore extends SubTableCore {
       }
       return;
     }
-    if (field === F4.materialContainerNo) {
+    if (field === F3.materialContainerNo) {
       if (option) {
         applyFillFromOption(rowData, option._item ?? option);
       }
@@ -1738,7 +1755,7 @@ class PretreatmentListTableCore extends SubTableCore {
       }
       return;
     }
-    if (field === F4.product) {
+    if (field === F3.product) {
       if (option) {
         applyFillFromProductOption(rowData, option._item ?? option);
       } else if (!hasValue) {
@@ -2513,9 +2530,9 @@ function useRenderPageFactory(props, payload) {
       const prevMap = info.validatorMessageMap ?? {};
       const sameLocations = prevLocations.length === nextLocations.length && nextLocations.every((k, i) => k === prevLocations[i]);
       const sameMessages = sameLocations && nextLocations.every((k) => {
-        const a11 = prevMap[k];
+        const a10 = prevMap[k];
         const b12 = map[k];
-        return JSON.stringify(a11) === JSON.stringify(b12);
+        return JSON.stringify(a10) === JSON.stringify(b12);
       });
       if (sameMessages) return;
       closeValidatorPopovers();
@@ -3382,6 +3399,166 @@ function useFormulaExpWatcher(options) {
     stop
   };
 }
+class FormAnnotationController {
+  formIns;
+  basicIns;
+  formRef;
+  paramExtraProps;
+  onVisibleChange;
+  constructor(params) {
+    Object.assign(this, params);
+    this.showAnnotation.value = this.paramExtraProps?._gct_default_annotation_status_ || false;
+    const { emitter, EmitterEnum } = useNocodeEmitter();
+    onBeforeMount(() => {
+      emitter.on(EmitterEnum.__on__open_single_annotation_detail_, (params2) => {
+        console.log("打开单个批注详情 aaaa", params2);
+        this.selectedCell.value = params2.cellLocation;
+      });
+    });
+    watch(
+      [this.ready, this.showAnnotation],
+      async ([isReady, visible]) => {
+        if (!isReady) {
+          return;
+        }
+        const uniqueId = this.basicIns.value?.uniqueId ?? "";
+        if (!visible) {
+          this.selectedCell.value = void 0;
+          this.rowViewHistoryId.value = void 0;
+          await this.formRef.setAnnotationViewStatus(uniqueId, false, []);
+          return;
+        }
+        await this.loadAnnotationHistory();
+        this.rowViewHistoryId.value = void 0;
+        await this.formRef.setAnnotationViewStatus(uniqueId, true, {
+          locations: this.allCellLocation.value,
+          rowDetails: []
+        });
+      },
+      {
+        immediate: true
+      }
+    );
+  }
+  /** 批注显隐 */
+  showAnnotation = ref(false);
+  /** 所有的父级批注数据 */
+  annotationList = ref([]);
+  /** 所有的修改过的单元格位置 */
+  allCellLocation = ref();
+  /** 当前展开行级展示的变更记录 id */
+  rowViewHistoryId = ref();
+  /** 是否已经加载过批注数据 */
+  hasLoadedHistory = ref(false);
+  //! 变更相关变量
+  /** 选中单元格 */
+  selectedCell = ref();
+  //! 表单相关变量
+  /** 是否就绪 */
+  ready = computed(() => {
+    return this.basicIns.value && this.basicIns.value.uniqueId;
+  });
+  /**
+   * 弹出提示警告信息
+   */
+  /**
+   * 加载批注历史（默认全量；套件可 override 为审批历史等）
+   */
+  loadAnnotationHistory = async () => {
+    return this.fetchAllFormChangeHistory();
+  };
+  normalizeAllResponse = (res) => {
+    if (!res) return [];
+    return Array.isArray(res) ? res : res.data ?? [];
+  };
+  applyAnnotationItems = (items, callback) => {
+    const scoped = this.scopeAnnotationItems(items || []);
+    this.annotationList.value = scoped;
+    const fieldItems = scoped.filter(
+      (item) => item.changeType === "Form" && item.details?.length && callback?.(item)
+    );
+    this.allCellLocation.value = collectFormChangeFieldLocations(fieldItems);
+  };
+  /**
+   * 按场景裁剪批注列表（套件可 override：审批处理页/详情页）
+   */
+  scopeAnnotationItems(items) {
+    return items || [];
+  }
+  toggleFormChangeRowView = async (historyId) => {
+    const uniqueId = this.basicIns.value?.uniqueId ?? "";
+    const next = nextFormChangeRowViewHistoryId(
+      this.rowViewHistoryId.value,
+      historyId,
+      this.annotationList.value
+    );
+    this.rowViewHistoryId.value = next.historyId;
+    await this.formRef.setFormChangeRowViewDetails?.(
+      uniqueId,
+      next.rowDetails.length ? next.rowDetails : null,
+      next.historyId
+    );
+  };
+  fetchAllFormChangeHistory = async () => {
+    if (isEmpty(this.formIns.value)) {
+      throw new Error($t("sys.onlineForm.formInstanceIsEmpty"));
+    }
+    try {
+      const res = await api.apaas.onlineFormChangeHistory.getList({
+        instanceId: this.formIns.value.id,
+        tmplId: this.formIns.value.tmplId
+      });
+      const items = this.normalizeAllResponse(res);
+      this.applyAnnotationItems(items, () => true);
+      return items;
+    } catch (e2) {
+      console.error("加载所有批注信息 error", e2);
+      throw e2;
+    }
+  };
+  handleOpenAnnotation = async () => {
+    this.showAnnotation.value = true;
+    if (this.onVisibleChange && typeof this.onVisibleChange === "function") {
+      this.onVisibleChange(false);
+    }
+  };
+  handleCloseAnnotation = async () => {
+    this.showAnnotation.value = false;
+    this.selectedCell.value = void 0;
+  };
+}
+function collectAnnotationItemsByLocation(map, cellLocation, fallback = []) {
+  if (cellLocation == null || cellLocation === "") return fallback;
+  const locs = Array.isArray(cellLocation) ? cellLocation : [cellLocation];
+  const merged = [];
+  const seen = /* @__PURE__ */ new Set();
+  locs.forEach((loc) => {
+    (map.get(loc) || []).forEach((item) => {
+      if (seen.has(item.id)) return;
+      seen.add(item.id);
+      merged.push(item);
+    });
+  });
+  return merged;
+}
+function annotationItemTime(item) {
+  return Date.parse(item.time || item.createTime || "");
+}
+function filterAnnotationItemsUpToCurrent(items) {
+  if (!items?.length) return [];
+  const current = items.find((item) => item.isCurrentChange);
+  if (!current) return items;
+  const currentTs = annotationItemTime(current);
+  if (Number.isNaN(currentTs)) {
+    return items.filter((item) => item.isCurrentChange);
+  }
+  return items.filter((item) => {
+    if (item.isCurrentChange) return true;
+    const ts = annotationItemTime(item);
+    if (Number.isNaN(ts)) return false;
+    return ts <= currentTs;
+  });
+}
 function useMaterialStocktake() {
   async function getStockDataByWarehouse({ cloneRuntimeJson, warehouseId, locationId }) {
     const stocktakeTables = cloneRuntimeJson?.paper?.props?.materialStocktakeList;
@@ -3415,25 +3592,23 @@ function useMaterialStocktake() {
 export {
   a5 as AITooltips,
   AllocateTableCore,
-  B4 as BaseFormModelFetcher,
+  B3 as BaseFormModelFetcher,
   a7 as BinarizeMethodOptions,
   ah as BindCmpStyleEnum,
-  y as BooleanShowMode,
+  x as BooleanShowMode,
   B2 as BorderTD,
   BpmnNodeTypeEnum,
-  aS as BpmnSignatureTypeEnum,
-  B3 as BuiltinAction,
-  aT as ButtonTypeEnum,
+  aU as BpmnSignatureTypeEnum,
+  aV as ButtonTypeEnum,
   B as BwipCodeType,
-  aU as CHECK_TABLE_MEDPRO_PROTOCOL_KEY,
+  aW as CHECK_TABLE_MEDPRO_PROTOCOL_KEY,
   h as CellType,
-  J as CellWidgetViewState,
-  C as ChangeType,
+  H as CellWidgetViewState,
   CheckDsTypeEnum,
-  aV as CodeRunner,
+  aX as CodeRunner,
   ComponentTypeEnum,
-  aW as Config_Fields,
-  aX as ControlStatusEnum,
+  aY as Config_Fields,
+  aZ as ControlStatusEnum,
   af as DateFormat,
   ai as DecimalDisplayMode,
   a6 as DenoiseMethodOptions,
@@ -3441,38 +3616,39 @@ export {
   a3 as DeviceLink,
   D2 as DeviceLinkTmplUtil,
   a4 as DeviceParamsTypeTitle,
-  K as DiagonalDirection,
+  I as DiagonalDirection,
+  K as DiagonalVertex,
   _ as DocumentLayout,
   p as DocumentLoading,
   e as DocumentPaper,
   q as DynamicQuickFillModal,
   f as DynamicTableAction,
-  aY as EBR_PROVIDE_ENUM,
+  a_ as EBR_PROVIDE_ENUM,
   ar as EFieldBizTypeEnum,
   N as EmptySymbol,
-  aZ as FieldSysVarDefaultValueEnum,
-  F2 as FillingTypeEnum,
+  a$ as FieldSysVarDefaultValueEnum,
+  FillingTypeEnum,
   F as FixedQuickFillModal,
-  a10 as FormAnnotationController,
-  F3 as FormModelController,
+  FormAnnotationController,
+  F2 as FormModelController,
   FormTmplBomController,
   r as FormTmplConfigController,
   FormTypeEnum,
   $ as ImageDisplayModeEnum,
-  I as InstanceStatusValues,
+  I2 as InstanceStatusValues,
   a9 as JoinModelTypeEum,
-  x as LabelPosition,
-  M as LineDirection,
+  w as LabelPosition,
+  J as LineDirection,
   L as LineType,
-  M3 as MBRender,
+  M2 as MBRender,
   s as MCDataUtil,
   b11 as MCRender,
   MaterialConsumeTableController,
   MaterialConsumptionPatternEnum,
-  M2 as MaterialStatusEnum,
-  a_ as MobileFillTypeEnum,
+  MaterialStatusEnum,
+  b0 as MobileFillTypeEnum,
   NCB_PROVIDE,
-  a$ as OfficeTypeEnum,
+  b1 as OfficeTypeEnum,
   O as Orientation,
   b as PageSizeEnum,
   P as PaginationFormat,
@@ -3481,86 +3657,88 @@ export {
   m as PaperWidgeValueType,
   a8 as ParamModelTypeEnum,
   PlatformEnum,
-  b0 as PosEnum,
+  b2 as PosEnum,
   PretreatmentListTableCore,
-  b1 as RangeCompareOp,
+  b3 as RangeCompareOp,
   ap as RangeValidateMode,
   RenderModeEnum,
-  D as SignShowTypeEnum,
-  z as SignatureNumberTypeEnum,
-  A as SignatureTimeTypeEnum,
-  E as SignatureTypeEnum,
+  A as SignShowTypeEnum,
+  y as SignatureNumberTypeEnum,
+  z as SignatureTimeTypeEnum,
+  D as SignatureTypeEnum,
   SterilizeBatchTableCore,
   StocktakeTableCore,
   SubTableCore,
   SubTableCoreFactory,
   SubTableType,
-  b2 as SummaryApproveHisTypeEnum,
+  b4 as SummaryApproveHisTypeEnum,
   T as TimeDiffFormat,
   V as ViewTypeEnum,
   W as WidgetImageSizeMode,
-  b3 as applyCheckDsDataToRuntime,
-  b4 as applyMedProCheckDsDataToRuntime,
+  b5 as applyCheckDsDataToRuntime,
+  b6 as applyMedProCheckDsDataToRuntime,
   baseDataUtils,
-  b5 as buildFormChangeDisplayRows,
-  b6 as buildStableFieldLocation,
+  b7 as buildFormChangeDisplayRows,
+  b8 as buildStableFieldLocation,
   calcFillData,
   calcUtils,
   clearFormRules,
-  c2 as collectAnnotationItemsByLocation,
-  b7 as collectFormChangeFieldLocations,
+  collectAnnotationItemsByLocation,
+  collectFormChangeFieldLocations,
   commonUtils,
-  b8 as deleteSubtableRow,
-  b9 as detailsHaveFormChangeRowOps,
+  b9 as deleteSubtableRow,
+  ba as detailsHaveFormChangeRowOps,
   enrichFormChangeRowDetails,
-  ba as extractFormChangeRowDetails,
+  bb as extractFormChangeRowDetails,
   extractKeywordFromQueryData,
-  bb as fetchCheckDsDataForTable,
-  bc as fetchCustomCheckDsData,
-  bd as fetchMedProCheckDsData,
-  f2 as filterAnnotationItemsUpToCurrent,
+  bc as fetchCheckDsDataForTable,
+  bd as fetchCustomCheckDsData,
+  be as fetchMedProCheckDsData,
+  filterAnnotationItemsUpToCurrent,
   getAppInfo,
-  be as getFormChangeRowKey,
-  bf as getFormChangeRowOp,
-  bg as getParseRuleConfig,
+  bf as getFormChangeRowKey,
+  bg as getFormChangeRowOp,
+  bh as getParseRuleConfig,
   getParseRuleInfo,
   getParseRuleValue,
-  bh as getSubTableQuickFillInfo,
+  bi as getSubTableQuickFillInfo,
   getSuiteKey,
-  bi as handleOldConfig,
-  bj as insertSubtableRows,
-  bk as isAnnLocationSelected,
+  bj as handleOldConfig,
+  bk as insertSubtableRows,
+  bl as isAnnLocationSelected,
   isEdhrSuite,
-  bl as isFormChangeGhostRow,
-  bm as isMedProSuite,
-  bn as isRowAddedInCurrentFormChange,
-  bo as jsonSchemaUtils,
-  bp as nextFormChangeRowViewHistoryId,
+  bm as isFormChangeGhostRow,
+  bn as isMedProSuite,
+  bo as isRowAddedInCurrentFormChange,
+  bp as jsonSchemaUtils,
+  bq as migrateDiagonalDirectionToVertex,
+  nextFormChangeRowViewHistoryId,
   ak as normalizeRefLoaderResult,
-  bq as recordSubtableRowAdd,
-  br as recordSubtableRowDelete,
+  br as recordSubtableRowAdd,
+  bs as recordSubtableRowDelete,
   al as refUtils,
   registerValidationContext,
-  bs as relocateDeletedRowsToEnd,
+  bt as relocateDeletedRowsToEnd,
   renderUtils,
   requestDisplayValidation,
   requestFullValidation,
-  bt as requestNonMedProCheckDsData,
-  bu as resolveAnnotationFieldLocation,
-  bv as resolveFormChangeRowUi,
-  bw as resolveRowFormChangeMark,
+  bu as requestNonMedProCheckDsData,
+  bv as resolveAnnotationFieldLocation,
+  M as resolveDiagonalVertex,
+  bw as resolveFormChangeRowUi,
+  bx as resolveRowFormChangeMark,
   ad as setSelectAnnotationId,
-  bx as setSelectMobileTdId,
+  by as setSelectMobileTdId,
   ac as setSelectValidatorId,
   settleAndValidateDisplay,
   aa as sqlUtils,
   transformUtils,
   unregisterValidationContext,
-  n as useCalculateFormula,
+  u as useCalculateFormula,
   ao as useCurrentPageFormState,
   c as useDependency,
   useEbrWikiFactoryV2,
-  u2 as useFormModel,
+  u3 as useFormModel,
   a2 as useFormTmplConfig,
   useFormulaExpWatcher,
   useMaterialBalance,
@@ -3568,7 +3746,7 @@ export {
   useNocodeEmitter,
   ae as useNocodeFormWidget,
   t as useOnlineFormActionButton,
-  u as useOnlineFormTransformField2Component,
+  u2 as useOnlineFormTransformField2Component,
   useRenderPageFactory,
   b10 as useStyles,
   d as useValidator,