@gct-paas/excel 0.1.28-beta.8 → 0.1.28

package/dist/{exceljs.min-DHw6Xo0Z.js → exceljs.min-BxkFiHRf.js}

@@ -1,5 +1,5 @@
-import { A as commonjsGlobal, D as getDefaultExportFromCjs } from "./dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-D8HQKSsX.js";
-import { c as commonjsRequire } from "./index-CDLpl1vT.js";
+import { I as commonjsGlobal, J as getDefaultExportFromCjs } from "./dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-BviS9x-o.js";
+import { c as commonjsRequire } from "./index-DapZh4vf.js";
 function _mergeNamespaces(n, m) {
   for (var i = 0; i < m.length; i++) {
     const e = m[i];

package/dist/{font-editor-BMzWHu2P.js → font-editor-BBNgoyoK.js}

@@ -1,8 +1,8 @@
 import { defineComponent, computed, resolveComponent, openBlock, createElementBlock, createElementVNode, createVNode, unref, normalizeClass, withCtx, normalizeStyle } from "vue";
-import { A as AlignEditor } from "./align-editor-B4gydK1M.js";
+import { A as AlignEditor } from "./align-editor-aEWznFoT.js";
 import { pick } from "lodash-es";
-import { J as _sfc_main$1, G as ColorPicker } from "./index-CDLpl1vT.js";
-import { _ as _export_sfc } from "./dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-D8HQKSsX.js";
+import { n as _sfc_main$1, C as ColorPicker } from "./index-DapZh4vf.js";
+import { a4 as _export_sfc } from "./dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-BviS9x-o.js";
 const _hoisted_1 = { class: "ks-row-middle mb-6px" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "font-editor",

package/dist/{image-design-Cv7Md3br.js → image-design-CV8ivT4U.js}

@@ -1,10 +1,11 @@
 import { defineComponent, openBlock, createElementBlock, normalizeClass, createElementVNode, unref, normalizeStyle } from "vue";
-import { u as useWebUpload } from "./index-DCyS2gPu.js";
+import { u as useWebUpload } from "./index-B9hn-Xpy.js";
 import "ant-design-vue";
-import { _ as _export_sfc } from "./dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-D8HQKSsX.js";
+import { a4 as _export_sfc } from "./dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-BviS9x-o.js";
 import "@gct-paas/form-base";
 import "lodash-es";
 import "dayjs";
+import "vxe-table";
 const _hoisted_1 = ["src"];
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "image-design",

package/dist/{index-ClwYjOaz.js → index-B94zjbXB.js}

@@ -1,9 +1,9 @@
 import { get } from "lodash-es";
-import { m as ComponentTypeEnum, al as ImageDisplayModeEnum, V as SignatureNumberTypeEnum, W as SignatureTimeTypeEnum, X as SignShowTypeEnum, Y as SignatureTypeEnum } from "./dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-D8HQKSsX.js";
+import { C as ComponentTypeEnum, av as ImageDisplayModeEnum, a0 as SignatureNumberTypeEnum, a1 as SignatureTimeTypeEnum, a2 as SignShowTypeEnum, a3 as SignatureTypeEnum } from "./dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-BviS9x-o.js";
 import "vue";
 import "dayjs";
 import "ant-design-vue";
-import { B as BaseComponent } from "./BaseComponent-yoXj5Q9c.js";
+import { B as BaseComponent } from "./BaseComponent-9YPaGJfR.js";
 class Sign extends BaseComponent {
   component = ComponentTypeEnum.Sign;
   wrapperCmpConfig({ data }) {

package/dist/{index-DCyS2gPu.js → index-B9hn-Xpy.js}

@@ -1,10 +1,11 @@
-import { ab as noop, cH as tryOnScopeDispose, cI as isClient, cJ as tryOnMounted, cK as resolveUnref, ac as isIOS, cL as isString, cM as identity, w as api, _ as _export_sfc, cN as getAugmentedNamespace, A as commonjsGlobal, D as getDefaultExportFromCjs, cO as watchDebounced, c4 as getParseRuleConfig, aP as getLotLockedReason, bw as uuid2 } from "./dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-D8HQKSsX.js";
+import { al as noop, dn as tryOnScopeDispose, dp as isClient, dq as tryOnMounted, dr as resolveUnref, am as isIOS, ds as isString, dt as identity, z as api, a4 as _export_sfc, du as getAugmentedNamespace, I as commonjsGlobal, J as getDefaultExportFromCjs, ay as watchDebounced, cK as getParseRuleConfig, c9 as uuid2 } from "./dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-BviS9x-o.js";
 import { message, Modal, Form } from "ant-design-vue";
-import { watch, ref as ref$1, defineComponent, inject, computed, resolveComponent, openBlock, createElementBlock, normalizeClass, createElementVNode, renderSlot, createBlock, withCtx, createTextVNode, toDisplayString, createCommentVNode, onUnmounted, createVNode, h, onMounted, mergeProps, unref, reactive, Fragment, renderList, toRaw, toHandlers, toRef, watchEffect } from "vue";
+import { watch, ref as ref$1, defineComponent, inject, computed, resolveComponent, openBlock, createElementBlock, normalizeClass, createElementVNode, renderSlot, createBlock, withCtx, createTextVNode, toDisplayString, createCommentVNode, onUnmounted, createVNode, h, onMounted, mergeProps, unref, reactive, Fragment, renderList, toRaw, toRef, watchEffect } from "vue";
 import { debounce, cloneDeep } from "lodash-es";
 import "dayjs";
-import { u as useFormModel, M as MBRender, a as MCRender } from "./mb-render-DNA0sAdk.js";
+import { u as useFormModel, M as MBRender, a as MCRender } from "./mb-render-BBRR_byl.js";
 import { useFormBaseModal, closeAllFormBaseModal } from "@gct-paas/form-base";
+import { VxeGrid } from "vxe-table";
 function unrefElement(elRef) {
   var _a;
   const plain = resolveUnref(elRef);
@@ -201,34 +202,6 @@ const _TransitionPresets = {
 __spreadValues({
   linear: identity
 }, _TransitionPresets);
-function useWindowSize(options = {}) {
-  const {
-    window: window2 = defaultWindow,
-    initialWidth = Infinity,
-    initialHeight = Infinity,
-    listenOrientation = true,
-    includeScrollbar = true
-  } = options;
-  const width = ref$1(initialWidth);
-  const height = ref$1(initialHeight);
-  const update = () => {
-    if (window2) {
-      if (includeScrollbar) {
-        width.value = window2.innerWidth;
-        height.value = window2.innerHeight;
-      } else {
-        width.value = window2.document.documentElement.clientWidth;
-        height.value = window2.document.documentElement.clientHeight;
-      }
-    }
-  };
-  update();
-  tryOnMounted(update);
-  useEventListener("resize", update, { passive: true });
-  if (listenOrientation)
-    useEventListener("orientationchange", update, { passive: true });
-  return { width, height };
-}
 const uploadApis = {
   upload: null,
   transfer: (filename) => filename
@@ -381,6 +354,8 @@ class OpenUtilWeb {
     return new Promise((resolve) => {
       Modal.confirm({
         ...options,
+        okText: $t("sys.okText"),
+        cancelText: $t("sys.cancel"),
         onOk: () => {
           resolve(true);
         },
@@ -422,12 +397,12 @@ class ModalManager {
     this.modals = [];
   }
 }
-const _hoisted_1$6 = { class: "modal-wrapper__content" };
-const _hoisted_2$2 = {
+const _hoisted_1$4 = { class: "modal-wrapper__content" };
+const _hoisted_2$1 = {
   key: 0,
   class: "modal-wrapper__footer"
 };
-const _sfc_main$9 = /* @__PURE__ */ defineComponent({
+const _sfc_main$7 = /* @__PURE__ */ defineComponent({
   __name: "modal-wrapper",
   props: {
     opts: { default: () => ({}) },
@@ -486,10 +461,10 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
       return openBlock(), createElementBlock("div", {
         class: normalizeClass(["modal-wrapper", _options.value.height && "modal-wrapper--has-height"])
       }, [
-        createElementVNode("div", _hoisted_1$6, [
+        createElementVNode("div", _hoisted_1$4, [
           renderSlot(_ctx.$slots, "default", {}, void 0, true)
         ]),
-        showFooter.value ? (openBlock(), createElementBlock("div", _hoisted_2$2, [
+        showFooter.value ? (openBlock(), createElementBlock("div", _hoisted_2$1, [
           _options.value.showCancelBtn ? (openBlock(), createBlock(_component_a_button, {
             key: 0,
             onClick: onCancel
@@ -515,7 +490,7 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ModalWrapper = /* @__PURE__ */ _export_sfc(_sfc_main$9, [["__scopeId", "data-v-f2d43ec5"]]);
+const ModalWrapper = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["__scopeId", "data-v-f2d43ec5"]]);
 var type;
 var hasRequiredType;
 function requireType() {
@@ -3156,7 +3131,7 @@ class MemoryCache {
     }
   }
 }
-const _sfc_main$8 = /* @__PURE__ */ defineComponent({
+const _sfc_main$6 = /* @__PURE__ */ defineComponent({
   __name: "select-more",
   emits: ["next"],
   setup(__props, { emit: __emit }) {
@@ -3312,7 +3287,7 @@ function useAsyncOptions({ bindModelKey, modelCategory }) {
     if (!complete) {
       treeData.value?.push({
         selectable: false,
-        title: () => h(_sfc_main$8, {
+        title: () => h(_sfc_main$6, {
           onNextOnce: () => {
             arg.pageNo += 1;
             getAsyncOptions(arg);
@@ -3339,7 +3314,7 @@ function useAsyncOptions({ bindModelKey, modelCategory }) {
     treeData
   };
 }
-const _sfc_main$7 = /* @__PURE__ */ defineComponent({
+const _sfc_main$5 = /* @__PURE__ */ defineComponent({
   __name: "rdo-tree-select",
   props: {
     modelValue: {},
@@ -3442,11 +3417,11 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const _hoisted_1$5 = {
+const _hoisted_1$3 = {
   key: 0,
   class: "form-field-select--readonly"
 };
-const _sfc_main$6 = /* @__PURE__ */ defineComponent({
+const _sfc_main$4 = /* @__PURE__ */ defineComponent({
   __name: "form-field-select",
   props: {
     modelValue: { default: void 0 },
@@ -3497,7 +3472,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
     };
     return (_ctx, _cache) => {
       const _component_a_select = resolveComponent("a-select");
-      return __props.readonly ? (openBlock(), createElementBlock("span", _hoisted_1$5, toDisplayString(readonlyText.value), 1)) : (openBlock(), createBlock(_component_a_select, mergeProps({
+      return __props.readonly ? (openBlock(), createElementBlock("span", _hoisted_1$3, toDisplayString(readonlyText.value), 1)) : (openBlock(), createBlock(_component_a_select, mergeProps({
         key: 1,
         class: "form-field-select",
         value: props.modelValue,
@@ -3512,11 +3487,11 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const FormFieldSelect = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["__scopeId", "data-v-4bfc82a8"]]);
-const _hoisted_1$4 = {
+const FormFieldSelect = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-4bfc82a8"]]);
+const _hoisted_1$2 = {
   class: /* @__PURE__ */ normalizeClass(["parse-rule-modal__content"])
 };
-const _hoisted_2$1 = {
+const _hoisted_2 = {
   key: 0,
   class: "mb12px"
 };
@@ -3527,7 +3502,7 @@ const _hoisted_5 = {
   class: "parse-rule-modal__actions"
 };
 const _hoisted_6 = ["onClick", "title"];
-const _sfc_main$5 = /* @__PURE__ */ defineComponent({
+const _sfc_main$3 = /* @__PURE__ */ defineComponent({
   __name: "parse-rule-modal",
   props: {
     modal: {},
@@ -3613,14 +3588,14 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
         "do-ok": doOk
       }, {
         default: withCtx(() => [
-          createElementVNode("div", _hoisted_1$4, [
+          createElementVNode("div", _hoisted_1$2, [
             createVNode(_component_a_form_item, {
               class: "parse-rule-modal__rule w-425px",
               label: _ctx.$t("sys.edhr.mcTable.parseRule") + "：",
               name: "parsingRuleId"
             }, {
               default: withCtx(() => [
-                createVNode(_sfc_main$7, {
+                createVNode(_sfc_main$5, {
                   "model-value": formState.parsingRuleId,
                   "onUpdate:modelValue": onRuleChange,
                   modelKey: "em_barcode_parsing_rules",
@@ -3629,7 +3604,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
               ]),
               _: 1
             }, 8, ["label"]),
-            __props.ruleTip ? (openBlock(), createElementBlock("div", _hoisted_2$1, [
+            __props.ruleTip ? (openBlock(), createElementBlock("div", _hoisted_2, [
               createVNode(_component_a_alert, {
                 message: __props.ruleTip,
                 type: "info",
@@ -3721,118 +3696,18 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ParseRuleModal = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["__scopeId", "data-v-2712d5f4"]]);
-const _hoisted_1$3 = {
-  class: /* @__PURE__ */ normalizeClass(["multi-rows-modal__content"])
-};
-const _sfc_main$4 = /* @__PURE__ */ defineComponent({
-  __name: "multi-rows-modal",
-  props: {
-    modal: {},
-    rows: {}
-  },
-  setup(__props) {
-    const modalOptions = reactive({
-      width: 800,
-      draggable: true,
-      showFooter: true,
-      canFullscreen: false,
-      title: $t("sys.kit.selectMaterial"),
-      wrapClassName: "gct-draggable-modal"
-    });
-    const props = __props;
-    const selectedRow = ref$1();
-    const tableData = computed(
-      () => (props.rows ?? []).map((row, index) => ({
-        ...row,
-        _rowKey: `${row.materialId ?? ""}_${row.productionIdentificationId ?? ""}_${index}`
-      }))
-    );
-    const gridOptions = reactive({
-      round: true,
-      maxHeight: 420,
-      rowConfig: {
-        isHover: true,
-        keyField: "_rowKey"
-      },
-      radioConfig: {
-        trigger: "row",
-        highlight: true
-      },
-      columns: [
-        { type: "radio", width: 48 },
-        {
-          field: "productId",
-          title: $t("sys.model.product"),
-          showOverflow: "tooltip",
-          minWidth: 140
-        },
-        {
-          field: "materialNo",
-          title: $t("sys.edhr.materialNo"),
-          showOverflow: "tooltip",
-          minWidth: 160
-        }
-      ]
-    });
-    const gridEvents = {
-      radioChange({ row }) {
-        selectedRow.value = row;
-      }
-    };
-    const doOk = async () => {
-      if (!selectedRow.value) {
-        message.error($t("请选择一条数据"));
-        return false;
-      }
-      const {
-        _rowKey: _,
-        productionIdentificationIsLocked,
-        productionIdentificationId,
-        ...rest
-      } = selectedRow.value;
-      if (productionIdentificationIsLocked) {
-        const msg = await getLotLockedReason(productionIdentificationId);
-        message.error(msg);
-        throw new Error("物料批次已被锁定");
-      }
-      return {
-        ok: true,
-        data: rest
-      };
-    };
-    return (_ctx, _cache) => {
-      const _component_vxe_grid = resolveComponent("vxe-grid");
-      return openBlock(), createBlock(unref(ModalWrapper), {
-        opts: modalOptions,
-        class: normalizeClass(["multi-rows-modal"]),
-        "do-ok": doOk
-      }, {
-        default: withCtx(() => [
-          createElementVNode("div", _hoisted_1$3, [
-            createVNode(_component_vxe_grid, mergeProps({
-              class: "multi-rows-modal__grid default vxetable",
-              data: tableData.value,
-              "max-height": "420px"
-            }, gridOptions, toHandlers(gridEvents)), null, 16, ["data"])
-          ])
-        ]),
-        _: 1
-      }, 8, ["opts"]);
-    };
-  }
-});
-const MultiRowsModal = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-c36488c5"]]);
+const ParseRuleModal = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-2712d5f4"]]);
 class SubTableRender {
   modalManager = new ModalManager();
   openScanModal(opts) {
     return useFormBaseModal(
       "COMMON_SCAN",
       {
-        title: opts.title,
+        // title: opts.title,
         formFieldOptions: opts.formModelController.getFormFieldOptions(opts.subModelKey),
         scanRules: opts.scanRules,
         scanParam: opts.scanParam,
+        ruleTip: $t("sys.scanRuleTipSubTable"),
         onScan: opts.onScan
       },
       { mask: false, draggable: true }
@@ -3848,8 +3723,8 @@ class SubTableRender {
     }
   };
   openMultiRowsModal = async (opts) => {
-    const res = await this.modalManager.openModal(
-      MultiRowsModal,
+    const { success, result } = await useFormBaseModal(
+      "SCAN_MULTI_ROWS_MODAL",
       { rows: opts.rows },
       {
         title: opts.title ?? $t("sys.kit.selectMaterial"),
@@ -3858,8 +3733,8 @@ class SubTableRender {
         draggable: true
       }
     );
-    if (res?.ok && res.data) {
-      return res.data;
+    if (success && result) {
+      return result;
     }
   };
   destroyAllModals() {
@@ -3869,8 +3744,8 @@ class SubTableRender {
 }
 class AllocateWebRender extends SubTableRender {
 }
-const _hoisted_1$2 = { class: "p24px" };
-const _sfc_main$3 = /* @__PURE__ */ defineComponent({
+const _hoisted_1$1 = { class: "p24px" };
+const _sfc_main$2 = /* @__PURE__ */ defineComponent({
   __name: "material-consume-modal",
   props: {
     modal: {},
@@ -3910,7 +3785,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
         class: normalizeClass(["material-consume-modal"])
       }, {
         default: withCtx(() => [
-          createElementVNode("div", _hoisted_1$2, [
+          createElementVNode("div", _hoisted_1$1, [
             createVNode(_component_a_table, {
               columns,
               "data-source": tableData.value,
@@ -3938,7 +3813,7 @@ class MbWebRender extends MBRender {
       return;
     }
     this.modalHtml = window.NocodeAdapter.utils.overlay.createModal(
-      _sfc_main$3,
+      _sfc_main$2,
       {
         data
       },
@@ -3963,10 +3838,10 @@ class MbWebRender extends MBRender {
     }
   }
 }
-const _hoisted_1$1 = {
+const _hoisted_1 = {
   class: /* @__PURE__ */ normalizeClass(["bom-modal__content"])
 };
-const _sfc_main$2 = /* @__PURE__ */ defineComponent({
+const _sfc_main$1 = /* @__PURE__ */ defineComponent({
   __name: "bom-modal",
   props: {
     modal: {},
@@ -4041,14 +3916,13 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
       ]
     });
     return (_ctx, _cache) => {
-      const _component_vxe_grid = resolveComponent("vxe-grid");
       return openBlock(), createBlock(unref(ModalWrapper), {
         opts: modalOptions,
         class: normalizeClass(["bom-modal"])
       }, {
         default: withCtx(() => [
-          createElementVNode("div", _hoisted_1$1, [
-            (openBlock(), createBlock(_component_vxe_grid, mergeProps({
+          createElementVNode("div", _hoisted_1, [
+            (openBlock(), createBlock(unref(VxeGrid), mergeProps({
               key: refreshKey.value,
               class: "device-table__grid default vxetable",
               data: tableData.value
@@ -4060,7 +3934,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const BomModal = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-2a48426e"]]);
+const BomModal = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-5d267371"]]);
 class McWebRender extends MCRender {
   /**
    * 所有打开的modal集合
@@ -4096,7 +3970,7 @@ class McWebRender extends MCRender {
     await useFormBaseModal(
       "COMMON_SCAN",
       {
-        title: opts.title,
+        // title: opts.title,
         formFieldOptions: opts.formModelController.getFormFieldOptions(opts.subModelKey),
         scanRules: opts.scanRules,
         scanParam: opts.scanParam,
@@ -4116,8 +3990,8 @@ class McWebRender extends MCRender {
     }
   }
   async openMultiRowsModal(opts) {
-    const res = await window.NocodeAdapter.utils.overlay.modal(
-      MultiRowsModal,
+    const { success, result } = await useFormBaseModal(
+      "SCAN_MULTI_ROWS_MODAL",
       { rows: opts.rows },
       {
         title: opts.title ?? $t("sys.kit.selectMaterial"),
@@ -4126,94 +4000,24 @@ class McWebRender extends MCRender {
         draggable: true
       }
     );
-    if (res?.ok && res.data) {
-      return res.data;
+    if (success && result) {
+      return result;
     }
   }
 }
-const _hoisted_1 = { class: "pt20px px16px pb20px" };
-const _hoisted_2 = { class: "bg-radio" };
-const _sfc_main$1 = /* @__PURE__ */ defineComponent({
-  __name: "scan-modal",
-  props: {
-    onScan: { type: Function }
-  },
-  setup(__props) {
-    const props = __props;
-    const barcode = ref$1();
-    const activeType = ref$1("add");
-    function changeCalculation(type2) {
-      activeType.value = type2;
-    }
-    async function handleEnter(e) {
-      console.log("handleEnter", e, barcode.value);
-      if (barcode.value?.trim()) {
-        await props.onScan({ barcode: barcode.value, type: activeType.value });
-        barcode.value = void 0;
-      }
-    }
-    return (_ctx, _cache) => {
-      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, [
-        createElementVNode("div", _hoisted_2, [
-          createElementVNode("div", {
-            class: normalizeClass(["bg-radio-item", [activeType.value === "add" && "active"]]),
-            onClick: _cache[0] || (_cache[0] = ($event) => changeCalculation("add"))
-          }, [
-            _cache[3] || (_cache[3] = createElementVNode("i", { class: "iconfont icon-chuangjian" }, null, -1)),
-            createTextVNode(" " + toDisplayString(_ctx.$t("sys.edhr.addStocktakeNum")), 1)
-          ], 2),
-          createElementVNode("div", {
-            class: normalizeClass(["bg-radio-item", [activeType.value === "minus" && "active"]]),
-            onClick: _cache[1] || (_cache[1] = ($event) => changeCalculation("minus"))
-          }, [
-            _cache[4] || (_cache[4] = createElementVNode("i", { class: "iconfont icon-jiantouxia_arrow-down" }, null, -1)),
-            createTextVNode(" " + toDisplayString(_ctx.$t("sys.edhr.plusStocktakeNum")), 1)
-          ], 2)
-        ]),
-        createVNode(_component_a_form, { class: "mt20px" }, {
-          default: withCtx(() => [
-            createVNode(_component_a_form_item, {
-              label: _ctx.$t("sys.edhr.materialNo2"),
-              rules: [{ required: true }]
-            }, {
-              default: withCtx(() => [
-                createVNode(_component_a_input, {
-                  value: barcode.value,
-                  "onUpdate:value": _cache[2] || (_cache[2] = ($event) => barcode.value = $event),
-                  placeholder: _ctx.$t("sys.inputText"),
-                  allowClear: "",
-                  onPressEnter: handleEnter
-                }, null, 8, ["value", "placeholder"])
-              ]),
-              _: 1
-            }, 8, ["label"])
-          ]),
-          _: 1
-        })
-      ]);
-    };
-  }
-});
-const ScanModal = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-954013ba"]]);
 class StocktakeWebRender extends SubTableRender {
   openScanModal(opts) {
-    return this.modalManager.openModal(
-      ScanModal,
+    return useFormBaseModal(
+      "COMMON_SCAN",
       {
+        formFieldOptions: opts.formModelController?.getFormFieldOptions(opts.subModelKey),
+        scanRules: opts.scanRules,
+        scanParam: opts.scanParam,
+        ruleTip: $t("sys.scanRuleTipSubTable"),
+        showScanAdjustBtn: true,
         onScan: opts.onScan
       },
-      {
-        width: 400,
-        draggable: true,
-        showFooter: false,
-        canFullscreen: false,
-        mask: false,
-        title: opts.title ?? $t("sys.onlineForm.subTableType.STOCKTAKE"),
-        wrapClassName: "gct-draggable-modal"
-      }
+      { mask: false, draggable: true }
     );
   }
 }
@@ -4232,15 +4036,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const emit = __emit;
     const handleClick = async () => {
       if (props.disabled && !props.modelValue) return;
-      const res = await window.NocodeAdapter.utils.overlay.modal(ParseRuleModal, {
+      const { success, result } = await useFormBaseModal("PARSE_RULE_MODAL", {
         config: props.modelValue,
-        subModelKey: props.subModelKey,
-        formModelController,
+        formFieldOptions: formModelController.getFormFieldOptions(props.subModelKey),
         ruleTip: props.ruleTip,
         readonly: !!props.disabled
       });
-      if (res?.ok && !props.disabled) {
-        emit("update:modelValue", res.data);
+      if (success && !props.disabled) {
+        emit("update:modelValue", result);
       }
     };
     const btnAttrs = computed(() => {
@@ -4269,7 +4072,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const AddRuleBtn = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-8bf17209"]]);
+const AddRuleBtn = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-54f27da9"]]);
 function initRenderToAdapter() {
   const adapter = window.NocodeAdapter;
   adapter.openUtil = new OpenUtilWeb();
@@ -4290,17 +4093,15 @@ export {
   ParseRuleModal as P,
   StocktakeWebRender as S,
   Uploader as U,
-  _sfc_main$7 as _,
+  _sfc_main$5 as _,
   useEventListener as a,
   unrefElement as b,
-  useWindowSize as c,
+  useIntersectionObserver as c,
   defaultWindow as d,
-  MultiRowsModal as e,
+  cacheAdapter as e,
   initWebNocodeAdapter as f,
   initRenderToAdapter as g,
-  useIntersectionObserver as h,
   initWebPaasUploadApis as i,
-  cacheAdapter as j,
   onClickOutside as o,
   require$$0 as r,
   useWebUpload as u

package/dist/{index-CTfI5z2v.js → index-BI1w0HuA.js}

@@ -1,9 +1,9 @@
 import { get, pick } from "lodash-es";
-import { m as ComponentTypeEnum } from "./dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-D8HQKSsX.js";
+import { C as ComponentTypeEnum } from "./dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-BviS9x-o.js";
 import "vue";
 import "dayjs";
 import "ant-design-vue";
-import { B as BaseComponent } from "./BaseComponent-yoXj5Q9c.js";
+import { B as BaseComponent } from "./BaseComponent-9YPaGJfR.js";
 class UploadFile extends BaseComponent {
   component = ComponentTypeEnum.UploadFile;
   wrapperCmpConfig({ data }) {

package/dist/{index-DYJ2NY6r.js → index-BIyoFjsu.js}

@@ -1,4 +1,4 @@
-import { m as ComponentTypeEnum } from "./dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-D8HQKSsX.js";
+import { C as ComponentTypeEnum } from "./dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-BviS9x-o.js";
 import "vue";
 import { pick } from "lodash-es";
 import "dayjs";

package/dist/{index-Cf0HUPLj.js → index-BNdFxtuu.js}

@@ -1,9 +1,9 @@
 import { has, get, pick } from "lodash-es";
-import { m as ComponentTypeEnum, aE as DecimalDisplayMode, bR as RangeCompareOp, aQ as RangeValidateMode, aD as BindCmpStyleEnum } from "./dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-D8HQKSsX.js";
+import { C as ComponentTypeEnum, au as DecimalDisplayMode, at as RangeCompareOp, as as RangeValidateMode, b0 as BindCmpStyleEnum } from "./dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-BviS9x-o.js";
 import "vue";
 import "dayjs";
 import "ant-design-vue";
-import { B as BaseComponent } from "./BaseComponent-yoXj5Q9c.js";
+import { B as BaseComponent } from "./BaseComponent-9YPaGJfR.js";
 class InputNumber extends BaseComponent {
   component = ComponentTypeEnum.Inputnumber;
   wrapperCmpConfig({ data }) {

package/dist/{index-B_rAitke.js → index-BVy2F-LZ.js}

@@ -1,9 +1,9 @@
 import { get, pick } from "lodash-es";
-import { m as ComponentTypeEnum } from "./dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-D8HQKSsX.js";
+import { C as ComponentTypeEnum } from "./dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-BviS9x-o.js";
 import "vue";
 import "dayjs";
 import "ant-design-vue";
-import { B as BaseComponent } from "./BaseComponent-yoXj5Q9c.js";
+import { B as BaseComponent } from "./BaseComponent-9YPaGJfR.js";
 class Timepicker extends BaseComponent {
   component = ComponentTypeEnum.Timepicker;
   wrapperCmpConfig({ data }) {