cnhis-design-vue 0.2.66-beta → 0.2.67-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "0.2.66-beta",
+  "version": "0.2.67-beta",
   "description": "基于 Ant Desgin Vue 的UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",

package/packages/table-filter/src/components/search-condition/SearchCondition.vue

@@ -374,7 +374,8 @@ export default create({
       classify: 'custom',
       classifyList: [],
       addVal: '',
-      showAdd: false
+      showAdd: false,
+      birthdayFilter: ["BIG", "LESS", "BIGEQ", "LESSEQ", "IN_THE_PAST_DI", "IN_THE_FUTURE_DI"]
     };
   },
   computed: {
@@ -981,12 +982,16 @@ export default create({
               return true;
             } else {
               let matchItem = this.fieldTypeList.find(item => sea.fieldType.toUpperCase() == item.name);
+              let conList = this.searchChildList;
               if (matchItem) {
                 // 关系 选项
-                action.searchChildList = matchItem.conList;
-              } else {
-                action.searchChildList = this.searchChildList;
+                conList = matchItem.conList;
+              }
+              if (action?.settingObj?.attr === "BIRTHDAY") {
+                conList = conList.filter(v => !this.birthdayFilter.includes(v.name)) || [];
               }
+
+              action.searchChildList = conList;
             }
             // 通过 attr 判断类型，searchChildList
             if (attrType == 'AGE') {

package/packages/table-filter/src/components/search-filter/SearchFilter.vue

@@ -58,7 +58,8 @@ export default {
       bodyStyle: {
         maxHeight: "496px",
         overflowY: "auto"
-      }
+      },
+      filterTimer: null
     };
   },
   computed: {},
@@ -80,9 +81,13 @@ export default {
   },
   methods: {
     init() {
-      this.$nextTick(() => {
+      this.clearTimer()
+      this.filterTimer = setTimeout(() => {
         this.handleInitConditions();
-      });
+      }, 30)
+    },
+    clearTimer() {
+      if(this.filterTimer) clearTimeout(this.filterTimer)
     },
     handleInitConditions() {
       this.$refs.conditionRef.handleInitConditions();
@@ -123,6 +128,9 @@ export default {
         this.bodyStyle.height = "";
       }
     }
+  },
+  destroyed() {
+    this.clearTimer();
   }
 };
 </script>