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 | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/menu/pastecontroller/index.jsx b/src/menu/pastecontroller/index.jsx
index eb105f6..074d4f1 100644
--- a/src/menu/pastecontroller/index.jsx
+++ b/src/menu/pastecontroller/index.jsx
@@ -1,6 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { Modal, Button, notification } from 'antd'
+import { SnippetsOutlined } from '@ant-design/icons'
import MenuUtils from '@/utils/utils-custom.js'
import MKEmitter from '@/utils/events.js'
@@ -37,7 +38,6 @@
}
tab.components = tab.components.map(cell => {
- cell.floor = tab.floor + 1
cell.tabId = tab.uuid
cell.parentId = tab.parentId
@@ -52,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 || ''
@@ -67,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') {
@@ -108,8 +107,8 @@
const { visible } = this.state
return (
- <div style={{display: 'inline-block'}}>
- <Button style={{borderColor: '#40a9ff', color: '#40a9ff'}} icon="snippets" onClick={() => {this.setState({visible: true})}}>绮樿创</Button>
+ <div className="mk-view-paste" style={{display: 'inline-block'}}>
+ <Button style={{borderColor: '#40a9ff', color: '#40a9ff'}} onClick={() => {this.setState({visible: true})}}><SnippetsOutlined />绮樿创</Button>
<Modal
title="绮樿创"
visible={visible}
--
Gitblit v1.8.0