ct-component-plus 0.0.24 → 0.0.26

package/package.json

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

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

@@ -12,6 +12,7 @@ import {
 import { useNamespace } from "../../../hooks";
 import SearchBox from "../../search-box";
 import TableBox from "../../table";
+import CtEmpty from "../../empty";
 import CtPagination from "../../pagination";
 import CtLoading from "../../loading";
 import TableTitle from "./modules/TableTitle.vue";
@@ -70,6 +71,12 @@ export default {
         return {};
       },
     },
+    pageProps: {
+      type: Object,
+      default: () => {
+        return {};
+      },
+    },
   },
   setup(props, { emit, slots, expose }) {
     const baseDao = inject("$ctBaseDao");
@@ -88,6 +95,7 @@ export default {
       searchParams: {},
       pageLoading: false,
       downloadLoading: false,
+      pageError: false,
     });
     const downloadLoading = ref(false);
     provide("downloadLoading", downloadLoading);
@@ -117,6 +125,7 @@ export default {
         dataP.pageSize = props.pageSize;
         dataP.pageNo = state.pageNo;
       }
+      state.pageError = false;
       state.pageLoading = true;
       if (isFunction(props.cbs.doSearch)) {
         await props.cbs.doSearch(dataP);
@@ -150,8 +159,8 @@ export default {
           }
           tableProps.tableData = tableData || list || [];
         })
-        .finally(() => {
-          state.pageLoading = false;
+        .catch(() => {
+          state.pageError = true;
         });
       state.pageLoading = false;
     };
@@ -163,10 +172,10 @@ export default {
     const tableProps = reactive({
       columnData: props.tableProps.columnData || [],
       tableData: [
-        { index: 1, result: 3, status: "暂未处理" },
-        { index: 2, result: 0, status: "无需处理" },
-        { index: 3, result: 3, status: "处理中" },
-        { index: 4, result: 0, status: "处理完成" },
+        // { index: 1, result: 3, status: "暂未处理" },
+        // { index: 2, result: 0, status: "无需处理" },
+        // { index: 3, result: 3, status: "处理中" },
+        // { index: 4, result: 0, status: "处理完成" },
       ],
     });
     const sortList = computed(() => {
@@ -247,58 +256,64 @@ export default {
             slots.content
               ? slots.content()
               : h("div", { class: ns.em("content", "default") }, [
-                  h(
-                    CtLoading,
-                    { "is-load": state.pageLoading, ...props.loadProps },
-                    {
-                      default: () => [
-                        slots.contentBefore ? slots.contentBefore() : null,
-                        slots.tableTop
-                          ? slots.tableTitle()
-                          : h(
-                              TableTitle,
-                              {
-                                total: state.total,
-                                pageSize: state.pageSize,
-                                handleList: props.tableHandleList,
-                                sortList: sortList.value,
-                                sortObj: state.sortObj,
-                                "onUpdate:sortObj": (val) => {
-                                  state.sortObj = val;
+                  state.pageError
+                    ? h(CtEmpty, {
+                        class: ns.e("error-empty"),
+                        innerText:
+                          props.pageProps?.pageErrorText || "接口请求错误",
+                      })
+                    : h(
+                        CtLoading,
+                        { "is-load": state.pageLoading, ...props.loadProps },
+                        {
+                          default: () => [
+                            slots.contentBefore ? slots.contentBefore() : null,
+                            slots.tableTop
+                              ? slots.tableTitle()
+                              : h(
+                                  TableTitle,
+                                  {
+                                    total: state.total,
+                                    pageSize: state.pageSize,
+                                    handleList: props.tableHandleList,
+                                    sortList: sortList.value,
+                                    sortObj: state.sortObj,
+                                    "onUpdate:sortObj": (val) => {
+                                      state.sortObj = val;
+                                    },
+                                    onChangeSort: changeSort,
+                                    onDownload: doDownload,
+                                    ref: tableTitleRef,
+                                  },
+                                  {
+                                    tableTitle: slots.tableTitle,
+                                    tableDesc: slots.tableDesc,
+                                  }
+                                ),
+                            h("div", { class: ns.e("table") }, [
+                              h(
+                                TableBox,
+                                {
+                                  "table-props": tableProps,
+                                  ...props.tableProps,
+                                  ref: tableRef,
                                 },
-                                onChangeSort: changeSort,
-                                onDownload: doDownload,
-                                ref: tableTitleRef,
-                              },
-                              {
-                                tableTitle: slots.tableTitle,
-                                tableDesc: slots.tableDesc,
-                              }
-                            ),
-                        h("div", { class: ns.e("table") }, [
-                          h(
-                            TableBox,
-                            {
-                              "table-props": tableProps,
-                              ...props.tableProps,
-                              ref: tableRef,
-                            },
-                            { ...getSelfSlots("table") }
-                          ),
-                          h(CtPagination, {
-                            class: ns.e("pagination"),
-                            pageSize: state.pageSize,
-                            total: state.total,
-                            "current-page": state.pageNo,
-                            "onUpdate:current-page": changePageNo,
-                            ...props.paginationProps,
-                            ref: paginationRef,
-                          }),
-                        ]),
-                        slots.contentAfter ? slots.contentAfter() : null,
-                      ],
-                    }
-                  ),
+                                { ...getSelfSlots("table") }
+                              ),
+                              h(CtPagination, {
+                                class: ns.e("pagination"),
+                                pageSize: state.pageSize,
+                                total: state.total,
+                                "current-page": state.pageNo,
+                                "onUpdate:current-page": changePageNo,
+                                ...props.paginationProps,
+                                ref: paginationRef,
+                              }),
+                            ]),
+                            slots.contentAfter ? slots.contentAfter() : null,
+                          ],
+                        }
+                      ),
                 ]),
           ]),
         ]),

package/packages/components/select/src/select.vue

@@ -138,6 +138,9 @@ const emptyText = computed(() => {
     ? props.noMatchText || "暂无匹配数据"
     : props.noDataText || "暂无数据";
 });
+const getUseLabel = (label) => {
+  return typeof label === "string" ? label : String(label);
+};
 
 watch(
   () => selectText.value,
@@ -170,7 +173,7 @@ watchEffect(async () => {
     noFilterOptions.value = true;
   }
 });
-watchEffect(async () => {
+const watchServiceHandle = async () => {
   // 通过api获取数据，会监听api以及serviceParams的改变（收集到的依赖改变）都会触发重新查询
   const cbs = props.cbs || {};
   if (props.api && baseDao) {
@@ -194,11 +197,11 @@ watchEffect(async () => {
         }
         data = data.map((item) => {
           if (self) {
-            return { label: item, value: item };
+            return { label: getUseLabel(item), value: item };
           }
           return {
             ...item,
-            label: item[label],
+            label: getUseLabel(item[label]),
             value: item[value],
           };
         });
@@ -221,7 +224,21 @@ watchEffect(async () => {
       }
     } catch (error) {}
   }
-});
+};
+watch(
+  [
+    () => props.api,
+    () => props.serviceParams,
+    () => props.serviceMethod,
+    () => props.mapObj,
+  ],
+  (newVal, oldVal) => {
+    watchServiceHandle();
+  },
+  {
+    immediate: true,
+  }
+);
 const checkedAll = useCheckedAll(filterOptions, valueModel, {
   onCheckedAll: (falg) => {
     if (!keyword.value && !falg) {