doway-coms 1.4.7 → 1.4.9

package/package.json

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

package/packages/BaseGrid/src/index.vue

@@ -18,7 +18,6 @@
       :filter-config="{
         remote: filterRemote,
       }"
-      :toolbar-config="toolBarConfig"
       :menu-config="menuConfig"
       @menu-click="contextMenuClickEvent"
       @filter-change="filterChange"
@@ -73,13 +72,13 @@
 <!--          {{item}}-->
         </div>
       </template>
-      <template #toolbar_buttons>
+<!--      <template #toolbar_buttons>-->
 <!--        <div>-->
 <!--          <span v-for="loopFilterStr in filterStr" :key="loopFilterStr.field">-->
 <!--            {{ loopFilterStr.title }} {{ loopFilterStr.exp }} 并且</span-->
 <!--          >-->
 <!--        </div>-->
-      </template>
+<!--      </template>-->
       <template #seqHeader>
         <div
           @click="clickHeader"
@@ -303,7 +302,7 @@
               .displayValues"
             :key="$index"
           >
-            <a-input allowClear v-model="loopFilterValue.value[0]" />
+            <a-input allowClear v-model="loopFilterValue.value[0]" @keyup.enter.native="filterConfirm(scope.column)" />
           </div>
           <a-button @click="filterAddExp(scope.column)">添加条件</a-button>
           <a-button @click="filterConfirm(scope.column)">确认</a-button>
@@ -321,11 +320,13 @@
               :precision="0"
               size="small"
               v-model="loopFilterValue.value[0]"
+              @keyup.enter.native="filterConfirm(scope.column)"
             />~
             <a-input-number
               :precision="0"
               size="small"
               v-model="loopFilterValue.value[1]"
+              @keyup.enter.native="filterConfirm(scope.column)"
             />
           </div>
           <a-button @click="filterAddExp(scope.column)">添加条件</a-button>
@@ -345,6 +346,7 @@
                     overflow: 'auto',
                     maxWidth: '100px'
                   }"
+                  @keyup.enter.native="filterConfirm(scope.column)"
               >
                 <br />
                 <a-checkbox
@@ -393,6 +395,7 @@
               }"
               placeholder="开始时间"
               v-model="loopFilterValue.value[0]"
+              @keyup.enter.native="filterConfirm(scope.column)"
             />
             <a-date-picker
               valueFormat="YYYY-MM-DD HH:mm:ss"
@@ -405,6 +408,7 @@
               }"
               placeholder="结束时间"
               v-model="loopFilterValue.value[1]"
+              @keyup.enter.native="filterConfirm(scope.column)"
             />
           </div>
           <a-button @click="filterAddExp(scope.column)">添加条件</a-button>
@@ -424,12 +428,14 @@
               format="YYYY-MM-DD"
               placeholder="开始时间"
               v-model="loopFilterValue.value[0]"
+              @keyup.enter.native="filterConfirm(scope.column)"
             />
             <a-date-picker
               valueFormat="YYYY-MM-DD"
               format="YYYY-MM-DD"
               placeholder="结束时间"
               v-model="loopFilterValue.value[1]"
+              @keyup.enter.native="filterConfirm(scope.column)"
             />
           </div>
           <a-button @click="filterAddExp(scope.column)">添加条件</a-button>
@@ -2233,6 +2239,7 @@ export default {
       this.setFilterExpression();
       //通知外部筛选改变事件
       this.$emit("filterChange", { filterCol: colInfo });
+      this.$refs.baseGrid.clearFilter()
     },
     setFilterExpression() {
       XEUtils.clear(this.filterExpression);
@@ -2340,10 +2347,10 @@ export default {
         //设置第一个输入框光标选中
         let tempClassName = column.field + "_filter_0";
         setTimeout(() => {
-          document
-            .getElementsByClassName(tempClassName)[0]
-            .children[0].select();
-          document.getElementsByClassName(tempClassName)[0].children[0].focus();
+          // document
+          //   .getElementsByClassName(tempClassName)[0]
+          //   .children[0].select();
+          // document.getElementsByClassName(tempClassName)[0].children[0].focus();
         }, 10);
       }
     },