doway-coms 1.6.86 → 1.7.2

package/package.json

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

package/packages/BaseGrid/src/SeqSetting.vue

@@ -15,10 +15,11 @@
           <div ref="dragForm">
             <div
               :class="{ 'not-sort': searchField }"  
-              v-for="item in columns.filter(x=> x.visible && showField(x.title))"
+              v-for="item in columns.filter(x=> x.visible)"
               :key="item.currentKey"
               :data-id="item.currentKey"
               class="drag-row show-sort"
+              v-show="showField(item.title)"
             >
               <div style="margin-right: 7px;"  class="move">
                 <img src="../../styles/icon/drag.svg" alt="" style="width: 20px" >

package/packages/BaseGrid/src/index.vue

@@ -946,7 +946,6 @@ export default {
     }
   },
   created() {
-
     try{
       if(this.pager && this.pager.sizeOptions) {
         this.pager.sizeOptions = XEUtils.map(this.pager.sizeOptions, item => {
@@ -956,17 +955,8 @@ export default {
     } catch(err) {
       console.debug(err)
     }
-
-
     //拖动后输入框有错位问题，暂时不启用
     // this.initColumnDrop()
-
-    // this.internalColumns.push({
-    //     field: 'sysRowState',
-    //     visible:false,
-    //     filterMethod:this.sysRowStateFilter,
-    //     filters:[{label:'筛选删除行',value:'delete',checked:true}]
-    //   })
     for (let i = 0; i < this.columns.length; i++) {
       this.internalColumns.push(this.initColumns(this.columns[i]));
       if(this.columns[i].visible !== false && this.columns[i].controlType !== 'operation') {
@@ -2601,7 +2591,7 @@ export default {
           colInfo.filters[0].data.bindingValues.push(item);
           this.$set(col.filters[0].data,'bindingValues',colInfo.filters[0].data.bindingValues)
         } else {
-          if (item.value[0] || item.value[1]||item.value[0]==0||item.value[1]==0) {
+          if (item.value[0] || item.value[1]||item.value[0]===0||item.value[1]===0) {
             colInfo.filters[0].data.bindingValues.push(item);
             this.$set(col.filters[0].data,'bindingValues',colInfo.filters[0].data.bindingValues)
           }
@@ -2938,10 +2928,16 @@ export default {
     saveFilterTable(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);
+        if (
+          colInfo.params.controlType === controlType.select ||
+          colInfo.params.controlType === controlType.checkbox
+        ) {
+          // 复选清空筛选初始数据过滤
+          if (!item.value) {
+            colInfo.filters[0].data.bindingValues.push(item);
+          }
         } else {
-          if (item.value[0] || item.value[1]) {
+          if (item.value[0] || item.value[1]||item.value[0]===0||item.value[1]===0) {
             colInfo.filters[0].data.bindingValues.push(item);
           }
         }