From c10fc10d5fd307a7b334bcde6af5c1175aaa0410 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 28 八月 2024 17:47:28 +0800
Subject: [PATCH] 2024-08-28
---
src/views/menudesign/index.jsx | 414 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 206 insertions(+), 208 deletions(-)
diff --git a/src/views/menudesign/index.jsx b/src/views/menudesign/index.jsx
index 6d94c54..36cb91f 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 } from '@/utils/utils-custom.js'
+import { getTables, getFuncsAndInters, getLangTrans, getAllSqls } 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'))
@@ -36,6 +35,7 @@
const PasteController = asyncComponent(() => import('@/menu/pastecontroller'))
const StyleController = asyncComponent(() => import('@/menu/stylecontroller'))
const ReplaceField = asyncComponent(() => import('@/menu/replaceField'))
+const Debug = asyncComponent(() => import('@/menu/debug'))
const NormalCss = asyncComponent(() => import('@/menu/normalCss'))
const Versions = asyncComponent(() => import('@/menu/versions'))
const TableNodes = asyncComponent(() => import('@/menu/tablenodes'))
@@ -61,12 +61,12 @@
menuloading: false,
oriConfig: null,
config: null,
- customComponents: [],
comloading: false,
settingshow: sessionStorage.getItem('settingshow') !== 'false',
eyeopen: false,
view: '',
popConfig: null,
+ langName: '',
needUpdate: false
}
@@ -96,12 +96,19 @@
try {
let param = JSON.parse(window.decodeURIComponent(window.atob(this.props.match.params.param)))
+ 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()
})
@@ -123,20 +130,10 @@
MKEmitter.addListener('changePopview', this.initPopview)
MKEmitter.addListener('triggerMenuSave', this.triggerMenuSave)
- MKEmitter.addListener('updateCustomComponent', this.updateCustomComponent)
+ MKEmitter.addListener('changeEditMenu', this.changeEditMenu)
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.getPrintTemp()
this.getRoleFields()
- setGLOBFuncs()
+ // setGLOBFuncs()
}, 1000)
document.onkeydown = (event) => {
@@ -205,7 +202,49 @@
}
MKEmitter.removeListener('changePopview', this.initPopview)
MKEmitter.removeListener('triggerMenuSave', this.triggerMenuSave)
- MKEmitter.removeListener('updateCustomComponent', this.updateCustomComponent)
+ MKEmitter.removeListener('changeEditMenu', this.changeEditMenu)
+ }
+
+ changeEditMenu = (menu) => {
+ if (menu.MenuID && menu.MenuID.length === 3 && menu.MenuNo && !this.menuLoading) {
+ this.menuLoading = true
+ let param = {
+ func: 'sPC_Get_LongParam',
+ MenuID: menu.MenuID[2]
+ }
+
+ Api.getCloudConfig(param).then(result => {
+ this.menuLoading = false
+ if (result.status) {
+ let config = null
+
+ try {
+ config = result.LongParam ? JSON.parse(window.decodeURIComponent(window.atob(result.LongParam))) : null
+ } catch (e) {
+ console.warn('Parse Failure')
+ config = null
+ }
+
+ if (config) {
+ let _param = {
+ MenuId: menu.MenuID[2],
+ MenuID: menu.MenuID[2],
+ ParentId: menu.MenuID[1],
+ MenuName: menu.MenuName,
+ MenuNo: menu.MenuNo
+ }
+ if (config.Template === 'BaseTable') {
+ _param = window.btoa(window.encodeURIComponent(JSON.stringify(_param)))
+ window.open(`#/tabledesign/${_param}`)
+ } else if (config.Template === 'CustomPage') {
+ _param.MenuType = 'custom'
+ _param = window.btoa(window.encodeURIComponent(JSON.stringify(_param)))
+ window.open(`#/menudesign/${_param}`)
+ }
+ }
+ }
+ })
+ }
}
triggerMenuSave = () => {
@@ -235,135 +274,6 @@
window.GLOB.customMenu = config
this.setState({view: '', popConfig: null})
- }
-
- getPrintTemp = () => {
- if (!sessionStorage.getItem('printTemps')) {
- let _sql = `select ID,Images,PrintTempNO+PrintTempName as PN from sPrintTemplate
- where appkey= @appkey@ and Deleted=0 and typechartwo='web_print'
- union select ID,Images,a.PrintTempNO+PrintTempName as PN
- from (select * from sPrintTemplate where appkey= '' and Deleted=0 and typechartwo='web_print') a
- left join (select PrintTempNO from sPrintTemplate where appkey= @appkey@ and Deleted=0 ) b
- on a.PrintTempNO=b.PrintTempNO
- left join (select Srcid from sPrintTemplate_Log where appkey='' and apicode= @appkey@ and Deleted=0 ) c
- on a.ID=c.Srcid where b.PrintTempNO is null and c.Srcid is null`
-
- let param = {
- func: 'sPC_Get_SelectedList',
- LText: Utils.formatOptions(_sql),
- obj_name: 'data',
- arr_field: 'PN,ID,Images'
- }
-
- 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.getCloudConfig(param).then(res => {
- if (res.status) {
- let temps = res.data.map(temp => {
- return {
- value: temp.ID,
- text: temp.PN
- }
- })
-
- sessionStorage.setItem('printTemps', JSON.stringify(temps))
- } else {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
- })
- }
- })
- }
- }
-
- getAppPictures = () => {
- if (sessionStorage.getItem('app_pictures')) return
-
- let deffers = []
- let param = {
- func: 's_url_db_adduptdel',
- PageIndex: 0, // 0 浠ｈ〃鍏ㄩ儴
- PageSize: 0, // 0 浠ｈ〃鍏ㄩ儴
- type: 'search'
- }
- deffers = [new Promise(resolve => {
- setTimeout(() => {
- Api.getCloudConfig({...param, typecharone: 'image'}).then(res => {
- resolve(res.data)
- })
- }, 500)
- }), new Promise(resolve => {
- setTimeout(() => {
- Api.getCloudConfig({...param, typecharone: 'video'}).then(res => {
- resolve(res.data)
- })
- }, 1000)
- }), new Promise(resolve => {
- setTimeout(() => {
- Api.getCloudConfig({...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] || []))
- })
- }
-
- updateCustomComponent = () => {
- Api.getCloudConfig({
- func: 's_get_custom_components',
- typename: '',
- typecharone: ''
- }).then(res => {
- if (!res.status) {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
- })
- } else if (res.cus_list) {
- sessionStorage.setItem('app_custom_components', JSON.stringify(res.cus_list))
- this.setCustomComponent(res.cus_list)
- }
- })
- }
-
- 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})
}
initPopview = (card, btn) => {
@@ -749,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++
})
@@ -764,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++
})
@@ -778,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++
})
@@ -789,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++
})
@@ -867,6 +777,20 @@
duration: 5
})
return
+ } else if (this.checklog()) {
+ if (sessionStorage.getItem('langList') && !config.trans) {
+
+ } else if (window.backend && config.enabled && !config.allSqls) {
+
+ } else {
+ notification.success({
+ top: 92,
+ message: '褰撳墠閰嶇疆鏈慨鏀癸紝鏃犻渶淇濆瓨銆�',
+ duration: 5
+ })
+ MKEmitter.emit('completeSave')
+ return
+ }
}
this.setState({
@@ -884,12 +808,52 @@
delete config.force
}
+ let long_data = ''
+ delete config.allSqls
+ if (window.backend && config.enabled) {
+ let sqls = getAllSqls(config)
+ let _t = moment().format('YYYYMMDDHHmmss')
+ let getguid = () => {
+ let uuid = ''
+ for (let i = 0; i < 18; i++) {
+ uuid += String.fromCharCode(Math.floor(Math.random() * 26) + 65)
+ }
+ return uuid
+ }
+
+ long_data = []
+
+ config.allSqls = sqls.map(item => {
+ let v_id = _t + getguid()
+ long_data.push(`${md5(window.GLOB.appkey + v_id)},${item.uuid},${v_id},${window.btoa(window.encodeURIComponent(item.LText))}`)
+
+ return {
+ uuid: item.uuid,
+ v_id: v_id,
+ type: item.type,
+ reps: item.reps,
+ sql: item.LText
+ }
+ })
+
+ long_data = long_data.join(';')
+ }
+
if (config.cacheUseful !== 'true') {
config.components = this.resetSyncQuery(config.components)
}
+ if (config.MenuID === 'home_page_id') {
+ config.permission = 'false'
+ }
+
let tbs = []
let btns = this.getMenuMessage(config, tbs)
+
+ if (config.permission === 'false') {
+ btns = []
+ }
+
let arr = []
tbs = tbs.filter(tb => {
let _tb = tb.toLowerCase()
@@ -914,9 +878,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',
@@ -928,19 +898,21 @@
EasyCode: config.easyCode || '',
Template: 'CustomPage',
MenuName: config.MenuName || '',
- PageParam: JSON.stringify({Template: 'CustomPage', OpenType: config.OpenType || 'newtab', hidden: config.hidden || 'false'}),
+ 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: '',
+ long_data: long_data,
debug_md5: key,
debug_url: url,
debug_list: window.btoa(tbs),
LongParam: window.btoa(window.encodeURIComponent(JSON.stringify(config)))
}
- param.LText = Utils.formatOptions(param.LText)
+ if (langSql) {
+ param.lang_translation = window.btoa(window.encodeURIComponent(langSql))
+ }
+
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+ param.secretkey = Utils.encrypt('', param.timestamp)
let btnParam = { // 娣诲姞鑿滃崟鎸夐挳
func: 'sPC_Button_AddUpt',
@@ -948,14 +920,14 @@
ParentID: config.uuid,
MenuNo: config.MenuNo,
Template: 'CustomPage',
- button_proc_edition: 'Y'
+ button_proc_edition: 'Y',
+ exec_type: 'x'
}
btnParam.LText = btns.join(' union all ')
-
- btnParam.LText = Utils.formatOptions(btnParam.LText)
+ btnParam.LText = Utils.formatOptions(btnParam.LText, 'x')
btnParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- btnParam.secretkey = Utils.encrypt(btnParam.LText, btnParam.timestamp)
+ btnParam.secretkey = Utils.encrypt('', btnParam.timestamp)
new Promise(resolve => {
if (MenuType === 'billPrint') { // 鎵撳嵃鐢熸垚椤甸潰鏁堟灉鍥�
@@ -972,10 +944,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 => {
@@ -1045,10 +1028,10 @@
duration: 2
})
} else {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
+ Modal.warning({
+ width: 400,
+ title: res.message,
+ okText: '鐭ラ亾浜�'
})
}
MKEmitter.emit('completeSave')
@@ -1224,12 +1207,6 @@
this.setState({config})
window.GLOB.customMenu = config
-
- notification.success({
- top: 92,
- message: '绮樿创鎴愬姛锛�',
- duration: 2
- })
}
changeSetting = () => {
@@ -1241,12 +1218,34 @@
}, 400)
}
+ checklog = () => {
+ const { oriConfig, config } = this.state
+
+ return is(fromJS(oriConfig), fromJS(config))
+ }
+
+ 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
+ }, () => {
+ this.setState({
+ config: config
+ })
+ })
+
+ window.GLOB.customMenu = config
+ }
+
render () {
- const { view, comloading, MenuType, MenuId, config, settingshow, ParentId, menuloading, customComponents, eyeopen, needUpdate } = this.state
+ const { view, comloading, MenuType, MenuId, config, settingshow, ParentId, menuloading, eyeopen, needUpdate, langName } = this.state
return (
- <ConfigProvider locale={_locale}>
- <Header />
+ <>
+ <Header menuName={config ? config.MenuName + langName : ''}/>
<DndProvider backend={HTML5Backend}>
{view !== 'popview' ? <div className={'pc-menu-view ' + (MenuType || '')}>
<div className="menu-body">
@@ -1257,31 +1256,32 @@
<Collapse accordion defaultActiveKey="basedata" bordered={false}>
{/* 鍩烘湰淇℃伅 */}
<Panel header="鍩烘湰淇℃伅" key="basedata">
- {/* 鑿滃崟淇℃伅 */}
- {config && MenuType === 'custom' ? <MenuForm
- config={config}
- MenuId={MenuId}
- parentId={ParentId}
- MenuName={config.MenuName}
- MenuNo={config.MenuNo}
- updateConfig={this.updateConfig}
- /> : null}
- {config && MenuType === 'home' ? <HomeForm
- config={config}
- updateConfig={this.updateConfig}
- /> : null}
- {config && MenuType === 'billPrint' ? <PrintMenuForm
- config={config}
- updateConfig={this.updateConfig}
- /> : null}
- {config ? <UrlFieldComponent
- config={config}
- updateConfig={this.updateConfig}
- /> : null}
- {/* 琛ㄥ悕娣诲姞 */}
- {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}
+ {config ? <>
+ {MenuType === 'custom' ? <MenuForm
+ config={config}
+ MenuId={MenuId}
+ parentId={ParentId}
+ MenuName={config.MenuName}
+ MenuNo={config.MenuNo}
+ updateConfig={this.updateConfig}
+ /> : null}
+ {MenuType === 'home' ? <HomeForm
+ config={config}
+ updateConfig={this.updateConfig}
+ /> : null}
+ {MenuType === 'billPrint' ? <PrintMenuForm
+ config={config}
+ updateConfig={this.updateConfig}
+ /> : null}
+ <UrlFieldComponent
+ config={config}
+ updateConfig={this.updateConfig}
+ />
+ {/* 琛ㄥ悕娣诲姞 */}
+ <TableComponent config={config} updatetable={this.updateConfig}/>
+ <Paragraph style={{padding: '15px 0px 0px 18px'}} copyable={{ text: MenuId }}>鑿滃崟ID</Paragraph>
+ <NormalCss config={config} updateConfig={this.updateConfig}/>
+ </> : null}
</Panel>
{/* 缁勪欢娣诲姞 */}
<Panel header="缁勪欢" key="component">
@@ -1290,19 +1290,17 @@
<Panel header="鍏冪礌" key="element">
<Modulecell />
</Panel>
- {customComponents && customComponents.length ? <Panel header="鑷畾涔夌粍浠�" key="cuscomponent">
- <SourceWrap components={customComponents} MenuType={MenuType} />
- </Panel> : null}
<Panel header="椤甸潰鏍峰紡" key="background">
{config ? <BgController config={config} updateConfig={this.updateConfig} /> : null}
</Panel>
</Collapse>
</div>
<div className={'menu-view' + (menuloading ? ' saving' : '') + (eyeopen ? ' eye-open' : '')}>
- <Card title={config ? config.MenuName : ''} bordered={false} extra={
+ <Card bordered={false} extra={
<div className="mk-opeartion-list">
+ {config ? <Debug config={config}/> : null}
<Button className="mk-border-purple" onClick={() => this.setState({eyeopen: !eyeopen})}>{!eyeopen ? <EyeOutlined /> : <EyeInvisibleOutlined />} 缁勪欢鍚�</Button>
- <Versions MenuId={MenuId} open_edition={config ? config.open_edition : ''}/>
+ {config ? <Versions MenuId={MenuId} Template="CustomPage" checklog={this.checklog} updateConfig={this.updateLogConfig}/> : null}
<TableNodes config={config} />
<ReplaceField type="custom" config={config} updateConfig={this.resetConfig}/>
<SysInterface config={config} updateConfig={this.updateConfig}/>
@@ -1311,7 +1309,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" />}
@@ -1323,7 +1321,7 @@
<ModalController />
<StyleController />
<StyleCombController />
- </ConfigProvider>
+ </>
)
}
}
--
Gitblit v1.8.0