ct-component-plus 1.5.0 → 2.0.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ct-component-plus",
   "private": false,
-  "version": "1.5.0",
+  "version": "2.0.0",
   "type": "module",
   "main": "packages/components/index.js",
   "files": [
@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "cingta-icon": "^2.1.6",
-    "element-plus": "~2.4.4",
+    "element-plus": "^2.5.0",
     "vue": "^3.2.47"
   },
   "devDependencies": {

package/packages/components/select/src/select.vue

@@ -155,9 +155,9 @@ const selectText = computed(() => {
       result = selectObj.value.map((item) => item.label).join(cnt);
     }
   }
-  nextTick(() => {
-    selectRef.value.$refs.reference.input.value = result;
-  });
+  // nextTick(() => {
+  //   selectRef.value.$refs.reference.input.value = result;
+  // });
   return result;
 });
 const emptyText = computed(() => {
@@ -358,7 +358,9 @@ defineExpose({
 </script>
 <style lang="less">
 .ct-select {
-  width: 214px;
+  &.el-select {
+    width: 214px;
+  }
   &__top {
     padding: 0 16px;
     font-size: var(--ct-font-size);
@@ -407,7 +409,7 @@ defineExpose({
     z-index: 3;
     right: var(--ct-component-inner-padding);
     top: 50%;
-    height: calc(var(--ct-component-size) - 2px);
+    height: calc(var(--ct-component-size) - 8px);
     transform: translateY(-50%);
     background-color: #fff;
   }
@@ -419,18 +421,24 @@ defineExpose({
     color: var(--ct-color-grey-sub);
   }
   &.is-multiple {
-    // &::after {
-    //   content: attr(select-text);
-    //   position: absolute;
-    //   left: var(--ct-component-inner-padding);
-    //   right: calc(var(--ct-component-inner-padding) * 2);
-    //   top: 50%;
-    //   transform: translateY(-50%);
-    //   text-overflow: ellipsis;
-    //   overflow: hidden;
-    //   white-space: nowrap;
-    //   cursor: pointer;
-    // }
+    &::after {
+      content: attr(select-text);
+      position: absolute;
+      left: var(--ct-component-inner-padding);
+      right: calc(var(--ct-component-inner-padding) * 2);
+      top: 50%;
+      transform: translateY(-50%);
+      text-overflow: ellipsis;
+      overflow: hidden;
+      white-space: nowrap;
+      cursor: pointer;
+    }
+    .el-select__placeholder.is-transparent {
+      display: block;
+    }
+    .el-select__selected-item {
+      display: none;
+    }
   }
 }
 </style>

package/packages/components/year-select/src/year-select.vue

@@ -135,9 +135,12 @@ const getYearList = () => {
   }
   yearList.value = yearArr;
 };
-watch(() => props.range, () => {
-  getYearList();
-})
+watch(
+  () => props.range,
+  () => {
+    getYearList();
+  }
+);
 const filterHandleE = (str) => {
   //处理结束年
   if (judgeYear(str) && judgeRange(str)) {
@@ -207,7 +210,7 @@ onMounted(() => {
   getYearList();
 });
 </script>
-<style lang='less'>
+<style lang="less">
 .ct-year-select {
   --el-select-input-focus-border-color: transparent;
   --ct-year-select-select-inner-box-shadow: none;
@@ -273,5 +276,15 @@ onMounted(() => {
       }
     }
   }
+  .el-select__wrapper {
+    padding: 1px 12px;
+    min-height: 30px;
+    box-shadow: var(--ct-year-select-select-inner-box-shadow);
+    &.is-focused,
+    &.is-hovering:not(.is-focused),
+    &.is-disabled {
+      box-shadow: var(--ct-year-select-select-inner-box-shadow);
+    }
+  }
 }
-</style>
+</style>

package/packages/style/init.less

@@ -105,33 +105,44 @@
   --ct-color-bluegray-11: #434852;
   --ct-color-bluegray-12: #2c2e33;
   --ct-color-bluegray-13: #131314;
+
+  --ct-color-red: #F55549;
+  --ct-color-tigerlily: #FF643E;
+  --ct-color-orange: #FF9233;
+  --ct-color-apricot: #FFAD2C;
+  --ct-color-gold: #FFC300;
+  --ct-color-lemon: #FFE600;
+  --ct-color-lime: #BFE600;
+  --ct-color-green: #75CE5F;
+  --ct-color-cyan: #22C2B7;
+  --ct-color-skyblue: #42A6FF;
+  --ct-color-blue: #4D64FF;
+  --ct-color-violet: #644DFF;
+  --ct-color-purple: #AC4DFF;
+  --ct-color-magenta: #E65CE6;
+  --ct-color-white: #FFFFFF;
+
   // ------red-color-------
-  --ct-color-red-1: #fef7f6;
-  --ct-color-red-2: #ffe2e0;
-  --ct-color-red-3: #ffc6c2;
-  --ct-color-red-4: #ffa9a3;
-  --ct-color-red-5: #ff8980;
-  --ct-color-red-6: #f55549;
-  --ct-color-red-7: #db382c;
-  --ct-color-red-8: #c22013;
+  --ct-color-red-1: #FEF4F4;
+  --ct-color-red-2: #FFE2E0;
+  --ct-color-red-3: #FFC6C2;
+  --ct-color-red-4: #FFA9A3;
+  --ct-color-red-5: #FF7B70;
+  --ct-color-red: #F55549;
   //  ------orange-color-------
-  --ct-color-orange-1: #fff7f0;
-  --ct-color-orange-2: #ffe9d6;
-  --ct-color-orange-3: #ffd4ae;
-  --ct-color-orange-4: #ffbb80;
-  --ct-color-orange-5: #ffa85c;
-  --ct-color-orange-6: #ff9233;
-  --ct-color-orange-7: #e67717;
-  --ct-color-orange-8: #cc5f00;
+  --ct-color-orange-1: #FFF7F0;
+  --ct-color-orange-2: #FFE9D6;
+  --ct-color-orange-3: #FFD9B8;
+  --ct-color-orange-4: #FFBB80;
+  --ct-color-orange-5: #FFA85C;
+  --ct-color-orange: #FF9233;
   //  ------gold-color-------
-  --ct-color-gold-1: #fffaeb;
-  --ct-color-gold-2: #fff5d6;
-  --ct-color-gold-3: #ffecad;
-  --ct-color-gold-4: #ffe180;
-  --ct-color-gold-5: #ffd95c;
-  --ct-color-gold-6: #ffc300;
-  --ct-color-gold-7: #e6af00;
-  --ct-color-gold-8: #cc9c00;
+  --ct-color-gold-1: #FFFAEB;
+  --ct-color-gold-2: #FFF5D6;
+  --ct-color-gold-3: #FFEDB3;
+  --ct-color-gold-4: #FFE180;
+  --ct-color-gold-5: #FFD95C;
+  --ct-color-gold: #FFC300;
   //  ------yellow-color-------
   --ct-color-yellow-1: #fffff0;
   --ct-color-yellow-2: #fcfcd4;
@@ -160,50 +171,40 @@
   --ct-color-green-7: #53cc45;
   --ct-color-green-8: #42b336;
   //  ------cyan-color-------
-  --ct-color-cyan-1: #f0fcfc;
-  --ct-color-cyan-2: #dcfafa;
-  --ct-color-cyan-3: #c9f5f5;
-  --ct-color-cyan-4: #a4ebeb;
-  --ct-color-cyan-5: #79e0e0;
-  --ct-color-cyan-6: #3dcccc;
-  --ct-color-cyan-7: #24b3b3;
-  --ct-color-cyan-8: #0f9999;
+  --ct-color-cyan-1: #EDFCFB;
+  --ct-color-cyan-2: #DCFAF8;
+  --ct-color-cyan-3: #BDF2EF;
+  --ct-color-cyan-4: #97E6E0;
+  --ct-color-cyan-5: #6BD6CF;
+  --ct-color-cyan: #22C2B7;
   //  ------skyblue-color-------
-  --ct-color-skyblue-1: #f0f9ff;
-  --ct-color-skyblue-2: #e0f3ff;
-  --ct-color-skyblue-3: #c7e9ff;
-  --ct-color-skyblue-4: #9ed8ff;
-  --ct-color-skyblue-5: #66c1ff;
-  --ct-color-skyblue-6: #33adff;
-  --ct-color-skyblue-7: #0092f5;
-  --ct-color-skyblue-8: #007dd1;
+  --ct-color-skyblue-1: #F0F8FF;
+  --ct-color-skyblue-2: #E0F1FF;
+  --ct-color-skyblue-3: #C2E2FF;
+  --ct-color-skyblue-4: #99CFFF;
+  --ct-color-skyblue-5: #66B8FF;
+  --ct-color-skyblue: #42A6FF;
   //  ------blue-color-------
-  --ct-color-blue-1: #f5f6ff;
-  --ct-color-blue-2: #e6e9ff;
-  --ct-color-blue-3: #ccd2ff;
-  --ct-color-blue-4: #b8c1ff;
-  --ct-color-blue-5: #7a8cff;
-  --ct-color-blue-6: #4d64ff;
-  --ct-color-blue-7: #2e46e6;
-  --ct-color-blue-8: #152ed6;
+  --ct-color-blue-1: #F2F5FF;
+  --ct-color-blue-2: #E6ECFF;
+  --ct-color-blue-3: #CCD8FF;
+  --ct-color-blue-4: #A8BDFF;
+  --ct-color-blue-5: #738FFF;
+  --ct-color-blue: #4D64FF;
+  //  ------violet-color-------
+  --ct-color-violet-1: #F4F2FF;
+  --ct-color-violet-2: #E9E6FF;
+  --ct-color-violet-3: #D3CCFF;
+  --ct-color-violet-4: #B8ADFF;
+  --ct-color-violet-5: #8C7AFF;
+  --ct-color-violet: #644DFF;
   //  ------purple-color-------
-  --ct-color-purple-1: #faf5ff;
-  --ct-color-purple-2: #f1e0ff;
-  --ct-color-purple-3: #e7ccff;
-  --ct-color-purple-4: #d9adff;
-  --ct-color-purple-5: #c17aff;
-  --ct-color-purple-6: #ac4dff;
-  --ct-color-purple-7: #902ee6;
-  --ct-color-purple-8: #7614cc;
-  //  ------magenta-color-------
-  --ct-color-magenta-1: #fff5ff;
-  --ct-color-magenta-2: #fae1fa;
-  --ct-color-magenta-3: #f5cef5;
-  --ct-color-magenta-4: #f0b2f0;
-  --ct-color-magenta-5: #eb8deb;
-  --ct-color-magenta-6: #e65ce6;
-  --ct-color-magenta-7: #cc3dcc;
-  --ct-color-magenta-8: #b324b3;
+  --ct-color-purple-1: #F9F2FF;
+  --ct-color-purple-2: #F1E0FF;
+  --ct-color-purple-3: #E7CCFF;
+  --ct-color-purple-4: #D6A8FF;
+  --ct-color-purple-5: #BF75FF;
+  --ct-color-purple: #AC4DFF;
 }
 
 body {