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/popview/index.jsx | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/src/views/menudesign/popview/index.jsx b/src/views/menudesign/popview/index.jsx
index 496f116..fa28c25 100644
--- a/src/views/menudesign/popview/index.jsx
+++ b/src/views/menudesign/popview/index.jsx
@@ -1,7 +1,7 @@
import React, { Component } from 'react'
import { is, fromJS } from 'immutable'
import PropTypes from 'prop-types'
-import { notification, Modal, Collapse, Card, Switch, Button } from 'antd'
+import { notification, Modal, Collapse, Switch, Button } from 'antd'
import { EyeOutlined, EyeInvisibleOutlined } from '@ant-design/icons'
import MKEmitter from '@/utils/events.js'
@@ -15,6 +15,7 @@
const SourceWrap = asyncComponent(() => import('@/menu/modulesource'))
const Modulecell = asyncComponent(() => import('@/menu/modulecell'))
const MenuShell = asyncComponent(() => import('@/menu/menushell'))
+const NormalCopy = asyncComponent(() => import('@/menu/normalCopy'))
const ReplaceField = asyncComponent(() => import('@/menu/replaceField'))
const BgController = asyncComponent(() => import('@/pc/bgcontroller'))
const PasteController = asyncComponent(() => import('@/menu/pastecontroller'))
@@ -260,6 +261,7 @@
<Panel header="鍩烘湰淇℃伅" key="basedata">
{/* 琛ㄥ悕娣诲姞 */}
<TableComponent config={config} updatetable={this.updatetable}/>
+ <NormalCopy />
</Panel>
{/* 缁勪欢娣诲姞 */}
<Panel header="缁勪欢" key="component">
@@ -274,21 +276,17 @@
</Collapse>
</div>
<div className={'menu-view' + (menuloading ? ' saving' : '') + (eyeopen ? ' eye-open' : '')}>
- <Card title={
- <div> {config.MenuName} </div>
- } bordered={false} extra={
- <div>
- <Button className="mk-border-purple" onClick={() => this.setState({eyeopen: !eyeopen})}>{!eyeopen ? <EyeOutlined /> : <EyeInvisibleOutlined />} 缁勪欢鍚�</Button>
- <ReplaceField type="custom" config={config} updateConfig={this.resetConfig}/>
- <StyleCombControlButton menu={config} />
- <PasteController insert={this.insert} />
- <Switch className="big" checkedChildren="鍚�" unCheckedChildren="鍋�" checked={config.enabled} onChange={this.onEnabledChange} />
- <Button type="primary" id="save-pop-config" onClick={this.submitConfig} loading={menuloading}>淇濆瓨</Button>
- <Button type="default" disabled={menuloading} onClick={this.closeView}>杩斿洖</Button>
- </div>
- } style={{ width: '100%' }}>
- {!comloading ? <MenuShell menu={config} handleList={this.updateConfig} /> : null}
- </Card>
+ <div className="mk-opeartion-list">
+ <div className="btn-name">{config.MenuName}</div>
+ <Button className="mk-border-purple" onClick={() => this.setState({eyeopen: !eyeopen})}>{!eyeopen ? <EyeOutlined /> : <EyeInvisibleOutlined />} 缁勪欢鍚�</Button>
+ <ReplaceField config={config} updateConfig={this.resetConfig}/>
+ <StyleCombControlButton menu={config} />
+ <PasteController insert={this.insert} />
+ <Switch className="big" checkedChildren="鍚�" unCheckedChildren="鍋�" checked={config.enabled} onChange={this.onEnabledChange} />
+ <Button type="primary" id="save-pop-config" onClick={this.submitConfig} loading={menuloading}>淇濆瓨</Button>
+ <Button type="default" disabled={menuloading} onClick={this.closeView}>杩斿洖</Button>
+ </div>
+ {!comloading ? <MenuShell menu={config} handleList={this.updateConfig} /> : null}
</div>
</div>
</div>
--
Gitblit v1.8.0