From bd1dfc9e6c9b9f8076ca2783ce598e0936b4c664 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 22 十二月 2021 14:36:03 +0800
Subject: [PATCH] 2021-12-22
---
src/views/pcdesign/index.jsx | 629 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 395 insertions(+), 234 deletions(-)
diff --git a/src/views/pcdesign/index.jsx b/src/views/pcdesign/index.jsx
index 183c884..6f9c9a3 100644
--- a/src/views/pcdesign/index.jsx
+++ b/src/views/pcdesign/index.jsx
@@ -5,10 +5,11 @@
import { is, fromJS } from 'immutable'
import moment from 'moment'
import HTML5Backend from 'react-dnd-html5-backend'
-import { ConfigProvider, notification, Modal, Collapse, Switch, Button, Icon, message, Spin } from 'antd'
+import { ConfigProvider, notification, Modal, Collapse, Switch, Button, message, Spin, Typography } from 'antd'
+import { DoubleLeftOutlined, DoubleRightOutlined } from '@ant-design/icons'
import Api from '@/api'
-import Utils from '@/utils/utils.js'
+import Utils, { setGLOBFuncs } from '@/utils/utils.js'
import zhCN from '@/locales/zh-CN/mob.js'
import enUS from '@/locales/en-US/mob.js'
import antdEnUS from 'antd/es/locale/en_US'
@@ -21,14 +22,20 @@
const { Panel } = Collapse
const { confirm } = Modal
+const { Paragraph } = Typography
const MenuForm = asyncComponent(() => import('./menuform'))
+const Transfer = asyncComponent(() => import('@/pc/transfer'))
+const PopviewController = asyncComponent(() => import('@/menu/popview'))
+const Versions = asyncComponent(() => import('@/menu/versions'))
const MenuShell = asyncComponent(() => import('@/pc/menushell'))
const SourceWrap = asyncComponent(() => import('@/pc/modulesource'))
+const CreateView = asyncComponent(() => import('@/pc/createview'))
const BgController = asyncComponent(() => import('@/pc/bgcontroller'))
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'))
@@ -40,8 +47,10 @@
sessionStorage.setItem('isEditState', 'true')
sessionStorage.setItem('editMenuType', 'menu') // 缂栬緫鑿滃崟绫诲瀷
sessionStorage.setItem('appType', 'pc') // 搴旂敤绫诲瀷
+sessionStorage.setItem('typename', 'pc')
document.body.className = ''
window.GLOB.UserComponentMap = new Map() // 缂撳瓨鐢ㄦ埛鑷畾涔夌粍浠�
+window.GLOB.TabsMap = new Map() // 缂撳瓨鐢ㄦ埛鎿嶄綔鐨勬爣绛鹃〉
window.GLOB.CacheIndependent = new Map()
window.GLOB.urlFields = [] // url鍙橀噺
window.GLOB.customMenu = null // 淇濆瓨鑿滃崟淇℃伅
@@ -66,6 +75,7 @@
customComponents: [],
settingshow: sessionStorage.getItem('settingshow') !== 'false',
controlshow: sessionStorage.getItem('controlshow') !== 'false',
+ comloading: false
}
UNSAFE_componentWillMount() {
@@ -77,15 +87,15 @@
sessionStorage.setItem('appId', param.ID || '')
sessionStorage.setItem('lang', param.lang || 'zh-CN')
sessionStorage.setItem('kei_no', param.kei_no || '')
- sessionStorage.setItem('link_type', param.link_type || 'true')
sessionStorage.setItem('role_type', param.role_type || 'true')
- sessionStorage.setItem('login_types', param.login_types || 'true')
+ sessionStorage.setItem('login_types', param.login_types || 'false')
+ sessionStorage.setItem('sysBgColor', param.sysBgColor || '#ffffff')
this.setState({
localedict: sessionStorage.getItem('lang') !== 'en-US' ? antdZhCN : antdEnUS,
dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS
})
- this.getAppMessage()
+ this.getAppMessage(param.MenuID)
} else if (param.type === 'view') {
this.setState({
MenuId: param.MenuID
@@ -93,7 +103,7 @@
this.getMenuParam(param)
})
}
- } catch {
+ } catch (e) {
notification.warning({
top: 92,
message: '鑿滃崟淇℃伅瑙ｆ瀽閿欒锛�',
@@ -122,12 +132,14 @@
MKEmitter.addListener('copyButtons', this.copyButtons)
MKEmitter.addListener('changePopview', this.initPopview)
MKEmitter.addListener('changeEditMenu', this.changeEditMenu)
+ MKEmitter.addListener('triggerMenuSave', this.triggerMenuSave)
MKEmitter.addListener('submitComponentStyle', this.updateComponentStyle)
MKEmitter.addListener('updateCustomComponent', this.updateCustomComponent)
setTimeout(() => {
this.updateCustomComponent()
this.getAppPictures()
this.getSmStemp()
+ setGLOBFuncs()
}, 1000)
}
@@ -143,8 +155,15 @@
MKEmitter.removeListener('copyButtons', this.copyButtons)
MKEmitter.removeListener('changePopview', this.initPopview)
MKEmitter.removeListener('changeEditMenu', this.changeEditMenu)
+ MKEmitter.removeListener('triggerMenuSave', this.triggerMenuSave)
MKEmitter.removeListener('submitComponentStyle', this.updateComponentStyle)
MKEmitter.removeListener('updateCustomComponent', this.updateCustomComponent)
+ }
+
+ triggerMenuSave = () => {
+ if (this.state.visible) return
+
+ this.submitConfig()
}
changeEditMenu = (menu) => {
@@ -165,20 +184,20 @@
type: 'view'
}
- if (menu.fixed && menu.MenuNo && menu.MenuName) {
- param.fixed = true
- }
param.MenuNo = menu.MenuNo || ''
param.MenuName = menu.MenuName || ''
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)
}
- getAppMessage = () => {
+ getAppMessage = (MenuID) => {
Api.getSystemConfig({
func: 's_get_keyids',
bid: sessionStorage.getItem('appId')
@@ -192,9 +211,9 @@
return
}
- let homeId = ''
+ let homeId = MenuID || ''
let appViewList = []
- if (res.data && res.data.length > 0) {
+ if (!homeId && res.data && res.data.length > 0) {
appViewList = res.data
appViewList.forEach(item => {
if (item.keys_type === 'index') {
@@ -238,20 +257,20 @@
})
} 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'}))))
}
})
}
getSmStemp = () => {
- let _sql = `select ID,TemplateCode,SignName from bd_msn_sms_temp where deleted=0 and appkey='${window.GLOB.appkey}'`
+ let _sql = `select ID,TemplateCode,SignName from (select * from bd_msn_sms_temp where deleted=0 and status=20 ) a
+ inner join (select openid from sapp where id='${window.GLOB.appkey}') b
+ on a.openid=b.openid`
_sql = Utils.formatOptions(_sql)
@@ -318,6 +337,23 @@
})
}
})
+ 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
+ })
+ }
+ })
})
}
@@ -365,6 +401,14 @@
})
}
+ handleBack = () => {
+ this.setState({popBtn: null, delButtons: [], copyButtons: [], thawButtons: []}, () => {
+ sessionStorage.setItem('editMenuType', 'menu')
+ window.GLOB.customMenu = this.state.config
+ this.setState({visible: false})
+ })
+ }
+
updateComponentStyle = (parentId, keys, style) => {
const { config } = this.state
@@ -378,21 +422,17 @@
})
this.setState({
- config: {...config, components: []}
+ config: {...config, components},
+ comloading: true
}, () => {
this.setState({
- config: {...config, components: components}
+ comloading: false
})
})
}
delButtons = (items) => {
- const { copyButtons, delButtons } = this.state
-
- this.setState({
- delButtons: [...delButtons, ...items],
- copyButtons: copyButtons.filter(item => !items.includes(item.uuid))
- })
+ this.setState({ delButtons: [...this.state.delButtons, ...items] })
}
copyButtons = (items) => {
@@ -491,19 +531,15 @@
components: [],
viewType: 'menu',
style: {
- backgroundColor: '#ffffff', backgroundImage: '', paddingLeft: '20px', paddingRight: '20px'
+ backgroundColor: sessionStorage.getItem('sysBgColor') || '#ffffff', backgroundImage: '', paddingLeft: '20px', paddingRight: '20px'
}
}
}
-
+
config.uuid = MenuId
config.MenuID = MenuId
config.open_edition = result.open_edition || ''
window.GLOB.urlFields = config.urlFields || []
-
- if (urlParam.fixed && urlParam.MenuNo && urlParam.MenuName) {
- config.fixed = true
- }
let indeComs = []
config.components.forEach(item => {
@@ -554,6 +590,11 @@
appIndeList = appIndeList.map(item => (item.keys_type !== 'index' ? item.keys_id : '')).join(',')
let menus = res.menus.filter(item => appIndeList.indexOf(item.MenuID) === -1)
+ menus = menus.map(item => {
+ item.value = item.MenuID
+ item.label = item.MenuName
+ return item
+ })
sessionStorage.setItem('appMenus', JSON.stringify(menus))
})
}
@@ -608,17 +649,20 @@
components: [],
viewType: 'menu',
style: {
- backgroundColor: '#ffffff', backgroundImage: '', paddingLeft: '20px', paddingRight: '20px'
+ backgroundColor: sessionStorage.getItem('sysBgColor') || '#ffffff', backgroundImage: '', paddingLeft: '20px', paddingRight: '20px'
}
}
} else {
config.components = MenuUtils.resetConfig(config.components)
+ config.enabled = false
message.success('澶嶅埗鎴愬姛锛屼繚瀛樺悗鐢熸晥銆�')
}
config.uuid = MenuId
config.MenuID = MenuId
config.open_edition = ''
+ config.MenuName = urlParam.MenuName || ''
+ config.MenuNo = urlParam.MenuNo || ''
let indeComs = []
config.components.forEach(item => {
@@ -715,64 +759,160 @@
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 => {
- if (item.type === 'tabs') {
+ let list = components.map(item => {
+ let m = {
+ key: item.uuid,
+ title: item.name,
+ children: []
+ }
+ if (item.type === 'login' || item.type === 'navbar') {
+ return null
+ } else 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.type === 'timeline') {
+ 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 === 'table' && item.subtype === 'normaltable') {
+ } 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 === 'form') {
+ m.children = item.subcards.map(m => {
+ return {
+ key: m.uuid,
+ title: m.setting.title
+ }
+ })
+ } else if (item.type === 'table' && (item.subtype === 'normaltable' || item.subtype === 'editable')) {
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)
+ }
})
})
}
+
+ return m
})
+
+ list = list.filter(Boolean)
+
+ return list
}
- traversal(config.components)
+ let trees = traversal(config.components)
- return buttons
+ nodes.children = trees
+ nodes.popviews = popviews
+
+ if (config.components.findIndex(item => item.type === 'login') > -1) {
+ nodes.login = true
+ }
+
+ return nodes
}
checkBtn = (btn) => {
@@ -793,23 +933,6 @@
})
}
}
- }
-
- filterConfig = (components) => {
- return components.map(item => {
- if (item.type === 'tabs') {
- item.subtabs.forEach(tab => {
- tab.components = this.filterConfig(tab.components)
- })
- } else if (item.type === 'group') {
- item.components = this.filterConfig(item.components)
- } else if (item.type === 'table' && item.subtype === 'normaltable') {
- item.search = item.search.filter(a => !a.origin)
- item.action = item.action.filter(a => !a.origin)
- item.cols = item.cols.filter(a => !a.origin)
- }
- return item
- })
}
submitConfig = () => {
@@ -835,18 +958,17 @@
})
setTimeout(() => {
- config.components = this.filterConfig(config.components)
-
if (config.enabled && this.verifyConfig()) {
config.enabled = false
}
- let parMenuId = sessionStorage.getItem('kei_no') + 'pc' + sessionStorage.getItem('lang')
+ let roleParam = this.getMenuMessage()
+
let param = {
func: 'sPC_TrdMenu_AddUpt',
- FstID: parMenuId,
- SndID: parMenuId,
- ParentID: parMenuId,
+ FstID: 'mk_app',
+ SndID: 'mk_app',
+ ParentID: 'mk_app',
MenuID: config.uuid,
MenuNo: config.MenuNo || '',
EasyCode: '',
@@ -855,6 +977,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: ''
@@ -862,26 +985,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()
@@ -912,19 +1015,51 @@
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,
- SndID: parMenuId,
- ParentID: parMenuId,
+ FstID: 'mk_app',
+ SndID: 'mk_app',
+ ParentID: 'mk_app',
MenuID: item.uuid,
- MenuNo: item.wrap.MenuNo || '',
+ 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: ''
@@ -934,95 +1069,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') {
@@ -1038,27 +1105,34 @@
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) {
- let param = {
+ if (!is(fromJS(appViewList), fromJS(_appViewList))) {
+ let kparam = {
func: 's_kei_link_keyids_addupt',
BID: sessionStorage.getItem('appId'),
exec_type: 'y',
LText: ''
}
- 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)
+ 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)
- param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt('', param.timestamp)
+ kparam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ kparam.secretkey = Utils.encrypt('', kparam.timestamp)
- Api.getSystemConfig(param).then(result => {
+ Api.getSystemConfig(kparam).then(result => {
if (!result.status) {
notification.warning({
top: 92,
@@ -1082,10 +1156,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)
}
@@ -1102,13 +1175,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 => { // 椤甸潰淇濆瓨
@@ -1131,15 +1203,12 @@
config.open_edition = res.open_edition || ''
this.setState({
+ config,
oriConfig: fromJS(config).toJS(),
})
- if (btnParam.LText) {
- return Api.getSystemConfig(btnParam)
- } else {
- return {
- status: true
- }
+ return {
+ status: true
}
} else {
notification.warning({
@@ -1168,7 +1237,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
})
@@ -1177,7 +1246,9 @@
Api.getSystemConfig({
func: 'sPC_Get_LongParam',
- MenuID: item.$originUuid
+ MenuID: item.$originUuid,
+ TypeCharOne: sessionStorage.getItem('kei_no'),
+ typename: 'pc',
}).then(result => {
if (result.status) {
let _conf = ''
@@ -1194,6 +1265,7 @@
_conf.uuid = item.uuid
_conf.MenuID = item.uuid
_conf.Template = 'webPage'
+ _conf.enabled = false
} else {
resolve({
status: true
@@ -1209,7 +1281,9 @@
Template: 'webPage',
MenuName: item.label,
PageParam: JSON.stringify({Template: 'webPage'}),
- LongParam: window.btoa(window.encodeURIComponent(JSON.stringify(_conf)))
+ LongParam: window.btoa(window.encodeURIComponent(JSON.stringify(_conf))),
+ TypeCharOne: sessionStorage.getItem('kei_no'),
+ Typename: 'pc',
}
Api.getSystemConfig(_param).then(response => {
@@ -1248,12 +1322,7 @@
delButtons: [],
copyButtons: [],
thawButtons: [],
- menuloading: false,
- config: {...config, components: []}
- }, () => {
- this.setState({
- config: {...this.state.config, components: this.state.oriConfig.components}
- })
+ menuloading: false
})
notification.success({
top: 92,
@@ -1265,6 +1334,7 @@
menuloading: false
})
}
+ MKEmitter.emit('completeSave')
})
}, 300)
}
@@ -1329,8 +1399,9 @@
check(item.components)
return
}
- if (['propcard', 'brafteditor', 'sandbox'].includes(item.subtype) && item.wrap.datatype === 'static') return
-
+ if (['propcard', 'brafteditor', 'sandbox', 'stepform', 'tabform'].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}銆嬫湭璁剧疆鏁版嵁婧愶紒`
@@ -1338,6 +1409,8 @@
error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆鏁版嵁婧愶紒`
} else if (!item.setting.primaryKey) {
error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆涓婚敭锛乣
+ } else if (!item.setting.supModule && item.type !== 'balcony' && (!item.wrap || item.wrap.supType !== 'multi')) {
+ error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆涓婄骇缁勪欢锛乣
}
}
if (item.type === 'bar' || item.type === 'line' || item.type === 'pie') {
@@ -1376,6 +1449,19 @@
window.GLOB.customMenu = config
}
+ resetConfig = (config) => {
+ this.setState({
+ config: config,
+ comloading: true
+ }, () => {
+ this.setState({
+ comloading: false
+ })
+ })
+
+ window.GLOB.customMenu = config
+ }
+
insert = (item) => {
let config = fromJS(this.state.config).toJS()
@@ -1383,6 +1469,12 @@
this.setState({config})
window.GLOB.customMenu = config
+
+ notification.success({
+ top: 92,
+ message: '绮樿创鎴愬姛锛�',
+ duration: 2
+ })
}
refreshView = () => {
@@ -1456,7 +1548,67 @@
duration: 5
})
} else {
- sessionStorage.setItem('appHomeId', config.MenuID)
+ sessionStorage.setItem('appViewList', JSON.stringify(appViewList))
+ }
+ })
+ },
+ onCancel() {}
+ })
+ }
+
+ setLoginView = () => {
+ const { oriConfig, config } = this.state
+
+ if (!oriConfig || !is(fromJS(oriConfig), fromJS(config))) {
+ notification.warning({
+ top: 92,
+ message: '閰嶇疆淇℃伅鏈繚瀛橈紒',
+ duration: 5
+ })
+ return
+ }
+
+ let param = {
+ func: 's_kei_link_keyids_addupt',
+ BID: sessionStorage.getItem('appId'),
+ exec_type: 'y',
+ LText: ''
+ }
+
+ let appViewList = sessionStorage.getItem('appViewList')
+ appViewList = appViewList ? JSON.parse(appViewList) : []
+ appViewList = appViewList.filter(item => item.keys_type !== 'login')
+
+ appViewList.unshift({
+ appkey: window.GLOB.appkey || '',
+ bid: sessionStorage.getItem('appId') || '',
+ kei_no: sessionStorage.getItem('kei_no') || '',
+ keys_id: config.MenuID,
+ keys_type: 'login',
+ remark: config.MenuName
+ })
+
+ 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.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ param.secretkey = Utils.encrypt('', param.timestamp)
+
+ let hasLogin = config.components.findIndex(item => item.type === 'login') > -1
+
+ confirm({
+ title: '纭畾璁剧疆鏈〉闈负鐧诲綍椤靛悧锛�',
+ content: hasLogin ? '' : '褰撳墠椤甸潰灏氭湭娣诲姞鐧诲綍缁勪欢銆�',
+ onOk() {
+ Api.getSystemConfig(param).then(result => {
+ if (!result.status) {
+ notification.warning({
+ top: 92,
+ message: result.message,
+ duration: 5
+ })
+ } else {
sessionStorage.setItem('appViewList', JSON.stringify(appViewList))
}
})
@@ -1466,17 +1618,17 @@
}
render () {
- const { localedict, loading, 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}
- {!settingshow ? <Icon onClick={() => {sessionStorage.setItem('settingshow', 'true'); this.setState({settingshow: true})}} type="double-right" /> : null}
+ {settingshow ? <DoubleLeftOutlined onClick={() => {sessionStorage.setItem('settingshow', 'false'); this.setState({settingshow: false})}}/> : null}
+ {!settingshow ? <DoubleRightOutlined onClick={() => {sessionStorage.setItem('settingshow', 'true'); this.setState({settingshow: true})}}/> : null}
</div>
<div className="pc-setting-tools">
<Collapse accordion activeKey={activeKey} bordered={false} onChange={(key) => this.setState({activeKey: key})}>
@@ -1492,6 +1644,7 @@
{config ? <UrlFieldComponent config={config} updateConfig={this.updateConfig}/> : null}
{/* 琛ㄥ悕娣诲姞 */}
{config ? <TableComponent config={config} updatetable={this.updateConfig}/> : null}
+ {config ? <Paragraph style={{padding: '15px 0px 0px 18px'}} copyable={{ text: MenuId }}>鑿滃崟ID</Paragraph> : null}
</Panel>
{/* 缁勪欢娣诲姞 */}
<Panel header={dict['mob.component']} key="component">
@@ -1508,24 +1661,32 @@
</div>
<div className={'menu-control ' + (!controlshow ? 'hidden' : '')}>
<div className="draw">
- {controlshow ? <Icon onClick={() => {sessionStorage.setItem('controlshow', 'false'); this.setState({controlshow: false})}} type="double-right" /> : null}
- {!controlshow ? <Icon onClick={() => {sessionStorage.setItem('controlshow', 'true'); this.setState({controlshow: true})}} type="double-left" /> : null}
+ {controlshow ? <DoubleRightOutlined onClick={() => {sessionStorage.setItem('controlshow', 'false'); this.setState({controlshow: false})}}/> : null}
+ {!controlshow ? <DoubleLeftOutlined onClick={() => {sessionStorage.setItem('controlshow', 'true'); this.setState({controlshow: true})}}/> : null}
</div>
- <Button type="primary" onClick={this.submitConfig} loading={menuloading}>{dict['mob.save']}</Button>
- <Switch className="big" checkedChildren={dict['mob.enable']} unCheckedChildren={dict['mob.disable']} checked={config && config.enabled} onChange={this.onEnabledChange} />
- <PasteController type="menu" Tab={null} insert={this.insert} />
- <StyleCombControlButton menu={config} />
- <SysInterface config={config} updateConfig={this.updateConfig}/>
- <PictureController/>
- <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>
- <Button type="default" onClick={this.closeView}>鍏抽棴</Button>
+ <div className="wrap">
+ <Button type="primary" onClick={this.submitConfig} loading={menuloading}>{dict['mob.save']}</Button>
+ <Switch className="big" checkedChildren={dict['mob.enable']} unCheckedChildren={dict['mob.disable']} checked={config && config.enabled} onChange={this.onEnabledChange} />
+ <CreateView resetmenu={this.getAppMenus} />
+ <PasteController insert={this.insert} />
+ <StyleCombControlButton menu={config} />
+ <SysInterface config={config} updateConfig={this.updateConfig}/>
+ <PictureController/>
+ <Quotecomponent config={config} updateConfig={this.updateConfig}/>
+ <Button className="mk-border-green" icon="home" onClick={this.setHomeView}>璁句负棣栭〉</Button>
+ <Button className="mk-border-purple" icon="login" onClick={this.setLoginView}>璁句负鐧诲綍椤�</Button>
+ <ReplaceField type="custom" config={config} updateConfig={this.resetConfig}/>
+ <Transfer MenuID={MenuId} />
+ <Versions MenuId={MenuId} open_edition={config ? config.open_edition : ''}/>
+ <Button className="mk-border-danger" icon="redo" onClick={this.refreshView}>寮哄埗鍒锋柊</Button>
+ <Button type="default" onClick={this.closeView}>鍏抽棴</Button>
+ </div>
</div>
- <div className={'menu-body ' + (menuloading ? 'saving' : '')}>
- {config && config.components ? <MenuShell menu={config} handleList={this.updateConfig} /> : null}
+ <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