@kengic/vue 0.26.3 → 0.26.5-beta.0

package/dist/kengic-vue.js

@@ -2437,7 +2437,7 @@ const emptyIcon = {
       ...a.data
     }, r);
   }
-}), version = "0.26.3";
+}), version = "0.26.5-beta.0";
 var freeGlobal = typeof global == "object" && global && global.Object === Object && global;
 const freeGlobal$1 = freeGlobal;
 var freeSelf = typeof self == "object" && self && self.Object === Object && self, root = freeGlobal$1 || freeSelf || Function("return this")();
@@ -6899,7 +6899,12 @@ class KgUtil {
           break;
         }
         case typeof l == "string": {
-          s[o] = this.parseParamFromString(l);
+          s[o] = this.parseParamFromString({
+            $dayjs: n,
+            formID: r,
+            value: l,
+            varName: o
+          });
           break;
         }
         default: {
@@ -6933,7 +6938,10 @@ class KgUtil {
           s[o] = this.parseParams(l, null, n);
           break;
         case typeof l == "string":
-          s[o] = this.parseParamFromString(l);
+          s[o] = this.parseParamFromString({
+            $dayjs: n,
+            value: l
+          });
           break;
         default:
           s[o] = l != null ? l : null;
@@ -6942,24 +6950,35 @@ class KgUtil {
     }), s);
   }
   static parseParamFromString(a) {
-    var u, s, o, l, c, _, d;
-    const r = useKg(), n = /(.*)?({(.*)?})(.*)?/.exec(a);
-    if (n) {
-      const g = n[2], m = n[2].slice(1, -1);
-      switch (g) {
+    var _, d, g, m, b, v, p, E, T, C, A, k, O;
+    const {
+      formID: r,
+      $dayjs: n,
+      value: u,
+      varName: s
+    } = a != null ? a : {}, o = useKg(), l = r ? useKgVar(r) : null, c = /(.*)?({(.*)?})(.*)?/.exec(u);
+    if (c) {
+      const D = c[2], y = c[2].slice(1, -1);
+      switch (D) {
         case "{WAREHOUSE}":
-          return a.replace(g, (s = (u = useKgWarehouse().warehouse.value) == null ? void 0 : u.whId) != null ? s : "");
+          return u.replace(D, (d = (_ = useKgWarehouse().warehouse.value) == null ? void 0 : _.whId) != null ? d : "");
         case "{LOCALE}":
-          return a.replace(g, (l = (o = r.locale) == null ? void 0 : o.value) != null ? l : "");
+          return u.replace(D, (m = (g = o.locale) == null ? void 0 : g.value) != null ? m : "");
+        case "{NOW}":
+          return n ? u.replace(D, n().format("YYYY-MM-DD HH:mm:ss")) : u;
+        case "{USER}":
+          return u.replace(D, (T = (E = (p = (v = (b = o.store).getUseUserStore) == null ? void 0 : v.call(b)) == null ? void 0 : p.userInfo) == null ? void 0 : E.username) != null ? T : "");
+        case "{ROW}":
+          return l && s ? u.replace(D, (C = l.kgTable.selectedRow.value) == null ? void 0 : C[s]) : u;
         default: {
-          if (m.endsWith(":query"))
-            return (d = (_ = (c = r.router.value) == null ? void 0 : c.currentRoute) == null ? void 0 : _.query[m.slice(0, -6)]) != null ? d : "";
+          if (y.endsWith(":query"))
+            return (O = (k = (A = o.router.value) == null ? void 0 : A.currentRoute) == null ? void 0 : k.query[y.slice(0, -6)]) != null ? O : "";
           break;
         }
       }
-      return a;
+      return u;
     } else
-      return a;
+      return u;
   }
   static parseParamFromDayjs(a) {
     const {
@@ -7143,87 +7162,78 @@ class KgVarUtil {
     return r;
   }
   static transformFormItemDefaultValue(a) {
-    var b, v, p, E, T;
     const {
       formID: r,
       varName: n,
       $dayjs: u,
       value: s,
       buttonVarName: o
-    } = a != null ? a : {}, l = useKg(), c = useKgVar(r);
-    let _ = s;
-    const d = /(.*)?({(.*)?})(.*)?/.exec(_);
-    if (d)
-      switch (d[2]) {
-        case "{NOW}":
-          _ = _.replace("{NOW}", u().format("YYYY-MM-DD HH:mm:ss"));
-          break;
-        case "{USER}":
-          _ = _.replace("{USER}", (E = (p = (v = (b = l.store).getUseUserStore) == null ? void 0 : v.call(b)) == null ? void 0 : p.userInfo) == null ? void 0 : E.username);
-          break;
-        case "{ROW}":
-          _ = _.replace("{ROW}", (T = c.kgTable.selectedRow.value) == null ? void 0 : T[n]);
-          break;
-      }
-    const g = c.getVarConfigControl({
+    } = a != null ? a : {}, l = useKgVar(r);
+    let c = KgUtil.parseParamFromString({
+      value: s,
+      formID: r,
+      varName: n,
+      $dayjs: u
+    });
+    const _ = l.getVarConfigControl({
       buttonVarName: o,
       varName: n
     });
-    if (!g)
-      return _;
-    const m = g.ctrl_typ || KG__VAR_CONFIG_CONTROL__CONTROL_TYPE.INPUT;
-    switch (m) {
+    if (!_)
+      return c;
+    const d = _.ctrl_typ || KG__VAR_CONFIG_CONTROL__CONTROL_TYPE.INPUT;
+    switch (d) {
       case KG__VAR_CONFIG_CONTROL__CONTROL_TYPE.INPUT:
       case KG__VAR_CONFIG_CONTROL__CONTROL_TYPE.INPUT_PASSWORD:
       case KG__VAR_CONFIG_CONTROL__CONTROL_TYPE.TEXT_AREA:
-        return isNil(_) ? null : String(_);
+        return isNil(c) ? null : String(c);
       case KG__VAR_CONFIG_CONTROL__CONTROL_TYPE.INPUT_NUMBER: {
-        if (isNil(_))
+        if (isNil(c))
           return;
-        const C = Number(_);
-        if (Number.isNaN(C)) {
-          ____ERROR____(`| \u63A7\u4EF6\u7684\u503C\u975E\u6CD5 | ${m} \u63A7\u4EF6\u7684\u503C\u5FC5\u987B\u4E3A\u6570\u5B57\u7C7B\u578B.`, {
+        const g = Number(c);
+        if (Number.isNaN(g)) {
+          ____ERROR____(`| \u63A7\u4EF6\u7684\u503C\u975E\u6CD5 | ${d} \u63A7\u4EF6\u7684\u503C\u5FC5\u987B\u4E3A\u6570\u5B57\u7C7B\u578B.`, {
             formID: r,
             varName: n,
-            value: _
+            value: c
           });
           return;
         }
-        return C;
+        return g;
       }
       case KG__VAR_CONFIG_CONTROL__CONTROL_TYPE.CHECKBOX:
       case KG__VAR_CONFIG_CONTROL__CONTROL_TYPE.SWITCH: {
-        if (isNil(_))
+        if (isNil(c))
           return 0;
-        const C = Number(_);
-        if (Number.isNaN(C)) {
-          ____ERROR____(`| \u63A7\u4EF6\u7684\u503C\u975E\u6CD5 | ${m} \u63A7\u4EF6\u7684\u503C\u5FC5\u987B\u4E3A\u6570\u5B57\u7C7B\u578B.`, {
+        const g = Number(c);
+        if (Number.isNaN(g)) {
+          ____ERROR____(`| \u63A7\u4EF6\u7684\u503C\u975E\u6CD5 | ${d} \u63A7\u4EF6\u7684\u503C\u5FC5\u987B\u4E3A\u6570\u5B57\u7C7B\u578B.`, {
             formID: r,
             varName: n,
-            value: _
+            value: c
           });
           return;
         }
-        if (![0, 1].includes(C)) {
-          ____ERROR____(`| \u63A7\u4EF6\u7684\u503C\u975E\u6CD5 | ${m} \u63A7\u4EF6\u7684\u503C\u5FC5\u987B\u4E3A 0 \u6216 1.`, {
+        if (![0, 1].includes(g)) {
+          ____ERROR____(`| \u63A7\u4EF6\u7684\u503C\u975E\u6CD5 | ${d} \u63A7\u4EF6\u7684\u503C\u5FC5\u987B\u4E3A 0 \u6216 1.`, {
             formID: r,
             varName: n,
-            value: _
+            value: c
           });
           return;
         }
-        return C;
+        return g;
       }
       case KG__VAR_CONFIG_CONTROL__CONTROL_TYPE.DATE_TIME: {
-        if (isNil(_) || _.trim() === "")
+        if (isNil(c) || c.trim() === "")
           return;
-        const C = u(`1900-01-01 ${_}`);
-        if (C != null && C.isValid())
-          return C;
-        ____ERROR____(`| \u63A7\u4EF6\u7684\u503C\u975E\u6CD5 | ${m} \u63A7\u4EF6\u7684\u503C\u5FC5\u987B\u4E3A\u65F6\u95F4\u7C7B\u578B.`, {
+        const g = u(`1900-01-01 ${c}`);
+        if (g != null && g.isValid())
+          return g;
+        ____ERROR____(`| \u63A7\u4EF6\u7684\u503C\u975E\u6CD5 | ${d} \u63A7\u4EF6\u7684\u503C\u5FC5\u987B\u4E3A\u65F6\u95F4\u7C7B\u578B.`, {
           formID: r,
           varName: n,
-          value: _
+          value: c
         });
         return;
       }
@@ -7232,94 +7242,94 @@ class KgVarUtil {
       case KG__VAR_CONFIG_CONTROL__CONTROL_TYPE.DATE_WEEK:
       case KG__VAR_CONFIG_CONTROL__CONTROL_TYPE.DATE_MONTH:
       case KG__VAR_CONFIG_CONTROL__CONTROL_TYPE.DATE_YEAR: {
-        if (isNil(_))
+        if (isNil(c))
           return;
-        const C = u(_);
-        if (C != null && C.isValid())
-          return C;
-        ____ERROR____(`| \u63A7\u4EF6\u7684\u503C\u975E\u6CD5 | ${m} \u63A7\u4EF6\u7684\u503C\u5FC5\u987B\u4E3A\u65E5\u671F\u7C7B\u578B.`, {
+        const g = u(c);
+        if (g != null && g.isValid())
+          return g;
+        ____ERROR____(`| \u63A7\u4EF6\u7684\u503C\u975E\u6CD5 | ${d} \u63A7\u4EF6\u7684\u503C\u5FC5\u987B\u4E3A\u65E5\u671F\u7C7B\u578B.`, {
           formID: r,
           varName: n,
-          value: _
+          value: c
         });
         return;
       }
       case KG__VAR_CONFIG_CONTROL__CONTROL_TYPE.SELECT_MULTIPLE:
       case KG__VAR_CONFIG_CONTROL__CONTROL_TYPE.CHECKBOX_GROUP: {
-        if (isNil(_))
+        if (isNil(c))
           return [];
         try {
-          const C = JSON.parse(_);
-          if (!isArray$2(C)) {
-            ____ERROR____(`| \u63A7\u4EF6\u7684\u503C\u975E\u6CD5 | ${m} \u63A7\u4EF6\u7684\u503C\u5FC5\u987B\u4E3A\u6570\u7EC4\u7C7B\u578B.`, {
+          const g = JSON.parse(c);
+          if (!isArray$2(g)) {
+            ____ERROR____(`| \u63A7\u4EF6\u7684\u503C\u975E\u6CD5 | ${d} \u63A7\u4EF6\u7684\u503C\u5FC5\u987B\u4E3A\u6570\u7EC4\u7C7B\u578B.`, {
               formID: r,
               varName: n,
-              value: _
+              value: c
             });
             return;
           }
-          const A = c.store.getVarConfigPossibility(r, n);
-          switch (A == null ? void 0 : A.val_data_type) {
+          const m = l.store.getVarConfigPossibility(r, n);
+          switch (m == null ? void 0 : m.val_data_type) {
             case KG__VAR_CONFIG_POSSIBILITY__VALUE_DATA_TYPE.NUMBER: {
-              const k = C.map((O) => Number(O));
-              if (k.some((O) => Number.isNaN(k))) {
-                ____ERROR____(`| \u63A7\u4EF6\u7684\u503C\u975E\u6CD5 | ${m} \u63A7\u4EF6\u7684\u503C\u5FC5\u987B\u4E3A number \u6570\u7EC4\u7C7B\u578B.`, {
+              const b = g.map((v) => Number(v));
+              if (b.some((v) => Number.isNaN(b))) {
+                ____ERROR____(`| \u63A7\u4EF6\u7684\u503C\u975E\u6CD5 | ${d} \u63A7\u4EF6\u7684\u503C\u5FC5\u987B\u4E3A number \u6570\u7EC4\u7C7B\u578B.`, {
                   formID: r,
                   varName: n,
-                  value: _,
-                  VarConfigPossibility: A
+                  value: c,
+                  VarConfigPossibility: m
                 });
                 return;
               }
-              return k;
+              return b;
             }
             case KG__VAR_CONFIG_POSSIBILITY__VALUE_DATA_TYPE.BOOLEAN:
-              return C.map((k) => Boolean(k));
+              return g.map((b) => Boolean(b));
             case KG__VAR_CONFIG_POSSIBILITY__VALUE_DATA_TYPE.STRING:
-              return C.map((k) => String(k));
+              return g.map((b) => String(b));
             case KG__VAR_CONFIG_POSSIBILITY__VALUE_DATA_TYPE.DEFAULT:
-              return C;
+              return g;
             default:
-              return C;
+              return g;
           }
         } catch {
-          ____ERROR____(`| \u63A7\u4EF6\u7684\u503C\u975E\u6CD5 | ${m} \u63A7\u4EF6\u7684\u503C\u5FC5\u987B\u4E3A\u6570\u7EC4\u7C7B\u578B.`, {
+          ____ERROR____(`| \u63A7\u4EF6\u7684\u503C\u975E\u6CD5 | ${d} \u63A7\u4EF6\u7684\u503C\u5FC5\u987B\u4E3A\u6570\u7EC4\u7C7B\u578B.`, {
             formID: r,
             varName: n,
-            value: _
+            value: c
           });
           return;
         }
       }
       case KG__VAR_CONFIG_CONTROL__CONTROL_TYPE.SELECT: {
-        if (isNil(_))
+        if (isNil(c))
           return;
-        const C = c.store.getVarConfigPossibility(r, n);
-        switch (C == null ? void 0 : C.val_data_type) {
+        const g = l.store.getVarConfigPossibility(r, n);
+        switch (g == null ? void 0 : g.val_data_type) {
           case KG__VAR_CONFIG_POSSIBILITY__VALUE_DATA_TYPE.NUMBER: {
-            const A = Number(_);
-            if (Number.isNaN(A)) {
-              ____ERROR____(`| \u63A7\u4EF6\u7684\u503C\u975E\u6CD5 | ${m} \u63A7\u4EF6\u7684\u503C\u5FC5\u987B\u4E3A\u6570\u5B57\u7C7B\u578B.`, {
+            const m = Number(c);
+            if (Number.isNaN(m)) {
+              ____ERROR____(`| \u63A7\u4EF6\u7684\u503C\u975E\u6CD5 | ${d} \u63A7\u4EF6\u7684\u503C\u5FC5\u987B\u4E3A\u6570\u5B57\u7C7B\u578B.`, {
                 formID: r,
                 varName: n,
-                value: _,
-                VarConfigPossibility: C
+                value: c,
+                VarConfigPossibility: g
               });
               return;
             }
-            return A;
+            return m;
           }
           case KG__VAR_CONFIG_POSSIBILITY__VALUE_DATA_TYPE.BOOLEAN:
-            return Boolean(_);
+            return Boolean(c);
           case KG__VAR_CONFIG_POSSIBILITY__VALUE_DATA_TYPE.STRING:
-            return String(_);
+            return String(c);
           case KG__VAR_CONFIG_POSSIBILITY__VALUE_DATA_TYPE.DEFAULT:
-            return _;
+            return c;
         }
         break;
       }
       default:
-        return _;
+        return c;
     }
   }
   static transformFormItemDynamicQueryOperator(a) {
@@ -7673,7 +7683,12 @@ class KgVarUtil {
             b[F] = void 0;
             break;
           }
-          let z = KgUtil.parseParamFromString(M);
+          let z = KgUtil.parseParamFromString({
+            $dayjs: o,
+            formID: u,
+            value: M,
+            varName: F
+          });
           switch (w) {
             case KG_DYNAMIC_QUERY_OPERATOR.NE: {
               z = ` AND (${R} <> N'${z}')`;
@@ -9101,10 +9116,12 @@ class AesEncryption {
     };
   }
   encryptByAES(a) {
-    return aes.exports.encrypt(a, this.key, this.getOptions).toString();
+    var r;
+    return aes.exports.encrypt(a, (r = this.key) != null ? r : "", this.getOptions).toString();
   }
   decryptByAES(a) {
-    return aes.exports.decrypt(a, this.key, this.getOptions).toString(UTF8);
+    var r;
+    return aes.exports.decrypt(a, (r = this.key) != null ? r : "", this.getOptions).toString(UTF8);
   }
 }
 function encryptByBase64(e) {
@@ -9475,8 +9492,8 @@ function onEventFactory(e, a, r) {
 const useKgAppSelectStore = defineStore("KgAppSelect", {
   state: () => ({
     currentApp: null,
-    gotoAppEventListenersMap: /* @__PURE__ */ new Map(),
-    gotoPathEventListenersMap: /* @__PURE__ */ new Map()
+    gotoAppEventListenerMap: /* @__PURE__ */ new Map(),
+    gotoPathEventListenerMap: /* @__PURE__ */ new Map()
   }),
   getters: {
     getCurrentApp() {
@@ -9487,13 +9504,13 @@ const useKgAppSelectStore = defineStore("KgAppSelect", {
     addEventListener(e, a) {
       switch (e) {
         case "gotoApp": {
-          const r = this.gotoAppEventListenersMap.get("0");
-          this.gotoAppEventListenersMap.set("0", [...r != null ? r : [], a]);
+          const r = this.gotoAppEventListenerMap.get("0");
+          this.gotoAppEventListenerMap.set("0", [...r != null ? r : [], a]);
           break;
         }
         case "gotoPath": {
-          const r = this.gotoPathEventListenersMap.get("0");
-          this.gotoPathEventListenersMap.set("0", [...r != null ? r : [], a]);
+          const r = this.gotoPathEventListenerMap.get("0");
+          this.gotoPathEventListenerMap.set("0", [...r != null ? r : [], a]);
           break;
         }
       }
@@ -9502,17 +9519,17 @@ const useKgAppSelectStore = defineStore("KgAppSelect", {
       switch (e) {
         case "gotoApp":
           if (a) {
-            const r = this.gotoAppEventListenersMap.get("0");
-            this.gotoAppEventListenersMap.set("0", without$1(r, a));
+            const r = this.gotoAppEventListenerMap.get("0");
+            this.gotoAppEventListenerMap.set("0", without$1(r, a));
           } else
-            this.gotoAppEventListenersMap.set("0", []);
+            this.gotoAppEventListenerMap.set("0", []);
           break;
         case "gotoPath":
           if (a) {
-            const r = this.gotoPathEventListenersMap.get("0");
-            this.gotoPathEventListenersMap.set("0", without$1(r, a));
+            const r = this.gotoPathEventListenerMap.get("0");
+            this.gotoPathEventListenerMap.set("0", without$1(r, a));
           } else
-            this.gotoPathEventListenersMap.set("0", []);
+            this.gotoPathEventListenerMap.set("0", []);
           break;
       }
     },
@@ -9520,10 +9537,10 @@ const useKgAppSelectStore = defineStore("KgAppSelect", {
       let r, n = Promise.resolve(!1);
       switch (e) {
         case "gotoApp":
-          r = this.gotoAppEventListenersMap.get("0");
+          r = this.gotoAppEventListenerMap.get("0");
           break;
         case "gotoPath":
-          r = this.gotoPathEventListenersMap.get("0");
+          r = this.gotoPathEventListenerMap.get("0");
           break;
       }
       if (r)
@@ -13016,7 +13033,7 @@ const getProps$L = () => ({
   name: "KgLayoutHeaderLocale",
   props: getProps$L(),
   setup(e) {
-    const a = ref([]), r = computed(() => a.value[0] ? {
+    const a = ref([]), r = computed(() => ({
       en,
       es_ES,
       fr_FR,
@@ -13024,7 +13041,7 @@ const getProps$L = () => ({
       ko_KR,
       vi_VN,
       zh_CN
-    } : ""), {
+    })), {
       changeLocale: n,
       getLocale: u
     } = useLocale();
@@ -14323,7 +14340,7 @@ function useKgFormItemSelect(e) {
     try {
       _.value = !0;
       const q = KgUtil.parseParams(b.value, null, r);
-      if (!await s.kgForm.store.emit(s.formID, "selectBeforeRequest", {
+      if (!await s.kgForm.store.emit(s.formID, "onSelectBeforeRequest", {
         context: (R = a.kgContext) != null ? R : KG_FORM_CONTEXT.SUBMIT,
         params: q,
         response: k,
@@ -15481,13 +15498,13 @@ const KgFormItem = defineComponent({
   }
 }), useKgFormStore = defineStore("KgForm", {
   state: () => ({
-    changeEventListenersMap: /* @__PURE__ */ new Map(),
-    lookupBeforeOkEventListenersMap: /* @__PURE__ */ new Map(),
-    lookupBeforeOpenEventListenersMap: /* @__PURE__ */ new Map(),
-    lookupOkEventListenersMap: /* @__PURE__ */ new Map(),
-    selectBeforeRequestEventListenersMap: /* @__PURE__ */ new Map(),
-    selectBeforeSetDatasEventListenersMap: /* @__PURE__ */ new Map(),
-    selectChangeEventListenersMap: /* @__PURE__ */ new Map()
+    changeEventListenerMap: /* @__PURE__ */ new Map(),
+    lookupBeforeOkEventListenerMap: /* @__PURE__ */ new Map(),
+    lookupBeforeOpenEventListenerMap: /* @__PURE__ */ new Map(),
+    lookupOkEventListenerMap: /* @__PURE__ */ new Map(),
+    selectBeforeRequestEventListenerMap: /* @__PURE__ */ new Map(),
+    selectBeforeSetDatasEventListenerMap: /* @__PURE__ */ new Map(),
+    selectChangeEventListenerMap: /* @__PURE__ */ new Map()
   }),
   getters: {},
   actions: {
@@ -15496,38 +15513,38 @@ const KgFormItem = defineComponent({
     addEventListener(e, a, r) {
       switch (a) {
         case "change": {
-          const n = this.changeEventListenersMap.get(e);
-          this.changeEventListenersMap.set(e, [...n != null ? n : [], r]);
+          const n = this.changeEventListenerMap.get(e);
+          this.changeEventListenerMap.set(e, [...n != null ? n : [], r]);
           break;
         }
-        case "selectBeforeRequest": {
-          const n = this.selectBeforeRequestEventListenersMap.get(e);
-          this.selectBeforeRequestEventListenersMap.set(e, [...n != null ? n : [], r]);
+        case "onSelectBeforeRequest": {
+          const n = this.selectBeforeRequestEventListenerMap.get(e);
+          this.selectBeforeRequestEventListenerMap.set(e, [...n != null ? n : [], r]);
           break;
         }
         case "selectBeforeSetDatas": {
-          const n = this.selectBeforeSetDatasEventListenersMap.get(e);
-          this.selectBeforeSetDatasEventListenersMap.set(e, [...n != null ? n : [], r]);
+          const n = this.selectBeforeSetDatasEventListenerMap.get(e);
+          this.selectBeforeSetDatasEventListenerMap.set(e, [...n != null ? n : [], r]);
           break;
         }
         case "selectChange": {
-          const n = this.selectChangeEventListenersMap.get(e);
-          this.selectChangeEventListenersMap.set(e, [...n != null ? n : [], r]);
+          const n = this.selectChangeEventListenerMap.get(e);
+          this.selectChangeEventListenerMap.set(e, [...n != null ? n : [], r]);
           break;
         }
         case "lookupBeforeOpen": {
-          const n = this.lookupBeforeOpenEventListenersMap.get(e);
-          this.lookupBeforeOpenEventListenersMap.set(e, [...n != null ? n : [], r]);
+          const n = this.lookupBeforeOpenEventListenerMap.get(e);
+          this.lookupBeforeOpenEventListenerMap.set(e, [...n != null ? n : [], r]);
           break;
         }
         case "lookupBeforeOk": {
-          const n = this.lookupBeforeOkEventListenersMap.get(e);
-          this.lookupBeforeOkEventListenersMap.set(e, [...n != null ? n : [], r]);
+          const n = this.lookupBeforeOkEventListenerMap.get(e);
+          this.lookupBeforeOkEventListenerMap.set(e, [...n != null ? n : [], r]);
           break;
         }
         case "lookupOk": {
-          const n = this.lookupOkEventListenersMap.get(e);
-          this.lookupOkEventListenersMap.set(e, [...n != null ? n : [], r]);
+          const n = this.lookupOkEventListenerMap.get(e);
+          this.lookupOkEventListenerMap.set(e, [...n != null ? n : [], r]);
           break;
         }
       }
@@ -15538,25 +15555,25 @@ const KgFormItem = defineComponent({
       let n, u = Promise.resolve(!1);
       switch (a) {
         case "change":
-          n = this.changeEventListenersMap.get(e);
+          n = this.changeEventListenerMap.get(e);
           break;
-        case "selectBeforeRequest":
-          n = this.selectBeforeRequestEventListenersMap.get(e);
+        case "onSelectBeforeRequest":
+          n = this.selectBeforeRequestEventListenerMap.get(e);
           break;
         case "selectBeforeSetDatas":
-          n = this.selectBeforeSetDatasEventListenersMap.get(e);
+          n = this.selectBeforeSetDatasEventListenerMap.get(e);
           break;
         case "selectChange":
-          n = this.selectChangeEventListenersMap.get(e);
+          n = this.selectChangeEventListenerMap.get(e);
           break;
         case "lookupBeforeOpen":
-          n = this.lookupBeforeOpenEventListenersMap.get(e);
+          n = this.lookupBeforeOpenEventListenerMap.get(e);
           break;
         case "lookupBeforeOk":
-          n = this.lookupBeforeOkEventListenersMap.get(e);
+          n = this.lookupBeforeOkEventListenerMap.get(e);
           break;
         case "lookupOk":
-          n = this.lookupOkEventListenersMap.get(e);
+          n = this.lookupOkEventListenerMap.get(e);
           break;
       }
       if (n) {
@@ -15573,52 +15590,52 @@ const KgFormItem = defineComponent({
       switch (a) {
         case "change":
           if (r) {
-            const n = this.changeEventListenersMap.get(e);
-            this.changeEventListenersMap.set(e, without$1(n, r));
+            const n = this.changeEventListenerMap.get(e);
+            this.changeEventListenerMap.set(e, without$1(n, r));
           } else
-            this.changeEventListenersMap.set(e, []);
+            this.changeEventListenerMap.set(e, []);
           break;
-        case "selectBeforeRequest":
+        case "onSelectBeforeRequest":
           if (r) {
-            const n = this.selectBeforeRequestEventListenersMap.get(e);
-            this.selectBeforeRequestEventListenersMap.set(e, without$1(n, r));
+            const n = this.selectBeforeRequestEventListenerMap.get(e);
+            this.selectBeforeRequestEventListenerMap.set(e, without$1(n, r));
           } else
-            this.selectChangeEventListenersMap.set(e, []);
+            this.selectChangeEventListenerMap.set(e, []);
           break;
         case "selectBeforeSetDatas":
           if (r) {
-            const n = this.selectBeforeSetDatasEventListenersMap.get(e);
-            this.selectBeforeSetDatasEventListenersMap.set(e, without$1(n, r));
+            const n = this.selectBeforeSetDatasEventListenerMap.get(e);
+            this.selectBeforeSetDatasEventListenerMap.set(e, without$1(n, r));
           } else
-            this.selectChangeEventListenersMap.set(e, []);
+            this.selectChangeEventListenerMap.set(e, []);
           break;
         case "selectChange":
           if (r) {
-            const n = this.selectChangeEventListenersMap.get(e);
-            this.selectChangeEventListenersMap.set(e, without$1(n, r));
+            const n = this.selectChangeEventListenerMap.get(e);
+            this.selectChangeEventListenerMap.set(e, without$1(n, r));
           } else
-            this.selectChangeEventListenersMap.set(e, []);
+            this.selectChangeEventListenerMap.set(e, []);
           break;
         case "lookupBeforeOpen":
           if (r) {
-            const n = this.lookupBeforeOpenEventListenersMap.get(e);
-            this.lookupBeforeOpenEventListenersMap.set(e, without$1(n, r));
+            const n = this.lookupBeforeOpenEventListenerMap.get(e);
+            this.lookupBeforeOpenEventListenerMap.set(e, without$1(n, r));
           } else
-            this.lookupBeforeOpenEventListenersMap.set(e, []);
+            this.lookupBeforeOpenEventListenerMap.set(e, []);
           break;
         case "lookupBeforeOk":
           if (r) {
-            const n = this.lookupBeforeOkEventListenersMap.get(e);
-            this.lookupBeforeOkEventListenersMap.set(e, without$1(n, r));
+            const n = this.lookupBeforeOkEventListenerMap.get(e);
+            this.lookupBeforeOkEventListenerMap.set(e, without$1(n, r));
           } else
-            this.lookupBeforeOkEventListenersMap.set(e, []);
+            this.lookupBeforeOkEventListenerMap.set(e, []);
           break;
         case "lookupOk":
           if (r) {
-            const n = this.lookupOkEventListenersMap.get(e);
-            this.lookupOkEventListenersMap.set(e, without$1(n, r));
+            const n = this.lookupOkEventListenerMap.get(e);
+            this.lookupOkEventListenerMap.set(e, without$1(n, r));
           } else
-            this.lookupOkEventListenersMap.set(e, []);
+            this.lookupOkEventListenerMap.set(e, []);
           break;
       }
     }
@@ -15637,7 +15654,11 @@ function useKgForm(e) {
     onLookupBeforeOk: onEventFactory(a.formID, r, "lookupBeforeOk"),
     onLookupBeforeOpen: onEventFactory(a.formID, r, "lookupBeforeOpen"),
     onLookupOk: onEventFactory(a.formID, r, "lookupOk"),
-    onSelectBeforeRequest: onEventFactory(a.formID, r, "selectBeforeRequest"),
+    onSelectBeforeRequest: onEventFactory(
+      a.formID,
+      r,
+      "onSelectBeforeRequest"
+    ),
     onSelectBeforeSetDatas: onEventFactory(
       a.formID,
       r,
@@ -15937,7 +15958,7 @@ const getProps$B = () => ({
         return new Promise((H, V) => {
           var U;
           const I = watch(s.kgSubmit.formModel, async (J) => {
-            J && Object.keys(J).length > 0 && (setTimeout(() => I()), await s.kgSubmit.store.emit(s.formID, "open", {
+            J && Object.keys(J).length > 0 && (setTimeout(() => I()), await s.kgSubmit.store.emit(s.formID, "onOpen", {
               isCopying: s.isCopying.value,
               isCreating: s.isCreating.value,
               isDeleting: s.isDeleting.value,
@@ -15955,7 +15976,7 @@ const getProps$B = () => ({
       await s.kgSubmit.store.emit(s.formID, "close", null);
     }
     async function G() {
-      s.kgButton.setCurrentButton(null);
+      await s.kgSubmit.store.emit(s.formID, "onBeforeCancel", {}) || (await s.kgButton.setCurrentButton(null), await s.kgSubmit.store.emit(s.formID, "onCancel", {}));
     }
     async function B() {
       var te, H;
@@ -17611,18 +17632,18 @@ const KG__DI__KG_VAR_CONFIG__HOST_FORM_ID = Symbol("KG__DI__KG_VAR_CONFIG__HOST_
           switch (_) {
             case "id_clm": {
               const v = n.varVariables.value.map((p) => ({
-                value: p.var_nam,
-                label: p.var_nam
+                label: p.var_nam,
+                value: p.var_nam
               }));
               return v.find((p) => p.value === "id") || v.unshift({
-                value: "id",
-                label: "id"
+                label: "id",
+                value: "id"
               }), c.value = v, !0;
             }
             case "pg_size_opt":
               return isArray$2(u.kgSubmit.formModel.value.pg_size_opts) && (c.value = u.kgSubmit.formModel.value.pg_size_opts.map((v) => ({
-                value: v,
-                label: v
+                label: String(v),
+                value: v
               })), u.kgSubmit.formModel.value.pg_size_opt || (u.kgSubmit.formModel.value.pg_size_opt = (g = (d = c.value[0]) == null ? void 0 : d.value) != null ? g : 10), c.value.map((v) => v.value).includes(u.kgSubmit.formModel.value.pg_size_opt) || (u.kgSubmit.formModel.value.pg_size_opt = (b = (m = c.value[0]) == null ? void 0 : m.value) != null ? b : 10)), !0;
           }
           break;
@@ -18317,7 +18338,7 @@ function _useTransferColumns(e, a) {
       }
     }, {
       dataIndex: "display_type",
-      width: 140,
+      width: 200,
       title: u.t("display_type").value,
       className: "input",
       customRender: ({
@@ -18328,6 +18349,7 @@ function _useTransferColumns(e, a) {
           value: (c = l.display_type) != null ? c : void 0,
           "onUpdate:value": (_) => l.display_type = _,
           allowClear: !0,
+          mode: "multiple",
           class: "kg-not-clickable"
         }, {
           default: () => {
@@ -18701,7 +18723,7 @@ const getProps$z = () => ({}), KgVarConfigModalTableVarGridMaster = defineCompon
                 class: "kg-flex-table",
                 size: "small",
                 scroll: {
-                  x: E === "left" ? "370px" : `${1552 + 32}px`,
+                  x: E === "left" ? "370px" : `${1612 + 32}px`,
                   y: "auto"
                 },
                 columns: E === "left" ? c() : _(),
@@ -19617,34 +19639,34 @@ const KG_TABLE_TD_DEFAULT_WIDTH = 120, KG_TABLE_TD_MIN_WIDTH = 80, KG_TABLE_TD_M
       var e;
       return KgUtil.tryParseJSON((e = varGridDetail.value) == null ? void 0 : e.display_type_properties);
     }), getText = computed(() => {
-      var e, a, r, n, u, s, o, l, c;
+      var e, a, r, n, u, s, o, l, c, _, d;
       if (props.kgValue === KG_TABLE_TEMP_ID)
         return "";
       let _text = props.kgValue;
-      switch ((e = varGridDetail.value) == null ? void 0 : e.display_type) {
+      switch ((r = (a = (e = varGridDetail.value) == null ? void 0 : e.display_type) == null ? void 0 : a.split(",")) == null ? void 0 : r[0]) {
         case KG__VAR_GRID_DETAIL__DISPLAY_TYPE.DESC: {
           if (!kgVar.kgTable.isShowDescription.value) {
             _text = props.kgValue;
             break;
           }
           const properties = displayTypeProperties.value;
-          if ((a = properties.description) != null && a.codeName) {
-            let codeValue = (r = properties.description) == null ? void 0 : r.codeValue;
+          if ((n = properties.description) != null && n.codeName) {
+            let codeValue = (u = properties.description) == null ? void 0 : u.codeValue;
             codeValue || (codeValue = "`${row." + props.kgVarName + "}`");
             try {
-              const row = (n = props.kgRow) != null ? n : {};
+              const row = (s = props.kgRow) != null ? s : {};
               codeValue = eval(codeValue);
             } catch {
               ____ERROR____("KgTableBodyCell.getText() | \u63CF\u8FF0\u89E3\u6790\u5931\u8D25.", {
                 VarGridDetail: varGridDetail.value
               });
             }
-            _text = ((s = kg.getDescription({
-              codeName: (u = properties.description) == null ? void 0 : u.codeName,
+            _text = ((l = kg.getDescription({
+              codeName: (o = properties.description) == null ? void 0 : o.codeName,
               codeValue
-            })) == null ? void 0 : s.shortDsc) || props.kgValue;
+            })) == null ? void 0 : l.shortDsc) || props.kgValue;
           } else
-            properties.dscFieldName ? _text = ((o = props.kgRow) == null ? void 0 : o[properties.dscFieldName]) || props.kgValue : _text = ((l = props.kgRow) == null ? void 0 : l[`${props.kgVarName}_dsc`]) || ((c = props.kgRow) == null ? void 0 : c[`${props.kgVarName}Dsc`]) || props.kgValue;
+            properties.dscFieldName ? _text = ((c = props.kgRow) == null ? void 0 : c[properties.dscFieldName]) || props.kgValue : _text = ((_ = props.kgRow) == null ? void 0 : _[`${props.kgVarName}_dsc`]) || ((d = props.kgRow) == null ? void 0 : d[`${props.kgVarName}Dsc`]) || props.kgValue;
           break;
         }
       }
@@ -19652,26 +19674,29 @@ const KG_TABLE_TD_DEFAULT_WIDTH = 120, KG_TABLE_TD_MIN_WIDTH = 80, KG_TABLE_TD_M
 `)), isNil(_text) && (_text = ""), _text;
     }), formRef = ref(null);
     function onClick(e) {
-      var a, r;
+      var a, r, n, u, s, o, l;
       if (e.detail === 1 && !(kgVar.isCreating.value || kgVar.isUpdating.value || kgVar.isCopying.value || kgVar.isDeleting.value))
         switch (props.kgContext) {
           case KG_TABLE_CELL_CONTEXT.TABLE_FILTER:
             return;
           case KG_TABLE_CELL_CONTEXT.TABLE_CELL: {
-            switch ((a = varGridDetail.value) == null ? void 0 : a.display_type) {
+            switch ((n = (r = (a = varGridDetail.value) == null ? void 0 : a.display_type) == null ? void 0 : r.split(",")) == null ? void 0 : n[0]) {
+              case KG__VAR_GRID_DETAIL__DISPLAY_TYPE.DESC: {
+                (o = (s = (u = varGridDetail.value) == null ? void 0 : u.display_type) == null ? void 0 : s.split(",")) != null && o.includes(KG__VAR_GRID_DETAIL__DISPLAY_TYPE.UPDATE_LINK) && (e.stopPropagation(), e.preventDefault(), emit("kgUpdateLinkClick"));
+                break;
+              }
               case KG__VAR_GRID_DETAIL__DISPLAY_TYPE.UPDATE_LINK:
                 e.stopPropagation(), e.preventDefault(), emit("kgUpdateLinkClick");
                 break;
-              case KG__VAR_GRID_DETAIL__DISPLAY_TYPE.ROUTE_LINK:
-                {
-                  e.stopPropagation(), e.preventDefault();
-                  const n = displayTypeProperties.value;
-                  (r = kg.router.value) == null || r.push({
-                    path: n.path,
-                    query: props.kgRow
-                  });
-                }
+              case KG__VAR_GRID_DETAIL__DISPLAY_TYPE.ROUTE_LINK: {
+                e.stopPropagation(), e.preventDefault();
+                const c = displayTypeProperties.value;
+                (l = kg.router.value) == null || l.push({
+                  path: c.path,
+                  query: props.kgRow
+                });
                 break;
+              }
             }
             break;
           }
@@ -19701,39 +19726,50 @@ const KG_TABLE_TD_DEFAULT_WIDTH = 120, KG_TABLE_TD_MIN_WIDTH = 80, KG_TABLE_TD_M
       });
     }
     function renderCell() {
-      var e, a, r, n, u, s, o, l, c;
+      var e, a, r, n, u, s, o, l, c, _, d, g, m, b;
       if (isSubmitting.value)
         return renderCellForSubmit();
-      switch ((e = varGridDetail.value) == null ? void 0 : e.display_type) {
+      switch ((r = (a = (e = varGridDetail.value) == null ? void 0 : e.display_type) == null ? void 0 : a.split(",")) == null ? void 0 : r[0]) {
         case KG__VAR_GRID_DETAIL__DISPLAY_TYPE.YN: {
-          const _ = displayTypeProperties.value;
+          const v = displayTypeProperties.value;
           return createVNode(KgYesOrNo, {
-            kgValue: isNil(props.kgValue) ? void 0 : props.kgValue === ((a = _.yValue) != null ? a : 1),
-            kgNilAsFalse: _.nilAsFalse
+            kgValue: isNil(props.kgValue) ? void 0 : props.kgValue === ((n = v.yValue) != null ? n : 1),
+            kgNilAsFalse: v.nilAsFalse
           }, null);
         }
         case KG__VAR_GRID_DETAIL__DISPLAY_TYPE.DESC: {
-          const _ = displayTypeProperties.value;
-          if (_.isTag) {
-            const d = (r = _.tagColors) == null ? void 0 : r.find((g) => g.value === props.kgValue);
+          const v = displayTypeProperties.value;
+          if (v.isTag) {
+            const p = (u = v.tagColors) == null ? void 0 : u.find((E) => E.value === props.kgValue);
             return isNil(getText.value) || !String(getText.value).trim() ? renderText() : createVNode(Tag, {
-              color: (n = d == null ? void 0 : d.color) != null ? n : "default"
+              color: (s = p == null ? void 0 : p.color) != null ? s : "default"
             }, {
               default: () => [getText.value]
             });
-          } else
+          } else if ((c = (l = (o = varGridDetail.value) == null ? void 0 : o.display_type) == null ? void 0 : l.split(",")) != null && c.includes(KG__VAR_GRID_DETAIL__DISPLAY_TYPE.UPDATE_LINK))
+            switch (props.kgContext) {
+              case KG_TABLE_CELL_CONTEXT.TABLE_FILTER:
+                return renderText({
+                  isUpdateLink: !1
+                });
+              case KG_TABLE_CELL_CONTEXT.TABLE_CELL:
+                return renderText({
+                  isUpdateLink: !0
+                });
+            }
+          else
             return renderText();
         }
         case KG__VAR_GRID_DETAIL__DISPLAY_TYPE.PROGRESS: {
-          const _ = displayTypeProperties.value, d = (s = (u = props.kgRow) == null ? void 0 : u[_.leftColumn]) != null ? s : 0;
+          const v = displayTypeProperties.value, p = (d = (_ = props.kgRow) == null ? void 0 : _[v.leftColumn]) != null ? d : 0;
           switch (props.kgContext) {
             case KG_TABLE_CELL_CONTEXT.TABLE_FILTER:
-              return d;
+              return p;
             case KG_TABLE_CELL_CONTEXT.TABLE_CELL:
               return createVNode(KgProgressA, {
-                kgTextWidth: _.textWidth,
-                kgLeft: d,
-                kgRight: (o = props.kgRow) == null ? void 0 : o[_.rightColumn]
+                kgTextWidth: v.textWidth,
+                kgLeft: p,
+                kgRight: (g = props.kgRow) == null ? void 0 : g[v.rightColumn]
               }, null);
           }
           break;
@@ -19767,17 +19803,17 @@ const KG_TABLE_TD_DEFAULT_WIDTH = 120, KG_TABLE_TD_MIN_WIDTH = 80, KG_TABLE_TD_M
           break;
         }
         case KG__VAR_GRID_DETAIL__DISPLAY_TYPE.IMAGE: {
-          const _ = displayTypeProperties.value, d = (l = _.width) != null ? l : 29, g = (c = _.height) != null ? c : 29;
+          const v = displayTypeProperties.value, p = (m = v.width) != null ? m : 29, E = (b = v.height) != null ? b : 29;
           switch (props.kgContext) {
             case KG_TABLE_CELL_CONTEXT.TABLE_FILTER:
               return props.kgValue;
             case KG_TABLE_CELL_CONTEXT.TABLE_CELL:
               return createVNode(KgImage, {
                 src: props.kgValue,
-                width: d,
-                height: g,
-                onClick: (m) => {
-                  m.preventDefault(), m.stopPropagation();
+                width: p,
+                height: E,
+                onClick: (T) => {
+                  T.preventDefault(), T.stopPropagation();
                 }
               }, null);
           }
@@ -20131,13 +20167,13 @@ function _useDatas() {
     }
     return a.value.forEach((s) => {
       Object.keys(s).forEach((o) => {
-        var c;
+        var c, _, d;
         const l = kgVar.kgTable.getVarGridDetail({
           varName: o
         });
-        switch (l == null ? void 0 : l.display_type) {
+        switch ((_ = (c = l == null ? void 0 : l.display_type) == null ? void 0 : c.split(",")) == null ? void 0 : _[0]) {
           case KG__VAR_GRID_DETAIL__DISPLAY_TYPE.PROGRESS: {
-            s[o] = (c = s[o]) != null ? c : 0;
+            s[o] = (d = s[o]) != null ? d : 0;
             break;
           }
           default: {
@@ -20780,18 +20816,18 @@ const KgTable$1 = "", getProps$r = () => ({
   }
 }), useKgTableStore = defineStore("KgTable", {
   state: () => ({
-    afterRequestEventListenersMap: /* @__PURE__ */ new Map(),
-    beforeParseParameterEventListenersMap: /* @__PURE__ */ new Map(),
-    beforeRequestEventListenersMap: /* @__PURE__ */ new Map(),
-    beforeSetDatasEventListenersMap: /* @__PURE__ */ new Map(),
+    afterRequestEventListenerMap: /* @__PURE__ */ new Map(),
+    beforeParseParameterEventListenerMap: /* @__PURE__ */ new Map(),
+    beforeRequestEventListenerMap: /* @__PURE__ */ new Map(),
+    beforeSetDatasEventListenerMap: /* @__PURE__ */ new Map(),
     datasMap: /* @__PURE__ */ new Map(),
     isReadyMap: /* @__PURE__ */ new Map(),
     isRequestedMap: /* @__PURE__ */ new Map(),
     isRequestingMap: /* @__PURE__ */ new Map(),
     isShowDescriptionMap: /* @__PURE__ */ new Map(),
-    onReadyEventListenersMap: /* @__PURE__ */ new Map(),
+    onReadyEventListenerMap: /* @__PURE__ */ new Map(),
     requestParamsMap: /* @__PURE__ */ new Map(),
-    rowDoubleClickEventListenersMap: /* @__PURE__ */ new Map(),
+    rowDoubleClickEventListenerMap: /* @__PURE__ */ new Map(),
     rowHeightMap: /* @__PURE__ */ new Map(),
     selectedRowKeysMap: /* @__PURE__ */ new Map(),
     selectedRowsMap: /* @__PURE__ */ new Map(),
@@ -20897,33 +20933,33 @@ const KgTable$1 = "", getProps$r = () => ({
       }
       switch (a) {
         case "ready": {
-          const n = this.onReadyEventListenersMap.get(e);
-          this.onReadyEventListenersMap.set(e, [...n != null ? n : [], r]);
+          const n = this.onReadyEventListenerMap.get(e);
+          this.onReadyEventListenerMap.set(e, [...n != null ? n : [], r]);
           break;
         }
         case "rowDoubleClick": {
-          const n = this.rowDoubleClickEventListenersMap.get(e);
-          this.rowDoubleClickEventListenersMap.set(e, [...n != null ? n : [], r]);
+          const n = this.rowDoubleClickEventListenerMap.get(e);
+          this.rowDoubleClickEventListenerMap.set(e, [...n != null ? n : [], r]);
           break;
         }
         case "beforeParseRequestParameter": {
-          const n = this.beforeParseParameterEventListenersMap.get(e);
-          this.beforeParseParameterEventListenersMap.set(e, [...n != null ? n : [], r]);
+          const n = this.beforeParseParameterEventListenerMap.get(e);
+          this.beforeParseParameterEventListenerMap.set(e, [...n != null ? n : [], r]);
           break;
         }
         case "beforeRequest": {
-          const n = this.beforeRequestEventListenersMap.get(e);
-          this.beforeRequestEventListenersMap.set(e, [...n != null ? n : [], r]);
+          const n = this.beforeRequestEventListenerMap.get(e);
+          this.beforeRequestEventListenerMap.set(e, [...n != null ? n : [], r]);
           break;
         }
         case "beforeSetDatas": {
-          const n = this.beforeSetDatasEventListenersMap.get(e);
-          this.beforeSetDatasEventListenersMap.set(e, [...n != null ? n : [], r]);
+          const n = this.beforeSetDatasEventListenerMap.get(e);
+          this.beforeSetDatasEventListenerMap.set(e, [...n != null ? n : [], r]);
           break;
         }
         case "afterRequest": {
-          const n = this.afterRequestEventListenersMap.get(e);
-          this.afterRequestEventListenersMap.set(e, [...n != null ? n : [], r]);
+          const n = this.afterRequestEventListenerMap.get(e);
+          this.afterRequestEventListenerMap.set(e, [...n != null ? n : [], r]);
           break;
         }
       }
@@ -20943,22 +20979,22 @@ const KgTable$1 = "", getProps$r = () => ({
       let n, u = Promise.resolve(!1);
       switch (a) {
         case "ready":
-          n = this.onReadyEventListenersMap.get(e);
+          n = this.onReadyEventListenerMap.get(e);
           break;
         case "rowDoubleClick":
-          n = this.rowDoubleClickEventListenersMap.get(e);
+          n = this.rowDoubleClickEventListenerMap.get(e);
           break;
         case "beforeRequest":
-          n = this.beforeRequestEventListenersMap.get(e);
+          n = this.beforeRequestEventListenerMap.get(e);
           break;
         case "beforeParseRequestParameter":
-          n = this.beforeParseParameterEventListenersMap.get(e);
+          n = this.beforeParseParameterEventListenerMap.get(e);
           break;
         case "beforeSetDatas":
-          n = this.beforeSetDatasEventListenersMap.get(e);
+          n = this.beforeSetDatasEventListenerMap.get(e);
           break;
         case "afterRequest":
-          n = this.afterRequestEventListenersMap.get(e);
+          n = this.afterRequestEventListenerMap.get(e);
           break;
       }
       if (!n)
@@ -21040,45 +21076,45 @@ const KgTable$1 = "", getProps$r = () => ({
       switch (a) {
         case "ready":
           if (r) {
-            const n = this.onReadyEventListenersMap.get(e);
-            this.onReadyEventListenersMap.set(e, without$1(n, r));
+            const n = this.onReadyEventListenerMap.get(e);
+            this.onReadyEventListenerMap.set(e, without$1(n, r));
           } else
-            this.onReadyEventListenersMap.set(e, []);
+            this.onReadyEventListenerMap.set(e, []);
           break;
         case "rowDoubleClick":
           if (r) {
-            const n = this.rowDoubleClickEventListenersMap.get(e);
-            this.rowDoubleClickEventListenersMap.set(e, without$1(n, r));
+            const n = this.rowDoubleClickEventListenerMap.get(e);
+            this.rowDoubleClickEventListenerMap.set(e, without$1(n, r));
           } else
-            this.rowDoubleClickEventListenersMap.set(e, []);
+            this.rowDoubleClickEventListenerMap.set(e, []);
           break;
         case "beforeParseRequestParameter":
           if (r) {
-            const n = this.beforeParseParameterEventListenersMap.get(e);
-            this.beforeParseParameterEventListenersMap.set(e, without$1(n, r));
+            const n = this.beforeParseParameterEventListenerMap.get(e);
+            this.beforeParseParameterEventListenerMap.set(e, without$1(n, r));
           } else
-            this.beforeParseParameterEventListenersMap.set(e, []);
+            this.beforeParseParameterEventListenerMap.set(e, []);
           break;
         case "beforeRequest":
           if (r) {
-            const n = this.beforeRequestEventListenersMap.get(e);
-            this.beforeRequestEventListenersMap.set(e, without$1(n, r));
+            const n = this.beforeRequestEventListenerMap.get(e);
+            this.beforeRequestEventListenerMap.set(e, without$1(n, r));
           } else
-            this.beforeRequestEventListenersMap.set(e, []);
+            this.beforeRequestEventListenerMap.set(e, []);
           break;
         case "beforeSetDatas":
           if (r) {
-            const n = this.beforeSetDatasEventListenersMap.get(e);
-            this.beforeSetDatasEventListenersMap.set(e, without$1(n, r));
+            const n = this.beforeSetDatasEventListenerMap.get(e);
+            this.beforeSetDatasEventListenerMap.set(e, without$1(n, r));
           } else
-            this.beforeSetDatasEventListenersMap.set(e, []);
+            this.beforeSetDatasEventListenerMap.set(e, []);
           break;
         case "afterRequest":
           if (r) {
-            const n = this.afterRequestEventListenersMap.get(e);
-            this.afterRequestEventListenersMap.set(e, without$1(n, r));
+            const n = this.afterRequestEventListenerMap.get(e);
+            this.afterRequestEventListenerMap.set(e, without$1(n, r));
           } else
-            this.afterRequestEventListenersMap.set(e, []);
+            this.afterRequestEventListenerMap.set(e, []);
           break;
       }
     },
@@ -21515,54 +21551,56 @@ const useKgSubmitStore = defineStore("KgSubmit", {
   actions: {
     addEventListener(e, a, r) {
       switch (a) {
-        case "beforeOpen":
-          {
-            const n = this.beforeOpenEventListenersMap.get(e);
-            this.beforeOpenEventListenersMap.set(e, [...n != null ? n : [], r]);
-          }
+        case "beforeOpen": {
+          const n = this.beforeOpenEventListenerMap.get(e);
+          this.beforeOpenEventListenerMap.set(e, [...n != null ? n : [], r]);
           break;
-        case "open":
-          {
-            const n = this.openEventListenersMap.get(e);
-            this.openEventListenersMap.set(e, [...n != null ? n : [], r]);
-          }
+        }
+        case "onOpen": {
+          const n = this.openEventListenerMap.get(e);
+          this.openEventListenerMap.set(e, [...n != null ? n : [], r]);
           break;
-        case "beforeOk":
-          {
-            const n = this.beforeOkEventListenersMap.get(e);
-            this.beforeOkEventListenersMap.set(e, [...n != null ? n : [], r]);
-          }
+        }
+        case "beforeOk": {
+          const n = this.beforeOkEventListenerMap.get(e);
+          this.beforeOkEventListenerMap.set(e, [...n != null ? n : [], r]);
           break;
-        case "afterValidate":
-          {
-            const n = this.afterValidateEventListenersMap.get(e);
-            this.afterValidateEventListenersMap.set(e, [...n != null ? n : [], r]);
-          }
+        }
+        case "afterValidate": {
+          const n = this.afterValidateEventListenerMap.get(e);
+          this.afterValidateEventListenerMap.set(e, [...n != null ? n : [], r]);
           break;
-        case "beforeRequest":
-          {
-            const n = this.beforeRequestEventListenersMap.get(e);
-            this.beforeRequestEventListenersMap.set(e, [...n != null ? n : [], r]);
-          }
+        }
+        case "beforeRequest": {
+          const n = this.beforeRequestEventListenerMap.get(e);
+          this.beforeRequestEventListenerMap.set(e, [...n != null ? n : [], r]);
           break;
-        case "ok":
-          {
-            const n = this.okEventListenersMap.get(e);
-            this.okEventListenersMap.set(e, [...n != null ? n : [], r]);
-          }
+        }
+        case "ok": {
+          const n = this.okEventListenerMap.get(e);
+          this.okEventListenerMap.set(e, [...n != null ? n : [], r]);
           break;
-        case "error":
-          {
-            const n = this.errorEventListenersMap.get(e);
-            this.errorEventListenersMap.set(e, [...n != null ? n : [], r]);
-          }
+        }
+        case "onBeforeCancel": {
+          const n = this.onBeforeCancelEventListenerMap.get(e);
+          this.onBeforeCancelEventListenerMap.set(e, [...n != null ? n : [], r]);
           break;
-        case "close":
-          {
-            const n = this.closeEventListenersMap.get(e);
-            this.closeEventListenersMap.set(e, [...n != null ? n : [], r]);
-          }
+        }
+        case "onCancel": {
+          const n = this.onCancelEventListenerMap.get(e);
+          this.onCancelEventListenerMap.set(e, [...n != null ? n : [], r]);
+          break;
+        }
+        case "error": {
+          const n = this.errorEventListenerMap.get(e);
+          this.errorEventListenerMap.set(e, [...n != null ? n : [], r]);
           break;
+        }
+        case "close": {
+          const n = this.closeEventListenerMap.get(e);
+          this.closeEventListenerMap.set(e, [...n != null ? n : [], r]);
+          break;
+        }
       }
     },
     createVarSubmitDetail(e, a) {
@@ -21591,28 +21629,34 @@ const useKgSubmitStore = defineStore("KgSubmit", {
       let n, u = Promise.resolve(!1);
       switch (a) {
         case "beforeOpen":
-          n = this.beforeOpenEventListenersMap.get(e);
+          n = this.beforeOpenEventListenerMap.get(e);
           break;
-        case "open":
-          n = this.openEventListenersMap.get(e);
+        case "onOpen":
+          n = this.openEventListenerMap.get(e);
           break;
         case "beforeOk":
-          n = this.beforeOkEventListenersMap.get(e);
+          n = this.beforeOkEventListenerMap.get(e);
           break;
         case "afterValidate":
-          n = this.afterValidateEventListenersMap.get(e);
+          n = this.afterValidateEventListenerMap.get(e);
           break;
         case "beforeRequest":
-          n = this.beforeRequestEventListenersMap.get(e);
+          n = this.beforeRequestEventListenerMap.get(e);
           break;
         case "ok":
-          n = this.okEventListenersMap.get(e);
+          n = this.okEventListenerMap.get(e);
+          break;
+        case "onBeforeCancel":
+          n = this.onBeforeCancelEventListenerMap.get(e);
+          break;
+        case "onCancel":
+          n = this.onCancelEventListenerMap.get(e);
           break;
         case "error":
-          n = this.errorEventListenersMap.get(e);
+          n = this.errorEventListenerMap.get(e);
           break;
         case "close":
-          n = this.closeEventListenersMap.get(e);
+          n = this.closeEventListenerMap.get(e);
           break;
       }
       if (n) {
@@ -21662,59 +21706,73 @@ const useKgSubmitStore = defineStore("KgSubmit", {
       switch (a) {
         case "beforeOpen":
           if (r) {
-            const n = this.beforeOpenEventListenersMap.get(e);
-            this.beforeOpenEventListenersMap.set(e, without$1(n, r));
+            const n = this.beforeOpenEventListenerMap.get(e);
+            this.beforeOpenEventListenerMap.set(e, without$1(n, r));
           } else
-            this.beforeOpenEventListenersMap.set(e, []);
+            this.beforeOpenEventListenerMap.set(e, []);
           break;
-        case "open":
+        case "onOpen":
           if (r) {
-            const n = this.openEventListenersMap.get(e);
-            this.openEventListenersMap.set(e, without$1(n, r));
+            const n = this.openEventListenerMap.get(e);
+            this.openEventListenerMap.set(e, without$1(n, r));
           } else
-            this.openEventListenersMap.set(e, []);
+            this.openEventListenerMap.set(e, []);
           break;
         case "beforeOk":
           if (r) {
-            const n = this.beforeOkEventListenersMap.get(e);
-            this.beforeOkEventListenersMap.set(e, without$1(n, r));
+            const n = this.beforeOkEventListenerMap.get(e);
+            this.beforeOkEventListenerMap.set(e, without$1(n, r));
           } else
-            this.beforeOkEventListenersMap.set(e, []);
+            this.beforeOkEventListenerMap.set(e, []);
           break;
         case "afterValidate":
           if (r) {
-            const n = this.afterValidateEventListenersMap.get(e);
-            this.afterValidateEventListenersMap.set(e, without$1(n, r));
+            const n = this.afterValidateEventListenerMap.get(e);
+            this.afterValidateEventListenerMap.set(e, without$1(n, r));
           } else
-            this.afterValidateEventListenersMap.set(e, []);
+            this.afterValidateEventListenerMap.set(e, []);
           break;
         case "beforeRequest":
           if (r) {
-            const n = this.beforeRequestEventListenersMap.get(e);
-            this.beforeRequestEventListenersMap.set(e, without$1(n, r));
+            const n = this.beforeRequestEventListenerMap.get(e);
+            this.beforeRequestEventListenerMap.set(e, without$1(n, r));
           } else
-            this.beforeRequestEventListenersMap.set(e, []);
+            this.beforeRequestEventListenerMap.set(e, []);
           break;
         case "ok":
           if (r) {
-            const n = this.okEventListenersMap.get(e);
-            this.okEventListenersMap.set(e, without$1(n, r));
+            const n = this.okEventListenerMap.get(e);
+            this.okEventListenerMap.set(e, without$1(n, r));
+          } else
+            this.okEventListenerMap.set(e, []);
+          break;
+        case "onBeforeCancel":
+          if (r) {
+            const n = this.onBeforeCancelEventListenerMap.get(e);
+            this.onBeforeCancelEventListenerMap.set(e, without$1(n, r));
+          } else
+            this.onBeforeCancelEventListenerMap.set(e, []);
+          break;
+        case "onCancel":
+          if (r) {
+            const n = this.onCancelEventListenerMap.get(e);
+            this.onCancelEventListenerMap.set(e, without$1(n, r));
           } else
-            this.okEventListenersMap.set(e, []);
+            this.onCancelEventListenerMap.set(e, []);
           break;
         case "error":
           if (r) {
-            const n = this.errorEventListenersMap.get(e);
-            this.errorEventListenersMap.set(e, without$1(n, r));
+            const n = this.errorEventListenerMap.get(e);
+            this.errorEventListenerMap.set(e, without$1(n, r));
           } else
-            this.errorEventListenersMap.set(e, []);
+            this.errorEventListenerMap.set(e, []);
           break;
         case "close":
           if (r) {
-            const n = this.closeEventListenersMap.get(e);
-            this.closeEventListenersMap.set(e, without$1(n, r));
+            const n = this.closeEventListenerMap.get(e);
+            this.closeEventListenerMap.set(e, without$1(n, r));
           } else
-            this.closeEventListenersMap.set(e, []);
+            this.closeEventListenerMap.set(e, []);
           break;
       }
     },
@@ -21849,18 +21907,20 @@ const useKgSubmitStore = defineStore("KgSubmit", {
     }
   },
   state: () => ({
-    afterValidateEventListenersMap: /* @__PURE__ */ new Map(),
-    beforeOkEventListenersMap: /* @__PURE__ */ new Map(),
-    beforeOpenEventListenersMap: /* @__PURE__ */ new Map(),
-    beforeRequestEventListenersMap: /* @__PURE__ */ new Map(),
-    closeEventListenersMap: /* @__PURE__ */ new Map(),
-    errorEventListenersMap: /* @__PURE__ */ new Map(),
+    afterValidateEventListenerMap: /* @__PURE__ */ new Map(),
+    beforeOkEventListenerMap: /* @__PURE__ */ new Map(),
+    beforeOpenEventListenerMap: /* @__PURE__ */ new Map(),
+    beforeRequestEventListenerMap: /* @__PURE__ */ new Map(),
+    closeEventListenerMap: /* @__PURE__ */ new Map(),
+    errorEventListenerMap: /* @__PURE__ */ new Map(),
     formModelMap: /* @__PURE__ */ new Map(),
     formRefMap: /* @__PURE__ */ new Map(),
     formRulesMap: /* @__PURE__ */ new Map(),
     isLoadingMap: /* @__PURE__ */ new Map(),
-    okEventListenersMap: /* @__PURE__ */ new Map(),
-    openEventListenersMap: /* @__PURE__ */ new Map()
+    okEventListenerMap: /* @__PURE__ */ new Map(),
+    onBeforeCancelEventListenerMap: /* @__PURE__ */ new Map(),
+    onCancelEventListenerMap: /* @__PURE__ */ new Map(),
+    openEventListenerMap: /* @__PURE__ */ new Map()
   })
 });
 function useKgSubmit(e) {
@@ -21941,13 +22001,15 @@ function useKgSubmit(e) {
       return (n = r.getFormModel(a.formID)) != null ? n : {};
     }),
     onAfterValidate: onEventFactory(a.formID, r, "afterValidate"),
+    onBeforeCancel: onEventFactory(a.formID, r, "onBeforeCancel"),
     onBeforeOk: onEventFactory(a.formID, r, "beforeOk"),
     onBeforeOpen: onEventFactory(a.formID, r, "beforeOpen"),
     onBeforeRequest: onEventFactory(a.formID, r, "beforeRequest"),
+    onCancel: onEventFactory(a.formID, r, "onCancel"),
     onClose: onEventFactory(a.formID, r, "close"),
     onError: onEventFactory(a.formID, r, "error"),
     onOk: onEventFactory(a.formID, r, "ok"),
-    onOpen: onEventFactory(a.formID, r, "open"),
+    onOpen: onEventFactory(a.formID, r, "onOpen"),
     patchVarSubmitDetail(n) {
       return r.patchVarSubmitDetail(a.formID, n);
     },
@@ -25859,7 +25921,7 @@ const KgVarConfig$1 = "", KgVarConfig = defineComponent({
     isRetrievingVarProfileMasterMap: /* @__PURE__ */ new Map(),
     isUpdatingRequestingMap: /* @__PURE__ */ new Map(),
     levelMap: /* @__PURE__ */ new Map(),
-    onRetrieveEventListenersMap: /* @__PURE__ */ new Map(),
+    onRetrieveEventListenerMap: /* @__PURE__ */ new Map(),
     varButtonConfigMap: /* @__PURE__ */ new Map(),
     varButtonMap: /* @__PURE__ */ new Map(),
     varChildDetailMap: /* @__PURE__ */ new Map(),
@@ -26203,8 +26265,8 @@ const KgVarConfig$1 = "", KgVarConfig = defineComponent({
       }
       switch (a) {
         case "retrieve": {
-          const n = this.onRetrieveEventListenersMap.get(e);
-          this.onRetrieveEventListenersMap.set(e, [...n != null ? n : [], r]);
+          const n = this.onRetrieveEventListenerMap.get(e);
+          this.onRetrieveEventListenerMap.set(e, [...n != null ? n : [], r]);
           break;
         }
       }
@@ -26259,7 +26321,7 @@ const KgVarConfig$1 = "", KgVarConfig = defineComponent({
       switch (a) {
         case "retrieve":
           {
-            const n = this.onRetrieveEventListenersMap.get(e);
+            const n = this.onRetrieveEventListenerMap.get(e);
             n && n.forEach((u) => u());
           }
           break;
@@ -26332,10 +26394,10 @@ const KgVarConfig$1 = "", KgVarConfig = defineComponent({
       switch (a) {
         case "retrieve":
           if (r) {
-            const n = this.onRetrieveEventListenersMap.get(e);
-            this.onRetrieveEventListenersMap.set(e, without$1(n, r));
+            const n = this.onRetrieveEventListenerMap.get(e);
+            this.onRetrieveEventListenerMap.set(e, without$1(n, r));
           } else
-            this.onRetrieveEventListenersMap.set(e, []);
+            this.onRetrieveEventListenerMap.set(e, []);
           break;
       }
     },
@@ -27205,82 +27267,82 @@ const KgVar = defineComponent({
   name: "KgButtonOther",
   props: getProps$d(),
   setup(e) {
-    const a = useKg(), r = useKgVar();
-    r.kgButton.store.$onAction(async ({
-      name: c,
-      args: _
+    const a = inject("$dayjs", dayjs), r = useKg(), n = useKgVar();
+    n.kgButton.store.$onAction(async ({
+      name: _,
+      args: d
     }) => {
-      switch (c) {
+      switch (_) {
         case "click":
-          _[0] === r.formID && _[2] === e.kgVarName && await s();
+          d[0] === n.formID && d[2] === e.kgVarName && await o();
           break;
       }
     });
-    const n = computed(() => r.store.getVarButton(r.formID, e.kgVarName)), u = computed(() => {
-      var c, _, d, g, m, b, v, p;
-      return isNil(e.kgDisabled) ? !!(e.kgLoading || r.kgTable.isRetrieving.value || ((c = n.value) == null ? void 0 : c.dis_no_select_flg) === 1 && ((d = (_ = r.kgTable.selectedRows.value) == null ? void 0 : _.length) != null ? d : 0) === 0 || ((g = n.value) == null ? void 0 : g.dis_mult_select_flg) === 1 && ((b = (m = r.kgTable.selectedRows.value) == null ? void 0 : m.length) != null ? b : 0) > 1 || KgAuthUtil.getPermissionType((v = n.value) == null ? void 0 : v.permission_code) === 2 && !a.p((p = n.value) == null ? void 0 : p.permission_code) || r.isCreating.value || r.isUpdating.value || r.isCopying.value || r.isDeleting.value) : e.kgDisabled;
+    const u = computed(() => n.store.getVarButton(n.formID, e.kgVarName)), s = computed(() => {
+      var _, d, g, m, b, v, p, E;
+      return isNil(e.kgDisabled) ? !!(e.kgLoading || n.kgTable.isRetrieving.value || ((_ = u.value) == null ? void 0 : _.dis_no_select_flg) === 1 && ((g = (d = n.kgTable.selectedRows.value) == null ? void 0 : d.length) != null ? g : 0) === 0 || ((m = u.value) == null ? void 0 : m.dis_mult_select_flg) === 1 && ((v = (b = n.kgTable.selectedRows.value) == null ? void 0 : b.length) != null ? v : 0) > 1 || KgAuthUtil.getPermissionType((p = u.value) == null ? void 0 : p.permission_code) === 2 && !r.p((E = u.value) == null ? void 0 : E.permission_code) || n.isCreating.value || n.isUpdating.value || n.isCopying.value || n.isDeleting.value) : e.kgDisabled;
     });
-    async function s() {
-      var g, m, b;
+    async function o() {
+      var m, b, v;
       if (e.onKgClick && await e.onKgClick()) {
-        r.kgButton.setIsClickIntercepted({
+        n.kgButton.setIsClickIntercepted({
           varName: e.kgVarName,
           isIntercepted: !0
         });
         return;
       }
-      if (r.kgButton.setIsClickIntercepted({
+      if (n.kgButton.setIsClickIntercepted({
         varName: e.kgVarName,
         isIntercepted: !1
-      }), r.kgSubmit.getVarSubmitConfig({
+      }), n.kgSubmit.getVarSubmitConfig({
         buttonVarName: e.kgVarName
       })) {
-        r.kgButton.setCurrentButton({
+        n.kgButton.setCurrentButton({
           varName: e.kgVarName
         });
         return;
       }
-      const c = (g = e.kgButton) == null ? void 0 : g.cmd;
-      if (!c) {
-        message.error(a.t("kg.KgButton.noApiUrl"));
+      const _ = (m = e.kgButton) == null ? void 0 : m.cmd;
+      if (!_) {
+        message.error(r.t("kg.KgButton.noApiUrl"));
         return;
       }
-      let _ = null;
-      const d = async () => {
-        var p, E, T, C, A, k, O, D, y, F, L;
-        _ == null || _.showLoading(), r.store.setIsOtherRequesting(r.formID, !0);
-        const v = r.kgTable.selectedRows.value;
+      let d = null;
+      const g = async () => {
+        var E, T, C, A, k, O, D, y, F, L, R;
+        d == null || d.showLoading(), n.store.setIsOtherRequesting(n.formID, !0);
+        const p = n.kgTable.selectedRows.value;
         try {
-          const R = KgVarUtil.parseRequestParamsToJSON((E = (p = e.kgButton) == null ? void 0 : p.cmd_prm) != null ? E : ""), M = (C = (T = e.kgButton) == null ? void 0 : T.cmd_method) != null ? C : "POST", w = await httpClient().request({
-            url: c,
-            method: M,
-            params: R,
-            data: v != null ? v : [],
+          const M = KgUtil.parseParams(KgVarUtil.parseRequestParamsToJSON((T = (E = e.kgButton) == null ? void 0 : E.cmd_prm) != null ? T : ""), n.formID, a), w = (A = (C = e.kgButton) == null ? void 0 : C.cmd_method) != null ? A : "POST", K = await httpClient().request({
+            url: _,
+            method: w,
+            params: M,
+            data: p != null ? p : [],
             headers: {
-              [KG_HTTP_HEADERS.KG_FORM_ID]: r.formID,
-              [KG_HTTP_HEADERS.KG_BUTTON_VAR_NAME]: (k = (A = e.kgButton) == null ? void 0 : A.var_nam) != null ? k : ""
+              [KG_HTTP_HEADERS.KG_FORM_ID]: n.formID,
+              [KG_HTTP_HEADERS.KG_BUTTON_VAR_NAME]: (O = (k = e.kgButton) == null ? void 0 : k.var_nam) != null ? O : ""
             }
           });
-          ((O = e.kgButton) == null ? void 0 : O.reload_all_after_done_flg) === 1 ? (((D = e.kgButton) == null ? void 0 : D.show_success_message_flg) !== 0 && message.success(a.t("kg.executeSuccess")), r.kgSearch.search({
-            isPreserveSelectedRows: ((y = e.kgButton) == null ? void 0 : y.re_select_after_reload_flg) !== 0,
-            isSearchFirstPage: ((F = e.kgButton) == null ? void 0 : F.re_select_after_reload_flg) === 0
-          })) : ((L = e.kgButton) == null ? void 0 : L.show_success_message_flg) !== 0 && message.success(a.t("kg.executeSuccess"));
-        } catch (R) {
-          console.error(R);
+          ((D = e.kgButton) == null ? void 0 : D.reload_all_after_done_flg) === 1 ? (((y = e.kgButton) == null ? void 0 : y.show_success_message_flg) !== 0 && message.success(r.t("kg.executeSuccess")), n.kgSearch.search({
+            isPreserveSelectedRows: ((F = e.kgButton) == null ? void 0 : F.re_select_after_reload_flg) !== 0,
+            isSearchFirstPage: ((L = e.kgButton) == null ? void 0 : L.re_select_after_reload_flg) === 0
+          })) : ((R = e.kgButton) == null ? void 0 : R.show_success_message_flg) !== 0 && message.success(r.t("kg.executeSuccess"));
+        } catch (M) {
+          console.error(M);
         } finally {
-          r.store.setIsOtherRequesting(r.formID, !1), _ == null || _.hideLoading();
+          n.store.setIsOtherRequesting(n.formID, !1), d == null || d.hideLoading();
         }
       };
-      if (((m = e.kgButton) == null ? void 0 : m.show_modal_flg) === 1) {
-        const v = KgUtil.tryParseJSON((b = e.kgButton) == null ? void 0 : b.modal_props);
-        typeof v.content == "string" && (v.content = r.t(v.content).value), _ = KgUtil.confirm({
-          onOk: () => d(),
-          ...v
+      if (((b = e.kgButton) == null ? void 0 : b.show_modal_flg) === 1) {
+        const p = KgUtil.tryParseJSON((v = e.kgButton) == null ? void 0 : v.modal_props);
+        typeof p.content == "string" && (p.content = n.t(p.content).value), d = KgUtil.confirm({
+          onOk: () => g(),
+          ...p
         });
       } else
-        d();
+        g();
     }
-    function o() {
+    function l() {
       return e.kgLoading ? createVNode(LoadingOutlined$1, null, null) : e.kgIcon ? createVNode("span", {
         class: "anticon"
       }, [createVNode(Icon, {
@@ -27291,24 +27353,24 @@ const KgVar = defineComponent({
         icon: "ant-design:info-circle-outlined"
       }, null)]);
     }
-    function l() {
+    function c() {
       return e.kgText ? e.kgText : e.kgVarName;
     }
     return () => {
-      var c, _, d, g, m, b;
+      var _, d, g, m, b, v;
       return createVNode(Button, {
-        "kg-id": (c = n.value) == null ? void 0 : c.id,
-        "kg-form_id": (_ = n.value) == null ? void 0 : _.frm_id,
-        "kg-var_name": (d = n.value) == null ? void 0 : d.var_nam,
-        "kg-cmd": (g = n.value) == null ? void 0 : g.cmd,
-        "kg-permission": (b = (m = n.value) == null ? void 0 : m.permission_code) != null ? b : "",
+        "kg-id": (_ = u.value) == null ? void 0 : _.id,
+        "kg-form_id": (d = u.value) == null ? void 0 : d.frm_id,
+        "kg-var_name": (g = u.value) == null ? void 0 : g.var_nam,
+        "kg-cmd": (m = u.value) == null ? void 0 : m.cmd,
+        "kg-permission": (v = (b = u.value) == null ? void 0 : b.permission_code) != null ? v : "",
         type: "primary",
-        disabled: u.value,
+        disabled: s.value,
         danger: e.kgColor === KG__VAR_BUTTON__COLOR.RED,
-        ghost: !e.kgPrimary && !u.value,
-        onClick: s
+        ghost: !e.kgPrimary && !s.value,
+        onClick: o
       }, {
-        default: () => [o(), l()]
+        default: () => [l(), c()]
       });
     };
   }
@@ -27653,13 +27715,13 @@ const getProps$c = () => ({
   }
 }), useKgButtonStore = defineStore("KgButton", {
   state: () => ({
-    clickEventListenersMap: /* @__PURE__ */ new Map(),
+    clickEventListenerMap: /* @__PURE__ */ new Map(),
     currentButtonMap: /* @__PURE__ */ new Map(),
-    importOkEventListenersMap: /* @__PURE__ */ new Map(),
+    importOkEventListenerMap: /* @__PURE__ */ new Map(),
     isClickInterceptedMap: /* @__PURE__ */ new Map(),
     isCurrentButtonRequestingMap: /* @__PURE__ */ new Map(),
-    submitCancelEventListenersMap: /* @__PURE__ */ new Map(),
-    submitSaveEventListenersMap: /* @__PURE__ */ new Map()
+    submitCancelEventListenerMap: /* @__PURE__ */ new Map(),
+    submitSaveEventListenerMap: /* @__PURE__ */ new Map()
   }),
   getters: {
     getButtonDescription() {
@@ -27782,23 +27844,23 @@ const getProps$c = () => ({
     addEventListener(e, a, r) {
       switch (a) {
         case "click": {
-          const n = this.clickEventListenersMap.get(e);
-          this.clickEventListenersMap.set(e, [...n != null ? n : [], r]);
+          const n = this.clickEventListenerMap.get(e);
+          this.clickEventListenerMap.set(e, [...n != null ? n : [], r]);
           break;
         }
         case "importOk": {
-          const n = this.importOkEventListenersMap.get(e);
-          this.importOkEventListenersMap.set(e, [...n != null ? n : [], r]);
+          const n = this.importOkEventListenerMap.get(e);
+          this.importOkEventListenerMap.set(e, [...n != null ? n : [], r]);
           break;
         }
         case "submitSave": {
-          const n = this.submitSaveEventListenersMap.get(e);
-          this.submitSaveEventListenersMap.set(e, [...n != null ? n : [], r]);
+          const n = this.submitSaveEventListenerMap.get(e);
+          this.submitSaveEventListenerMap.set(e, [...n != null ? n : [], r]);
           break;
         }
         case "submitCancel": {
-          const n = this.submitCancelEventListenersMap.get(e);
-          this.submitCancelEventListenersMap.set(e, [...n != null ? n : [], r]);
+          const n = this.submitCancelEventListenerMap.get(e);
+          this.submitCancelEventListenerMap.set(e, [...n != null ? n : [], r]);
           break;
         }
       }
@@ -27816,16 +27878,16 @@ const getProps$c = () => ({
       let n, u = Promise.resolve(!1);
       switch (a) {
         case "click":
-          n = this.clickEventListenersMap.get(e);
+          n = this.clickEventListenerMap.get(e);
           break;
         case "importOk":
-          n = this.importOkEventListenersMap.get(e);
+          n = this.importOkEventListenerMap.get(e);
           break;
         case "submitSave":
-          n = this.submitSaveEventListenersMap.get(e);
+          n = this.submitSaveEventListenerMap.get(e);
           break;
         case "submitCancel":
-          n = this.submitCancelEventListenersMap.get(e);
+          n = this.submitCancelEventListenerMap.get(e);
           break;
       }
       if (n) {
@@ -27842,31 +27904,31 @@ const getProps$c = () => ({
       switch (a) {
         case "click":
           if (r) {
-            const n = this.clickEventListenersMap.get(e);
-            this.clickEventListenersMap.set(e, without$1(n, r));
+            const n = this.clickEventListenerMap.get(e);
+            this.clickEventListenerMap.set(e, without$1(n, r));
           } else
-            this.clickEventListenersMap.set(e, []);
+            this.clickEventListenerMap.set(e, []);
           break;
         case "importOk":
           if (r) {
-            const n = this.importOkEventListenersMap.get(e);
-            this.importOkEventListenersMap.set(e, without$1(n, r));
+            const n = this.importOkEventListenerMap.get(e);
+            this.importOkEventListenerMap.set(e, without$1(n, r));
           } else
-            this.importOkEventListenersMap.set(e, []);
+            this.importOkEventListenerMap.set(e, []);
           break;
         case "submitSave":
           if (r) {
-            const n = this.submitSaveEventListenersMap.get(e);
-            this.submitSaveEventListenersMap.set(e, without$1(n, r));
+            const n = this.submitSaveEventListenerMap.get(e);
+            this.submitSaveEventListenerMap.set(e, without$1(n, r));
           } else
-            this.submitSaveEventListenersMap.set(e, []);
+            this.submitSaveEventListenerMap.set(e, []);
           break;
         case "submitCancel":
           if (r) {
-            const n = this.submitCancelEventListenersMap.get(e);
-            this.submitCancelEventListenersMap.set(e, without$1(n, r));
+            const n = this.submitCancelEventListenerMap.get(e);
+            this.submitCancelEventListenerMap.set(e, without$1(n, r));
           } else
-            this.submitCancelEventListenersMap.set(e, []);
+            this.submitCancelEventListenerMap.set(e, []);
           break;
       }
     },
@@ -28403,9 +28465,9 @@ const getProps$a = () => ({
     dynamicOperatorModelMap: /* @__PURE__ */ new Map(),
     formModel: /* @__PURE__ */ new Map(),
     isReadyMap: /* @__PURE__ */ new Map(),
-    onReadyEventListenersMap: /* @__PURE__ */ new Map(),
-    onResetEventListenersMap: /* @__PURE__ */ new Map(),
-    onSearchEventListenersMap: /* @__PURE__ */ new Map(),
+    onReadyEventListenerMap: /* @__PURE__ */ new Map(),
+    onResetEventListenerMap: /* @__PURE__ */ new Map(),
+    onSearchEventListenerMap: /* @__PURE__ */ new Map(),
     resetFnMap: /* @__PURE__ */ new Map(),
     searchFnMap: /* @__PURE__ */ new Map()
   }),
@@ -28470,20 +28532,20 @@ const getProps$a = () => ({
       switch (a) {
         case "ready":
           {
-            const n = this.onReadyEventListenersMap.get(e);
-            this.onReadyEventListenersMap.set(e, [...n != null ? n : [], r]);
+            const n = this.onReadyEventListenerMap.get(e);
+            this.onReadyEventListenerMap.set(e, [...n != null ? n : [], r]);
           }
           break;
         case "search":
           {
-            const n = this.onSearchEventListenersMap.get(e);
-            this.onSearchEventListenersMap.set(e, [...n != null ? n : [], r]);
+            const n = this.onSearchEventListenerMap.get(e);
+            this.onSearchEventListenerMap.set(e, [...n != null ? n : [], r]);
           }
           break;
         case "reset":
           {
-            const n = this.onResetEventListenersMap.get(e);
-            this.onResetEventListenersMap.set(e, [...n != null ? n : [], r]);
+            const n = this.onResetEventListenerMap.get(e);
+            this.onResetEventListenerMap.set(e, [...n != null ? n : [], r]);
           }
           break;
       }
@@ -28505,13 +28567,13 @@ const getProps$a = () => ({
         let l;
         switch (a) {
           case "ready":
-            l = this.onReadyEventListenersMap.get(o);
+            l = this.onReadyEventListenerMap.get(o);
             break;
           case "search":
-            l = this.onSearchEventListenersMap.get(o);
+            l = this.onSearchEventListenerMap.get(o);
             break;
           case "reset":
-            l = this.onResetEventListenersMap.get(o);
+            l = this.onResetEventListenerMap.get(o);
             break;
         }
         if (!l) {
@@ -28570,24 +28632,24 @@ const getProps$a = () => ({
       switch (a) {
         case "ready":
           if (r) {
-            const n = this.onReadyEventListenersMap.get(e);
-            this.onReadyEventListenersMap.set(e, without$1(n, r));
+            const n = this.onReadyEventListenerMap.get(e);
+            this.onReadyEventListenerMap.set(e, without$1(n, r));
           } else
-            this.onReadyEventListenersMap.set(e, []);
+            this.onReadyEventListenerMap.set(e, []);
           break;
         case "search":
           if (r) {
-            const n = this.onSearchEventListenersMap.get(e);
-            this.onSearchEventListenersMap.set(e, without$1(n, r));
+            const n = this.onSearchEventListenerMap.get(e);
+            this.onSearchEventListenerMap.set(e, without$1(n, r));
           } else
-            this.onSearchEventListenersMap.set(e, []);
+            this.onSearchEventListenerMap.set(e, []);
           break;
         case "reset":
           if (r) {
-            const n = this.onResetEventListenersMap.get(e);
-            this.onResetEventListenersMap.set(e, without$1(n, r));
+            const n = this.onResetEventListenerMap.get(e);
+            this.onResetEventListenerMap.set(e, without$1(n, r));
           } else
-            this.onResetEventListenersMap.set(e, []);
+            this.onResetEventListenerMap.set(e, []);
           break;
       }
     },