From c7414c3cc93649479119d51b230c4b8e36884ca7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 23 七月 2021 18:18:55 +0800
Subject: [PATCH] 2021-07-23
---
src/views/pcdesign/index.jsx | 355 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 208 insertions(+), 147 deletions(-)
diff --git a/src/views/pcdesign/index.jsx b/src/views/pcdesign/index.jsx
index bc7ea8b..d677f80 100644
--- a/src/views/pcdesign/index.jsx
+++ b/src/views/pcdesign/index.jsx
@@ -23,6 +23,8 @@
const { confirm } = Modal
const MenuForm = asyncComponent(() => import('./menuform'))
+const Transfer = asyncComponent(() => import('@/pc/transfer'))
+// const PopviewController = asyncComponent(() => import('@/menu/popview'))
const MenuShell = asyncComponent(() => import('@/pc/menushell'))
const SourceWrap = asyncComponent(() => import('@/pc/modulesource'))
const CreateView = asyncComponent(() => import('@/pc/createview'))
@@ -30,6 +32,7 @@
const Quotecomponent = asyncComponent(() => import('@/pc/quotecomponent'))
const PasteController = asyncComponent(() => import('@/menu/pastecontroller'))
const StyleController = asyncComponent(() => import('@/menu/stylecontroller'))
+const ReplaceField = asyncComponent(() => import('@/menu/replaceField'))
const SysInterface = asyncComponent(() => import('@/menu/sysinterface'))
const UrlFieldComponent = asyncComponent(() => import('@/menu/urlfieldcomponent'))
const PictureController = asyncComponent(() => import('@/menu/picturecontroller'))
@@ -173,7 +176,10 @@
param = window.btoa(window.encodeURIComponent(JSON.stringify(param)))
- if (param === this.props.match.params.param) return
+ if (param === this.props.match.params.param) {
+ window.location.reload()
+ return
+ }
this.props.history.push('/pcdesign/' + param)
}
@@ -238,13 +244,11 @@
})
} else {
sessionStorage.setItem('appViewList', JSON.stringify(appViewList))
- sessionStorage.setItem('appHomeId', homeId)
this.props.history.replace('/pcdesign/' + window.btoa(window.encodeURIComponent(JSON.stringify({MenuID: homeId, type: 'view'}))))
}
})
} else {
sessionStorage.setItem('appViewList', JSON.stringify(appViewList))
- sessionStorage.setItem('appHomeId', homeId)
this.props.history.replace('/pcdesign/' + window.btoa(window.encodeURIComponent(JSON.stringify({MenuID: homeId, type: 'view'}))))
}
})
@@ -364,6 +368,14 @@
}
this.setState({customComponents: coms})
this.getRoleFields()
+ })
+ }
+
+ handleBack = () => {
+ this.setState({popBtn: null, delButtons: [], copyButtons: [], thawButtons: []}, () => {
+ sessionStorage.setItem('editMenuType', 'menu')
+ window.GLOB.customMenu = this.state.config
+ this.setState({visible: false})
})
}
@@ -498,7 +510,7 @@
}
}
}
-
+
config.uuid = MenuId
config.MenuID = MenuId
config.open_edition = result.open_edition || ''
@@ -716,64 +728,149 @@
getMenuMessage = () => {
const { config } = this.state
- let buttons = []
- let _sort = 1
+ let nodes = {type: 'view', key: config.uuid, title: config.MenuName, children: []}
+ let popviews = []
let traversal = (components) => {
- components.forEach(item => {
+ let list = components.map(item => {
+ let m = {
+ key: item.uuid,
+ title: item.name,
+ children: []
+ }
if (item.type === 'tabs') {
+ let tabs = []
item.subtabs.forEach(tab => {
- traversal(tab.components)
+ let s = traversal(tab.components)
+
+ if (s.length === 0) return
+
+ tabs.push({
+ key: tab.uuid,
+ title: tab.label,
+ children: s
+ })
})
+
+ if (tabs.length > 0) {
+ m.children = tabs
+ }
} else if (item.type === 'group') {
- traversal(item.components)
+ m.children = traversal(item.components)
} else if (item.type === 'card' || (item.type === 'table' && item.subtype === 'tablecard')) {
item.action && item.action.forEach(btn => {
this.checkBtn(btn)
- buttons.push(`select '${btn.uuid}' as menuid, '${item.name + '-' + btn.label}' as menuname, '${_sort * 10}' as Sort`)
- _sort++
+ m.children.push({
+ key: btn.uuid,
+ title: btn.label,
+ })
+ if (btn.OpenType === 'popview') {
+ popviews.push(btn.uuid)
+ }
})
item.subcards.forEach(card => {
card.elements && card.elements.forEach(cell => {
if (cell.eleType !== 'button') return
this.checkBtn(cell)
- buttons.push(`select '${cell.uuid}' as menuid, '${item.name + '-' + cell.label}' as menuname, '${_sort * 10}' as Sort`)
- _sort++
+ m.children.push({
+ key: cell.uuid,
+ title: cell.label,
+ })
+ if (cell.OpenType === 'popview') {
+ popviews.push(cell.uuid)
+ }
})
card.backElements && card.backElements.forEach(cell => {
if (cell.eleType !== 'button') return
this.checkBtn(cell)
- buttons.push(`select '${cell.uuid}' as menuid, '${item.name + '-' + cell.label}' as menuname, '${_sort * 10}' as Sort`)
- _sort++
+ m.children.push({
+ key: cell.uuid,
+ title: cell.label,
+ })
+ if (cell.OpenType === 'popview') {
+ popviews.push(cell.uuid)
+ }
})
})
- } else if (item.type === 'line' || item.type === 'bar') {
- item.action && item.action.forEach(btn => {
- this.checkBtn(btn)
- buttons.push(`select '${btn.uuid}' as menuid, '${item.name + '-' + btn.label}' as menuname, '${_sort * 10}' as Sort`)
- _sort++
+ } else if (item.type === 'carousel') {
+ item.subcards.forEach(card => {
+ card.elements && card.elements.forEach(cell => {
+ if (cell.eleType !== 'button') return
+ this.checkBtn(cell)
+ m.children.push({
+ key: cell.uuid,
+ title: cell.label,
+ })
+ if (cell.OpenType === 'popview') {
+ popviews.push(cell.uuid)
+ }
+ })
+ })
+ } else if (item.type === 'balcony') {
+ item.elements && item.elements.forEach(cell => {
+ if (cell.eleType !== 'button') return
+ this.checkBtn(cell)
+ m.children.push({
+ key: cell.uuid,
+ title: cell.label,
+ })
+ if (cell.OpenType === 'popview') {
+ popviews.push(cell.uuid)
+ }
+ })
+ } else if (item.type === 'menubar') {
+ if (item.wrap.title) {
+ m.title = item.wrap.title
+ }
+
+ m.children = item.subMenus.map(menu => {
+ return {
+ key: menu.uuid,
+ title: menu.setting.name
+ }
})
} else if (item.type === 'table' && item.subtype === 'normaltable') {
item.action && item.action.forEach(btn => {
this.checkBtn(btn)
- buttons.push(`select '${btn.uuid}' as menuid, '${item.name + '-' + btn.label}' as menuname, '${_sort * 10}' as Sort`)
- _sort++
+ m.children.push({
+ key: btn.uuid,
+ title: btn.label,
+ })
+ if (btn.OpenType === 'popview') {
+ popviews.push(btn.uuid)
+ }
})
item.cols && item.cols.forEach(col => {
if (col.type !== 'action') return
col.elements.forEach(btn => {
this.checkBtn(btn)
- buttons.push(`select '${btn.uuid}' as menuid, '${item.name + '-' + btn.label}' as menuname, '${_sort * 10}' as Sort`)
- _sort++
+ m.children.push({
+ key: btn.uuid,
+ title: btn.label,
+ })
+ if (btn.OpenType === 'popview') {
+ popviews.push(btn.uuid)
+ }
})
})
}
+
+ if (m.children.length === 0) return null
+
+ return m
})
+
+ list = list.filter(Boolean)
+
+ return list
}
- traversal(config.components)
+ let trees = traversal(config.components)
- return buttons
+ nodes.children = trees
+ nodes.popviews = popviews
+
+ return nodes
}
checkBtn = (btn) => {
@@ -843,6 +940,8 @@
}
let parMenuId = sessionStorage.getItem('kei_no') + 'pc' + sessionStorage.getItem('lang')
+ let roleParam = this.getMenuMessage()
+
let param = {
func: 'sPC_TrdMenu_AddUpt',
FstID: parMenuId,
@@ -856,6 +955,7 @@
Typename: 'pc',
MenuName: config.MenuName || '',
PageParam: JSON.stringify({Template: 'webPage'}),
+ menus_rolelist: window.btoa(window.encodeURIComponent(JSON.stringify(roleParam))),
open_edition: config.open_edition,
LText: '',
LTexttb: ''
@@ -863,26 +963,6 @@
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
-
- let btnParam = { // 娣诲姞鑿滃崟鎸夐挳
- func: 'sPC_Button_AddUpt',
- Type: 40, // 娣诲姞鑿滃崟涓嬬殑鎸夐挳type涓�40锛屾寜閽笅鐨勬寜閽畉ype涓�60
- ParentID: config.uuid,
- MenuNo: config.MenuNo,
- Template: 'webPage',
- PageParam: '',
- LongParam: '',
- LText: []
- }
-
- btnParam.LText = this.getMenuMessage()
- btnParam.LText = btnParam.LText.join(' union all ')
-
- let btnIds = btnParam.LText // 鐢ㄤ簬澶嶅埗鎸夐挳鐨勮繃婊�
-
- btnParam.LText = Utils.formatOptions(btnParam.LText)
- btnParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- btnParam.secretkey = Utils.encrypt(btnParam.LText, btnParam.timestamp)
new Promise(resolve => {
let _config = fromJS(config).toJS()
@@ -913,6 +993,37 @@
return
}
+ let roles = {
+ type: 'navbar',
+ key: item.uuid,
+ title: item.name,
+ children: []
+ }
+
+ roles.children = item.menus.map(fst => {
+ if (fst.property === 'classify' && fst.sublist.length > 0) {
+ return {
+ key: fst.MenuID,
+ title: fst.name,
+ children: fst.sublist.map(scd => {
+ if (scd.property === 'classify' && scd.sublist.length > 0) {
+ return {
+ key: scd.MenuID,
+ title: scd.name,
+ children: scd.sublist.map(thd => {
+ return { key: thd.MenuID, title: thd.name }
+ })
+ }
+ } else {
+ return { key: scd.MenuID, title: scd.name }
+ }
+ })
+ }
+ } else {
+ return { key: fst.MenuID, title: fst.name }
+ }
+ })
+
let _param = {
func: 'sPC_TrdMenu_AddUpt',
FstID: parMenuId,
@@ -926,6 +1037,7 @@
Typename: 'pc',
MenuName: item.name || '',
PageParam: JSON.stringify({Template: item.type}),
+ menus_rolelist: window.btoa(window.encodeURIComponent(JSON.stringify(roles))),
open_edition: item.open_edition || '',
LText: '',
LTexttb: ''
@@ -935,95 +1047,27 @@
_param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
_param.secretkey = Utils.encrypt('', _param.timestamp)
- let appMenuParam = null
- if (item.type === 'navbar') {
- appMenuParam = {
- func: 's_appmenus_addupt',
- exec_type: 'y'
- }
-
- appMenuParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- appMenuParam.secretkey = Utils.encrypt('', _param.timestamp)
-
- let LText = []
- let app_param = []
- let kei_no = sessionStorage.getItem('kei_no')
- let userid = sessionStorage.getItem('CloudUserID') || ''
-
- item.menus.forEach((fst, findex) => {
- // LText.push(`select '${fst.MenuID}','${fst.name}','','0','${sessionStorage.getItem('appId')}','0','${(findex + 1) * 10}','10','','${userid}','${window.GLOB.appkey}','${fst.MenuNo || ''}','${kei_no}','pc'`)
- LText.push(`select '${fst.MenuID}','${fst.name}','','0','0','0','${(findex + 1) * 10}','10','','${userid}','${window.GLOB.appkey}','${fst.MenuNo || ''}','${kei_no}','pc'`)
- app_param.push(`select '${window.GLOB.appkey}','${fst.MenuID}','${userid}','${(findex + 1) * 10}','','${fst.name}','${fst.MenuNo || ''}','0','10','${kei_no}','pc'`)
- if (fst.property === 'classify' && fst.sublist.length > 0) {
- fst.sublist.forEach(scd => {
- LText.push(`select '${scd.MenuID}','${scd.name}','','0','${fst.MenuID}','0','${(findex + 1) * 10}','20','','${userid}','${window.GLOB.appkey}','${scd.MenuNo || ''}','${kei_no}','pc'`)
- app_param.push(`select '${window.GLOB.appkey}','${scd.MenuID}','${userid}','${(findex + 1) * 10}','','${scd.name}','${scd.MenuNo || ''}','${fst.MenuID}','20','${kei_no}','pc'`)
-
- if (scd.property === 'classify' && scd.sublist.length > 0) {
- scd.sublist.forEach(thd => {
- LText.push(`select '${thd.MenuID}','${thd.name}','','0','${scd.MenuID}','0','${(findex + 1) * 10}','20','','${userid}','${window.GLOB.appkey}','${thd.MenuNo || ''}','${kei_no}','pc'`)
- app_param.push(`select '${window.GLOB.appkey}','${thd.MenuID}','${userid}','${(findex + 1) * 10}','','${thd.name}','${thd.MenuNo || ''}','${scd.MenuID}','20','${kei_no}','pc'`)
- })
- }
- })
- }
- })
- appMenuParam.LText = Utils.formatOptions(LText.join(' union '))
- appMenuParam.LText1 = Utils.formatOptions(app_param.join(' union '))
- }
-
- if (appMenuParam) {
- Api.getSystemConfig(appMenuParam).then(_res => {
- if (!_res.status) {
- notification.warning({
- top: 92,
- message: _res.message,
- duration: 5
- })
- this.setState({ menuloading: false })
- return
- }
-
- Api.getSystemConfig(_param).then(res => {
- if (!res.status) {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
- })
- this.setState({ menuloading: false })
- return
- }
-
- new_open_edition[item.uuid] = res.open_edition || ''
-
- resolve()
+ Api.getSystemConfig(_param).then(res => {
+ if (!res.status) {
+ notification.warning({
+ top: 92,
+ message: res.message,
+ duration: 5
})
- })
- } else {
- Api.getSystemConfig(_param).then(res => {
- if (!res.status) {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
- })
- this.setState({ menuloading: false })
- return
- }
-
- new_open_edition[item.uuid] = res.open_edition || ''
- resolve()
- })
- }
+ this.setState({ menuloading: false })
+ return
+ }
+
+ new_open_edition[item.uuid] = res.open_edition || ''
+ resolve()
+ })
})
})
Promise.all(deffers).then(() => {
let appViewList = sessionStorage.getItem('appViewList')
appViewList = JSON.parse(appViewList)
- let _length = appViewList.length
+ let _appViewList = fromJS(appViewList).toJS()
let appIndeList = appViewList.map(item => item.keys_id).join(',')
-
config.components = config.components.map(item => {
if (item.type === 'navbar') {
@@ -1039,12 +1083,19 @@
keys_type: 'navbar',
remark: item.name
})
+ } else {
+ appViewList = appViewList.map(view => {
+ if (view.keys_id === item.uuid) {
+ view.remark = item.name
+ }
+ return view
+ })
}
}
return item
})
- if (appViewList.length > _length) {
+ if (!is(fromJS(appViewList), fromJS(_appViewList))) {
let kparam = {
func: 's_kei_link_keyids_addupt',
BID: sessionStorage.getItem('appId'),
@@ -1083,10 +1134,9 @@
if (delButtons.length === 0) {
return { status: true, nonexec: true }
} else {
- let appHomeId = sessionStorage.getItem('appHomeId')
let _param = {
func: 'sPC_MainMenu_Del',
- MenuID: delButtons.filter(id => id !== appHomeId).join(',')
+ MenuID: delButtons.join(',')
}
return Api.getSystemConfig(_param)
}
@@ -1103,13 +1153,12 @@
this.getAppMenus()
}
- let ids = thawButtons.filter(item => btnIds.indexOf(item) !== -1)
- if (ids.length === 0) {
+ if (thawButtons.length === 0) {
return { status: true }
} else {
return Api.getSystemConfig({
func: 'sPC_MainMenu_ReDel',
- MenuID: ids.join(',')
+ MenuID: thawButtons.join(',')
})
}
}).then(res => { // 椤甸潰淇濆瓨
@@ -1136,12 +1185,8 @@
oriConfig: fromJS(config).toJS(),
})
- if (btnParam.LText) {
- return Api.getSystemConfig(btnParam)
- } else {
- return {
- status: true
- }
+ return {
+ status: true
}
} else {
notification.warning({
@@ -1170,7 +1215,7 @@
return new Promise(resolve => {
let deffers = copyButtons.map(item => {
return new Promise(resolve => {
- if (btnIds.indexOf(item.uuid) === -1) { // 澶嶅埗鐨勬寜閽凡鍒犻櫎
+ if (delButtons.includes(item.uuid)) { // 澶嶅埗鐨勬寜閽凡鍒犻櫎
resolve({
status: true
})
@@ -1332,7 +1377,8 @@
return
}
if (['propcard', 'brafteditor', 'sandbox', 'stepform'].includes(item.subtype) && item.wrap.datatype === 'static') return
-
+ if (['balcony'].includes(item.type) && item.wrap.datatype === 'static') return
+
if (item.setting) {
if (item.setting.interType === 'system' && item.setting.execute !== 'false' && !item.setting.dataresource) {
error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆鏁版嵁婧愶紒`
@@ -1373,6 +1419,19 @@
updateConfig = (config) => {
this.setState({
config: config
+ })
+
+ window.GLOB.customMenu = config
+ }
+
+ resetConfig = (config) => {
+ this.setState({
+ config: config,
+ comloading: true
+ }, () => {
+ this.setState({
+ comloading: false
+ })
})
window.GLOB.customMenu = config
@@ -1458,7 +1517,6 @@
duration: 5
})
} else {
- sessionStorage.setItem('appHomeId', config.MenuID)
sessionStorage.setItem('appViewList', JSON.stringify(appViewList))
}
})
@@ -1468,13 +1526,13 @@
}
render () {
- const { localedict, loading, comloading, activeKey, settingshow, controlshow, dict, MenuId, config, menuloading, customComponents } = this.state
+ const { localedict, loading, visible, popBtn, comloading, activeKey, settingshow, controlshow, dict, MenuId, config, menuloading, customComponents } = this.state
return (
<ConfigProvider locale={localedict}>
<div className={'mk-pc-view '} id="mk-pc-design-view">
{loading ? <Spin className="view-spin" size="large" /> : null}
- <DndProvider backend={HTML5Backend}>
+ {!popBtn && !visible ? <DndProvider backend={HTML5Backend}>
<div className={'menu-setting ' + (!settingshow ? 'hidden' : '')}>
<div className="draw">
{settingshow ? <Icon onClick={() => {sessionStorage.setItem('settingshow', 'false'); this.setState({settingshow: false})}} type="double-left" /> : null}
@@ -1523,12 +1581,15 @@
<Quotecomponent config={config} updateConfig={this.updateConfig}/>
<Button className="mk-border-green" icon="home" onClick={this.setHomeView}>璁句负棣栭〉</Button>
<Button className="mk-border-danger" icon="redo" onClick={this.refreshView}>寮哄埗鍒锋柊</Button>
+ <ReplaceField type="custom" config={config} updateConfig={this.resetConfig}/>
+ <Transfer MenuID={MenuId} />
<Button type="default" onClick={this.closeView}>鍏抽棴</Button>
</div>
- <div className={'menu-body ' + (menuloading ? 'saving' : '')}>
+ <div className={'menu-body menu-view' + (menuloading ? 'saving' : '')}>
{config && !comloading ? <MenuShell menu={config} handleList={this.updateConfig} /> : null}
</div>
- </DndProvider>
+ </DndProvider> : null}
+ {/* {popBtn && visible ? <PopviewController btn={popBtn} handleBack={this.handleBack}/> : null} */}
<StyleController />
<StyleCombController />
<ModalController />
--
Gitblit v1.8.0