From 295b93984fd94a11d0337637f76ff91b5a618215 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 24 四月 2023 09:49:26 +0800
Subject: [PATCH] 2023-04-24
---
src/views/pcdesign/index.jsx | 1560 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 804 insertions(+), 756 deletions(-)
diff --git a/src/views/pcdesign/index.jsx b/src/views/pcdesign/index.jsx
index 8649210..b6b2760 100644
--- a/src/views/pcdesign/index.jsx
+++ b/src/views/pcdesign/index.jsx
@@ -1,23 +1,22 @@
import React, { Component } from 'react'
-import { connect } from 'react-redux'
import { DndProvider } from 'react-dnd'
import { withRouter } from 'react-router'
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, Typography } from 'antd'
-import { DoubleLeftOutlined, DoubleRightOutlined, HomeOutlined, LoginOutlined, RedoOutlined } from '@ant-design/icons'
+import { DoubleLeftOutlined, DoubleRightOutlined, HomeOutlined, LoginOutlined, RedoOutlined, 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 zhCN from '@/locales/zh-CN/mob.js'
-import enUS from '@/locales/en-US/mob.js'
-import antdEnUS from 'antd/es/locale/en_US'
+import { getTables } from '@/utils/utils-custom.js'
import antdZhCN from 'antd/es/locale/zh_CN'
import MKEmitter from '@/utils/events.js'
import MenuUtils from '@/utils/utils-custom.js'
import asyncComponent from '@/utils/asyncComponent'
+import '@/assets/css/design.scss'
import './index.scss'
const { Panel } = Collapse
@@ -25,17 +24,22 @@
const { Paragraph } = Typography
const MenuForm = asyncComponent(() => import('./menuform'))
+const Header = asyncComponent(() => import('@/menu/header'))
+const PopView = asyncComponent(() => import('@/views/menudesign/popview'))
const Transfer = asyncComponent(() => import('@/pc/transfer'))
-const PopviewController = asyncComponent(() => import('@/menu/popview'))
const Versions = asyncComponent(() => import('@/menu/versions'))
const MenuShell = asyncComponent(() => import('@/pc/menushell'))
+const ViewNodes = asyncComponent(() => import('@/menu/viewnodes'))
const SourceWrap = asyncComponent(() => import('@/pc/modulesource'))
+const Modulecell = asyncComponent(() => import('@/menu/modulecell'))
+const TableNodes = asyncComponent(() => import('@/menu/tablenodes'))
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 NormalCss = asyncComponent(() => import('@/menu/normalCss'))
const SysInterface = asyncComponent(() => import('@/menu/sysinterface'))
const UrlFieldComponent = asyncComponent(() => import('@/menu/urlfieldcomponent'))
const PictureController = asyncComponent(() => import('@/menu/picturecontroller'))
@@ -45,56 +49,52 @@
const TableComponent = asyncComponent(() => import('@/templates/sharecomponent/tablecomponent'))
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 // 淇濆瓨鑿滃崟淇℃伅
+
+const memberLevel = Utils.getMemberLevel()
class MenuDesign extends Component {
state = {
- localedict: sessionStorage.getItem('lang') !== 'en-US' ? antdZhCN : antdEnUS,
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
loading: true,
MenuId: '',
MenuName: '',
MenuNo: '',
- delButtons: [],
- copyButtons: [],
- thawButtons: [],
activeKey: 'basedata',
menuloading: false,
oriConfig: null,
config: null,
- popBtn: null, // 寮圭獥鏍囩椤�
- visible: false,
- customComponents: [],
settingshow: sessionStorage.getItem('settingshow') !== 'false',
controlshow: sessionStorage.getItem('controlshow') !== 'false',
- comloading: false
+ comloading: false,
+ eyeopen: false,
+ view: '',
+ popConfig: null,
+ needUpdate: false
}
UNSAFE_componentWillMount() {
- if (this.props.memberLevel < 30) return
+ if (memberLevel < 30) return
+
+ sessionStorage.setItem('editMenuType', 'menu') // 缂栬緫鑿滃崟绫诲瀷
+
+ window.GLOB.TabsMap = new Map() // 缂撳瓨鐢ㄦ埛鎿嶄綔鐨勬爣绛鹃〉
+ window.GLOB.CacheIndependent = new Map()
+ window.GLOB.urlFields = [] // url鍙橀噺
+ window.GLOB.customMenu = null // 淇濆瓨鑿滃崟淇℃伅
+
try {
let param = JSON.parse(window.decodeURIComponent(window.atob(this.props.match.params.param)))
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('role_type', param.role_type || '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(param.MenuID)
} else if (param.type === 'view') {
this.setState({
@@ -123,24 +123,75 @@
}
componentDidMount () {
- if (this.props.memberLevel < 30) {
+ if (memberLevel < 30) {
document.getElementById('mk-pc-design-view').innerHTML = '<div style="text-align: center; font-size: 30px; margin-top: 40vh; height: 100vh; background: #fff;">鏈簲鐢ㄦ病鏈塒C绔〉闈㈢殑缂栬緫鏉冮檺锛岃鑱旂郴绠＄悊鍛橈紒</div>'
return
}
- MKEmitter.addListener('delButtons', this.delButtons)
- MKEmitter.addListener('thawButtons', this.thawButtons)
- 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()
+ this.getRoleFields()
setGLOBFuncs()
}, 1000)
+
+ document.onkeydown = (event) => {
+ let e = event || window.event
+ let keyCode = e.keyCode || e.which || e.charCode
+ let preKey = ''
+
+ if (e.ctrlKey) {
+ preKey = 'ctrl'
+ }
+ if (e.shiftKey) {
+ preKey = 'shift'
+ } else if (e.altKey) {
+ preKey = 'alt'
+ }
+
+ if (!preKey || !keyCode) return
+
+ let _shortcut = `${preKey}+${keyCode}`
+
+ if (_shortcut === 'ctrl+83') {
+ let modals = document.querySelectorAll('.mk-pop-modal')
+ let msg = null
+ for (let i = 0; i < modals.length; i++) {
+ if (msg) {
+ break
+ }
+
+ let node = modals[i].querySelector('.mk-com-name')
+
+ if (node) {
+ msg = node.innerText
+ }
+ }
+ if (msg) {
+ notification.warning({
+ top: 92,
+ message: '璇蜂繚瀛�' + msg,
+ duration: 5
+ })
+ return false
+ }
+
+ let node = document.getElementById('save-modal-config')
+ if (!node) {
+ node = document.getElementById('save-pop-config')
+ }
+ if (!node) {
+ node = document.getElementById('save-config')
+ }
+
+ if (node) {
+ node.click()
+ }
+ return false
+ }
+ }
}
/**
@@ -150,18 +201,13 @@
this.setState = () => {
return
}
- MKEmitter.removeListener('delButtons', this.delButtons)
- MKEmitter.removeListener('thawButtons', this.thawButtons)
- 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
+ if (this.state.view === 'popview') return
this.submitConfig()
}
@@ -181,10 +227,11 @@
let param = {
MenuID: menu.MenuID,
copyMenuId: menu.copyMenuId || '',
+ clearMenu: menu.clearMenu !== 'false',
type: 'view'
}
- param.MenuNo = menu.MenuNo || ''
+ // param.MenuNo = menu.MenuNo || ''
param.MenuName = menu.MenuName || ''
param = window.btoa(window.encodeURIComponent(JSON.stringify(param)))
@@ -211,9 +258,9 @@
return
}
- let homeId = MenuID || ''
+ let homeId = ''
let appViewList = []
- if (!homeId && res.data && res.data.length > 0) {
+ if (res.data && res.data.length > 0) {
appViewList = res.data
appViewList.forEach(item => {
if (item.keys_type === 'index') {
@@ -223,7 +270,7 @@
}
if (!homeId) {
- homeId = Utils.getuuid()
+ homeId = MenuID || Utils.getuuid()
let param = {
func: 's_kei_link_keyids_addupt',
@@ -262,205 +309,152 @@
})
} else {
sessionStorage.setItem('appViewList', JSON.stringify(appViewList))
- this.props.history.replace('/pcdesign/' + window.btoa(window.encodeURIComponent(JSON.stringify({MenuID: homeId, type: 'view'}))))
+ this.props.history.replace('/pcdesign/' + window.btoa(window.encodeURIComponent(JSON.stringify({MenuID: MenuID || homeId, type: 'view'}))))
}
- })
- }
-
- getSmStemp = () => {
- 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)
-
- let param = {
- func: 'sPC_Get_SelectedList',
- LText: _sql,
- obj_name: 'data',
- arr_field: 'ID,TemplateCode,SignName'
- }
-
- param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
- param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp) // 浜戠鏁版嵁楠岃瘉
-
- Api.getSystemConfig(param).then(res => {
- let msgs = []
- if (!res.status) {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
- })
- } else if (res.data) {
- msgs = res.data
- }
- sessionStorage.setItem('msgTemplate', JSON.stringify(msgs))
})
}
getAppPictures = () => {
- if (sessionStorage.getItem('app_videos') || sessionStorage.getItem('app_pictures')) return
-
- Api.getSystemConfig({
+ if (sessionStorage.getItem('app_pictures')) return
+
+ let deffers = []
+ let param = {
func: 's_url_db_adduptdel',
PageIndex: 0, // 0 浠ｈ〃鍏ㄩ儴
PageSize: 0, // 0 浠ｈ〃鍏ㄩ儴
- typecharone: 'image',
type: 'search'
- }).then(res => {
- if (res.status) {
- sessionStorage.setItem('app_pictures', JSON.stringify(res.data || []))
- } else if (!res.status) {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
+ }
+ deffers = [new Promise(resolve => {
+ setTimeout(() => {
+ Api.getSystemConfig({...param, typecharone: 'image'}).then(res => {
+ resolve(res.data)
})
- }
-
- Api.getSystemConfig({
- func: 's_url_db_adduptdel',
- PageIndex: 0, // 0 浠ｈ〃鍏ㄩ儴
- PageSize: 0, // 0 浠ｈ〃鍏ㄩ儴
- typecharone: 'video',
- type: 'search'
- }).then(res => {
- if (res.status) {
- sessionStorage.setItem('app_videos', JSON.stringify(res.data || []))
- } else if (!res.status) {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
- })
- }
- })
- Api.getSystemConfig({
- func: 's_url_db_adduptdel',
- PageIndex: 0, // 0 浠ｈ〃鍏ㄩ儴
- PageSize: 0, // 0 浠ｈ〃鍏ㄩ儴
- typecharone: 'color',
- type: 'search'
- }).then(res => {
- if (res.status) {
- sessionStorage.setItem('app_colors', JSON.stringify(res.data || []))
- } else if (!res.status) {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
- })
- }
- })
- })
- }
-
- updateCustomComponent = () => {
- Api.getSystemConfig({
- func: 's_get_custom_components',
- typename: 'pc',
- typecharone: ''
- }).then(res => {
- let coms = []
- if (!res.status) {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
+ }, 500)
+ }), new Promise(resolve => {
+ setTimeout(() => {
+ Api.getSystemConfig({...param, typecharone: 'video'}).then(res => {
+ resolve(res.data)
})
- } else if (res.cus_list && res.cus_list.length > 0) {
- res.cus_list.forEach(item => {
- let config = ''
-
- try {
- config = JSON.parse(window.decodeURIComponent(window.atob(item.long_param)))
- } catch (e) {
- console.warn('Parse Failure')
- config = ''
- }
-
- if (!config || !item.c_name) return
-
- window.GLOB.UserComponentMap.set(item.c_id, item.c_name)
- coms.push({
- uuid: item.c_id,
- type: 'menu',
- title: item.c_name,
- url: item.images,
- component: config.type,
- subtype: config.subtype,
- width: config.width || 24,
- config
- })
+ }, 1000)
+ }), new Promise(resolve => {
+ setTimeout(() => {
+ Api.getSystemConfig({...param, typecharone: 'color'}).then(res => {
+ resolve(res.data)
})
- }
- this.setState({customComponents: coms})
- this.getRoleFields()
+ }, 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] || []))
})
- }
-
- 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
-
- if (config.uuid !== parentId) return
-
- let components = config.components.map(item => {
- if (keys.includes(item.uuid)) {
- item.style = {...item.style, ...style}
- }
- return item
- })
-
- this.setState({
- config: {...config, components},
- comloading: true
- }, () => {
- this.setState({
- comloading: false
- })
- })
- }
-
- delButtons = (items) => {
- this.setState({ delButtons: [...this.state.delButtons, ...items] })
- }
-
- copyButtons = (items) => {
- this.setState({copyButtons: [...this.state.copyButtons, ...items]})
- }
-
- thawButtons = (item) => {
- this.setState({thawButtons: [...this.state.thawButtons, item]})
}
initPopview = (card, btn) => {
- const { oriConfig, config } = this.state
+ const { config } = this.state
- if (!oriConfig || !is(fromJS(oriConfig), fromJS(config))) {
- notification.warning({
- top: 92,
- message: '閰嶇疆淇℃伅鏈繚瀛橈紒',
- duration: 5
- })
+ if (!this.checkBase()) {
return
}
- btn.config = fromJS(config).toJS()
- btn.component = card
+ let _btn = fromJS(btn).toJS()
- sessionStorage.setItem('editMenuType', 'popview') // 缂栬緫寮圭獥鏍囩
+ if (_btn.config) {
+ _btn.config.uuid = _btn.uuid
+ _btn.config.MenuID = _btn.uuid
+ _btn.config.ParentId = card.uuid
+ _btn.config.MenuName = _btn.label
+ } else {
+ _btn.config = {
+ uuid: _btn.uuid,
+ MenuID: _btn.uuid,
+ ParentId: card.uuid,
+ enabled: false,
+ MenuName: _btn.label,
+ tables: config.tables || [],
+ Template: 'CustomPage',
+ components: [],
+ viewType: 'popview',
+ style: { backgroundColor: '#ffffff', backgroundImage: '', paddingTop: '16px', paddingBottom: '40px', paddingLeft: '16px', paddingRight: '16px' }
+ }
+ }
- this.setState({popBtn: btn, visible: true})
+ this.setState({view: 'popview', popConfig: _btn})
+ }
+
+ submitPopConfig = (btnconfig) => {
+ let parents = {[btnconfig.ParentId]: true}
+ let popbtns = {[btnconfig.uuid]: fromJS(btnconfig).toJS()}
+ let config = fromJS(this.state.config).toJS()
+
+ config.components = this.setPopView(config.components, parents, popbtns)
+
+ this.setState({ config }, () => {
+ this.submitConfig()
+ })
+ }
+
+ setPopView = (components, parents, popbtns) => {
+ return components.map(item => {
+ if (item.type === 'tabs') {
+ item.subtabs.forEach(tab => {
+ tab.components = this.setPopView(tab.components, parents, popbtns)
+ })
+ } else if (item.type === 'group') {
+ item.components = this.setPopView(item.components, parents, popbtns)
+ } else if (parents[item.uuid]) {
+ this.setpopConfig(item, popbtns)
+ }
+ return item
+ })
+ }
+
+ setpopConfig = (config, popbtns) => {
+ config.subcards && config.subcards.forEach(item => {
+ item.elements.forEach(cell => {
+ if (cell.eleType !== 'button') return
+ if (cell.OpenType === 'popview' && popbtns[cell.uuid]) {
+ cell.config = popbtns[cell.uuid]
+ }
+ })
+ })
+
+ config.cols && config.cols.forEach(col => {
+ if (col.type === 'action') {
+ col.elements.forEach(cell => {
+ if (cell.OpenType === 'popview' && popbtns[cell.uuid]) {
+ cell.config = popbtns[cell.uuid]
+ }
+ })
+ }
+ })
+
+ config.elements && config.elements.forEach(cell => {
+ if (cell.eleType !== 'button') return
+ if (cell.OpenType === 'popview' && popbtns[cell.uuid]) {
+ cell.config = popbtns[cell.uuid]
+ }
+ })
+
+ config.action && config.action.forEach(cell => {
+ if (cell.OpenType === 'popview' && popbtns[cell.uuid]) {
+ cell.config = popbtns[cell.uuid]
+ }
+ })
+
+ config.$tables = getTables(config)
+ }
+
+ closePop = () => {
+ const {config} = this.state
+
+ sessionStorage.setItem('editMenuType', 'menu')
+
+ window.GLOB.urlFields = config.urlFields || []
+ window.GLOB.customMenu = config
+
+ this.setState({view: '', popConfig: null})
}
closeView = () => {
@@ -468,10 +462,7 @@
if (!config) {
window.close()
- return
- }
-
- if (!oriConfig || !is(fromJS(oriConfig), fromJS(config))) {
+ } else if (!oriConfig || !is(fromJS(oriConfig), fromJS(config))) {
confirm({
title: '閰嶇疆淇℃伅鏈繚瀛橈紝纭畾鍏抽棴鍚楋紵',
content: '',
@@ -482,6 +473,25 @@
})
} else {
window.close()
+ }
+ }
+
+ backView = () => {
+ const { oriConfig, config } = this.state
+
+ if (!config) {
+ window.history.back()
+ } else if (!oriConfig || !is(fromJS(oriConfig), fromJS(config))) {
+ confirm({
+ title: '閰嶇疆淇℃伅鏈繚瀛橈紝纭畾鍚庨��鍚楋紵',
+ content: '',
+ onOk() {
+ window.history.back()
+ },
+ onCancel() {}
+ })
+ } else {
+ window.history.back()
}
}
@@ -508,7 +518,6 @@
this.getCopyParam(urlParam)
} else {
let config = null
- let isCreate = false
try {
config = result.LongParam ? JSON.parse(window.decodeURIComponent(window.atob(result.LongParam))) : null
@@ -518,15 +527,14 @@
}
if (!config) {
- isCreate = true
config = {
- version: 1.0,
+ version: 2.0,
uuid: MenuId,
MenuID: MenuId,
Template: 'webPage',
enabled: false,
MenuName: urlParam.MenuName || '',
- MenuNo: urlParam.MenuNo || '',
+ MenuNo: '',
tables: [],
components: [],
viewType: 'menu',
@@ -541,27 +549,66 @@
config.open_edition = result.open_edition || ''
window.GLOB.urlFields = config.urlFields || []
- let indeComs = []
+ if (config.version !== 2.0) {
+ config.components = this.collectTB(config.components)
+ config.version = 2.0
+
+ this.setState({
+ needUpdate: true
+ })
+ }
+
+ let navItem = null
config.components.forEach(item => {
if (item.type === 'navbar') {
- indeComs.push(fromJS(item).toJS())
+ navItem = fromJS(item).toJS()
}
})
- if (indeComs.length === 0) {
+ if (!navItem) {
this.setState({
- oriConfig: isCreate ? null : config,
- config: fromJS(config).toJS(),
+ oriConfig: fromJS(config).toJS(),
+ config: config,
loading: false
})
window.GLOB.customMenu = config
} else {
- this.jointComponents(config, indeComs, isCreate)
+ this.jointComponents(config, navItem)
}
}
})
this.getAppMenus()
+ }
+
+ collectTB = (components) => {
+ return components.map(item => {
+ if (item.type === 'tabs') {
+ item.subtabs.forEach(tab => {
+ delete tab.floor
+ delete tab.hasSearch
+ delete tab.parentId
+
+ tab.components = this.collectTB(tab.components)
+ })
+ } else if (item.type === 'group') {
+ item.components = this.collectTB(item.components)
+ } else if (!['search', 'navbar', 'login', 'topbar', 'officialAccount'].includes(item.type)) {
+ item.$tables = getTables(item)
+ }
+
+ if (item.subtype === 'tablecard') { // 鍏煎
+ item.type = 'card'
+ }
+
+ delete item.tabId
+ delete item.parentId
+ delete item.btnlog
+ delete item.floor
+ delete item.dataName
+
+ return item
+ })
}
getAppMenus = () => {
@@ -587,15 +634,20 @@
let appIndeList = sessionStorage.getItem('appViewList')
appIndeList = JSON.parse(appIndeList)
- appIndeList = appIndeList.map(item => (item.keys_type !== 'index' ? item.keys_id : '')).join(',')
+ appIndeList = appIndeList.map(item => (item.keys_type === 'navbar' ? 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
+ if (item.MenuNo) {
+ item.label = item.MenuName + '锛�' + item.MenuNo + '锛�'
+ } else {
+ item.label = item.MenuName
+ }
return item
})
sessionStorage.setItem('appMenus', JSON.stringify(menus))
+ sessionStorage.setItem('allMenus', JSON.stringify(res.menus || []))
})
}
@@ -618,12 +670,6 @@
})
this.setState({loading: false})
return
- } else if (!result.LongParam) {
- notification.warning({
- top: 92,
- message: '鏈煡璇㈠埌澶嶅埗鑿滃崟閰嶇疆淇℃伅锛�',
- duration: 5
- })
}
let config = null
@@ -634,11 +680,10 @@
console.warn('Parse Failure')
config = null
}
-
if (!config) {
config = {
- version: 1.0,
+ version: 2.0,
uuid: MenuId,
MenuID: MenuId,
Template: 'webPage',
@@ -653,7 +698,24 @@
}
}
} else {
- config.components = MenuUtils.resetConfig(config.components)
+ let commonId = Utils.getuuid()
+ if (config.interfaces && config.interfaces.length > 0) {
+ config.interfaces = config.interfaces.map(inter => {
+ inter.uuid = md5(commonId + inter.uuid)
+ return inter
+ })
+ }
+ config.components = MenuUtils.resetConfig(config.components, commonId, urlParam.clearMenu)
+
+ if (config.version !== 2.0) {
+ config.components = this.collectTB(config.components)
+ config.version = 2.0
+
+ this.setState({
+ needUpdate: true
+ })
+ }
+
config.enabled = false
message.success('澶嶅埗鎴愬姛锛屼繚瀛樺悗鐢熸晥銆�')
}
@@ -662,54 +724,44 @@
config.MenuID = MenuId
config.open_edition = ''
config.MenuName = urlParam.MenuName || ''
- config.MenuNo = urlParam.MenuNo || ''
+ config.MenuNo = ''
- let indeComs = []
+ let navItem = null
config.components.forEach(item => {
if (item.type === 'navbar') {
- indeComs.push(fromJS(item).toJS())
+ navItem = fromJS(item).toJS()
}
})
- if (indeComs.length === 0) {
+ if (!navItem) {
this.setState({
- oriConfig: null,
- config: fromJS(config).toJS(),
+ oriConfig: fromJS(config).toJS(),
+ config: config,
loading: false
})
window.GLOB.customMenu = config
} else {
- this.jointComponents(config, indeComs, true)
+ this.jointComponents(config, navItem)
}
})
}
- jointComponents = (config, indeComs, isCreate) => {
- let deffers = indeComs.map(item => {
- return new Promise(resolve => {
- Api.getSystemConfig({
- func: 'sPC_Get_LongParam',
- TypeCharOne: sessionStorage.getItem('kei_no'),
- typename: 'pc',
- MenuID: item.uuid
- }).then(res => {
- res.uuid = item.uuid
-
- if (!res.status) {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
- })
- }
-
- resolve(res)
+ jointComponents = (config, navItem) => {
+ Api.getSystemConfig({
+ func: 'sPC_Get_LongParam',
+ TypeCharOne: sessionStorage.getItem('kei_no'),
+ typename: 'pc',
+ MenuID: navItem.uuid
+ }).then(res => {
+ if (!res.status) {
+ notification.warning({
+ top: 92,
+ message: res.message,
+ duration: 5
})
- })
- })
- Promise.all(deffers).then(result => {
- let _conf = {}
- result.forEach(res => {
+
+ config.components = config.components.filter(item => item.type !== 'navbar')
+ } else {
let _config = null
try {
_config = res.LongParam ? JSON.parse(window.decodeURIComponent(window.atob(res.LongParam))) : null
@@ -720,35 +772,21 @@
if (_config) {
_config.open_edition = res.open_edition || ''
- _conf[res.uuid] = _config
- window.GLOB.CacheIndependent.set(res.uuid, fromJS(_config).toJS())
+ config.components = config.components.map(item => {
+ if (item.type === 'navbar') {
+ return _config
+ }
+ return item
+ })
+
+ window.GLOB.CacheIndependent.set(navItem.uuid, fromJS(_config).toJS())
+ } else {
+ config.components = config.components.filter(item => item.type !== 'navbar')
}
- })
-
- let _length = config.components.length
- config.components = config.components.map(item => {
- if (item.type === 'navbar') {
- if (_conf[item.uuid]) {
- item = _conf[item.uuid]
- } else {
- item = null
- }
- }
- return item
- })
-
- config.components = config.components.filter(Boolean)
-
- if (_length > config.components.length) {
- notification.warning({
- top: 92,
- message: '閮ㄥ垎缁勪欢宸插垹闄わ紒',
- duration: 5
- })
}
this.setState({
- oriConfig: isCreate ? null : fromJS(config).toJS(),
+ oriConfig: fromJS(config).toJS(),
config: config,
loading: false
})
@@ -757,22 +795,34 @@
})
}
- getMenuMessage = () => {
+ getMenuMessage = (tbs) => {
const { config } = this.state
- let nodes = {type: 'view', key: config.uuid, title: config.MenuName, children: []}
- let popviews = []
+ let nodes = {type: 'view', version: '1.0', key: config.uuid, title: config.MenuName, children: []}
let traversal = (components) => {
- let list = components.map(item => {
+ let list = []
+ components.forEach(item => {
+ if (item.$tables) {
+ tbs.push(...item.$tables)
+ }
+
+ if (item.plot && item.plot.permission !== 'true') {
+ return
+ } else if (item.type === 'login' || item.type === 'navbar') {
+ return
+ } else if (!['tabs', 'group'].includes(item.type) && item.wrap && item.wrap.permission !== 'true') {
+ return
+ }
+
let m = {
key: item.uuid,
title: item.name,
children: []
}
- if (item.type === 'login' || item.type === 'navbar') {
- return null
- } else if (item.type === 'tabs') {
+
+ if (item.type === 'tabs') {
let tabs = []
+ let mm = []
item.subtabs.forEach(tab => {
let s = traversal(tab.components)
@@ -783,122 +833,101 @@
title: tab.label,
children: s
})
+
+ mm.push(...s)
})
if (tabs.length > 0) {
m.children = tabs
}
+
+ if (item.setting.permission === 'true') {
+ list.push(m)
+ } else if (mm.length) {
+ list.push(...mm)
+ }
+
+ return
} else if (item.type === 'group') {
m.children = traversal(item.components)
- } else if (item.type === 'card' || (item.type === 'table' && item.subtype === 'tablecard')) {
+
+ if (item.setting.permission === 'true') {
+ list.push(m)
+ } else if (m.children.length) {
+ list.push(...m.children)
+ }
+
+ return
+ } else if (item.type === 'card' || item.type === 'carousel' || item.type === 'timeline') {
item.action && item.action.forEach(btn => {
- this.checkBtn(btn)
+ if (btn.hidden === 'true') return
+
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)
+ if (cell.eleType !== 'button' || cell.hidden === 'true') return
+
m.children.push({
key: cell.uuid,
title: cell.label,
})
- if (cell.OpenType === 'popview') {
- popviews.push(cell.uuid)
- }
})
+
card.backElements && card.backElements.forEach(cell => {
- if (cell.eleType !== 'button') return
- this.checkBtn(cell)
+ if (cell.eleType !== 'button' || cell.hidden === 'true') return
+
m.children.push({
key: cell.uuid,
title: cell.label,
})
- if (cell.OpenType === 'popview') {
- popviews.push(cell.uuid)
- }
- })
- })
- } else if (item.type === 'carousel' || item.type === 'timeline') {
- item.subcards.forEach(card => {
- card.elements && card.elements.forEach(cell => {
- if (cell.eleType !== 'button') return
- this.checkBtn(cell)
- m.children.push({
- key: cell.uuid,
- title: cell.label,
- })
- if (cell.OpenType === 'popview') {
- popviews.push(cell.uuid)
- }
})
})
} else if (item.type === 'balcony') {
item.elements && item.elements.forEach(cell => {
- if (cell.eleType !== 'button') return
- this.checkBtn(cell)
+ if (cell.eleType !== 'button' || cell.hidden === 'true') return
+
m.children.push({
key: cell.uuid,
title: cell.label,
})
- if (cell.OpenType === 'popview') {
- popviews.push(cell.uuid)
- }
- })
- } else if (item.type === 'menubar') {
- if (item.wrap.title) {
- m.title = item.wrap.title
- }
-
- m.children = item.subMenus.map(menu => {
- return {
- key: menu.uuid,
- title: menu.setting.name
- }
})
} else if (item.type === 'form') {
- 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)
+ if (item.subtype !== 'simpleform') {
+ m.children = item.subcards.map(m => {
+ return {
+ key: m.uuid,
+ title: m.setting.title
+ }
+ })
+ }
+ } else if (item.type === 'table') {
+ item.action.forEach(btn => {
+ if (btn.hidden === 'true') return
+
m.children.push({
key: btn.uuid,
title: btn.label,
})
- if (btn.OpenType === 'popview') {
- popviews.push(btn.uuid)
- }
})
- item.cols && item.cols.forEach(col => {
+ item.cols.forEach(col => {
if (col.type !== 'action') return
col.elements.forEach(btn => {
- this.checkBtn(btn)
+ if (btn.hidden === 'true') return
+
m.children.push({
key: btn.uuid,
title: btn.label,
})
- if (btn.OpenType === 'popview') {
- popviews.push(btn.uuid)
- }
})
})
}
- return m
+ list.push(m)
})
-
- list = list.filter(Boolean)
return list
}
@@ -906,38 +935,138 @@
let trees = traversal(config.components)
nodes.children = trees
- nodes.popviews = popviews
if (config.components.findIndex(item => item.type === 'login') > -1) {
nodes.login = true
+ nodes.children = []
+ }
+ if (nodes.children.length === 0) {
+ nodes.pass = true
+ }
+
+ if (config.interfaces) {
+ config.interfaces.forEach(item => {
+ if (item.$tables) {
+ tbs.push(...item.$tables)
+ }
+ })
}
return nodes
}
- checkBtn = (btn) => {
- if (['prompt', 'exec', 'pop'].includes(btn.OpenType) && btn.Ot === 'required' && btn.verify && btn.verify.scripts && btn.verify.scripts.length > 0) {
- let hascheck = false
- btn.verify.scripts.forEach(item => {
- if (item.status === 'false') return
-
- if (/\$check@|@check\$/ig.test(item.sql)) {
- hascheck = true
+ getSubMenus = () => {
+ const { config } = this.state
+ let menus = []
+ let menuObj = {}
+ let allMenus = JSON.parse(sessionStorage.getItem('allMenus'))
+
+ allMenus.forEach(item => {
+ menuObj[item.MenuID] = item
+ })
+
+ let traversal = (components) => {
+ components.forEach(item => {
+ if (item.type === 'login') {
+ if (item.wrap.linkmenu && menuObj[item.wrap.linkmenu]) {
+ menus.push(menuObj[item.wrap.linkmenu])
+ }
+ } else if (item.type === 'tabs') {
+ item.subtabs.forEach(tab => {
+ traversal(tab.components)
+ })
+ } else if (item.type === 'group') {
+ traversal(item.components)
+ } else if (item.type === 'card' || item.type === 'carousel' || item.type === 'timeline') {
+ item.action && item.action.forEach(btn => {
+ if (btn.linkmenu && menuObj[btn.linkmenu]) {
+ menus.push(menuObj[btn.linkmenu])
+ } else if (btn.openmenu && menuObj[btn.openmenu]) {
+ menus.push(menuObj[btn.openmenu])
+ }
+ })
+ item.subcards.forEach(card => {
+ if (card.setting.click === 'menu' && menuObj[card.setting.menu]) {
+ menus.push(menuObj[card.setting.menu])
+ } else if (card.setting.click === 'menus' && card.menus) {
+ card.menus.forEach(m => {
+ if (menuObj[m.menu]) {
+ menus.push(menuObj[m.menu])
+ }
+ })
+ }
+ card.elements && card.elements.forEach(cell => {
+ if (cell.eleType !== 'button') return
+
+ if (cell.linkmenu && menuObj[cell.linkmenu]) {
+ menus.push(menuObj[cell.linkmenu])
+ } else if (cell.openmenu && menuObj[cell.openmenu]) {
+ menus.push(menuObj[cell.openmenu])
+ }
+ })
+
+ 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]) {
+ menus.push(menuObj[cell.openmenu])
+ }
+ })
+ })
+ } 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]) {
+ menus.push(menuObj[cell.openmenu])
+ }
+ })
+ } else if (item.type === 'form') {
+ item.subcards.forEach(m => {
+ if (m.subButton && m.subButton.linkmenu && menuObj[m.subButton.linkmenu]) {
+ menus.push(menuObj[m.subButton.linkmenu])
+ }
+ })
+ } else if (item.type === 'table') {
+ item.action && item.action.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])
+ }
+ })
+ 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])
+ }
+ })
+ })
}
})
- if (hascheck) {
- notification.warning({
- top: 92,
- message: `鍙�夋嫨澶氳鐨勬寜閽��${btn.label}銆嬩腑 $check@ 鎴� @check$ 灏嗕笉浼氱敓鏁堬紒`,
- duration: 5
- })
- }
}
+
+ traversal(config.components)
+
+ let map = new Map()
+ menus = menus.filter(m => {
+ if (map.has(m.MenuID)) return false
+ map.set(m.MenuID, true)
+ return true
+ })
+
+ return menus
}
- submitConfig = () => {
- const { delButtons, copyButtons, thawButtons } = this.state
- let config = fromJS(this.state.config).toJS()
+ checkBase = () => {
+ const { config } = this.state
if (!config.MenuName || !config.MenuNo || (config.cacheUseful === 'true' && !config.cacheTime)) {
notification.warning({
@@ -950,6 +1079,44 @@
settingshow: true,
activeKey: 'basedata'
})
+ return false
+ }
+ return true
+ }
+
+ resetSyncQuery = (components) => {
+ return components.map(item => {
+ if (item.type === 'tabs') {
+ item.subtabs.forEach(tab => {
+ tab.components = this.resetSyncQuery(tab.components)
+ })
+ } else if (item.type === 'group') {
+ item.components = this.resetSyncQuery(item.components)
+ } else if (item.setting && item.setting.interType === 'system' && item.setting.sync === 'true') {
+ let sql = ''
+ if (item.setting.execute !== 'false' && item.setting.dataresource) {
+ sql = item.setting.dataresource
+ }
+
+ item.scripts && item.scripts.forEach(script => {
+ if (script.status === 'false') return
+
+ sql += script.sql
+ })
+
+ if (sql.length > 8000) {
+ item.setting.sync = 'false'
+ }
+ }
+
+ return item
+ })
+ }
+
+ submitConfig = () => {
+ let config = fromJS(this.state.config).toJS()
+
+ if (!this.checkBase()) {
return
}
@@ -958,11 +1125,64 @@
})
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
}
- let roleParam = this.getMenuMessage()
+ if (config.cacheUseful !== 'true') {
+ config.components = this.resetSyncQuery(config.components)
+ }
+
+ let tbs = []
+ let roleParam = this.getMenuMessage(tbs)
+
+ let subMenus = this.getSubMenus()
+ 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 arr = []
+ tbs = tbs.filter(tb => {
+ let _tb = tb.toLowerCase()
+
+ if (arr.includes(_tb)) return false
+ arr.push(_tb)
+
+ return true
+ })
+ tbs.sort()
+ if (tbs.length && sessionStorage.getItem('mk_tb_names')) {
+ let names = sessionStorage.getItem('mk_tb_names')
+ tbs = tbs.filter(tb => names.indexOf(',' + tb.toLowerCase() + ',') > -1)
+ }
+ tbs = tbs.map(tb => `'${tb}'`).join(';')
+
+ let key = md5(config.uuid + sessionStorage.getItem('kei_no') + 'pc' + sessionStorage.getItem('lang') + tbs.toLowerCase())
+ let url = ''
+
+ if (config.tbkey === key) {
+ key = ''
+ } else {
+ let urlparam = {
+ type: 'app',
+ MenuID: config.uuid,
+ ID: sessionStorage.getItem('appId') || '',
+ remark: sessionStorage.getItem('appName') || '',
+ lang: sessionStorage.getItem('lang') || '',
+ kei_no: sessionStorage.getItem('kei_no') || '',
+ typename: 'pc',
+ sysBgColor: sessionStorage.getItem('sysBgColor') || '',
+ MenuName: config.MenuName || '',
+ }
+
+ url = window.btoa(window.encodeURIComponent(JSON.stringify(urlparam)))
+ config.tbkey = key
+ }
let param = {
func: 'sPC_TrdMenu_AddUpt',
@@ -980,49 +1200,50 @@
menus_rolelist: window.btoa(window.encodeURIComponent(JSON.stringify(roleParam))),
open_edition: config.open_edition,
LText: '',
- LTexttb: ''
+ LTexttb: '',
+ menus_used_list,
+ debug_md5: key,
+ debug_url: url,
+ debug_list: window.btoa(tbs)
}
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
- new Promise(resolve => {
- let _config = fromJS(config).toJS()
- let indeComs = []
- _config.components = _config.components.map(item => {
- if (item.type === 'navbar') {
- indeComs.push(item)
- return {
- type: 'navbar',
- uuid: item.uuid
- }
+ let _config = fromJS(config).toJS()
+ let NavBar = null
+ _config.components = _config.components.map(item => {
+ if (item.type === 'navbar') {
+ NavBar = fromJS(item).toJS()
+ return {
+ type: 'navbar',
+ uuid: item.uuid
}
- return item
- })
+ }
+ return item
+ })
- param.LongParam = window.btoa(window.encodeURIComponent(JSON.stringify(_config)))
+ param.LongParam = window.btoa(window.encodeURIComponent(JSON.stringify(_config)))
- if (indeComs.length === 0) {
- resolve(true)
+ new Promise(resolve => {
+ if (!NavBar) {
+ resolve({status: true})
} else {
- let new_open_edition = {}
- let deffers = indeComs.map(item => {
- return new Promise(resolve => {
- let _item = window.GLOB.CacheIndependent.get(item.uuid)
- if (_item && is(fromJS(_item), fromJS(item))) {
- new_open_edition[item.uuid] = item.open_edition || ''
- resolve()
- return
- }
+ let _item = window.GLOB.CacheIndependent.get(NavBar.uuid) || {}
+ NavBar.open_edition = _item.open_edition || ''
+ if (is(fromJS(_item), fromJS(NavBar))) {
+ resolve({status: true})
+ } else {
+ let roles = {
+ type: 'navbar',
+ version: '1.0',
+ key: NavBar.uuid,
+ title: NavBar.name,
+ children: []
+ }
- let roles = {
- type: 'navbar',
- key: item.uuid,
- title: item.name,
- children: []
- }
-
- roles.children = item.menus.map(fst => {
+ if (NavBar.wrap.permission === 'true') {
+ roles.children = NavBar.menus.map(fst => {
if (fst.property === 'classify' && fst.sublist.length > 0) {
return {
key: fst.MenuID,
@@ -1045,158 +1266,103 @@
return { key: fst.MenuID, title: fst.name }
}
})
+ } else {
+ roles.pass = true
+ }
- let _param = {
- func: 'sPC_TrdMenu_AddUpt',
- FstID: 'mk_app',
- SndID: 'mk_app',
- ParentID: 'mk_app',
- MenuID: item.uuid,
- MenuNo: item.wrap.MenuNo || Utils.getuuid(),
- EasyCode: '',
- Template: item.type,
- TypeCharOne: sessionStorage.getItem('kei_no'),
- Typename: 'pc',
- MenuName: item.name || '',
- PageParam: JSON.stringify({Template: item.type}),
- menus_rolelist: window.btoa(window.encodeURIComponent(JSON.stringify(roles))),
- open_edition: item.open_edition || '',
- LText: '',
- LTexttb: ''
- }
+ let _param = {
+ func: 'sPC_TrdMenu_AddUpt',
+ FstID: 'mk_app',
+ SndID: 'mk_app',
+ ParentID: 'mk_app',
+ MenuID: NavBar.uuid,
+ MenuNo: NavBar.wrap.MenuNo || Utils.getuuid(),
+ EasyCode: '',
+ Template: NavBar.type,
+ TypeCharOne: sessionStorage.getItem('kei_no'),
+ Typename: 'pc',
+ MenuName: NavBar.name || '',
+ PageParam: JSON.stringify({Template: NavBar.type}),
+ menus_rolelist: window.btoa(window.encodeURIComponent(JSON.stringify(roles))),
+ open_edition: NavBar.open_edition,
+ LText: '',
+ LTexttb: ''
+ }
- _param.LongParam = window.btoa(window.encodeURIComponent(JSON.stringify(item)))
- _param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- _param.secretkey = Utils.encrypt('', _param.timestamp)
+ _param.LongParam = window.btoa(window.encodeURIComponent(JSON.stringify(NavBar)))
+ _param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ _param.secretkey = Utils.encrypt('', _param.timestamp)
- Api.getSystemConfig(_param).then(res => {
- if (!res.status) {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
- })
- this.setState({ menuloading: false })
- return
- }
+ Api.getSystemConfig(_param).then(res => {
+ if (res.status) {
+ NavBar.open_edition = res.open_edition || ''
+ window.GLOB.CacheIndependent.set(NavBar.uuid, fromJS(NavBar).toJS())
- new_open_edition[item.uuid] = res.open_edition || ''
- resolve()
- })
- })
- })
- Promise.all(deffers).then(() => {
- let appViewList = sessionStorage.getItem('appViewList')
- appViewList = JSON.parse(appViewList)
- let _appViewList = fromJS(appViewList).toJS()
- let appIndeList = appViewList.map(item => item.keys_id).join(',')
+ let appViewList = sessionStorage.getItem('appViewList')
+ let _appViewList = JSON.parse(appViewList)
- config.components = config.components.map(item => {
- if (item.type === 'navbar') {
- item.open_edition = new_open_edition[item.uuid] || ''
- window.GLOB.CacheIndependent.set(item.uuid, fromJS(item).toJS())
-
- if (appIndeList.indexOf(item.uuid) === -1) {
- appViewList.unshift({
+ let index = _appViewList.findIndex(item => item.keys_id === NavBar.uuid)
+
+ if (index === -1) {
+ _appViewList.unshift({
appkey: window.GLOB.appkey || '',
bid: sessionStorage.getItem('appId') || '',
kei_no: sessionStorage.getItem('kei_no') || '',
- keys_id: item.uuid,
+ keys_id: NavBar.uuid,
keys_type: 'navbar',
- remark: item.name
+ remark: NavBar.name
})
} else {
- appViewList = appViewList.map(view => {
- if (view.keys_id === item.uuid) {
- view.remark = item.name
+ _appViewList = _appViewList.map(item => {
+ if (item.keys_id === NavBar.uuid && item.remark !== NavBar.name) {
+ item.remark = NavBar.name
}
- return view
+ return item
})
}
- }
- return item
- })
- if (!is(fromJS(appViewList), fromJS(_appViewList))) {
- let kparam = {
- func: 's_kei_link_keyids_addupt',
- BID: sessionStorage.getItem('appId'),
- exec_type: 'y',
- LText: ''
- }
-
- kparam.LText = appViewList.map(item => `select '${item.keys_id}','${item.keys_type}','${item.kei_no}','${item.appkey}','${item.bid}','${sessionStorage.getItem('CloudUserID')}','${item.remark}'`)
- kparam.LText = kparam.LText.join(' union all ')
- kparam.LText = Utils.formatOptions(kparam.LText)
+ let viewList = JSON.stringify(_appViewList)
+
+ if (appViewList !== viewList) {
+ let kparam = {
+ func: 's_kei_link_keyids_addupt',
+ BID: sessionStorage.getItem('appId'),
+ exec_type: 'y',
+ LText: ''
+ }
- kparam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- kparam.secretkey = Utils.encrypt('', kparam.timestamp)
-
- Api.getSystemConfig(kparam).then(result => {
- if (!result.status) {
- notification.warning({
- top: 92,
- message: result.message,
- duration: 5
- })
- this.setState({ menuloading: false })
+ kparam.LText = _appViewList.map(item => `select '${item.keys_id}','${item.keys_type}','${item.kei_no}','${item.appkey}','${item.bid}','${sessionStorage.getItem('CloudUserID')}','${item.remark}'`)
+ kparam.LText = kparam.LText.join(' union all ')
+ kparam.LText = Utils.formatOptions(kparam.LText)
+
+ kparam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ kparam.secretkey = Utils.encrypt('', kparam.timestamp)
+
+ Api.getSystemConfig(kparam).then(result => {
+ if (result.status) {
+ sessionStorage.setItem('appViewList', viewList)
+ }
+
+ resolve(result)
+ }, this.netError)
} else {
- sessionStorage.setItem('appViewList', JSON.stringify(appViewList))
- resolve(true)
+ resolve(res)
}
- })
- } else {
- resolve(true)
- }
- })
- }
- }).then(res => { // 鎸夐挳鎴栬彍鍗曞垹闄�
- if (!res) return
-
- if (delButtons.length === 0) {
- return { status: true, nonexec: true }
- } else {
- let _param = {
- func: 'sPC_MainMenu_Del',
- MenuID: delButtons.join(',')
+ } else {
+ resolve(res)
+ }
+ }, this.netError)
}
- 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()
- }
-
- if (thawButtons.length === 0) {
- return { status: true }
- } else {
- return Api.getSystemConfig({
- func: 'sPC_MainMenu_ReDel',
- MenuID: thawButtons.join(',')
- })
}
}).then(res => { // 椤甸潰淇濆瓨
- if (!res) return
+ if (!res || !res.status) return res
- if (res.status) {
- return Api.getSystemConfig(param)
- } else {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
- })
- return false
- }
- }).then(res => { // 椤甸潰鎸夐挳鍏崇郴淇濆瓨
+ return Api.getSystemConfig(param)
+ }).then(res => {
+ this.setState({
+ menuloading: false
+ })
+
if (!res) return
if (res.status) {
@@ -1205,138 +1371,39 @@
this.setState({
config,
oriConfig: fromJS(config).toJS(),
+ needUpdate: false
})
- return {
- status: true
- }
- } else {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
- })
- return false
- }
- }).then(res => { // 鎸夐挳澶嶅埗
- if (!res) return
- if (!res.status) {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
- })
- return false
- }
+ localStorage.setItem('pcUpdate', new Date().getTime() + ',' + config.uuid)
- if (copyButtons.length === 0) {
- return {
- status: true
- }
- } else {
- return new Promise(resolve => {
- let deffers = copyButtons.map(item => {
- return new Promise(resolve => {
- if (delButtons.includes(item.uuid)) { // 澶嶅埗鐨勬寜閽凡鍒犻櫎
- resolve({
- status: true
- })
- return
- }
-
- Api.getSystemConfig({
- func: 'sPC_Get_LongParam',
- MenuID: item.$originUuid,
- TypeCharOne: sessionStorage.getItem('kei_no'),
- typename: 'pc',
- }).then(result => {
- if (result.status) {
- let _conf = ''
-
- try {
- _conf = result.LongParam ? JSON.parse(window.decodeURIComponent(window.atob(result.LongParam))) : ''
- } catch (e) {
- console.warn('Parse Failure')
- _conf = ''
- }
-
- if (_conf) {
- _conf.components = MenuUtils.resetConfig(_conf.components)
- _conf.uuid = item.uuid
- _conf.MenuID = item.uuid
- _conf.Template = 'webPage'
- _conf.enabled = false
- } else {
- resolve({
- status: true
- })
- return
- }
-
- let _param = {
- func: 'sPC_ButtonParam_AddUpt',
- ParentID: config.uuid,
- MenuID: item.uuid,
- MenuNo: '',
- Template: 'webPage',
- MenuName: item.label,
- PageParam: JSON.stringify({Template: 'webPage'}),
- LongParam: window.btoa(window.encodeURIComponent(JSON.stringify(_conf))),
- TypeCharOne: sessionStorage.getItem('kei_no'),
- Typename: 'pc',
- }
-
- Api.getSystemConfig(_param).then(response => {
- resolve(response)
- })
- }
- })
- })
- })
- Promise.all(deffers).then(result => {
- let error = null
- result.forEach(response => {
- if (!response.status) {
- error = response
- }
- })
-
- if (error) {
- notification.warning({
- top: 92,
- message: error.message,
- duration: 5
- })
- resolve(false)
- } else {
- resolve({
- status: true
- })
- }
- })
- })
- }
- }).then(res => {
- if (res && res.status) {
- this.setState({
- delButtons: [],
- copyButtons: [],
- thawButtons: [],
- menuloading: false
- })
notification.success({
top: 92,
message: '淇濆瓨鎴愬姛',
duration: 2
})
+ MKEmitter.emit('completeSave')
} else {
- this.setState({
- menuloading: false
+ notification.warning({
+ top: 92,
+ message: res.message,
+ duration: 5
})
}
- MKEmitter.emit('completeSave')
+ }, this.netError)
+ }, 300 + (+sessionStorage.getItem('mkDelay')))
+ }
+
+ netError = (error) => {
+ this.setState({
+ menuloading: false
+ })
+ if (!error) {
+ notification.warning({
+ top: 92,
+ message: '淇濆瓨澶辫触锛岃妫�鏌ョ綉缁滄槸鍚︽甯搞��',
+ duration: 5
})
- }, 300)
+ }
}
getRoleFields = () => {
@@ -1374,17 +1441,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 check = (components) => {
@@ -1398,38 +1470,20 @@
} else if (item.type === 'group') {
check(item.components)
return
+ } else if (!item.errors || item.errors.length === 0) {
+ 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}銆嬫湭璁剧疆鏁版嵁婧愶紒`
- } else if (item.setting.interType === 'system' && item.setting.execute === 'false' && item.scripts.length === 0) {
- 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') {
- if (!item.plot.Xaxis) {
- error = `缁勪欢銆�${item.name}銆嬪浘琛ㄥ瓧娈靛皻鏈缃紒`
- }
- } else if (item.type === 'dashboard' && !item.plot.valueField) {
- error = `缁勪欢銆�${item.name}銆嬫樉绀哄�煎皻鏈缃紒`
- } else if (item.type === 'scatter' && (!item.plot.Xaxis || !item.plot.Yaxis || !item.plot.gender)) {
- error = `缁勪欢銆�${item.name}銆嬪潗鏍囪酱灏氭湭璁剧疆锛乣
- } else if (item.type === 'tree' && (!item.wrap.valueField || !item.wrap.labelField || !item.wrap.parentField)) {
- error = `缁勪欢銆�${item.name}銆嬪熀鏈俊鎭皻鏈缃紒`
- }
+ item.errors.forEach(err => {
+ if (err.level !== 0 || error) return
+ error = `缁勪欢銆�${item.name}銆�${err.detail}`
+ })
})
}
check(config.components)
- if (show && error) {
+ if (config.enabled && error) {
notification.warning({
top: 92,
message: error,
@@ -1437,7 +1491,7 @@
})
}
- return error
+ return error === ''
}
// 鏇存柊閰嶇疆淇℃伅
@@ -1478,9 +1532,7 @@
}
refreshView = () => {
- const { oriConfig, config } = this.state
-
- if (!oriConfig || !is(fromJS(oriConfig), fromJS(config))) {
+ if (!is(fromJS(this.state.oriConfig || {}), fromJS(this.state.config || {}))) {
notification.warning({
top: 92,
message: '閰嶇疆淇℃伅鏈繚瀛橈紒',
@@ -1498,9 +1550,9 @@
}
setHomeView = () => {
- const { oriConfig, config } = this.state
+ const { config } = this.state
- if (!oriConfig || !is(fromJS(oriConfig), fromJS(config))) {
+ if (!is(fromJS(this.state.oriConfig || {}), fromJS(config || {}))) {
notification.warning({
top: 92,
message: '閰嶇疆淇℃伅鏈繚瀛橈紒',
@@ -1557,9 +1609,9 @@
}
setLoginView = () => {
- const { oriConfig, config } = this.state
+ const { config } = this.state
- if (!oriConfig || !is(fromJS(oriConfig), fromJS(config))) {
+ if (!is(fromJS(this.state.oriConfig || {}), fromJS(config || {}))) {
notification.warning({
top: 92,
message: '閰嶇疆淇℃伅鏈繚瀛橈紒',
@@ -1618,13 +1670,13 @@
}
render () {
- const { localedict, loading, visible, popBtn, comloading, activeKey, settingshow, controlshow, dict, MenuId, config, menuloading, customComponents } = this.state
+ const { view, loading, comloading, activeKey, settingshow, controlshow, MenuId, config, menuloading, eyeopen, needUpdate } = this.state
return (
- <ConfigProvider locale={localedict}>
- <div className={'mk-pc-view '} id="mk-pc-design-view">
- {loading ? <Spin className="view-spin" size="large" /> : null}
- {!popBtn && !visible ? <DndProvider backend={HTML5Backend}>
+ <ConfigProvider locale={antdZhCN}>
+ <DndProvider backend={HTML5Backend}>
+ {view !== 'popview' ? <div className={'mk-pc-view '} id="mk-pc-design-view">
+ {loading ? <Spin className="view-spin" size="large" /> : null}
<div className={'menu-setting ' + (!settingshow ? 'hidden' : '')}>
<div className="draw">
{settingshow ? <DoubleLeftOutlined onClick={() => {sessionStorage.setItem('settingshow', 'false'); this.setState({settingshow: false})}}/> : null}
@@ -1633,10 +1685,9 @@
<div className="pc-setting-tools">
<Collapse accordion activeKey={activeKey} bordered={false} onChange={(key) => this.setState({activeKey: key})}>
{/* 鍩烘湰淇℃伅 */}
- <Panel header={dict['mob.basemsg']} key="basedata">
+ <Panel header="鍩烘湰淇℃伅" key="basedata">
{/* 鑿滃崟淇℃伅 */}
{config ? <MenuForm
- dict={dict}
config={config}
MenuId={MenuId}
updateConfig={this.updateConfig}
@@ -1645,15 +1696,16 @@
{/* 琛ㄥ悕娣诲姞 */}
{config ? <TableComponent config={config} updatetable={this.updateConfig}/> : null}
{config ? <Paragraph style={{padding: '15px 0px 0px 18px'}} copyable={{ text: MenuId }}>鑿滃崟ID</Paragraph> : null}
+ {config ? <NormalCss config={config} updateConfig={this.updateConfig}/> : null}
</Panel>
{/* 缁勪欢娣诲姞 */}
- <Panel header={dict['mob.component']} key="component">
+ <Panel header="缁勪欢" key="component">
<SourceWrap />
</Panel>
- {customComponents && customComponents.length ? <Panel header="鑷畾涔夌粍浠�" key="cuscomponent">
- <SourceWrap components={customComponents} />
- </Panel> : null}
- <Panel header={'椤甸潰鏍峰紡'} key="background">
+ <Panel header="鍏冪礌" key="element">
+ <Modulecell />
+ </Panel>
+ <Panel header="椤甸潰鏍峰紡" key="background">
{config ? <BgController config={config} updateConfig={this.updateConfig} /> : null}
</Panel>
</Collapse>
@@ -1665,14 +1717,18 @@
{!controlshow ? <DoubleLeftOutlined onClick={() => {sessionStorage.setItem('controlshow', 'true'); this.setState({controlshow: true})}}/> : null}
</div>
<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} />
+ <Button type="primary" className={needUpdate ? 'update-tip' : ''} id="save-config" onClick={this.submitConfig} loading={menuloading}>淇濆瓨</Button>
+ {config ? <Switch className="big" checkedChildren="鍚�" unCheckedChildren="鍋�" checked={config.enabled} onChange={this.onEnabledChange} /> : null}
+ <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} />
- <StyleCombControlButton menu={config} />
+ <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" onClick={this.setHomeView}><HomeOutlined /> 璁句负棣栭〉</Button>
<Button className="mk-border-purple" onClick={this.setLoginView}><LoginOutlined/> 璁句负鐧诲綍椤�</Button>
<ReplaceField type="custom" config={config} updateConfig={this.resetConfig}/>
@@ -1682,28 +1738,20 @@
<Button type="default" onClick={this.closeView}>鍏抽棴</Button>
</div>
</div>
- <div className={'menu-body menu-view' + (menuloading ? 'saving' : '')}>
+ <div className={'menu-body menu-view' + (menuloading ? ' saving' : '') + (eyeopen ? ' eye-open' : '')}>
{config && !comloading ? <MenuShell menu={config} handleList={this.updateConfig} /> : null}
</div>
- </DndProvider> : null}
- {popBtn && visible ? <PopviewController btn={popBtn} handleBack={this.handleBack}/> : null}
- <StyleController />
- <StyleCombController />
- <ModalController />
- </div>
+ </div> : <>
+ <Header/>
+ <PopView btn={this.state.popConfig} save={this.submitPopConfig} cancel={this.closePop}/>
+ </>}
+ </DndProvider>
+ <StyleController />
+ <StyleCombController />
+ <ModalController />
</ConfigProvider>
)
}
}
-const mapStateToProps = (state) => {
- return {
- memberLevel: state.memberLevel
- }
-}
-
-const mapDispatchToProps = () => {
- return {}
-}
-
-export default withRouter(connect(mapStateToProps, mapDispatchToProps)(MenuDesign))
\ No newline at end of file
+export default withRouter(MenuDesign)
\ No newline at end of file
--
Gitblit v1.8.0