@kengic/vue 0.26.2 → 0.26.3-beta.1

package/dist/kengic-vue.js

@@ -2437,7 +2437,7 @@ const emptyIcon = {
       ...a.data
     }, r);
   }
-}), version = "0.26.2";
+}), version = "0.26.3-beta.1";
 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")();
@@ -8572,54 +8572,55 @@ function requireCore() {
     });
   }(core)), core.exports;
 }
-var encBase64 = { exports: {} };
-(function(e, a) {
-  (function(r, n) {
-    e.exports = n(requireCore());
-  })(commonjsGlobal, function(r) {
-    return function() {
-      var n = r, u = n.lib, s = u.WordArray, o = n.enc;
-      o.Base64 = {
-        stringify: function(c) {
-          var _ = c.words, d = c.sigBytes, g = this._map;
-          c.clamp();
-          for (var m = [], b = 0; b < d; b += 3)
-            for (var v = _[b >>> 2] >>> 24 - b % 4 * 8 & 255, p = _[b + 1 >>> 2] >>> 24 - (b + 1) % 4 * 8 & 255, E = _[b + 2 >>> 2] >>> 24 - (b + 2) % 4 * 8 & 255, T = v << 16 | p << 8 | E, C = 0; C < 4 && b + C * 0.75 < d; C++)
-              m.push(g.charAt(T >>> 6 * (3 - C) & 63));
-          var k = g.charAt(64);
-          if (k)
-            for (; m.length % 4; )
-              m.push(k);
-          return m.join("");
-        },
-        parse: function(c) {
-          var _ = c.length, d = this._map, g = this._reverseMap;
-          if (!g) {
-            g = this._reverseMap = [];
-            for (var m = 0; m < d.length; m++)
-              g[d.charCodeAt(m)] = m;
-          }
-          var b = d.charAt(64);
-          if (b) {
-            var v = c.indexOf(b);
-            v !== -1 && (_ = v);
-          }
-          return l(c, _, g);
-        },
-        _map: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="
-      };
-      function l(c, _, d) {
-        for (var g = [], m = 0, b = 0; b < _; b++)
-          if (b % 4) {
-            var v = d[c.charCodeAt(b - 1)] << b % 4 * 2, p = d[c.charCodeAt(b)] >>> 6 - b % 4 * 2, E = v | p;
-            g[m >>> 2] |= E << 24 - m % 4 * 8, m++;
-          }
-        return s.create(g, m);
-      }
-    }(), r.enc.Base64;
-  });
-})(encBase64);
-const Base64 = encBase64.exports;
+var encBase64 = { exports: {} }, hasRequiredEncBase64;
+function requireEncBase64() {
+  return hasRequiredEncBase64 || (hasRequiredEncBase64 = 1, function(e, a) {
+    (function(r, n) {
+      e.exports = n(requireCore());
+    })(commonjsGlobal, function(r) {
+      return function() {
+        var n = r, u = n.lib, s = u.WordArray, o = n.enc;
+        o.Base64 = {
+          stringify: function(c) {
+            var _ = c.words, d = c.sigBytes, g = this._map;
+            c.clamp();
+            for (var m = [], b = 0; b < d; b += 3)
+              for (var v = _[b >>> 2] >>> 24 - b % 4 * 8 & 255, p = _[b + 1 >>> 2] >>> 24 - (b + 1) % 4 * 8 & 255, E = _[b + 2 >>> 2] >>> 24 - (b + 2) % 4 * 8 & 255, T = v << 16 | p << 8 | E, C = 0; C < 4 && b + C * 0.75 < d; C++)
+                m.push(g.charAt(T >>> 6 * (3 - C) & 63));
+            var k = g.charAt(64);
+            if (k)
+              for (; m.length % 4; )
+                m.push(k);
+            return m.join("");
+          },
+          parse: function(c) {
+            var _ = c.length, d = this._map, g = this._reverseMap;
+            if (!g) {
+              g = this._reverseMap = [];
+              for (var m = 0; m < d.length; m++)
+                g[d.charCodeAt(m)] = m;
+            }
+            var b = d.charAt(64);
+            if (b) {
+              var v = c.indexOf(b);
+              v !== -1 && (_ = v);
+            }
+            return l(c, _, g);
+          },
+          _map: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="
+        };
+        function l(c, _, d) {
+          for (var g = [], m = 0, b = 0; b < _; b++)
+            if (b % 4) {
+              var v = d[c.charCodeAt(b - 1)] << b % 4 * 2, p = d[c.charCodeAt(b)] >>> 6 - b % 4 * 2, E = v | p;
+              g[m >>> 2] |= E << 24 - m % 4 * 8, m++;
+            }
+          return s.create(g, m);
+        }
+      }(), r.enc.Base64;
+    });
+  }(encBase64)), encBase64.exports;
+}
 var md5 = { exports: {} }, hasRequiredMd5;
 function requireMd5() {
   return hasRequiredMd5 || (hasRequiredMd5 = 1, function(e, a) {
@@ -8991,7 +8992,7 @@ function requireCipherCore() {
 }
 (function(e, a) {
   (function(r, n, u) {
-    e.exports = n(requireCore(), encBase64.exports, requireMd5(), requireEvpkdf(), requireCipherCore());
+    e.exports = n(requireCore(), requireEncBase64(), requireMd5(), requireEvpkdf(), requireCipherCore());
   })(commonjsGlobal, function(r) {
     return function() {
       var n = r, u = n.lib, s = u.BlockCipher, o = n.algo, l = [], c = [], _ = [], d = [], g = [], m = [], b = [], v = [], p = [], E = [];
@@ -9046,7 +9047,7 @@ function requireCipherCore() {
     }(), r.AES;
   });
 })(aes);
-var encUtf8 = { exports: {} };
+var encBase64Exports = requireEncBase64(), encUtf8 = { exports: {} };
 (function(e, a) {
   (function(r, n) {
     e.exports = n(requireCore());
@@ -9106,10 +9107,10 @@ class AesEncryption {
   }
 }
 function encryptByBase64(e) {
-  return UTF8.parse(e).toString(Base64);
+  return UTF8.parse(e).toString(encBase64Exports);
 }
 function decodeByBase64(e) {
-  return Base64.parse(e).toString(UTF8);
+  return encBase64Exports.parse(e).toString(UTF8);
 }
 function encryptByMd5(e) {
   return md5Exports(e).toString();
@@ -14064,10 +14065,18 @@ const getProps$H = () => ({
 function _useFormRules(e) {
   const a = useKg(), r = useKgVar(), n = computed(() => r.store.getVarConfigInput(r.formID, e.kgVarName)), u = computed(() => {
     var A, O;
-    return (O = r.kgSubmit.getVarSubmitDetails({
-      buttonVarName: (A = r.kgButton.currentButton.value) == null ? void 0 : A.var_nam,
-      varName: e.kgVarName
-    })[0]) != null ? O : null;
+    switch (e.kgContext) {
+      case KG_FORM_CONTEXT.SEARCH:
+        return r.kgSubmit.getVarSubmitDetailByVarProfileDetail({
+          varProfileDetail: r.store.getVarProfileDetail(r.formID, e.kgVarName)
+        });
+      case KG_FORM_CONTEXT.SUBMIT:
+      case KG_FORM_CONTEXT.TABLE:
+        return (O = r.kgSubmit.getVarSubmitDetails({
+          buttonVarName: (A = r.kgButton.currentButton.value) == null ? void 0 : A.var_nam,
+          varName: e.kgVarName
+        })[0]) != null ? O : null;
+    }
   }), s = ref([]), o = computed(() => {
     var A, O;
     return [
@@ -18454,13 +18463,7 @@ const getProps$z = () => ({}), KgVarConfigModalTableVarGridMaster = defineCompon
   setup(e) {
     var v, p;
     const a = (p = inject(KG__DI__FORM_ID, null)) != null ? p : (v = inject(KG__DI__KG_VAR_CONFIG__HOST_FORM_ID, null)) == null ? void 0 : v.value, r = useKg(), n = useKgVar(a), u = useKgVar(FORM_ID__TABLE__VAR_GRID_MASTER);
-    u.kgSearch.onReady(async () => (await u.kgSubmit.patchVarSubmitDetail({
-      buttonType: KG__VAR_BUTTON__TYPE.SEARCH,
-      properties: {
-        default_value: n.formID
-      },
-      varName: "frm_id"
-    }), !1)), u.kgTable.onBeforeSetDatas(async ({
+    u.kgSearch.onReady(async () => (u.kgSearch.formModel.value && (u.kgSearch.formModel.value.frm_id = n.formID), !1)), u.kgTable.onBeforeSetDatas(async ({
       datas: E
     }) => (transformVarGridMasters(E.value), !1)), u.kgSubmit.onOpen(async () => {
       var E, T, C, k, A, O, y, D;
@@ -23338,7 +23341,7 @@ const getProps$q = () => ({}), KgVarConfigModalButtonVarButton = defineComponent
     }) => a.t(n).value
   }];
 }, rightVarProfileDetailColumns = (e) => {
-  var u, s;
+  var u, s, o, l;
   const a = useKg(), r = useKgVar(e), n = useKgVar(FORM_ID__SEARCH__VAR_PROFILE_MASTER);
   return compact([
     {
@@ -23349,8 +23352,8 @@ const getProps$q = () => ({}), KgVarConfigModalButtonVarButton = defineComponent
       title: "#",
       className: "ant-table-cell--index",
       customRender: ({
-        index: o
-      }) => o + 1
+        index: c
+      }) => c + 1
     },
     {
       dataIndex: "handler",
@@ -23371,33 +23374,63 @@ const getProps$q = () => ({}), KgVarConfigModalButtonVarButton = defineComponent
     },
     {
       dataIndex: "var_nam",
-      width: "auto",
+      width: 300,
       title: n.t("var_text").value,
       customRender: ({
-        value: o
-      }) => r.t(o).value
+        value: c
+      }) => r.t(c).value
+    },
+    {
+      dataIndex: "exclude_from_where_sql_flag",
+      width: 220,
+      title: n.t("exclude_from_where_sql_flag").value,
+      className: "input",
+      customRender: ({
+        record: c
+      }) => createVNode(Checkbox, {
+        checked: c.exclude_from_where_sql_flag === 1,
+        "onUpdate:checked": (_) => c.exclude_from_where_sql_flag = _ ? 1 : 0,
+        class: "kg-not-clickable"
+      }, null)
     },
     ((s = (u = a.option.value.KgSearch) == null ? void 0 : u.dynamicQuery) == null ? void 0 : s.on) !== !0 ? null : {
+      dataIndex: "use_underscore_when_dynamic_query_flag",
+      width: 280,
+      title: n.t("use_underscore_when_dynamic_query_flag").value,
+      className: "input",
+      customRender: ({
+        record: c
+      }) => {
+        var _;
+        return createVNode(Checkbox, {
+          checked: c.use_underscore_when_dynamic_query_flag === 1,
+          "onUpdate:checked": (d) => c.use_underscore_when_dynamic_query_flag = d ? 1 : 0,
+          disabled: ((_ = n.kgSubmit.formModel.value) == null ? void 0 : _.dyn_flg) !== 1,
+          class: "kg-not-clickable"
+        }, null);
+      }
+    },
+    ((l = (o = a.option.value.KgSearch) == null ? void 0 : o.dynamicQuery) == null ? void 0 : l.on) !== !0 ? null : {
       dataIndex: "dft_dyn_op",
       width: 150,
       title: n.t("dft_dyn_op").value,
       className: "input",
       customRender: ({
-        record: o
+        record: c
       }) => {
-        var _, d, g;
-        const c = (_ = useKgVar(o.frm_id).getVarConfigControl({
-          varName: o.var_nam,
+        var g, m, b;
+        const d = (g = useKgVar(c.frm_id).getVarConfigControl({
+          varName: c.var_nam,
           buttonType: KG__VAR_BUTTON__TYPE.SEARCH
-        })) == null ? void 0 : _.ctrl_typ;
+        })) == null ? void 0 : g.ctrl_typ;
         return createVNode(Select, {
-          value: (d = o.dft_dyn_op) != null ? d : void 0,
-          "onUpdate:value": (m) => o.dft_dyn_op = m,
+          value: (m = c.dft_dyn_op) != null ? m : void 0,
+          "onUpdate:value": (v) => c.dft_dyn_op = v,
           allowClear: !0,
-          disabled: ((g = n.kgSubmit.formModel.value) == null ? void 0 : g.dyn_flg) !== 1,
+          disabled: ((b = n.kgSubmit.formModel.value) == null ? void 0 : b.dyn_flg) !== 1,
           class: "kg-not-clickable"
         }, {
-          default: () => KgVarUtil.getDynamicQueryOperatorSelectOptions(c),
+          default: () => KgVarUtil.getDynamicQueryOperatorSelectOptions(d),
           suffixIcon: () => createVNode(CaretDownOutlined$1, {
             class: "ant-select-suffix"
           }, null)
@@ -23495,13 +23528,7 @@ const getProps$l = () => ({}), KgVarConfigModalSearchVarProfileMaster = defineCo
   setup(e) {
     var m, b;
     const a = (b = inject(KG__DI__FORM_ID, null)) != null ? b : (m = inject(KG__DI__KG_VAR_CONFIG__HOST_FORM_ID, null)) == null ? void 0 : m.value, r = useKg(), n = useKgVar(a), u = useKgVar(FORM_ID__SEARCH__VAR_PROFILE_MASTER);
-    u.kgSearch.onReady(async () => (await u.kgSubmit.patchVarSubmitDetail({
-      buttonType: KG__VAR_BUTTON__TYPE.SEARCH,
-      properties: {
-        default_value: n.formID
-      },
-      varName: "frm_id"
-    }), !1)), u.kgTable.onBeforeSetDatas(async ({
+    u.kgSearch.onReady(async () => (u.kgSearch.formModel.value && (u.kgSearch.formModel.value.frm_id = n.formID), !1)), u.kgTable.onBeforeSetDatas(async ({
       datas: v
     }) => (transformVarProfileMasters(v.value), !1)), u.kgSubmit.onOpen(async () => {
       var v, p, E, T, C, k, A;
@@ -23539,7 +23566,7 @@ const getProps$l = () => ({}), KgVarConfigModalSearchVarProfileMaster = defineCo
                   id: u.kgTable.selectedRow.value.id
                 }
               });
-              s.value = s.value.map((D) => {
+              transformVarProfileMasters([O]), s.value = s.value.map((D) => {
                 var F;
                 const M = (F = O == null ? void 0 : O.varProfileDetails) == null ? void 0 : F.find((N) => N.var_nam === D.var_nam);
                 return M ? {
@@ -23646,7 +23673,7 @@ const getProps$l = () => ({}), KgVarConfigModalSearchVarProfileMaster = defineCo
                 class: "kg-flex-table",
                 size: "small",
                 scroll: {
-                  x: v === "left" ? "370px" : `${(((y = (O = r.option.value.KgSearch) == null ? void 0 : O.dynamicQuery) == null ? void 0 : y.on) !== !0 ? 522 - 150 : 1192) + 32}px`,
+                  x: v === "left" ? "370px" : `${(((y = (O = r.option.value.KgSearch) == null ? void 0 : O.dynamicQuery) == null ? void 0 : y.on) !== !0 ? 1022 - 150 : 1192) + 32}px`,
                   y: "auto"
                 },
                 columns: v === "left" ? leftVarProfileDetailColumns(a) : rightVarProfileDetailColumns(a),

package/dist/src/components/KgSearch/index.hooks.d.ts

@@ -34,7 +34,8 @@ export declare type IUseKgSearch = {
      */
     model: ComputedRef<ReturnType<IKgSearchStore['getFormModel']>>;
     /**
-     * 监听事件: ready, 查询字段初始完成, 组件渲染完成.
+     * 监听事件: 查询字段初始完成, 组件渲染完成, 查询表单对象已经有值.
+     *
      * @param listener 事件监听函数.
      * @param isOnce 是否只会触发一次. 默认为 undefined.
      */

package/dist/src/components/KgSearch/index.store.d.ts

@@ -4,7 +4,7 @@ import { IKgEventListener } from '../../consts';
 import { IKgTableRequestParameter } from '../KgTable';
 /**
  * 事件类型.
- *   'ready':  就绪, 查询字段初始完成, 组件渲染完成
+ *   'ready':  查询字段初始完成, 组件渲染完成, 查询表单对象已经有值
  *   'search': 点击查询按钮, 并且表单验证通过
  *   'reset':  点击重置按钮
  */

package/dist/src/components/KgSubmit/index.hooks.d.ts

@@ -99,7 +99,7 @@ export interface IUseKgSubmit {
      * @param param.varProfileDetail 查询条件视图明细.
      */
     getVarSubmitDetailByVarProfileDetail(param?: {
-        varProfileDetail: VarProfileDetail;
+        varProfileDetail: VarProfileDetail | null;
     }): VarSubmitDetail | null;
     /**
      * <p>获取提交表单字段, 根据所传参数进行过滤.</p>

package/dist/src/components/KgSubmit/index.store.d.ts

@@ -131,7 +131,7 @@ export interface IUseKgSubmitStoreGetters {
     }) => VarSubmitConfig | null;
     getVarSubmitConfigs(): (formID: string | null | undefined) => Array<VarSubmitConfig>;
     getVarSubmitDetailByVarProfileDetail(): (formID: string | null | undefined, param?: {
-        varProfileDetail: VarProfileDetail;
+        varProfileDetail: VarProfileDetail | null;
     }) => VarSubmitDetail | null;
     getVarSubmitDetails(): (formID: string | null | undefined, param?: {
         buttonType?: KG__VAR_BUTTON__TYPE;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kengic/vue",
-    "version": "0.26.2",
+    "version": "0.26.3-beta.1",
     "scripts": {
         "build": "npm run switch-node-version && rimraf dist && vue-tsc && vite build",
         "build:dev": "npm run switch-node-version && rimraf dist && vue-tsc && vite build --mode development",