From f96291cbdaea1244d06507ba714e14ef74f434e8 Mon Sep 17 00:00:00 2001
From: xuliangzhan <xu_liangzhan@163.com>
Date: Mon, 2 Nov 2020 22:24:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/App.vue                             | 2 +-
 examples/api/table.js                        | 6 +++---
 examples/plugins/xtable/formatter.js         | 2 +-
 examples/views/table/advanced/CustomSort.vue | 4 ++--
 examples/views/table/base/Format.vue         | 2 +-
 examples/views/table/formats/API.vue         | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/examples/App.vue b/examples/App.vue
index 367bec9b2..5bf04f6fd 100644
--- a/examples/App.vue
+++ b/examples/App.vue
@@ -90,7 +90,7 @@
 
     <vxe-modal v-model="supportVisible" :loading="supportLoading" title="💡技术支持" width="800" position="center">
       <template v-slot>
-        <div class="support-declare">vxe-table 开源版完全免费，如果该项目帮助了您，你可以通过捐赠或者加入技术支持群的方式来支持作者，同时您的支持也能帮助该项目持续维护下去！</div>
+        <div class="support-declare">vxe-table 使用完全免费，如果该项目帮助了您，你可以通过捐赠或者加入技术支持群的方式来支持作者，同时您的支持也能帮助该项目持续维护下去！</div>
         <div>
           <ul class="vxe-row support-question">
             <li class="vxe-col--12" v-for="(item, index) in supportQuestionList" :key="index">
diff --git a/examples/api/table.js b/examples/api/table.js
index c0251e73b..fc43f9949 100644
--- a/examples/api/table.js
+++ b/examples/api/table.js
@@ -1724,7 +1724,7 @@ const apis = [
         version: 'pro',
         type: 'Object',
         enum: '',
-        defVal: '',
+        defVal: '继承 setup.table.clipConfig',
         list: [
           {
             name: 'getMethod',
@@ -1770,7 +1770,7 @@ const apis = [
         version: '',
         type: 'any',
         enum: '',
-        defVal: '',
+        defVal: '继承 setup.table.mouseConfig',
         list: [
           {
             name: 'selected',
@@ -1807,7 +1807,7 @@ const apis = [
         version: '',
         type: 'any',
         enum: '',
-        defVal: '',
+        defVal: '继承 setup.table.keyboardConfig',
         list: [
           {
             name: 'isArrow',
diff --git a/examples/plugins/xtable/formatter.js b/examples/plugins/xtable/formatter.js
index ed6670bab..8a3b261cd 100644
--- a/examples/plugins/xtable/formatter.js
+++ b/examples/plugins/xtable/formatter.js
@@ -18,7 +18,7 @@ VXETable.formats.mixin({
   },
   // 四舍五入金额，每隔3位逗号分隔，默认2位数
   formatAmount ({ cellValue }, digits = 2) {
-    return XEUtils.commafy(XEUtils.toNumber(cellValue), { digits: digits })
+    return XEUtils.commafy(XEUtils.toNumber(cellValue), { digits })
   },
   // 格式化银行卡，默认每4位空格隔开
   formatBankcard ({ cellValue }) {
diff --git a/examples/views/table/advanced/CustomSort.vue b/examples/views/table/advanced/CustomSort.vue
index 6b66eea88..a6fe3f778 100644
--- a/examples/views/table/advanced/CustomSort.vue
+++ b/examples/views/table/advanced/CustomSort.vue
@@ -123,7 +123,7 @@ export default {
               }
             },
             formatAmount ({ cellValue }) {
-              return XEUtils.commafy(cellValue)
+              return XEUtils.commafy(XEUtils.toNumber(cellValue))
             },
             filterNameMethod ({ value, row, column }) {
               return row.id >= value
@@ -159,7 +159,7 @@ export default {
       }
     },
     formatAmount ({ cellValue }) {
-      return XEUtils.commafy(cellValue)
+      return XEUtils.commafy(XEUtils.toNumber(cellValue))
     },
     filterNameMethod ({ value, row }) {
       return row.id >= value
diff --git a/examples/views/table/base/Format.vue b/examples/views/table/base/Format.vue
index b601dad3d..126b9d171 100644
--- a/examples/views/table/base/Format.vue
+++ b/examples/views/table/base/Format.vue
@@ -148,7 +148,7 @@ export default {
           },
           // 四舍五入金额，每隔3位逗号分隔，默认2位数
           formatAmount ({ cellValue }, digits = 2) {
-            return XEUtils.commafy(XEUtils.toNumber(cellValue), { digits: digits })
+            return XEUtils.commafy(XEUtils.toNumber(cellValue), { digits })
           },
           // 格式化银行卡，默认每4位空格隔开
           formatBankcard ({ cellValue }) {
diff --git a/examples/views/table/formats/API.vue b/examples/views/table/formats/API.vue
index b14c80637..d25fa9819 100644
--- a/examples/views/table/formats/API.vue
+++ b/examples/views/table/formats/API.vue
@@ -70,8 +70,8 @@ export default {
         `,
         `
         // 格式金额，默认2位数
-        VXETable.formats.add('myAmount', ({ cellValue }, digits) => {
-          return XEUtils.commafy(cellValue, { digits: digits || 2 })
+        VXETable.formats.add('myAmount', ({ cellValue }, digits = 2) => {
+          return XEUtils.commafy(XEUtils.toNumber(cellValue), { digits })
         })
 
         export default {