doway-coms 2.11.92 → 2.11.94

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "2.11.92",
+  "version": "2.11.94",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",
@@ -24,6 +24,7 @@
     "vue-contextmenujs": "^1.4.9",
     "vue-router": "3.6.5",
     "vuedraggable": "^2.24.3",
+    "vue-virtual-scroller": "^1.1.2",
     "vuex": "3.6.2",
     "vxe-table": "3.8.24",
     "xe-clipboard": "1.10.2",

package/packages/BaseGrid/src/index.vue

@@ -614,10 +614,6 @@
       </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)"
@@ -626,25 +622,27 @@
                 '已选' + 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
-                  "
+            <div style="max-height: 200px; overflow-y: scroll;text-align: left">
+            <RecycleScroller
+                  class="scroller"
+                 :items="scope.column.params.dataSource.filter(item => 
+                  !scope.column.filters[0].data.displayValueSearchText || 
+                  item.caption.indexOf(scope.column.filters[0].data.displayValueSearchText) > -1
+                )"
+                  :item-size="40"
+                  key-field="value"
+                  style="height:200px"
+                  v-slot="{ item: loopSource, index }"
+                >
+                 {{ index+1}}:<a-checkbox
+                 :checked="scope.column.filters[0].data.displayValues.includes(loopSource.value)"
                   :value="loopSource.value"
+                  @change="(e) => handleFilterCheckboxChange(scope.column, loopSource.value, e)"
                   style="margin: 5px 0"
                   >{{ loopSource.caption }}
                 </a-checkbox>
-              </div>
+            </RecycleScroller>
             </div>
-          </a-checkbox-group>
           <br />
           <a-button
             @click="saveFilterTable(scope.column)"
@@ -868,9 +866,12 @@ import { saveUserModuleDataFieldApi, userResetApi, saveUserModuleDataPageSizeApi
 import { gridDefaultValueDisplay } from '../../utils/filters'
 import SeqSetting from './SeqSetting'
 import request from '../../utils/request'
+import { RecycleScroller } from 'vue-virtual-scroller'
+import 'vue-virtual-scroller/dist/vue-virtual-scroller.css'
 export default {
   name: 'BaseGrid',
   components: {
+    RecycleScroller,
     'a-tag': Tag,
     'a-popover': Popover,
     'a-empty': Empty,
@@ -4134,7 +4135,8 @@ export default {
       })
       if (
         column.params.controlType !== controlType.select &&
-        column.params.controlType !== controlType.multiSelect
+        column.params.controlType !== controlType.multiSelect &&
+        column.params.filterControlType !== 'select_remote'
       ) {
         column.filters[0].data.displayValues.push({
           value: [null, null],