From d1cd5af5adb53e91efdd278328e1b6f8ad834fb5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 06 二月 2025 21:11:56 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/views/menudesign/index.jsx | 45 +++++++++++++++++++++++++--------------------
1 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/src/views/menudesign/index.jsx b/src/views/menudesign/index.jsx
index 29eb9eb..f29c056 100644
--- a/src/views/menudesign/index.jsx
+++ b/src/views/menudesign/index.jsx
@@ -4,8 +4,8 @@
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 } from 'antd'
-import { DoubleLeftOutlined, DoubleRightOutlined, EyeOutlined, EyeInvisibleOutlined, CopyOutlined } 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'
@@ -35,8 +35,10 @@
const PasteController = asyncComponent(() => import('@/menu/pastecontroller'))
const StyleController = asyncComponent(() => import('@/menu/stylecontroller'))
const ReplaceField = asyncComponent(() => import('@/menu/replaceField'))
+const LowerField = asyncComponent(() => import('@/menu/lowerField'))
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'))
@@ -1353,9 +1355,10 @@
/>
{/* 琛ㄥ悕娣诲姞 */}
<TableComponent config={config} updatetable={this.updateConfig}/>
- <Paragraph style={{padding: '15px 0px 0px 37px'}} copyable={{ text: MenuId }}>鑿滃崟ID</Paragraph>
+ <Paragraph style={{padding: '15px 0px 0px 32px'}} copyable={{ text: MenuId }}>鑿滃崟ID锛�</Paragraph>
<Paragraph style={{padding: '0px 0px 0px 18px'}}>鑿滃崟缁勪欢锛�<CopyOutlined onClick={this.copyMenu} style={{cursor: 'pointer', color: '#1890ff'}} /></Paragraph>
<NormalCss config={config} updateConfig={this.updateConfig}/>
+ <NormalCopy />
</> : null}
</Panel>
{/* 缁勪欢娣诲姞 */}
@@ -1371,24 +1374,26 @@
</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}/>
<PictureController/>
- <StyleCombControlButton menu={config} />
- <PasteController vType="admin" insert={this.insert} />
- {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>} 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