ct-component-plus 0.0.40 → 0.0.42

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ct-component-plus",
   "private": false,
-  "version": "0.0.40",
+  "version": "0.0.42",
   "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.6",
     "element-plus": "~2.3.4",
     "vue": "^3.2.47"
   },

package/packages/components/button/src/button.vue

@@ -92,7 +92,7 @@ defineExpose({
     background-color: #fff;
     color: var(--ct-color-primary);
     &:hover:not(.is-disabled) {
-      background-color: var(--ct-color-primary-bg);
+      background-color: #f3f4ff;
     }
     &.is-disabled {
       border-color: var(--ct-color-disabled);

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

@@ -210,7 +210,7 @@ onMounted(() => {});
       box-shadow: 0 0 0 1px var(--ct-search-box-border-color);
       border-radius: var(--ct-border-radius);
       &:hover {
-        --ct-search-box-border-color: var(--ct-color-grey-transition);
+        --ct-search-box-border-color: var(--ct-color-grey-sub);
       }
       &:focus-within {
         --ct-search-box-border-color: var(--ct-color-primary);

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

@@ -40,6 +40,10 @@ export const tableProps = {
       }
     }
   },
+  selectableFn: {
+    //判断每行是否可选
+    type: Function
+  },
   teleportDom: {
     type: [String, Object],
   },
@@ -59,4 +63,5 @@ export const tableProps = {
   mergeList: Array,
   alignLeftKeys: Array,
   alignRightKeys: Array,
+  rowKey: String,
 }

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

@@ -7,14 +7,15 @@
         :data="showData"
         :span-method="spanMethod"
         @selection-change="handleSelectChange"
-        row-key="rowKey"
+        :row-key="rowKey || 'rowKey'"
         v-bind="$attrs">
         <el-table-column
           v-if="isMultiSelect"
           type="selection"
           width="88"
           v-bind="multiSelectAttr"
-          :reserve-selection="true">
+          :reserve-selection="true"
+          :selectable="judgeSelectable">
         </el-table-column>
         <el-table-column
           v-for="(column, index) in columnData"
@@ -119,12 +120,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,
@@ -246,6 +248,13 @@ watch(
 function handleSelectChange(val) {
   selectedArr.value = copyObj(val);
 }
+function judgeSelectable(row) {
+  if (props.selectableFn) {
+    return props.selectableFn(row);
+  } else {
+    return true;
+  }
+}
 
 const teleportStatus = ref(false);
 const sortObj = computed({

package/packages/echarts/base.js

@@ -32,6 +32,10 @@ export const baseOption = {
     bottom: 0,
     itemWidth: 14,
     itemHeight: 14,
+    itemStyle: {
+      borderWidth: 0,
+    },
+    inactiveBorderWidth: 0,
     itemGap: 32,
     borderRadius: 2,
     icon: "roundRect",

package/packages/style/element.less

@@ -589,7 +589,8 @@
     font-size: 15px;
     --el-table-header-text-color: var(--ct-font-color);
     --el-table-header-bg-color: #F0F3F9;
-    --el-table-row-hover-bg-color: #F7F9FD;
+    // --el-table-row-hover-bg-color: #F7F9FD;
+    --el-table-row-hover-bg-color: #FAFAFC;
 
     .cell {}