From 58826d6f4eab9f8c9acf9fa8696f60039c645cfe Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 20 八月 2024 18:18:00 +0800
Subject: [PATCH] 2024-08-20
---
src/views/menudesign/index.jsx | 79 ++++++++++++++++++++++++++++++---------
1 files changed, 60 insertions(+), 19 deletions(-)
diff --git a/src/views/menudesign/index.jsx b/src/views/menudesign/index.jsx
index f77e0a4..4b8f4d2 100644
--- a/src/views/menudesign/index.jsx
+++ b/src/views/menudesign/index.jsx
@@ -4,16 +4,16 @@
import { is, fromJS } from 'immutable'
import moment from 'moment'
import HTML5Backend from 'react-dnd-html5-backend'
-import { ConfigProvider, notification, Modal, Collapse, Card, Switch, Button, Typography, Spin } from 'antd'
+import { notification, Modal, Collapse, Card, Switch, Button, Typography, Spin } from 'antd'
import { DoubleLeftOutlined, DoubleRightOutlined, EyeOutlined, EyeInvisibleOutlined } from '@ant-design/icons'
import html2canvas from 'html2canvas'
import md5 from 'md5'
import Api from '@/api'
-import Utils, { setGLOBFuncs } from '@/utils/utils.js'
-import antdZhCN from 'antd/es/locale/zh_CN'
+import Utils from '@/utils/utils.js'
+import { langs } from '@/store/options'
import MKEmitter from '@/utils/events.js'
-import { getTables, getFuncsAndInters } from '@/utils/utils-custom.js'
+import { getTables, getFuncsAndInters, getLangTrans } from '@/utils/utils-custom.js'
import asyncComponent from '@/utils/asyncComponent'
import '@/assets/css/design.scss'
@@ -22,7 +22,6 @@
const { Panel } = Collapse
const { confirm } = Modal
const { Paragraph } = Typography
-const _locale = antdZhCN
const MenuForm = asyncComponent(() => import('./menuform'))
const HomeForm = asyncComponent(() => import('./homeform'))
@@ -67,6 +66,7 @@
eyeopen: false,
view: '',
popConfig: null,
+ langName: '',
needUpdate: false
}
@@ -98,12 +98,17 @@
sessionStorage.setItem('MenuType', param.MenuType || 'custom')
+ if (param.lang) {
+ sessionStorage.setItem('lang', param.lang)
+ }
+
this.setState({
MenuType: param.MenuType,
MenuId: param.MenuId || param.MenuID,
ParentId: param.ParentId || '',
MenuName: param.MenuName || '',
MenuNo: param.MenuNo || '',
+ langName: sessionStorage.getItem('lang') !== 'zh-CN' && langs[sessionStorage.getItem('lang')] ? `锛�${langs[sessionStorage.getItem('lang')]}锛塦 : ''
}, () => {
this.getMenuParam()
})
@@ -128,7 +133,7 @@
MKEmitter.addListener('changeEditMenu', this.changeEditMenu)
setTimeout(() => {
this.getRoleFields()
- setGLOBFuncs()
+ // setGLOBFuncs()
}, 1000)
document.onkeydown = (event) => {
@@ -654,7 +659,7 @@
if (item.action && item.action.length > 0) {
item.action.forEach(btn => {
- if (btn.hidden === 'true') return
+ if (btn.hidden === 'true' || btn.permission === 'false') 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++
})
@@ -669,13 +674,13 @@
item.subcards.forEach(card => {
card.elements && card.elements.forEach(cell => {
if (cell.eleType !== 'button') return
- if (cell.hidden === 'true') return
+ if (cell.hidden === 'true' || cell.permission === 'false') 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++
})
card.backElements && card.backElements.forEach(cell => {
if (cell.eleType !== 'button') return
- if (cell.hidden === 'true') return
+ if (cell.hidden === 'true' || cell.permission === 'false') 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++
})
@@ -683,7 +688,7 @@
} else if (item.type === 'balcony') {
item.elements && item.elements.forEach(cell => {
if (cell.eleType !== 'button') return
- if (cell.hidden === 'true') return
+ if (cell.hidden === 'true' || cell.permission === 'false') 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++
})
@@ -694,7 +699,7 @@
loopCol(col.subcols)
} else if (col.type === 'custom') {
col.elements.forEach(cell => {
- if (cell.eleType !== 'button' || cell.hidden === 'true') return
+ if (cell.eleType !== 'button' || cell.hidden === 'true' || cell.permission === 'false') 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++
})
@@ -772,6 +777,18 @@
duration: 5
})
return
+ } else if (this.checklog()) {
+ if (sessionStorage.getItem('langList') && !config.trans) {
+
+ } else {
+ notification.success({
+ top: 92,
+ message: '褰撳墠閰嶇疆鏈慨鏀癸紝鏃犻渶淇濆瓨銆�',
+ duration: 5
+ })
+ MKEmitter.emit('completeSave')
+ return
+ }
}
this.setState({
@@ -799,6 +816,11 @@
let tbs = []
let btns = this.getMenuMessage(config, tbs)
+
+ if (config.permission === 'false') {
+ btns = []
+ }
+
let arr = []
tbs = tbs.filter(tb => {
let _tb = tb.toLowerCase()
@@ -823,12 +845,15 @@
} else {
let urlparam = JSON.parse(window.decodeURIComponent(window.atob(this.props.match.params.param)))
urlparam.type = 'admin'
+ urlparam.lang = sessionStorage.getItem('lang')
+
url = window.btoa(window.encodeURIComponent(JSON.stringify(urlparam)))
config.tbkey = key
}
let interfaces = getFuncsAndInters(config)
let urlFields = config.urlFields ? config.urlFields.join(',') : ''
+ let langSql = getLangTrans(config)
let param = {
func: 'sPC_TrdMenu_AddUpt',
@@ -842,12 +867,16 @@
MenuName: config.MenuName || '',
PageParam: JSON.stringify({Template: 'CustomPage', OpenType: config.OpenType || 'newtab', hidden: config.hidden || 'false', menuColor: config.menuColor || '', interfaces, urlFields}),
open_edition: config.open_edition,
- LText: '',
- LTexttb: '',
+ // LText: '',
+ // LTexttb: '',
debug_md5: key,
debug_url: url,
debug_list: window.btoa(tbs),
LongParam: window.btoa(window.encodeURIComponent(JSON.stringify(config)))
+ }
+
+ if (langSql) {
+ param.lang_translation = window.btoa(window.encodeURIComponent(langSql))
}
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
@@ -883,10 +912,21 @@
Api.fileuploadbase64(param).then(result => {
if (result.status) {
+ let url = result.Images
+ let baseurl = ''
+
+ if (window.GLOB.cloudServiceApi) {
+ baseurl = window.GLOB.cloudServiceApi.replace(/webapi(.*)$/, '')
+ } else {
+ baseurl = window.GLOB.baseurl
+ }
+
+ url = url.match(/^http/) || url.match(/^\/\//) ? url : baseurl + url
+
Api.getCloudConfig({
func: 's_PrintTemplateMSub',
ID: config.uuid,
- Images: Utils.getcloudurl(result.Images),
+ Images: url,
Remark: '',
temp_type: 'billprint',
}).then(response => {
@@ -1155,6 +1195,7 @@
updateLogConfig = (config) => {
config.fstMenuId = this.state.config.fstMenuId || config.fstMenuId || ''
config.parentId = this.state.config.parentId || config.parentId || ''
+ config.open_edition = this.state.config.open_edition || ''
this.setState({
config: null
@@ -1168,11 +1209,11 @@
}
render () {
- const { view, comloading, MenuType, MenuId, config, settingshow, ParentId, menuloading, eyeopen, needUpdate } = this.state
+ const { view, comloading, MenuType, MenuId, config, settingshow, ParentId, menuloading, eyeopen, needUpdate, langName } = this.state
return (
- <ConfigProvider locale={_locale}>
- <Header menuName={config ? config.MenuName : ''}/>
+ <>
+ <Header menuName={config ? config.MenuName + langName : ''}/>
<DndProvider backend={HTML5Backend}>
{view !== 'popview' ? <div className={'pc-menu-view ' + (MenuType || '')}>
<div className="menu-body">
@@ -1236,7 +1277,7 @@
<PasteController insert={this.insert} />
{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>
+ <Button type="default" disabled={menuloading} onClick={this.closeView}>鍏抽棴</Button>
</div>
} style={{ width: '100%' }}>
{config && !comloading ? <MenuShell menu={config} handleList={this.updateConfig} /> : <Spin className="loading-config" size="large" />}
@@ -1248,7 +1289,7 @@
<ModalController />
<StyleController />
<StyleCombController />
- </ConfigProvider>
+ </>
)
}
}
--
Gitblit v1.8.0