From cbeffcc0902631909c0373f274752a97ddaf2d4e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 06 八月 2022 01:41:54 +0800
Subject: [PATCH] 2022-08-06
---
src/templates/formtabconfig/index.jsx | 55 ++++++++++++++++++++++++++-----------------------------
1 files changed, 26 insertions(+), 29 deletions(-)
diff --git a/src/templates/formtabconfig/index.jsx b/src/templates/formtabconfig/index.jsx
index 9fce9dc..aef7eda 100644
--- a/src/templates/formtabconfig/index.jsx
+++ b/src/templates/formtabconfig/index.jsx
@@ -430,10 +430,7 @@
let _inputfields = []
let _tabfields = []
let _linkableFields = []
- let _linksupFields = [{
- value: '',
- text: '绌�'
- }]
+ let _linksupFields = []
let _formfields = []
// 璁剧疆涓嬫媺鑿滃崟鍙叧鑱斿瓧娈�
@@ -485,7 +482,7 @@
this.setState({
modaltype: 'search',
card: card,
- formlist: getModalForm(card, _inputfields, _tabfields, _linkableFields, _linksupFields, false).map(item => {
+ formlist: getModalForm(card, _inputfields, _tabfields, _linkableFields, _linksupFields).map(item => {
if (item.key === 'type') {
item.options = item.options.filter(option => !['switch', 'checkbox', 'radio', 'checkcard', 'hint'].includes(option.value))
}
@@ -601,10 +598,10 @@
LText: res.dataSource
}
- param.LText = param.LText.replace(/@\$|\$@/ig, '')
+ param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id)@/ig, `'${param.timestamp}'`)
param.LText = Utils.formatOptions(param.LText)
- param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
if (window.GLOB.mainSystemApi && res.database === 'sso') {
@@ -759,13 +756,7 @@
let newLText = Utils.formatOptions(FuncUtils.getTableFunc(setting, menu, _config)) // 鍒涘缓瀛樺偍杩囩▼sql
let DelText = Utils.formatOptions(FuncUtils.dropfunc(setting.innerFunc)) // 鍒犻櫎瀛樺偍杩囩▼sql
- this.refs.tableCreatFunc.exec(setting.innerFunc, newLText, DelText).then(result => {
- if (result === 'success') {
- this.setState({
- config: _config
- })
- }
- })
+ this.refs.tableCreatFunc.exec(setting.innerFunc, newLText, DelText)
})
}
@@ -1327,7 +1318,6 @@
initval: '',
type: item.type,
resourceType: '0',
- setAll: 'false',
options: [],
orderType: 'asc'
}
@@ -1458,10 +1448,10 @@
LText: res.dataresource
}
- param.LText = param.LText.replace(/@\$|\$@/ig, '')
+ param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id)@/ig, `'${param.timestamp}'`)
param.LText = Utils.formatOptions(param.LText)
- param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
Api.getLocalConfig(param).then(result => {
@@ -1802,7 +1792,7 @@
className="tables"
style={{ width: '100%' }}
optionFilterProp="children"
- value={this.state.dict['header.menu.table.placeholder']}
+ value="璇烽�夋嫨琛ㄥ悕"
onChange={this.onTableChange}
showArrow={false}
getPopupContainer={() => document.getElementById('common-basedata')}
@@ -1833,7 +1823,7 @@
return (<SourceElement key={index} content={item}/>)
})}
</div>
- <Button type="primary" block onClick={() => this.queryField('search')}>{this.state.dict['header.menu.form.add']}</Button>
+ <Button type="primary" block onClick={() => this.queryField('search')}>鎵归噺娣诲姞</Button>
</Panel>
{/* 鎸夐挳娣诲姞 */}
<Panel header={this.state.dict['header.menu.action']} key="2">
@@ -1855,7 +1845,7 @@
<Tooltip placement="topLeft" title="鐐瑰嚮鎸夐挳锛屽彲瀹屾垚鎴栨煡鐪嬫爣绛鹃厤缃俊鎭��">
<QuestionCircleOutlined className="mk-form-tip" />
</Tooltip>
- {this.state.dict['header.menu.tab.configurable']}
+ 鏍囩閰嶇疆
</p> : null
}
{configTabs.map((item, index) => {
@@ -1876,7 +1866,7 @@
<div className="setting">
<Card title={
<div>
- {this.state.dict['header.menu.page.configurable']}
+ 椤甸潰閰嶇疆
<RedoOutlined style={{marginLeft: '10px'}} title="鍒锋柊鏍囩鍒楄〃" onClick={this.reloadTab} />
</div>
} bordered={false} extra={
@@ -1915,7 +1905,6 @@
setting={config.setting}
handleMenu={this.handleSearch}
deleteMenu={this.deleteElement}
- placeholder={this.state.dict['header.form.modal.placeholder']}
/>
</Panel>
))}
@@ -1931,7 +1920,6 @@
handleMenu={this.handleAction}
deleteMenu={this.deleteElement}
profileMenu={this.profileAction}
- placeholder={this.state.dict['header.form.action.placeholder']}
/>
</div>
{/* 鏍囩缁� */}
@@ -1946,9 +1934,9 @@
</DndProvider>
{/* 缂栬緫琛ㄥ崟 */}
<Modal
- title={this.state.card && this.state.card.iscopy ? this.state.dict['header.modal.form.copy'] : this.state.dict['header.modal.form.edit']}
+ title={this.state.card && this.state.card.iscopy ? '琛ㄥ崟-澶嶅埗' : '琛ㄥ崟-缂栬緫'}
visible={modaltype === 'search'}
- width={700}
+ width={950}
maskClosable={false}
onOk={this.handleSubmit}
confirmLoading={this.state.sqlVerifing}
@@ -1967,7 +1955,7 @@
<Modal
title={this.state.dict['model.action'] + '-' + this.state.dict['model.edit']}
visible={modaltype === 'actionEdit'}
- width={900}
+ width={920}
maskClosable={false}
onCancel={this.editModalCancel}
footer={[
@@ -2015,11 +2003,19 @@
wrapClassName="common-table-fields-modal"
title={'楠岃瘉淇℃伅'}
visible={this.state.profileVisible}
- width={'75vw'}
+ width={'90vw'}
maskClosable={false}
okText={this.state.dict['model.submit']}
onOk={this.verifySubmit}
- onCancel={() => { this.setState({ profileVisible: false }) }}
+ onCancel={() => {
+ if (this.verifyRef.handleCancel) {
+ this.verifyRef.handleCancel().then(() => {
+ this.setState({ profileVisible: false })
+ })
+ } else {
+ this.setState({ profileVisible: false })
+ }
+ }}
destroyOnClose
>
<VerifyCard
@@ -2073,7 +2069,7 @@
{this.state.dict['header.menu.config.placeholder']}
</Modal>
<Modal
- title={this.state.dict['header.menu.group.manage']}
+ title="鍒嗙粍绠＄悊"
visible={this.state.groupVisible}
width={700}
maskClosable={false}
@@ -2102,6 +2098,7 @@
<PasteForm
dict={this.state.dict}
wrappedComponentRef={(inst) => this.pasteFormRef = inst}
+ inputSubmit={this.pasteSubmit}
/>
</Modal>
{this.state.loading && <Spin size="large" />}
--
Gitblit v1.8.0