doway-coms 1.4.23 → 1.4.25

package/package.json

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

package/packages/BaseGrid/src/index.vue

@@ -1135,16 +1135,7 @@ export default {
         case "clearFilter":
           // 示例
           const filterList = this.$refs.baseGrid.getCheckedFilters();
-
           filterList.forEach((col) => {
-            // if (
-            //   col.column.params.controlType === "select" ||
-            //   col.column.params.controlType === "checkbox"
-            // ) {
-            //   col.column.filters = [{ data: [] }];
-            // } else {
-            //   col.column.filters = [{ data: [] }];
-            // }
               this.$refs.baseGrid.clearFilter(col.column);
               col.column.filters = [
                   {
@@ -2249,24 +2240,34 @@ export default {
       });
     },
     filterConfirm(colInfo) {
-      console.log(colInfo);
-      colInfo.filters[0].data.bindingValues = [];
-      XEUtils.arrayEach(colInfo.filters[0].data.displayValues, (item) => {
-        if (colInfo.params.controlType === controlType.select) {
-          colInfo.filters[0].data.bindingValues.push(item);
-        } else {
-          if (item.value[0] || item.value[1]) {
+      if (this.filterRemote) {
+        console.log(colInfo);
+        colInfo.filters[0].data.bindingValues = [];
+        XEUtils.arrayEach(colInfo.filters[0].data.displayValues, (item) => {
+          if (colInfo.params.controlType === controlType.select) {
             colInfo.filters[0].data.bindingValues.push(item);
+          } else {
+            if (item.value[0] || item.value[1]) {
+              colInfo.filters[0].data.bindingValues.push(item);
+            }
+          }
+        });
+        colInfo.filters[0].checked =
+          colInfo.filters[0].data.bindingValues.length > 0;
+        //设置筛选过滤条件
+        this.setFilterExpression();
+        //通知外部筛选改变事件
+        this.$emit("filterChange", { filterCol: colInfo });
+      } else {
+        for (let i = 0; i < colInfo.filters.length; i++) {
+          if (!colInfo.filters[i].value) {
+            colInfo.filters[i].checked = true;
+          } else {
+            colInfo.filters[i].checked = false;
           }
         }
-      });
-      colInfo.filters[0].checked =
-        colInfo.filters[0].data.bindingValues.length > 0;
-
-      //设置筛选过滤条件
-      this.setFilterExpression();
-      //通知外部筛选改变事件
-      this.$emit("filterChange", { filterCol: colInfo });
+        this.$refs.baseGrid.updateData();
+      }
       this.$refs.baseGrid.closeFilter()
     },
     setFilterExpression() {

package/packages/BaseIntervalInput/src/index.vue

@@ -66,6 +66,13 @@
           <div v-if="displayType === 'second'" style="width:20px">
             <span>秒</span>
           </div>
+          <input
+            @input="secondTotalChange"
+            v-if="displayType === 'second'"
+            type="number"
+            class="input-second-class"
+            v-model="secondTotalValue"
+          />
         </div>
         <div class="d-error-msg">
           {{ v.errors[0] }}
@@ -98,6 +105,7 @@ export default {
       hourValue: 0,
       minuteValue: 0,
       secondValue: 0,
+      secondTotalValue: 0,
       testValue: 0,
       filterValue: '',
       isInputChanged: false,
@@ -116,6 +124,7 @@ export default {
     currentValue: {
       // 动态计算currentValue的值
       get: function() {
+        console.debug('get value')
         //分钟计算成小时
         let tempValue = this.value
         if (this.valueType === 'hour') {
@@ -143,6 +152,7 @@ export default {
           //设置秒数
           this.secondValue = tempValue
         }
+        this.secondTotalValue = this.value
 
         return this.value // 将props中的value赋值给currentValue
       },
@@ -243,6 +253,10 @@ export default {
       this.setCurrentValue()
       this.$emit('change')
     },
+    secondTotalChange() {
+      this.currentValue = XEUtils.toNumber(this.secondTotalValue)
+      this.$emit('change')
+    },
     setCurrentValue() {
       if (this.valueType === 'hour') {
         this.currentValue =
@@ -275,6 +289,13 @@ export default {
   outline: none;
   width: 25px;
 }
+.input-second-class {
+  border-top: none;
+  border-right: none;
+  border-left: none;
+  outline: none;
+  width: 100px;
+}
 input[type="number"] {
   &::-webkit-outer-spin-button,
   &::-webkit-inner-spin-button {