From a29edbd4c670e1907e38e98f20257e5519745a4d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 08 十二月 2022 17:36:21 +0800
Subject: [PATCH] 2022-12-08
---
src/views/mobdesign/index.jsx | 907 +++++++++++++++++++++++++------------------------------
1 files changed, 414 insertions(+), 493 deletions(-)
diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index 15218a9..c392429 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -2,21 +2,20 @@
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, 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 antdZhCN from 'antd/es/locale/zh_CN'
import MKEmitter from '@/utils/events.js'
-import MenuUtils from '@/utils/utils-custom.js'
+import MenuUtils, { getTables } from '@/utils/utils-custom.js'
import asyncComponent from '@/utils/asyncComponent'
+import '@/assets/css/design.scss'
import './index.scss'
const { Panel } = Collapse
@@ -31,6 +30,8 @@
const Versions = asyncComponent(() => import('@/menu/versions'))
const ViewNodes = asyncComponent(() => import('@/menu/viewnodes'))
const SourceWrap = asyncComponent(() => import('@/mob/modulesource'))
+const Modulecell = asyncComponent(() => import('@/menu/modulecell'))
+const TableNodes = asyncComponent(() => import('@/menu/tablenodes'))
const BgController = asyncComponent(() => import('@/pc/bgcontroller'))
const ReplaceField = asyncComponent(() => import('@/menu/replaceField'))
const SysInterface = asyncComponent(() => import('@/menu/sysinterface'))
@@ -59,17 +60,14 @@
class MobDesign extends Component {
state = {
- localedict: sessionStorage.getItem('lang') !== 'en-US' ? antdZhCN : antdEnUS,
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
loading: true,
MenuId: '',
MenuName: '',
MenuNo: '',
- activeKey: 'component',
+ activeKey: 'basedata',
menuloading: false,
oriConfig: null,
config: null,
- customComponents: [],
direction: 'vertical',
settingshow: true,
controlshow: true,
@@ -77,7 +75,7 @@
adapters: [],
viewType: 'menu',
eyeopen: false,
- modalStatus: false // 寮圭獥鏄惁寮�鍚紝鍒ゆ柇ctrl+s鏄惁鍙敤
+ needUpdate: false
}
UNSAFE_componentWillMount() {
@@ -87,20 +85,15 @@
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('typename', param.typename || 'mob')
sessionStorage.setItem('adapter', param.adapter || '')
sessionStorage.setItem('sysBgColor', param.sysBgColor || '#ffffff')
sessionStorage.setItem('userbind', param.userbind || '')
sessionStorage.setItem('instantMessage', param.instantMessage || '')
- 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') {
window.GLOB.winWidth = 420
@@ -128,7 +121,6 @@
viewType: /^userbind/.test(param.MenuID) ? 'userbind' : 'menu'
}, () => {
this.getMenuParam(param)
- this.getRelationMenus()
})
}
} catch (e) {
@@ -155,20 +147,9 @@
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('modalStatus', this.modalStatus)
MKEmitter.addListener('triggerMenuSave', this.submitConfig)
MKEmitter.addListener('changeEditMenu', this.changeEditMenu)
- MKEmitter.addListener('submitComponentStyle', this.updateComponentStyle)
- MKEmitter.addListener('updateCustomComponent', this.updateCustomComponent)
setTimeout(() => {
- if (sessionStorage.getItem('app_custom_components')) {
- let list = sessionStorage.getItem('app_custom_components')
- list = JSON.parse(list)
-
- this.setCustomComponent(list)
- } else {
- this.updateCustomComponent()
- }
this.getAppPictures()
this.getSmStemp()
this.getRoleFields()
@@ -194,10 +175,23 @@
let _shortcut = `${preKey}+${keyCode}`
if (_shortcut === 'ctrl+83') {
- if (this.state.modalStatus) {
+ 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: '璇蜂繚瀛�' + this.state.modalStatus,
+ message: '璇蜂繚瀛�' + msg,
duration: 5
})
return false
@@ -223,54 +217,49 @@
this.setState = () => {
return
}
- MKEmitter.removeListener('modalStatus', this.modalStatus)
MKEmitter.removeListener('triggerMenuSave', this.submitConfig)
MKEmitter.removeListener('changeEditMenu', this.changeEditMenu)
- MKEmitter.removeListener('submitComponentStyle', this.updateComponentStyle)
- MKEmitter.removeListener('updateCustomComponent', this.updateCustomComponent)
- }
-
- modalStatus = (val) => {
- this.setState({modalStatus: val})
}
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
+ if (!sessionStorage.getItem('msgTemplate')) {
+ let _sql = `select聽ID,TemplateCode,SignName+'_'+describe as 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'
}
- sessionStorage.setItem('msgTemplate', JSON.stringify(msgs))
- })
+
+ 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))
+ })
+ }
}
changeEditMenu = (menu) => {
const { oriConfig, config } = this.state
- if (!oriConfig || !is(fromJS(oriConfig), fromJS(config))) {
+ if (!is(fromJS(oriConfig || {}), fromJS(config || {}))) {
notification.warning({
top: 92,
message: '閰嶇疆淇℃伅鏈繚瀛橈紒',
@@ -377,111 +366,39 @@
}
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 || []))
- }
-
- 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 || []))
- }
- })
- 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 || []))
- }
- })
- })
- }
-
- updateCustomComponent = () => {
- Api.getSystemConfig({
- func: 's_get_custom_components',
- typename: sessionStorage.getItem('typename'),
- typecharone: ''
- }).then(res => {
- 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)
})
- } else if (res.cus_list) {
- sessionStorage.setItem('app_custom_components', JSON.stringify(res.cus_list))
- this.setCustomComponent(res.cus_list)
- }
- })
- }
+ }, 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)
+ })]
- setCustomComponent = (cus_list) => {
- let coms = []
-
- 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,
- config
- })
- })
- this.setState({customComponents: coms})
- }
-
- 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
- })
+ 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] || []))
})
}
@@ -490,7 +407,7 @@
if (!config) {
window.close()
- } else if (!oriConfig || !is(fromJS(oriConfig), fromJS(config))) {
+ } else if (!is(fromJS(oriConfig || {}), fromJS(config || {}))) {
confirm({
title: '閰嶇疆淇℃伅鏈繚瀛橈紝纭畾鍏抽棴鍚楋紵',
content: '',
@@ -509,7 +426,7 @@
if (!config) {
window.history.back()
- } else if (!oriConfig || !is(fromJS(oriConfig), fromJS(config))) {
+ } else if (!is(fromJS(oriConfig || {}), fromJS(config || {}))) {
confirm({
title: '閰嶇疆淇℃伅鏈繚瀛橈紝纭畾鍚庨��鍚楋紵',
content: '',
@@ -546,7 +463,6 @@
this.getCopyParam(urlParam)
} else {
let config = null
- let isCreate = false
try {
config = result.LongParam ? JSON.parse(window.decodeURIComponent(window.atob(result.LongParam))) : null
@@ -561,15 +477,13 @@
}
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: [],
@@ -586,59 +500,43 @@
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(),
- activeKey: isCreate ? 'basedata' : 'component',
+ oriConfig: fromJS(config).toJS(),
+ config: config,
loading: false
})
window.GLOB.customMenu = config
} else {
- this.jointComponents(config, indeComs, isCreate)
+ this.jointComponents(config, navItem)
}
}
})
this.getAppMenus()
}
- getRelationMenus = () => {
- const { MenuId } = this.state
-
- let param = {
- func: 's_get_menu_used_list',
- TypeCharOne: sessionStorage.getItem('kei_no'),
- typename: sessionStorage.getItem('typename'),
- par_menuid: MenuId,
- // used_menuid: MenuId
- }
-
- Api.getSystemConfig(param).then(result => {
- if (!result.status) {
- notification.warning({
- top: 92,
- message: result.message,
- duration: 5
- })
- return
- }
- })
- }
-
setUserBindMenu = (config, result) => {
const { MenuId } = this.state
- let isCreate = !config
if (!config) {
config = {
- version: 1.0,
+ version: 2.0,
uuid: MenuId,
MenuID: MenuId,
Template: 'webPage',
@@ -662,19 +560,16 @@
backElements: []
}
],
- headerStyle: {}, parentId: '', width: 24, scripts: [], btnlog: [], pageable: false,
+ headerStyle: {}, width: 24, scripts: [], pageable: false,
wrap: {name: 'logo', width: 24, datatype: 'static', cardType: '', blacklist: []},
name: 'logo', floor: 1, switchable: true,
- setting:{interType: 'system'}, tabId: '', style:{paddingTop: '8vh', paddingBottom: '10vh'}, dataName: Utils.getuuid(), format: 'object', subtype: 'propcard', type: 'card', uuid: Utils.getuuid(), columns: []
+ setting:{interType: 'system'}, style:{paddingTop: '8vh', paddingBottom: '10vh'}, format: 'object', subtype: 'propcard', type: 'card', uuid: Utils.getuuid(), columns: []
})
config.components.push({
uuid: Utils.getuuid(),
type: 'login',
floor: 1,
- tabId: '',
- parentId: '',
- dataName: '',
width: 24,
name: '鐢ㄦ埛缁戝畾',
subtype: 'bindlogin',
@@ -694,10 +589,10 @@
backElements: []
}
],
- headerStyle: {}, parentId: '', width: 24, scripts: [], btnlog: [], pageable: false,
+ headerStyle: {}, width: 24, scripts: [], pageable: false,
wrap: {name: 'Power', width: 24, datatype: 'static', cardType: '', blacklist: []},
name: 'Power', floor: 1, switchable: true,
- setting:{interType: 'system'}, tabId: '', style:{}, dataName: Utils.getuuid(), format: 'object', subtype: 'propcard', type: 'card', uuid: Utils.getuuid(), columns: []
+ setting:{interType: 'system'}, style:{}, format: 'object', subtype: 'propcard', type: 'card', uuid: Utils.getuuid(), columns: []
})
}
@@ -706,9 +601,8 @@
config.open_edition = result.open_edition || ''
this.setState({
- oriConfig: isCreate ? null : config,
- config: fromJS(config).toJS(),
- activeKey: isCreate ? 'basedata' : 'component',
+ oriConfig: fromJS(config).toJS(),
+ config: config,
loading: false
})
window.GLOB.customMenu = config
@@ -737,11 +631,11 @@
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(',')
- if (sessionStorage.getItem('userbind')) {
- appIndeList = appIndeList + ',' + sessionStorage.getItem('userbind')
- }
+ // if (sessionStorage.getItem('userbind')) {
+ // appIndeList = appIndeList + ',' + sessionStorage.getItem('userbind')
+ // }
if (sessionStorage.getItem('instantMessage')) {
appIndeList = appIndeList + ',' + sessionStorage.getItem('instantMessage')
}
@@ -796,7 +690,7 @@
if (!config) {
config = {
- version: 1.0,
+ version: 2.0,
uuid: MenuId,
MenuID: MenuId,
Template: 'webPage',
@@ -811,7 +705,26 @@
}
}
} else {
- config.components = MenuUtils.resetConfig(config.components, {}, urlParam.clearMenu)
+ let uuids = {} // 閲嶇疆鍏叡鏁版嵁婧�
+ if (config.interfaces && config.interfaces.length > 0) {
+ config.interfaces = config.interfaces.map(inter => {
+ uuids[inter.uuid] = this.getuuid()
+ inter.uuid = uuids[inter.uuid]
+ return inter
+ })
+ }
+
+ config.components = MenuUtils.resetConfig(config.components, uuids, 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('澶嶅埗鎴愬姛锛屼繚瀛樺悗鐢熸晥銆�')
}
@@ -823,14 +736,14 @@
// 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(),
@@ -839,37 +752,27 @@
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: sessionStorage.getItem('typename'),
- 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: sessionStorage.getItem('typename'),
+ 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
@@ -880,58 +783,84 @@
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(),
- activeKey: isCreate ? 'basedata' : 'component',
+ oriConfig: fromJS(config).toJS(),
config: config,
loading: false
})
+
window.GLOB.customMenu = config
})
}
- getMenuMessage = () => {
+ 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
+ })
+ }
+
+ getMenuMessage = (tbs) => {
const { config } = this.state
let traversal = (components) => {
let list = []
components.forEach(item => {
+ if (item.$tables) {
+ tbs.push(...item.$tables)
+ }
+
+ if (item.plot && item.plot.permission !== 'true') {
+ return
+ } else if (['login', 'navbar', 'topbar'].includes(item.type) || item.subtype === 'commonbar') {
+ 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 === 'topbar' || item.type === 'login' || item.type === 'navbar' || (item.type === 'menubar' && item.subtype === 'commonbar')) {
- return null
- } else if (item.type === 'tabs') {
+ if (item.type === 'tabs') {
let tabs = []
let mm = []
item.subtabs.forEach(tab => {
@@ -958,7 +887,7 @@
list.push(...mm)
}
- return null
+ return
} else if (item.type === 'group') {
m.children = traversal(item.components)
@@ -968,12 +897,8 @@
list.push(...m.children)
}
- return null
- } if (item.plot && item.plot.permission !== 'true') {
- return null
- } if (item.wrap && item.wrap.permission !== 'true') {
- return null
- } else if (item.type === 'card' || (item.type === 'table' && item.subtype === 'tablecard')) {
+ return
+ } else if (item.type === 'card' || item.type === 'carousel' || item.type === 'timeline') {
item.action && item.action.forEach(btn => {
if (btn.hidden === 'true') return
@@ -984,20 +909,7 @@
})
item.subcards.forEach(card => {
card.elements && card.elements.forEach(cell => {
- if (cell.eleType !== 'button') return
- if (cell.hidden === 'true') return
-
- m.children.push({
- key: cell.uuid,
- title: cell.label,
- })
- })
- })
- } else if (item.type === 'carousel' || item.type === 'timeline') {
- item.subcards.forEach(card => {
- card.elements && card.elements.forEach(cell => {
- if (cell.eleType !== 'button') return
- if (cell.hidden === 'true') return
+ if (cell.eleType !== 'button' || cell.hidden === 'true') return
m.children.push({
key: cell.uuid,
@@ -1007,8 +919,7 @@
})
} else if (item.type === 'balcony') {
item.elements && item.elements.forEach(cell => {
- if (cell.eleType !== 'button') return
- if (cell.hidden === 'true') return
+ if (cell.eleType !== 'button' || cell.hidden === 'true') return
m.children.push({
key: cell.uuid,
@@ -1035,7 +946,7 @@
}
})
}
- } else if (item.type === 'table' && item.subtype === 'normaltable') {
+ } else if (item.type === 'table') {
item.action && item.action.forEach(btn => {
if (btn.hidden === 'true') return
@@ -1064,6 +975,14 @@
}
let trees = traversal(config.components)
+
+ if (config.interfaces) {
+ config.interfaces.forEach(item => {
+ if (item.$tables) {
+ tbs.push(...item.$tables)
+ }
+ })
+ }
return trees
}
@@ -1104,7 +1023,6 @@
menus.push({
MenuID: m.uuid,
MenuName: m.setting.name,
- // MenuNo: m.setting.MenuNo
MenuNo: ''
})
}
@@ -1118,7 +1036,7 @@
})
} else if (item.type === 'group') {
traversal(item.components)
- } else if (item.type === 'card' || (item.type === 'table' && item.subtype === 'tablecard')) {
+ } 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])
@@ -1146,21 +1064,6 @@
}
})
})
- } else if (item.type === 'carousel' || item.type === 'timeline') {
- item.subcards.forEach(card => {
- if (card.setting.click === 'menu' && menuObj[card.setting.menu]) {
- menus.push(menuObj[card.setting.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])
- }
- })
- })
} else if (item.type === 'balcony') {
item.elements && item.elements.forEach(cell => {
if (cell.eleType !== 'button') return
@@ -1177,7 +1080,7 @@
menus.push(menuObj[m.subButton.linkmenu])
}
})
- } else if (item.type === 'table' && item.subtype === 'normaltable') {
+ } else if (item.type === 'table') {
item.action && item.action.forEach(btn => {
if (btn.linkmenu && menuObj[btn.linkmenu]) {
menus.push(menuObj[btn.linkmenu])
@@ -1236,7 +1139,7 @@
})
} else if (item.type === 'group') {
item.components = traversal(item.components)
- } else if (['card', 'carousel', 'timeline'].includes(item.type) || (item.type === 'table' && item.subtype === 'tablecard')) {
+ } else if (['card', 'carousel', 'timeline'].includes(item.type)) {
item.subcards.forEach(card => {
card.miniStyle = this.transferStyle(card.style)
card.elements = card.elements.map(cell => {
@@ -1253,7 +1156,7 @@
menu.miniStyle = this.transferStyle(menu.style)
return menu
})
- } else if (item.type === 'table' && item.subtype === 'normaltable') {
+ } else if (item.type === 'table') {
let getCols = (cols) => {
return cols.map(col => {
if (col.type === 'colspan') {
@@ -1318,10 +1221,50 @@
config.enabled = false
}
+ let tbs = []
let roleParam = {type: 'view', version: '1.0', key: config.uuid, title: config.MenuName, children: []}
- roleParam.children = this.getMenuMessage()
+ roleParam.children = this.getMenuMessage(tbs)
config.loginview = false
config.tabview = false
+
+ 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') + sessionStorage.getItem('typename') + 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: sessionStorage.getItem('typename') || '',
+ adapter: sessionStorage.getItem('adapter') || '',
+ sysBgColor: sessionStorage.getItem('sysBgColor') || '',
+ MenuName: config.MenuName || '',
+ }
+
+ url = window.btoa(window.encodeURIComponent(JSON.stringify(urlparam)))
+ config.tbkey = key
+ }
if (roleParam.children.length === 0) {
roleParam.pass = true
@@ -1375,202 +1318,184 @@
menus_rolelist: window.btoa(window.encodeURIComponent(JSON.stringify(roleParam))),
LText: '',
LTexttb: '',
- menus_used_list
+ 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 roles = {
- type: 'navbar',
- version: '1.0',
- key: item.uuid,
- title: item.name,
- children: []
- }
-
- if (item.wrap.permission === 'true') {
- roles.children = item.menus.map(menu => {
- return {
- key: menu.MenuID,
- title: menu.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: sessionStorage.getItem('typename'),
- MenuName: item.name || '',
- PageParam: JSON.stringify({Template: item.type}),
- open_edition: _item ? (_item.open_edition || '') : '',
- menus_rolelist: window.btoa(window.encodeURIComponent(JSON.stringify(roles))),
- 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
- })
- this.setState({ menuloading: false })
- return
- }
-
- new_open_edition[item.uuid] = res.open_edition || ''
- resolve()
- })
- })
- })
- Promise.all(deffers).then(() => {
- let appViewList = sessionStorage.getItem('appViewList')
- appViewList = JSON.parse(appViewList)
- let _appViewList = fromJS(appViewList).toJS()
- let appIndeList = appViewList.map(item => item.keys_id).join(',')
-
- 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({
- appkey: window.GLOB.appkey || '',
- bid: sessionStorage.getItem('appId') || '',
- kei_no: sessionStorage.getItem('kei_no') || '',
- keys_id: item.uuid,
- keys_type: 'navbar',
- remark: item.name
- })
- } else {
- appViewList = appViewList.map(view => {
- if (view.keys_id === item.uuid) {
- view.remark = item.name
- }
- return view
- })
- }
- }
- return item
- })
-
- if (!is(fromJS(appViewList), fromJS(_appViewList))) {
- let param = {
- func: 's_kei_link_keyids_addupt',
- BID: sessionStorage.getItem('appId'),
- exec_type: 'y',
- LText: ''
- }
+ 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: []
+ }
- 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
- })
- this.setState({ menuloading: false })
- } else {
- sessionStorage.setItem('appViewList', JSON.stringify(appViewList))
- resolve(true)
+ if (NavBar.wrap.permission === 'true') {
+ roles.children = NavBar.menus.map(menu => {
+ return {
+ key: menu.MenuID,
+ title: menu.name
}
})
} else {
- resolve(true)
+ roles.pass = true
}
- })
+
+ 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: sessionStorage.getItem('typename'),
+ MenuName: NavBar.name || '',
+ PageParam: JSON.stringify({Template: NavBar.type}),
+ open_edition: _item ? (_item.open_edition || '') : '',
+ menus_rolelist: window.btoa(window.encodeURIComponent(JSON.stringify(roles))),
+ 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 => {
+ if (res.status) {
+ NavBar.open_edition = res.open_edition || ''
+ window.GLOB.CacheIndependent.set(NavBar.uuid, fromJS(NavBar).toJS())
+
+ let appViewList = sessionStorage.getItem('appViewList')
+ let _appViewList = JSON.parse(appViewList)
+
+ 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: NavBar.uuid,
+ keys_type: 'navbar',
+ remark: NavBar.name
+ })
+ } else {
+ _appViewList = _appViewList.map(item => {
+ if (item.keys_id === NavBar.uuid && item.remark !== NavBar.name) {
+ item.remark = NavBar.name
+ }
+ return item
+ })
+ }
+
+ 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.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)
+ })
+ } else {
+ resolve(res)
+ }
+ } else {
+ resolve(res)
+ }
+ })
+ }
}
}).then(res => { // 椤甸潰淇濆瓨
- if (!res) return
+ if (!res || !res.status) return res
return Api.getSystemConfig(param)
}).then(res => {
+ this.setState({
+ menuloading: false
+ })
+
if (!res) return
if (res.status) {
config.open_edition = res.open_edition || ''
-
+
this.setState({
config,
oriConfig: fromJS(config).toJS(),
- menuloading: false
+ needUpdate: false
})
+
+ localStorage.setItem('mobUpdate', new Date().getTime() + ',' + config.uuid)
notification.success({
top: 92,
message: '淇濆瓨鎴愬姛',
duration: 2
})
+ MKEmitter.emit('completeSave')
} else {
notification.warning({
top: 92,
message: res.message,
duration: 5
})
- this.setState({
- menuloading: false
- })
}
- MKEmitter.emit('completeSave')
})
}, 300 + (+sessionStorage.getItem('mkDelay')))
}
getRoleFields = () => {
- if (sessionStorage.getItem('sysRoles') || sessionStorage.getItem('permFuncField')) return
+ if (sessionStorage.getItem('sysRoles')) return
+
Api.getSystemConfig({func: 'sPC_Get_Roles_sModular'}).then(res => {
if (res.status) {
let _permFuncField = []
@@ -1655,10 +1580,6 @@
}
check(config.components, 1, 'view')
-
- // if (!error && viewType === 'userbind' && config.components.filter(item => item.type === 'login').length === 0) {
- // error = '鐢ㄦ埛缁戝畾椤甸潰蹇呴』娣诲姞鐧诲綍銆�'
- // }
if (!error && searchSum > 1) {
error = '鎼滅储缁勪欢涓庡鑸爮鐨勬悳绱㈠姛鑳戒笉鍙悓鏃朵娇鐢ㄣ��'
@@ -1746,7 +1667,7 @@
refreshView = () => {
const { oriConfig, config } = this.state
- if (!oriConfig || !is(fromJS(oriConfig), fromJS(config))) {
+ if (!is(fromJS(oriConfig || {}), fromJS(config || {}))) {
notification.warning({
top: 92,
message: '閰嶇疆淇℃伅鏈繚瀛橈紒',
@@ -1766,7 +1687,7 @@
setHomeView = () => {
const { oriConfig, config } = this.state
- if (!oriConfig || !is(fromJS(oriConfig), fromJS(config))) {
+ if (!is(fromJS(oriConfig || {}), fromJS(config || {}))) {
notification.warning({
top: 92,
message: '閰嶇疆淇℃伅鏈繚瀛橈紒',
@@ -1825,7 +1746,7 @@
setLoginView = () => {
const { oriConfig, config } = this.state
- if (!oriConfig || !is(fromJS(oriConfig), fromJS(config))) {
+ if (!is(fromJS(oriConfig || {}), fromJS(config || {}))) {
notification.warning({
top: 92,
message: '閰嶇疆淇℃伅鏈繚瀛橈紒',
@@ -1919,10 +1840,10 @@
render () {
- const { viewType, localedict, comloading, loading, settingshow, controlshow, activeKey, dict, MenuId, config, menuloading, customComponents, adapters, eyeopen } = this.state
+ const { viewType, comloading, loading, settingshow, controlshow, activeKey, MenuId, config, menuloading, adapters, eyeopen, needUpdate } = this.state
return (
- <ConfigProvider locale={localedict}>
+ <ConfigProvider locale={antdZhCN}>
<div className={'mk-mob-view ' + viewType} id="mk-mob-design-view">
<Header changeView={this.changeView}/>
{loading ? <Spin className="view-spin" size="large" /> : null}
@@ -1938,7 +1859,6 @@
<Panel header="鍩烘湰淇℃伅" forceRender className="basedata" key="basedata">
{/* 鑿滃崟淇℃伅 */}
{config ? <MenuForm
- dict={dict}
config={config}
MenuId={MenuId}
adapters={adapters}
@@ -1950,12 +1870,12 @@
{config ? <Paragraph style={{padding: '15px 0px 0px 18px'}} copyable={{ text: MenuId }}>鑿滃崟ID</Paragraph> : null}
</Panel>
{/* 缁勪欢娣诲姞 */}
- <Panel header={dict['mob.component']} className="component" key="component">
+ <Panel header="缁勪欢" className="component" key="component">
<SourceWrap />
</Panel>
- {customComponents && customComponents.length ? <Panel header="鑷畾涔夌粍浠�" className="cuscomponent" key="cuscomponent">
- <SourceWrap components={customComponents} />
- </Panel> : null}
+ <Panel header="鍏冪礌" key="element">
+ <Modulecell />
+ </Panel>
<Panel header={'椤甸潰鏍峰紡'} key="background">
{config ? <BgController config={config} updateConfig={this.updateConfig} /> : null}
</Panel>
@@ -1968,22 +1888,23 @@
{!controlshow ? <DoubleLeftOutlined onClick={() => {this.setState({controlshow: true})}}/> : null}
</div>
<div className="wrap">
- <Button type="primary" onClick={this.submitConfig} id="save-config" 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' : ''} 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 : ''}/>
- <StyleCombControlButton menu={config} />
<Button className="mk-border-danger" onClick={this.refreshView}><RedoOutlined /> 寮哄埗鍒锋柊</Button>
<Button type="default" onClick={this.closeView}>鍏抽棴</Button>
</div>
--
Gitblit v1.8.0