doway-coms 2.11.66 → 2.11.67

package/package.json

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

package/packages/BaseGrid/src/index.vue

@@ -219,10 +219,9 @@
             size="small"
             @change="cellValueChange(scope)"
             v-model="scope.row[scope.column.property]"
-            :formatter="(value) => numberFormatter(value, scope)"
-            :parser="(value) => numberParse(value, scope)"
-            :min="scope.column.numberMin"
-            :max="scope.column.numberMax"
+            :max="scope.column.params.max"
+            :min="scope.column.params.min"
+            :precision="scope.column.params.precision"
             :disabled="editDisabled(scope)"
             :step="scope.column.params.step"
           />
@@ -2182,6 +2181,16 @@ export default {
       if (originCol.rules) {
         this.validRules[colInfo.field] = originCol.rules
       }
+      
+
+      // if (XEUtils.isNumber(originCol.min)) {
+      //   colParams['min'] =(XEUtils.isNumber(originCol.min)?originCol.min:'Infinity'
+      // }
+      // if (XEUtils.isNumber(originCol.max)) {
+      //   colParams['max'] = originCol.max
+      // }
+      colParams['max'] =XEUtils.isNumber(originCol.max)?originCol.max:'Infinity'
+      colParams['min'] =XEUtils.isNumber(originCol.min)?originCol.min:'-Infinity'
       if (originCol.precision) {
         colParams['precision'] = originCol.precision
         //加入验证逻辑
@@ -2192,12 +2201,8 @@ export default {
         //     validator: this.validPrecision
         // })
       }
-      if (XEUtils.isInteger(originCol.min)) {
-        colParams['min'] = originCol.min
-      }
-      if (XEUtils.isInteger(originCol.max)) {
-        colParams['max'] = originCol.max
-      }
+
+      
       // else{
       //     colParams['precision'] = 10 //默认十位小数
       // }
@@ -4025,17 +4030,18 @@ export default {
       )
       if (!reg.test(value)) {
         //小数点验证不通过
-        // console.debug('验证不通过')
+        console.debug('验证不通过',value)
         returnValue = XEUtils.floor(value, tempPrecision)
       }
+      console.debug('returnValue',returnValue, XEUtils.toNumber(returnValue))
       if (
-        XEUtils.isInteger(scope.column.params.max) &&
+        XEUtils.isNumber(scope.column.params.max) &&
         XEUtils.toNumber(returnValue) > scope.column.params.max
       ) {
         returnValue = scope.column.params.max
       }
       if (
-        XEUtils.isInteger(scope.column.params.min) &&
+        XEUtils.isNumber(scope.column.params.min) &&
         XEUtils.toNumber(returnValue) < scope.column.params.min
       ) {
         returnValue = scope.column.params.min

package/packages/BaseNumberInput/src/index.vue

@@ -33,6 +33,9 @@
             :placeholder="placeholder"
             :formatter="numberFormatter"
             :parser="numberParse"
+            :max="max"
+            :min="min"
+            :precision="precision"
             style="width: 100%"
             :class="{ 'd-error-input': v.errors.length > 0 }"
           />
@@ -46,6 +49,9 @@
             :placeholder="placeholder"
             :formatter="numberFormatter"
             :parser="numberParse"
+            :max="max"
+            :min="min"
+            :precision="precision"
             style="width: 100%"
             :class="{ 'd-error-input': v.errors.length > 0 }"
           />
@@ -220,11 +226,12 @@ export default {
     numberFormatter(value) {
       // 百分比格式化
       if (this.percent) {
-        if (this.precision) {
-          return XEUtils.round(value, this.precision) + "%";
-        } else {
           return value + "%";
-        }
+        // if (this.precision) {
+        //   return XEUtils.round(value, this.precision) + "%";
+        // } else {
+        //   return value + "%";
+        // }
       }
       return value;
     },
@@ -233,35 +240,36 @@ export default {
       if (this.percent) {
         value.replace("%", "");
       }
-      if (value === null || value === "") {
-        return value;
-      }
-      let returnValue = value;
-      let tempPrecision = XEUtils.toNumber(this.precision);
-      let reg = new RegExp(
-        "^((-?)|(-?([1-9]{1}\\d*)|-?([0]{1})))(\\.(\\d){0," +
-          tempPrecision +
-          "})?$"
-      );
-      if (!reg.test(value)) {
-        //小数点验证不通过
-        returnValue = XEUtils.floor(value, tempPrecision);
-      }
-      if (
-        this.max !== null &&
-        this.max !== undefined &&
-        XEUtils.toNumber(returnValue) > this.max
-      ) {
-        returnValue = this.max;
-      }
-      if (
-        this.min !== null &&
-        this.min !== undefined &&
-        XEUtils.toNumber(returnValue) < this.min
-      ) {
-        returnValue = this.min;
-      }
-      return returnValue;
+      return value
+      // if (value === null || value === "") {
+      //   return value;
+      // }
+      // let returnValue = value;
+      // let tempPrecision = XEUtils.toNumber(this.precision);
+      // let reg = new RegExp(
+      //   "^((-?)|(-?([1-9]{1}\\d*)|-?([0]{1})))(\\.(\\d){0," +
+      //     tempPrecision +
+      //     "})?$"
+      // );
+      // if (!reg.test(value)) {
+      //   //小数点验证不通过
+      //   returnValue = XEUtils.floor(value, tempPrecision);
+      // }
+      // if (
+      //   this.max !== null &&
+      //   this.max !== undefined &&
+      //   XEUtils.toNumber(returnValue) > this.max
+      // ) {
+      //   returnValue = this.max;
+      // }
+      // if (
+      //   this.min !== null &&
+      //   this.min !== undefined &&
+      //   XEUtils.toNumber(returnValue) < this.min
+      // ) {
+      //   returnValue = this.min;
+      // }
+      // return returnValue;
     },
     getFormatValue(value) {
       if (this.percent) {