@dt-frames/ui 2.0.3 → 2.0.4

package/es/components/modal/src/index.d.ts

@@ -100,7 +100,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
     afterClose: FunctionConstructor;
 }, {
     props: any;
-    emits: (event: "register" | "visible-change" | "height-change" | "cancel" | "save" | "update:visible", ...args: any[]) => void;
+    emits: (event: "visible-change" | "height-change" | "cancel" | "save" | "register" | "update:visible", ...args: any[]) => void;
     visibleRef: import("vue").Ref<boolean>;
     propsRef: import("vue").Ref<Partial<ExtractPropTypes<{
         t: {
@@ -620,11 +620,11 @@ declare const _sfc_main: import("vue").DefineComponent<{
             "onHandle-method"?: (...args: any[]) => any;
         }, {
             mode: "search" | "dialog";
-            minShowColumn: number;
-            showAdvancedButton: boolean;
             show: boolean;
-            isAdvanced: boolean;
+            showAdvancedButton: boolean;
+            minShowColumn: number;
             buttonList: import("../../form/src/types/form.type").ButtonProps[];
+            isAdvanced: boolean;
         }>;
     }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("handleSave" | "handleCancel")[], "handleSave" | "handleCancel", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
         buttons: import("vue").PropType<import("../../form/src/types/form.type").ButtonProps[]>;
@@ -649,7 +649,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
         showSave: boolean;
         showCancel: boolean;
     }>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("register" | "visible-change" | "height-change" | "cancel" | "save" | "update:visible")[], "register" | "visible-change" | "height-change" | "cancel" | "save" | "update:visible", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("visible-change" | "height-change" | "cancel" | "save" | "register" | "update:visible")[], "visible-change" | "height-change" | "cancel" | "save" | "register" | "update:visible", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
     t: {
         type: StringConstructor;
     };
@@ -747,27 +747,27 @@ declare const _sfc_main: import("vue").DefineComponent<{
     closeFunc: import("vue").PropType<() => Promise<boolean>>;
     afterClose: FunctionConstructor;
 }>> & {
-    onRegister?: (...args: any[]) => any;
-    "onUpdate:visible"?: (...args: any[]) => any;
     "onVisible-change"?: (...args: any[]) => any;
     "onHeight-change"?: (...args: any[]) => any;
     onCancel?: (...args: any[]) => any;
     onSave?: (...args: any[]) => any;
+    onRegister?: (...args: any[]) => any;
+    "onUpdate:visible"?: (...args: any[]) => any;
 }, {
-    loading: boolean;
     visible: boolean;
-    mask: boolean;
     closable: boolean;
     destroyOnClose: boolean;
     scrollTop: boolean;
     draggable: boolean;
     defaultFullscreen: boolean;
     canFullscreen: boolean;
+    loading: boolean;
     loadingTip: string;
     useWrapper: boolean;
     centered: boolean;
     showOkBtn: boolean;
     showCancelBtn: boolean;
+    mask: boolean;
     maskClosable: boolean;
     keyboard: boolean;
 }>;

package/es/components/source/hooks/useSource.d.ts

@@ -21,6 +21,7 @@ export declare function useSource(props: SourceOption): {
             total: number;
         }>;
         loading: import("vue").Ref<boolean>;
+        onSearch: () => void;
         onTableChange: (params: TableParamsType) => void;
         onAdd: () => void;
         onUpdate: (arg: any) => void;
@@ -35,6 +36,19 @@ export declare function useSource(props: SourceOption): {
         onQueryById: (id: Key) => Promise<unknown>;
         registerInstance: (instance: CurdActionType) => CurdActionType;
     };
+    api: import("../types/source.type").ApiObjType;
+    loading: {
+        [key: string]: import("vue").Ref<boolean>;
+    };
+    dataSource: import("vue").Ref<any[]>;
+    onAdd: () => void;
+    onUpdate: (arg: any) => void;
+    onDelete: (arg: any) => void;
+    onDeletes: (ids: Key[]) => void;
+    onQueryById: (id: Key) => Promise<unknown>;
+    onDownload: (excelData: DownloadType, extraData?: any[]) => void;
+    onSave: () => void;
     onSearch: () => void;
+    onReset: () => void;
     onTableChange: (params: TableParamsType) => void;
 };

