ct-component-plus 0.0.23 → 0.0.25

package/package.json

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

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

@@ -6,17 +6,10 @@
 </template>
 
 <script setup>
-import { reactive, onMounted, inject, watch, unref } from "vue";
+import { inject, unref } from "vue";
 const downloadLoading = inject("downloadLoading", false);
-watch(
-  () => downloadLoading,
-  (val) => {
-    console.log("watch", val);
-  }
-);
 const emit = defineEmits(["download"]);
 const download = () => {
-  console.log("download", unref(downloadLoading));
   if (unref(downloadLoading)) return;
   emit("download");
 };

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

@@ -21,6 +21,7 @@
               :class="[ns.e('handle-item'), ns.is(item, true)]"
               v-for="(item, index) in handleList"
               :key="index"
+              v-show="handleItemShow(item)"
             >
               <component
                 v-if="handleItemShow(item)"

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

@@ -7,6 +7,7 @@ import {
   computed,
   resolveComponent,
   provide,
+  nextTick,
 } from "vue";
 import { useNamespace } from "../../../hooks";
 import SearchBox from "../../search-box";
@@ -22,6 +23,10 @@ export default {
       type: String,
       default: "",
     },
+    needInit: {
+      type: Boolean,
+      default: true,
+    },
     searchConfig: {
       type: Object,
       default: () => {
@@ -100,7 +105,6 @@ export default {
     // searchBox逻辑
     const searchRef = ref(null);
     const doSearch = (params) => {
-      console.log("doSearch", params);
       state.searchParams = params;
       state.pageNo = 1;
       getPageData();
@@ -177,7 +181,6 @@ export default {
       getPageData();
     };
     const changePageNo = (val) => {
-      console.log("changePageNo", val);
       state.pageNo = val;
       getPageData();
     };
@@ -193,7 +196,18 @@ export default {
       });
       downloadLoading.value = false;
     };
-
+    const clickSearch = () => {
+      if (searchRef.value && isFunction(searchRef.value.doSearch)) {
+        searchRef.value.doSearch();
+      } else {
+        doSearch({});
+      }
+    };
+    if (props.needInit) {
+      nextTick(() => {
+        clickSearch();
+      });
+    }
     const ns = useNamespace("page-component");
     expose({
       searchMethod,
@@ -202,6 +216,7 @@ export default {
       tableRef,
       paginationRef,
       doSearch,
+      clickSearch,
       getPageData,
       changePageNo,
       changeSort,

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

@@ -169,6 +169,7 @@ defineExpose({
   componentAll: componentAll.value,
   getComponent,
   buriedParams,
+  doSearch,
 });
 onMounted(() => {});
 </script>

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) {

package/packages/components/table/src/table.vue

@@ -1,17 +1,22 @@
 <template>
   <div :class="[ns.b()]">
     <div :class="[ns.e('container')]">
-      <el-table ref="tableRef"
+      <el-table
+        ref="tableRef"
         :class="[ns.e('body')]"
         :data="showData"
         :span-method="spanMethod"
         @selection-change="handleSelectChange"
-        row-key="rowKey" v-bind="$attrs">
+        row-key="rowKey"
+        v-bind="$attrs"
+      >
         <el-table-column
           v-if="isMultiSelect"
-          type="selection" width="88"
+          type="selection"
+          width="88"
           v-bind="multiSelectAttr"
-          :reserve-selection="true"></el-table-column>
+          :reserve-selection="true"
+        ></el-table-column>
         <el-table-column
           v-for="(column, index) in columnData"
           :key="column.value + '-' + column.label"
@@ -24,25 +29,26 @@
           :align="column.align || 'center'"
           :fixed="column.fixed || false"
           show-overflow-tooltip
-          v-bind="column.rawAttr || {}">
-          <template #header="scope"
-            v-if="column.slotHeader">
+          v-bind="column.rawAttr || {}"
+        >
+          <template #header="scope" v-if="column.slotHeader">
             <slot
               :name="column.value + 'Header'"
               v-bind="scope"
               :column="column"
               :label="column.label"
-              :value="column.value">
+              :value="column.value"
+            >
             </slot>
           </template>
           <template #default="scope">
-            <slot :name="column.value"
+            <slot
+              :name="column.value"
               :value="scope.row[column.value]"
               v-bind="scope"
-              :column="column">
-              <span>{{
-                scope.row[column.value]
-              }}</span>
+              :column="column"
+            >
+              <span>{{ scope.row[column.value] }}</span>
             </slot>
             <el-table-column
               v-for="(column1, index) in column.children"
@@ -56,16 +62,16 @@
               :align="column1.align || 'center'"
               :fixed="column1.fixed || false"
               show-overflow-tooltip
-              v-bind="column1.rawAttr || {}">
+              v-bind="column1.rawAttr || {}"
+            >
               <template #default="scope">
                 <slot
                   :name="column1.value"
                   :value="scope.row[column1.value]"
                   v-bind="scope"
-                  :column="column1">
-                  <span>{{
-                    scope.row[column1.value]
-                  }}</span>
+                  :column="column1"
+                >
+                  <span>{{ scope.row[column1.value] }}</span>
                 </slot>
               </template>
             </el-table-column>
@@ -73,12 +79,13 @@
         </el-table-column>
         <template #empty>
           <slot name="empty">
-            <component :is="tableEmptyDom"
+            <component
+              :is="tableEmptyDom"
               v-if="tableEmptyDom"
-              :text="emptyText">
+              :text="emptyText"
+            >
             </component>
-            <span v-else>{{ emptyText
-            }}</span>
+            <span v-else>{{ emptyText }}</span>
           </slot>
         </template>
       </el-table>
@@ -88,13 +95,11 @@
         :total="total"
         :current-page="pageNo"
         v-if="pageSize"
-        @current-change="handleCurrentChange"></ct-pagination>
+        @current-change="handleCurrentChange"
+      ></ct-pagination>
     </div>
-    <Teleport :to="`#${teleportDom}`"
-      v-if="teleportDom && teleportStatus">
-      <table-sort
-        v-model:sort-obj="sortObj"
-        :sort-list="sortList"></table-sort>
+    <Teleport :to="`#${teleportDom}`" v-if="teleportDom && teleportStatus">
+      <table-sort v-model:sort-obj="sortObj" :sort-list="sortList"></table-sort>
     </Teleport>
   </div>
 </template>
@@ -243,7 +248,6 @@ const sortList = computed(() => {
 });
 onMounted(() => {
   teleportStatus.value = true; //直到dom挂载完毕再挂载teleport组件
-  console.log(props.teleportDom);
 });
 
 defineExpose({ tableRef });