From 29432c9167e3fcdf83f35d0bb9dbe9acb7c7ffbf Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 22 六月 2021 14:35:23 +0800
Subject: [PATCH] 2021-06-22
---
src/views/pcdesign/index.jsx | 636 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 480 insertions(+), 156 deletions(-)
diff --git a/src/views/pcdesign/index.jsx b/src/views/pcdesign/index.jsx
index f270f84..6528b49 100644
--- a/src/views/pcdesign/index.jsx
+++ b/src/views/pcdesign/index.jsx
@@ -1,21 +1,21 @@
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, Icon } from 'antd'
+import { ConfigProvider, notification, Modal, Collapse, Switch, Button, Icon, message, Spin } from 'antd'
import Api from '@/api'
-import Utils from '@/utils/utils.js'
+import Utils, { setGLOBFuncs } from '@/utils/utils.js'
import zhCN from '@/locales/zh-CN/mob.js'
import enUS from '@/locales/en-US/mob.js'
import antdEnUS from 'antd/es/locale/en_US'
import antdZhCN from 'antd/es/locale/zh_CN'
import MKEmitter from '@/utils/events.js'
-import MenuUtils from '@/menu/utils/menuUtils.js'
+import MenuUtils from '@/utils/utils-custom.js'
import asyncComponent from '@/utils/asyncComponent'
-import { modifyCustomMenu } from '@/store/action'
import './index.scss'
@@ -25,12 +25,13 @@
const MenuForm = asyncComponent(() => import('./menuform'))
const MenuShell = asyncComponent(() => import('@/pc/menushell'))
const SourceWrap = asyncComponent(() => import('@/pc/modulesource'))
+const CreateView = asyncComponent(() => import('@/pc/createview'))
const BgController = asyncComponent(() => import('@/pc/bgcontroller'))
const Quotecomponent = asyncComponent(() => import('@/pc/quotecomponent'))
const PasteController = asyncComponent(() => import('@/menu/pastecontroller'))
-const PaddingController = asyncComponent(() => import('@/pc/padcontroller'))
const StyleController = asyncComponent(() => import('@/menu/stylecontroller'))
const SysInterface = asyncComponent(() => import('@/menu/sysinterface'))
+const UrlFieldComponent = asyncComponent(() => import('@/menu/urlfieldcomponent'))
const PictureController = asyncComponent(() => import('@/menu/picturecontroller'))
const ModalController = asyncComponent(() => import('@/menu/modalconfig/controller'))
const StyleCombController = asyncComponent(() => import('@/menu/stylecombcontroller'))
@@ -40,14 +41,18 @@
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.CacheIndependent = new Map()
+window.GLOB.urlFields = [] // url鍙橀噺
+window.GLOB.customMenu = null // 淇濆瓨鑿滃崟淇℃伅
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: '',
@@ -66,6 +71,7 @@
}
UNSAFE_componentWillMount() {
+ if (this.props.memberLevel < 30) return
try {
let param = JSON.parse(window.decodeURIComponent(window.atob(this.props.match.params.param)))
@@ -73,20 +79,21 @@
sessionStorage.setItem('appId', param.ID || '')
sessionStorage.setItem('lang', param.lang || 'zh-CN')
sessionStorage.setItem('kei_no', param.kei_no || '')
- sessionStorage.setItem('link_type', param.link_type || 'true')
sessionStorage.setItem('role_type', param.role_type || 'true')
sessionStorage.setItem('login_types', param.login_types || 'true')
-
+
this.setState({
localedict: sessionStorage.getItem('lang') !== 'en-US' ? antdZhCN : antdEnUS,
dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS
})
+ this.getAppMessage()
} else if (param.type === 'view') {
this.setState({
MenuId: param.MenuID
+ }, () => {
+ this.getMenuParam(param)
})
}
- this.getAppMessage()
} catch {
notification.warning({
top: 92,
@@ -96,11 +103,21 @@
}
}
+ UNSAFE_componentWillReceiveProps(nextProps) {
+ if (this.props.match.params.param !== nextProps.match.params.param) {
+ window.location.reload()
+ }
+ }
+
shouldComponentUpdate (nextProps, nextState) {
return !is(fromJS(this.state), fromJS(nextState))
}
componentDidMount () {
+ if (this.props.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)
@@ -111,6 +128,8 @@
setTimeout(() => {
this.updateCustomComponent()
this.getAppPictures()
+ this.getSmStemp()
+ setGLOBFuncs()
}, 1000)
}
@@ -133,17 +152,29 @@
changeEditMenu = (menu) => {
const { oriConfig, config } = this.state
- if (!is(fromJS(oriConfig), fromJS(config))) {
+ if (!oriConfig || !is(fromJS(oriConfig), fromJS(config))) {
notification.warning({
top: 92,
- message: '閰嶇疆宸蹭慨鏀癸紝璇蜂繚瀛橈紒',
+ message: '閰嶇疆淇℃伅鏈繚瀛橈紒',
duration: 5
})
return
}
- this.props.history.replace('/pcdesign/' + window.btoa(window.encodeURIComponent(JSON.stringify({MenuID: menu.MenuID, type: 'view'}))))
- window.location.reload()
+ let param = {
+ MenuID: menu.MenuID,
+ copyMenuId: menu.copyMenuId || '',
+ type: 'view'
+ }
+
+ param.MenuNo = menu.MenuNo || ''
+ param.MenuName = menu.MenuName || ''
+
+ param = window.btoa(window.encodeURIComponent(JSON.stringify(param)))
+
+ if (param === this.props.match.params.param) return
+
+ this.props.history.push('/pcdesign/' + param)
}
getAppMessage = () => {
@@ -161,67 +192,93 @@
}
let homeId = ''
- if (this.state.MenuId) {
- let appViewList = res.data && res.data.length > 0 ? res.data : []
-
- homeId = this.state.MenuId
-
- sessionStorage.setItem('appViewList', JSON.stringify(appViewList))
- } else {
- let appViewList = []
- if (res.data && res.data.length > 0) {
- appViewList = res.data
- appViewList.forEach(item => {
- if (item.keys_type === 'index') {
- homeId = item.keys_id
- }
- })
- }
-
- if (!homeId) {
- homeId = Utils.getuuid()
-
- let param = {
- func: 's_kei_link_keyids_addupt',
- BID: sessionStorage.getItem('appId'),
- exec_type: 'y',
- LText: ''
+ let appViewList = []
+ if (res.data && res.data.length > 0) {
+ appViewList = res.data
+ appViewList.forEach(item => {
+ if (item.keys_type === 'index') {
+ homeId = item.keys_id
}
+ })
+ }
- appViewList.unshift({
- appkey: window.GLOB.appkey || '',
- bid: sessionStorage.getItem('appId') || '',
- kei_no: sessionStorage.getItem('kei_no') || '',
- keys_id: homeId,
- keys_type: 'index',
- remark: '棣栭〉'
- })
+ if (!homeId) {
+ homeId = Utils.getuuid()
- param.LText = appViewList.map(item => `select '${item.keys_id}','${item.keys_type}','${item.kei_no}','${item.appkey}','${item.bid}','${sessionStorage.getItem('CloudUserID')}','${item.remark}'`)
- param.LText = param.LText.join(' union all ')
- param.LText = Utils.formatOptions(param.LText)
-
- param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt('', param.timestamp)
-
- Api.getSystemConfig(param).then(result => {
- if (!result.status) {
- notification.warning({
- top: 92,
- message: result.message,
- duration: 5
- })
- }
- })
+ let param = {
+ func: 's_kei_link_keyids_addupt',
+ BID: sessionStorage.getItem('appId'),
+ exec_type: 'y',
+ LText: ''
}
+ appViewList.unshift({
+ appkey: window.GLOB.appkey || '',
+ bid: sessionStorage.getItem('appId') || '',
+ kei_no: sessionStorage.getItem('kei_no') || '',
+ keys_id: homeId,
+ keys_type: 'index',
+ remark: '棣栭〉'
+ })
+
+ param.LText = appViewList.map(item => `select '${item.keys_id}','${item.keys_type}','${item.kei_no}','${item.appkey}','${item.bid}','${sessionStorage.getItem('CloudUserID')}','${item.remark}'`)
+ param.LText = param.LText.join(' union all ')
+ param.LText = Utils.formatOptions(param.LText)
+
+ param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ param.secretkey = Utils.encrypt('', param.timestamp)
+
+ Api.getSystemConfig(param).then(result => {
+ if (!result.status) {
+ notification.warning({
+ top: 92,
+ message: result.message,
+ duration: 5
+ })
+ } else {
+ sessionStorage.setItem('appViewList', JSON.stringify(appViewList))
+ sessionStorage.setItem('appHomeId', homeId)
+ this.props.history.replace('/pcdesign/' + window.btoa(window.encodeURIComponent(JSON.stringify({MenuID: homeId, type: 'view'}))))
+ }
+ })
+ } else {
sessionStorage.setItem('appViewList', JSON.stringify(appViewList))
+ sessionStorage.setItem('appHomeId', homeId)
+ this.props.history.replace('/pcdesign/' + window.btoa(window.encodeURIComponent(JSON.stringify({MenuID: homeId, type: 'view'}))))
}
- this.props.history.replace('/pcdesign/' + window.btoa(window.encodeURIComponent(JSON.stringify({MenuID: homeId, type: 'view'}))))
-
- this.setState({MenuId: homeId}, () => {
- this.getMenuParam()
- })
+ })
+ }
+
+ 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))
})
}
@@ -237,6 +294,12 @@
}).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
+ })
}
Api.getSystemConfig({
@@ -248,6 +311,12 @@
}).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
+ })
}
})
})
@@ -256,10 +325,17 @@
updateCustomComponent = () => {
Api.getSystemConfig({
func: 's_get_custom_components',
+ typename: 'pc',
typecharone: ''
}).then(res => {
let coms = []
- if (res.cus_list && res.cus_list.length > 0) {
+ if (!res.status) {
+ notification.warning({
+ top: 92,
+ message: res.message,
+ duration: 5
+ })
+ } else if (res.cus_list && res.cus_list.length > 0) {
res.cus_list.forEach(item => {
let config = ''
@@ -312,10 +388,10 @@
}
delButtons = (items) => {
- const { copyButtons } = this.state
+ const { copyButtons, delButtons } = this.state
this.setState({
- delButtons: [...this.state.delButtons, ...items],
+ delButtons: [...delButtons, ...items],
copyButtons: copyButtons.filter(item => !items.includes(item.uuid))
})
}
@@ -331,10 +407,10 @@
initPopview = (card, btn) => {
const { oriConfig, config } = this.state
- if (!is(fromJS(oriConfig), fromJS(config))) {
+ if (!oriConfig || !is(fromJS(oriConfig), fromJS(config))) {
notification.warning({
top: 92,
- message: '閰嶇疆宸蹭慨鏀癸紝璇蜂繚瀛橈紒',
+ message: '閰嶇疆淇℃伅鏈繚瀛橈紒',
duration: 5
})
return
@@ -356,9 +432,9 @@
return
}
- if (!is(fromJS(oriConfig), fromJS(config))) {
+ if (!oriConfig || !is(fromJS(oriConfig), fromJS(config))) {
confirm({
- title: '閰嶇疆宸蹭慨鏀癸紝鏀惧純淇濆瓨鍚楋紵',
+ title: '閰嶇疆淇℃伅鏈繚瀛橈紝纭畾鍏抽棴鍚楋紵',
content: '',
onOk() {
window.close()
@@ -370,7 +446,7 @@
}
}
- getMenuParam = () => {
+ getMenuParam = (urlParam) => {
const { MenuId } = this.state
let param = {
@@ -381,8 +457,19 @@
}
Api.getSystemConfig(param).then(result => {
- if (result.status) {
+ if (!result.status) {
+ notification.warning({
+ top: 92,
+ message: result.message,
+ duration: 5
+ })
+ this.setState({loading: false})
+ return
+ } else if (!result.LongParam && urlParam.copyMenuId) {
+ this.getCopyParam(urlParam)
+ } else {
let config = null
+ let isCreate = false
try {
config = result.LongParam ? JSON.parse(window.decodeURIComponent(window.atob(result.LongParam))) : null
@@ -392,14 +479,15 @@
}
if (!config) {
+ isCreate = true
config = {
version: 1.0,
uuid: MenuId,
MenuID: MenuId,
Template: 'webPage',
enabled: false,
- MenuName: '',
- MenuNo: '',
+ MenuName: urlParam.MenuName || '',
+ MenuNo: urlParam.MenuNo || '',
tables: [],
components: [],
viewType: 'menu',
@@ -412,6 +500,7 @@
config.uuid = MenuId
config.MenuID = MenuId
config.open_edition = result.open_edition || ''
+ window.GLOB.urlFields = config.urlFields || []
let indeComs = []
config.components.forEach(item => {
@@ -422,23 +511,21 @@
if (indeComs.length === 0) {
this.setState({
- oriConfig: config,
+ oriConfig: isCreate ? null : config,
config: fromJS(config).toJS(),
+ loading: false
})
-
- this.props.modifyCustomMenu(config)
+
+ window.GLOB.customMenu = config
} else {
- this.jointComponents(config, indeComs)
+ this.jointComponents(config, indeComs, isCreate)
}
- } else {
- notification.warning({
- top: 92,
- message: result.message,
- duration: 5
- })
}
})
+ this.getAppMenus()
+ }
+ getAppMenus = () => {
let _param = {
func: 's_get_app_menus',
TypeCharOne: sessionStorage.getItem('kei_no'),
@@ -468,7 +555,91 @@
})
}
- jointComponents = (config, indeComs) => {
+ getCopyParam = (urlParam) => {
+ const { MenuId } = this.state
+
+ let param = {
+ func: 'sPC_Get_LongParam',
+ TypeCharOne: sessionStorage.getItem('kei_no'),
+ typename: 'pc',
+ MenuID: urlParam.copyMenuId
+ }
+
+ Api.getSystemConfig(param).then(result => {
+ if (!result.status) {
+ notification.warning({
+ top: 92,
+ message: result.message,
+ duration: 5
+ })
+ this.setState({loading: false})
+ return
+ } else if (!result.LongParam) {
+ notification.warning({
+ top: 92,
+ message: '鏈煡璇㈠埌澶嶅埗鑿滃崟閰嶇疆淇℃伅锛�',
+ duration: 5
+ })
+ }
+
+ let config = null
+
+ try {
+ config = result.LongParam ? JSON.parse(window.decodeURIComponent(window.atob(result.LongParam))) : null
+ } catch (e) {
+ console.warn('Parse Failure')
+ config = null
+ }
+
+
+ if (!config) {
+ config = {
+ version: 1.0,
+ uuid: MenuId,
+ MenuID: MenuId,
+ Template: 'webPage',
+ enabled: false,
+ MenuName: '',
+ MenuNo: '',
+ tables: [],
+ components: [],
+ viewType: 'menu',
+ style: {
+ backgroundColor: '#ffffff', backgroundImage: '', paddingLeft: '20px', paddingRight: '20px'
+ }
+ }
+ } else {
+ config.components = MenuUtils.resetConfig(config.components)
+ message.success('澶嶅埗鎴愬姛锛屼繚瀛樺悗鐢熸晥銆�')
+ }
+
+ config.uuid = MenuId
+ config.MenuID = MenuId
+ config.open_edition = ''
+ config.MenuName = urlParam.MenuName || ''
+ config.MenuNo = urlParam.MenuNo || ''
+
+ let indeComs = []
+ config.components.forEach(item => {
+ if (item.type === 'navbar') {
+ indeComs.push(fromJS(item).toJS())
+ }
+ })
+
+ if (indeComs.length === 0) {
+ this.setState({
+ oriConfig: null,
+ config: fromJS(config).toJS(),
+ loading: false
+ })
+ window.GLOB.customMenu = config
+ } else {
+ this.jointComponents(config, indeComs, true)
+ }
+ })
+ }
+
+ jointComponents = (config, indeComs, isCreate) => {
let deffers = indeComs.map(item => {
return new Promise(resolve => {
Api.getSystemConfig({
@@ -485,7 +656,6 @@
message: res.message,
duration: 5
})
- return
}
resolve(res)
@@ -533,11 +703,12 @@
}
this.setState({
- oriConfig: fromJS(config).toJS(),
- config: config
+ oriConfig: isCreate ? null : fromJS(config).toJS(),
+ config: config,
+ loading: false
})
- this.props.modifyCustomMenu(config)
+ window.GLOB.customMenu = config
})
}
@@ -650,6 +821,11 @@
message: '璇峰畬鍠勮彍鍗曞熀鏈俊鎭紒',
duration: 5
})
+ sessionStorage.setItem('settingshow', 'true')
+ this.setState({
+ settingshow: true,
+ activeKey: 'basedata'
+ })
return
}
@@ -752,25 +928,92 @@
LText: '',
LTexttb: ''
}
-
+
_param.LongParam = window.btoa(window.encodeURIComponent(JSON.stringify(item)))
_param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
_param.secretkey = Utils.encrypt('', _param.timestamp)
- Api.getSystemConfig(_param).then(res => {
- if (!res.status) {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
- })
- return
+ let appMenuParam = null
+ if (item.type === 'navbar') {
+ appMenuParam = {
+ func: 's_appmenus_addupt',
+ exec_type: 'y'
}
+
+ appMenuParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ appMenuParam.secretkey = Utils.encrypt('', _param.timestamp)
- new_open_edition[item.uuid] = res.open_edition || ''
-
- resolve()
- })
+ let LText = []
+ let app_param = []
+ let kei_no = sessionStorage.getItem('kei_no')
+ let userid = sessionStorage.getItem('CloudUserID') || ''
+
+ item.menus.forEach((fst, findex) => {
+ // LText.push(`select '${fst.MenuID}','${fst.name}','','0','${sessionStorage.getItem('appId')}','0','${(findex + 1) * 10}','10','','${userid}','${window.GLOB.appkey}','${fst.MenuNo || ''}','${kei_no}','pc'`)
+ LText.push(`select '${fst.MenuID}','${fst.name}','','0','0','0','${(findex + 1) * 10}','10','','${userid}','${window.GLOB.appkey}','${fst.MenuNo || ''}','${kei_no}','pc'`)
+ app_param.push(`select '${window.GLOB.appkey}','${fst.MenuID}','${userid}','${(findex + 1) * 10}','','${fst.name}','${fst.MenuNo || ''}','0','10','${kei_no}','pc'`)
+ if (fst.property === 'classify' && fst.sublist.length > 0) {
+ fst.sublist.forEach(scd => {
+ LText.push(`select '${scd.MenuID}','${scd.name}','','0','${fst.MenuID}','0','${(findex + 1) * 10}','20','','${userid}','${window.GLOB.appkey}','${scd.MenuNo || ''}','${kei_no}','pc'`)
+ app_param.push(`select '${window.GLOB.appkey}','${scd.MenuID}','${userid}','${(findex + 1) * 10}','','${scd.name}','${scd.MenuNo || ''}','${fst.MenuID}','20','${kei_no}','pc'`)
+
+ if (scd.property === 'classify' && scd.sublist.length > 0) {
+ scd.sublist.forEach(thd => {
+ LText.push(`select '${thd.MenuID}','${thd.name}','','0','${scd.MenuID}','0','${(findex + 1) * 10}','20','','${userid}','${window.GLOB.appkey}','${thd.MenuNo || ''}','${kei_no}','pc'`)
+ app_param.push(`select '${window.GLOB.appkey}','${thd.MenuID}','${userid}','${(findex + 1) * 10}','','${thd.name}','${thd.MenuNo || ''}','${scd.MenuID}','20','${kei_no}','pc'`)
+ })
+ }
+ })
+ }
+ })
+ appMenuParam.LText = Utils.formatOptions(LText.join(' union '))
+ appMenuParam.LText1 = Utils.formatOptions(app_param.join(' union '))
+ }
+
+ if (appMenuParam) {
+ Api.getSystemConfig(appMenuParam).then(_res => {
+ if (!_res.status) {
+ notification.warning({
+ top: 92,
+ message: _res.message,
+ duration: 5
+ })
+ this.setState({ menuloading: false })
+ return
+ }
+
+ Api.getSystemConfig(_param).then(res => {
+ if (!res.status) {
+ notification.warning({
+ top: 92,
+ message: res.message,
+ duration: 5
+ })
+ this.setState({ menuloading: false })
+ return
+ }
+
+ new_open_edition[item.uuid] = res.open_edition || ''
+
+ resolve()
+ })
+ })
+ } else {
+ Api.getSystemConfig(_param).then(res => {
+ if (!res.status) {
+ notification.warning({
+ top: 92,
+ message: res.message,
+ duration: 5
+ })
+ this.setState({ menuloading: false })
+ return
+ }
+
+ new_open_edition[item.uuid] = res.open_edition || ''
+ resolve()
+ })
+ }
})
})
Promise.all(deffers).then(() => {
@@ -778,6 +1021,7 @@
appViewList = JSON.parse(appViewList)
let _length = appViewList.length
let appIndeList = appViewList.map(item => item.keys_id).join(',')
+
config.components = config.components.map(item => {
if (item.type === 'navbar') {
@@ -799,27 +1043,28 @@
})
if (appViewList.length > _length) {
- let param = {
+ let kparam = {
func: 's_kei_link_keyids_addupt',
BID: sessionStorage.getItem('appId'),
exec_type: 'y',
LText: ''
}
- param.LText = appViewList.map(item => `select '${item.keys_id}','${item.keys_type}','${item.kei_no}','${item.appkey}','${item.bid}','${sessionStorage.getItem('CloudUserID')}','${item.remark}'`)
- param.LText = param.LText.join(' union all ')
- param.LText = Utils.formatOptions(param.LText)
+ kparam.LText = appViewList.map(item => `select '${item.keys_id}','${item.keys_type}','${item.kei_no}','${item.appkey}','${item.bid}','${sessionStorage.getItem('CloudUserID')}','${item.remark}'`)
+ kparam.LText = kparam.LText.join(' union all ')
+ kparam.LText = Utils.formatOptions(kparam.LText)
- param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt('', param.timestamp)
+ kparam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ kparam.secretkey = Utils.encrypt('', kparam.timestamp)
- Api.getSystemConfig(param).then(result => {
+ Api.getSystemConfig(kparam).then(result => {
if (!result.status) {
notification.warning({
top: 92,
message: result.message,
duration: 5
})
+ this.setState({ menuloading: false })
} else {
sessionStorage.setItem('appViewList', JSON.stringify(appViewList))
resolve(true)
@@ -830,17 +1075,16 @@
}
})
}
- }).then(res => { // 鎸夐挳鍒犻櫎
+ }).then(res => { // 鎸夐挳鎴栬彍鍗曞垹闄�
if (!res) return
if (delButtons.length === 0) {
- return {
- status: true
- }
+ return { status: true, nonexec: true }
} else {
+ let appHomeId = sessionStorage.getItem('appHomeId')
let _param = {
func: 'sPC_MainMenu_Del',
- MenuID: delButtons.join(',')
+ MenuID: delButtons.filter(id => id !== appHomeId).join(',')
}
return Api.getSystemConfig(_param)
}
@@ -853,13 +1097,13 @@
duration: 5
})
return false
+ } else if (!res.nonexec) { // 鎵ц鍒犻櫎鍚庡埛鏂拌彍鍗曞垪琛�
+ this.getAppMenus()
}
let ids = thawButtons.filter(item => btnIds.indexOf(item) !== -1)
if (ids.length === 0) {
- return {
- status: true
- }
+ return { status: true }
} else {
return Api.getSystemConfig({
func: 'sPC_MainMenu_ReDel',
@@ -1072,25 +1316,44 @@
const { config } = this.state
let error = ''
- config.components.forEach(item => {
- if (error) return
- if (['propcard', 'brafteditor', 'sandbox'].includes(item.subtype) && item.wrap.datatype === 'static') return
+ let check = (components) => {
+ components.forEach(item => {
+ if (error) return
+ if (item.type === 'tabs') {
+ item.subtabs.forEach(tab => {
+ check(tab.components)
+ })
+ return
+ } else if (item.type === 'group') {
+ check(item.components)
+ return
+ }
+ if (['propcard', 'brafteditor', 'sandbox', 'stepform'].includes(item.subtype) && 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}銆嬫湭璁剧疆涓婚敭锛乣
+ }
+ }
+ 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}銆嬪熀鏈俊鎭皻鏈缃紒`
+ }
+ })
+ }
- 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.interType && !item.setting.primaryKey) {
- error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆涓婚敭锛乣
- }
- }
- if (item.type === 'bar' || item.type === 'line' || item.type === 'pie') {
- if (!item.plot.Xaxis) {
- error = `缁勪欢銆�${item.name}銆嬪浘琛ㄥ瓧娈靛皻鏈缃紒`
- }
- }
- })
+ check(config.components)
if (show && error) {
notification.warning({
@@ -1109,7 +1372,7 @@
config: config
})
- this.props.modifyCustomMenu(config)
+ window.GLOB.customMenu = config
}
insert = (item) => {
@@ -1118,16 +1381,16 @@
config.components.push(item)
this.setState({config})
- this.props.modifyCustomMenu(config)
+ window.GLOB.customMenu = config
}
refreshView = () => {
const { oriConfig, config } = this.state
- if (!is(fromJS(oriConfig), fromJS(config))) {
+ if (!oriConfig || !is(fromJS(oriConfig), fromJS(config))) {
notification.warning({
top: 92,
- message: '閰嶇疆宸蹭慨鏀癸紝璇蜂繚瀛橈紒',
+ message: '閰嶇疆淇℃伅鏈繚瀛橈紒',
duration: 5
})
return
@@ -1141,12 +1404,73 @@
window.location.reload()
}
+ setHomeView = () => {
+ const { oriConfig, config } = this.state
+
+ if (!oriConfig || !is(fromJS(oriConfig), fromJS(config))) {
+ notification.warning({
+ top: 92,
+ message: '閰嶇疆淇℃伅鏈繚瀛橈紒',
+ duration: 5
+ })
+ return
+ }
+
+ let param = {
+ func: 's_kei_link_keyids_addupt',
+ BID: sessionStorage.getItem('appId'),
+ exec_type: 'y',
+ LText: ''
+ }
+
+ let appViewList = sessionStorage.getItem('appViewList')
+ appViewList = appViewList ? JSON.parse(appViewList) : []
+ appViewList = appViewList.filter(item => item.keys_type !== 'index')
+
+ appViewList.unshift({
+ appkey: window.GLOB.appkey || '',
+ bid: sessionStorage.getItem('appId') || '',
+ kei_no: sessionStorage.getItem('kei_no') || '',
+ keys_id: config.MenuID,
+ keys_type: 'index',
+ remark: config.MenuName
+ })
+
+ param.LText = appViewList.map(item => `select '${item.keys_id}','${item.keys_type}','${item.kei_no}','${item.appkey}','${item.bid}','${sessionStorage.getItem('CloudUserID')}','${item.remark}'`)
+ param.LText = param.LText.join(' union all ')
+ param.LText = Utils.formatOptions(param.LText)
+
+ param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ param.secretkey = Utils.encrypt('', param.timestamp)
+
+ confirm({
+ title: '纭畾璁剧疆鏈〉闈负棣栭〉鍚楋紵',
+ content: '',
+ onOk() {
+ Api.getSystemConfig(param).then(result => {
+ if (!result.status) {
+ notification.warning({
+ top: 92,
+ message: result.message,
+ duration: 5
+ })
+ } else {
+ sessionStorage.setItem('appHomeId', config.MenuID)
+ sessionStorage.setItem('appViewList', JSON.stringify(appViewList))
+ }
+ })
+ },
+ onCancel() {}
+ })
+ }
+
render () {
- const { localedict, activeKey, settingshow, controlshow, dict, MenuId, config, menuloading, customComponents } = this.state
+ const { localedict, loading, activeKey, settingshow, controlshow, dict, MenuId, config, menuloading, customComponents } = this.state
return (
<ConfigProvider locale={localedict}>
- <div className={'mk-pc-view '} id="mk-menu-design-view">
+ <div className={'mk-pc-view '} id="mk-pc-design-view">
+ {loading ? <Spin className="view-spin" size="large" /> : null}
<DndProvider backend={HTML5Backend}>
<div className={'menu-setting ' + (!settingshow ? 'hidden' : '')}>
<div className="draw">
@@ -1164,6 +1488,7 @@
MenuId={MenuId}
updateConfig={this.updateConfig}
/> : null}
+ {config ? <UrlFieldComponent config={config} updateConfig={this.updateConfig}/> : null}
{/* 琛ㄥ悕娣诲姞 */}
{config ? <TableComponent config={config} updatetable={this.updateConfig}/> : null}
</Panel>
@@ -1174,11 +1499,8 @@
{customComponents && customComponents.length ? <Panel header="鑷畾涔夌粍浠�" key="cuscomponent">
<SourceWrap components={customComponents} />
</Panel> : null}
- <Panel header={'椤甸潰鑳屾櫙'} key="background">
+ <Panel header={'椤甸潰鏍峰紡'} key="background">
{config ? <BgController config={config} updateConfig={this.updateConfig} /> : null}
- </Panel>
- <Panel header={'椤甸潰鍐呰竟璺�'} key="padding">
- {config ? <PaddingController config={config} updateConfig={this.updateConfig} /> : null}
</Panel>
</Collapse>
</div>
@@ -1190,13 +1512,15 @@
</div>
<Button type="primary" onClick={this.submitConfig} loading={menuloading}>{dict['mob.save']}</Button>
<Switch className="big" checkedChildren={dict['mob.enable']} unCheckedChildren={dict['mob.disable']} checked={config && config.enabled} onChange={this.onEnabledChange} />
+ <CreateView resetmenu={this.getAppMenus} />
<PasteController type="menu" Tab={null} insert={this.insert} />
<StyleCombControlButton menu={config} />
<SysInterface config={config} updateConfig={this.updateConfig}/>
<PictureController/>
<Quotecomponent config={config} updateConfig={this.updateConfig}/>
+ <Button className="mk-border-green" icon="home" onClick={this.setHomeView}>璁句负棣栭〉</Button>
<Button className="mk-border-danger" icon="redo" onClick={this.refreshView}>寮哄埗鍒锋柊</Button>
- <Button type="default" onClick={this.closeView}>{dict['mob.return']}</Button>
+ <Button type="default" onClick={this.closeView}>鍏抽棴</Button>
</div>
<div className={'menu-body ' + (menuloading ? 'saving' : '')}>
{config && config.components ? <MenuShell menu={config} handleList={this.updateConfig} /> : null}
@@ -1211,14 +1535,14 @@
}
}
-const mapStateToProps = () => {
- return {}
-}
-
-const mapDispatchToProps = (dispatch) => {
+const mapStateToProps = (state) => {
return {
- modifyCustomMenu: (customMenu) => dispatch(modifyCustomMenu(customMenu))
+ memberLevel: state.memberLevel
}
}
-export default connect(mapStateToProps, mapDispatchToProps)(MenuDesign)
\ No newline at end of file
+const mapDispatchToProps = () => {
+ return {}
+}
+
+export default withRouter(connect(mapStateToProps, mapDispatchToProps)(MenuDesign))
\ No newline at end of file
--
Gitblit v1.8.0