ct-component-plus 1.6.0 → 2.0.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ct-component-plus",
   "private": false,
-  "version": "1.6.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>