From 92664ef80a97a63fde223b14097ccda3ae6ff183 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 24 四月 2025 14:31:57 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/views/menudesign/index.jsx | 177 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 138 insertions(+), 39 deletions(-)
diff --git a/src/views/menudesign/index.jsx b/src/views/menudesign/index.jsx
index 703e194..d7d9dc1 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 { notification, Modal, Collapse, Card, Switch, Button, Typography, Spin } from 'antd'
-import { DoubleLeftOutlined, DoubleRightOutlined, EyeOutlined, EyeInvisibleOutlined } from '@ant-design/icons'
+import { notification, Modal, Collapse, Switch, Button, Typography, Spin, message, Dropdown } from 'antd'
+import { DoubleLeftOutlined, DoubleRightOutlined, EyeOutlined, EyeInvisibleOutlined, CopyOutlined, DownOutlined } from '@ant-design/icons'
import html2canvas from 'html2canvas'
import md5 from 'md5'
import Api from '@/api'
-import Utils, { setGLOBFuncs } from '@/utils/utils.js'
+import Utils from '@/utils/utils.js'
import { langs } from '@/store/options'
import MKEmitter from '@/utils/events.js'
-import { getTables, getFuncsAndInters, getLangTrans } from '@/utils/utils-custom.js'
+import { getTables, getFuncsAndInters, getOutMessage, getLangTrans, getAllSqls } from '@/utils/utils-custom.js'
import asyncComponent from '@/utils/asyncComponent'
import '@/assets/css/design.scss'
@@ -35,8 +35,12 @@
const PasteController = asyncComponent(() => import('@/menu/pastecontroller'))
const StyleController = asyncComponent(() => import('@/menu/stylecontroller'))
const ReplaceField = asyncComponent(() => import('@/menu/replaceField'))
+const DelExtraDb = asyncComponent(() => import('@/menu/delExtraDb'))
+const LowerField = asyncComponent(() => import('@/menu/lowerField'))
+const LowerText = asyncComponent(() => import('@/menu/lowerText'))
const Debug = asyncComponent(() => import('@/menu/debug'))
const NormalCss = asyncComponent(() => import('@/menu/normalCss'))
+const NormalCopy = asyncComponent(() => import('@/menu/normalCopy'))
const Versions = asyncComponent(() => import('@/menu/versions'))
const TableNodes = asyncComponent(() => import('@/menu/tablenodes'))
const SysInterface = asyncComponent(() => import('@/menu/sysinterface'))
@@ -133,7 +137,7 @@
MKEmitter.addListener('changeEditMenu', this.changeEditMenu)
setTimeout(() => {
this.getRoleFields()
- setGLOBFuncs()
+ // setGLOBFuncs()
}, 1000)
document.onkeydown = (event) => {
@@ -780,6 +784,8 @@
} else if (this.checklog()) {
if (sessionStorage.getItem('langList') && !config.trans) {
+ } else if (config.enabled && !config.allSqls) {
+
} else {
notification.success({
top: 92,
@@ -806,12 +812,51 @@
delete config.force
}
- if (config.cacheUseful !== 'true') {
- config.components = this.resetSyncQuery(config.components)
+ if (config.MenuID === 'home_page_id' || MenuType === 'billPrint') {
+ config.permission = 'false'
}
- if (config.MenuID === 'home_page_id') {
- config.permission = 'false'
+ let long_data = ''
+ if (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)
+ }
+ uuid = uuid.replace(/minke/ig, 'MNKIE')
+ return uuid
+ }
+
+ long_data = []
+
+ let perm = true
+ if (config.permission === 'false' || config.sqlperm === 'false') {
+ perm = false
+ }
+
+ 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))},${perm ? item.roleId || '' : ''}`)
+
+ return {
+ uuid: item.uuid,
+ v_id: v_id,
+ type: item.type,
+ reps: item.reps,
+ luser: item.luser === true
+ }
+ })
+
+ long_data = long_data.join(';')
+ } else {
+ delete config.allSqls
+ }
+
+ if (config.cacheUseful !== 'true') {
+ config.components = this.resetSyncQuery(config.components)
}
let tbs = []
@@ -852,8 +897,16 @@
}
let interfaces = getFuncsAndInters(config)
+ let msg = getOutMessage(config)
let urlFields = config.urlFields ? config.urlFields.join(',') : ''
let langSql = getLangTrans(config)
+ let pds = 'false'
+ if (config.interfaces && config.enabled) {
+ config.interfaces.forEach(item => {
+ if (item.status !== 'true') return
+ pds = 'true'
+ })
+ }
let param = {
func: 'sPC_TrdMenu_AddUpt',
@@ -865,10 +918,9 @@
EasyCode: config.easyCode || '',
Template: 'CustomPage',
MenuName: config.MenuName || '',
- PageParam: JSON.stringify({Template: 'CustomPage', OpenType: config.OpenType || 'newtab', hidden: config.hidden || 'false', menuColor: config.menuColor || '', interfaces, urlFields}),
+ PageParam: JSON.stringify({Template: 'CustomPage', OpenType: config.OpenType || 'newtab', hidden: config.hidden || 'false', menuColor: config.menuColor || '', interfaces, msg, pds, backend: 'level1', enabled: config.enabled, urlFields}),
open_edition: config.open_edition,
- // LText: '',
- // LTexttb: '',
+ long_data: long_data,
debug_md5: key,
debug_url: url,
debug_list: window.btoa(tbs),
@@ -1007,18 +1059,11 @@
}, 300 + (+sessionStorage.getItem('mkDelay')))
}
- netError = (error) => {
+ netError = () => {
this.setState({
menuloading: false
})
- if (!error) {
- notification.warning({
- top: 92,
- message: '淇濆瓨澶辫触锛岃妫�鏌ョ綉缁滄槸鍚︽甯搞��',
- duration: 5
- })
- }
MKEmitter.emit('completeSave')
}
@@ -1171,7 +1216,16 @@
insert = (item) => {
let config = fromJS(this.state.config).toJS()
- config.components.push(item)
+ if (item.copyType === 'components') {
+ config.components.push(...item.components)
+ if (!config.interfaces) {
+ config.interfaces = item.interfaces
+ } else {
+ config.interfaces.push(...item.interfaces)
+ }
+ } else {
+ config.components.push(item)
+ }
this.setState({config})
window.GLOB.customMenu = config
@@ -1190,6 +1244,44 @@
const { oriConfig, config } = this.state
return is(fromJS(oriConfig), fromJS(config))
+ }
+
+ copyMenu = () => {
+ const { config } = this.state
+
+ if (!config.enabled) {
+ notification.warning({
+ top: 92,
+ message: '鑿滃崟鏈惎鐢紝涓嶅彲澶嶅埗銆�',
+ duration: 5
+ })
+ } else if (config.components.length === 0) {
+ notification.warning({
+ top: 92,
+ message: '鏈坊鍔犵粍浠讹紝涓嶅彲澶嶅埗銆�',
+ duration: 5
+ })
+ } else {
+ let msg = { copyType: 'components', type: 'admin' }
+
+ msg.components = config.components || []
+ msg.interfaces = config.interfaces || []
+
+ try {
+ msg = window.btoa(window.encodeURIComponent(JSON.stringify(msg)))
+ } catch (e) {
+ console.warn('Stringify Failure')
+ msg = ''
+ }
+
+ let oInput = document.createElement('input')
+ oInput.value = msg
+ document.body.appendChild(oInput)
+ oInput.select()
+ document.execCommand('Copy')
+ document.body.removeChild(oInput)
+ message.success('澶嶅埗鎴愬姛銆�')
+ }
}
updateLogConfig = (config) => {
@@ -1247,8 +1339,10 @@
/>
{/* 琛ㄥ悕娣诲姞 */}
<TableComponent config={config} updatetable={this.updateConfig}/>
- <Paragraph style={{padding: '15px 0px 0px 18px'}} copyable={{ text: MenuId }}>鑿滃崟ID</Paragraph>
+ <Paragraph style={{padding: '15px 0px 0px 32px'}} copyable={{ text: MenuId }}>鑿滃崟ID锛�</Paragraph>
<NormalCss config={config} updateConfig={this.updateConfig}/>
+ <Paragraph style={{padding: '0px 0px 0px 18px'}}>澶嶅埗鑿滃崟涓嬫墍鏈夌粍浠讹細<CopyOutlined onClick={this.copyMenu} style={{cursor: 'pointer', color: '#1890ff'}} /></Paragraph>
+ <NormalCopy />
</> : null}
</Panel>
{/* 缁勪欢娣诲姞 */}
@@ -1264,24 +1358,29 @@
</Collapse>
</div>
<div className={'menu-view' + (menuloading ? ' saving' : '') + (eyeopen ? ' eye-open' : '')}>
- <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>
- {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}/>
+ <div className="mk-opeartion-list">
+ {config ? <Debug config={config}/> : null}
+ <Button className="mk-border-purple" onClick={() => this.setState({eyeopen: !eyeopen})}>{!eyeopen ? <EyeOutlined /> : <EyeInvisibleOutlined />} 缁勪欢鍚�</Button>
+ {config ? <Versions MenuId={MenuId} Template="CustomPage" checklog={this.checklog} updateConfig={this.updateLogConfig}/> : null}
+ <TableNodes config={config} />
+ <SysInterface config={config} updateConfig={this.updateConfig}/>
+ <StyleCombControlButton menu={config} />
+ <PasteController vType="admin" insert={this.insert} />
+ {config ? <Dropdown placement="bottomCenter" overlay={<div className="mk-opeartion-dropdown-wrap">
+ <ReplaceField config={config} updateConfig={this.resetConfig}/>
+ <LowerField config={config} updateConfig={this.resetConfig}/>
+ <DelExtraDb config={config} updateConfig={this.resetConfig}/>
+ <LowerText />
<PictureController/>
- <StyleCombControlButton menu={config} />
- <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>
- </div>
- } style={{ width: '100%' }}>
- {config && !comloading ? <MenuShell menu={config} handleList={this.updateConfig} /> : <Spin className="loading-config" size="large" />}
- </Card>
+ <Button onClick={() => window.open('#/ai')}>DeepSeek</Button>
+ </div>} trigger={['hover']}>
+ <div className="mk-button-more">鏇村<DownOutlined/></div>
+ </Dropdown> : null}
+ {config ? <Switch className="big" checkedChildren="鍚�" unCheckedChildren="鍋�" checked={config.enabled} onChange={this.onEnabledChange} /> : null}
+ <Button type="primary" id="save-config" disabled={!config} className={needUpdate ? 'update-tip' : ''} onClick={this.submitConfig} loading={menuloading}>淇濆瓨</Button>
+ <Button type="default" disabled={menuloading} onClick={this.closeView}>鍏抽棴</Button>
+ </div>
+ {config && !comloading ? <MenuShell menu={config} handleList={this.updateConfig} /> : <Spin className="loading-config" size="large" />}
</div>
</div>
</div> : <PopView btn={this.state.popConfig} save={this.submitPopConfig} cancel={this.closePop}/>}
--
Gitblit v1.8.0