From 58826d6f4eab9f8c9acf9fa8696f60039c645cfe Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 20 八月 2024 18:18:00 +0800
Subject: [PATCH] 2024-08-20
---
src/views/mobdesign/index.jsx | 621 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 357 insertions(+), 264 deletions(-)
diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index dc5675f..95a7773 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -3,16 +3,15 @@
import { withRouter } from 'react-router'
import { is, fromJS } from 'immutable'
import HTML5Backend from 'react-dnd-html5-backend'
-import { ConfigProvider, notification, Modal, Collapse, Switch, Button, message, Spin, Typography } from 'antd'
-import { DoubleLeftOutlined, DoubleRightOutlined, HomeOutlined, LoginOutlined, RedoOutlined, ArrowLeftOutlined, EyeOutlined, EyeInvisibleOutlined } from '@ant-design/icons'
+import { notification, Modal, Collapse, Switch, Button, message, Spin, Typography } from 'antd'
+import { DoubleLeftOutlined, DoubleRightOutlined, HomeOutlined, LoginOutlined, ArrowLeftOutlined, EyeOutlined, EyeInvisibleOutlined } from '@ant-design/icons'
import moment from 'moment'
import md5 from 'md5'
import Api from '@/api'
-import Utils, { setGLOBFuncs } from '@/utils/utils.js'
-import antdZhCN from 'antd/es/locale/zh_CN'
+import Utils from '@/utils/utils.js'
import MKEmitter from '@/utils/events.js'
-import MenuUtils, { getTables } from '@/utils/utils-custom.js'
+import MenuUtils, { getTables, getFuncsAndInters, getLangTrans } from '@/utils/utils-custom.js'
import asyncComponent from '@/utils/asyncComponent'
import '@/assets/css/design.scss'
@@ -23,6 +22,7 @@
const { Paragraph } = Typography
const Header = asyncComponent(() => import('@/mob/header'))
+const Debug = asyncComponent(() => import('@/menu/debug'))
const MenuForm = asyncComponent(() => import('./menuform'))
const MobShell = asyncComponent(() => import('@/mob/mobshell'))
const CreateView = asyncComponent(() => import('@/pc/createview'))
@@ -48,7 +48,6 @@
const TableComponent = asyncComponent(() => import('@/templates/sharecomponent/tablecomponent'))
const PopView = asyncComponent(() => import('./popview'))
-sessionStorage.setItem('isEditState', 'true')
sessionStorage.setItem('editMenuType', 'menu') // 缂栬緫鑿滃崟绫诲瀷
sessionStorage.setItem('appType', 'mob') // 搴旂敤绫诲瀷
document.body.className = ''
@@ -57,8 +56,6 @@
window.GLOB.CacheIndependent = new Map()
window.GLOB.urlFields = [] // url鍙橀噺
window.GLOB.customMenu = null // 淇濆瓨鑿滃崟淇℃伅
-
-const memberLevel = Utils.getMemberLevel()
class MobDesign extends Component {
state = {
@@ -77,18 +74,40 @@
viewType: 'menu',
view: '',
eyeopen: false,
- needUpdate: false
+ needUpdate: false,
+ appLoginId: '',
+ appHomeId: ''
}
UNSAFE_componentWillMount() {
- if (memberLevel < 30) return
+ if (sessionStorage.getItem('devError') === 'true') {
+ sessionStorage.clear()
+ window.history.replaceState(null, null, window.location.href.split('#')[0] + '#/login')
+ window.location.reload()
+ return
+ }
+
+ if (!sessionStorage.getItem('UserID')) {
+ sessionStorage.removeItem('editMenuType')
+ sessionStorage.removeItem('appType')
+ this.props.history.replace('/login')
+ return
+ }
+
+ if (window.GLOB.memberLevel < 30) return
+
+ window.GLOB.developing = true
+
try {
let param = JSON.parse(window.decodeURIComponent(window.atob(this.props.match.params.param)))
+
+ if (param.lang) {
+ sessionStorage.setItem('lang', param.lang)
+ }
if (param.type === 'app') {
sessionStorage.setItem('appId', param.ID || '')
sessionStorage.setItem('appName', param.remark || '')
- sessionStorage.setItem('lang', param.lang || 'zh-CN')
sessionStorage.setItem('kei_no', param.kei_no || '')
sessionStorage.setItem('typename', param.typename || 'mob')
sessionStorage.setItem('adapter', param.adapter || '')
@@ -97,12 +116,23 @@
sessionStorage.setItem('userbind', param.userbind || '')
sessionStorage.setItem('instantMessage', param.instantMessage || '')
+ if (param.applangList) {
+ sessionStorage.setItem('applangList', param.applangList)
+ } else {
+ sessionStorage.removeItem('applangList')
+ }
+
+ if (param.wxAppId) {
+ sessionStorage.setItem('wxAppId', param.wxAppId)
+ }
+
this.getAppMessage(param.MenuID)
} else if (param.type === 'view') {
window.GLOB.winWidth = 420
window.GLOB.winHeight = 738
window.GLOB.shellWidth = 376
window.GLOB.shellHeight = 680
+ window.GLOB.curDate = moment().format('YYYY-MM-DD')
let adapters = sessionStorage.getItem('adapter')
if (adapters) {
@@ -111,10 +141,29 @@
adapters = []
}
+ let appLoginId = ''
+ let appHomeId = ''
+ if (sessionStorage.getItem('appViewList')) {
+ try {
+ let appMenus = JSON.parse(sessionStorage.getItem('appViewList'))
+ appMenus.forEach(item => {
+ if (item.keys_type === 'login') {
+ appLoginId = item.keys_id
+ } else if (item.keys_type === 'index') {
+ appHomeId = item.keys_id
+ }
+ })
+ } catch (e) {
+
+ }
+ }
+
this.setState({
adapters,
MenuId: param.MenuID,
- viewType: /^userbind/.test(param.MenuID) ? 'userbind' : 'menu'
+ viewType: /^userbind/.test(param.MenuID) ? 'userbind' : 'menu',
+ appLoginId: appLoginId,
+ appHomeId: appHomeId
}, () => {
this.getMenuParam(param)
})
@@ -139,17 +188,22 @@
}
componentDidMount () {
- if (memberLevel < 30) {
+ if (!sessionStorage.getItem('UserID')) return
+ if (window.GLOB.memberLevel < 30) {
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('changePopview', this.initPopview)
MKEmitter.addListener('triggerMenuSave', this.submitConfig)
MKEmitter.addListener('changeEditMenu', this.changeEditMenu)
+
+ if (sessionStorage.getItem('wxAppId')) {
+ window.GLOB.WXAppID = sessionStorage.getItem('wxAppId')
+ }
+
setTimeout(() => {
- this.getAppPictures()
this.getRoleFields()
- setGLOBFuncs()
+ // setGLOBFuncs()
}, 1000)
document.onkeydown = (event) => {
@@ -232,6 +286,8 @@
_btn.config.MenuID = _btn.uuid
_btn.config.ParentId = card.uuid
_btn.config.MenuName = _btn.label
+
+ _btn.config.components = this.updateComponents(_btn.config.components || [])
} else {
_btn.config = {
uuid: _btn.uuid,
@@ -298,15 +354,23 @@
})
})
- 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]
+ if (config.cols) {
+ let loopCol = (cols) => {
+ cols.forEach(col => {
+ if (col.type === 'colspan') {
+ loopCol(col.subcols)
+ } else if (col.type === 'custom') {
+ col.elements.forEach(cell => {
+ if (cell.eleType !== 'button') return
+ if (cell.OpenType === 'popview' && popbtns[cell.uuid]) {
+ cell.config = popbtns[cell.uuid]
+ }
+ })
}
})
}
- })
+ loopCol(config.cols)
+ }
config.elements && config.elements.forEach(cell => {
if (cell.eleType !== 'button') return
@@ -364,7 +428,8 @@
MenuID: menu.MenuID,
copyMenuId: menu.copyMenuId || '',
clearMenu: menu.clearMenu !== 'false',
- type: 'view'
+ type: 'view',
+ lang: sessionStorage.getItem('lang')
}
param.MenuNo = menu.MenuNo || ''
@@ -378,7 +443,7 @@
}
getAppMessage = (MenuID) => {
- Api.getSystemConfig({
+ Api.getCloudConfig({
func: 's_get_keyids',
bid: sessionStorage.getItem('appId')
}).then(res => {
@@ -408,7 +473,7 @@
let param = {
func: 's_kei_link_keyids_addupt',
BID: sessionStorage.getItem('appId'),
- exec_type: 'y',
+ exec_type: 'x',
LText: ''
}
@@ -423,12 +488,12 @@
param.LText = appViewList.map(item => `select '${item.keys_id}','${item.keys_type}','${item.kei_no}','${item.appkey}','${item.bid}','${sessionStorage.getItem('CloudUserID')}','${item.remark}'`)
param.LText = param.LText.join(' union all ')
- param.LText = Utils.formatOptions(param.LText)
+ param.LText = Utils.formatOptions(param.LText, 'x')
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
- Api.getSystemConfig(param).then(result => {
+ Api.getCloudConfig(param).then(result => {
if (!result.status) {
notification.warning({
top: 92,
@@ -437,50 +502,13 @@
})
} else {
sessionStorage.setItem('appViewList', JSON.stringify(appViewList))
- this.props.history.replace('/mobdesign/' + window.btoa(window.encodeURIComponent(JSON.stringify({MenuID: homeId, type: 'view'}))))
+ this.props.history.replace('/mobdesign/' + window.btoa(window.encodeURIComponent(JSON.stringify({MenuID: homeId, type: 'view', lang: sessionStorage.getItem('lang')}))))
}
})
} else {
sessionStorage.setItem('appViewList', JSON.stringify(appViewList))
- this.props.history.replace('/mobdesign/' + window.btoa(window.encodeURIComponent(JSON.stringify({MenuID: MenuID || homeId, type: 'view'}))))
+ this.props.history.replace('/mobdesign/' + window.btoa(window.encodeURIComponent(JSON.stringify({MenuID: MenuID || homeId, type: 'view', lang: sessionStorage.getItem('lang')}))))
}
- })
- }
-
- getAppPictures = () => {
- if (sessionStorage.getItem('app_pictures')) return
-
- let deffers = []
- let param = {
- func: 's_url_db_adduptdel',
- PageIndex: 0, // 0 浠ｈ〃鍏ㄩ儴
- PageSize: 0, // 0 浠ｈ〃鍏ㄩ儴
- type: 'search'
- }
- deffers = [new Promise(resolve => {
- setTimeout(() => {
- Api.getSystemConfig({...param, typecharone: 'image'}).then(res => {
- resolve(res.data)
- })
- }, 500)
- }), new Promise(resolve => {
- setTimeout(() => {
- Api.getSystemConfig({...param, typecharone: 'video'}).then(res => {
- resolve(res.data)
- })
- }, 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] || []))
})
}
@@ -532,7 +560,7 @@
MenuID: MenuId
}
- Api.getSystemConfig(param).then(result => {
+ Api.getCloudConfig(param).then(result => {
if (!result.status) {
notification.warning({
top: 92,
@@ -579,6 +607,7 @@
config.uuid = MenuId
config.MenuID = MenuId
+ config.Template = 'webPage'
config.open_edition = result.open_edition || ''
config.direction = config.direction || sessionStorage.getItem('direction') || 'vertical'
window.GLOB.urlFields = config.urlFields || []
@@ -604,6 +633,8 @@
this.setState({
needUpdate: true
})
+ } else {
+ config.components = this.updateComponents(config.components)
}
let navItem = null
@@ -695,6 +726,7 @@
config.uuid = MenuId
config.MenuID = MenuId
+ config.Template = 'webPage'
config.open_edition = result.open_edition || ''
this.setState({
@@ -716,7 +748,7 @@
_param.secretkey = Utils.encrypt(_param.LText, _param.timestamp)
- Api.getSystemConfig(_param).then(res => {
+ Api.getCloudConfig(_param).then(res => {
if (!res.status) {
notification.warning({
top: 92,
@@ -762,7 +794,7 @@
MenuID: urlParam.copyMenuId
}
- Api.getSystemConfig(param).then(result => {
+ Api.getCloudConfig(param).then(result => {
if (!result.status) {
notification.warning({
top: 92,
@@ -823,6 +855,8 @@
this.setState({
needUpdate: true
})
+ } else {
+ config.components = this.updateComponents(config.components)
}
config.enabled = false
@@ -832,6 +866,7 @@
config.uuid = MenuId
config.MenuID = MenuId
config.open_edition = ''
+ config.Template = 'webPage'
config.MenuName = urlParam.MenuName || ''
// config.MenuNo = urlParam.MenuNo || ''
config.MenuNo = ''
@@ -873,7 +908,7 @@
}
jointComponents = (config, navItem) => {
- Api.getSystemConfig({
+ Api.getCloudConfig({
func: 'sPC_Get_LongParam',
TypeCharOne: sessionStorage.getItem('kei_no'),
typename: sessionStorage.getItem('typename'),
@@ -921,6 +956,27 @@
})
}
+ updateComponents = (components) => { // 鍏煎鎬у崌绾� table
+ return components.map(item => {
+ if (item.type === 'tabs') {
+ item.subtabs.forEach(tab => {
+ tab.components = this.updateComponents(tab.components)
+ })
+ } else if (item.type === 'group') {
+ item.components = this.updateComponents(item.components)
+ } else if (item.type === 'table') {
+ item.cols = item.cols.map(col => {
+ if (col.type === 'action') {
+ col.type = 'custom'
+ }
+ return col
+ })
+ }
+
+ return item
+ })
+ }
+
collectTB = (components) => {
return components.map(item => {
if (item.type === 'tabs') {
@@ -939,6 +995,13 @@
if (item.subtype === 'tablecard') { // 鍏煎
item.type = 'card'
+ } else if (item.type === 'table') {
+ item.cols = item.cols.map(col => {
+ if (col.type === 'action') {
+ col.type = 'custom'
+ }
+ return col
+ })
}
delete item.tabId
@@ -1015,7 +1078,7 @@
return
} else if (item.type === 'card' || item.type === 'carousel' || item.type === 'timeline') {
item.action && item.action.forEach(btn => {
- if (btn.hidden === 'true') return
+ if (btn.hidden === 'true' || btn.permission === 'false') return
m.children.push({
key: btn.uuid,
@@ -1024,7 +1087,7 @@
})
item.subcards.forEach(card => {
card.elements && card.elements.forEach(cell => {
- if (cell.eleType !== 'button' || cell.hidden === 'true') return
+ if (cell.eleType !== 'button' || cell.hidden === 'true' || cell.permission === 'false') return
m.children.push({
key: cell.uuid,
@@ -1035,7 +1098,7 @@
if (item.subtype !== 'dualdatacard') return
card.backElements && card.backElements.forEach(cell => {
- if (cell.eleType !== 'button' || cell.hidden === 'true') return
+ if (cell.eleType !== 'button' || cell.hidden === 'true' || cell.permission === 'false') return
m.children.push({
key: cell.uuid,
@@ -1045,7 +1108,7 @@
})
} else if (item.type === 'balcony') {
item.elements && item.elements.forEach(cell => {
- if (cell.eleType !== 'button' || cell.hidden === 'true') return
+ if (cell.eleType !== 'button' || cell.hidden === 'true' || cell.permission === 'false') return
m.children.push({
key: cell.uuid,
@@ -1074,24 +1137,29 @@
}
} else if (item.type === 'table') {
item.action && item.action.forEach(btn => {
- if (btn.hidden === 'true') return
+ if (btn.hidden === 'true' || btn.permission === 'false') return
m.children.push({
key: btn.uuid,
title: btn.label,
})
})
- item.cols && item.cols.forEach(col => {
- if (col.type !== 'action') return
- col.elements.forEach(btn => {
- if (btn.hidden === 'true') return
-
- m.children.push({
- key: btn.uuid,
- title: btn.label,
- })
+ let loopCol = (cols) => {
+ cols.forEach(col => {
+ if (col.type === 'colspan') {
+ loopCol(col.subcols)
+ } else if (col.type === 'custom') {
+ col.elements.forEach(cell => {
+ if (cell.eleType !== 'button' || cell.hidden === 'true' || cell.permission === 'false') return
+ m.children.push({
+ key: cell.uuid,
+ title: cell.label,
+ })
+ })
+ }
})
- })
+ }
+ loopCol(item.cols)
}
list.push(m)
@@ -1181,8 +1249,6 @@
})
}
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]) {
@@ -1192,8 +1258,6 @@
if (item.subtype === 'dualdatacard') {
card.backElements && card.backElements.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]) {
@@ -1204,8 +1268,6 @@
})
} else if (item.type === 'balcony') {
item.elements && item.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]) {
@@ -1226,16 +1288,22 @@
menus.push(menuObj[btn.openmenu])
}
})
- item.cols && item.cols.forEach(col => {
- if (col.type !== 'action') return
- col.elements.forEach(btn => {
- if (btn.linkmenu && menuObj[btn.linkmenu]) {
- menus.push(menuObj[btn.linkmenu])
- } else if (btn.openmenu && menuObj[btn.openmenu]) {
- menus.push(menuObj[btn.openmenu])
+ let loopCol = (cols) => {
+ cols.forEach(col => {
+ if (col.type === 'colspan') {
+ loopCol(col.subcols)
+ } else if (col.type === 'custom') {
+ col.elements.forEach(cell => {
+ if (cell.linkmenu && menuObj[cell.linkmenu]) {
+ menus.push(menuObj[cell.linkmenu])
+ } else if (cell.openmenu && menuObj[cell.openmenu]) {
+ menus.push(menuObj[cell.openmenu])
+ }
+ })
}
})
- })
+ }
+ loopCol(item.cols)
}
})
}
@@ -1257,6 +1325,7 @@
let traversal = (components) => {
return components.map(item => {
+ item.miniStyle = ''
if (item.style) {
item.miniStyle = this.transferStyle(item.style)
}
@@ -1272,12 +1341,18 @@
}
if (item.type === 'tabs') {
+ if (item.setting.backgroundColor) {
+ item.miniStyle += `--tabs-header-background: ${item.setting.backgroundColor};`
+ }
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)) {
+ if (item.wrap.display === 'hidden') {
+ item.miniStyle += 'display:none;'
+ }
item.subcards.forEach(card => {
card.miniStyle = this.transferStyle(card.style)
card.elements = card.elements.map(cell => {
@@ -1299,7 +1374,7 @@
return cols.map(col => {
if (col.type === 'colspan') {
col.subcols = getCols(col.subcols || [])
- } else if (col.type === 'custom' || col.type === 'action') {
+ } else if (col.type === 'custom') {
col.elements = col.elements.map(cell => {
cell.miniStyle = this.transferStyle(cell.style)
return cell
@@ -1377,6 +1452,18 @@
activeKey: 'basedata'
})
return
+ } else if (this.checklog()) {
+ if ((sessionStorage.getItem('applangList') && !config.trans) || (adapters.includes('wxmini') && !config.hasOwnProperty('miniStyle'))) {
+
+ } else {
+ notification.success({
+ top: 92,
+ message: '褰撳墠閰嶇疆鏈慨鏀癸紝鏃犻渶淇濆瓨銆�',
+ duration: 5
+ })
+ MKEmitter.emit('completeSave')
+ return
+ }
}
this.setState({
@@ -1384,8 +1471,14 @@
})
setTimeout(() => {
- if (config.enabled && this.verifyConfig()) {
+ let _pass = this.verifyConfig(config)
+
+ if (config.enabled && !_pass) {
config.enabled = false
+ config.force = true
+ } else if (!config.enabled && config.force && _pass) {
+ config.enabled = true
+ delete config.force
}
if (config.cacheUseful !== 'true') {
@@ -1430,7 +1523,7 @@
typename: sessionStorage.getItem('typename') || '',
adapter: sessionStorage.getItem('adapter') || '',
sysBgColor: sessionStorage.getItem('sysBgColor') || '',
- MenuName: config.MenuName || '',
+ MenuName: config.MenuName || ''
}
url = window.btoa(window.encodeURIComponent(JSON.stringify(urlparam)))
@@ -1441,6 +1534,9 @@
roleParam.pass = true
}
+ delete config.miniTitle
+ delete config.miniReloadUp
+
config.components.forEach(item => {
if (item.type === 'login') {
roleParam.login = true
@@ -1448,6 +1544,13 @@
config.loginview = true
} else if (item.type === 'navbar') {
config.tabview = true
+ } else if (item.type === 'topbar' && adapters.includes('wxmini')) {
+ if (item.wrap.minishow !== 'true') {
+ config.miniTitle = item.wrap.title || ''
+ }
+ if (item.wrap.reload === 'true') {
+ config.miniReloadUp = true
+ }
}
})
@@ -1472,6 +1575,10 @@
let menus_used_list = subMenus.map(m => `'${config.uuid}','${config.MenuName || ''}','${config.MenuNo || ''}','${m.MenuID}','${m.MenuName}'`).join(';')
menus_used_list = window.btoa(window.encodeURIComponent(menus_used_list || 'del'))
+ let interfaces = getFuncsAndInters(config)
+ roleParam.interfaces = interfaces
+ let langSql = getLangTrans(config)
+
let param = {
func: 'sPC_TrdMenu_AddUpt',
FstID: 'mk_app',
@@ -1484,15 +1591,19 @@
TypeCharOne: sessionStorage.getItem('kei_no'),
Typename: sessionStorage.getItem('typename'),
MenuName: config.MenuName || '',
- PageParam: JSON.stringify({Template: 'webPage'}),
+ PageParam: JSON.stringify({Template: 'webPage', interfaces}),
open_edition: config.open_edition,
menus_rolelist: window.btoa(window.encodeURIComponent(JSON.stringify(roleParam))),
- LText: '',
- LTexttb: '',
+ // LText: '',
+ // LTexttb: '',
menus_used_list,
debug_md5: key,
debug_url: url,
debug_list: window.btoa(tbs)
+ }
+
+ if (langSql) {
+ param.lang_translation = window.btoa(window.encodeURIComponent(langSql))
}
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
@@ -1556,15 +1667,15 @@
PageParam: JSON.stringify({Template: NavBar.type}),
open_edition: _item ? (_item.open_edition || '') : '',
menus_rolelist: window.btoa(window.encodeURIComponent(JSON.stringify(roles))),
- LText: '',
- LTexttb: ''
+ // LText: '',
+ // LTexttb: ''
}
_param.LongParam = window.btoa(window.encodeURIComponent(JSON.stringify(NavBar)))
_param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
_param.secretkey = Utils.encrypt('', _param.timestamp)
- Api.getSystemConfig(_param).then(res => {
+ Api.getCloudConfig(_param).then(res => {
if (res.status) {
NavBar.open_edition = res.open_edition || ''
window.GLOB.CacheIndependent.set(NavBar.uuid, fromJS(NavBar).toJS())
@@ -1598,18 +1709,18 @@
let kparam = {
func: 's_kei_link_keyids_addupt',
BID: sessionStorage.getItem('appId'),
- exec_type: 'y',
+ exec_type: 'x',
LText: ''
}
kparam.LText = _appViewList.map(item => `select '${item.keys_id}','${item.keys_type}','${item.kei_no}','${item.appkey}','${item.bid}','${sessionStorage.getItem('CloudUserID')}','${item.remark}'`)
kparam.LText = kparam.LText.join(' union all ')
- kparam.LText = Utils.formatOptions(kparam.LText)
+ kparam.LText = Utils.formatOptions(kparam.LText, 'x')
kparam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
kparam.secretkey = Utils.encrypt('', kparam.timestamp)
- Api.getSystemConfig(kparam).then(result => {
+ Api.getCloudConfig(kparam).then(result => {
if (result.status) {
sessionStorage.setItem('appViewList', viewList)
}
@@ -1628,7 +1739,7 @@
}).then(res => { // 椤甸潰淇濆瓨
if (!res || !res.status) return res
- return Api.getSystemConfig(param)
+ return Api.getCloudConfig(param)
}).then(res => {
this.setState({
menuloading: false
@@ -1652,14 +1763,14 @@
message: '淇濆瓨鎴愬姛',
duration: 2
})
- MKEmitter.emit('completeSave')
} else {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
+ Modal.warning({
+ width: 400,
+ title: res.message,
+ okText: '鐭ラ亾浜�'
})
}
+ MKEmitter.emit('completeSave')
}, this.netError)
}, 300 + (+sessionStorage.getItem('mkDelay')))
}
@@ -1668,6 +1779,7 @@
this.setState({
menuloading: false
})
+
if (!error) {
notification.warning({
top: 92,
@@ -1675,12 +1787,13 @@
duration: 5
})
}
+ MKEmitter.emit('completeSave')
}
getRoleFields = () => {
if (sessionStorage.getItem('sysRoles')) return
- Api.getSystemConfig({func: 'sPC_Get_Roles_sModular'}).then(res => {
+ Api.getCloudConfig({func: 'sPC_Get_Roles_sModular'}).then(res => {
if (res.status) {
let _permFuncField = []
let _sysRoles = []
@@ -1713,17 +1826,22 @@
onEnabledChange = () => {
const { config } = this.state
- if (!config || (!config.enabled && this.verifyConfig(true))) {
- return
- }
+ let _config = {...config, enabled: !config.enabled}
- this.setState({
- config: {...config, enabled: !config.enabled}
- })
+ delete _config.force
+
+ if (!_config.enabled) {
+ this.setState({
+ config: _config
+ })
+ } else if (this.verifyConfig(_config)) {
+ this.setState({
+ config: _config
+ })
+ }
}
- verifyConfig = (show) => {
- const { config } = this.state
+ verifyConfig = (config) => {
let error = ''
let searchSum = 0
let swipes = []
@@ -1790,7 +1908,7 @@
}
}
- if (show && error) {
+ if (config.enabled && error) {
notification.warning({
top: 92,
message: error,
@@ -1798,7 +1916,7 @@
})
}
- return error
+ return error === ''
}
// 鏇存柊閰嶇疆淇℃伅
@@ -1813,69 +1931,14 @@
insert = (item) => {
let config = fromJS(this.state.config).toJS()
- if (item.type === 'search') {
- if (config.components.filter(card => card.type === 'topbar' && card.wrap.type !== 'navbar').length > 0) {
- notification.warning({
- top: 92,
- message: '瀵艰埅鏍忎娇鐢ㄤ簡鎼滅储锛屼笉鍙坊鍔犳悳绱㈢粍浠讹紒',
- duration: 5
- })
- return
- }
- if (config.components.filter(card => card.type === 'search').length > 0) {
- notification.warning({
- top: 92,
- message: '鎼滅储鏉′欢涓嶅彲閲嶅娣诲姞锛�',
- duration: 5
- })
- return
- }
- }
-
- if (item.type === 'topbar') {
- if (config.components.findIndex(m => m.type === 'topbar') > -1) {
- notification.warning({
- top: 92,
- message: '瀵艰埅鏍忎笉鍙噸澶嶆坊鍔狅紒',
- duration: 5
- })
- return
- }
- if (!config.style.paddingTop) {
- config.style.paddingTop = '50px'
- }
+ if (item.type === 'topbar' && !config.style.paddingTop) {
+ config.style.paddingTop = '50px'
}
config.components.push(item)
this.setState({config})
window.GLOB.customMenu = config
-
- notification.success({
- top: 92,
- message: '绮樿创鎴愬姛锛�',
- duration: 2
- })
- }
-
- refreshView = () => {
- const { oriConfig, config } = this.state
-
- if (!is(fromJS(oriConfig || {}), fromJS(config || {}))) {
- notification.warning({
- top: 92,
- message: '閰嶇疆淇℃伅鏈繚瀛橈紒',
- duration: 5
- })
- return
- }
-
- sessionStorage.removeItem('sysRoles')
- sessionStorage.removeItem('permFuncField')
- sessionStorage.removeItem('app_videos')
- sessionStorage.removeItem('app_pictures')
-
- window.location.reload()
}
setHomeView = () => {
@@ -1893,7 +1956,7 @@
let param = {
func: 's_kei_link_keyids_addupt',
BID: sessionStorage.getItem('appId'),
- exec_type: 'y',
+ exec_type: 'x',
LText: ''
}
@@ -1912,16 +1975,18 @@
param.LText = appViewList.map(item => `select '${item.keys_id}','${item.keys_type}','${item.kei_no}','${item.appkey}','${item.bid}','${sessionStorage.getItem('CloudUserID')}','${item.remark}'`)
param.LText = param.LText.join(' union all ')
- param.LText = Utils.formatOptions(param.LText)
+ param.LText = Utils.formatOptions(param.LText, 'x')
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
+
+ const that = this
confirm({
title: '纭畾璁剧疆鏈〉闈负棣栭〉鍚楋紵',
content: '',
onOk() {
- Api.getSystemConfig(param).then(result => {
+ Api.getCloudConfig(param).then(result => {
if (!result.status) {
notification.warning({
top: 92,
@@ -1930,6 +1995,10 @@
})
} else {
sessionStorage.setItem('appViewList', JSON.stringify(appViewList))
+
+ that.setState({
+ appHomeId: config.MenuID
+ })
}
})
},
@@ -1952,7 +2021,7 @@
let param = {
func: 's_kei_link_keyids_addupt',
BID: sessionStorage.getItem('appId'),
- exec_type: 'y',
+ exec_type: 'x',
LText: ''
}
@@ -1971,18 +2040,19 @@
param.LText = appViewList.map(item => `select '${item.keys_id}','${item.keys_type}','${item.kei_no}','${item.appkey}','${item.bid}','${sessionStorage.getItem('CloudUserID')}','${item.remark}'`)
param.LText = param.LText.join(' union all ')
- param.LText = Utils.formatOptions(param.LText)
+ param.LText = Utils.formatOptions(param.LText, 'x')
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
let hasLogin = config.components.findIndex(item => item.type === 'login') > -1
+ const that = this
confirm({
title: '纭畾璁剧疆鏈〉闈负鐧诲綍椤靛悧锛�',
content: hasLogin ? '' : '褰撳墠椤甸潰灏氭湭娣诲姞鐧诲綍缁勪欢銆�',
onOk() {
- Api.getSystemConfig(param).then(result => {
+ Api.getCloudConfig(param).then(result => {
if (!result.status) {
notification.warning({
top: 92,
@@ -1991,6 +2061,10 @@
})
} else {
sessionStorage.setItem('appViewList', JSON.stringify(appViewList))
+
+ that.setState({
+ appLoginId: config.MenuID
+ })
}
})
},
@@ -2033,27 +2107,46 @@
window.GLOB.customMenu = config
}
+ checklog = () => {
+ const { oriConfig, config } = this.state
+
+ return is(fromJS(oriConfig), fromJS(config))
+ }
+
+ updateLogConfig = (config) => {
+ config.open_edition = this.state.config.open_edition || ''
+
+ this.setState({
+ config: null
+ }, () => {
+ this.setState({
+ config: config
+ })
+ })
+
+ window.GLOB.customMenu = config
+ }
+
render () {
- const { view, viewType, comloading, loading, settingshow, controlshow, activeKey, MenuId, config, menuloading, adapters, eyeopen, needUpdate } = this.state
+ const { view, viewType, comloading, loading, settingshow, controlshow, activeKey, MenuId, config, menuloading, adapters, eyeopen, needUpdate, appLoginId, appHomeId } = this.state
return (
- <ConfigProvider locale={antdZhCN}>
- <div className={'mk-mob-view ' + viewType} id="mk-mob-design-view">
- <Header/>
- {loading ? <Spin className="view-spin" size="large" /> : null}
- <DndProvider backend={HTML5Backend}>
- {view !== 'popview' ? <><div className={'menu-setting ' + (!settingshow ? 'hidden' : '')}>
- <div className="draw">
- {settingshow ? <DoubleLeftOutlined onClick={() => {this.setState({settingshow: false})}} /> : null}
- {!settingshow ? <DoubleRightOutlined onClick={() => {this.setState({settingshow: true})}} /> : null}
- </div>
- <div className="pc-setting-tools">
- <Collapse accordion activeKey={activeKey} bordered={false} onChange={(key) => this.setState({activeKey: key})}>
- {/* 鍩烘湰淇℃伅 */}
- <Panel header="鍩烘湰淇℃伅" forceRender className="basedata" key="basedata">
- {/* 鑿滃崟淇℃伅 */}
- {config ? <MenuForm
+ <div className={'mk-mob-view ' + viewType} id="mk-mob-design-view">
+ <Header/>
+ {loading ? <Spin className="view-spin" size="large" /> : null}
+ <DndProvider backend={HTML5Backend}>
+ {view !== 'popview' ? <><div className={'menu-setting ' + (!settingshow ? 'hidden' : '')}>
+ <div className="draw">
+ {settingshow ? <DoubleLeftOutlined onClick={() => {this.setState({settingshow: false})}} /> : null}
+ {!settingshow ? <DoubleRightOutlined onClick={() => {this.setState({settingshow: true})}} /> : null}
+ </div>
+ <div className="pc-setting-tools">
+ <Collapse accordion activeKey={activeKey} bordered={false} onChange={(key) => this.setState({activeKey: key})}>
+ {/* 鍩烘湰淇℃伅 */}
+ <Panel header="鍩烘湰淇℃伅" forceRender className="basedata" key="basedata">
+ {config ? <>
+ <MenuForm
config={config}
MenuId={MenuId}
adapters={adapters}
@@ -2063,66 +2156,66 @@
this.changeView(con.direction)
}
}}
- /> : null}
- {config ? <UrlFieldComponent config={config} updateConfig={this.updateConfig}/> : null}
+ />
+ <UrlFieldComponent config={config} updateConfig={this.updateConfig}/>
{/* 琛ㄥ悕娣诲姞 */}
- {config ? <TableComponent config={config} updatetable={this.updateConfig}/> : null}
- {config ? <Paragraph style={{padding: '15px 0px 0px 18px'}} copyable={{ text: MenuId }}>鑿滃崟ID</Paragraph> : null}
- {config ? <Paragraph style={{padding: '10px 0px 0px 18px'}} copyable={{ text: `${window.GLOB.baseurl}mob/index.html#/index/${sessionStorage.getItem('kei_no')}/${sessionStorage.getItem('typename')}/${sessionStorage.getItem('lang')}/${MenuId}/@BID@` }}>鑿滃崟閾炬帴</Paragraph> : null}
- {config ? <NormalCss config={config} updateConfig={this.updateConfig}/> : null}
- </Panel>
- {/* 缁勪欢娣诲姞 */}
- <Panel header="缁勪欢" className="component" key="component">
- <SourceWrap />
- </Panel>
- <Panel header="鍏冪礌" key="element">
- <Modulecell />
- </Panel>
- <Panel header="椤甸潰鏍峰紡" key="background">
- {config ? <BgController config={config} updateConfig={this.updateConfig} /> : null}
- </Panel>
- </Collapse>
- </div>
+ <TableComponent config={config} updatetable={this.updateConfig}/>
+ <Paragraph style={{padding: '15px 0px 0px 18px'}} copyable={{ text: MenuId }}>鑿滃崟ID</Paragraph>
+ <Paragraph style={{padding: '10px 0px 0px 18px'}} copyable={{ text: `${window.GLOB.baseurl}mob/index.html#/index/${sessionStorage.getItem('kei_no')}/${sessionStorage.getItem('typename')}/${sessionStorage.getItem('lang')}/${MenuId}/@BID@` }}>鑿滃崟閾炬帴</Paragraph>
+ <NormalCss config={config} updateConfig={this.updateConfig}/>
+ </> : null}
+ </Panel>
+ {/* 缁勪欢娣诲姞 */}
+ <Panel header="缁勪欢" className="component" key="component">
+ <SourceWrap />
+ </Panel>
+ <Panel header="鍏冪礌" key="element">
+ <Modulecell />
+ </Panel>
+ <Panel header="椤甸潰鏍峰紡" key="background">
+ {config ? <BgController config={config} updateConfig={this.updateConfig} /> : null}
+ </Panel>
+ </Collapse>
</div>
- <div className={'menu-control' + (!controlshow ? ' hidden' : '')}>
- <div className="draw">
- {controlshow ? <DoubleRightOutlined onClick={() => {this.setState({controlshow: false})}}/> : null}
- {!controlshow ? <DoubleLeftOutlined onClick={() => {this.setState({controlshow: true})}}/> : null}
- </div>
- <div className="wrap">
- <Button type="primary" className={needUpdate ? 'update-tip' : ''} onClick={this.submitConfig} id="save-config" loading={menuloading}>淇濆瓨</Button>
- <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>
- <CreateView resetmenu={this.getAppMenus} />
- <PasteController insert={this.insert} />
- <TableNodes config={config} />
- <ViewNodes config={config} MenuId={MenuId}/>
- <SysInterface config={config} updateConfig={this.updateConfig}/>
- <PictureController/>
- <Quotecomponent config={config} updateConfig={this.updateConfig}/>
- <StyleCombControlButton menu={config} />
- <Button className="mk-border-green set-home" onClick={this.setHomeView}><HomeOutlined /> 璁句负棣栭〉</Button>
- <Button className="mk-border-purple set-login" onClick={this.setLoginView}><LoginOutlined /> 璁句负鐧诲綍椤�</Button>
- <ReplaceField type="custom" config={config} updateConfig={this.resetConfig}/>
- <Transfer MenuID={MenuId} />
- <Versions MenuId={MenuId} open_edition={config ? config.open_edition : ''}/>
- <Button className="mk-border-danger" onClick={this.refreshView}><RedoOutlined /> 寮哄埗鍒锋柊</Button>
- <Button type="default" onClick={this.closeView}>鍏抽棴</Button>
- </div>
+ </div>
+ <div className={'menu-control' + (!controlshow ? ' hidden' : '')}>
+ <div className="draw">
+ {controlshow ? <DoubleRightOutlined onClick={() => {this.setState({controlshow: false})}}/> : null}
+ {!controlshow ? <DoubleLeftOutlined onClick={() => {this.setState({controlshow: true})}}/> : null}
</div>
- <div className={'menu-body menu-view' + (menuloading ? ' saving' : '') + (eyeopen ? ' eye-open' : '')}>
- {config && !comloading ? <div className="mob-shell" style={{width: window.GLOB.shellWidth, height: window.GLOB.shellHeight}}>
- <MobShell menu={config} handleList={this.updateConfig} />
- </div> : null}
- </div></> : <PopView btn={this.state.popConfig} save={this.submitPopConfig} cancel={this.closePop}/>}
- </DndProvider>
- <StyleController />
- <StyleCombController />
- <ModalController />
- <SearchController />
- </div>
- </ConfigProvider>
+ <div className="wrap">
+ <Button type="primary" className={needUpdate ? 'update-tip' : ''} onClick={this.submitConfig} id="save-config" loading={menuloading}>淇濆瓨</Button>
+ {config ? <Switch className="big" checkedChildren="鍚�" unCheckedChildren="鍋�" checked={config.enabled} onChange={this.onEnabledChange} /> : null}
+ <ArrowLeftOutlined title="鍚庨��" className="back-view" onClick={this.backView}/>
+ {config ? <Debug config={config}/> : null}
+ <Button className="mk-border-purple" onClick={() => this.setState({eyeopen: !eyeopen})}>{!eyeopen ? <EyeOutlined /> : <EyeInvisibleOutlined />} 缁勪欢鍚�</Button>
+ <CreateView resetmenu={this.getAppMenus} />
+ <PasteController insert={this.insert} />
+ <TableNodes config={config} />
+ <ViewNodes config={config} MenuId={MenuId}/>
+ <SysInterface config={config} updateConfig={this.updateConfig}/>
+ <PictureController/>
+ <Quotecomponent config={config} updateConfig={this.updateConfig}/>
+ <StyleCombControlButton menu={config} />
+ <Button className="mk-border-green set-home" disabled={MenuId === appHomeId} onClick={this.setHomeView}><HomeOutlined /> 璁句负棣栭〉</Button>
+ <Button className="mk-border-purple" disabled={MenuId === appLoginId} onClick={this.setLoginView}><LoginOutlined /> 璁句负鐧诲綍椤�</Button>
+ <ReplaceField type="custom" config={config} updateConfig={this.resetConfig}/>
+ <Transfer MenuID={MenuId} />
+ {config ? <Versions MenuId={MenuId} Template="webPage" checklog={this.checklog} updateConfig={this.updateLogConfig}/> : null}
+ <Button type="default" onClick={this.closeView}>鍏抽棴</Button>
+ </div>
+ </div>
+ <div className={'menu-body menu-view' + (menuloading ? ' saving' : '') + (eyeopen ? ' eye-open' : '')}>
+ {config && !comloading ? <div className="mob-shell" style={{width: window.GLOB.shellWidth, height: window.GLOB.shellHeight}}>
+ <MobShell menu={config} handleList={this.updateConfig} />
+ </div> : null}
+ </div></> : <PopView btn={this.state.popConfig} save={this.submitPopConfig} cancel={this.closePop}/>}
+ </DndProvider>
+ <StyleController />
+ <StyleCombController />
+ <ModalController />
+ <SearchController />
+ </div>
)
}
}
--
Gitblit v1.8.0