doway-coms 2.11.93 → 2.11.95

package/package.json

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

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,34 +622,27 @@
                 '已选' + scope.column.filters[0].data.displayValues.length
               "
             />
-            <div style="max-height: 200px; overflow-y: scroll">
+            <div style="max-height: 200px; overflow-y: scroll;text-align: left">
             <RecycleScroller
                   class="scroller"
-                  :items="scope.column.params.dataSource"
+                 :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 }"
                 >
-              <!-- <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
-                  "
+                 :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)"
@@ -4146,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],