ol-base-components 3.4.1 → 3.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol-base-components",
-  "version": "3.4.1",
+  "version": "3.4.2",
   "private": false,
   "main": "src/package/index.js",
   "bin": {

package/src/App.vue

@@ -5,6 +5,7 @@
       :form-search-data="formSearchData"
       @handleSearch="handleSearch"
       :dragable="false"
+      @onSave="save"
     ></ol-customSearch>
     =========
     <!-- <div>table组件案例</div> -->
@@ -849,6 +850,11 @@ export default {
         done(data);
       }
     },
+    save(e) {
+      console.log(123, e);
+
+      // this.formSearchData.value.usageStatus = null;
+    },
   },
 };
 </script>

package/src/package/formSearch/src/components/SearchConfigDialog.vue

@@ -342,6 +342,14 @@ export default {
       type: Boolean,
       default: false,
     },
+    formSearchData: {
+      type: Object,
+      default: () => {},
+    },
+    formSearch: {
+      type: Object,
+      default: () => {},
+    },
     tableSearch: {
       type: Array,
       default: () => [],
@@ -396,6 +404,8 @@ export default {
   },
   created() {
     this.loadAllDictList();
+    // 重置数据
+    this.setArrVModelReset();
   },
   watch: {
     visible: {
@@ -876,6 +886,16 @@ export default {
       this.configList.push(newItem);
       this.customsDialogVisible = false;
     },
+    // 处理数组和非数组的双向绑定值, 例如：下拉框和日期选择器切换成多选下拉框时间范围时候 双向绑定的值的类型要改变。this.formSearch是实际双向绑定的值
+    setArrVModelReset() {
+      this.tableSearch.forEach(item => {
+        const { value: key, inputType } = item;
+        if (!Object.keys(this.formSearch).includes(key)) return;
+        if (!(inputType === "select" || inputType === "picker")) return; //只有下拉框和日期选择器会有 双向绑定数组
+        delete this.formSearchData.value[key];
+        delete this.formSearch[key];
+      });
+    },
   },
 };
 </script>

package/src/package/formSearch/src/index.vue

@@ -14,6 +14,7 @@
         v-bind="{
           ...(formSearchData.options && formSearchData.options.formProps),
         }"
+        :key="key"
       >
         <!-- 'label-width': '100px', -->
         <div
@@ -179,6 +180,8 @@
       v-if="configDialogVisible"
       :visible.sync="configDialogVisible"
       :table-search="formSearchData.tableSearch"
+      :formSearchData="formSearchData"
+      :formSearch="formSearch"
       :customs="formSearchData.customs"
       @save="handleSaveConfig"
       v-bind="$attrs"
@@ -306,6 +309,7 @@ export default {
       },
       tempBoxData: [],
       optionBox: [],
+      key: 0,
     };
   },
   async created() {
@@ -601,11 +605,15 @@ export default {
       this.configDialogVisible = true;
     },
     handleSaveConfig(configList) {
+      if (this.isCustomSearch) {
+        this.key++; // 下拉框多选时候高度被撑开，改成单选时候高度无法重置。所以重写渲染。这里不管直接全都重写渲染
+      }
       this.formSearchData.tableSearch = configList;
       this.findTableSearch =
         this.formSearchData.tableSearch.length > this.tableSearchSlice
           ? this.formSearchData.tableSearch.slice(0, this.tableSearchSlice)
           : this.formSearchData.tableSearch;
+
       this.$emit("onSave", configList);
     },
     async loadOptionSources() {