doway-coms 2.11.85 → 2.11.87

package/package.json

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

package/packages/BaseGrid/src/index.vue

@@ -610,6 +610,48 @@
           <a-button @click="filterConfirm(scope.column)">确认</a-button>
         </div>
       </template>
+      <template #select_remote_filter="scope">
+        <div class="interceptor-filter-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 #multiSelect_filter="scope">
         <div class="interceptor-filter-class">
           <a-checkbox-group
@@ -820,7 +862,7 @@ import BasePagination from '../../BasePagination/index'
 import exportCmp from './exportCmp.vue'
 import BasePulldown from '../../BasePulldown/index'
 import BaseGridAdjust from '../../BaseGridAdjust/index'
-import { saveUserModuleDataFieldApi, userResetApi, saveUserModuleDataPageSizeApi } from '../../utils/api'
+import { saveUserModuleDataFieldApi, userResetApi, saveUserModuleDataPageSizeApi,commonOperationSearchDataApi } from '../../utils/api'
 import { gridDefaultValueDisplay } from '../../utils/filters'
 import SeqSetting from './SeqSetting'
 import request from '../../utils/request'
@@ -2220,7 +2262,13 @@ export default {
       // }
       colParams['le'] = originCol.le
       colParams['controlType'] = originCol.controlType
-      colParams['filterControlType'] = colParams['controlType']
+      if(originCol.filterControlType){
+          colParams['filterControlType'] = originCol.filterControlType
+          colParams['filterLinkData'] = originCol.filterLinkData
+          colParams['dataSource'] = []
+      }else{
+          colParams['filterControlType'] = colParams['controlType']
+      }
       colParams['edit'] = false
       colParams['thousandDigit'] = originCol.thousandDigit
       if (originCol.editStates) {
@@ -3784,7 +3832,8 @@ export default {
         if (
           colInfo.params.controlType === controlType.multiSelect ||
           colInfo.params.controlType === controlType.select ||
-          colInfo.params.controlType === controlType.checkbox
+          colInfo.params.controlType === controlType.checkbox ||
+          colInfo.params.filterControlType === 'select_remote'
         ) {
           colInfo.filters[0].data.bindingValues.push(XEUtils.clone(item,true))
           this.$set(
@@ -3855,7 +3904,7 @@ export default {
           }
         } else if (
           column.params.controlType === controlType.select ||
-          column.params.controlType === controlType.multiSelect
+          column.params.controlType === controlType.multiSelect 
         ) {
           // 下拉
           data.push(item)
@@ -3915,7 +3964,8 @@ export default {
         if (
           loopColInfo.params.controlType === controlType.select ||
           loopColInfo.params.controlType === controlType.multiSelect ||
-          loopColInfo.params.controlType === controlType.checkbox
+          loopColInfo.params.controlType === controlType.checkbox ||
+          loopColInfo.params.filterControlType === 'select_remote'
         ) {
           colFilterExpression.expressions.push({
             field: loopColInfo.field,
@@ -4021,7 +4071,39 @@ export default {
 
       this.toolBarConfig.enabled = this.filterExpression.length > 0
     },
-    filterVisible({ column, visible }) {
+    async filterVisible({ column, visible }) {
+
+      if(visible && column.params && column.params.filterControlType==='select_remote' && column.params.filterLoaded!==true){
+          //已经加载过数据
+          let postData = {
+          moduleCode: this.moduleCode,
+            dataCodes: [
+              {
+                dataCode: column.params.filterLinkData,
+                searchParam: {
+                  begin:1,
+                  size: 0,
+                  sorts: [],
+                  expression: {
+                    expressions: [],
+                    operator: 'and'
+                  }
+                }
+              }
+            ]
+          } 
+          try {
+              let res =  await commonOperationSearchDataApi(postData)
+              column.params['dataSource'] = res.content[column.params.filterLinkData].rows
+              column.params['filterLoaded'] = true
+          }catch(err){
+             console.debug(err)
+             return
+          }finally{
+          }
+      }
+
+
       // 筛选前关闭所有展开行
       this.closeAllExpand()
       //重新设置绑定值
@@ -4192,7 +4274,8 @@ export default {
         })
       } else if (
         info.column.params.controlType === controlType.select ||
-        info.column.params.controlType === controlType.multiSelect
+        info.column.params.controlType === controlType.multiSelect ||
+        info.column.params.filterControlType === 'select_remote'
       ) {
         // 下拉
         returnOperator = '包含'
@@ -4231,7 +4314,8 @@ export default {
         if (
           colInfo.params.controlType === controlType.select ||
           colInfo.params.controlType === controlType.multiSelect ||
-          colInfo.params.controlType === controlType.checkbox
+          colInfo.params.controlType === controlType.checkbox  ||
+          colInfo.params.filterControlType === 'select_remote'
         ) {
           // 复选清空筛选初始数据过滤
           if (!item.value) {

package/packages/utils/api.js

@@ -126,3 +126,10 @@ export function userResetApi(data) {
     params: data
   })
 }
+export function commonOperationSearchDataApi(data) {
+  return request({
+    url: store.getters.baseUrl + '/searchData',
+    method: 'post',
+    data: data
+  })
+}

package/packages/utils/msg.js

@@ -93,6 +93,7 @@ export function successMsg(msg, desc){
             title: msgObj.title,
             content: msgObj.content,
             width: msgObj.width? msgObj.width : 416,
+            zIndex:1000000,
             onOk() {
                 resolve(true)
             },