From f6626b05f1275cc2f8ca77f773d4f6a6af1b0a89 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期一, 21 十一月 2022 16:11:55 +0800 Subject: [PATCH] 2022-11-21 --- src/views/mobdesign/index.jsx | 771 +++++++++++++++++++++++++--------------------------------- 1 files changed, 333 insertions(+), 438 deletions(-) diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx index bbd3cdb..1eed346 100644 --- a/src/views/mobdesign/index.jsx +++ b/src/views/mobdesign/index.jsx @@ -12,7 +12,7 @@ import Utils, { setGLOBFuncs } from '@/utils/utils.js' 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' @@ -64,11 +64,10 @@ MenuId: '', MenuName: '', MenuNo: '', - activeKey: 'component', + activeKey: 'basedata', menuloading: false, oriConfig: null, config: null, - customComponents: [], direction: 'vertical', settingshow: true, controlshow: true, @@ -76,7 +75,7 @@ adapters: [], viewType: 'menu', eyeopen: false, - modalStatus: false // 寮圭獥鏄惁寮�鍚紝鍒ゆ柇ctrl+s鏄惁鍙敤 + needUpdate: false } UNSAFE_componentWillMount() { @@ -122,7 +121,6 @@ viewType: /^userbind/.test(param.MenuID) ? 'userbind' : 'menu' }, () => { this.getMenuParam(param) - this.getRelationMenus() }) } } catch (e) { @@ -149,19 +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('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() @@ -187,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 @@ -216,53 +217,49 @@ this.setState = () => { return } - MKEmitter.removeListener('modalStatus', this.modalStatus) MKEmitter.removeListener('triggerMenuSave', this.submitConfig) MKEmitter.removeListener('changeEditMenu', this.changeEditMenu) - MKEmitter.removeListener('updateCustomComponent', this.updateCustomComponent) - } - - modalStatus = (val) => { - this.setState({modalStatus: val}) } getSmStemp = () => { - 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' - } - - 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: '閰嶇疆淇℃伅鏈繚瀛橈紒', @@ -369,90 +366,40 @@ } 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 浠h〃鍏ㄩ儴 PageSize: 0, // 0 浠h〃鍏ㄩ儴 - 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 浠h〃鍏ㄩ儴 - PageSize: 0, // 0 浠h〃鍏ㄩ儴 - 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 浠h〃鍏ㄩ儴 - PageSize: 0, // 0 浠h〃鍏ㄩ儴 - 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) + })] + + 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] || [])) }) - } - - 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}) } closeView = () => { @@ -460,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: '', @@ -479,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: '', @@ -516,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 @@ -531,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: [], @@ -556,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', @@ -673,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 @@ -763,7 +690,7 @@ if (!config) { config = { - version: 1.0, + version: 2.0, uuid: MenuId, MenuID: MenuId, Template: 'webPage', @@ -788,6 +715,16 @@ } 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('澶嶅埗鎴愬姛锛屼繚瀛樺悗鐢熸晥銆�') } @@ -799,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(), @@ -815,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 @@ -856,40 +783,56 @@ 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 + }) + } + + 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 }) } @@ -903,15 +846,21 @@ 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 => { @@ -938,7 +887,7 @@ list.push(...mm) } - return null + return } else if (item.type === 'group') { m.children = traversal(item.components) @@ -948,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 @@ -964,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, @@ -987,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, @@ -1015,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 @@ -1044,6 +975,14 @@ } let trees = traversal(config.components) + + if (config.interfaces) { + config.interfaces.forEach(item => { + if (item.$tables) { + tbs.push(...item.$tables) + } + }) + } return trees } @@ -1084,7 +1023,6 @@ menus.push({ MenuID: m.uuid, MenuName: m.setting.name, - // MenuNo: m.setting.MenuNo MenuNo: '' }) } @@ -1098,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]) @@ -1126,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 @@ -1157,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]) @@ -1216,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 => { @@ -1233,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') { @@ -1404,196 +1327,175 @@ 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 = [] @@ -1678,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 = '鎼滅储缁勪欢涓庡鑸爮鐨勬悳绱㈠姛鑳戒笉鍙悓鏃朵娇鐢ㄣ��' @@ -1769,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: '閰嶇疆淇℃伅鏈繚瀛橈紒', @@ -1789,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: '閰嶇疆淇℃伅鏈繚瀛橈紒', @@ -1848,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: '閰嶇疆淇℃伅鏈繚瀛橈紒', @@ -1942,7 +1840,7 @@ render () { - const { viewType, comloading, loading, settingshow, controlshow, activeKey, 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={antdZhCN}> @@ -1978,9 +1876,6 @@ <Panel header="鍏冪礌" key="element"> <Modulecell /> </Panel> - {customComponents && customComponents.length ? <Panel header="鑷畾涔夌粍浠�" className="cuscomponent" key="cuscomponent"> - <SourceWrap components={customComponents} /> - </Panel> : null} <Panel header={'椤甸潰鏍峰紡'} key="background"> {config ? <BgController config={config} updateConfig={this.updateConfig} /> : null} </Panel> @@ -1993,7 +1888,7 @@ {!controlshow ? <DoubleLeftOutlined onClick={() => {this.setState({controlshow: true})}}/> : null} </div> <div className="wrap"> - <Button type="primary" onClick={this.submitConfig} id="save-config" loading={menuloading}>淇濆瓨</Button> + <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> -- Gitblit v1.8.0