doway-coms 1.4.22 → 1.4.24

package/package.json

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

package/packages/BaseGrid/src/index.vue

@@ -1227,6 +1227,11 @@ export default {
         visible: true,
       };
 
+      if(XEUtils.has(originCol,'showOverflow')){
+        colInfo['showOverflow'] = originCol.showOverflow
+      }
+
+
       let customSlot = {
         default: "default",
       };

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 {