doway-coms 2.2.2 → 2.2.4

package/package.json

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

package/packages/BaseForm/src/index.vue

@@ -76,6 +76,7 @@
         :max="col.max"
         :precision="col.precision"
         :percent="col.percent"
+        :doFormat="col.doFormat"
         @change="
           () => {
             numberChange(col)

package/packages/BaseGrid/src/index.vue

@@ -203,6 +203,7 @@
             size="small"
             @change="cellValueChange(scope)"
             value-format="YYYY-MM-DD"
+            :disabled-date="(current) => disabledDate(current,scope.column.params)"
           />
         </div>
       </template>
@@ -1852,7 +1853,9 @@ export default {
         colParams['controlEdit'] = true
       }
       if (originCol.controlType === controlType.date) {
-        colParams['pastDate'] = originCol.pastDate
+        colParams['pastDate'] = originCol.pastDate == undefined ? true : false
+        colParams['disabledDateValue'] = 
+          originCol.disabledDateValue == undefined ? 0: originCol.disabledDateValue
       }
       colParams['disableUserVisible'] = originCol.disableUserVisible === true
       colInfo['params'] = colParams
@@ -3323,6 +3326,16 @@ export default {
         })
         .finally(() => {})
     },
+    disabledDate(current, params) {
+      if (params.pastDate === true) {
+        //如果允许过期时间
+        return false;
+      }
+      return (
+        current &&
+        current.diff(moment().add(params.disabledDateValue, "day"), "days") < 0
+      );
+    },
   },
 }
 </script>

package/packages/BaseNumberInput/src/index.vue

@@ -58,8 +58,8 @@
         </div>
       </ValidationProvider>
       <span v-else>
-        <span v-if="percent">{{ currentValue*100 }}%</span>
-        <span v-else>{{ currentValue }}</span>
+        <span v-if="percent">{{ getFormatValue(currentValue)}}</span>
+        <span v-else>{{ getFormatValue(currentValue) }}</span>
       </span>
     </div>
   </div>
@@ -198,6 +198,12 @@ export default {
         return false
       }
     },
+    doFormat:{
+      type:Boolean,
+      default:function(){
+        return false
+      }
+    }
   },
   created() {},
   methods: {
@@ -213,7 +219,12 @@ export default {
     numberFormatter(value) {
       // 百分比格式化
       if (this.percent) {
-        return value + '%'
+        
+        if(this.precision){
+          return XEUtils.round(value,this.precision) +'%'
+        }else{
+          return value + '%'
+        }
       }
       return value
     },
@@ -251,6 +262,21 @@ export default {
         returnValue = this.min
       }
       return returnValue
+    },
+    getFormatValue(value){
+      if (this.percent) {
+        if(this.precision){
+          return XEUtils.round(this.percentValue,this.precision) +'%'
+        }else{
+          return this.percentValue + '%'
+        }
+      }
+      console.log('inner',this.doFormat)
+      if(this.doFormat&&this.precision){
+        
+        return XEUtils.round(value,this.precision)
+      }
+      return value
     }
   }
 }

package/packages/utils/filters.js

@@ -460,8 +460,8 @@ export function gridDefaultValueDisplay(rowInfo,colInfo){
       displayValue = displayValue.join(',')
       break
     case controlType.number:
-      if(colInfo.params.doFloor){
-        displayValue=XEUtils.floor(displayValue,colInfo.params.precision)
+      if(colInfo.params.doRound){
+        displayValue=XEUtils.round(displayValue,colInfo.params.precision)
       }
       break
 

package/packages/utils/gridFormat.js

@@ -57,5 +57,8 @@ VXETable.formats.mixin({
   },
   formatPercent({ cellValue }) {
     return cellValue + '%'
+  },
+  formatPercentAndFixedNumber({ cellValue }) {
+    return XEUtils.toFixed(XEUtils.round(cellValue, digits), digits) +'%'
   }
 })