From 2bccb9ec7bdefe23292a22bc153463cfa1479a49 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 六月 2024 16:25:42 +0800
Subject: [PATCH] 2024-06-21
---
src/views/mobdesign/index.jsx | 312 +++++++++++++++++++++++++++-------------------------
1 files changed, 162 insertions(+), 150 deletions(-)
diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index 4946716..dbf4105 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -3,16 +3,15 @@
import { withRouter } from 'react-router'
import { is, fromJS } from 'immutable'
import HTML5Backend from 'react-dnd-html5-backend'
-import { ConfigProvider, notification, Modal, Collapse, Switch, Button, message, Spin, Typography } from 'antd'
+import { notification, Modal, Collapse, Switch, Button, message, Spin, Typography } from 'antd'
import { DoubleLeftOutlined, DoubleRightOutlined, HomeOutlined, LoginOutlined, ArrowLeftOutlined, EyeOutlined, EyeInvisibleOutlined } from '@ant-design/icons'
import moment from 'moment'
import md5 from 'md5'
import Api from '@/api'
import Utils, { setGLOBFuncs } from '@/utils/utils.js'
-import antdZhCN from 'antd/es/locale/zh_CN'
import MKEmitter from '@/utils/events.js'
-import MenuUtils, { getTables, getFuncsAndInters } from '@/utils/utils-custom.js'
+import MenuUtils, { getTables, getFuncsAndInters, getLangTrans } from '@/utils/utils-custom.js'
import asyncComponent from '@/utils/asyncComponent'
import '@/assets/css/design.scss'
@@ -99,11 +98,14 @@
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 || '')
@@ -111,6 +113,12 @@
sessionStorage.setItem('direction', param.direction || 'vertical')
sessionStorage.setItem('userbind', param.userbind || '')
sessionStorage.setItem('instantMessage', param.instantMessage || '')
+
+ if (param.applangList) {
+ sessionStorage.setItem('applangList', param.applangList)
+ } else {
+ sessionStorage.removeItem('applangList')
+ }
this.getAppMessage(param.MenuID)
} else if (param.type === 'view') {
@@ -390,7 +398,8 @@
MenuID: menu.MenuID,
copyMenuId: menu.copyMenuId || '',
clearMenu: menu.clearMenu !== 'false',
- type: 'view'
+ type: 'view',
+ lang: sessionStorage.getItem('lang')
}
param.MenuNo = menu.MenuNo || ''
@@ -434,7 +443,7 @@
let param = {
func: 's_kei_link_keyids_addupt',
BID: sessionStorage.getItem('appId'),
- exec_type: 'y',
+ exec_type: 'x',
LText: ''
}
@@ -449,7 +458,7 @@
param.LText = appViewList.map(item => `select '${item.keys_id}','${item.keys_type}','${item.kei_no}','${item.appkey}','${item.bid}','${sessionStorage.getItem('CloudUserID')}','${item.remark}'`)
param.LText = param.LText.join(' union all ')
- param.LText = Utils.formatOptions(param.LText)
+ param.LText = Utils.formatOptions(param.LText, 'x')
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
@@ -463,12 +472,12 @@
})
} else {
sessionStorage.setItem('appViewList', JSON.stringify(appViewList))
- this.props.history.replace('/mobdesign/' + window.btoa(window.encodeURIComponent(JSON.stringify({MenuID: homeId, type: 'view'}))))
+ this.props.history.replace('/mobdesign/' + window.btoa(window.encodeURIComponent(JSON.stringify({MenuID: homeId, type: 'view', lang: sessionStorage.getItem('lang')}))))
}
})
} else {
sessionStorage.setItem('appViewList', JSON.stringify(appViewList))
- this.props.history.replace('/mobdesign/' + window.btoa(window.encodeURIComponent(JSON.stringify({MenuID: MenuID || homeId, type: 'view'}))))
+ this.props.history.replace('/mobdesign/' + window.btoa(window.encodeURIComponent(JSON.stringify({MenuID: MenuID || homeId, type: 'view', lang: sessionStorage.getItem('lang')}))))
}
})
}
@@ -568,6 +577,7 @@
config.uuid = MenuId
config.MenuID = MenuId
+ config.Template = 'webPage'
config.open_edition = result.open_edition || ''
config.direction = config.direction || sessionStorage.getItem('direction') || 'vertical'
window.GLOB.urlFields = config.urlFields || []
@@ -686,6 +696,7 @@
config.uuid = MenuId
config.MenuID = MenuId
+ config.Template = 'webPage'
config.open_edition = result.open_edition || ''
this.setState({
@@ -825,6 +836,7 @@
config.uuid = MenuId
config.MenuID = MenuId
config.open_edition = ''
+ config.Template = 'webPage'
config.MenuName = urlParam.MenuName || ''
// config.MenuNo = urlParam.MenuNo || ''
config.MenuNo = ''
@@ -1036,7 +1048,7 @@
return
} else if (item.type === 'card' || item.type === 'carousel' || item.type === 'timeline') {
item.action && item.action.forEach(btn => {
- if (btn.hidden === 'true') return
+ if (btn.hidden === 'true' || btn.permission === 'false') return
m.children.push({
key: btn.uuid,
@@ -1045,7 +1057,7 @@
})
item.subcards.forEach(card => {
card.elements && card.elements.forEach(cell => {
- if (cell.eleType !== 'button' || cell.hidden === 'true') return
+ if (cell.eleType !== 'button' || cell.hidden === 'true' || cell.permission === 'false') return
m.children.push({
key: cell.uuid,
@@ -1056,7 +1068,7 @@
if (item.subtype !== 'dualdatacard') return
card.backElements && card.backElements.forEach(cell => {
- if (cell.eleType !== 'button' || cell.hidden === 'true') return
+ if (cell.eleType !== 'button' || cell.hidden === 'true' || cell.permission === 'false') return
m.children.push({
key: cell.uuid,
@@ -1066,7 +1078,7 @@
})
} else if (item.type === 'balcony') {
item.elements && item.elements.forEach(cell => {
- if (cell.eleType !== 'button' || cell.hidden === 'true') return
+ if (cell.eleType !== 'button' || cell.hidden === 'true' || cell.permission === 'false') return
m.children.push({
key: cell.uuid,
@@ -1095,7 +1107,7 @@
}
} else if (item.type === 'table') {
item.action && item.action.forEach(btn => {
- if (btn.hidden === 'true') return
+ if (btn.hidden === 'true' || btn.permission === 'false') return
m.children.push({
key: btn.uuid,
@@ -1108,7 +1120,7 @@
loopCol(col.subcols)
} else if (col.type === 'custom') {
col.elements.forEach(cell => {
- if (cell.eleType !== 'button' || cell.hidden === 'true') return
+ if (cell.eleType !== 'button' || cell.hidden === 'true' || cell.permission === 'false') return
m.children.push({
key: cell.uuid,
title: cell.label,
@@ -1403,6 +1415,18 @@
activeKey: 'basedata'
})
return
+ } else if (this.checklog()) {
+ if (sessionStorage.getItem('applangList') && !config.trans) {
+
+ } else {
+ notification.success({
+ top: 92,
+ message: '褰撳墠閰嶇疆鏈慨鏀癸紝鏃犻渶淇濆瓨銆�',
+ duration: 5
+ })
+ MKEmitter.emit('completeSave')
+ return
+ }
}
this.setState({
@@ -1506,6 +1530,7 @@
let interfaces = getFuncsAndInters(config)
roleParam.interfaces = interfaces
+ let langSql = getLangTrans(config)
let param = {
func: 'sPC_TrdMenu_AddUpt',
@@ -1522,12 +1547,16 @@
PageParam: JSON.stringify({Template: 'webPage', interfaces}),
open_edition: config.open_edition,
menus_rolelist: window.btoa(window.encodeURIComponent(JSON.stringify(roleParam))),
- LText: '',
- LTexttb: '',
+ // LText: '',
+ // LTexttb: '',
menus_used_list,
debug_md5: key,
debug_url: url,
debug_list: window.btoa(tbs)
+ }
+
+ if (langSql) {
+ param.lang_translation = window.btoa(window.encodeURIComponent(langSql))
}
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
@@ -1591,8 +1620,8 @@
PageParam: JSON.stringify({Template: NavBar.type}),
open_edition: _item ? (_item.open_edition || '') : '',
menus_rolelist: window.btoa(window.encodeURIComponent(JSON.stringify(roles))),
- LText: '',
- LTexttb: ''
+ // LText: '',
+ // LTexttb: ''
}
_param.LongParam = window.btoa(window.encodeURIComponent(JSON.stringify(NavBar)))
@@ -1633,13 +1662,13 @@
let kparam = {
func: 's_kei_link_keyids_addupt',
BID: sessionStorage.getItem('appId'),
- exec_type: 'y',
+ exec_type: 'x',
LText: ''
}
kparam.LText = _appViewList.map(item => `select '${item.keys_id}','${item.keys_type}','${item.kei_no}','${item.appkey}','${item.bid}','${sessionStorage.getItem('CloudUserID')}','${item.remark}'`)
kparam.LText = kparam.LText.join(' union all ')
- kparam.LText = Utils.formatOptions(kparam.LText)
+ kparam.LText = Utils.formatOptions(kparam.LText, 'x')
kparam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
kparam.secretkey = Utils.encrypt('', kparam.timestamp)
@@ -1688,10 +1717,10 @@
duration: 2
})
} else {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
+ Modal.warning({
+ width: 400,
+ title: res.message,
+ okText: '鐭ラ亾浜�'
})
}
MKEmitter.emit('completeSave')
@@ -1855,49 +1884,14 @@
insert = (item) => {
let config = fromJS(this.state.config).toJS()
- if (item.type === 'search') {
- if (config.components.filter(card => card.type === 'topbar' && card.wrap.type !== 'navbar').length > 0) {
- notification.warning({
- top: 92,
- message: '瀵艰埅鏍忎娇鐢ㄤ簡鎼滅储锛屼笉鍙坊鍔犳悳绱㈢粍浠讹紒',
- duration: 5
- })
- return
- }
- if (config.components.filter(card => card.type === 'search').length > 0) {
- notification.warning({
- top: 92,
- message: '鎼滅储鏉′欢涓嶅彲閲嶅娣诲姞锛�',
- duration: 5
- })
- return
- }
- }
-
- if (item.type === 'topbar') {
- if (config.components.findIndex(m => m.type === 'topbar') > -1) {
- notification.warning({
- top: 92,
- message: '瀵艰埅鏍忎笉鍙噸澶嶆坊鍔狅紒',
- duration: 5
- })
- return
- }
- if (!config.style.paddingTop) {
- config.style.paddingTop = '50px'
- }
+ if (item.type === 'topbar' && !config.style.paddingTop) {
+ config.style.paddingTop = '50px'
}
config.components.push(item)
this.setState({config})
window.GLOB.customMenu = config
-
- notification.success({
- top: 92,
- message: '绮樿创鎴愬姛锛�',
- duration: 2
- })
}
setHomeView = () => {
@@ -1915,7 +1909,7 @@
let param = {
func: 's_kei_link_keyids_addupt',
BID: sessionStorage.getItem('appId'),
- exec_type: 'y',
+ exec_type: 'x',
LText: ''
}
@@ -1934,7 +1928,7 @@
param.LText = appViewList.map(item => `select '${item.keys_id}','${item.keys_type}','${item.kei_no}','${item.appkey}','${item.bid}','${sessionStorage.getItem('CloudUserID')}','${item.remark}'`)
param.LText = param.LText.join(' union all ')
- param.LText = Utils.formatOptions(param.LText)
+ param.LText = Utils.formatOptions(param.LText, 'x')
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
@@ -1974,7 +1968,7 @@
let param = {
func: 's_kei_link_keyids_addupt',
BID: sessionStorage.getItem('appId'),
- exec_type: 'y',
+ exec_type: 'x',
LText: ''
}
@@ -1993,7 +1987,7 @@
param.LText = appViewList.map(item => `select '${item.keys_id}','${item.keys_type}','${item.kei_no}','${item.appkey}','${item.bid}','${sessionStorage.getItem('CloudUserID')}','${item.remark}'`)
param.LText = param.LText.join(' union all ')
- param.LText = Utils.formatOptions(param.LText)
+ param.LText = Utils.formatOptions(param.LText, 'x')
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
@@ -2055,97 +2049,115 @@
window.GLOB.customMenu = config
}
+ checklog = () => {
+ const { oriConfig, config } = this.state
+
+ return is(fromJS(oriConfig), fromJS(config))
+ }
+
+ updateLogConfig = (config) => {
+ config.open_edition = this.state.config.open_edition || ''
+
+ this.setState({
+ config: null
+ }, () => {
+ this.setState({
+ config: config
+ })
+ })
+
+ window.GLOB.customMenu = config
+ }
+
render () {
const { view, viewType, comloading, loading, settingshow, controlshow, activeKey, MenuId, config, menuloading, adapters, eyeopen, needUpdate } = this.state
return (
- <ConfigProvider locale={antdZhCN}>
- <div className={'mk-mob-view ' + viewType} id="mk-mob-design-view">
- <Header/>
- {loading ? <Spin className="view-spin" size="large" /> : null}
- <DndProvider backend={HTML5Backend}>
- {view !== 'popview' ? <><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 activeKey={activeKey} bordered={false} onChange={(key) => this.setState({activeKey: key})}>
- {/* 鍩烘湰淇℃伅 */}
- <Panel header="鍩烘湰淇℃伅" forceRender className="basedata" key="basedata">
- {config ? <>
- <MenuForm
- config={config}
- MenuId={MenuId}
- adapters={adapters}
- updateConfig={(con) => {
- this.updateConfig(con)
- if (con.direction !== config.direction) {
- this.changeView(con.direction)
- }
- }}
- />
- <UrlFieldComponent config={config} updateConfig={this.updateConfig}/>
- {/* 琛ㄥ悕娣诲姞 */}
- <TableComponent config={config} updatetable={this.updateConfig}/>
- <Paragraph style={{padding: '15px 0px 0px 18px'}} copyable={{ text: MenuId }}>鑿滃崟ID</Paragraph>
- <Paragraph style={{padding: '10px 0px 0px 18px'}} copyable={{ text: `${window.GLOB.baseurl}mob/index.html#/index/${sessionStorage.getItem('kei_no')}/${sessionStorage.getItem('typename')}/${sessionStorage.getItem('lang')}/${MenuId}/@BID@` }}>鑿滃崟閾炬帴</Paragraph>
- <NormalCss config={config} updateConfig={this.updateConfig}/>
- </> : null}
- </Panel>
- {/* 缁勪欢娣诲姞 */}
- <Panel header="缁勪欢" className="component" key="component">
- <SourceWrap />
- </Panel>
- <Panel header="鍏冪礌" key="element">
- <Modulecell />
- </Panel>
- <Panel header="椤甸潰鏍峰紡" key="background">
- {config ? <BgController config={config} updateConfig={this.updateConfig} /> : null}
- </Panel>
- </Collapse>
- </div>
+ <div className={'mk-mob-view ' + viewType} id="mk-mob-design-view">
+ <Header/>
+ {loading ? <Spin className="view-spin" size="large" /> : null}
+ <DndProvider backend={HTML5Backend}>
+ {view !== 'popview' ? <><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" className={needUpdate ? 'update-tip' : ''} onClick={this.submitConfig} id="save-config" loading={menuloading}>淇濆瓨</Button>
- {config ? <Switch className="big" checkedChildren="鍚�" unCheckedChildren="鍋�" checked={config.enabled} onChange={this.onEnabledChange} /> : null}
- <ArrowLeftOutlined title="鍚庨��" className="back-view" onClick={this.backView}/>
- {config ? <Debug config={config}/> : null}
- <Button className="mk-border-purple" onClick={() => this.setState({eyeopen: !eyeopen})}>{!eyeopen ? <EyeOutlined /> : <EyeInvisibleOutlined />} 缁勪欢鍚�</Button>
- <CreateView resetmenu={this.getAppMenus} />
- <PasteController insert={this.insert} />
- <TableNodes config={config} />
- <ViewNodes config={config} MenuId={MenuId}/>
- <SysInterface config={config} updateConfig={this.updateConfig}/>
- <PictureController/>
- <Quotecomponent config={config} updateConfig={this.updateConfig}/>
- <StyleCombControlButton menu={config} />
- <Button className="mk-border-green set-home" onClick={this.setHomeView}><HomeOutlined /> 璁句负棣栭〉</Button>
- <Button className="mk-border-purple set-login" onClick={this.setLoginView}><LoginOutlined /> 璁句负鐧诲綍椤�</Button>
- <ReplaceField type="custom" config={config} updateConfig={this.resetConfig}/>
- <Transfer MenuID={MenuId} />
- <Versions MenuId={MenuId} open_edition={config ? config.open_edition : ''}/>
- <Button type="default" onClick={this.closeView}>鍏抽棴</Button>
- </div>
+ <div className="pc-setting-tools">
+ <Collapse accordion activeKey={activeKey} bordered={false} onChange={(key) => this.setState({activeKey: key})}>
+ {/* 鍩烘湰淇℃伅 */}
+ <Panel header="鍩烘湰淇℃伅" forceRender className="basedata" key="basedata">
+ {config ? <>
+ <MenuForm
+ config={config}
+ MenuId={MenuId}
+ adapters={adapters}
+ updateConfig={(con) => {
+ this.updateConfig(con)
+ if (con.direction !== config.direction) {
+ this.changeView(con.direction)
+ }
+ }}
+ />
+ <UrlFieldComponent config={config} updateConfig={this.updateConfig}/>
+ {/* 琛ㄥ悕娣诲姞 */}
+ <TableComponent config={config} updatetable={this.updateConfig}/>
+ <Paragraph style={{padding: '15px 0px 0px 18px'}} copyable={{ text: MenuId }}>鑿滃崟ID</Paragraph>
+ <Paragraph style={{padding: '10px 0px 0px 18px'}} copyable={{ text: `${window.GLOB.baseurl}mob/index.html#/index/${sessionStorage.getItem('kei_no')}/${sessionStorage.getItem('typename')}/${sessionStorage.getItem('lang')}/${MenuId}/@BID@` }}>鑿滃崟閾炬帴</Paragraph>
+ <NormalCss config={config} updateConfig={this.updateConfig}/>
+ </> : null}
+ </Panel>
+ {/* 缁勪欢娣诲姞 */}
+ <Panel header="缁勪欢" className="component" key="component">
+ <SourceWrap />
+ </Panel>
+ <Panel header="鍏冪礌" key="element">
+ <Modulecell />
+ </Panel>
+ <Panel header="椤甸潰鏍峰紡" key="background">
+ {config ? <BgController config={config} updateConfig={this.updateConfig} /> : null}
+ </Panel>
+ </Collapse>
</div>
- <div className={'menu-body menu-view' + (menuloading ? ' saving' : '') + (eyeopen ? ' eye-open' : '')}>
- {config && !comloading ? <div className="mob-shell" style={{width: window.GLOB.shellWidth, height: window.GLOB.shellHeight}}>
- <MobShell menu={config} handleList={this.updateConfig} />
- </div> : null}
- </div></> : <PopView btn={this.state.popConfig} save={this.submitPopConfig} cancel={this.closePop}/>}
- </DndProvider>
- <StyleController />
- <StyleCombController />
- <ModalController />
- <SearchController />
- </div>
- </ConfigProvider>
+ </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" className={needUpdate ? 'update-tip' : ''} onClick={this.submitConfig} id="save-config" loading={menuloading}>淇濆瓨</Button>
+ {config ? <Switch className="big" checkedChildren="鍚�" unCheckedChildren="鍋�" checked={config.enabled} onChange={this.onEnabledChange} /> : null}
+ <ArrowLeftOutlined title="鍚庨��" className="back-view" onClick={this.backView}/>
+ {config ? <Debug config={config}/> : null}
+ <Button className="mk-border-purple" onClick={() => this.setState({eyeopen: !eyeopen})}>{!eyeopen ? <EyeOutlined /> : <EyeInvisibleOutlined />} 缁勪欢鍚�</Button>
+ <CreateView resetmenu={this.getAppMenus} />
+ <PasteController insert={this.insert} />
+ <TableNodes config={config} />
+ <ViewNodes config={config} MenuId={MenuId}/>
+ <SysInterface config={config} updateConfig={this.updateConfig}/>
+ <PictureController/>
+ <Quotecomponent config={config} updateConfig={this.updateConfig}/>
+ <StyleCombControlButton menu={config} />
+ <Button className="mk-border-green set-home" onClick={this.setHomeView}><HomeOutlined /> 璁句负棣栭〉</Button>
+ <Button className="mk-border-purple set-login" onClick={this.setLoginView}><LoginOutlined /> 璁句负鐧诲綍椤�</Button>
+ <ReplaceField type="custom" config={config} updateConfig={this.resetConfig}/>
+ <Transfer MenuID={MenuId} />
+ {config ? <Versions MenuId={MenuId} Template="webPage" checklog={this.checklog} updateConfig={this.updateLogConfig}/> : null}
+ <Button type="default" onClick={this.closeView}>鍏抽棴</Button>
+ </div>
+ </div>
+ <div className={'menu-body menu-view' + (menuloading ? ' saving' : '') + (eyeopen ? ' eye-open' : '')}>
+ {config && !comloading ? <div className="mob-shell" style={{width: window.GLOB.shellWidth, height: window.GLOB.shellHeight}}>
+ <MobShell menu={config} handleList={this.updateConfig} />
+ </div> : null}
+ </div></> : <PopView btn={this.state.popConfig} save={this.submitPopConfig} cancel={this.closePop}/>}
+ </DndProvider>
+ <StyleController />
+ <StyleCombController />
+ <ModalController />
+ <SearchController />
+ </div>
)
}
}
--
Gitblit v1.8.0