From 81c3fd3ac5017591d987d9c9fe42042fae5c7d7d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 30 十一月 2021 14:30:47 +0800
Subject: [PATCH] 2021-11-30
---
src/views/mobdesign/index.jsx | 758 +++++++++++++++++++++++++++++----------------------------
1 files changed, 383 insertions(+), 375 deletions(-)
diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index 9a637c2..d4474f5 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -5,7 +5,7 @@
import { is, fromJS } from 'immutable'
import moment from 'moment'
import HTML5Backend from 'react-dnd-html5-backend'
-import { ConfigProvider, notification, Modal, Collapse, Switch, Button, message, Spin, Icon } from 'antd'
+import { ConfigProvider, notification, Modal, Collapse, Switch, Button, message, Spin, Icon, Typography } from 'antd'
import Api from '@/api'
import Utils, { setGLOBFuncs } from '@/utils/utils.js'
@@ -21,13 +21,17 @@
const { Panel } = Collapse
const { confirm } = Modal
+const { Paragraph } = Typography
const Header = asyncComponent(() => import('@/mob/header'))
const MenuForm = asyncComponent(() => import('./menuform'))
const MobShell = asyncComponent(() => import('@/mob/mobshell'))
const CreateView = asyncComponent(() => import('@/pc/createview'))
+const Transfer = asyncComponent(() => import('@/pc/transfer'))
+const Versions = asyncComponent(() => import('@/menu/versions'))
const SourceWrap = asyncComponent(() => import('@/mob/modulesource'))
const BgController = asyncComponent(() => import('@/pc/bgcontroller'))
+const ReplaceField = asyncComponent(() => import('@/menu/replaceField'))
const SysInterface = asyncComponent(() => import('@/menu/sysinterface'))
const Quotecomponent = asyncComponent(() => import('@/pc/quotecomponent'))
const PasteController = asyncComponent(() => import('@/menu/pastecontroller'))
@@ -35,6 +39,7 @@
const UrlFieldComponent = asyncComponent(() => import('@/menu/urlfieldcomponent'))
const PictureController = asyncComponent(() => import('@/menu/picturecontroller'))
const ModalController = asyncComponent(() => import('@/mob/modalconfig/controller'))
+const SearchController = asyncComponent(() => import('@/mob/searchconfig/controller'))
const StyleCombController = asyncComponent(() => import('@/menu/stylecombcontroller'))
const StyleCombControlButton = asyncComponent(() => import('@/menu/stylecombcontrolbutton'))
const TableComponent = asyncComponent(() => import('@/templates/sharecomponent/tablecomponent'))
@@ -44,6 +49,7 @@
sessionStorage.setItem('appType', 'mob') // 搴旂敤绫诲瀷
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 // 淇濆瓨鑿滃崟淇℃伅
@@ -56,14 +62,10 @@
MenuId: '',
MenuName: '',
MenuNo: '',
- delButtons: [],
- copyButtons: [],
- thawButtons: [],
activeKey: 'component',
menuloading: false,
oriConfig: null,
config: null,
- visible: false,
customComponents: [],
direction: 'vertical',
settingshow: true,
@@ -81,14 +83,15 @@
sessionStorage.setItem('lang', param.lang || 'zh-CN')
sessionStorage.setItem('kei_no', param.kei_no || '')
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('typename', param.typename || 'mob')
+ sessionStorage.setItem('adapter', param.adapter || 'false')
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') {
window.GLOB.winWidth = 420
window.GLOB.winHeight = 738
@@ -108,7 +111,7 @@
this.getMenuParam(param)
})
}
- } catch {
+ } catch (e) {
notification.warning({
top: 92,
message: '鑿滃崟淇℃伅瑙ｆ瀽閿欒锛�',
@@ -132,10 +135,8 @@
document.getElementById('mk-mob-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('thawButtons', this.thawButtons)
- MKEmitter.addListener('copyButtons', this.copyButtons)
MKEmitter.addListener('changeEditMenu', this.changeEditMenu)
+ MKEmitter.addListener('triggerMenuSave', this.submitConfig)
MKEmitter.addListener('submitComponentStyle', this.updateComponentStyle)
MKEmitter.addListener('updateCustomComponent', this.updateCustomComponent)
setTimeout(() => {
@@ -153,10 +154,8 @@
this.setState = () => {
return
}
- MKEmitter.removeListener('delButtons', this.delButtons)
- MKEmitter.removeListener('thawButtons', this.thawButtons)
- MKEmitter.removeListener('copyButtons', this.copyButtons)
MKEmitter.removeListener('changeEditMenu', this.changeEditMenu)
+ MKEmitter.removeListener('triggerMenuSave', this.submitConfig)
MKEmitter.removeListener('submitComponentStyle', this.updateComponentStyle)
MKEmitter.removeListener('updateCustomComponent', this.updateCustomComponent)
}
@@ -222,7 +221,7 @@
this.props.history.push('/mobdesign/' + param)
}
- getAppMessage = () => {
+ getAppMessage = (MenuID) => {
Api.getSystemConfig({
func: 's_get_keyids',
bid: sessionStorage.getItem('appId')
@@ -236,9 +235,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') {
@@ -282,13 +281,11 @@
})
} else {
sessionStorage.setItem('appViewList', JSON.stringify(appViewList))
- sessionStorage.setItem('appHomeId', homeId)
this.props.history.replace('/mobdesign/' + 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('/mobdesign/' + window.btoa(window.encodeURIComponent(JSON.stringify({MenuID: homeId, type: 'view'}))))
}
})
@@ -317,6 +314,17 @@
}).then(res => {
if (res.status) {
sessionStorage.setItem('app_videos', JSON.stringify(res.data || []))
+ }
+ })
+ 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 || []))
}
})
})
@@ -380,23 +388,6 @@
comloading: false
})
})
- }
-
- delButtons = (items) => {
- const { copyButtons, delButtons } = this.state
-
- this.setState({
- delButtons: [...delButtons, ...items],
- copyButtons: copyButtons.filter(item => !items.includes(item.uuid))
- })
- }
-
- copyButtons = (items) => {
- this.setState({copyButtons: [...this.state.copyButtons, ...items]})
- }
-
- thawButtons = (item) => {
- this.setState({thawButtons: [...this.state.thawButtons, item]})
}
closeView = () => {
@@ -526,6 +517,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))
})
}
@@ -585,6 +581,7 @@
}
} else {
config.components = MenuUtils.resetConfig(config.components)
+ config.enabled = false
message.success('澶嶅埗鎴愬姛锛屼繚瀛樺悗鐢熸晥銆�')
}
@@ -690,64 +687,123 @@
getMenuMessage = () => {
const { config } = this.state
- let buttons = []
- let _sort = 1
-
+
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 === 'topbar' || 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,
+ })
})
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++
- })
- 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,
+ })
})
})
- } 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,
+ })
+ })
+ })
+ } 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,
+ })
+ })
+ } 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.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,
+ })
})
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,
+ })
})
})
}
+
+ return m
})
+
+ list = list.filter(Boolean)
+
+ return list
}
- traversal(config.components)
+ let trees = traversal(config.components)
- return buttons
+ return trees
}
checkBtn = (btn) => {
@@ -770,25 +826,88 @@
}
}
- 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
+ getMiniStyle = (config) => {
+ config.miniStyle = this.transferStyle(config.style)
+
+ let traversal = (components) => {
+ return components.map(item => {
+ if (item.style) {
+ item.miniStyle = this.transferStyle(item.style)
+ }
+ if (item.headerStyle) {
+ item.miniHeaderStyle = this.transferStyle(item.headerStyle)
+ }
+
+ if (item.action && item.action.length > 0) {
+ item.action = item.action.map(btn => {
+ btn.miniStyle = this.transferStyle(btn.style)
+ return btn
+ })
+ }
+
+ if (item.type === 'tabs') {
+ item.subtabs.forEach(tab => {
+ tab.components = traversal(tab.components)
+ })
+ } else if (item.type === 'group') {
+ item.components = traversal(item.components)
+ } else if (['card', 'carousel', 'timeline'].includes(item.type) || (item.type === 'table' && item.subtype === 'tablecard')) {
+ item.subcards.forEach(card => {
+ card.miniStyle = this.transferStyle(card.style)
+ card.elements = card.elements.map(cell => {
+ cell.miniStyle = this.transferStyle(cell.style)
+ return cell
+ })
+ })
+ } else if (item.type === 'balcony') {
+ item.elements && item.elements.forEach(cell => {
+ cell.miniStyle = this.transferStyle(cell.style)
+ })
+ } else if (item.type === 'menubar') {
+ item.subMenus = item.subMenus.map(menu => {
+ menu.miniStyle = this.transferStyle(menu.style)
+ return menu
+ })
+ } else if (item.type === 'table' && item.subtype === 'normaltable') {
+ let getCols = (cols) => {
+ return cols.map(col => {
+ if (col.type === 'colspan') {
+ col.subcols = getCols(col.subcols || [])
+ } else if (col.type === 'custom' || col.type === 'action') {
+ col.elements = col.elements.map(cell => {
+ cell.miniStyle = this.transferStyle(cell.style)
+ return cell
+ })
+ }
+
+ return col
+ })
+ }
+
+ item.cols = getCols(item.cols)
+ }
+
+ return item
+ })
+ }
+
+ config.components = traversal(config.components)
+
+ return config
+ }
+
+ transferStyle = (style = {}) => {
+ let _style = ''
+ Object.keys(style).forEach(key => {
+ if (['hShadow', 'vShadow', 'shadowBlur', 'shadowColor'].includes(key)) return
+ if (!style[key]) return
+ _style += `${key.replace(/[A-Z]/g, m => '-' + m.toLowerCase())}:${style[key]};`
})
+
+ return _style
}
submitConfig = () => {
- const { delButtons, copyButtons, thawButtons } = this.state
let config = fromJS(this.state.config).toJS()
if (!config.MenuName || !config.MenuNo || (config.cacheUseful === 'true' && !config.cacheTime)) {
@@ -809,18 +928,29 @@
})
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 = {type: 'view', key: config.uuid, title: config.MenuName, children: []}
+ roleParam.children = this.getMenuMessage()
+
+ if (config.components.findIndex(item => item.type === 'login') > -1) {
+ roleParam.login = true
+ config.loginview = true
+ } else {
+ config.loginview = false
+ }
+
+ if (sessionStorage.getItem('adapter') === 'true') {
+ config = this.getMiniStyle(config)
+ }
+
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: '',
@@ -830,32 +960,13 @@
MenuName: config.MenuName || '',
PageParam: JSON.stringify({Template: 'webPage'}),
open_edition: config.open_edition,
+ menus_rolelist: window.btoa(window.encodeURIComponent(JSON.stringify(roleParam))),
LText: '',
LTexttb: ''
}
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()
@@ -886,11 +997,25 @@
return
}
+ let roles = {
+ type: 'navbar',
+ key: item.uuid,
+ title: item.name,
+ children: []
+ }
+
+ roles.children = item.menus.map(menu => {
+ return {
+ key: menu.MenuID,
+ title: menu.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 || Utils.getuuid(),
EasyCode: '',
@@ -899,7 +1024,8 @@
Typename: sessionStorage.getItem('typename'),
MenuName: item.name || '',
PageParam: JSON.stringify({Template: item.type}),
- open_edition: item.open_edition || '',
+ open_edition: _item.open_edition || '',
+ menus_rolelist: window.btoa(window.encodeURIComponent(JSON.stringify(roles))),
LText: '',
LTexttb: ''
}
@@ -907,96 +1033,28 @@
_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)
-
- 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') {
@@ -1012,12 +1070,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 param = {
func: 's_kei_link_keyids_addupt',
BID: sessionStorage.getItem('appId'),
@@ -1050,55 +1115,11 @@
}
})
}
- }).then(res => { // 鎸夐挳鎴栬彍鍗曞垹闄�
- if (!res) return
-
- 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(',')
- }
- return Api.getSystemConfig(_param)
- }
- }).then(res => { // 鎸夐挳瑙ｉ櫎鍐荤粨
- if (!res) return
- if (!res.status) {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
- })
- return false
- } else if (!res.nonexec) { // 鎵ц鍒犻櫎鍚庡埛鏂拌彍鍗曞垪琛�
- this.getAppMenus()
- }
-
- let ids = thawButtons.filter(item => btnIds.indexOf(item) !== -1)
- if (ids.length === 0) {
- return { status: true }
- } else {
- return Api.getSystemConfig({
- func: 'sPC_MainMenu_ReDel',
- MenuID: ids.join(',')
- })
- }
}).then(res => { // 椤甸潰淇濆瓨
if (!res) return
- 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 => {
if (!res) return
if (res.status) {
@@ -1107,139 +1128,25 @@
this.setState({
config,
oriConfig: fromJS(config).toJS(),
+ menuloading: false
})
- if (btnParam.LText) {
- return Api.getSystemConfig(btnParam)
- } else {
- 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
- }
-
- if (copyButtons.length === 0) {
- return {
- status: true
- }
- } else {
- return new Promise(resolve => {
- let deffers = copyButtons.map(item => {
- return new Promise(resolve => {
- if (btnIds.indexOf(item.uuid) === -1) { // 澶嶅埗鐨勬寜閽凡鍒犻櫎
- resolve({
- status: true
- })
- return
- }
-
- Api.getSystemConfig({
- func: 'sPC_Get_LongParam',
- MenuID: item.$originUuid
- }).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'
- } 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)))
- }
-
- 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: [],
- thawButtons: [],
- menuloading: false,
- comloading: true
- }, () => {
- this.setState({
- comloading: false
- })
- })
notification.success({
top: 92,
message: '淇濆瓨鎴愬姛',
duration: 2
})
} else {
+ notification.warning({
+ top: 92,
+ message: res.message,
+ duration: 5
+ })
this.setState({
menuloading: false
})
}
+ MKEmitter.emit('completeSave')
})
}, 300)
}
@@ -1307,8 +1214,10 @@
error = `瀵艰埅鏍忋��${item.name}銆嬫湭璁剧疆鑿滃崟鍙傛暟锛乣
}
- if (['propcard', 'brafteditor', 'sandbox', 'tabbar', 'stepform'].includes(item.subtype) && item.wrap.datatype === 'static') return
-
+ if (['propcard', 'brafteditor', 'sandbox', 'tabbar', 'stepform', 'tabform'].includes(item.subtype) && item.wrap.datatype === 'static') return
+ if (['balcony'].includes(item.type) && item.wrap.datatype === 'static') return
+ if (['menubar'].includes(item.type) && item.wrap.datatype !== 'dynamic') return
+
if (item.setting) {
if (item.setting.interType === 'system' && item.setting.execute !== 'false' && !item.setting.dataresource) {
error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆鏁版嵁婧愶紒`
@@ -1316,6 +1225,8 @@
error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆鏁版嵁婧愶紒`
} else if (!item.setting.primaryKey) {
error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆涓婚敭锛乣
+ } else if (!item.setting.supModule && !['navbar', 'balcony', 'menubar'].includes(item.type)) {
+ error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆涓婄骇缁勪欢锛乣
}
}
if (item.type === 'bar' || item.type === 'line' || item.type === 'pie') {
@@ -1355,10 +1266,25 @@
insert = (item) => {
let config = fromJS(this.state.config).toJS()
+ if (item.type === 'topbar' && config.components.findIndex(m => m.type === 'topbar') > -1) {
+ notification.warning({
+ top: 92,
+ message: '瀵艰埅鏍忎笉鍙噸澶嶆坊鍔狅紒',
+ duration: 5
+ })
+ return
+ }
+
config.components.push(item)
this.setState({config})
window.GLOB.customMenu = config
+
+ notification.success({
+ top: 92,
+ message: '绮樿创鎴愬姛锛�',
+ duration: 2
+ })
}
refreshView = () => {
@@ -1432,7 +1358,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))
}
})
@@ -1462,6 +1448,20 @@
})
}
+ resetConfig = (config) => {
+ this.setState({
+ config: config,
+ comloading: true
+ }, () => {
+ this.setState({
+ comloading: false
+ })
+ })
+
+ window.GLOB.customMenu = config
+ }
+
+
render () {
const { localedict, comloading, loading, settingshow, controlshow, activeKey, dict, MenuId, config, menuloading, customComponents } = this.state
@@ -1490,6 +1490,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">
@@ -1509,19 +1510,25 @@
{controlshow ? <Icon onClick={() => {this.setState({controlshow: false})}} type="double-right" /> : null}
{!controlshow ? <Icon onClick={() => {this.setState({controlshow: true})}} type="double-left" /> : 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} />
- <CreateView resetmenu={this.getAppMenus} />
- <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' : '')}>
+ <div className={'menu-body menu-view' + (menuloading ? 'saving' : '')}>
{config && !comloading ? <div className="mob-shell" style={{width: window.GLOB.shellWidth, height: window.GLOB.shellHeight}}>
<MobShell menu={config} handleList={this.updateConfig} />
</div> : null}
@@ -1530,6 +1537,7 @@
<StyleController />
<StyleCombController />
<ModalController />
+ <SearchController />
</div>
</ConfigProvider>
)
--
Gitblit v1.8.0