From 4ce77c01c1adcbd1b3cb2aa5b7103a827d189811 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 06 二月 2025 20:53:22 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/views/mobdesign/popview/index.jsx | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/views/mobdesign/popview/index.jsx b/src/views/mobdesign/popview/index.jsx
index 15edee3..c7ce41b 100644
--- a/src/views/mobdesign/popview/index.jsx
+++ b/src/views/mobdesign/popview/index.jsx
@@ -15,6 +15,7 @@
const MobShell = asyncComponent(() => import('@/mob/mobshell'))
const SourceWrap = asyncComponent(() => import('@/mob/modulesource'))
const Modulecell = asyncComponent(() => import('@/menu/modulecell'))
+const NormalCopy = asyncComponent(() => import('@/menu/normalCopy'))
const BgController = asyncComponent(() => import('@/pc/bgcontroller'))
const ReplaceField = asyncComponent(() => import('@/menu/replaceField'))
const PasteController = asyncComponent(() => import('@/menu/pastecontroller'))
@@ -266,6 +267,7 @@
<Panel header="鍩烘湰淇℃伅" forceRender className="basedata" key="basedata">
{/* 琛ㄥ悕娣诲姞 */}
<TableComponent config={config} updatetable={this.updateConfig}/>
+ <NormalCopy />
</Panel>
{/* 缁勪欢娣诲姞 */}
<Panel header="缁勪欢" className="component" key="component">
@@ -285,13 +287,13 @@
{controlshow ? <DoubleRightOutlined onClick={() => {this.setState({controlshow: false})}}/> : null}
{!controlshow ? <DoubleLeftOutlined onClick={() => {this.setState({controlshow: true})}}/> : null}
</div>
- <div className="wrap">
+ <div className="wrap mk-opeartion-list">
<Button type="primary" onClick={this.submitConfig} id="save-config" loading={menuloading}>淇濆瓨</Button>
<Switch className="big" checkedChildren="鍚�" unCheckedChildren="鍋�" checked={config && config.enabled} onChange={this.onEnabledChange} />
<Button className="mk-border-purple" onClick={() => this.setState({eyeopen: !eyeopen})}>{!eyeopen ? <EyeOutlined /> : <EyeInvisibleOutlined />} 缁勪欢鍚�</Button>
<PasteController insert={this.insert} />
<StyleCombControlButton menu={config} />
- <ReplaceField type="custom" config={config} updateConfig={this.resetConfig}/>
+ <ReplaceField config={config} updateConfig={this.resetConfig}/>
<Button type="default" onClick={this.closeView}>杩斿洖</Button>
</div>
</div>
--
Gitblit v1.8.0