n20-common-lib 2.2.42 → 2.2.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.2.42",
+  "version": "2.2.44",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/assets/css/cl-form-item.scss

@@ -530,6 +530,21 @@ $--input-max: 224px;
 .el-range-editor {
   position: relative;
 
+  &.el-input__inner {
+    width: $--input-width;
+    padding: 3px 30px 3px 6px;
+  }
+
+  .el-range-input {
+    flex: 1 1 auto;
+    text-align: left;
+    background: $--input-background-color;
+
+    &::placeholder {
+      text-align: center;
+    }
+  }
+
   .el-range__icon {
     position: absolute;
     height: 100%;
@@ -540,13 +555,17 @@ $--input-max: 224px;
     font-size: 16px;
     transition: all 0.3s;
   }
-
   &.has-value {
     &:hover {
       .el-range__icon {
         display: none;
       }
     }
+    &.is-disabled {
+      .el-range__icon {
+        display: initial;
+      }
+    }
   }
 
   .el-range__close-icon {
@@ -558,30 +577,14 @@ $--input-max: 224px;
     color: #cccccc;
     transition: all 0.3s;
   }
-}
-
-.el-range-editor.el-input__inner {
-  padding: 3px 6px;
-}
-
-.el-range-editor.el-input__inner {
-  width: $--input-width;
-  padding-right: 30px;
-}
 
-.el-range-editor .el-range-input {
-  flex: 1 1 auto;
-  text-align: left;
-
-  &::placeholder {
-    text-align: center;
+  &:not(.has-value) {
+    .el-range-separator {
+      color: #cccccc;
+    }
   }
 }
 
-.el-range-editor:not(.has-value) .el-range-separator {
-  color: #cccccc;
-}
-
 .el-date-table td {
   & span {
     border-radius: 2px;

package/src/components/SelectDatePickerPro/index.vue

@@ -15,7 +15,7 @@
       clearable
       v-bind="$attrs"
       :placeholder="'选择日' | $lc"
-      v-on="$listeners"
+      @change="$listeners.change"
     />
     <date-picker
       v-if="type === '周' && selectList.includes(type)"
@@ -27,7 +27,7 @@
       :picker-options="attrs"
       :default-time="['00:00:00', '23:59:59']"
       :placeholder="'选择周' | $lc"
-      v-on="$listeners"
+      @change="$listeners.change"
     />
 
     <date-picker
@@ -40,14 +40,9 @@
       :editable="false"
       v-bind="$attrs"
       :placeholder="'选择月' | $lc"
-      v-on="$listeners"
-    />
-    <quarter-date-picker
-      v-if="type === '季'"
-      key="quarter"
-      v-model="quarter"
-      :disabled-date="this.attrs.disabledDate"
+      @change="$listeners.change"
     />
+    <quarter-date-picker v-if="type === '季'" key="quarter" v-model="quarter" :disabled-date="attrs.disabledDate" />
     <date-picker
       v-if="type === '年' && selectList.includes(type)"
       key="year"
@@ -58,7 +53,7 @@
       value-format="yyyy"
       :editable="false"
       :placeholder="'选择年' | $lc"
-      v-on="$listeners"
+      @change="$listeners.change"
     />
   </div>
 </template>