doway-coms 1.6.28 → 1.6.30

package/package.json

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

package/packages/BaseGrid/src/index.vue

@@ -1856,11 +1856,12 @@ export default {
       }
       this.$refs.baseGrid.refreshColumn()
     },
-    setColumnFormatter(field,formatterName){
+    setColumnFormatter(fields,formatterName){
       for (let i = 0; i < this.internalColumns.length; i++) {
-        if (this.internalColumns[i].field == field) {
+        let tempFieldName = this.internalColumns[i].field
+        if (XEUtils.arrayIndexOf(fields,tempFieldName)>-1) {
            this.internalColumns[i].formatter = formatterName
-           this.$refs.baseGrid.getColumnByField(field).formatter = formatterName
+           this.$refs.baseGrid.getColumnByField(tempFieldName).formatter = formatterName
            break
         }
       }

package/packages/utils/gridFormat.js

@@ -33,11 +33,11 @@ VXETable.formats.mixin({
     return '¥' + XEUtils.commafy(XEUtils.toNumber(cellValue), { digits })
   },
   // 四舍五入金额，每隔3位逗号分隔，默认2位数,美元金额符号
-  formatUSDAmount({ cellValue }, digits = 2) {
+  formatAmountUSD({ cellValue }, digits = 2) {
     return  '$'+ XEUtils.commafy(XEUtils.toNumber(cellValue), { digits })
   },
   // 四舍五入金额，每隔3位逗号分隔，默认2位数,人民币金额符号
-  formatRMBAmount({ cellValue }, digits = 2) {
+  formatAmountRMB({ cellValue }, digits = 2) {
     return  '¥' + XEUtils.commafy(XEUtils.toNumber(cellValue), { digits })
   },
   // 格式化银行卡，默认每4位空格隔开