From b8cde0c39d7b6d58ceff3adf6dea3cb3118ea602 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 13 九月 2022 14:46:15 +0800
Subject: [PATCH] 2022-09-13

---
 src/menu/components/share/pastecomponent/index.jsx |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/menu/components/share/pastecomponent/index.jsx b/src/menu/components/share/pastecomponent/index.jsx
index e367d11..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'
@@ -162,10 +163,7 @@
         }
         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', 'fileupload', 'hint', 'color', 'funcvar'].includes(res.type)) {
@@ -188,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') {
@@ -221,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