lw-cdp-ui 1.3.15 → 1.3.17

package/dist/components/lwSearch/cascader/cascader.vue

@@ -0,0 +1,44 @@
+<template>
+  <el-cascader v-model="value" :options="item.options" :props="item.props" :filterable="item.filterable" />
+</template>
+
+<script>
+export default {
+  emits: ["update:modelValue", "change"],
+  name: "Input",
+  props: {
+    disabled: { // 是否禁止操作
+      type: Boolean,
+      default: false
+    },
+    modelValue: { // 绑定的结果
+      type: [String, Number],
+      default: ""
+    },
+    item: { // 配置项
+      type: Object,
+      default: () => ({})
+    },
+  },
+  data() {
+    return {
+      value: this.modelValue
+    };
+  },
+  watch: {
+    modelValue(newVal) {
+      this.value = newVal;
+    },
+    value(newVal) {
+      const filter = this.item.filter ?? false;
+      if (filter) {
+        newVal = newVal.replace(/ /g, ',').replace(/\,/g, ',').replace(/\，/g, ',').replace(/\n/g, ',');
+      }
+      console.log('%c [ newVal ]-36', 'font-size:13px; background:pink; color:#bf2c9f;', newVal)
+
+      this.$emit('update:modelValue', newVal);
+      this.$emit('change', newVal);
+    }
+  }
+};
+</script>

package/dist/components/lwSearch/index.vue

@@ -79,6 +79,7 @@ import SearchSelect from "./select/select.vue";
 import SearchDate from "./date/date.vue";
 import SearchDates from "./dates/dates.vue";
 import SearchDateRange from "./dateRange/dateRange.vue";
+import SearchCascader from "./cascader/cascader.vue";
 import dayjs from "dayjs";
 
 export default {
@@ -88,6 +89,7 @@ export default {
     SearchDate,
     SearchDates,
     SearchDateRange,
+    SearchCascader
   },
   name: "lwSearch",
   props: {
@@ -203,7 +205,7 @@ export default {
       const remainder = spans % 24;
 
       if (spans > 18) {
-        return !this.isExpandStatus || remainder === 0 || (remainder > 15 && remainder < 24);
+        return !this.isExpandStatus || remainder === 0 || (remainder > 18 && remainder < 24);
       }
 
       return false
@@ -236,6 +238,7 @@ export default {
         date: "SearchDate",
         dates: "SearchDates",
         dateRange: "SearchDateRange",
+        cascader: "SearchCascader",
       };
       return typeList[type] || "SearchInput";
     },
@@ -417,7 +420,7 @@ export default {
     }
 
     .expand-row {
-      padding-bottom: 40px;
+      padding-bottom: 42px;
     }
 
     .control {