From 35f51aad9824b55bbe67c0fb21bd3d3d24381c2f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 16 七月 2023 21:42:33 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/table/base-table/columns/index.jsx | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/menu/components/table/base-table/columns/index.jsx b/src/menu/components/table/base-table/columns/index.jsx
index 37e38f0..5b6a30a 100644
--- a/src/menu/components/table/base-table/columns/index.jsx
+++ b/src/menu/components/table/base-table/columns/index.jsx
@@ -324,9 +324,17 @@
col.subcols = []
} else if (col.type === 'index') {
col.label = '搴忓彿'
+ } else if (col.type === 'number') {
+ col.Width = 80
}
- _columns.splice(hoverIndex, 0, col)
+ let hIndex = +hoverIndex
+
+ if (_columns.length > 0 && hIndex + 1 === _columns.length) {
+ _columns.push(col)
+ } else {
+ _columns.splice(hIndex, 0, col)
+ }
this.setState({
columns: _columns
@@ -613,7 +621,7 @@
let n = []
config.columns.forEach(col => {
- m.push(`${col.field}(${col.label})`)
+ m.push(`${col.field} ${col.datatype}`)
n.push(col.field)
})
--
Gitblit v1.8.0