doway-coms 1.6.13 → 1.6.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "1.6.13",
+  "version": "1.6.15",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",

package/packages/BasePulldown/src/index.vue

@@ -47,7 +47,7 @@
           </ValidationProvider>
         </template>
         <template #dropdown>
-          <div class="pulldown-grid interceptor-class">
+          <div class="pulldown-grid interceptor-class" >
             <vxe-grid
               size="mini"
               border
@@ -90,7 +90,7 @@
               </template>
 <!--              普通输入框的过滤筛选-->
               <template #text_filter="{ column }">
-                <div class="interceptor-class"> 
+                <div class="interceptor-class">
                   <div
                       v-for="(item, $index) in column.filters"
                       :key="$index"
@@ -765,7 +765,9 @@ export default {
       if (this.isOld === true) {
         tempExp = "";
       }
-      if (this.currentValue) {
+      if(this.filterExpression.expressions.length > 0) {
+        tempExp.expressions.push(this.filterExpression)
+      }else if (this.currentValue) {
         for (let i = 0; i < this.filterCols.length; i++) {
           if (this.isOld === true) {
             tempExp =
@@ -823,9 +825,6 @@ export default {
       };
       //查询之前从外部组件构造其他的条件
       this.$emit("preSearch", postExpression, repeatRowInfo);
-      if(this.filterExpression.expressions.length > 0) {
-        postExpression.expression.expressions.push(this.filterExpression)
-      }
       let postData = {
         fields: this.fetchFields,
         begin:
@@ -1029,7 +1028,7 @@ export default {
       })
     },
 
-  //   清楚筛选条件
+  //   清除筛选条件
     clearColumnFilter() {
       let columns = []
       let vm = this
@@ -1040,6 +1039,9 @@ export default {
       }
         XEUtils.each(columns, item => {
           let col= vm.columns.find(x=>x.field === item.field)
+          if(!col) {
+            return
+          }
           if(!col.controlType) {
             col.controlType = 'text'
           }