package/es/components/source/index.js

@@ -1,5 +1,5 @@
-import { ref, unref, reactive, toRaw } from "vue";
-import { isString, http, isObject, useAppStore, error, getDictValueByCode, formatNumber, useI18n, useMessage, isArray } from "@dt-frames/core";
+import { ref, unref, toRaw } from "vue";
+import { isString, http, isObject, useAppStore, error, getDictValueByCode, formatNumber, useI18n, useMessage, isArray, isFunction, isBoolean } from "@dt-frames/core";
 import { isObject as isObject$1 } from "@vueuse/core";
 import { capitalize } from "lodash-es";
 import * as xlsx from "xlsx";
@@ -134,7 +134,7 @@ function useSource(props) {
   const { t } = useI18n("UI");
   const { confirm, message } = useMessage();
   const { appConf } = useAppStore();
-  const { baseUrl, api: orgApi, immediateSearch = true, exportName, beforeUpdate, afterUpdate } = props;
+  const { baseUrl, api: orgApi, exportName, beforeUpdate, afterUpdate } = props;
   const pagination = ref({
     current: appConf?.ui?.table?.defaultPageNo || 1,
     pageSize: appConf?.ui?.table?.defaultPageSize || 20,
@@ -142,27 +142,34 @@ function useSource(props) {
   });
   const { loading, api } = getApi(orgApi, baseUrl);
   const dataSource = ref([]);
-  const baseData = reactive({
-    entityDTO: {},
-    orderDTOs: []
-  });
+  let baseData = {
+    pageNumber: 1,
+    pageSize: appConf?.ui?.table?.defaultPageSize || 20
+  };
   let tableInstance = null;
   let formInstance = null;
   let curdInstance = null;
   function onSearch() {
     tableInstance?.clearSelectedRowKeys();
     const { defaultPageSize } = tableInstance?.getPagination() || {};
-    baseData.pageDTO = {
-      pageNo: 0,
+    baseData = {
+      ...formInstance?.getFormValues() ?? {},
+      pageNumber: 1,
       pageSize: defaultPageSize
     };
     loading.onSearch.value = true;
+    loading.onQuerypage.value = true;
     setPage();
   }
   function onReset() {
-    baseData.entityDTO = { ...formInstance?.getFormValues() ?? {} };
-    baseData.pageDTO.pageNo = 0;
+    const { defaultPageSize } = tableInstance?.getPagination() || {};
+    baseData = {
+      ...formInstance?.getFormValues() ?? {},
+      pageNumber: 1,
+      pageSize: defaultPageSize
+    };
     loading.onReset.value = true;
+    loading.onQuerypage.value = true;
     tableInstance?.clearSelectedRowKeys();
     setPage();
   }
@@ -177,12 +184,12 @@ function useSource(props) {
         dataSource.value.splice(0, dataSource.value.length, ...rsp);
         return;
       }
-      const { records, pageDTO } = rsp;
+      const { records, total, size, current } = rsp;
       dataSource.value.splice(0, dataSource.value.length, ...records);
       pagination.value = {
-        current: (pageDTO?.pageNo ?? 0) + 1,
-        pageSize: pageDTO?.pageSize ?? appConf?.ui?.table?.defaultPageSize,
-        total: pageDTO?.totalCount ?? 0
+        current,
+        pageSize: size || appConf?.ui?.table?.defaultPageSize,
+        total
       };
     }).finally(() => {
       loading.onSearch.value = false;
@@ -192,18 +199,29 @@ function useSource(props) {
   }
   function onTableChange(params) {
     const { pagination: pagination2, sort, filter } = params;
-    baseData.pageDTO = {
-      pageNo: pagination2.current - 1,
+    if (!appConf?.ui?.table?.multipleSorter) {
+      let order = sort.order;
+      let sortOrder = order === "ascend" ? "asc" : order === "descend" ? "desc" : null;
+      baseData = {
+        ...baseData,
+        sortName: sortOrder ? sort.field : "",
+        sortOrder
+      };
+    } else {
+      baseData.sort = (sort || []).map((it) => {
+        if (it.order) {
+          return {
+            sortName: it.field,
+            sortOrder: it.order === "ascend" ? "asc" : "desc"
+          };
+        }
+      }).filter((it) => it);
+    }
+    baseData = {
+      ...baseData,
+      pageNumber: pagination2.current,
       pageSize: pagination2.pageSize
     };
-    baseData.orderDTOs = (isObject$1(sort) ? [sort] : sort).map((it) => {
-      if (it.order) {
-        return {
-          propertyName: it.field,
-          dir: it.order === "ascend" ? "asc" : "desc"
-        };
-      }
-    }).filter((it) => it);
     setPage(filter);
   }
   function onAdd() {
@@ -221,10 +239,18 @@ function useSource(props) {
   function onSave() {
     let model = curdInstance && curdInstance.curdFormMethods.getFormValues();
     curdInstance.curdFormMethods.validate().then((rsp) => {
+      if (beforeUpdate && isFunction(beforeUpdate)) {
+        let canUpdate = beforeUpdate(model);
+        if (isBoolean(canUpdate) && canUpdate === false) {
+          return false;
+        } else if (!isBoolean(canUpdate)) {
+          model = { ...canUpdate };
+        }
+      }
       if (!model.id) {
         loading.onAdd.value = true;
         fetch(api.add, { ...model }, false).then((rsp2) => {
-          if (rsp2?.code === 0) {
+          if (rsp2?.code === appConf?.http?.okCode) {
             message.success(t("ADD_SUCCESS"));
             curdInstance.closeModal();
             onSearch();
@@ -234,7 +260,7 @@ function useSource(props) {
       } else {
         loading.onUpdate.value = true;
         fetch(api.update, { ...model }, false).then((rsp2) => {
-          if (rsp2?.code === 0) {
+          if (rsp2?.code === appConf?.http?.okCode) {
             message.success(t("UPDATE_SUCCESS"));
             curdInstance.closeModal();
             onSearch();
@@ -264,7 +290,7 @@ function useSource(props) {
       iconType: "warning",
       onOk() {
         fetch(api.deletes, toRaw(_ids), false).then((rsp) => {
-          if (rsp?.code === 0) {
+          if (rsp?.code === appConf?.http?.okCode) {
             message.success((isSingleDelete ? "" : t("MULTIFY")) + t("DELETE_SUCCESS"));
             !isSingleDelete && tableInstance.clearSelectedRowKeys();
             onSearch();
@@ -305,6 +331,7 @@ function useSource(props) {
     dataSource,
     pagination,
     loading: loading.onQuerypage,
+    onSearch,
     onTableChange,
     onAdd,
     onUpdate,
@@ -323,7 +350,18 @@ function useSource(props) {
     form,
     table,
     curd,
+    api,
+    loading,
+    dataSource,
+    onAdd,
+    onUpdate,
+    onDelete,
+    onDeletes,
+    onQueryById,
+    onDownload,
+    onSave,
     onSearch,
+    onReset,
     onTableChange
   };
 }

package/es/components/source/types/source.type.d.ts

@@ -12,8 +12,7 @@ export declare type ApiObjType = {
 export declare type SourceOption = {
     baseUrl?: string;
     exportName?: string | ComputedRef;
-    immediateSearch?: boolean;
-    beforeUpdate?: () => boolean | undefined;
+    beforeUpdate?: (model: Recordable) => boolean | Recordable | undefined;
     afterUpdate?: () => void;
     api?: ApiObjType;
 };
@@ -22,12 +21,9 @@ export declare type orderType = {
     order: 'asc' | 'desc';
 };
 export declare type BaseDataType = {
-    entityDTO?: any;
-    pageDTO?: {
-        pageNo: Number;
-        pageSize: Number;
-    } | null;
-    orderDTOs: orderType[];
+    pageNumber: Number;
+    pageSize: Number;
+    [key: string]: any;
 };
 export declare type TableParamsType = {
     pagination: any;