doway-coms 2.1.5 → 2.1.7

package/package.json

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

package/packages/BaseGrid/src/index.vue

@@ -236,6 +236,25 @@
           </a-select>
         </div>
       </template>
+      <template #multiSelect_edit="scope">
+        <div class="interceptor-class">
+          <a-select
+            v-model="scope.row[scope.column.property]"
+            @change="cellValueChange(scope)"
+            mode="multiple"
+            size="small"
+            :max-tag-count="scope.column.params.maxTagCount"
+            class="inner-cell-control"
+          >
+            <a-select-option
+              v-for="loopSource in scope.column.params.dataSource"
+              :key="loopSource.value"
+              :value="loopSource.value"
+              >{{ loopSource.caption }}</a-select-option
+            >
+          </a-select>
+        </div>
+      </template>
       <template #time_edit="scope" class="interceptor-class">
         <div class="interceptor-class">
           <a-time-picker
@@ -516,6 +535,48 @@
           <a-button @click="filterConfirm(scope.column)">确认</a-button>
         </div>
       </template>
+      <template #multiSelect_filter="scope">
+        <div class="interceptor-class">
+          <a-checkbox-group
+            v-model="scope.column.filters[0].data.displayValues"
+            @keyup.enter.native="filterConfirm(scope.column)"
+          >
+            <a-input
+              placeholder="请输入搜索内容"
+              @change="displayValueSearchTextChange(scope.column)"
+              v-model="scope.column.filters[0].data.displayValueSearchText"
+              :addon-before="
+                '已选' + scope.column.filters[0].data.displayValues.length
+              "
+            />
+            <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="saveFilterTable(scope.column)"
+            v-if="moduleCode && dataCode"
+            >默认配置</a-button
+          >
+          <a-button @click="filterConfirm(scope.column)">确认</a-button>
+        </div>
+      </template>
       <template #checkbox_filter="scope">
         <div class="interceptor-class">
           <a-checkbox-group
@@ -685,6 +746,7 @@ import BaseGridAdjust from '../../BaseGridAdjust/index'
 import { saveUserModuleDataFieldApi } from '../../utils/api'
 import { gridDefaultValueDisplay } from '../../utils/filters'
 import SeqSetting from './SeqSetting'
