From 76a4300654a18d228838c3f27455dc8e7a8cd616 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 15 一月 2021 17:04:42 +0800
Subject: [PATCH] Merge branch 'master' into bms
---
src/menu/components/share/markcomponent/markform/index.jsx | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/menu/components/table/normal-table/columns/markcolumn/markform/index.jsx b/src/menu/components/share/markcomponent/markform/index.jsx
similarity index 94%
rename from src/menu/components/table/normal-table/columns/markcolumn/markform/index.jsx
rename to src/menu/components/share/markcomponent/markform/index.jsx
index 613ea2b..c027d4b 100644
--- a/src/menu/components/table/normal-table/columns/markcolumn/markform/index.jsx
+++ b/src/menu/components/share/markcomponent/markform/index.jsx
@@ -68,7 +68,7 @@
<Select>
<Select.Option value="="> = </Select.Option>
<Select.Option value="!="> != </Select.Option>
- <Select.Option value=">"> > </Select.Option>
+ <Select.Option value=">"> > </Select.Option>
<Select.Option value="<"> < </Select.Option>
<Select.Option value="like"> like </Select.Option>
</Select>
@@ -101,7 +101,7 @@
)}
</Form.Item>
</Col>
- <Col span={6}>
+ {signs.length ? <Col span={6}>
<Form.Item label="鏍囪鏂瑰紡">
{getFieldDecorator('signType', {
initialValue: [],
@@ -115,8 +115,8 @@
<Cascader options={signs} placeholder=""/>
)}
</Form.Item>
- </Col>
- <Col span={18} style={{textAlign: 'right', marginBottom: 10}}>
+ </Col> : null}
+ <Col span={signs.length ? 18 : 24} style={{textAlign: 'right'}}>
<Button onClick={this.handleConfirm} type="primary" className="mk-green">
娣诲姞
</Button>
--
Gitblit v1.8.0