From f6626b05f1275cc2f8ca77f773d4f6a6af1b0a89 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 十一月 2022 16:11:55 +0800
Subject: [PATCH] 2022-11-21
---
src/views/pcdesign/index.jsx | 1054 ++++++++++++++++++++++++----------------------------------
1 files changed, 439 insertions(+), 615 deletions(-)
diff --git a/src/views/pcdesign/index.jsx b/src/views/pcdesign/index.jsx
index f3a98e3..fa764b8 100644
--- a/src/views/pcdesign/index.jsx
+++ b/src/views/pcdesign/index.jsx
@@ -10,7 +10,7 @@
import Api from '@/api'
import Utils, { setGLOBFuncs } from '@/utils/utils.js'
-// import antdEnUS from 'antd/es/locale/en_US'
+import { getTables } from '@/utils/utils-custom.js'
import antdZhCN from 'antd/es/locale/zh_CN'
import MKEmitter from '@/utils/events.js'
import MenuUtils from '@/utils/utils-custom.js'
@@ -24,6 +24,8 @@
const { Paragraph } = Typography
const MenuForm = asyncComponent(() => import('./menuform'))
+const Header = asyncComponent(() => import('@/menu/header'))
+const PopView = asyncComponent(() => import('@/views/menudesign/popview'))
const Transfer = asyncComponent(() => import('@/pc/transfer'))
const Versions = asyncComponent(() => import('@/menu/versions'))
const MenuShell = asyncComponent(() => import('@/pc/menushell'))
@@ -59,18 +61,17 @@
MenuId: '',
MenuName: '',
MenuNo: '',
- delButtons: [],
- copyButtons: [],
activeKey: 'basedata',
menuloading: false,
oriConfig: null,
config: null,
- customComponents: [],
settingshow: sessionStorage.getItem('settingshow') !== 'false',
controlshow: sessionStorage.getItem('controlshow') !== 'false',
comloading: false,
eyeopen: false,
- modalStatus: false // 寮圭獥鏄惁寮�鍚紝鍒ゆ柇ctrl+s鏄惁鍙敤
+ view: '',
+ popConfig: null,
+ needUpdate: false
}
UNSAFE_componentWillMount() {
@@ -78,7 +79,6 @@
sessionStorage.setItem('editMenuType', 'menu') // 缂栬緫鑿滃崟绫诲瀷
- window.GLOB.UserComponentMap = new Map() // 缂撳瓨鐢ㄦ埛鑷畾涔夌粍浠�
window.GLOB.TabsMap = new Map() // 缂撳瓨鐢ㄦ埛鎿嶄綔鐨勬爣绛鹃〉
window.GLOB.CacheIndependent = new Map()
window.GLOB.urlFields = [] // url鍙橀噺
@@ -126,22 +126,11 @@
document.getElementById('mk-pc-design-view').innerHTML = '<div style="text-align: center; font-size: 30px; margin-top: 40vh; height: 100vh; background: #fff;">鏈簲鐢ㄦ病鏈塒C绔〉闈㈢殑缂栬緫鏉冮檺锛岃鑱旂郴绠＄悊鍛橈紒</div>'
return
}
- MKEmitter.addListener('delButtons', this.delButtons)
- MKEmitter.addListener('modalStatus', this.modalStatus)
- MKEmitter.addListener('copyButtons', this.copyButtons)
MKEmitter.addListener('changePopview', this.initPopview)
MKEmitter.addListener('changeEditMenu', this.changeEditMenu)
MKEmitter.addListener('triggerMenuSave', this.triggerMenuSave)
- MKEmitter.addListener('updateCustomComponent', this.updateCustomComponent)
- setTimeout(() => {
- if (sessionStorage.getItem('app_custom_components')) {
- let list = sessionStorage.getItem('app_custom_components')
- list = JSON.parse(list)
- this.setCustomComponent(list)
- } else {
- this.updateCustomComponent()
- }
+ setTimeout(() => {
this.getAppPictures()
this.getSmStemp()
this.getRoleFields()
@@ -167,10 +156,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
@@ -199,20 +201,14 @@
this.setState = () => {
return
}
- MKEmitter.removeListener('delButtons', this.delButtons)
- MKEmitter.removeListener('modalStatus', this.modalStatus)
- MKEmitter.removeListener('copyButtons', this.copyButtons)
MKEmitter.removeListener('changePopview', this.initPopview)
MKEmitter.removeListener('changeEditMenu', this.changeEditMenu)
MKEmitter.removeListener('triggerMenuSave', this.triggerMenuSave)
- MKEmitter.removeListener('updateCustomComponent', this.updateCustomComponent)
- }
-
- modalStatus = (val) => {
- this.setState({modalStatus: val})
}
triggerMenuSave = () => {
+ if (this.state.view === 'popview') return
+
this.submitConfig()
}
@@ -396,135 +392,146 @@
}
getAppPictures = () => {
- if (sessionStorage.getItem('app_videos') || sessionStorage.getItem('app_pictures')) return
-
- Api.getSystemConfig({
+ if (sessionStorage.getItem('app_pictures')) return
+
+ let deffers = []
+ let param = {
func: 's_url_db_adduptdel',
PageIndex: 0, // 0 浠ｈ〃鍏ㄩ儴
PageSize: 0, // 0 浠ｈ〃鍏ㄩ儴
- typecharone: 'image',
type: 'search'
- }).then(res => {
- if (res.status) {
- sessionStorage.setItem('app_pictures', JSON.stringify(res.data || []))
- } else if (!res.status) {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
+ }
+ deffers = [new Promise(resolve => {
+ setTimeout(() => {
+ Api.getSystemConfig({...param, typecharone: 'image'}).then(res => {
+ resolve(res.data)
})
- }
-
- Api.getSystemConfig({
- func: 's_url_db_adduptdel',
- PageIndex: 0, // 0 浠ｈ〃鍏ㄩ儴
- PageSize: 0, // 0 浠ｈ〃鍏ㄩ儴
- typecharone: 'video',
- type: 'search'
- }).then(res => {
- if (res.status) {
- sessionStorage.setItem('app_videos', JSON.stringify(res.data || []))
- } else if (!res.status) {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
- })
- }
- })
- Api.getSystemConfig({
- func: 's_url_db_adduptdel',
- PageIndex: 0, // 0 浠ｈ〃鍏ㄩ儴
- PageSize: 0, // 0 浠ｈ〃鍏ㄩ儴
- typecharone: 'color',
- type: 'search'
- }).then(res => {
- if (res.status) {
- sessionStorage.setItem('app_colors', JSON.stringify(res.data || []))
- } else if (!res.status) {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
- })
- }
- })
- })
- }
-
- updateCustomComponent = () => {
- Api.getSystemConfig({
- func: 's_get_custom_components',
- typename: 'pc',
- typecharone: ''
- }).then(res => {
- if (!res.status) {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
+ }, 500)
+ }), new Promise(resolve => {
+ setTimeout(() => {
+ Api.getSystemConfig({...param, typecharone: 'video'}).then(res => {
+ resolve(res.data)
})
- } else if (res.cus_list) {
- sessionStorage.setItem('app_custom_components', JSON.stringify(res.cus_list))
- this.setCustomComponent(res.cus_list)
- }
+ }, 1000)
+ }), new Promise(resolve => {
+ setTimeout(() => {
+ Api.getSystemConfig({...param, typecharone: 'color'}).then(res => {
+ resolve(res.data)
+ })
+ }, 1500)
+ })]
+
+ Promise.all(deffers).then(response => {
+ sessionStorage.setItem('app_pictures', JSON.stringify(response[0] || []))
+ sessionStorage.setItem('app_videos', JSON.stringify(response[1] || []))
+ sessionStorage.setItem('app_colors', JSON.stringify(response[2] || []))
})
- }
-
- setCustomComponent = (cus_list) => {
- let coms = []
-
- cus_list.forEach(item => {
- let config = ''
-
- try {
- config = JSON.parse(window.decodeURIComponent(window.atob(item.long_param)))
- } catch (e) {
- console.warn('Parse Failure')
- config = ''
- }
-
- if (!config || !item.c_name) return
-
- window.GLOB.UserComponentMap.set(item.c_id, item.c_name)
- coms.push({
- uuid: item.c_id,
- type: 'menu',
- title: item.c_name,
- url: item.images,
- component: config.type,
- subtype: config.subtype,
- config
- })
- })
- this.setState({customComponents: coms})
- }
-
- delButtons = (items) => {
- this.setState({ delButtons: [...this.state.delButtons, ...items] })
- }
-
- copyButtons = (items) => {
- this.setState({copyButtons: [...this.state.copyButtons, ...items]})
}
initPopview = (card, btn) => {
- const { oriConfig, config } = this.state
+ const { config } = this.state
- if (!oriConfig || !is(fromJS(oriConfig), fromJS(config))) {
- notification.warning({
- top: 92,
- message: '閰嶇疆淇℃伅鏈繚瀛橈紒',
- duration: 5
- })
+ if (!this.checkBase()) {
return
}
let _btn = fromJS(btn).toJS()
- _btn.MenuName = config.MenuName + '-' + card.name + '-' + btn.label
- _btn.ParentMenuID = config.uuid
- this.props.history.push('/popdesign/' + window.btoa(window.encodeURIComponent((JSON.stringify(_btn)))))
+ if (_btn.config) {
+ _btn.config.uuid = _btn.uuid
+ _btn.config.MenuID = _btn.uuid
+ _btn.config.ParentId = card.uuid
+ _btn.config.MenuName = _btn.label
+ } else {
+ _btn.config = {
+ uuid: _btn.uuid,
+ MenuID: _btn.uuid,
+ ParentId: card.uuid,
+ enabled: false,
+ MenuName: _btn.label,
+ tables: config.tables || [],
+ Template: 'CustomPage',
+ components: [],
+ viewType: 'popview',
+ style: { backgroundColor: '#ffffff', backgroundImage: '', paddingTop: '16px', paddingBottom: '40px', paddingLeft: '16px', paddingRight: '16px' }
+ }
+ }
+
+ this.setState({view: 'popview', popConfig: _btn})
+ }
+
+ submitPopConfig = (btnconfig) => {
+ let parents = {[btnconfig.ParentId]: true}
+ let popbtns = {[btnconfig.uuid]: fromJS(btnconfig).toJS()}
+ let config = fromJS(this.state.config).toJS()
+
+ config.components = this.setPopView(config.components, parents, popbtns)
+
+ this.setState({ config }, () => {
+ this.submitConfig()
+ })
+ }
+
+ setPopView = (components, parents, popbtns) => {
+ return components.map(item => {
+ if (item.type === 'tabs') {
+ item.subtabs.forEach(tab => {
+ tab.components = this.setPopView(tab.components, parents, popbtns)
+ })
+ } else if (item.type === 'group') {
+ item.components = this.setPopView(item.components, parents, popbtns)
+ } else if (parents[item.uuid]) {
+ this.setpopConfig(item, popbtns)
+ }
+ return item
+ })
+ }
+
+ setpopConfig = (config, popbtns) => {
+ config.subcards && config.subcards.forEach(item => {
+ item.elements.forEach(cell => {
+ if (cell.eleType !== 'button') return
+ if (cell.OpenType === 'popview' && popbtns[cell.uuid]) {
+ cell.config = popbtns[cell.uuid]
+ }
+ })
+ })
+
+ config.cols && config.cols.forEach(col => {
+ if (col.type === 'action') {
+ col.elements.forEach(cell => {
+ if (cell.OpenType === 'popview' && popbtns[cell.uuid]) {
+ cell.config = popbtns[cell.uuid]
+ }
+ })
+ }
+ })
+
+ config.elements && config.elements.forEach(cell => {
+ if (cell.eleType !== 'button') return
+ if (cell.OpenType === 'popview' && popbtns[cell.uuid]) {
+ cell.config = popbtns[cell.uuid]
+ }
+ })
+
+ config.action && config.action.forEach(cell => {
+ if (cell.OpenType === 'popview' && popbtns[cell.uuid]) {
+ cell.config = popbtns[cell.uuid]
+ }
+ })
+
+ config.$tables = getTables(config)
+ }
+
+ closePop = () => {
+ const {config} = this.state
+
+ sessionStorage.setItem('editMenuType', 'menu')
+
+ window.GLOB.urlFields = config.urlFields || []
+ window.GLOB.customMenu = config
+
+ this.setState({view: '', popConfig: null})
}
closeView = () => {
@@ -588,7 +595,6 @@
this.getCopyParam(urlParam)
} else {
let config = null
- let isCreate = false
try {
config = result.LongParam ? JSON.parse(window.decodeURIComponent(window.atob(result.LongParam))) : null
@@ -598,9 +604,8 @@
}
if (!config) {
- isCreate = true
config = {
- version: 1.0,
+ version: 2.0,
uuid: MenuId,
MenuID: MenuId,
Template: 'webPage',
@@ -621,27 +626,66 @@
config.open_edition = result.open_edition || ''
window.GLOB.urlFields = config.urlFields || []
- let indeComs = []
+ if (config.version !== 2.0) {
+ config.components = this.collectTB(config.components)
+ config.version = 2.0
+
+ this.setState({
+ needUpdate: true
+ })
+ }
+
+ let navItem = null
config.components.forEach(item => {
if (item.type === 'navbar') {
- indeComs.push(fromJS(item).toJS())
+ navItem = fromJS(item).toJS()
}
})
- if (indeComs.length === 0) {
+ if (!navItem) {
this.setState({
- oriConfig: isCreate ? null : config,
- config: fromJS(config).toJS(),
+ oriConfig: fromJS(config).toJS(),
+ config: config,
loading: false
})
window.GLOB.customMenu = config
} else {
- this.jointComponents(config, indeComs, isCreate)
+ this.jointComponents(config, navItem)
}
}
})
this.getAppMenus()
+ }
+
+ collectTB = (components) => {
+ return components.map(item => {
+ if (item.type === 'tabs') {
+ item.subtabs.forEach(tab => {
+ delete tab.floor
+ delete tab.hasSearch
+ delete tab.parentId
+
+ tab.components = this.collectTB(tab.components)
+ })
+ } else if (item.type === 'group') {
+ item.components = this.collectTB(item.components)
+ } else if (!['search', 'navbar', 'login', 'topbar', 'officialAccount'].includes(item.type)) {
+ item.$tables = getTables(item)
+ }
+
+ if (item.subtype === 'tablecard') { // 鍏煎
+ item.type = 'card'
+ }
+
+ delete item.tabId
+ delete item.parentId
+ delete item.btnlog
+ delete item.floor
+ delete item.dataName
+
+ return item
+ })
}
getAppMenus = () => {
@@ -699,12 +743,6 @@
})
this.setState({loading: false})
return
- } else if (!result.LongParam) {
- notification.warning({
- top: 92,
- message: '鏈煡璇㈠埌澶嶅埗鑿滃崟閰嶇疆淇℃伅锛�',
- duration: 5
- })
}
let config = null
@@ -715,11 +753,10 @@
console.warn('Parse Failure')
config = null
}
-
if (!config) {
config = {
- version: 1.0,
+ version: 2.0,
uuid: MenuId,
MenuID: MenuId,
Template: 'webPage',
@@ -743,6 +780,16 @@
})
}
config.components = MenuUtils.resetConfig(config.components, uuids, urlParam.clearMenu)
+
+ if (config.version !== 2.0) {
+ config.components = this.collectTB(config.components)
+ config.version = 2.0
+
+ this.setState({
+ needUpdate: true
+ })
+ }
+
config.enabled = false
message.success('澶嶅埗鎴愬姛锛屼繚瀛樺悗鐢熸晥銆�')
}
@@ -753,52 +800,42 @@
config.MenuName = urlParam.MenuName || ''
config.MenuNo = ''
- let indeComs = []
+ let navItem = null
config.components.forEach(item => {
if (item.type === 'navbar') {
- indeComs.push(fromJS(item).toJS())
+ navItem = fromJS(item).toJS()
}
})
- if (indeComs.length === 0) {
+ if (!navItem) {
this.setState({
- oriConfig: null,
- config: fromJS(config).toJS(),
+ oriConfig: fromJS(config).toJS(),
+ config: config,
loading: false
})
window.GLOB.customMenu = config
} else {
- this.jointComponents(config, indeComs, true)
+ this.jointComponents(config, navItem)
}
})
}
- jointComponents = (config, indeComs, isCreate) => {
- let deffers = indeComs.map(item => {
- return new Promise(resolve => {
- Api.getSystemConfig({
- func: 'sPC_Get_LongParam',
- TypeCharOne: sessionStorage.getItem('kei_no'),
- typename: 'pc',
- MenuID: item.uuid
- }).then(res => {
- res.uuid = item.uuid
-
- if (!res.status) {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
- })
- }
-
- resolve(res)
+ jointComponents = (config, navItem) => {
+ Api.getSystemConfig({
+ func: 'sPC_Get_LongParam',
+ TypeCharOne: sessionStorage.getItem('kei_no'),
+ typename: 'pc',
+ MenuID: navItem.uuid
+ }).then(res => {
+ if (!res.status) {
+ notification.warning({
+ top: 92,
+ message: res.message,
+ duration: 5
})
- })
- })
- Promise.all(deffers).then(result => {
- let _conf = {}
- result.forEach(res => {
+
+ config.components = config.components.filter(item => item.type !== 'navbar')
+ } else {
let _config = null
try {
_config = res.LongParam ? JSON.parse(window.decodeURIComponent(window.atob(res.LongParam))) : null
@@ -809,35 +846,21 @@
if (_config) {
_config.open_edition = res.open_edition || ''
- _conf[res.uuid] = _config
- window.GLOB.CacheIndependent.set(res.uuid, fromJS(_config).toJS())
+ config.components = config.components.map(item => {
+ if (item.type === 'navbar') {
+ return _config
+ }
+ return item
+ })
+
+ window.GLOB.CacheIndependent.set(navItem.uuid, fromJS(_config).toJS())
+ } else {
+ config.components = config.components.filter(item => item.type !== 'navbar')
}
- })
-
- let _length = config.components.length
- config.components = config.components.map(item => {
- if (item.type === 'navbar') {
- if (_conf[item.uuid]) {
- item = _conf[item.uuid]
- } else {
- item = null
- }
- }
- return item
- })
-
- config.components = config.components.filter(Boolean)
-
- if (_length > config.components.length) {
- notification.warning({
- top: 92,
- message: '閮ㄥ垎缁勪欢宸插垹闄わ紒',
- duration: 5
- })
}
this.setState({
- oriConfig: isCreate ? null : fromJS(config).toJS(),
+ oriConfig: fromJS(config).toJS(),
config: config,
loading: false
})
@@ -849,7 +872,6 @@
getMenuMessage = (tbs) => {
const { config } = this.state
let nodes = {type: 'view', version: '1.0', key: config.uuid, title: config.MenuName, children: []}
- let popviews = []
let traversal = (components) => {
let list = []
@@ -858,14 +880,21 @@
tbs.push(...item.$tables)
}
+ if (item.plot && item.plot.permission !== 'true') {
+ return
+ } else if (item.type === 'login' || item.type === 'navbar') {
+ return
+ } else if (!['tabs', 'group'].includes(item.type) && item.wrap && item.wrap.permission !== 'true') {
+ return
+ }
+
let m = {
key: item.uuid,
title: item.name,
children: []
}
- if (item.type === 'login' || item.type === 'navbar') {
- return null
- } else if (item.type === 'tabs') {
+
+ if (item.type === 'tabs') {
let tabs = []
let mm = []
item.subtabs.forEach(tab => {
@@ -892,7 +921,7 @@
list.push(...mm)
}
- return null
+ return
} else if (item.type === 'group') {
m.children = traversal(item.components)
@@ -902,12 +931,8 @@
list.push(...m.children)
}
- return null
- } if (item.plot && item.plot.permission !== 'true') {
- return null
- } if (item.wrap && item.wrap.permission !== 'true') {
- return null
- } else if (item.type === 'card' || (item.type === 'table' && item.subtype === 'tablecard')) {
+ return
+ } else if (item.type === 'card' || item.type === 'carousel' || item.type === 'timeline') {
item.action && item.action.forEach(btn => {
if (btn.hidden === 'true') return
@@ -915,74 +940,34 @@
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
- if (cell.hidden === 'true') return
+ if (cell.eleType !== 'button' || cell.hidden === 'true') return
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
- if (cell.hidden === 'true') return
+ if (cell.eleType !== 'button' || cell.hidden === 'true') return
m.children.push({
key: cell.uuid,
title: cell.label,
})
- if (cell.OpenType === 'popview') {
- popviews.push(cell.uuid)
- }
- })
- })
- } else if (item.type === 'carousel' || item.type === 'timeline') {
- item.subcards.forEach(card => {
- card.elements && card.elements.forEach(cell => {
- if (cell.eleType !== 'button') return
- if (cell.hidden === 'true') return
-
- 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
- if (cell.hidden === 'true') return
+ if (cell.eleType !== 'button' || cell.hidden === 'true') return
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 === 'form') {
if (item.subtype !== 'simpleform') {
@@ -993,19 +978,16 @@
}
})
}
- } else if (item.type === 'table' && (item.subtype === 'normaltable' || item.subtype === 'editable')) {
- item.action && item.action.forEach(btn => {
+ } else if (item.type === 'table') {
+ item.action.forEach(btn => {
if (btn.hidden === 'true') return
m.children.push({
key: btn.uuid,
title: btn.label,
})
- if (btn.OpenType === 'popview') {
- popviews.push(btn.uuid)
- }
})
- item.cols && item.cols.forEach(col => {
+ item.cols.forEach(col => {
if (col.type !== 'action') return
col.elements.forEach(btn => {
if (btn.hidden === 'true') return
@@ -1014,9 +996,6 @@
key: btn.uuid,
title: btn.label,
})
- if (btn.OpenType === 'popview') {
- popviews.push(btn.uuid)
- }
})
})
}
@@ -1030,7 +1009,6 @@
let trees = traversal(config.components)
nodes.children = trees
- nodes.popviews = popviews
if (config.components.findIndex(item => item.type === 'login') > -1) {
nodes.login = true
@@ -1038,6 +1016,14 @@
}
if (nodes.children.length === 0) {
nodes.pass = true
+ }
+
+ if (config.interfaces) {
+ config.interfaces.forEach(item => {
+ if (item.$tables) {
+ tbs.push(...item.$tables)
+ }
+ })
}
return nodes
@@ -1065,7 +1051,7 @@
})
} else if (item.type === 'group') {
traversal(item.components)
- } else if (item.type === 'card' || (item.type === 'table' && item.subtype === 'tablecard')) {
+ } else if (item.type === 'card' || item.type === 'carousel' || item.type === 'timeline') {
item.action && item.action.forEach(btn => {
if (btn.linkmenu && menuObj[btn.linkmenu]) {
menus.push(menuObj[btn.linkmenu])
@@ -1093,21 +1079,6 @@
}
})
})
- } else if (item.type === 'carousel' || item.type === 'timeline') {
- item.subcards.forEach(card => {
- if (card.setting.click === 'menu' && menuObj[card.setting.menu]) {
- menus.push(menuObj[card.setting.menu])
- }
- card.elements && card.elements.forEach(cell => {
- if (cell.eleType !== 'button') return
-
- if (cell.linkmenu && menuObj[cell.linkmenu]) {
- menus.push(menuObj[cell.linkmenu])
- } else if (cell.openmenu && menuObj[cell.openmenu]) {
- menus.push(menuObj[cell.openmenu])
- }
- })
- })
} else if (item.type === 'balcony') {
item.elements && item.elements.forEach(cell => {
if (cell.eleType !== 'button') return
@@ -1124,7 +1095,7 @@
menus.push(menuObj[m.subButton.linkmenu])
}
})
- } else if (item.type === 'table' && item.subtype === 'normaltable') {
+ } else if (item.type === 'table') {
item.action && item.action.forEach(btn => {
if (btn.linkmenu && menuObj[btn.linkmenu]) {
menus.push(menuObj[btn.linkmenu])
@@ -1158,9 +1129,8 @@
return menus
}
- submitConfig = () => {
- const { delButtons, copyButtons } = this.state
- let config = fromJS(this.state.config).toJS()
+ checkBase = () => {
+ const { config } = this.state
if (!config.MenuName || !config.MenuNo || (config.cacheUseful === 'true' && !config.cacheTime)) {
notification.warning({
@@ -1173,6 +1143,15 @@
settingshow: true,
activeKey: 'basedata'
})
+ return false
+ }
+ return true
+ }
+
+ submitConfig = () => {
+ let config = fromJS(this.state.config).toJS()
+
+ if (!this.checkBase()) {
return
}
@@ -1256,201 +1235,159 @@
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
- new Promise(resolve => {
- let _config = fromJS(config).toJS()
- let indeComs = []
- _config.components = _config.components.map(item => {
- if (item.type === 'navbar') {
- indeComs.push(item)
- return {
- type: 'navbar',
- uuid: item.uuid
- }
+ let _config = fromJS(config).toJS()
+ let NavBar = null
+ _config.components = _config.components.map(item => {
+ if (item.type === 'navbar') {
+ NavBar = fromJS(item).toJS()
+ return {
+ type: 'navbar',
+ uuid: item.uuid
}
- return item
- })
+ }
+ return item
+ })
- param.LongParam = window.btoa(window.encodeURIComponent(JSON.stringify(_config)))
+ param.LongParam = window.btoa(window.encodeURIComponent(JSON.stringify(_config)))
- if (indeComs.length === 0) {
- resolve(true)
+ new Promise(resolve => {
+ if (!NavBar) {
+ resolve({status: true})
} else {
- let new_open_edition = {}
- let deffers = indeComs.map(item => {
- return new Promise(resolve => {
- let _item = window.GLOB.CacheIndependent.get(item.uuid)
- if (_item && is(fromJS(_item), fromJS(item))) {
- new_open_edition[item.uuid] = item.open_edition || ''
- resolve()
- return
- }
+ let _item = window.GLOB.CacheIndependent.get(NavBar.uuid) || {}
+ NavBar.open_edition = _item.open_edition || ''
+ if (is(fromJS(_item), fromJS(NavBar))) {
+ resolve({status: true})
+ } else {
+ let roles = {
+ type: 'navbar',
+ version: '1.0',
+ key: NavBar.uuid,
+ title: NavBar.name,
+ children: []
+ }
- let roles = {
- type: 'navbar',
- version: '1.0',
- key: item.uuid,
- title: item.name,
- children: []
- }
-
- if (item.wrap.permission === 'true') {
- 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 }
+ if (NavBar.wrap.permission === 'true') {
+ roles.children = NavBar.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: fst.MenuID, title: fst.name }
+ } else {
+ return { key: scd.MenuID, title: scd.name }
+ }
+ })
}
- })
- } else {
- roles.pass = true
- }
-
- let _param = {
- func: 'sPC_TrdMenu_AddUpt',
- FstID: 'mk_app',
- SndID: 'mk_app',
- ParentID: 'mk_app',
- MenuID: item.uuid,
- MenuNo: item.wrap.MenuNo || Utils.getuuid(),
- EasyCode: '',
- Template: item.type,
- TypeCharOne: sessionStorage.getItem('kei_no'),
- 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: ''
- }
-
- _param.LongParam = window.btoa(window.encodeURIComponent(JSON.stringify(item)))
- _param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- _param.secretkey = Utils.encrypt('', _param.timestamp)
-
- 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()
- })
- })
- })
- Promise.all(deffers).then(() => {
- let appViewList = sessionStorage.getItem('appViewList')
- appViewList = JSON.parse(appViewList)
- let _appViewList = fromJS(appViewList).toJS()
- let appIndeList = appViewList.map(item => item.keys_id).join(',')
-
- config.components = config.components.map(item => {
- if (item.type === 'navbar') {
- item.open_edition = new_open_edition[item.uuid] || ''
- window.GLOB.CacheIndependent.set(item.uuid, fromJS(item).toJS())
-
- if (appIndeList.indexOf(item.uuid) === -1) {
- appViewList.unshift({
- appkey: window.GLOB.appkey || '',
- bid: sessionStorage.getItem('appId') || '',
- kei_no: sessionStorage.getItem('kei_no') || '',
- keys_id: item.uuid,
- 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 (!is(fromJS(appViewList), fromJS(_appViewList))) {
- let kparam = {
- func: 's_kei_link_keyids_addupt',
- BID: sessionStorage.getItem('appId'),
- exec_type: 'y',
- 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.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- kparam.secretkey = Utils.encrypt('', kparam.timestamp)
-
- Api.getSystemConfig(kparam).then(result => {
- if (!result.status) {
- notification.warning({
- top: 92,
- message: result.message,
- duration: 5
- })
- this.setState({ menuloading: false })
- } else {
- sessionStorage.setItem('appViewList', JSON.stringify(appViewList))
- resolve(true)
+ return { key: fst.MenuID, title: fst.name }
}
})
} else {
- resolve(true)
+ roles.pass = true
}
- })
- }
- }).then(res => { // 鎸夐挳鎴栬彍鍗曞垹闄�
- if (!res) return
- if (delButtons.length === 0) {
- return { status: true, nonexec: true }
- } else {
- let _param = {
- func: 'sPC_MainMenu_Del',
- MenuID: delButtons.join(',')
+ let _param = {
+ func: 'sPC_TrdMenu_AddUpt',
+ FstID: 'mk_app',
+ SndID: 'mk_app',
+ ParentID: 'mk_app',
+ MenuID: NavBar.uuid,
+ MenuNo: NavBar.wrap.MenuNo || Utils.getuuid(),
+ EasyCode: '',
+ Template: NavBar.type,
+ TypeCharOne: sessionStorage.getItem('kei_no'),
+ Typename: 'pc',
+ MenuName: NavBar.name || '',
+ PageParam: JSON.stringify({Template: NavBar.type}),
+ menus_rolelist: window.btoa(window.encodeURIComponent(JSON.stringify(roles))),
+ open_edition: NavBar.open_edition,
+ LText: '',
+ LTexttb: ''
+ }
+
+ _param.LongParam = window.btoa(window.encodeURIComponent(JSON.stringify(NavBar)))
+ _param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ _param.secretkey = Utils.encrypt('', _param.timestamp)
+
+ Api.getSystemConfig(_param).then(res => {
+ if (res.status) {
+ NavBar.open_edition = res.open_edition || ''
+ window.GLOB.CacheIndependent.set(NavBar.uuid, fromJS(NavBar).toJS())
+
+ let appViewList = sessionStorage.getItem('appViewList')
+ let _appViewList = JSON.parse(appViewList)
+
+ let index = _appViewList.findIndex(item => item.keys_id === NavBar.uuid)
+
+ if (index === -1) {
+ _appViewList.unshift({
+ appkey: window.GLOB.appkey || '',
+ bid: sessionStorage.getItem('appId') || '',
+ kei_no: sessionStorage.getItem('kei_no') || '',
+ keys_id: NavBar.uuid,
+ keys_type: 'navbar',
+ remark: NavBar.name
+ })
+ } else {
+ _appViewList = _appViewList.map(item => {
+ if (item.keys_id === NavBar.uuid && item.remark !== NavBar.name) {
+ item.remark = NavBar.name
+ }
+ return item
+ })
+ }
+
+ let viewList = JSON.stringify(_appViewList)
+
+ if (appViewList !== viewList) {
+ let kparam = {
+ func: 's_kei_link_keyids_addupt',
+ BID: sessionStorage.getItem('appId'),
+ exec_type: 'y',
+ 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.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ kparam.secretkey = Utils.encrypt('', kparam.timestamp)
+
+ Api.getSystemConfig(kparam).then(result => {
+ if (result.status) {
+ sessionStorage.setItem('appViewList', viewList)
+ }
+
+ resolve(result)
+ })
+ } else {
+ resolve(res)
+ }
+ } else {
+ resolve(res)
+ }
+ })
}
- return Api.getSystemConfig(_param)
}
}).then(res => { // 椤甸潰淇濆瓨
- if (!res) return
+ if (!res || !res.status) return res
- if (res.status) {
- return Api.getSystemConfig(param)
- } else {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
- })
- return false
- }
- }).then(res => { // 椤甸潰鎸夐挳鍏崇郴淇濆瓨
+ return Api.getSystemConfig(param)
+ }).then(res => {
+ this.setState({
+ menuloading: false
+ })
+
if (!res) return
if (res.status) {
@@ -1459,135 +1396,24 @@
this.setState({
config,
oriConfig: fromJS(config).toJS(),
+ needUpdate: false
})
- return {
- status: true
- }
- } else {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
- })
- return false
- }
- }).then(res => { // 鎸夐挳澶嶅埗
- if (!res) return
- if (!res.status) {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
- })
- return false
- }
+ localStorage.setItem('pcUpdate', new Date().getTime() + ',' + config.uuid)
- if (copyButtons.length === 0) {
- return {
- status: true
- }
- } else {
- return new Promise(resolve => {
- let deffers = copyButtons.map(item => {
- return new Promise(resolve => {
- if (delButtons.includes(item.uuid)) { // 澶嶅埗鐨勬寜閽凡鍒犻櫎
- resolve({
- status: true
- })
- return
- }
-
- Api.getSystemConfig({
- func: 'sPC_Get_LongParam',
- MenuID: item.$originUuid,
- TypeCharOne: sessionStorage.getItem('kei_no'),
- typename: 'pc',
- }).then(result => {
- if (result.status) {
- let _conf = ''
-
- try {
- _conf = result.LongParam ? JSON.parse(window.decodeURIComponent(window.atob(result.LongParam))) : ''
- } catch (e) {
- console.warn('Parse Failure')
- _conf = ''
- }
-
- if (_conf) {
- _conf.components = MenuUtils.resetConfig(_conf.components)
- _conf.uuid = item.uuid
- _conf.MenuID = item.uuid
- _conf.Template = 'webPage'
- _conf.enabled = false
- } else {
- resolve({
- status: true
- })
- return
- }
-
- let _param = {
- func: 'sPC_ButtonParam_AddUpt',
- ParentID: config.uuid,
- MenuID: item.uuid,
- MenuNo: '',
- Template: 'webPage',
- MenuName: item.label,
- PageParam: JSON.stringify({Template: 'webPage'}),
- LongParam: window.btoa(window.encodeURIComponent(JSON.stringify(_conf))),
- TypeCharOne: sessionStorage.getItem('kei_no'),
- Typename: 'pc',
- }
-
- Api.getSystemConfig(_param).then(response => {
- resolve(response)
- })
- }
- })
- })
- })
- Promise.all(deffers).then(result => {
- let error = null
- result.forEach(response => {
- if (!response.status) {
- error = response
- }
- })
-
- if (error) {
- notification.warning({
- top: 92,
- message: error.message,
- duration: 5
- })
- resolve(false)
- } else {
- resolve({
- status: true
- })
- }
- })
- })
- }
- }).then(res => {
- if (res && res.status) {
- this.setState({
- delButtons: [],
- copyButtons: [],
- menuloading: false
- })
notification.success({
top: 92,
message: '淇濆瓨鎴愬姛',
duration: 2
})
+ MKEmitter.emit('completeSave')
} else {
- this.setState({
- menuloading: false
+ notification.warning({
+ top: 92,
+ message: res.message,
+ duration: 5
})
}
- MKEmitter.emit('completeSave')
})
}, 300 + (+sessionStorage.getItem('mkDelay')))
}
@@ -1713,9 +1539,7 @@
}
refreshView = () => {
- const { oriConfig, config } = this.state
-
- if (!oriConfig || !is(fromJS(oriConfig), fromJS(config))) {
+ if (!is(fromJS(this.state.oriConfig || {}), fromJS(this.state.config || {}))) {
notification.warning({
top: 92,
message: '閰嶇疆淇℃伅鏈繚瀛橈紒',
@@ -1733,9 +1557,9 @@
}
setHomeView = () => {
- const { oriConfig, config } = this.state
+ const { config } = this.state
- if (!oriConfig || !is(fromJS(oriConfig), fromJS(config))) {
+ if (!is(fromJS(this.state.oriConfig || {}), fromJS(config || {}))) {
notification.warning({
top: 92,
message: '閰嶇疆淇℃伅鏈繚瀛橈紒',
@@ -1792,9 +1616,9 @@
}
setLoginView = () => {
- const { oriConfig, config } = this.state
+ const { config } = this.state
- if (!oriConfig || !is(fromJS(oriConfig), fromJS(config))) {
+ if (!is(fromJS(this.state.oriConfig || {}), fromJS(config || {}))) {
notification.warning({
top: 92,
message: '閰嶇疆淇℃伅鏈繚瀛橈紒',
@@ -1853,13 +1677,13 @@
}
render () {
- const { loading, comloading, activeKey, settingshow, controlshow, MenuId, config, menuloading, customComponents, eyeopen } = this.state
+ const { view, loading, comloading, activeKey, settingshow, controlshow, MenuId, config, menuloading, eyeopen, needUpdate } = this.state
return (
<ConfigProvider locale={antdZhCN}>
- <div className={'mk-pc-view '} id="mk-pc-design-view">
- {loading ? <Spin className="view-spin" size="large" /> : null}
- <DndProvider backend={HTML5Backend}>
+ <DndProvider backend={HTML5Backend}>
+ {view !== 'popview' ?<div className={'mk-pc-view '} id="mk-pc-design-view">
+ {loading ? <Spin className="view-spin" size="large" /> : null}
<div className={'menu-setting ' + (!settingshow ? 'hidden' : '')}>
<div className="draw">
{settingshow ? <DoubleLeftOutlined onClick={() => {sessionStorage.setItem('settingshow', 'false'); this.setState({settingshow: false})}}/> : null}
@@ -1887,9 +1711,6 @@
<Panel header="鍏冪礌" key="element">
<Modulecell />
</Panel>
- {customComponents && customComponents.length ? <Panel header="鑷畾涔夌粍浠�" key="cuscomponent">
- <SourceWrap components={customComponents} />
- </Panel> : null}
<Panel header={'椤甸潰鏍峰紡'} key="background">
{config ? <BgController config={config} updateConfig={this.updateConfig} /> : null}
</Panel>
@@ -1902,7 +1723,7 @@
{!controlshow ? <DoubleLeftOutlined onClick={() => {sessionStorage.setItem('controlshow', 'true'); this.setState({controlshow: true})}}/> : null}
</div>
<div className="wrap">
- <Button type="primary" id="save-config" onClick={this.submitConfig} loading={menuloading}>淇濆瓨</Button>
+ <Button type="primary" className={needUpdate ? 'update-tip' : ''} id="save-config" onClick={this.submitConfig} loading={menuloading}>淇濆瓨</Button>
<Switch className="big" checkedChildren="鍚�" unCheckedChildren="鍋�" checked={config && config.enabled} onChange={this.onEnabledChange} />
<ArrowLeftOutlined title="鍚庨��" className="back-view" onClick={this.backView}/>
<Button className="mk-border-purple" onClick={() => this.setState({eyeopen: !eyeopen})}>{!eyeopen ? <EyeOutlined /> : <EyeInvisibleOutlined />} 缁勪欢鍚�</Button>
@@ -1926,11 +1747,14 @@
<div className={'menu-body menu-view' + (menuloading ? ' saving' : '') + (eyeopen ? ' eye-open' : '')}>
{config && !comloading ? <MenuShell menu={config} handleList={this.updateConfig} /> : null}
</div>
- </DndProvider>
- <StyleController />
- <StyleCombController />
- <ModalController />
- </div>
+ </div> : <>
+ <Header/>
+ <PopView btn={this.state.popConfig} save={this.submitPopConfig} cancel={this.closePop}/>
+ </>}
+ </DndProvider>
+ <StyleController />
+ <StyleCombController />
+ <ModalController />
</ConfigProvider>
)
}
--
Gitblit v1.8.0