@dt-frames/ui 2.0.6 → 2.0.8

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,