From 4b14db8b65e92fd46964b01a9af5bb9953653fac Mon Sep 17 00:00:00 2001
From: xuliangzhan <xu_liangzhan@163.com>
Date: Fri, 18 Dec 2020 20:28:15 +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/api/table.js       | 29 ++++++++++++++++++++++++++++-
 packages/conf/index.js      |  5 +++++
 packages/table/src/table.js |  3 +++
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/examples/api/table.js b/examples/api/table.js
index 2cc9ef1d0..d9df0f433 100644
--- a/examples/api/table.js
+++ b/examples/api/table.js
@@ -1735,6 +1735,33 @@ const apis = [
         enum: '',
         defVal: '继承 setup.table.clipConfig',
         list: [
+          {
+            name: 'isCopy',
+            desc: '是否启用复制功能',
+            version: 'pro',
+            type: 'boolean',
+            enum: '',
+            defVal: 'true',
+            list: []
+          },
+          {
+            name: 'isCut',
+            desc: '是否启用剪贴功能',
+            version: 'pro',
+            type: 'boolean',
+            enum: '',
+            defVal: 'true',
+            list: []
+          },
+          {
+            name: 'isPaste',
+            desc: '是否启用粘贴功能',
+            version: 'pro',
+            type: 'boolean',
+            enum: '',
+            defVal: 'true',
+            list: []
+          },
           {
             name: 'copyMethod',
             desc: '重写单元格复制取值的方法，将单元格复制到剪贴板',
@@ -1748,7 +1775,7 @@ const apis = [
             name: 'beforeCopyMethod',
             desc: '自定义单元格复制取值之前的方法，可以通过返回 false 阻止复制行为',
             version: 'pro',
-            type: '(params: { targetAreas }) => boolean',
+            type: '(params: { isCut, targetAreas }) => boolean',
             enum: '',
             defVal: '',
             list: []
diff --git a/packages/conf/index.js b/packages/conf/index.js
index f7768982c..7ea23d492 100644
--- a/packages/conf/index.js
+++ b/packages/conf/index.js
@@ -85,6 +85,11 @@ const GlobalConfig = {
     mouseConfig: {
       extension: true
     },
+    clipConfig: {
+      isCopy: true,
+      isCut: true,
+      isPaste: true
+    },
     fnrConfig: {
       isFind: true,
       isReplace: true
diff --git a/packages/table/src/table.js b/packages/table/src/table.js
index 6c963ff52..2a3028b96 100644
--- a/packages/table/src/table.js
+++ b/packages/table/src/table.js
@@ -690,6 +690,9 @@ export default {
       if (treeConfig && this.stripe) {
         UtilTools.warn('vxe.error.noTree', ['stripe'])
       }
+      if (this.tooltipOpts.enabled) {
+        UtilTools.warn('vxe.error.delProp', ['tooltip-config.enabled', 'tooltip-config.showAll'])
+      }
       // 检查导入导出类型
       const { exportConfig, exportOpts, importConfig, importOpts } = this
       if (importConfig && importOpts.types && !XEUtils.includeArrays(VXETable.importTypes, importOpts.types)) {