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 | 82 +++++++++++++++++------------------------
1 files changed, 34 insertions(+), 48 deletions(-)
diff --git a/src/views/menudesign/index.jsx b/src/views/menudesign/index.jsx
index 219e2ef..d7d9dc1 100644
--- a/src/views/menudesign/index.jsx
+++ b/src/views/menudesign/index.jsx
@@ -4,7 +4,7 @@
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, message, Dropdown } from 'antd'
+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'
@@ -35,9 +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'))
@@ -827,13 +830,7 @@
}
long_data = []
- // let oriIds = {}
- // if (config.allSqls) {
- // config.allSqls.forEach(item => {
- // if (!item.md5) return
- // oriIds[item.uuid + item.md5] = item.v_id
- // })
- // }
+
let perm = true
if (config.permission === 'false' || config.sqlperm === 'false') {
perm = false
@@ -842,10 +839,6 @@
config.allSqls = sqls.map(item => {
let v_id = _t + getguid()
- // if (oriIds[item.uuid + item.md5]) {
- // v_id = oriIds[item.uuid + item.md5]
- // }
-
long_data.push(`${md5(window.GLOB.appkey + v_id)},${item.uuid},${v_id},${window.btoa(window.encodeURIComponent(item.LText))},${perm ? item.roleId || '' : ''}`)
return {
@@ -853,7 +846,6 @@
v_id: v_id,
type: item.type,
reps: item.reps,
- // md5: item.md5 || '',
luser: item.luser === true
}
})
@@ -909,7 +901,7 @@
let urlFields = config.urlFields ? config.urlFields.join(',') : ''
let langSql = getLangTrans(config)
let pds = 'false'
- if (config.interfaces) {
+ if (config.interfaces && config.enabled) {
config.interfaces.forEach(item => {
if (item.status !== 'true') return
pds = 'true'
@@ -926,7 +918,7 @@
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, msg, pds, backend: 'level1', 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,
long_data: long_data,
debug_md5: key,
@@ -1067,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')
}
@@ -1354,9 +1339,10 @@
/>
{/* 琛ㄥ悕娣诲姞 */}
<TableComponent config={config} updatetable={this.updateConfig}/>
- <Paragraph style={{padding: '15px 0px 0px 37px'}} copyable={{ text: MenuId }}>鑿滃崟ID</Paragraph>
- <Paragraph style={{padding: '0px 0px 0px 18px'}}>鑿滃崟缁勪欢锛�<CopyOutlined onClick={this.copyMenu} style={{cursor: 'pointer', color: '#1890ff'}} /></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>
{/* 缁勪欢娣诲姞 */}
@@ -1372,29 +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} />
- <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}/>
- <PictureController/>
- </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>
- } style={{ width: '100%' }}>
- {config && !comloading ? <MenuShell menu={config} handleList={this.updateConfig} /> : <Spin className="loading-config" size="large" />}
- </Card>
+ <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/>
+ <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