From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/sharecomponent/tablecomponent/index.jsx | 82 ++++++++++++++++++++++++++++-------------
1 files changed, 56 insertions(+), 26 deletions(-)
diff --git a/src/templates/sharecomponent/tablecomponent/index.jsx b/src/templates/sharecomponent/tablecomponent/index.jsx
index 3979db7..f2da2b6 100644
--- a/src/templates/sharecomponent/tablecomponent/index.jsx
+++ b/src/templates/sharecomponent/tablecomponent/index.jsx
@@ -1,10 +1,12 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Icon, Tooltip, Select, List, notification } from 'antd'
+import { Tooltip, Select, List, notification } from 'antd'
+import { QuestionCircleOutlined, CloseOutlined } from '@ant-design/icons'
import moment from 'moment'
import Api from '@/api'
+import options from '@/store/options.js'
import Utils from '@/utils/utils.js'
import zhCN from '@/locales/zh-CN/model.js'
import enUS from '@/locales/en-US/model.js'
@@ -22,12 +24,10 @@
}
state = {
- dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+ dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
tables: [], // 绯荤粺琛�
- tableFields: [], // 宸查�夎〃瀛楁闆�
+ tableFields: [], // 宸查�夎〃瀛楁闆�
selectedTables: [], // 宸查�夎〃
- searchlist: null, // 鎼滅储鏉′欢闆�
- visible: false // 妯℃�佹鎺у埗
}
/**
@@ -59,12 +59,17 @@
}
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.encryptOpenKey(param.secretkey, param.timestamp) // 浜戠鏁版嵁楠岃瘉
- param.open_key = Utils.encrypt(param.secretkey, param.timestamp, true) // 浜戠鏁版嵁楠岃瘉
+ if (options.cloudServiceApi) { // 涓斿瓨鍦ㄤ簯绔湴鍧�
+ param.rduri = options.cloudServiceApi
+ param.userid = sessionStorage.getItem('CloudUserID') || ''
+ param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
+ }
- Api.getSystemConfig(param).then(res => {
+ Api.getSystemCacheConfig(param).then(res => {
if (res.status) {
this.setState({
tables: res.data
@@ -82,7 +87,14 @@
gettableFields = () => {
let deffers = this.state.selectedTables.map(item => {
return new Promise(resolve => {
- Api.getSystemConfig({func: 'sPC_Get_FieldName', TBName: item.TbName}).then(res => {
+ let param = {func: 'sPC_Get_FieldName', TBName: item.TbName}
+ if (options.cloudServiceApi) { // 涓斿瓨鍦ㄤ簯绔湴鍧�
+ param.rduri = options.cloudServiceApi
+ param.userid = sessionStorage.getItem('CloudUserID') || ''
+ param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
+ }
+
+ Api.getSystemCacheConfig(param).then(res => {
res.TBName = item.TbName
resolve(res)
})
@@ -99,7 +111,11 @@
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'
@@ -116,12 +132,13 @@
}
return {
- field: item.FieldName,
+ field: item.FieldName || '',
label: item.FieldDec,
type: _type,
datatype: _type,
decimal: _decimal,
length: _length,
+ $datatype: item.FieldType.toLowerCase()
}
})
}
@@ -138,8 +155,7 @@
this.setState({
tableFields: _columns
})
-
- this.props.updatetable(this.props.config, _columns)
+ window.GLOB.tableFields = _columns
})
}
@@ -167,8 +183,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'
@@ -190,15 +211,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,
@@ -225,7 +252,9 @@
tableFields: _fields
})
- this.props.updatetable({...config, tables: _tables}, _fields)
+ window.GLOB.tableFields = _fields
+
+ this.props.updatetable({...config, tables: _tables})
}
/**
@@ -246,8 +275,8 @@
{/* 琛ㄥ悕娣诲姞 */}
<div className="ant-col ant-form-item-label">
<label>
- <Tooltip placement="topLeft" title={dict['model.tooltip.table.guide']}>
- <Icon type="question-circle" />
+ <Tooltip placement="topLeft" title="姝ゅ鍙互娣诲姞椤甸潰閰嶇疆鐩稿叧鐨勫父鐢ㄨ〃锛屽彲閫氳繃宸ュ叿鏍忎腑鐨勬坊鍔犳寜閽紝鍙壒閲忔坊鍔犺〃鏍肩浉鍏冲瓧娈点��">
+ <QuestionCircleOutlined className="mk-form-tip" />
{dict['header.menu.table.add']}
</Tooltip>
</label>
@@ -257,17 +286,18 @@
className="tables"
style={{ width: '100%' }}
optionFilterProp="children"
- value={dict['header.menu.table.placeholder']}
- onChange={this.onTableChange}
+ value="璇烽�夋嫨琛ㄥ悕"
+ onSelect={this.onTableChange}
+ dropdownClassName="mk-tables"
showArrow={false}
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
+ return option.props.children[0].toLowerCase().indexOf(input.toLowerCase()) >= 0 ||
+ option.props.children[2].toLowerCase().indexOf(input.toLowerCase()) >= 0
}}
>
{tables.map((table, index) => (
- <Option key={index} title={table.TbName} value={table.TbName}>{table.Remark}</Option>
+ <Option key={index} title={table.TbName} value={table.TbName}>{table.Remark}<br/>{table.TbName}</Option>
))}
</Select>
{selectedTables.length > 0 && <List
@@ -276,7 +306,7 @@
dataSource={selectedTables}
renderItem={(item, index) => <List.Item key={index} title={item.Remark + ' (' + item.TbName + ')'}>
{item.Remark + ' (' + item.TbName + ')'}
- <Icon type="close" onClick={() => this.deleteTable(item)}/>
+ <CloseOutlined onClick={() => this.deleteTable(item)}/>
<div className="bottom-mask"></div>
</List.Item>}
/>}
--
Gitblit v1.8.0