@dt-frames/ui 2.0.6 → 2.0.7

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

@@ -15,7 +15,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
         default: () => {};
     };
     layout: {
-        type: import("vue").PropType<"vertical" | "horizontal" | "inline">;
+        type: import("vue").PropType<"vertical" | "inline" | "horizontal">;
         default: string;
     };
     labelWidth: {
@@ -59,7 +59,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
         default: () => {};
     };
     size: {
-        type: import("vue").PropType<"small" | "middle" | "large">;
+        type: import("vue").PropType<"middle" | "small" | "large">;
         default: string;
     };
     disabled: {
@@ -102,10 +102,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
         type: import("vue").PropType<{
             [key: string]: import("vue").Ref<boolean>;
         }>;
-        default: () => {
-            onSearch: import("vue").Ref<boolean>;
-            onReset: import("vue").Ref<boolean>;
-        };
+        default: () => {};
     };
     onSearch: {
         type: import("vue").PropType<(params: Recordable<any>) => void>;
@@ -147,7 +144,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
                 default: () => {};
             };
             layout: {
-                type: import("vue").PropType<"vertical" | "horizontal" | "inline">;
+                type: import("vue").PropType<"vertical" | "inline" | "horizontal">;
                 default: string;
             };
             labelWidth: {
@@ -191,7 +188,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
                 default: () => {};
             };
             size: {
-                type: import("vue").PropType<"small" | "middle" | "large">;
+                type: import("vue").PropType<"middle" | "small" | "large">;
                 default: string;
             };
             disabled: {
@@ -234,10 +231,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
                 type: import("vue").PropType<{
                     [key: string]: import("vue").Ref<boolean>;
                 }>;
-                default: () => {
-                    onSearch: import("vue").Ref<boolean>;
-                    onReset: import("vue").Ref<boolean>;
-                };
+                default: () => {};
             };
             onSearch: {
                 type: import("vue").PropType<(params: Recordable<any>) => void>;
@@ -285,7 +279,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
             default: () => {};
         };
         layout: {
-            type: import("vue").PropType<"vertical" | "horizontal" | "inline">;
+            type: import("vue").PropType<"vertical" | "inline" | "horizontal">;
             default: string;
         };
         labelWidth: {
@@ -329,7 +323,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
             default: () => {};
         };
         size: {
-            type: import("vue").PropType<"small" | "middle" | "large">;
+            type: import("vue").PropType<"middle" | "small" | "large">;
             default: string;
         };
         disabled: {
@@ -372,10 +366,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
             type: import("vue").PropType<{
                 [key: string]: import("vue").Ref<boolean>;
             }>;
-            default: () => {
-                onSearch: import("vue").Ref<boolean>;
-                onReset: import("vue").Ref<boolean>;
-            };
+            default: () => {};
         };
         onSearch: {
             type: import("vue").PropType<(params: Recordable<any>) => void>;
@@ -2181,8 +2172,8 @@ declare const _sfc_main: import("vue").DefineComponent<{
                     validator?: (rule: import("ant-design-vue/lib/form").RuleObject, value: any, callback: (error?: string) => void) => void | Promise<void>;
                 } | any;
                 required?: boolean;
-                validator?: (rule: import("ant-design-vue/lib/form").RuleObject, value: any, callback: (error?: string) => void) => void | Promise<void>;
                 trigger?: "blur" | "change" | ("blur" | "change")[];
+                validator?: (rule: import("ant-design-vue/lib/form").RuleObject, value: any, callback: (error?: string) => void) => void | Promise<void>;
                 transform?: (value: any) => any;
                 warningOnly?: boolean;
                 message?: (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
@@ -2220,7 +2211,6 @@ declare const _sfc_main: import("vue").DefineComponent<{
                 validateTrigger?: string | string[];
             };
             required?: boolean;
-            validator?: (rule: import("ant-design-vue/lib/form").RuleObject, value: any, callback: (error?: string) => void) => void | Promise<void>;
             trigger?: "blur" | "change" | ("blur" & ["change", "blur"]) | ("change" & ["change", "blur"]) | (("blur" | "change")[] & "blur") | (("blur" | "change")[] & "change") | {
                 [x: number]: "blur" | "change";
                 length: 2;
@@ -2292,6 +2282,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
                 0: "change";
                 1: "blur";
             };
+            validator?: (rule: import("ant-design-vue/lib/form").RuleObject, value: any, callback: (error?: string) => void) => void | Promise<void>;
             transform?: (value: any) => any;
             warningOnly?: boolean;
             message?: (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
@@ -2396,7 +2387,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
             default: () => {};
         };
         layout: {
-            type: import("vue").PropType<"vertical" | "horizontal" | "inline">;
+            type: import("vue").PropType<"vertical" | "inline" | "horizontal">;
             default: string;
         };
         labelWidth: {
@@ -2440,7 +2431,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
             default: () => {};
         };
         size: {
-            type: import("vue").PropType<"small" | "middle" | "large">;
+            type: import("vue").PropType<"middle" | "small" | "large">;
             default: string;
         };
         disabled: {
@@ -2483,10 +2474,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
             type: import("vue").PropType<{
                 [key: string]: import("vue").Ref<boolean>;
             }>;
-            default: () => {
-                onSearch: import("vue").Ref<boolean>;
-                onReset: import("vue").Ref<boolean>;
-            };
+            default: () => {};
         };
         onSearch: {
             type: import("vue").PropType<(params: Recordable<any>) => void>;
@@ -2525,7 +2513,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
     setFormValues: (values: Recordable<any>) => Promise<void>;
     appendFormItems: (schema: FormSchema[], prefixName?: string, first?: boolean) => void;
     validate: (nameList: (string | number)[]) => Promise<any>;
-    validateFields: (nameList: (string | number)[]) => Promise<any>;
+    validateFields: (nameList: (string | number)[]) => Promise<void>;
     getFormValues: () => Recordable<any>;
     formActionMethods: {
         setProps: (formProps: FormProps) => any;
@@ -2537,7 +2525,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
         setFormValues: (values: Recordable<any>) => Promise<void>;
         appendFormItems: (schema: FormSchema[], prefixName?: string, first?: boolean) => void;
         validate: (nameList: (string | number)[]) => Promise<any>;
-        validateFields: (nameList: (string | number)[]) => Promise<any>;
+        validateFields: (nameList: (string | number)[]) => Promise<void>;
         getFormValues: () => Recordable<any>;
     };
     getActionsProps: import("vue").ComputedRef<Recordable<any>>;
@@ -2565,7 +2553,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
                         default: () => {};
                     };
                     layout: {
-                        type: import("vue").PropType<"vertical" | "horizontal" | "inline">;
+                        type: import("vue").PropType<"vertical" | "inline" | "horizontal">;
                         default: string;
                     };
                     labelWidth: {
@@ -2609,7 +2597,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
                         default: () => {};
                     };
                     size: {
-                        type: import("vue").PropType<"small" | "middle" | "large">;
+                        type: import("vue").PropType<"middle" | "small" | "large">;
                         default: string;
                     };
                     disabled: {
@@ -2652,10 +2640,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
                         type: import("vue").PropType<{
                             [key: string]: import("vue").Ref<boolean>;
                         }>;
-                        default: () => {
-                            onSearch: import("vue").Ref<boolean>;
-                            onReset: import("vue").Ref<boolean>;
-                        };
+                        default: () => {};
                     };
                     onSearch: {
                         type: import("vue").PropType<(params: Recordable<any>) => void>;
@@ -2796,7 +2781,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
         default: () => {};
     };
     layout: {
-        type: import("vue").PropType<"vertical" | "horizontal" | "inline">;
+        type: import("vue").PropType<"vertical" | "inline" | "horizontal">;
         default: string;
     };
     labelWidth: {
@@ -2840,7 +2825,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
         default: () => {};
     };
     size: {
-        type: import("vue").PropType<"small" | "middle" | "large">;
+        type: import("vue").PropType<"middle" | "small" | "large">;
         default: string;
     };
     disabled: {
@@ -2883,10 +2868,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
         type: import("vue").PropType<{
             [key: string]: import("vue").Ref<boolean>;
         }>;
-        default: () => {
-            onSearch: import("vue").Ref<boolean>;
-            onReset: import("vue").Ref<boolean>;
-        };
+        default: () => {};
     };
     onSearch: {
         type: import("vue").PropType<(params: Recordable<any>) => void>;
@@ -2909,11 +2891,10 @@ declare const _sfc_main: import("vue").DefineComponent<{
 }>> & {
     onRegister?: (...args: any[]) => any;
 }, {
-    size: "small" | "middle" | "large";
     mode: "search" | "dialog";
     autoFetch: boolean;
     model: {};
-    layout: "vertical" | "horizontal" | "inline";
+    layout: "vertical" | "inline" | "horizontal";
     labelWidth: string | number;
     enLabelWidth: string | number;
     labelAlign: "left" | "right";
@@ -2921,6 +2902,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
     wrapperCol: {};
     rowProps: {};
     colProps: {};
+    size: "middle" | "small" | "large";
     disabled: boolean;
     compact: boolean;
     schemas: FormSchema[];

package/es/components/form/src/props.d.ts

@@ -16,7 +16,7 @@ export declare const BasicProps: {
         default: () => {};
     };
     layout: {
-        type: PropType<"vertical" | "horizontal" | "inline">;
+        type: PropType<"vertical" | "inline" | "horizontal">;
         default: string;
     };
     labelWidth: {
@@ -41,8 +41,8 @@ export declare const BasicProps: {
     };
     rowProps: {
         type: PropType<Partial<import("vue").ExtractPropTypes<{
-            align: PropType<"middle" | "top" | "bottom" | "stretch">;
-            justify: PropType<"center" | "start" | "space-around" | "space-between" | "end">;
+            align: PropType<"stretch" | "bottom" | "top" | "middle">;
+            justify: PropType<"space-around" | "space-between" | "center" | "end" | "start">;
             prefixCls: StringConstructor;
             gutter: {
                 type: PropType<import("ant-design-vue/lib/grid/Row").Gutter | [import("ant-design-vue/lib/grid/Row").Gutter, import("ant-design-vue/lib/grid/Row").Gutter]>;
@@ -60,7 +60,7 @@ export declare const BasicProps: {
         default: () => {};
     };
     size: {
-        type: PropType<"small" | "large" | "middle">;
+        type: PropType<"middle" | "small" | "large">;
         default: string;
     };
     disabled: {
@@ -103,10 +103,7 @@ export declare const BasicProps: {
         type: PropType<{
             [key: string]: Ref<boolean>;
         }>;
-        default: () => {
-            onSearch: Ref<boolean>;
-            onReset: Ref<boolean>;
-        };
+        default: () => {};
     };
     onSearch: {
         type: PropType<(params: Recordable) => void>;

package/es/components/modal/index.js

@@ -96,8 +96,6 @@ function useModal(props, setModalData) {
   };
   watchEffect(() => {
     const data = dataTransfer[unref(uidRef)];
-    if (!data)
-      return;
     if (!setModalData || !isFunction(setModalData))
       return;
     nextTick(() => {
@@ -216,7 +214,6 @@ function useDragMove(context) {
       const screenHeight = document.documentElement.clientHeight;
       const dragDomWidth = dragDom.offsetWidth;
       const dragDomheight = dragDom.offsetHeight;
-      console.log(dragDomWidth, dragDomheight, screenHeight, screenWidth);
       const minDragDomLeft = dragDom.offsetLeft;
       const maxDragDomLeft = screenWidth - dragDom.offsetLeft - dragDomWidth;
       const minDragDomTop = dragDom.offsetTop;
@@ -888,8 +885,8 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
               (openBlock(true), createElementBlock(Fragment, null, renderList(__props.buttonList, (button) => {
                 return openBlock(), createElementBlock(Fragment, null, [
                   (button.show === void 0 ? true : button.show) ? withDirectives((openBlock(), createBlock(_component_AButton, {
+                    class: normalizeClass(["items-center", button.class]),
                     type: button.type,
-                    class: normalizeClass(button.class),
                     loading: button.loading,
                     disabled: button.disabled,
                     key: unref(key),
@@ -955,8 +952,8 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       if (props.buttons && props.buttons.length)
         return props.buttons;
       let buttonActions = [
-        { t: "\u4FDD\u5B58", label: props.okText || t("SAVE"), preIcon: "mdi:content-save", type: "primary", flag: "OK" },
-        { t: "\u5173\u95ED", label: props.cancelText || t("CLOSE"), preIcon: "mdi:close", flag: "CANCEL" }
+        { t: "\u5173\u95ED", label: props.cancelText || t("CLOSE"), preIcon: "mdi:close", flag: "CANCEL" },
+        { t: "\u4FDD\u5B58", label: props.okText || t("SAVE"), preIcon: "mdi:content-save", type: "primary", flag: "OK" }
       ];
       if (!props.showSave)
         buttonActions = buttonActions.filter((btn) => btn.flag !== "OK");

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

@@ -107,11 +107,11 @@ declare const _sfc_main: import("vue").DefineComponent<{
         "onHandle-method"?: (...args: any[]) => any;
     }, {
         mode: "search" | "dialog";
-        show: boolean;
-        showAdvancedButton: boolean;
         minShowColumn: number;
-        buttonList: ButtonProps[];
+        showAdvancedButton: boolean;
+        show: boolean;
         isAdvanced: boolean;
+        buttonList: ButtonProps[];
     }>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("handleSave" | "handleCancel")[], "handleSave" | "handleCancel", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     buttons: PropType<ButtonProps[]>;

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: "visible-change" | "height-change" | "cancel" | "save" | "register" | "update:visible", ...args: any[]) => void;
+    emits: (event: "register" | "visible-change" | "height-change" | "cancel" | "save" | "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";
-            show: boolean;
-            showAdvancedButton: boolean;
             minShowColumn: number;
-            buttonList: import("../../form/src/types/form.type").ButtonProps[];
+            showAdvancedButton: boolean;
+            show: boolean;
             isAdvanced: boolean;
+            buttonList: import("../../form/src/types/form.type").ButtonProps[];
         }>;
     }, 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, ("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<{
+}, 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<{
     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

@@ -2,12 +2,13 @@ import { CurdActionType } from '../../curd/src/types/curd.type';
 import { FormActionType } from '../../form/src/types/actions.type';
 import { TableActionType } from '../../table/src/types/actions.type';
 import { DownloadType } from '../../table/src/types/header.type';
+import { Recordable } from "@dt-frames/core";
 import { Key } from "ant-design-vue/es/table/interface";
 import { SourceOption, TableParamsType } from "../types/source.type";
 export declare function useSource(props: SourceOption): {
     form: {
-        onSearch: () => void;
-        onReset: () => void;
+        onSearch: (params?: Recordable) => void;
+        onReset: (params?: Recordable) => void;
         loading: {
             [key: string]: import("vue").Ref<boolean>;
         };
@@ -21,17 +22,17 @@ export declare function useSource(props: SourceOption): {
             total: number;
         }>;
         loading: import("vue").Ref<boolean>;
-        onSearch: () => void;
+        onSearch: (params?: Recordable) => void;
         onTableChange: (params: TableParamsType) => void;
-        onAdd: () => void;
-        onUpdate: (arg: any) => void;
-        onDelete: (arg: any) => void;
+        onOPenAddDialog: () => void;
+        onOpenUpdateDialog: (row?: Recordable) => Promise<void>;
+        onDelete: (row: Recordable) => void;
         onDeletes: (ids: Key[]) => void;
         onDownload: (excelData: DownloadType, extraData?: any[]) => void;
         registerInstance: (instance: TableActionType) => TableActionType;
     };
     curd: {
-        onSave: () => void;
+        onSave: (params?: Recordable) => Promise<boolean>;
         onDeletes: (ids: Key[]) => void;
         onQueryById: (id: Key) => Promise<unknown>;
         registerInstance: (instance: CurdActionType) => CurdActionType;
@@ -41,14 +42,14 @@ export declare function useSource(props: SourceOption): {
         [key: string]: import("vue").Ref<boolean>;
     };
     dataSource: import("vue").Ref<any[]>;
-    onAdd: () => void;
-    onUpdate: (arg: any) => void;
-    onDelete: (arg: any) => void;
+    onOPenAddDialog: () => void;
+    onOpenUpdateDialog: (row?: Recordable) => Promise<void>;
+    onDelete: (row: Recordable) => void;
     onDeletes: (ids: Key[]) => void;
     onQueryById: (id: Key) => Promise<unknown>;
     onDownload: (excelData: DownloadType, extraData?: any[]) => void;
-    onSave: () => void;
-    onSearch: () => void;
-    onReset: () => void;
+    onSave: (params?: Recordable) => Promise<boolean>;
+    onSearch: (params?: Recordable) => void;
+    onReset: (params?: Recordable) => void;
     onTableChange: (params: TableParamsType) => void;
 };

package/es/components/source/index.js

@@ -149,11 +149,14 @@ function useSource(props) {
   let tableInstance = null;
   let formInstance = null;
   let curdInstance = null;
-  function onSearch() {
+  function onSearch(params = {}) {
+    if (!api.queryPage)
+      return;
     tableInstance?.clearSelectedRowKeys();
     const { defaultPageSize } = tableInstance?.getPagination() || {};
     baseData = {
       ...formInstance?.getFormValues() ?? {},
+      ...params,
       pageNumber: 1,
       pageSize: defaultPageSize
     };
@@ -161,9 +164,10 @@ function useSource(props) {
     loading.onQuerypage.value = true;
     setPage();
   }
-  function onReset() {
+  function onReset(params = {}) {
     const { defaultPageSize } = tableInstance?.getPagination() || {};
     baseData = {
+      ...params,
       ...formInstance?.getFormValues() ?? {},
       pageNumber: 1,
       pageSize: defaultPageSize
@@ -173,29 +177,32 @@ function useSource(props) {
     tableInstance?.clearSelectedRowKeys();
     setPage();
   }
-  function setPage(params = {}) {
+  async function setPage(params = {}) {
     if (!api.queryPage)
       return;
-    fetch(api.queryPage, {
-      ...toRaw(baseData),
-      ...params
-    }).then((rsp) => {
-      if (isArray(rsp)) {
-        dataSource.value.splice(0, dataSource.value.length, ...rsp);
+    try {
+      const result = await fetch(api.queryPage, {
+        ...toRaw(baseData),
+        ...params
+      });
+      if (isArray(result)) {
+        dataSource.value.splice(0, dataSource.value.length, ...result);
         return;
       }
-      const { records, total, size, current } = rsp;
+      const { records, total, size, current } = result;
       dataSource.value.splice(0, dataSource.value.length, ...records);
       pagination.value = {
         current,
         pageSize: size || appConf?.ui?.table?.defaultPageSize,
         total
       };
-    }).finally(() => {
+    } catch (err) {
+      console.error(`\u5206\u9875\u67E5\u8BE2\u9519\u8BEF\uFF1A${err}`);
+    } finally {
       loading.onSearch.value = false;
       loading.onQuerypage.value = false;
       loading.onReset.value = false;
-    });
+    }
   }
   function onTableChange(params) {
     const { pagination: pagination2, sort, filter } = params;
@@ -224,53 +231,72 @@ function useSource(props) {
     };
     setPage(filter);
   }
-  function onAdd() {
-    curdInstance && curdInstance.add();
+  function onOPenAddDialog() {
+    curdInstance && curdInstance.openAddDialog();
   }
-  function onUpdate(arg) {
-    curdInstance && curdInstance.update(arg);
+  async function onOpenUpdateDialog(row) {
+    curdInstance && curdInstance.openUpdateDialog(row);
   }
-  function onDelete(arg) {
-    curdInstance && curdInstance.del(arg);
+  function onDelete(row) {
+    if (curdInstance) {
+      curdInstance.del(row);
+    } else {
+      onDeletes([row?.id]);
+    }
   }
   function onQueryById(id) {
     return fetch(api.queryById, { id });
   }
-  function onSave() {
-    let model = curdInstance && curdInstance.curdFormMethods.getFormValues();
-    curdInstance.curdFormMethods.validate().then((rsp) => {
+  async function onSave(params) {
+    const methods = curdInstance ? curdInstance.curdFormMethods : formInstance;
+    if (!methods) {
+      console.log("\u672A\u914D\u7F6E\u8868\u5355\u5B9E\u4F8B\uFF01");
+      return;
+    }
+    let model = {
+      ...params,
+      ...methods.getFormValues()
+    };
+    try {
+      await methods.validate();
       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 === appConf?.http?.okCode) {
+        try {
+          const result = await fetch(api.add, { ...model }, false);
+          if (result?.code === appConf?.http?.okCode) {
             message.success(t("ADD_SUCCESS"));
-            curdInstance.closeModal();
+            curdInstance && curdInstance.closeModal();
             if (queryAfterUpdate !== false)
               onSearch();
           }
+        } catch (err) {
+        } finally {
           loading.onAdd.value = false;
-        });
+        }
       } else {
         loading.onUpdate.value = true;
-        fetch(api.update, { ...model }, false).then((rsp2) => {
-          if (rsp2?.code === appConf?.http?.okCode) {
+        try {
+          const result = await fetch(api.update, { ...model }, false);
+          if (result?.code === appConf?.http?.okCode) {
             message.success(t("UPDATE_SUCCESS"));
-            curdInstance.closeModal();
+            curdInstance && curdInstance.closeModal();
             if (queryAfterUpdate !== false)
               onSearch();
           }
+        } catch (err) {
+        } finally {
           loading.onUpdate.value = false;
-        });
+        }
       }
-    });
+    } catch (err) {
+    } finally {
+    }
   }
   function onDeletes(ids) {
     if (!tableInstance)
@@ -336,8 +362,8 @@ function useSource(props) {
     loading: loading.onQuerypage,
     onSearch,
     onTableChange,
-    onAdd,
-    onUpdate,
+    onOPenAddDialog,
+    onOpenUpdateDialog,
     onDelete,
     onDeletes,
     onDownload,
@@ -356,8 +382,8 @@ function useSource(props) {
     api,
     loading,
     dataSource,
-    onAdd,
-    onUpdate,
+    onOPenAddDialog,
+    onOpenUpdateDialog,
     onDelete,
     onDeletes,
     onQueryById,