From 6afdec0062dacbded57e166230eb22cc55ced0c1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 08 五月 2021 14:30:21 +0800
Subject: [PATCH] 2021-05-08
---
src/tabviews/custom/components/share/normalTable/index.jsx | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index 24682cc..2d53eb5 100644
--- a/src/tabviews/custom/components/share/normalTable/index.jsx
+++ b/src/tabviews/custom/components/share/normalTable/index.jsx
@@ -191,7 +191,7 @@
content = `${content.substr(0, 4)}-${content.substr(5, 2)}-${content.substr(8, 2)} ${content.substr(11, 2)}:${content.substr(14, 2)}:${content.substr(17, 2)}`
}
- content = col.prefix + content + col.postfix
+ content = (col.prefix || '') + content + (col.postfix || '')
}
if (col.marks) {
@@ -423,7 +423,10 @@
if (item.rowspan === 'true') {
rowspans.push(item.field)
}
- if (_format && !Math.floor(Math.random() * radio)) {
+ if (item.type === 'index') {
+ item.field = '$Index'
+ item.type = 'text'
+ } else if (_format && !Math.floor(Math.random() * radio)) {
item.blur = true
}
@@ -803,12 +806,13 @@
}
return (
- <div className={'normal-custom-table ' + setting.tableHeader} id={tableId}>
+ <div className={`normal-custom-table ${setting.tableHeader || ''} ${setting.mode || ''}`} id={tableId}>
{(setting.tableType === 'radio' || setting.tableType === 'checkbox') && data && data.length > 0 ?
- <Switch title="鏀惰捣" className="main-pickup" checkedChildren="寮�" unCheckedChildren="鍏�" defaultChecked={pickup} onChange={this.pickupChange} /> : null
+ <Switch title="鏀惰捣" className="main-pickup" checkedChildren="寮�" unCheckedChildren="鍏�" checked={pickup} onChange={this.pickupChange} /> : null
}
<Table
components={components}
+ style={setting.style}
size={setting.size || 'middle'}
bordered={setting.bordered !== 'false'}
rowSelection={rowSelection}
--
Gitblit v1.8.0