ct-component-plus 0.0.36 → 0.0.38

package/package.json

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

package/packages/components/date-picker/src/date-picker.vue

@@ -7,8 +7,7 @@
     :clear-icon="clearIcon"
     :prefix-icon="prefixIcon"
     :unlink-panels="unlinkPanels"
-    v-bind="rawAttr"
-  >
+    v-bind="rawAttr">
     <template #default="cell">
       <slot v-bind="cell"></slot>
     </template>
@@ -32,10 +31,13 @@ const showValue = computed({
   set(newValue) {
     let val = newValue;
     const defaultCount = 24 * 60 * 60 * 1000 - 1000;
+    const rawType = props.rawAttr?.type || attr.type;
     try {
       if (props.valueFormat === "x") {
         if (isFunction(props.addTimestamp)) {
           val = props.addTimestamp(val);
+        } else if (rawType?.includes && rawType.includes("time")) {
+          // 包含自己选时间的情况，不需要添加默认的时间戳
         } else if (isArray(val)) {
           if (isArray(props.addTimestamp)) {
             val = val.map((item, index) => {
@@ -72,5 +74,4 @@ useBuriedParams(props, emit, {
 });
 onMounted(() => {});
 </script>
-<style lang='less'>
-</style>
+<style lang="less"></style>

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

@@ -237,6 +237,7 @@ export default {
       });
     }
     const ns = useNamespace("page-component");
+    console.log(slots);
     expose({
       searchMethod,
       searchRef,
@@ -257,7 +258,7 @@ export default {
             slots.header
               ? slots.header()
               : h("div", { class: ns.em("header", "default") }, [
-                  slots.headerBefore ? slots.headerBefore() : null,
+                  slots["header-before"] ? slots["header-before"]() : null,
                   h("div", { class: ns.e("search") }, [
                     h(
                       SearchBox,
@@ -269,7 +270,7 @@ export default {
                       { ...getSelfSlots("search") }
                     ),
                   ]),
-                  slots.headerAfter ? slots.headerAfter() : null,
+                  slots["header-after"] ? slots["header-after"]() : null,
                 ]),
           ]),
           h("div", { class: ns.e("content") }, [
@@ -287,9 +288,11 @@ export default {
                         { "is-load": state.pageLoading, ...props.loadProps },
                         {
                           default: () => [
-                            slots.contentBefore ? slots.contentBefore() : null,
-                            slots.tableTop
-                              ? slots.tableTitle()
+                            slots["content-before"]
+                              ? slots["content-before"]()
+                              : null,
+                            slots["table-top"]
+                              ? slots["table-top"]()
                               : h(
                                   TableTitle,
                                   {
@@ -306,8 +309,13 @@ export default {
                                     ref: tableTitleRef,
                                   },
                                   {
-                                    tableTitle: slots.tableTitle,
-                                    tableDesc: slots.tableDesc,
+                                    "table-title": slots["table-title"],
+                                    "table-desc": slots["table-desc"],
+                                    "table-handle": slots["table-handle"],
+                                    "table-handle-before":
+                                      slots["table-handle-before"],
+                                    "table-handle-after":
+                                      slots["table-handle-after"],
                                   }
                                 ),
                             h("div", { class: ns.e("table") }, [
@@ -330,7 +338,9 @@ export default {
                                 ref: paginationRef,
                               }),
                             ]),
-                            slots.contentAfter ? slots.contentAfter() : null,
+                            slots["content-after"]
+                              ? slots["content-after"]()
+                              : null,
                           ],
                         }
                       ),

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,16 @@ let spanObj = {};
 watch(
   () => props.mergeList,
   (newVal, oldVal) => {
-    let res = {};
+    /**
+     * 将数组型的合并单元格数据转换成对象型，转换示例如下：
+     * {row: 1, col: 1, span: [2, 2]} =>
+     * {
+     *  1: { 1: [2,2], 2: [0,0] },
+     *  2: { 1: [0,0], 2: [0,0] }
+     * }
+     * 这里的合并数据对象的第一层的key表示对应的行，第二层的key对应的是列， 行和列都是从1开始的索引
+     */
+    let spanObjRes = {};
     if (Array.isArray(newVal)) {
       newVal.forEach((item) => {
         const { row, col, span } = item;
@@ -187,10 +187,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 +198,7 @@ watch(
         }
       });
     }
-    spanObj = res;
+    spanObj = spanObjRes;
   },
   { immediate: true }
 );
@@ -252,7 +252,7 @@ onMounted(() => {
 
 defineExpose({ tableRef });
 </script>
-<style lang='less' scoped>
+<style lang="less" scoped>
 .ct-table__body {
   width: 100%;
 }
@@ -262,4 +262,4 @@ defineExpose({ tableRef });
   display: flex;
   justify-content: flex-end;
 }
-</style>
+</style>