From 26d0fa42ea8c63a87e8ef93d0915f75f46fb1f9c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 24 三月 2022 11:09:53 +0800
Subject: [PATCH] 2022-03-24
---
src/menu/components/share/pastecomponent/index.jsx | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/menu/components/share/pastecomponent/index.jsx b/src/menu/components/share/pastecomponent/index.jsx
index e4d8edf..b0c79bb 100644
--- a/src/menu/components/share/pastecomponent/index.jsx
+++ b/src/menu/components/share/pastecomponent/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Icon, Modal, notification } from 'antd'
+import { Modal, notification } from 'antd'
+import { SnippetsOutlined } from '@ant-design/icons'
import Utils from '@/utils/utils.js'
import MKEmitter from '@/utils/events.js'
@@ -129,6 +130,7 @@
pasteSubmit = () => {
const { options } = this.props
this.pasteFormRef.handleConfirm().then(res => {
+
if (!options.includes(res.copyType)) {
notification.warning({ top: 92, message: '閰嶇疆淇℃伅鏍煎紡閿欒锛�', duration: 5 })
return
@@ -147,7 +149,11 @@
MKEmitter.emit('copyButtons', copyBtns)
}
- if (type === 'action') {
+ if (config.type === 'form') {
+ this.props.updateConfig(res)
+ this.setState({visible: false})
+ return
+ } else if (type === 'action') {
config.action = config.action || []
config.action = config.action.filter(item => !item.origin)
@@ -157,13 +163,10 @@
}
MKEmitter.emit('addButton', config.uuid, res)
} else if (type === 'search' || type === 'form') {
- config.search = config.search || []
- config.search = config.search.filter(item => !item.origin)
-
- let keys = config.search.map(item => item.field.toLowerCase())
+ let keys = config.search.map(item => item.field ? item.field.toLowerCase() : '')
if (type === 'form') {
- if (['number', 'switch', 'textarea', 'checkcard', 'fileupload', 'hint', 'color', 'funcvar'].includes(res.type)) {
+ if (['number', 'switch', 'textarea', 'fileupload', 'hint', 'color', 'funcvar'].includes(res.type)) {
res.type = 'text'
} else if (res.type === 'radio') {
res.type = 'select'
@@ -183,7 +186,9 @@
return
}
- config.search.push(res)
+ MKEmitter.emit('plusSearch', config.uuid, res, 'simple')
+ this.setState({visible: false})
+ return
} else if (type === 'cardcell') {
config.subcards.push(res)
} else if (type === 'menucell') {
@@ -216,7 +221,7 @@
return (
<div style={{display: 'inline-block'}}>
- <Icon type="snippets" style={{color: 'purple'}} onClick={() => {this.setState({visible: true})}} />
+ <SnippetsOutlined style={{color: 'purple'}} onClick={() => {this.setState({visible: true})}} />
<Modal
title="绮樿创"
visible={visible}
--
Gitblit v1.8.0