From 9ee3d1f9a09a865188baffdffb85f6ad329c7b09 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 19 十二月 2021 01:09:20 +0800
Subject: [PATCH] 2021-12-19
---
src/mob/components/search/single-search/index.jsx | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/mob/components/search/single-search/index.jsx b/src/mob/components/search/single-search/index.jsx
index 2febeb1..04596c7 100644
--- a/src/mob/components/search/single-search/index.jsx
+++ b/src/mob/components/search/single-search/index.jsx
@@ -1,7 +1,7 @@
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Popover, Icon, Input } from 'antd'
+import { Popover, Icon, Input, Button } from 'antd'
import zhCN from '@/locales/zh-CN/model.js'
import enUS from '@/locales/en-US/model.js'
@@ -10,8 +10,6 @@
import getWrapForm from './options'
import MKEmitter from '@/utils/events.js'
import './index.scss'
-
-const { Search } = Input
const NormalForm = asyncIconComponent(() => import('@/components/normalform'))
@@ -46,7 +44,7 @@
width: 24,
name: card.name,
subtype: card.subtype,
- wrap: { name: card.name, width: 24, label: '鎼滅储', field: '', show: 'button' },
+ wrap: { name: card.name, width: 24, label: '鎼滅储', field: '', show: 'text' },
style: {
marginLeft: '8px', marginRight: '8px', marginTop: '8px', marginBottom: '8px',
paddingLeft: '10px', paddingRight: '10px', paddingTop: '10px', paddingBottom: '10px',
@@ -116,9 +114,9 @@
}
getWrapForms = () => {
- const { wrap, action } = this.state.card
+ const { wrap } = this.state.card
- return getWrapForm(wrap, action)
+ return getWrapForm(wrap)
}
updateWrap = (res) => {
@@ -138,8 +136,11 @@
return (
<div className="single-search-edit-list" onClick={this.clickComponent} id={card.uuid} style={_style}>
- <Search placeholder={card.wrap.label} value={card.initval} enterButton />
- <Input placeholder={card.labelShow === 'false' ? card.label : ''} value={card.initval} />
+ <div className="search-wrap" style={{borderRadius: card.wrap.borderRadius || 0}}>
+ <Input placeholder={card.wrap.label} value={card.initval} />
+ {card.wrap.scan === 'show' ? <Icon type="scan" /> : null}
+ {card.wrap.show === 'text' ? <Button type="primary">鎼滅储</Button> : <Button icon="search" type="primary"></Button>}
+ </div>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
<NormalForm title="鎼滅储璁剧疆" width={800} update={this.updateWrap} getForms={this.getWrapForms}>
--
Gitblit v1.8.0