doway-coms 1.4.27 → 1.4.29

package/package.json

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

package/packages/BaseGrid/src/index.vue

@@ -17,6 +17,7 @@
       }"
       :filter-config="{
         remote: filterRemote,
+        filterMethod: filterMethod
       }"
       :menu-config="menuConfig"
       @menu-click="contextMenuClickEvent"
@@ -309,6 +310,20 @@
           <a-button @click="filterConfirm(scope.column)">确认</a-button>
         </div>
       </template>
+      <template #pulldown_filter="scope">
+        <div class="interceptor-class">
+          <div
+            :class="scope.column.field + '_filter_' + $index"
+            v-for="(loopFilterValue, $index) in scope.column.filters[0].data
+              .displayValues"
+            :key="$index"
+          >
+            <a-input allowClear v-model="loopFilterValue.value[0]" @keyup.enter.native="filterConfirm(scope.column)" />
+          </div>
+          <a-button @click="filterAddExp(scope.column)">添加条件</a-button>
+          <a-button @click="filterConfirm(scope.column)">确认</a-button>
+        </div>
+      </template>
       <template #number_filter="scope">
         <div class="interceptor-class">
           <div
@@ -879,7 +894,6 @@ export default {
         },
       });
     }
-    // console.log(this.internalColumns)
     this.gridEdit = this.edit;
   },
 
@@ -2247,38 +2261,72 @@ export default {
       });
     },
     filterConfirm(colInfo) {
-      if (this.filterRemote) {
-        let col= this.internalColumns.find(x=>x.field==colInfo.property)
-        this.$set(col.filters[0].data,'bindingValues',[])
-        colInfo.filters[0].data.bindingValues = [];
-        XEUtils.arrayEach(colInfo.filters[0].data.displayValues, (item) => {
-          if (colInfo.params.controlType === controlType.select) {
-            col.filters[0].data.bindingValues.push(item)
+      console.log(colInfo);
+      colInfo.filters[0].data.bindingValues = [];
+      XEUtils.arrayEach(colInfo.filters[0].data.displayValues, (item) => {
+        if (colInfo.params.controlType === controlType.select) {
+          colInfo.filters[0].data.bindingValues.push(item);
+        } else {
+          if (item.value[0] || item.value[1]) {
             colInfo.filters[0].data.bindingValues.push(item);
-          } else {
-            if (item.value[0] || item.value[1]) {
-              col.filters[0].data.bindingValues.push(item)
-              colInfo.filters[0].data.bindingValues.push(item);
-            }
           }
-        });
-        colInfo.filters[0].checked =
-          colInfo.filters[0].data.bindingValues.length > 0;
+        }
+      });
+      colInfo.filters[0].checked =
+        colInfo.filters[0].data.bindingValues.length > 0;
+
+      if (this.filterRemote) {
         //设置筛选过滤条件
         this.setFilterExpression();
         //通知外部筛选改变事件
         this.$emit("filterChange", { filterCol: colInfo });
       } else {
-        for (let i = 0; i < colInfo.filters.length; i++) {
-          if (!colInfo.filters[i].value) {
-            colInfo.filters[i].checked = true;
-          } else {
-            colInfo.filters[i].checked = false;
+        // 手动触发重新筛选filterMethod()方法
+        this.$refs.baseGrid.updateData()
+      }
+      this.$refs.baseGrid.closeFilter()
+    },
+    filterMethod({ options, values, cellValue, row, column }) {
+      // 如果是服务端筛选，不会跳入该方法
+      let currentVisible = false
+      // 获取所有筛选数据，加入data数组进行比对
+      const data = []
+      XEUtils.arrayEach(options[0].data.displayValues, (item) => {
+        if(column.params.controlType === controlType.number) {
+          // 数字范围选择
+          item.value.sort((a,b)=> a-b)
+          if ( item.value[0] <= cellValue && cellValue <= item.value[1]) {
+            currentVisible = true
+          }
+        } else if(
+          column.params.controlType === controlType.date ||
+          column.params.controlType === controlType.datetime ||
+          column.params.controlType === controlType.time
+        ) {
+          // 日期范围选择
+          let tempDate = []
+          tempDate.push(XEUtils.timestamp(item.value[0])),
+          tempDate.push(XEUtils.timestamp(item.value[1])),
+          cellValue = XEUtils.timestamp(cellValue)
+          tempDate.sort((a,b)=> a-b)
+          if ( tempDate[0] <= cellValue && cellValue <= tempDate[1]) {
+            currentVisible = true
+          }
+        } else if (column.params.controlType === controlType.select) {
+          // 下拉
+          data.push(item)
+        } else {
+          // 其余字符串
+          let tempData = item.value.find(x => x !== null)
+          if (tempData) {
+            data.push(tempData)
           }
         }
-        this.$refs.baseGrid.updateData();
+      });
+      if (cellValue && !currentVisible) {
+        currentVisible = data.find(x => cellValue.indexOf(x) > -1)?true:false
       }
-      this.$refs.baseGrid.closeFilter()
+      return currentVisible
     },
     setFilterExpression() {
       XEUtils.clear(this.filterExpression);
@@ -2298,6 +2346,7 @@ export default {
         };
         let expStr = "";
         let filterBindingValues = loopColInfo.filters[0].data.bindingValues;
+
         //筛选条件过滤
         let colFilterExpression = { operator: "or", expressions: [] };
 
@@ -2347,7 +2396,6 @@ export default {
             case controlType.number:
               tempPushExp.operator = "RA";
               tempPushExp.value = loopBindingValue.value;
-              console.log(tempPushExp);
               expStr = "范围";
               tempStr.exp =
                 tempStr.exp +
@@ -2363,7 +2411,6 @@ export default {
           }
           colFilterExpression.expressions.push(tempPushExp);
         });
-        // debugger
         this.filterExpression.push(colFilterExpression);
         tempStr.exp = expStr + tempStr.exp.substring(0, tempStr.exp.length - 1);
         this.filterStr.push(tempStr);