From 76427d51a079a5fd1f45bf7188249e7a4647ae05 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 14 九月 2020 10:37:25 +0800
Subject: [PATCH] 2020-09-14
---
src/templates/sharecomponent/tablecomponent/index.jsx | 37 ++++++++++++++++++-------------------
1 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/src/templates/sharecomponent/tablecomponent/index.jsx b/src/templates/sharecomponent/tablecomponent/index.jsx
index 300fbf7..72431bb 100644
--- a/src/templates/sharecomponent/tablecomponent/index.jsx
+++ b/src/templates/sharecomponent/tablecomponent/index.jsx
@@ -22,7 +22,7 @@
}
state = {
- dict: (!localStorage.getItem('lang') || localStorage.getItem('lang') === 'zh-CN') ? zhCN : enUS,
+ dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
tables: [], // 绯荤粺琛�
tableFields: [], // 宸查�夎〃瀛楁闆�
selectedTables: [], // 宸查�夎〃
@@ -59,10 +59,9 @@
}
param.LText = Utils.formatOptions(param.LText)
- param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
+ param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
-
- param.open_key = Utils.encrypt(param.secretkey, param.timestamp, true) // 浜戠鏁版嵁楠岃瘉
+ param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp) // 浜戠鏁版嵁楠岃瘉
Api.getSystemConfig(param).then(res => {
if (res.status) {
@@ -97,23 +96,19 @@
columns: res.FDName.map(item => {
let _type = item.FieldType.toLowerCase()
let _decimal = 0
+ let _length = 50
if (/^nvarchar/.test(_type)) {
+ try { // 瀛樺湪max
+ _length = +_type.match(/\d+/)[0] || 50
+ } catch {
+ _length = 2048
+ }
_type = 'text'
} else if (/^int/.test(_type)) {
_type = 'number'
} else if (/^decimal/.test(_type)) {
_decimal = _type.split(',')[1]
_decimal = parseInt(_decimal)
- if (_decimal > 4) {
- _decimal = 4
- }
- _type = 'number'
- } else if (/^decimal/.test(_type)) {
- _decimal = _type.split(',')[1]
- _decimal = parseInt(_decimal)
- if (_decimal > 4) {
- _decimal = 4
- }
_type = 'number'
} else if (/^datetime/.test(_type)) {
_type = 'datetime'
@@ -128,7 +123,8 @@
label: item.FieldDec,
type: _type,
datatype: _type,
- decimal: _decimal
+ decimal: _decimal,
+ length: _length,
}
})
}
@@ -165,15 +161,17 @@
})
let _config = {...config, tables: [...selectedTables, _table]}
-
+
Api.getSystemConfig({func: 'sPC_Get_FieldName', TBName: value}).then(res => {
if (res.status) {
let tabmsg = {
- tableName: _table.name,
+ tableName: _table.TbName,
columns: res.FDName.map(item => {
let _type = item.FieldType.toLowerCase()
let _decimal = 0
+ let _length = 50
if (/^nvarchar/.test(_type)) {
+ _length = +_type.match(/\d+/)[0] || 50
_type = 'text'
} else if (/^int/.test(_type)) {
_type = 'number'
@@ -194,7 +192,8 @@
label: item.FieldDec,
type: _type,
datatype: _type,
- decimal: _decimal
+ decimal: _decimal,
+ length: _length
}
})
}
@@ -264,7 +263,7 @@
value={dict['header.menu.table.placeholder']}
onChange={this.onTableChange}
showArrow={false}
- getPopupContainer={() => document.getElementById(containerId)}
+ getPopupContainer={() => containerId ? document.getElementById(containerId) : document.body}
filterOption={(input, option) => {
return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0 ||
option.props.value.toLowerCase().indexOf(input.toLowerCase()) >= 0
--
Gitblit v1.8.0