From a94b0a4d15b26ecf8fe99f0a1c3e60d60b97766d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 15 八月 2023 14:22:03 +0800
Subject: [PATCH] 2023-08-15
---
src/views/menudesign/index.jsx | 252 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 193 insertions(+), 59 deletions(-)
diff --git a/src/views/menudesign/index.jsx b/src/views/menudesign/index.jsx
index 998e016..6d94c54 100644
--- a/src/views/menudesign/index.jsx
+++ b/src/views/menudesign/index.jsx
@@ -10,7 +10,6 @@
import md5 from 'md5'
import Api from '@/api'
-import options from '@/store/options.js'
import Utils, { setGLOBFuncs } from '@/utils/utils.js'
import antdZhCN from 'antd/es/locale/zh_CN'
import MKEmitter from '@/utils/events.js'
@@ -37,6 +36,7 @@
const PasteController = asyncComponent(() => import('@/menu/pastecontroller'))
const StyleController = asyncComponent(() => import('@/menu/stylecontroller'))
const ReplaceField = asyncComponent(() => import('@/menu/replaceField'))
+const NormalCss = asyncComponent(() => import('@/menu/normalCss'))
const Versions = asyncComponent(() => import('@/menu/versions'))
const TableNodes = asyncComponent(() => import('@/menu/tablenodes'))
const SysInterface = asyncComponent(() => import('@/menu/sysinterface'))
@@ -47,7 +47,6 @@
const StyleCombControlButton = asyncComponent(() => import('@/menu/stylecombcontrolbutton'))
const TableComponent = asyncComponent(() => import('@/templates/sharecomponent/tablecomponent'))
-sessionStorage.setItem('isEditState', 'true')
sessionStorage.setItem('appType', '') // 搴旂敤绫诲瀷
document.body.className = ''
@@ -64,7 +63,7 @@
config: null,
customComponents: [],
comloading: false,
- settingshow: true,
+ settingshow: sessionStorage.getItem('settingshow') !== 'false',
eyeopen: false,
view: '',
popConfig: null,
@@ -72,19 +71,34 @@
}
UNSAFE_componentWillMount() {
+ if (sessionStorage.getItem('devError') === 'true') {
+ sessionStorage.clear()
+ window.history.replaceState(null, null, window.location.href.split('#')[0] + '#/login')
+ window.location.reload()
+ return
+ }
+
+ if (!sessionStorage.getItem('UserID')) {
+ sessionStorage.removeItem('appType')
+ this.props.history.replace('/login')
+ return
+ }
+
sessionStorage.setItem('editMenuType', 'menu') // 缂栬緫鑿滃崟绫诲瀷
+ window.GLOB.curDate = moment().format('YYYY-MM-DD')
window.GLOB.UserComponentMap = new Map() // 缂撳瓨鐢ㄦ埛鑷畾涔夌粍浠�
window.GLOB.TabsMap = new Map() // 缂撳瓨鐢ㄦ埛鎿嶄綔鐨勬爣绛鹃〉
window.GLOB.urlFields = [] // url鍙橀噺
window.GLOB.customMenu = null // 淇濆瓨鑿滃崟淇℃伅
+ window.GLOB.developing = true
try {
let param = JSON.parse(window.decodeURIComponent(window.atob(this.props.match.params.param)))
this.setState({
MenuType: param.MenuType,
- MenuId: param.MenuId,
+ MenuId: param.MenuId || param.MenuID,
ParentId: param.ParentId || '',
MenuName: param.MenuName || '',
MenuNo: param.MenuNo || '',
@@ -105,6 +119,8 @@
}
componentDidMount () {
+ if (!sessionStorage.getItem('UserID')) return
+
MKEmitter.addListener('changePopview', this.initPopview)
MKEmitter.addListener('triggerMenuSave', this.triggerMenuSave)
MKEmitter.addListener('updateCustomComponent', this.updateCustomComponent)
@@ -165,6 +181,9 @@
}
let node = document.getElementById('save-modal-config')
+ if (!node) {
+ node = document.getElementById('save-pop-config')
+ }
if (!node) {
node = document.getElementById('save-config')
}
@@ -241,7 +260,7 @@
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp) // 浜戠鏁版嵁楠岃瘉
- Api.getSystemConfig(param).then(res => {
+ Api.getCloudConfig(param).then(res => {
if (res.status) {
let temps = res.data.map(temp => {
return {
@@ -274,19 +293,19 @@
}
deffers = [new Promise(resolve => {
setTimeout(() => {
- Api.getSystemConfig({...param, typecharone: 'image'}).then(res => {
+ Api.getCloudConfig({...param, typecharone: 'image'}).then(res => {
resolve(res.data)
})
}, 500)
}), new Promise(resolve => {
setTimeout(() => {
- Api.getSystemConfig({...param, typecharone: 'video'}).then(res => {
+ Api.getCloudConfig({...param, typecharone: 'video'}).then(res => {
resolve(res.data)
})
}, 1000)
}), new Promise(resolve => {
setTimeout(() => {
- Api.getSystemConfig({...param, typecharone: 'color'}).then(res => {
+ Api.getCloudConfig({...param, typecharone: 'color'}).then(res => {
resolve(res.data)
})
}, 1500)
@@ -300,7 +319,7 @@
}
updateCustomComponent = () => {
- Api.getSystemConfig({
+ Api.getCloudConfig({
func: 's_get_custom_components',
typename: '',
typecharone: ''
@@ -366,6 +385,8 @@
_btn.config.MenuID = _btn.uuid
_btn.config.ParentId = card.uuid
_btn.config.MenuName = _btn.label
+
+ _btn.config.components = this.updateComponents(_btn.config.components || [])
} else {
_btn.config = {
uuid: _btn.uuid,
@@ -414,7 +435,7 @@
MenuID: MenuId
}
- Api.getSystemConfig(param).then(result => {
+ Api.getCloudConfig(param).then(result => {
if (result.status) {
let config = null
@@ -481,6 +502,7 @@
})
this.updatePage(config)
} else {
+ config.components = this.updateComponents(config.components)
this.setState({
oriConfig: fromJS(config).toJS(),
config: config
@@ -497,6 +519,27 @@
})
}
+ updateComponents = (components) => { // 鍏煎鎬у崌绾� table
+ return components.map(item => {
+ if (item.type === 'tabs') {
+ item.subtabs.forEach(tab => {
+ tab.components = this.updateComponents(tab.components)
+ })
+ } else if (item.type === 'group') {
+ item.components = this.updateComponents(item.components)
+ } else if (item.type === 'table') {
+ item.cols = item.cols.map(col => {
+ if (col.type === 'action') {
+ col.type = 'custom'
+ }
+ return col
+ })
+ }
+
+ return item
+ })
+ }
+
collectTB = (components, popBtns) => {
return components.map(item => {
if (item.type === 'tabs') {
@@ -509,12 +552,19 @@
})
} else if (item.type === 'group') {
item.components = this.collectTB(item.components, popBtns)
- } else if (item.type !== 'search') {
+ } else {
item.$tables = getTables(item, popBtns)
}
if (item.subtype === 'tablecard') { // 鍏煎
item.type = 'card'
+ } else if (item.type === 'table') {
+ item.cols = item.cols.map(col => {
+ if (col.type === 'action') {
+ col.type = 'custom'
+ }
+ return col
+ })
}
delete item.tabId
@@ -552,15 +602,23 @@
})
})
- config.cols && config.cols.forEach(col => {
- if (col.type === 'action') {
- col.elements.forEach(cell => {
- if (cell.OpenType === 'popview' && popbtns[cell.uuid]) {
- cell.config = popbtns[cell.uuid]
+ if (config.cols) {
+ let loopCol = (cols) => {
+ cols.forEach(col => {
+ if (col.type === 'colspan') {
+ loopCol(col.subcols)
+ } else if (col.type === 'custom') {
+ col.elements.forEach(cell => {
+ if (cell.eleType !== 'button') return
+ if (cell.OpenType === 'popview' && popbtns[cell.uuid]) {
+ cell.config = popbtns[cell.uuid]
+ }
+ })
}
})
}
- })
+ loopCol(config.cols)
+ }
config.elements && config.elements.forEach(cell => {
if (cell.eleType !== 'button') return
@@ -582,6 +640,7 @@
let popBtns = []
config.components = this.collectTB(config.components, popBtns)
+ config.version = 2.0
if (popBtns.length === 0) {
this.setState({
@@ -589,6 +648,8 @@
comloading: false,
needUpdate: true
})
+
+ window.GLOB.customMenu = config
return
}
@@ -600,7 +661,7 @@
}
setTimeout(() => {
- Api.getSystemConfig(param).then(res => {
+ Api.getCloudConfig(param).then(res => {
let _config = null
try {
_config = res.LongParam ? JSON.parse(window.decodeURIComponent(window.atob(res.LongParam))) : null
@@ -667,6 +728,8 @@
config.components = this.setPopView(config.components, parents, popbtns)
this.setState({ delButtons: bts, config, comloading: false })
+
+ window.GLOB.customMenu = config
})
}
@@ -679,6 +742,11 @@
if (item.$tables) {
tbs.push(...item.$tables)
}
+
+ if (item.wrap && item.wrap.permission === 'false') {
+ return
+ }
+
if (item.action && item.action.length > 0) {
item.action.forEach(btn => {
if (btn.hidden === 'true') return
@@ -715,14 +783,20 @@
_sort++
})
} else if (item.type === 'table') {
- item.cols && item.cols.forEach(col => {
- if (col.type !== 'action') return
- col.elements.forEach(btn => {
- if (btn.hidden === 'true') return
- buttons.push(`select '${btn.uuid}' as menuid, '${item.name + '-' + btn.label}' as menuname, '${_sort * 10}' as Sort, '${config.uuid}' as parentid, 40 as Type`)
- _sort++
+ let loopCol = (cols) => {
+ cols.forEach(col => {
+ if (col.type === 'colspan') {
+ loopCol(col.subcols)
+ } else if (col.type === 'custom') {
+ col.elements.forEach(cell => {
+ if (cell.eleType !== 'button' || cell.hidden === 'true') return
+ buttons.push(`select '${cell.uuid}' as menuid, '${item.name + '-' + cell.label}' as menuname, '${_sort * 10}' as Sort, '${config.uuid}' as parentid, 40 as Type`)
+ _sort++
+ })
+ }
})
- })
+ }
+ loopCol(item.cols)
}
})
}
@@ -743,7 +817,7 @@
checkBase = () => {
const { MenuType, config } = this.state
- if (MenuType === 'billPrint' && config.printPage === 'page' && !config.everyPCount) {
+ if (MenuType === 'billPrint' && ((config.printPage === 'page' && !config.everyPCount) || (config.callback === 'true' && !config.callNo))) {
return false
} else if (MenuType === 'home' && (config.cacheUseful === 'true' && !config.cacheTime)) {
return false
@@ -751,6 +825,35 @@
return false
}
return true
+ }
+
+ resetSyncQuery = (components) => {
+ return components.map(item => {
+ if (item.type === 'tabs') {
+ item.subtabs.forEach(tab => {
+ tab.components = this.resetSyncQuery(tab.components)
+ })
+ } else if (item.type === 'group') {
+ item.components = this.resetSyncQuery(item.components)
+ } else if (item.setting && item.setting.interType === 'system' && item.setting.sync === 'true') {
+ let sql = ''
+ if (item.setting.execute !== 'false' && item.setting.dataresource) {
+ sql = item.setting.dataresource
+ }
+
+ item.scripts && item.scripts.forEach(script => {
+ if (script.status === 'false') return
+
+ sql += script.sql
+ })
+
+ if (sql.length > 8000) {
+ item.setting.sync = 'false'
+ }
+ }
+
+ return item
+ })
}
submitConfig = () => {
@@ -771,8 +874,18 @@
})
setTimeout(() => {
- if (config.enabled && this.verifyConfig()) {
+ let _pass = this.verifyConfig(config)
+
+ if (config.enabled && !_pass) {
config.enabled = false
+ config.force = true
+ } else if (!config.enabled && config.force && _pass) {
+ config.enabled = true
+ delete config.force
+ }
+
+ if (config.cacheUseful !== 'true') {
+ config.components = this.resetSyncQuery(config.components)
}
let tbs = []
@@ -843,7 +956,6 @@
btnParam.LText = Utils.formatOptions(btnParam.LText)
btnParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
btnParam.secretkey = Utils.encrypt(btnParam.LText, btnParam.timestamp)
-
new Promise(resolve => {
if (MenuType === 'billPrint') { // 鎵撳嵃鐢熸垚椤甸潰鏁堟灉鍥�
@@ -852,15 +964,15 @@
Base64Img: canvas.toDataURL('image/png') // 鑾峰彇鐢熸垚鐨勫浘鐗�
}
- if (options.cloudServiceApi) {
- param.rduri = options.cloudServiceApi
+ if (window.GLOB.cloudServiceApi) {
+ param.rduri = window.GLOB.cloudServiceApi
param.userid = sessionStorage.getItem('CloudUserID') || ''
param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
}
Api.fileuploadbase64(param).then(result => {
if (result.status) {
- Api.getSystemConfig({
+ Api.getCloudConfig({
func: 's_PrintTemplateMSub',
ID: config.uuid,
Images: Utils.getcloudurl(result.Images),
@@ -872,7 +984,7 @@
} else {
resolve(result)
}
- })
+ }, this.netError)
})
} else {
resolve({status: true})
@@ -880,15 +992,12 @@
}).then(res => { // 椤甸潰淇濆瓨
if (!res || !res.status) return res
- return Api.getSystemConfig(param)
+ return Api.getCloudConfig(param)
}).then(res => { // 鎸夐挳鍒犻櫎
if (!res || !res.status) return res
if (MenuType !== 'billPrint') { // 鍩烘湰淇℃伅鏀瑰彉鏃讹紝閫氱煡鑿滃崟鍒楄〃鏇存柊
- let ori = this.state.oriConfig
- if (config.MenuName !== ori.MenuName || config.MenuNo !== ori.MenuNo || config.parentId !== ori.parentId) {
- localStorage.setItem('menuUpdate', new Date().getTime())
- }
+ localStorage.setItem('menuUpdate', new Date().getTime() + ',' + config.uuid)
}
config.open_edition = res.open_edition || ''
this.setState({
@@ -906,9 +1015,9 @@
func: 'sPC_MainMenu_Del',
MenuID: this.state.delButtons.join(',')
}
- return Api.getSystemConfig(_param)
+ return Api.getCloudConfig(_param)
}
- }).then(res => { // 椤甸潰鎸夐挳鍏崇郴淇濆瓨
+ }, this.netError).then(res => { // 椤甸潰鎸夐挳鍏崇郴淇濆瓨
if (!res || !res.status) return res
this.setState({
@@ -916,13 +1025,13 @@
})
if (MenuType !== 'billPrint') {
- return Api.getSystemConfig(btnParam)
+ return Api.getCloudConfig(btnParam)
} else {
return {
status: true
}
}
- }).then(res => {
+ }, this.netError).then(res => {
this.setState({
menuloading: false
})
@@ -935,7 +1044,6 @@
message: '淇濆瓨鎴愬姛',
duration: 2
})
- MKEmitter.emit('completeSave')
} else {
notification.warning({
top: 92,
@@ -943,14 +1051,30 @@
duration: 5
})
}
- })
+ MKEmitter.emit('completeSave')
+ }, this.netError)
}, 300 + (+sessionStorage.getItem('mkDelay')))
+ }
+
+ netError = (error) => {
+ this.setState({
+ menuloading: false
+ })
+
+ if (!error) {
+ notification.warning({
+ top: 92,
+ message: '淇濆瓨澶辫触锛岃妫�鏌ョ綉缁滄槸鍚︽甯搞��',
+ duration: 5
+ })
+ }
+ MKEmitter.emit('completeSave')
}
getRoleFields = () => {
if (sessionStorage.getItem('sysRoles')) return
- Api.getSystemConfig({func: 'sPC_Get_Roles_sModular'}).then(res => {
+ Api.getCloudConfig({func: 'sPC_Get_Roles_sModular'}).then(res => {
if (res.status) {
let _permFuncField = []
let _sysRoles = []
@@ -983,17 +1107,23 @@
onEnabledChange = () => {
const { config } = this.state
- if (!config || (!config.enabled && this.verifyConfig(true))) {
- return
- }
+ let _config = {...config, enabled: !config.enabled}
- this.setState({
- config: {...config, enabled: !config.enabled}
- })
+ delete _config.force
+
+ if (!_config.enabled) {
+ this.setState({
+ config: _config
+ })
+ } else if (this.verifyConfig(_config)) {
+ this.setState({
+ config: _config
+ })
+ }
}
- verifyConfig = (show) => {
- const { config, MenuType } = this.state
+ verifyConfig = (config) => {
+ const { MenuType } = this.state
let error = ''
let check = (components) => {
@@ -1021,7 +1151,7 @@
check(config.components)
- if (show && error) {
+ if (config.enabled && error) {
notification.warning({
top: 92,
message: error,
@@ -1037,12 +1167,14 @@
carousel: '杞挱',
tree: '鏍戝舰鍒楄〃',
chart: '鑷畾涔夊浘琛�',
- editor: '瀵屾枃鏈�',
- group: '鍒嗙粍'
+ // editor: '瀵屾枃鏈�',
+ group: '鍒嗙粍',
+ iframe: 'iframe'
}
let subforbid = {
editable: '鍙紪杈戣〃鏍�',
- voucher: '鍑瘉'
+ voucher: '鍑瘉',
+ account: '璐﹀'
}
config.components.forEach(item => {
@@ -1053,7 +1185,7 @@
}
})
- if (show && error) {
+ if (config.enabled && error) {
notification.warning({
top: 92,
message: error,
@@ -1062,7 +1194,7 @@
}
}
- return error
+ return error === ''
}
// 鏇存柊閰嶇疆淇℃伅
@@ -1102,6 +1234,7 @@
changeSetting = () => {
this.setState({settingshow: !this.state.settingshow})
+ sessionStorage.setItem('settingshow', '' + !this.state.settingshow)
setTimeout(() => {
MKEmitter.emit('tabsChange', 'all')
@@ -1148,6 +1281,7 @@
{/* 琛ㄥ悕娣诲姞 */}
{config ? <TableComponent config={config} updatetable={this.updateConfig}/> : null}
{config ? <Paragraph style={{padding: '15px 0px 0px 18px'}} copyable={{ text: MenuId }}>鑿滃崟ID</Paragraph> : null}
+ {config ? <NormalCss config={config} updateConfig={this.updateConfig}/> : null}
</Panel>
{/* 缁勪欢娣诲姞 */}
<Panel header="缁勪欢" key="component">
@@ -1175,7 +1309,7 @@
<PictureController/>
<StyleCombControlButton menu={config} />
<PasteController insert={this.insert} />
- <Switch className="big" checkedChildren="鍚�" unCheckedChildren="鍋�" checked={config && config.enabled} onChange={this.onEnabledChange} />
+ {config ? <Switch className="big" checkedChildren="鍚�" unCheckedChildren="鍋�" checked={config.enabled} onChange={this.onEnabledChange} /> : null}
<Button type="primary" id="save-config" className={needUpdate ? 'update-tip' : ''} onClick={this.submitConfig} loading={menuloading}>淇濆瓨</Button>
<Button type="default" onClick={this.closeView}>鍏抽棴</Button>
</div>
--
Gitblit v1.8.0