From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/pastecontroller/index.jsx | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/menu/pastecontroller/index.jsx b/src/menu/pastecontroller/index.jsx
index f0cb87c..074d4f1 100644
--- a/src/menu/pastecontroller/index.jsx
+++ b/src/menu/pastecontroller/index.jsx
@@ -38,7 +38,6 @@
}
tab.components = tab.components.map(cell => {
- cell.floor = tab.floor + 1
cell.tabId = tab.uuid
cell.parentId = tab.parentId
@@ -53,7 +52,6 @@
item.name = item.setting.name
item.components = item.components.map(cell => {
- cell.floor = item.floor
cell.tabId = item.tabId || ''
cell.parentId = item.parentId || ''
@@ -68,7 +66,7 @@
}
pasteSubmit = () => {
- let options = ['tabs', 'menubar', 'topbar', 'timeline', 'datacard', 'propcard', 'mainsearch', 'stepform', 'tabform', 'balcony', 'group', 'normaltable', 'tablecard', 'line', 'bar', 'pie', 'dashboard', 'scatter']
+ let options = ['tabs', 'menubar', 'topbar', 'timeline', 'datacard', 'propcard', 'mainsearch', 'simpleform', 'stepform', 'tabform', 'balcony', 'group', 'normaltable', 'tablecard', 'line', 'bar', 'pie', 'dashboard', 'scatter']
this.pasteFormRef.handleConfirm().then(res => {
if ((res.copyType === 'menubar' || res.copyType === 'topbar') && sessionStorage.getItem('appType') !== 'mob') {
@@ -109,7 +107,7 @@
const { visible } = this.state
return (
- <div style={{display: 'inline-block'}}>
+ <div className="mk-view-paste" style={{display: 'inline-block'}}>
<Button style={{borderColor: '#40a9ff', color: '#40a9ff'}} onClick={() => {this.setState({visible: true})}}><SnippetsOutlined />绮樿创</Button>
<Modal
title="绮樿创"
--
Gitblit v1.8.0