From af6486b3629d23e426ce85b87dbc20dfa15b1afe Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 07 十一月 2022 18:50:27 +0800
Subject: [PATCH] 2022-11-07
---
src/templates/comtableconfig/index.jsx | 65 +++++++++++++++++---------------
1 files changed, 34 insertions(+), 31 deletions(-)
diff --git a/src/templates/comtableconfig/index.jsx b/src/templates/comtableconfig/index.jsx
index 19d51d2..09683e2 100644
--- a/src/templates/comtableconfig/index.jsx
+++ b/src/templates/comtableconfig/index.jsx
@@ -11,8 +11,6 @@
import Utils from '@/utils/utils.js'
import MKEmitter from '@/utils/events.js'
import { updateCommonTable } from '@/utils/utils-update.js'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
import asyncComponent from '@/utils/asyncComponent'
import SearchComponent from '@/templates/sharecomponent/searchcomponent'
@@ -30,6 +28,7 @@
const Versions = asyncComponent(() => import('@/menu/versions'))
const UrlFieldComponent = asyncComponent(() => import('@/menu/urlfieldcomponent'))
const ReplaceField = asyncComponent(() => import('@/menu/replaceField'))
+const UpdateTable = asyncComponent(() => import('./updatetable'))
const Unattended = asyncComponent(() => import('@/templates/zshare/unattended'))
const EditComponent = asyncComponent(() => import('@/templates/zshare/editcomponent'))
const SettingComponent = asyncComponent(() => import('@/templates/sharecomponent/settingcomponent'))
@@ -48,7 +47,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
config: null, // 椤甸潰閰嶇疆
formlist: null, // 鎼滅储鏉′欢銆佹寜閽�佹樉绀哄垪琛ㄥ崟瀛楁
menuloading: false, // 鑿滃崟淇濆瓨涓�
@@ -64,7 +62,6 @@
activeKey: '0', // 榛樿灞曞紑鍩烘湰淇℃伅
chartview: null, // 褰撳墠瑙嗗浘
openEdition: '', // 缂栬緫鐗堟湰鏍囪锛岄槻姝㈠浜烘搷浣�
- modalStatus: false // 寮圭獥鏄惁寮�鍚紝鍒ゆ柇ctrl+s鏄惁鍙敤
}
/**
@@ -166,10 +163,23 @@
let _shortcut = `${preKey}+${keyCode}`
if (_shortcut === 'ctrl+83') {
- if (this.state.modalStatus) {
+ let modals = document.querySelectorAll('.mk-pop-modal')
+ let msg = null
+ for (let i = 0; i < modals.length; i++) {
+ if (msg) {
+ break
+ }
+
+ let node = modals[i].querySelector('.mk-com-name')
+
+ if (node) {
+ msg = node.innerText
+ }
+ }
+ if (msg) {
notification.warning({
top: 92,
- message: '璇蜂繚瀛�' + this.state.modalStatus,
+ message: '璇蜂繚瀛�' + msg,
duration: 5
})
return false
@@ -182,8 +192,6 @@
return false
}
}
-
- MKEmitter.addListener('modalStatus', this.modalStatus)
}
/**
@@ -194,11 +202,6 @@
return
}
document.onkeydown = () => {}
- MKEmitter.removeListener('modalStatus', this.modalStatus)
- }
-
- modalStatus = (val) => {
- this.setState({modalStatus: val})
}
/**
@@ -299,7 +302,7 @@
if (!_config.fstMenuId || !_config.ParentId || !_config.MenuName || !_config.MenuNo) {
notification.warning({
top: 92,
- message: this.state.dict['model.menu.basemsg'],
+ message: '璇峰畬鍠勮彍鍗曞熀鏈俊鎭紒',
duration: 5
})
this.setState({activeKey: '0'})
@@ -732,7 +735,7 @@
})
}
this.props.reloadmenu()
- Api.getLocalConfig(localParam)
+ Api.genericInterface(localParam)
} else {
this.setState({
menuloading: false,
@@ -779,14 +782,14 @@
if (config.isAdd) { // 鏂板缓鑿滃崟锛屾彁绀鸿彍鍗曞皻鏈繚瀛�
notification.warning({
top: 92,
- message: this.state.dict['header.menu.config.notsave'],
+ message: '鑿滃崟灏氭湭淇濆瓨锛岃鍏堜繚瀛樿彍鍗曢厤缃紒',
duration: 5
})
} else {
if (!is(fromJS(originMenu), fromJS(config))) { // 鑿滃崟淇℃伅鍙樺寲鏃讹紝鎻愮ず淇濆瓨
notification.warning({
top: 92,
- message: this.state.dict['header.menu.config.update'],
+ message: '鑿滃崟閰嶇疆宸蹭慨鏀癸紝璇蜂繚瀛橈紒',
duration: 5
})
return
@@ -1165,12 +1168,11 @@
<div className="tools">
<Collapse accordion activeKey={activeKey} bordered={false} onChange={(key) => this.setState({activeKey: key})}>
{/* 鍩烘湰淇℃伅 */}
- <Panel forceRender={true} header={this.state.dict['header.menu.basedata']} key="0" id="main-basedata">
+ <Panel forceRender={true} header="鍩烘湰淇℃伅" key="0" id="main-basedata">
{/* 鑿滃崟淇℃伅 */}
<MenuForm
menu={menu}
config={config}
- dict={this.state.dict}
updatemenu={this.updateconfig}
/>
{config ? <UrlFieldComponent
@@ -1185,14 +1187,14 @@
/>
</Panel>
{/* 鎼滅储鏉′欢娣诲姞 */}
- <Panel header={this.state.dict['header.menu.search']} key="1">
+ <Panel header="鎼滅储" key="1">
<div className="search-element">
{Source.searchItems.map((item, index) => (<SourceElement key={index} content={item}/>))}
</div>
<FieldsComponent config={config} type="search" />
</Panel>
{/* 鎸夐挳娣诲姞 */}
- <Panel header={this.state.dict['header.menu.action']} key="2">
+ <Panel header="鎸夐挳" key="2">
<div className="search-element">
{Source.actionItems.map((item, index) => (<SourceElement key={index} content={item}/>))}
</div>
@@ -1220,14 +1222,14 @@
})}
</Panel>
{/* 娣诲姞鏄剧ず鍒� */}
- <Panel header={this.state.dict['header.menu.column']} key="3">
+ <Panel header="鏄剧ず鍒�" key="3">
<div className="search-element">
{Source.columnItems.map((item, index) => (<SourceElement key={index} content={item}/>))}
</div>
<FieldsComponent config={config} type="columns"/>
</Panel>
{/* 娣诲姞鏍囩 */}
- <Panel header={this.state.dict['header.menu.tab']} key="4">
+ <Panel header="鏍囩椤�" key="4">
<div className="search-element">
{Source.tabItems.map((item, index) => (<SourceElement key={index} content={item}/>))}
</div>
@@ -1265,10 +1267,11 @@
<Unattended config={config} updateConfig={this.updateconfig}/>
<Versions MenuId={menu.MenuID} open_edition={openEdition} updateConfig={this.refreshConfig}/>
<ReplaceField type="table" config={config} updateConfig={this.updateconfig}/>
- <EditComponent dict={this.state.dict} type="table" options={['search', 'form', 'action', 'columns']} config={this.state.config} MenuID={this.props.menu.MenuID} thawButtons={this.state.thawButtons} refresh={this.editConfig}/>
- <Switch className="big" checkedChildren={this.state.dict['model.enable']} unCheckedChildren={this.state.dict['model.disable']} checked={this.state.config.enabled} onChange={this.onEnabledChange} />
- <Button type="primary" id="save-config" onClick={this.submitConfig} loading={this.state.menuloading}>{this.state.dict['model.save']}</Button>
- <Button onClick={this.cancelConfig}>{this.state.dict['model.back']}</Button>
+ <EditComponent type="table" options={['search', 'form', 'action', 'columns']} config={this.state.config} MenuID={this.props.menu.MenuID} thawButtons={this.state.thawButtons} refresh={this.editConfig}/>
+ <UpdateTable config={config}/>
+ <Switch className="big" checkedChildren="鍚�" unCheckedChildren="鍋�" checked={this.state.config.enabled} onChange={this.onEnabledChange} />
+ <Button type="primary" id="save-config" onClick={this.submitConfig} loading={this.state.menuloading}>淇濆瓨</Button>
+ <Button onClick={this.cancelConfig}>鍏抽棴</Button>
</div>
} style={{ width: '100%' }}>
<SettingComponent
@@ -1363,13 +1366,13 @@
visible={this.state.closeVisible}
onCancel={() => { this.setState({closeVisible: false}) }}
footer={[
- <Button key="save" className="mk-btn mk-green" loading={this.state.menucloseloading} onClick={this.submitConfig}>{this.state.dict['model.save']}</Button>,
- <Button key="notsave" className="mk-btn mk-yellow" onClick={this.notsave}>{this.state.dict['model.notsave']}</Button>,
- <Button key="cancel" onClick={() => { this.setState({closeVisible: false}) }}>{this.state.dict['model.cancel']}</Button>
+ <Button key="save" className="mk-btn mk-green" loading={this.state.menucloseloading} onClick={this.submitConfig}>淇濆瓨</Button>,
+ <Button key="notsave" className="mk-btn mk-yellow" onClick={this.notsave}>涓嶄繚瀛�</Button>,
+ <Button key="cancel" onClick={() => { this.setState({closeVisible: false}) }}>鍙栨秷</Button>
]}
destroyOnClose
>
- {this.state.dict['header.menu.config.placeholder']}
+ 閰嶇疆宸蹭慨鏀癸紝鏄惁淇濆瓨閰嶇疆淇℃伅锛�
</Modal>
{this.state.loading && <Spin size="large" />}
</div>
--
Gitblit v1.8.0