From c8dec113736cc78c47cd63377d756d364b42a94e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 23 四月 2025 16:39:15 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/table/base-table/columns/index.jsx | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/menu/components/table/base-table/columns/index.jsx b/src/menu/components/table/base-table/columns/index.jsx
index 63cf2fa..508f594 100644
--- a/src/menu/components/table/base-table/columns/index.jsx
+++ b/src/menu/components/table/base-table/columns/index.jsx
@@ -21,12 +21,12 @@
class HeaderCol extends Component {
deleteCol = () => {
- const _this = this
+ const that = this
confirm({
content: '纭畾鍒犻櫎鏄剧ず鍒楀悧锛�',
onOk() {
- _this.props.deleteCol(_this.props.column)
+ that.props.deleteCol(that.props.column)
},
onCancel() {}
})
@@ -391,7 +391,7 @@
if (!cell.eleType) {
if (cell.copyType === 'action') {
cell.eleType = 'button'
- cell.width = cell.width || 12
+ cell.width = cell.width || cell.width === 0 ? cell.width : 12
} else {
cell.eleType = 'text'
}
@@ -547,11 +547,6 @@
let val = {
copyType: 'cols',
cols: columns.filter(col => !col.origin)
- }
-
- let srcid = localStorage.getItem(window.GLOB.sysSign + 'srcId')
- if (srcid) {
- val.$srcId = srcid
}
oInput.value = window.btoa(window.encodeURIComponent(JSON.stringify(val)))
--
Gitblit v1.8.0