ct-component-plus 0.0.35 → 0.0.37

package/package.json

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

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

@@ -128,8 +128,10 @@ export default {
     const getPageData = async (download = false) => {
       let dataP = {
         ...state.searchParams,
-        ...state.sortObj,
       };
+      if (state.sortObj?.order && state.sortObj?.prop) {
+        dataP.sortObj = state.sortObj;
+      }
       if (props.pageSize) {
         dataP.pageSize = props.pageSize;
         dataP.pageNo = state.pageNo;

package/packages/components/table/src/index.js

@@ -36,12 +36,12 @@ export const tableProps = {
     type: Object,
     default: () => {
       return {
-        width:'88'
+        width: '88'
       }
     }
   },
   teleportDom: {
-    type:[String, Node],
+    type: [String, Node],
   },
   defaultSort: {
     type: Object,
@@ -56,4 +56,5 @@ export const tableProps = {
     type: String,
     default: "暂无数据",
   },
+  mergeList: Array,
 }

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

@@ -8,15 +8,13 @@
         :span-method="spanMethod"
         @selection-change="handleSelectChange"
         row-key="rowKey"
-        v-bind="$attrs"
-      >
+        v-bind="$attrs">
         <el-table-column
           v-if="isMultiSelect"
           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"
@@ -29,16 +27,14 @@
           :align="column.align || 'center'"
           :fixed="column.fixed || false"
           show-overflow-tooltip
-          v-bind="column.rawAttr || {}"
-        >
+          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">
@@ -46,8 +42,7 @@
               :name="column.value"
               :value="scope.row[column.value]"
               v-bind="scope"
-              :column="column"
-            >
+              :column="column">
               <span>{{ scope.row[column.value] }}</span>
             </slot>
             <el-table-column
@@ -62,15 +57,13 @@
               :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"
-                >
+                  :column="column1">
                   <span>{{ scope.row[column1.value] }}</span>
                 </slot>
               </template>
@@ -82,8 +75,7 @@
             <component
               :is="tableEmptyDom"
               v-if="tableEmptyDom"
-              :text="emptyText"
-            >
+              :text="emptyText">
             </component>
             <span v-else>{{ emptyText }}</span>
           </slot>
@@ -95,8 +87,7 @@
         :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>
@@ -174,7 +165,7 @@ let spanObj = {};
 watch(
   () => props.mergeList,
   (newVal, oldVal) => {
-    let res = {};
+    let spanObjRes = {};
     if (Array.isArray(newVal)) {
       newVal.forEach((item) => {
         const { row, col, span } = item;
@@ -187,10 +178,10 @@ watch(
             let res = i === 1 && j === 1 ? span : [0, 0];
             const rowKey = row + i - 1;
             const colKey = col + j - 1;
-            if (res[rowKey]) {
-              res[rowKey][colKey] = res;
+            if (spanObjRes[rowKey]) {
+              spanObjRes[rowKey][colKey] = res;
             } else {
-              res[rowKey] = {
+              spanObjRes[rowKey] = {
                 [colKey]: res,
               };
             }
@@ -198,7 +189,7 @@ watch(
         }
       });
     }
-    spanObj = res;
+    spanObj = spanObjRes;
   },
   { immediate: true }
 );
@@ -252,7 +243,7 @@ onMounted(() => {
 
 defineExpose({ tableRef });
 </script>
-<style lang='less' scoped>
+<style lang="less" scoped>
 .ct-table__body {
   width: 100%;
 }
@@ -262,4 +253,4 @@ defineExpose({ tableRef });
   display: flex;
   justify-content: flex-end;
 }
-</style>
+</style>