From 8acfcd6e349ef2d1b797a7483940a2f3f2dfcfe6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 03 二月 2024 17:49:25 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/share/pastecomponent/index.jsx | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/menu/components/share/pastecomponent/index.jsx b/src/menu/components/share/pastecomponent/index.jsx
index 7f0b88c..a96fa09 100644
--- a/src/menu/components/share/pastecomponent/index.jsx
+++ b/src/menu/components/share/pastecomponent/index.jsx
@@ -114,6 +114,10 @@
return
}
+ if (res.copyType === 'editcols') {
+ res.copyType = 'cols'
+ }
+
let type = res.copyType
let config = fromJS(this.props.config).toJS()
@@ -168,7 +172,7 @@
} else if (type === 'cols') {
config.cols = config.cols.filter(col => !col.origin)
- if (config.subtype === 'normaltable' && res.cols.length === 1) {
+ if ((config.subtype === 'normaltable' || config.subtype === 'editable') && res.cols.length === 1) {
config.cols.push(...res.cols)
} else {
let keys = config.cols.map(col => (col.field || '$empty'))
--
Gitblit v1.8.0