From e543372cc70a19ff2630c79d8421c2c593e54e5f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 02 六月 2021 17:15:21 +0800
Subject: [PATCH] 2021-06-02
---
src/templates/sharecomponent/columncomponent/markcolumn/markform/index.jsx | 70 ++++++++++++-----------------------
1 files changed, 24 insertions(+), 46 deletions(-)
diff --git a/src/templates/sharecomponent/columncomponent/markcolumn/markform/index.jsx b/src/templates/sharecomponent/columncomponent/markcolumn/markform/index.jsx
index 6147594..4fbbbac 100644
--- a/src/templates/sharecomponent/columncomponent/markcolumn/markform/index.jsx
+++ b/src/templates/sharecomponent/columncomponent/markcolumn/markform/index.jsx
@@ -1,6 +1,6 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Select, Button, Input, InputNumber, Radio, Icon, Cascader, Tooltip } from 'antd'
+import { Form, Row, Col, Select, Button, Input, Radio, Icon, Cascader, Tooltip } from 'antd'
import { minkeColorSystem, minkeIconSystem } from '@/utils/option.js'
import './index.scss'
@@ -19,7 +19,7 @@
originField: this.props.card,
signType: 'background',
selectIcon: '',
- options: minkeColorSystem,
+ options: JSON.parse(JSON.stringify(minkeColorSystem)),
icons: minkeIconSystem.direction
}
@@ -40,12 +40,25 @@
const { columns } = this.props
let item = columns.filter(col => col.field === record.field)[0]
+ let _type = 'background '
+ if (record.signType === 'icon' || record.signType === 'font') {
+ _type = 'font '
+ }
+
this.setState({
originField: item || '',
editItem: record,
contrastType: record.contrastType || '',
signType: record.signType || '',
- selectIcon: record.icon || ''
+ selectIcon: record.icon || '',
+ options: this.state.options.map(option => {
+ option.children = option.children.map(cell => {
+ cell.label = <div className={_type + cell.value}>{record.icon ? <Icon type={record.icon} /> : cell.value}</div>
+
+ return cell
+ })
+ return option
+ })
}, () => {
let fieldvalue = {}
Object.keys(record).forEach(key => {
@@ -151,14 +164,6 @@
this.setState({
editItem: null
})
- this.props.form.setFieldsValue({
- field: '',
- })
- if (this.state.contrastType !== 'static') {
- this.props.form.setFieldsValue({contrastField: ''})
- } else {
- this.props.form.setFieldsValue({contrastValue: ''})
- }
}
})
}
@@ -177,8 +182,6 @@
sm: { span: 16 }
}
}
-
- let contFields = columns.filter(col => originField.field !== col.field && originField.type === col.type)
return (
<Form {...formItemLayout} id="model-mark-form-box" className="mingke-table">
@@ -231,9 +234,10 @@
})(
<Select>
<Select.Option value="="> = </Select.Option>
- {originField.type === 'number' ? <Select.Option value=">"> > </Select.Option> : null}
- {originField.type === 'number' ? <Select.Option value="<"> < </Select.Option> : null}
- {originField.type === 'text' ? <Select.Option value="like"> like </Select.Option> : null}
+ <Select.Option value="!="> != </Select.Option>
+ <Select.Option value=">"> > </Select.Option>
+ <Select.Option value="<"> < </Select.Option>
+ <Select.Option value="like"> like </Select.Option>
</Select>
)}
</Form.Item>
@@ -241,14 +245,8 @@
{contrastType === 'static' ? <Col span={6}>
<Form.Item label={'瀵规瘮鍊�'}>
{getFieldDecorator('contrastValue', {
- initialValue: '',
- rules: [
- {
- required: true,
- message: this.props.dict['form.required.input'] + '瀵规瘮鍊�!'
- }
- ]
- })(originField.type === 'number' ? <InputNumber /> : <Input placeholder="" autoComplete="off" />)}
+ initialValue: ''
+ })(<Input placeholder="" autoComplete="off" />)}
</Form.Item>
</Col> : null}
{contrastType === 'dynamic' ? <Col span={6}>
@@ -266,7 +264,7 @@
showSearch
filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
>
- {contFields.map(item => (
+ {columns.map(item => (
<Select.Option key={item.uuid} title={item.label + '(' + item.field + ')'} value={item.field}>{item.label + '(' + item.field + ')'}</Select.Option>
))}
</Select>
@@ -340,26 +338,6 @@
})(
<Select onChange={this.changeIcon} getPopupContainer={() => document.getElementById('model-mark-form-box')}>
{icons.map(icon => <Select.Option key={icon} value={icon}><Icon type={icon} /></Select.Option>)}
- {/* <Select.Option value="arrow-up"><Icon type="arrow-up" /></Select.Option>
- <Select.Option value="arrow-down"><Icon type="arrow-down" /></Select.Option>
- <Select.Option value="arrow-left"><Icon type="arrow-left" /></Select.Option>
- <Select.Option value="arrow-right"><Icon type="arrow-right" /></Select.Option>
- <Select.Option value="check-circle"><Icon type="check-circle" /></Select.Option>
- <Select.Option value="close-circle"><Icon type="close-circle" /></Select.Option>
- <Select.Option value="clock-circle"><Icon type="clock-circle" /></Select.Option>
- <Select.Option value="pause-circle"><Icon type="pause-circle" /></Select.Option>
- <Select.Option value="stop"><Icon type="stop" /></Select.Option>
- <Select.Option value="question-circle"><Icon type="question-circle" /></Select.Option>
- <Select.Option value="exclamation-circle"><Icon type="exclamation-circle" /></Select.Option>
- <Select.Option value="check-square"><Icon type="check-square" /></Select.Option>
- <Select.Option value="warning"><Icon type="warning" /></Select.Option>
- <Select.Option value="minus-circle"><Icon type="minus-circle" /></Select.Option>
- <Select.Option value="issues-close"><Icon type="issues-close" /></Select.Option>
- <Select.Option value="question"><Icon type="question" /></Select.Option>
- <Select.Option value="fall"><Icon type="fall" /></Select.Option>
- <Select.Option value="rise"><Icon type="rise" /></Select.Option>
- <Select.Option value="link"><Icon type="link" /></Select.Option> */}
- {/* <Select.Option value="link"></Select.Option> */}
</Select>
)}
</Form.Item>
@@ -378,7 +356,7 @@
<Cascader
options={options}
placeholder=""
- displayRender={(label, selectedOptions) => selectedOptions[0] ? selectedOptions[0].label + ' / ' + selectedOptions[1].value : ''}
+ displayRender={(label, selectedOptions) => selectedOptions[0] ? selectedOptions[0].label + (selectedOptions[1] ? ' / ' + selectedOptions[1].value : '') : ''}
getPopupContainer={() => document.getElementById('model-mark-form-box')}
/>
)}
--
Gitblit v1.8.0