doway-coms 1.6.8 → 1.6.10

package/package.json

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

package/packages/BaseGrid/src/index.vue

@@ -267,7 +267,7 @@
       </template>
       <template #pager v-if="pager && !pager.notShow">
         <a-row>
-          <a-col :span="8" style="text-align: left; padding: 10px">
+          <a-col :span="12" style="text-align: left; padding: 10px">
             <a-space>
               <template v-for="loopPagerBtn in pager.buttons">
                 <a-button
@@ -282,11 +282,12 @@
               </template>
             </a-space>
           </a-col>
-          <a-col :span="16" style="text-align: right">
+          <a-col :span="12" style="text-align: right">
             <BasePagination
               v-if="pager.size"
               :totalRows="pager.totalRows"
               :pageSize="pager.size"
+              :pageSizeOptions="pager.sizeOptions"
               :currentPage="pager.current"
               @pageChange="pageChange"
               @pageSizeChange="pageSizeChange"
@@ -862,11 +863,16 @@ export default {
 
   created() {
 
-    // if(this.pager.sizeOptions) {
-    //   this.pager.sizeOptions = XEUtils.map(this.pager.sizeOptions, item => {
-    //     return Number(item)
-    //   })
-    // }
+    try{
+      if(this.pager && this.pager.sizeOptions) {
+        this.pager.sizeOptions = XEUtils.map(this.pager.sizeOptions, item => {
+          return Number(item)
+        })
+      }
+    } catch(err) {
+      console.debug(err)
+    }
+
 
     //拖动后输入框有错位问题，暂时不启用
     // this.initColumnDrop()

package/packages/BasePulldown/src/index.vue

@@ -88,27 +88,6 @@
                   </div>
                 </div>
               </template>
-<!--              <template #checkbox_filter="scope">-->
-<!--                <div class="interceptor-class">-->
-<!--                  <a-checkbox-group-->
-<!--                    v-model="scope.column.filters[0].data.displayValues"-->
-<!--                    @keyup.enter.native="filterConfirm(scope.column)"-->
-<!--                  >-->
-<!--                    <div style="max-height:200px;overflow-y:scroll">-->
-<!--                      <div style="text-align:left;" v-for="loopSource in scope.column.params.dataSource" :key="loopSource.value">-->
-<!--                        <a-checkbox-->
-<!--                          v-show="loopSource.caption.indexOf(scope.column.filters[0].data.displayValueSearchText)>-1"-->
-<!--                          :value="loopSource.value"-->
-<!--                          style="margin: 5px 0;"-->
-<!--                        >{{ loopSource.caption }}-->
-<!--                        </a-checkbox>-->
-<!--                      </div>-->
-<!--                    </div>-->
-<!--                  </a-checkbox-group>-->
-<!--                  <br>-->
-<!--                  <a-button @click="filterConfirm(scope.column)">确认</a-button>-->
-<!--                </div>-->
-<!--              </template>-->
 <!--              普通输入框的过滤筛选-->
               <template #text_filter="{ column }">
                 <div class="interceptor-class"> 
@@ -122,6 +101,27 @@
                   <a-button @click="filterConfirm(column)">确认</a-button>
                 </div>
               </template>
+<!--              选择筛选框-->
+              <template #select_filter="{ column }">
+                <div class="interceptor-class">
+                  <a-checkbox-group
+                    v-model="column.filters[0].data"
+                    @keyup.enter.native="filterConfirm(column)"
+                  >
+                    <div style="max-height:200px;overflow-y:scroll">
+                      <div style="text-align:left;" v-for="loopSource in column.params.dataSource" :key="loopSource.value">
+                        <a-checkbox
+                          :value="loopSource.value"
+                          style="margin: 5px 0;"
+                        >{{ loopSource.caption }}
+                        </a-checkbox>
+                      </div>
+                    </div>
+                  </a-checkbox-group>
+                  <br>
+                  <a-button @click="filterConfirm(column)">确认</a-button>
+                </div>
+              </template>
               <template #pager>
                 <a-row>
                   <a-col :span="8">
@@ -194,7 +194,7 @@ import XEUtils from "xe-utils";
 import { sysRowState, sysFormState, controlType } from "../../utils/enum";
 import { replaceParamString, replaceParam } from "../../utils/common";
 import request from "../../utils/request";
-import { Input, Button, Row, Col } from "ant-design-vue";
+import {Input, Button, Row, Col, Checkbox} from "ant-design-vue";
 import { ValidationProvider } from "vee-validate";
 import { Pulldown } from "vxe-table";
 import { Tooltip } from "ant-design-vue";
@@ -205,6 +205,8 @@ export default {
     "a-button": Button,
     "a-row": Row,
     "a-col": Col,
+    "a-checkbox": Checkbox,
+    "a-checkbox-group": Checkbox.Group,
     VxePulldown: Pulldown,
     ValidationProvider,
     Tooltip,
@@ -428,24 +430,38 @@ export default {
       if (this.columns[i].isCheckbox === true) {
         this.columns[i]["type"] = "checkbox";
       }
+      if(!this.columns[i].controlType) {
+        this.columns[i].controlType = 'text'
+      }
       // 设置字段的过滤插槽
       if(this.columns[i].filter) {
         this.columns[i]["filterMultiple"] = false;
-        this.columns[i]['filters'] = [
-          {
-            data: ''
-          }
-        ]
+
         switch(this.columns[i].controlType) {
-          // case 'checkbox':
-          //   this.columns[i]['slots'] = {
-          //     filter: `checkbox_filter`
-          //   }
-          //   break
+          case 'checkbox':
+            this.columns[i]['slots'] = {
+              filter: `checkbox_filter`
+            }
+            break
+          case 'select':
+            this.columns[i]['slots'] = {
+              filter: `select_filter`
+            }
+            this.columns[i]['filters'] = [
+              {
+                data: []
+              }
+            ]
+            break
           default:
             this.columns[i]['slots'] = {
               filter: `text_filter`
             }
+            this.columns[i]['filters'] = [
+              {
+                data: ''
+              }
+            ]
             break
         }
       }
@@ -948,8 +964,17 @@ export default {
         operator: 'and',
         expressions: []
       }
-      column.filters[0].checked =
-        column.filters[0].data !== '';
+      let col= this.columns.find(x=>x.field === column.field)
+      switch(col.controlType) {
+        case 'select':
+          column.filters[0].checked =
+            column.filters[0].data.length > 0
+          break;
+        default:
+          column.filters[0].checked =
+            column.filters[0].data !== ''
+          break;
+      }
         //通知外部筛选改变事件
       let columns = this.$refs.pupupGridView.getTableColumn().collectColumn
       XEUtils.each(columns, item => {
@@ -957,19 +982,37 @@ export default {
           operator: 'or',
           expressions: []
         }
-        if(item.filters && item.filters[0].checked) {
-          XEUtils.each(item.filters, loopItem => {
-            if(loopItem.data !== '') {
-              filterExpression.expressions.push({
-                field: item.field,
-                operator: "CO",
-                value: loopItem.data
+        switch (col.controlType) {
+          case 'select':
+            if(item.filters && item.filters[0].checked) {
+              XEUtils.each(item.filters[0].data, loopItem => {
+                  filterExpression.expressions.push({
+                    field: item.field,
+                    operator: "EQ",
+                    value: loopItem
+                  })
               })
+              if(filterExpression.expressions.length > 0) {
+                vm.filterExpression.expressions.push(filterExpression)
+              }
             }
-          })
-          if(filterExpression.expressions.length > 0) {
-            vm.filterExpression.expressions.push(filterExpression)
-          }
+            break
+          default:
+            if(item.filters && item.filters[0].checked) {
+              XEUtils.each(item.filters, loopItem => {
+                if(loopItem.data) {
+                  filterExpression.expressions.push({
+                    field: item.field,
+                    operator: "CO",
+                    value: loopItem.data
+                  })
+                }
+              })
+              if(filterExpression.expressions.length > 0) {
+                vm.filterExpression.expressions.push(filterExpression)
+              }
+            }
+            break
         }
       })
       this.gridPagerConfig.currentPage = 1
@@ -986,6 +1029,7 @@ export default {
   //   清楚筛选条件
     clearColumnFilter() {
       let columns = []
+      let vm = this
       try {
         columns = this.$refs.pupupGridView.getTableColumn().collectColumn
       }catch (err) {
@@ -993,11 +1037,24 @@ export default {
       }
 
         XEUtils.each(columns, item => {
-          if(item.filters && item.filters[0].checked) {
-            item.filters = [{
-              data: ''
-            }]
+          let col= vm.columns.find(x=>x.field === item.field)
+          switch(col.controlType) {
+            case 'select':
+              if(item.filters && item.filters[0].checked) {
+                item.filters = [{
+                  data: []
+                }]
+              }
+              break;
+            default:
+              if(item.filters && item.filters[0].checked) {
+                item.filters = [{
+                  data: ''
+                }]
+              }
+              break;
           }
+
         })
         this.filterExpression = {
           operator: 'and',