From 88290b40164b2e153a59751445b1879b06a9f170 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 02 一月 2025 16:04:08 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/table/base-table/columns/index.jsx | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/menu/components/table/base-table/columns/index.jsx b/src/menu/components/table/base-table/columns/index.jsx
index d36923a..b824871 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 = typeof(cell.width) === 'number' ? cell.width : 12
} else {
cell.eleType = 'text'
}
@@ -549,7 +549,7 @@
cols: columns.filter(col => !col.origin)
}
- let srcid = localStorage.getItem(window.location.href.split('#')[0] + 'srcId')
+ let srcid = localStorage.getItem(window.GLOB.sysSign + 'srcId')
if (srcid) {
val.$srcId = srcid
}
--
Gitblit v1.8.0