ct-component-plus 0.0.26 → 0.0.28

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ct-component-plus",
   "private": false,
-  "version": "0.0.26",
+  "version": "0.0.28",
   "type": "module",
   "main": "packages/components/index.js",
   "files": [

package/packages/components/page/src/page.vue

@@ -117,6 +117,14 @@ export default {
       state.pageNo = 1;
       getPageData();
     };
+    const setTableProps = (data) => {
+      const { total, tableData, columnData, list } = data;
+      state.total = total || 0;
+      if (columnData) {
+        tableProps.columnData = columnData;
+      }
+      tableProps.tableData = tableData || list || [];
+    };
     const getPageData = async (download = false) => {
       let dataP = {
         ...state.searchParams,
@@ -128,7 +136,14 @@ export default {
       state.pageError = false;
       state.pageLoading = true;
       if (isFunction(props.cbs.doSearch)) {
-        await props.cbs.doSearch(dataP);
+        const res = await props.cbs.doSearch(dataP);
+        if (res) {
+          if (Array.isArray(res)) {
+            tableProps.tableData = res;
+          } else if (typeof res === "object") {
+            setTableProps(res);
+          }
+        }
         state.pageLoading = false;
         return;
       }
@@ -152,12 +167,7 @@ export default {
             const dataHandle = await props.cbs.afterSearch(data);
             if (dataHandle) data = dataHandle;
           }
-          const { total, tableData, columnData, list } = data;
-          state.total = total || 0;
-          if (columnData) {
-            tableProps.columnData = columnData;
-          }
-          tableProps.tableData = tableData || list || [];
+          setTableProps(data);
         })
         .catch(() => {
           state.pageError = true;
@@ -321,7 +331,7 @@ export default {
   },
 };
 </script>
-<style lang='less' scoped>
+<style lang="less">
 .ct-page-component {
   --content-spacing-horizontal: 20px;
   &__header {
@@ -329,7 +339,7 @@ export default {
     padding: var(--content-spacing-horizontal);
     margin-bottom: 16px;
     border-radius: var(--ct-border-radius);
-    :deep(.ct-search-box) {
+    .ct-search-box {
       margin-bottom: 0;
     }
   }
@@ -338,7 +348,7 @@ export default {
     padding: 0 var(--content-spacing-horizontal)
       var(--content-spacing-horizontal);
     border-radius: var(--ct-border-radius);
-    :deep(.ct-table-box) {
+    .ct-table-box {
       margin-bottom: 0;
     }
   }
@@ -348,4 +358,4 @@ export default {
     margin-bottom: 0;
   }
 }
-</style>
+</style>