From b91c28df2f734b680198e755b7828666e238cea0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 六月 2024 16:43:44 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/views/imdesign/index.jsx | 173 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 84 insertions(+), 89 deletions(-)
diff --git a/src/views/imdesign/index.jsx b/src/views/imdesign/index.jsx
index 6bd3c0c..1960d4b 100644
--- a/src/views/imdesign/index.jsx
+++ b/src/views/imdesign/index.jsx
@@ -2,13 +2,11 @@
import { withRouter } from 'react-router'
import { is, fromJS } from 'immutable'
import moment from 'moment'
-import { ConfigProvider, notification, Modal, Collapse, Button, Spin } from 'antd'
+import { notification, Modal, Collapse, Button, Spin } from 'antd'
import { DoubleLeftOutlined, DoubleRightOutlined, LeftOutlined, UserOutlined, EllipsisOutlined } from '@ant-design/icons'
import Api from '@/api'
import Utils from '@/utils/utils.js'
-import antdEnUS from 'antd/es/locale/en_US'
-import antdZhCN from 'antd/es/locale/zh_CN'
// import MKEmitter from '@/utils/events.js'
import asyncComponent from '@/utils/asyncComponent'
import getWrapForm from './options'
@@ -32,7 +30,6 @@
class ImDesign extends Component {
state = {
- localedict: sessionStorage.getItem('lang') !== 'en-US' ? antdZhCN : antdEnUS,
loading: true,
MenuId: '',
MenuName: '',
@@ -49,10 +46,12 @@
try {
let param = JSON.parse(window.decodeURIComponent(window.atob(this.props.match.params.param)))
+ if (param.lang) {
+ sessionStorage.setItem('lang', param.lang)
+ }
if (param.type === 'app') {
sessionStorage.setItem('appId', param.ID || '')
sessionStorage.setItem('appName', param.remark || '')
- sessionStorage.setItem('lang', param.lang || 'zh-CN')
sessionStorage.setItem('kei_no', param.kei_no || '')
sessionStorage.setItem('typename', param.typename || 'mob')
sessionStorage.setItem('adapter', param.adapter || '')
@@ -60,9 +59,6 @@
sessionStorage.setItem('userbind', param.userbind || '')
sessionStorage.setItem('instantMessage', param.instantMessage || '')
- this.setState({
- localedict: sessionStorage.getItem('lang') !== 'en-US' ? antdZhCN : antdEnUS,
- })
this.getAppMessage(param.MenuID)
} else if (param.type === 'view') {
window.GLOB.winWidth = 420
@@ -149,7 +145,8 @@
let param = {
MenuID: config.wrap.linkmenu,
copyMenuId: '',
- type: 'view'
+ type: 'view',
+ lang: sessionStorage.getItem('lang')
}
param = window.btoa(window.encodeURIComponent(JSON.stringify(param)))
@@ -177,7 +174,7 @@
}
sessionStorage.setItem('appViewList', JSON.stringify(appViewList))
- this.props.history.replace('/imdesign/' + window.btoa(window.encodeURIComponent(JSON.stringify({MenuID: MenuID, type: 'view'}))))
+ this.props.history.replace('/imdesign/' + window.btoa(window.encodeURIComponent(JSON.stringify({MenuID: MenuID, type: 'view', lang: sessionStorage.getItem('lang')}))))
window.location.reload()
})
}
@@ -361,8 +358,8 @@
PageParam: JSON.stringify({Template: 'imPage'}),
open_edition: config.open_edition,
menus_rolelist: window.btoa(window.encodeURIComponent(JSON.stringify({type: 'im', key: config.uuid, title: config.MenuName, children: []}))),
- LText: '',
- LTexttb: ''
+ // LText: '',
+ // LTexttb: ''
}
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
@@ -421,96 +418,94 @@
}
render () {
- const { localedict, loading, settingshow, controlshow, MenuId, config, menuloading } = this.state
+ const { loading, settingshow, controlshow, MenuId, config, menuloading } = this.state
return (
- <ConfigProvider locale={localedict}>
- <div className="mk-mob-view" id="mk-mob-design-view">
- <Header/>
- {loading ? <Spin className="view-spin" size="large" /> : null}
- <div className={'menu-setting ' + (!settingshow ? 'hidden' : '')}>
- <div className="draw">
- {settingshow ? <DoubleLeftOutlined onClick={() => {this.setState({settingshow: false})}} /> : null}
- {!settingshow ? <DoubleRightOutlined onClick={() => {this.setState({settingshow: true})}} /> : null}
- </div>
- <div className="pc-setting-tools">
- <Collapse accordion defaultActiveKey="basedata" bordered={false}>
- {/* 鍩烘湰淇℃伅 */}
- <Panel header="鍩烘湰淇℃伅" forceRender key="basedata">
- {/* 鑿滃崟淇℃伅 */}
- {config ? <MenuForm
- config={config}
- MenuId={MenuId}
- updateConfig={this.updateConfig}
- /> : null}
- </Panel>
- <Panel header="椤甸潰鏍峰紡" key="background">
- {config ? <BgController config={config} updateConfig={this.updateConfig} /> : null}
- </Panel>
- </Collapse>
- </div>
+ <div className="mk-mob-view" id="mk-mob-design-view">
+ <Header/>
+ {loading ? <Spin className="view-spin" size="large" /> : null}
+ <div className={'menu-setting ' + (!settingshow ? 'hidden' : '')}>
+ <div className="draw">
+ {settingshow ? <DoubleLeftOutlined onClick={() => {this.setState({settingshow: false})}} /> : null}
+ {!settingshow ? <DoubleRightOutlined onClick={() => {this.setState({settingshow: true})}} /> : null}
</div>
- <div className={'menu-control ' + (!controlshow ? 'hidden' : '')}>
- <div className="draw">
- {controlshow ? <DoubleRightOutlined onClick={() => {this.setState({controlshow: false})}}/> : null}
- {!controlshow ? <DoubleLeftOutlined onClick={() => {this.setState({controlshow: true})}}/> : null}
- </div>
- <div className="wrap">
- <Button type="primary" onClick={this.submitConfig} id="save-config" loading={menuloading}>淇濆瓨</Button>
- <NormalForm title="鍗虫椂閫氫俊璁剧疆" width={800} update={this.updateWrap} getForms={this.getWrapForms}>
- <Button type="default" style={{borderColor: 'rgb(64, 169, 255)', color: 'rgb(64, 169, 255)'}}>璁剧疆</Button>
- </NormalForm>
- <Button type="default" className="mk-border-purple" onClick={this.backView}>鍚庨��</Button>
- <CreateView resetmenu={this.getAppMenus} />
- <Transfer MenuID={MenuId} />
- <Button type="default" onClick={this.closeView}>鍏抽棴</Button>
- </div>
+ <div className="pc-setting-tools">
+ <Collapse accordion defaultActiveKey="basedata" bordered={false}>
+ {/* 鍩烘湰淇℃伅 */}
+ <Panel header="鍩烘湰淇℃伅" forceRender key="basedata">
+ {/* 鑿滃崟淇℃伅 */}
+ {config ? <MenuForm
+ config={config}
+ MenuId={MenuId}
+ updateConfig={this.updateConfig}
+ /> : null}
+ </Panel>
+ <Panel header="椤甸潰鏍峰紡" key="background">
+ {config ? <BgController config={config} updateConfig={this.updateConfig} /> : null}
+ </Panel>
+ </Collapse>
</div>
- <div className={'menu-body menu-view'}>
- <div className="mob-shell" style={{width: window.GLOB.shellWidth, height: window.GLOB.shellHeight}}>
- <div className="instant-message" style={config ? config.style : null}>
- <div className="header">
- <LeftOutlined/>
- <span className="title">鏈嬪弸</span>
- {config && config.wrap.linkmenu ? <EllipsisOutlined onDoubleClick={this.changeEditMenu}/> : null}
- </div>
- <div className="mk-content-wrap">
- <div className="line-wrap">
- <div className="time-line">12:34</div>
- <div className="line-msg">
- <div className="portrait">
- <div className="img"><UserOutlined /></div>
- </div>
- <div className="msg">
- <div className="title">鏈嬪弸</div>
- <div className="words">鎮ㄥソ</div>
- </div>
+ </div>
+ <div className={'menu-control ' + (!controlshow ? 'hidden' : '')}>
+ <div className="draw">
+ {controlshow ? <DoubleRightOutlined onClick={() => {this.setState({controlshow: false})}}/> : null}
+ {!controlshow ? <DoubleLeftOutlined onClick={() => {this.setState({controlshow: true})}}/> : null}
+ </div>
+ <div className="wrap">
+ <Button type="primary" onClick={this.submitConfig} id="save-config" loading={menuloading}>淇濆瓨</Button>
+ <NormalForm title="鍗虫椂閫氫俊璁剧疆" width={800} update={this.updateWrap} getForms={this.getWrapForms}>
+ <Button type="default" style={{borderColor: 'rgb(64, 169, 255)', color: 'rgb(64, 169, 255)'}}>璁剧疆</Button>
+ </NormalForm>
+ <Button type="default" className="mk-border-purple" onClick={this.backView}>鍚庨��</Button>
+ <CreateView resetmenu={this.getAppMenus} />
+ <Transfer MenuID={MenuId} />
+ <Button type="default" onClick={this.closeView}>鍏抽棴</Button>
+ </div>
+ </div>
+ <div className={'menu-body menu-view'}>
+ <div className="mob-shell" style={{width: window.GLOB.shellWidth, height: window.GLOB.shellHeight}}>
+ <div className="instant-message" style={config ? config.style : null}>
+ <div className="header">
+ <LeftOutlined/>
+ <span className="title">鏈嬪弸</span>
+ {config && config.wrap.linkmenu ? <EllipsisOutlined onDoubleClick={this.changeEditMenu}/> : null}
+ </div>
+ <div className="mk-content-wrap">
+ <div className="line-wrap">
+ <div className="time-line">12:34</div>
+ <div className="line-msg">
+ <div className="portrait">
+ <div className="img"><UserOutlined /></div>
</div>
- </div>
- <div className="line-wrap">
- <div className="time-line">12:45</div>
- <div className="line-msg right">
- <div className="msg">
- <div className="words">
- 鎮ㄥソ
- </div>
- </div>
- <div className="portrait">
- <div className="img"><UserOutlined /></div>
- </div>
+ <div className="msg">
+ <div className="title">鏈嬪弸</div>
+ <div className="words">鎮ㄥソ</div>
</div>
</div>
</div>
- <div className="send-wrap">
- <div className="adm-input"></div>
- <div className="send"><Button>鍙戦��</Button></div>
+ <div className="line-wrap">
+ <div className="time-line">12:45</div>
+ <div className="line-msg right">
+ <div className="msg">
+ <div className="words">
+ 鎮ㄥソ
+ </div>
+ </div>
+ <div className="portrait">
+ <div className="img"><UserOutlined /></div>
+ </div>
+ </div>
</div>
+ </div>
+ <div className="send-wrap">
+ <div className="adm-input"></div>
+ <div className="send"><Button>鍙戦��</Button></div>
</div>
</div>
</div>
- <StyleController />
</div>
- </ConfigProvider>
+ <StyleController />
+ </div>
)
}
}
--
Gitblit v1.8.0