ct-component-plus 0.0.39 → 0.0.41

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ct-component-plus",
   "private": false,
-  "version": "0.0.39",
+  "version": "0.0.41",
   "type": "module",
   "main": "packages/components/index.js",
   "files": [
@@ -15,7 +15,7 @@
     "docs:build": "vuepress build docs"
   },
   "dependencies": {
-    "cingta-icon": "^2.0.2",
+    "cingta-icon": "^2.1.3",
     "element-plus": "~2.3.4",
     "vue": "^3.2.47"
   },

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

@@ -57,4 +57,7 @@ export const tableProps = {
     default: "暂无数据",
   },
   mergeList: Array,
+  alignLeftKeys: Array,
+  alignRightKeys: Array,
+  rowKey: String,
 }

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

@@ -7,7 +7,7 @@
         :data="showData"
         :span-method="spanMethod"
         @selection-change="handleSelectChange"
-        row-key="rowKey"
+        :row-key="rowKey || 'rowKey'"
         v-bind="$attrs">
         <el-table-column
           v-if="isMultiSelect"
@@ -25,7 +25,7 @@
           :min-width="judgeMinWidth(column, index)"
           :sort-orders="['ascending', 'descending']"
           :sortable="column.sortable ? 'custom' : false"
-          :align="column.align || 'center'"
+          :align="getColumnAlign(column)"
           :fixed="column.fixed || false"
           show-overflow-tooltip
           v-bind="column.rawAttr || {}">
@@ -55,7 +55,7 @@
               :min-width="judgeMinWidth(column1, index)"
               :sort-orders="['ascending', 'descending']"
               :sortable="column1.sortable ? 'custom' : false"
-              :align="column1.align || 'center'"
+              :align="getColumnAlign(column1)"
               :fixed="column1.fixed || false"
               show-overflow-tooltip
               v-bind="column1.rawAttr || {}">
@@ -119,12 +119,13 @@ const handleCurrentChange = (val) => {
   pageNo.value = val;
 };
 const showData = computed(() => {
-  const table = props.tableProps.tableData.map((item, index) => {
-    return {
-      ...item,
-      rowKey: `ct-row-${index}`,
-    };
-  });
+  // const table = props.tableProps.tableData.map((item, index) => {
+  //   return {
+  //     ...item,
+  //     rowKey: `ct-row-${index}`,
+  //   };
+  // });
+  const table = props.tableProps.tableData;
   if (props.pagination) {
     return table.slice(
       (pageNo.value - 1) * pageSize.value,
@@ -137,6 +138,18 @@ const showData = computed(() => {
 const columnData = computed(() => {
   return props.tableProps.columnData || [];
 });
+const getColumnAlign = (column) => {
+  if (column.align) {
+    return column.align;
+  }
+  if (props.alignLeftKeys && props.alignLeftKeys.includes(column.value)) {
+    return "left";
+  }
+  if (props.alignRightKeys && props.alignRightKeys.includes(column.value)) {
+    return "right";
+  }
+  return "center";
+};
 const judgeWidth = (column, index) => {
   // 判断处理column的width
   const columnWidth = props.columnWidth;