From 76a4300654a18d228838c3f27455dc8e7a8cd616 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 15 一月 2021 17:04:42 +0800
Subject: [PATCH] Merge branch 'master' into bms
---
src/menu/components/table/normal-table/columns/index.jsx | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/menu/components/table/normal-table/columns/index.jsx b/src/menu/components/table/normal-table/columns/index.jsx
index e494875..d779374 100644
--- a/src/menu/components/table/normal-table/columns/index.jsx
+++ b/src/menu/components/table/normal-table/columns/index.jsx
@@ -14,7 +14,7 @@
const { confirm } = Modal
const EditColumn = asyncIconComponent(() => import('./editColumn'))
-const MarkColumn = asyncIconComponent(() => import('./markcolumn'))
+const MarkColumn = asyncIconComponent(() => import('@/menu/components/share/markcomponent'))
const CardCellComponent = asyncComponent(() => import('@/menu/components/card/cardcellcomponent'))
class HeaderCol extends Component {
@@ -395,8 +395,8 @@
let oInput = document.createElement('input')
let val = {
- copyType: 'columns',
- columns: columns
+ copyType: 'cols',
+ cols: columns.filter(col => !col.origin)
}
oInput.value = window.btoa(window.encodeURIComponent(JSON.stringify(val)))
@@ -504,6 +504,7 @@
<DndProvider>
<Table
rowKey="uuid"
+ size={config.wrap.size || 'middle'}
rowClassName="editable-row"
bordered={config.wrap.bordered !== 'false'}
components={components}
--
Gitblit v1.8.0