ct-component-plus 0.0.27 → 0.0.29

package/package.json

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

package/packages/components/index.js

@@ -77,5 +77,5 @@ const install = function (app, options) {
 export default {
   install
 }
-
+export { CtMessage }
 export * from 'element-plus'

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;

package/packages/components/search-box/src/search-box.vue

@@ -10,33 +10,28 @@
             ns.is('outer-border', outerBorder),
           ]"
           :key="item.param || index"
-          :style="{ ...getComponentStyle(item) }"
-        >
+          :style="{ ...getComponentStyle(item) }">
           <slot v-bind="getComponentSlotScope(item)">
             <slot
               name="item-before"
-              v-bind="getComponentSlotScope(item)"
-            ></slot>
+              v-bind="getComponentSlotScope(item)"></slot>
             <span
               :class="[
                 ns.e('item-label'),
                 ns.is('required', item.required),
                 ns.is('outer-border', outerBorder),
-              ]"
-            >
+              ]">
               <span>{{ item.label }}</span>
               <span :class="[ns.is('required')]" v-if="!outerBorder">：</span>
             </span>
             <div :class="[ns.e('item-component')]">
               <slot
                 :name="item.componentName || item.param"
-                v-bind="getComponentSlotScope(item)"
-              >
+                v-bind="getComponentSlotScope(item)">
                 <component
                   :is="getComponent(item.type)"
                   v-model="searchParamsCurrent[item.param]"
-                  v-bind="getComponentProps(item)"
-                >
+                  v-bind="getComponentProps(item)">
                 </component>
               </slot>
             </div>
@@ -173,7 +168,7 @@ defineExpose({
 });
 onMounted(() => {});
 </script>
-<style lang='less'>
+<style lang="less">
 .ct-search-box {
   --ct-search-box-item-margin-right: 16px;
   --ct-search-box-item-margin-top: 14px;
@@ -201,6 +196,7 @@ onMounted(() => {});
     --ct-search-box-item-component-width: 100%;
     &.is-outer-border {
       --ct-font-size: 13px;
+      --el-font-size-base: var(--ct-font-size, 13px);
       --ct-search-box-border-color: var(--ct-border-color);
       --ct-search-box-inner-border-color: transparent;
       font-size: var(--ct-font-size);
@@ -246,4 +242,4 @@ onMounted(() => {});
     }
   }
 }
-</style>
+</style>