@kengic/vue 0.6.10-beta.8 → 0.6.10

package/dist/kengic-vue.js

@@ -5863,6 +5863,7 @@ const without$1 = without, en = {
     add: "Add",
     button: "Button",
     cancel: "Cancel",
+    close: "Close",
     confirm: "Confirm",
     confirmDelete: "Confirm delete ?",
     copy: "Copy",
@@ -6005,6 +6006,7 @@ const without$1 = without, en = {
     add: "\u65B0\u589E",
     button: "\u6309\u94AE",
     cancel: "\u53D6\u6D88",
+    close: "\u5173\u95ED",
     confirm: "\u786E\u8BA4",
     confirmDelete: "\u786E\u8BA4\u5220\u9664 ?",
     copy: "\u590D\u5236",
@@ -6989,7 +6991,7 @@ const useKgAppSelectStore = () => (store$8 || (store$8 = defineStore("KgAppSelec
       }
     },
     emit(e, t) {
-      let r;
+      let r, a = Promise.resolve(!1);
       switch (e) {
         case "gotoApp":
           r = this.gotoAppListenersMap.get("0");
@@ -6998,13 +7000,10 @@ const useKgAppSelectStore = () => (store$8 || (store$8 = defineStore("KgAppSelec
           r = this.gotoPathListenersMap.get("0");
           break;
       }
-      if (r) {
-        let a = Promise.resolve(!1);
+      if (r)
         for (let n = 0; n < r.length; n++)
           a = r[n](t != null ? t : null);
-        return a;
-      }
-      return Promise.resolve(!1);
+      return a;
     },
     async gotoApp(e) {
       const t = useKg();
@@ -9825,13 +9824,7 @@ const KgFormItemRadioGroup = defineComponent({
         case KG_FORM_ITEM_TYPE.SELECT:
           return createVNode(KgFormItemSelect, b.value, null);
         case KG_FORM_ITEM_TYPE.SWITCH:
-          switch (e.kgContext) {
-            case KG_FORM_CONTEXT.SEARCH:
-              return createVNode(KgFormItemSelect, b.value, null);
-            case KG_FORM_CONTEXT.SUBMIT:
-            default:
-              return createVNode(KgFormItemSwitch, b.value, null);
-          }
+          return createVNode(KgFormItemSwitch, b.value, null);
         case KG_FORM_ITEM_TYPE.CHECKBOX:
           return createVNode(KgFormItemCheckbox, b.value, null);
         case KG_FORM_ITEM_TYPE.CHECKBOX_GROUP:
@@ -9966,7 +9959,7 @@ const useKgFormStore = () => (store$6 || (store$6 = defineStore("KgForm", {
       }
     },
     emit(e, t, r) {
-      let a;
+      let a, n = Promise.resolve(!1);
       switch (t) {
         case "lookupBeforeOk":
           a = this.lookupBeforeOkListenersMap.get(e);
@@ -9975,13 +9968,10 @@ const useKgFormStore = () => (store$6 || (store$6 = defineStore("KgForm", {
           a = this.lookupOkListenersMap.get(e);
           break;
       }
-      if (a) {
-        let n = Promise.resolve(!1);
+      if (a)
         for (let o = 0; o < a.length; o++)
           n = a[o](r != null ? r : null);
-        return n;
-      }
-      return Promise.resolve(!1);
+      return n;
     }
   }
 }).bind(null, pinia())), store$6);
@@ -10160,7 +10150,7 @@ const useKgSubmitStore = () => (store$5 || (store$5 = defineStore("KgSubmit", {
       }
     },
     emit(e, t, r) {
-      let a;
+      let a, n = Promise.resolve(!1);
       switch (t) {
         case "open":
           a = this.openListenersMap.get(e);
@@ -10188,15 +10178,14 @@ const useKgSubmitStore = () => (store$5 || (store$5 = defineStore("KgSubmit", {
           break;
       }
       if (a) {
-        const n = [];
-        let o = Promise.resolve(!1);
+        const o = [];
         for (let i = 0; i < a.length; i++) {
           const s = a[i];
-          s.once && !s.invoked && (s.invoked = !0, n.push(s)), o = s(r);
+          s.once && !s.invoked && (s.invoked = !0, o.push(s)), n = s(r);
         }
-        return n.forEach((i) => this.removeEventListener(e, t, i)), o;
+        o.forEach((i) => this.removeEventListener(e, t, i));
       }
-      return Promise.resolve(!1);
+      return n;
     },
     setIsLoading(e, t) {
       this.isLoadingMap.set(e, t);
@@ -10592,7 +10581,7 @@ const getProps$p = () => ({
       return u.value ? 398 : (B = (L = m.value) == null ? void 0 : L.max_width) != null ? B : DEFAULT_MAX_WIDTH;
     }), P = computed(() => u.value ? 398 : A.value.kgWidth), V = ref(null);
     _useResizeObserver$1(V);
-    const D = _useTitle(), O = computed(() => u.value ? 400 : A.value.kgWidth && A.value.kgWidth > 0 ? A.value.kgWidth + 2 : 0), R = computed(() => O.value === 0 ? !1 : !!(o.isCreating.value || o.isUpdating.value || o.isCopying.value || o.isDeleting.value)), x = reactive({
+    const D = _useTitle(), O = computed(() => u.value ? 400 : A.value.kgWidth && A.value.kgWidth > 0 ? "auto" : 0), R = computed(() => O.value === 0 ? !1 : !!(o.isCreating.value || o.isUpdating.value || o.isCopying.value || o.isDeleting.value)), x = reactive({
       isFullscreen: !1
     }), {
       getClass: G
@@ -11065,9 +11054,9 @@ const useKgTableStore = () => (store$4 || (store$4 = defineStore("KgTable", {
     getSelectedRowKeys(e) {
       return (t) => {
         if (!t)
-          return KgLogger.error("formID \u4E3A\u7A7A."), null;
+          return KgLogger.error("formID \u4E3A\u7A7A."), ref([]);
         let r = e.selectedRowKeysMap.get(t);
-        return r || (r = ref([]), e.selectedRowKeysMap.set(t, r)), r != null ? r : null;
+        return r || (r = ref([]), e.selectedRowKeysMap.set(t, r)), r;
       };
     },
     getSelectedRows(e) {
@@ -11164,7 +11153,7 @@ const useKgTableStore = () => (store$4 || (store$4 = defineStore("KgTable", {
       }
     },
     emit(e, t, r) {
-      let a;
+      let a, n = Promise.resolve(!1);
       switch (t) {
         case "rowDoubleClick":
           a = this.rowDoubleClickListenersMap.get(e);
@@ -11177,25 +11166,21 @@ const useKgTableStore = () => (store$4 || (store$4 = defineStore("KgTable", {
           break;
       }
       if (a) {
-        const n = [];
-        let o = Promise.resolve(!1);
+        const o = [];
         for (let i = 0; i < a.length; i++) {
           const s = a[i];
-          s.once && !s.invoked && (s.invoked = !0, n.push(s)), o = s(r);
+          s.once && !s.invoked && (s.invoked = !0, o.push(s)), n = s(r);
         }
-        return n.forEach((i) => this.removeEventListener(e, t, i)), o;
+        o.forEach((i) => this.removeEventListener(e, t, i));
       }
-      return Promise.resolve(!1);
+      return n;
     },
     setSelectedRows(e, t) {
-      var n, o;
+      var o, i;
       const r = useKgVar(e);
       this.selectedRowsMap.set(e, unref(toRaw(t)));
-      const a = this.getSelectedRowKeys(e);
-      if (a) {
-        const i = (o = (n = r.varGridConfig.value) == null ? void 0 : n.id_clm) != null ? o : "id";
-        a.value = t.map((s) => s[i]);
-      }
+      const a = (i = (o = r.varGridConfig.value) == null ? void 0 : o.id_clm) != null ? i : "id", n = this.getSelectedRowKeys(e);
+      n.value = t.map((s) => s[a]);
     },
     setRowSelect(e, t, r) {
     },
@@ -11976,11 +11961,9 @@ const KgTable$1 = "", getProps$g = () => ({
   }) {
     var fe;
     const a = inject("$dayjs", dayjs), n = inject(DI_KG_VAR__KG_SLOTS, null), o = inject(DI_KG_VAR__KG_PROPS, null), i = useKg(), s = useKgVar(), l = useKgSearch(), c = useKgButton(), u = useKgTable(), d = useKgSubmit();
-    l.onSearch((K) => {
-      G(K);
-    }), l.onReset(() => {
-      G(!0);
-    }), u.store.$onAction(async ({
+    l.onSearch(async ({
+      resetPageIndex: K
+    }) => (G(K), !1)), l.onReset(async () => (G(!0), !1)), u.store.$onAction(async ({
       name: K,
       args: U
     }) => {
@@ -12525,7 +12508,7 @@ const useKgButtonStore = () => (store$3 || (store$3 = defineStore("KgButton", {
       }
     },
     emit(e, t, r) {
-      let a;
+      let a, n = Promise.resolve(!1);
       switch (t) {
         case "click":
           a = this.clickListenersMap.get(e);
@@ -12543,13 +12526,10 @@ const useKgButtonStore = () => (store$3 || (store$3 = defineStore("KgButton", {
           a = this.submitCancelListenersMap.get(e);
           break;
       }
-      if (a) {
-        let n = Promise.resolve(!1);
+      if (a)
         for (let o = 0; o < a.length; o++)
           n = a[o](r != null ? r : null);
-        return n;
-      }
-      return Promise.resolve(!1);
+      return n;
     },
     click(e, t, r, a) {
     }
@@ -13384,36 +13364,31 @@ const useKgSearchStore = () => (store$2 || (store$2 = defineStore("KgSearch", {
       }
     },
     emit(e, t, r) {
-      const n = [...useKgVar(e).store.getVarGridConfigMap.values()].filter((o) => (o == null ? void 0 : o.prf_frm_id) === e).map((o) => o == null ? void 0 : o.frm_id).filter((o) => !!o);
-      for (let o of [e, ...n])
+      const n = [...useKgVar(e).store.getVarGridConfigMap.values()].filter((i) => (i == null ? void 0 : i.prf_frm_id) === e).map((i) => i == null ? void 0 : i.frm_id).filter((i) => !!i);
+      let o = Promise.resolve(!1);
+      for (let i of [e, ...n]) {
+        let s;
         switch (t) {
           case "search":
-            {
-              const i = this.onSearchListenersMap.get(o);
-              i && i.forEach((s) => s(r == null ? void 0 : r.resetPageIndex));
-            }
+            s = this.onSearchListenersMap.get(i);
             break;
           case "reset":
-            {
-              const i = this.onResetListenersMap.get(o);
-              i && i.forEach((s) => s({}));
-            }
+            s = this.onResetListenersMap.get(i);
             break;
           case "ready":
-            {
-              const i = this.onReadyListenersMap.get(o);
-              if (i) {
-                const s = [];
-                Promise.resolve(!1);
-                for (let l = 0; l < i.length; l++) {
-                  const c = i[l];
-                  c.once && !c.invoked && (c.invoked = !0, s.push(c)), c(r);
-                }
-                s.forEach((l) => this.removeEventListener(o, "ready", l));
-              }
-            }
+            s = this.onReadyListenersMap.get(i);
             break;
         }
+        if (s) {
+          const l = [];
+          for (let c = 0; c < s.length; c++) {
+            const u = s[c];
+            u.once && !u.invoked && (u.invoked = !0, l.push(u)), o = u(r);
+          }
+          l.forEach((c) => this.removeEventListener(i, t, c));
+        }
+      }
+      return o;
     },
     setIsReady(e, t) {
       !e || this.isReadyMap.set(e, !!t);
@@ -13970,16 +13945,16 @@ function _useFormModel(e, t) {
   } = _useCommon();
   let s;
   const l = ref({});
-  return watch(a.currentVarProfileDetails, (c) => {
+  return watch(a.currentVarProfileDetails, async (c) => {
     l.value = {}, c != null && c.length && (c.forEach((u) => {
       var m, v;
       const d = (m = u.var_nam) != null ? m : "";
       l.value[d] = KgVarUtil.transformValueByControlType(a.formID, d, r, (v = u.dft_val) != null ? v : void 0, "R");
-    }), t.value.kgHeight = i.value, n.store.setModel(a.formID, l.value), o.value ? (s == null || s(), s = watch(e, (u) => {
-      u && (n.store.emit(a.formID, "ready"), n.store.setIsReady(a.formID, !0));
+    }), t.value.kgHeight = i.value, n.store.setModel(a.formID, l.value), o.value ? (s == null || s(), s = watch(e, async (u) => {
+      u && (await n.store.emit(a.formID, "ready", {}), n.store.setIsReady(a.formID, !0));
     }, {
       immediate: !0
-    })) : (n.store.emit(a.formID, "ready"), n.store.setIsReady(a.formID, !0)));
+    })) : (await n.store.emit(a.formID, "ready", {}), n.store.setIsReady(a.formID, !0)));
   }, {
     immediate: !0
   }), {
@@ -14029,29 +14004,29 @@ const KgSearch$1 = "", getProps$9 = () => ({}), KgSearch = defineComponent({
     onUnmounted(() => {
       n.store.dispose(a.formID);
     });
-    function M(O = !1) {
-      T.value || (i.value ? m.value && m.value.validate().then(() => {
-        n.store.emit(a.formID, "search", {
+    async function M(O = !1) {
+      T.value || (i.value ? m.value && m.value.validate().then(async () => {
+        await n.store.emit(a.formID, "search", {
           resetPageIndex: O
         });
       }).catch((R) => {
         KgLogger.debug(`${a.formID} | KgSearch | onSearch() | \u8868\u5355\u9A8C\u8BC1\u5931\u8D25.`, {
           e: R
         });
-      }) : n.store.emit(a.formID, "search", {
+      }) : await n.store.emit(a.formID, "search", {
         resetPageIndex: O
       }));
     }
     n.store.setSearchFn(a.formID, M);
-    function A() {
+    async function A() {
       var O;
-      (O = m.value) == null || O.resetFields(), i.value ? m.value && m.value.validate().then(() => {
-        n.store.emit(a.formID, "reset");
+      (O = m.value) == null || O.resetFields(), i.value ? m.value && m.value.validate().then(async () => {
+        await n.store.emit(a.formID, "reset", {});
       }).catch((R) => {
         KgLogger.debug("[KgSearch] \u8868\u5355\u9A8C\u8BC1\u5931\u8D25", {
           e: R
         });
-      }) : n.store.emit(a.formID, "reset");
+      }) : await n.store.emit(a.formID, "reset", {});
     }
     n.store.setResetFn(a.formID, A);
     function w() {

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

@@ -7,17 +7,17 @@ import { IKgEventCb } from '../../consts';
  *   'ready':  查询字段初始完成, 查询组件渲染完成
  */
 export declare type IKgSearchEvent = 'search' | 'reset' | 'ready';
-/** 事件参数. */
-export declare type IKgSearchEventParam = {
+/** 事件监听函数: search. */
+export declare type IKgSearchSearchCbParam = {
     /** 是否从第一页开始查询. */
     resetPageIndex?: boolean;
 };
-/** 事件监听函数: search. */
-export declare type IKgSearchSearchCb = ((resetPageIndex?: boolean) => void) & IKgEventCb;
-/** 事件监听函数: 'reset'. */
-export declare type IKgSearchResetCb = ((param: any) => void) & IKgEventCb;
-/** 事件监听函数: 'ready'. */
-export declare type IKgSearchReadyCb = ((param: any) => void) & IKgEventCb;
+export declare type IKgSearchSearchCb = ((param: IKgSearchSearchCbParam) => Promise<boolean>) & IKgEventCb;
+/** 事件监听函数: reset. */
+export declare type IKgSearchResetCb = ((param: any) => Promise<boolean>) & IKgEventCb;
+/** 事件监听函数: ready. */
+export declare type IKgSearchReadyCb = ((param: any) => Promise<boolean>) & IKgEventCb;
+export declare type IKgSearchCbParam = IKgSearchSearchCbParam;
 export declare type IKgSearchCb = IKgSearchSearchCb | IKgSearchResetCb | IKgSearchReadyCb;
 /** 查询方法. */
 export declare type IKgSearchSearchFn = (resetPageIndex?: boolean) => void;
@@ -55,7 +55,7 @@ export declare type IKgSearchStoreDefinition = StoreDefinition<'KgSearch', IKgSe
      * @param event 事件名称.
      * @param param 事件参数.
      */
-    emit(formID: string, event: IKgSearchEvent, param?: IKgSearchEventParam): void;
+    emit(formID: string, event: IKgSearchEvent, param: IKgSearchCbParam): Promise<boolean>;
     /**
      * 设置是否就绪.
      * @param formID 界面标识.

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

@@ -119,7 +119,7 @@ export declare type IKgSubmitStoreDefinition = StoreDefinition<'KgSubmit', IKgSu
      * 触发事件.
      * @param formID 界面标识.
      * @param event 事件名称.
-     * @param param 数据.
+     * @param param 事件参数.
      */
     emit(formID: string, event: IKgSubmitEvent, param: IKgSubmitCbParam): Promise<boolean>;
     setIsLoading(formID: string, value: boolean): void;

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

@@ -57,7 +57,7 @@ export interface IKgTableState {
 }
 export declare type IKgTableStoreDefinition = StoreDefinition<'KgTable', IKgTableState, {
     /** 当前勾选的所有行的主键. */
-    getSelectedRowKeys(): (formID?: string | null) => Ref<Array<Key>> | null;
+    getSelectedRowKeys(): (formID?: string | null) => Ref<Array<Key>>;
     /** 当前勾选的所有行. */
     getSelectedRows(): (formID?: string | null) => Array<IKgTableRow> | null;
     /** 当前勾选的第一行. */

package/dist/src/consts/i18n/en.d.ts

@@ -107,6 +107,7 @@ declare const _default: {
         add: string;
         button: string;
         cancel: string;
+        close: string;
         confirm: string;
         confirmDelete: string;
         copy: string;

package/dist/src/consts/i18n/zh_CN.d.ts

@@ -106,6 +106,7 @@ declare const _default: {
         add: string;
         button: string;
         cancel: string;
+        close: string;
         confirm: string;
         confirmDelete: string;
         copy: string;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kengic/vue",
-    "version": "0.6.10-beta.8",
+    "version": "0.6.10",
     "scripts": {
         "build": "rimraf dist && vue-tsc && vite build",
         "build:dev": "rimraf dist && vue-tsc && vite build --mode development",