From c29a1e1c8278a25b83b6158c2d426aa26c427569 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 01 九月 2021 16:18:30 +0800
Subject: [PATCH] 2021-09-01
---
src/templates/sharecomponent/tablecomponent/index.jsx | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/templates/sharecomponent/tablecomponent/index.jsx b/src/templates/sharecomponent/tablecomponent/index.jsx
index d44cc6f..d6aca93 100644
--- a/src/templates/sharecomponent/tablecomponent/index.jsx
+++ b/src/templates/sharecomponent/tablecomponent/index.jsx
@@ -112,7 +112,7 @@
if (/^nvarchar/.test(_type)) {
try { // 瀛樺湪max
_length = +_type.match(/\d+/)[0] || 50
- } catch {
+ } catch (e) {
_length = 2048
}
_type = 'text'
@@ -137,6 +137,7 @@
datatype: _type,
decimal: _decimal,
length: _length,
+ $datatype: item.FieldType.toLowerCase()
}
})
}
@@ -153,8 +154,7 @@
this.setState({
tableFields: _columns
})
-
- this.props.updatetable(this.props.config, _columns)
+ window.GLOB.tableFields = _columns
})
}
@@ -182,8 +182,13 @@
let _type = item.FieldType.toLowerCase()
let _decimal = 0
let _length = 50
+
if (/^nvarchar/.test(_type)) {
- _length = +_type.match(/\d+/)[0] || 50
+ try { // 瀛樺湪max
+ _length = +_type.match(/\d+/)[0] || 50
+ } catch (e) {
+ _length = 2048
+ }
_type = 'text'
} else if (/^int/.test(_type)) {
_type = 'number'
@@ -205,15 +210,21 @@
type: _type,
datatype: _type,
decimal: _decimal,
- length: _length
+ length: _length,
+ $datatype: item.FieldType.toLowerCase()
}
})
}
+
+ let _columns = [...tableFields, tabmsg]
+
this.setState({
- tableFields: [...tableFields, tabmsg]
+ tableFields: _columns
})
- this.props.updatetable(_config, [...tableFields, tabmsg])
+ window.GLOB.tableFields = _columns
+
+ this.props.updatetable(_config)
} else {
notification.warning({
top: 92,
@@ -240,7 +251,9 @@
tableFields: _fields
})
- this.props.updatetable({...config, tables: _tables}, _fields)
+ window.GLOB.tableFields = _fields
+
+ this.props.updatetable({...config, tables: _tables})
}
/**
--
Gitblit v1.8.0