+import request from '../../utils/request'
 export default {
   name: 'BaseGrid',
   components: {
@@ -1253,7 +1315,8 @@ export default {
             // }
           } else if (
             tempControlType === controlType.dropmulti ||
-            tempControlType === controlType.select
+            tempControlType === controlType.select ||
+            tempControlType === controlType.multiSelect
           ) {
             //下拉多选
             tempExpTag.expressions.push({
@@ -1742,6 +1805,37 @@ export default {
         colParams['replaceFields'] = originCol.replaceFields
         colParams['field'] = originCol.field
       }
+      if (originCol.controlType === controlType.multiSelect) {
+        colParams['controlEdit'] = true
+        if (originCol.maxTagCount) {
+          colParams['maxTagCount'] = originCol.maxTagCount
+        } else {
+          colParams['maxTagCount'] = 1
+        }
+        if (originCol.isLocal) {
+          colParams['dataSource'] = originCol.dataSource
+        } else {
+          let postData = {
+            begin: 1,
+            size: 0,
+            expression: { expressions: [], operator: 'and' },
+            sorts: [],
+          }
+          request({
+            data: postData,
+            method: 'post',
+            url: originCol.api,
+          }).then((res) => {
+            console.log(res)
+            colParams['dataSource'] = XEUtils.map(res.content, (item) => {
+              return {
+                value: item[originCol.value],
+                caption: item[originCol.caption],
+              }
+            })
+          })
+        }
+      }
       if (originCol.controlType === controlType.text) {
         colParams['controlEdit'] = true
       }
@@ -2064,14 +2158,16 @@ export default {
               displayValues: [],
               displayValueSearchText: '',
             }
-          } else{
-            loopCol.filters = [{
-              data: {
-                bindingValues: [],
-                displayValues: [],
-                displayValueSearchText: '',
+          } else {
+            loopCol.filters = [
+              {
+                data: {
+                  bindingValues: [],
+                  displayValues: [],
+                  displayValueSearchText: '',
+                },
               },
-            }]
+            ]
           }
         }
         find.extraInfo.order
@@ -2614,12 +2710,13 @@ export default {
       ) {
         if (column.params && column.params.route) {
           let tempRouteName = column.params.route.name
-          let tempRouteQuery = column.params.route.field
+          let tempRouteQuery = row[column.params.route.field]
           if (XEUtils.isArray(tempRouteName)) {
             //需要不同条件跳转不同页面
             for (let i = 0; i < tempRouteName.length; i++) {
               if (tempRouteName[i].value === row[tempRouteName[i].field]) {
-                tempRouteQuery = row[tempRouteName[i].query] || row[column.params.route.field]
+                tempRouteQuery =
+                  row[tempRouteName[i].query] || row[column.params.route.field]
                 tempRouteName = tempRouteName[i].name
                 break
               }
@@ -2765,6 +2862,7 @@ export default {
       colInfo.filters[0].data.bindingValues = []
       XEUtils.arrayEach(colInfo.filters[0].data.displayValues, (item) => {
         if (
+          colInfo.params.controlType === controlType.multiSelect ||
           colInfo.params.controlType === controlType.select ||
           colInfo.params.controlType === controlType.checkbox
         ) {
@@ -2833,7 +2931,10 @@ export default {
           if (tempDate[0] <= cellValue && cellValue <= tempDate[1]) {
             currentVisible = true
           }
-        } else if (column.params.controlType === controlType.select) {
+        } else if (
+          column.params.controlType === controlType.select ||
+          column.params.controlType === controlType.multiSelect
+        ) {
           // 下拉
           data.push(item)
         } else if (column.params.controlType === controlType.checkbox) {
@@ -2880,6 +2981,7 @@ export default {
 
         if (
           loopColInfo.params.controlType === controlType.select ||
+          loopColInfo.params.controlType === controlType.multiSelect ||
           loopColInfo.params.controlType === controlType.checkbox
         ) {
           colFilterExpression.expressions.push({
@@ -2892,7 +2994,6 @@ export default {
           this.filterStr.push(tempStr)
           return
         }
-
         XEUtils.arrayEach(filterBindingValues, (loopBindingValue) => {
           let tempPushExp = {
             field: loopColInfo.field,
@@ -2961,7 +3062,10 @@ export default {
         XEUtils.arrayEach(column.filters[0].data.bindingValues, (item) => {
           column.filters[0].data.displayValues.push(item)
         })
-        if (column.params.controlType !== controlType.select) {
+        if (
+          column.params.controlType !== controlType.select &&
+          column.params.controlType !== controlType.multiSelect
+        ) {
           column.filters[0].data.displayValues.push({
             value: [null, null],
           })
@@ -3101,7 +3205,10 @@ export default {
           tempDate.push(x.value[0]), tempDate.push(x.value[1])
           curretnArr.push(tempDate.join('~'))
         })
-      } else if (info.column.params.controlType === controlType.select) {
+      } else if (
+        info.column.params.controlType === controlType.select ||
+        info.column.params.controlType === controlType.multiSelect
+      ) {
         // 下拉
         returnOperator = '包含'
         displayValues.forEach((x) => {
@@ -3138,6 +3245,7 @@ export default {
       XEUtils.arrayEach(colInfo.filters[0].data.displayValues, (item) => {
         if (
           colInfo.params.controlType === controlType.select ||
+          colInfo.params.controlType === controlType.multiSelect ||
           colInfo.params.controlType === controlType.checkbox
         ) {
           // 复选清空筛选初始数据过滤

package/packages/utils/enum.js

@@ -60,7 +60,8 @@ export const sysRowState = {
     x_axis: 'x_axis',
     y_axis: 'y_axis',
     series: 'series',
-    treeSelect: 'treeSelect'
+    treeSelect: 'treeSelect',
+    multiSelect: 'multiSelect'
   }
   export const dataType = {
     frame: 'frame',

package/packages/utils/filters.js

@@ -447,12 +447,18 @@ export function gridDefaultValueDisplay(rowInfo,colInfo){
     case controlType.checkbox:
       displayValue = displayValue===true?'是':'否'
       break
-      case controlType.select:
+    case controlType.select:
         const item = colInfo.params.dataSource.find(
           item => item.value === displayValue
         )
         displayValue = item ? item.caption :displayValue
-        break
+      break
+    case controlType.multiSelect:
+      displayValue = XEUtils.map(displayValue, item => {
+        return XEUtils.find(colInfo.params.dataSource, loop => loop.value === item).caption
+      })
+      displayValue = displayValue.join(',')
+      break
 
   }
   return displayValue