From 1aa5654a0b51bb82948fff8bed77b166f25f11ea Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 19 二月 2025 20:14:20 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/sharecomponent/columncomponent/markcolumn/markform/index.jsx | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/templates/sharecomponent/columncomponent/markcolumn/markform/index.jsx b/src/templates/sharecomponent/columncomponent/markcolumn/markform/index.jsx
index 5785dd4..94683e2 100644
--- a/src/templates/sharecomponent/columncomponent/markcolumn/markform/index.jsx
+++ b/src/templates/sharecomponent/columncomponent/markcolumn/markform/index.jsx
@@ -1,13 +1,13 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Select, Button, Input, Radio, Icon, Cascader } from 'antd'
+import { Form, Row, Col, Select, Button, Input, Radio, Cascader } from 'antd'
import { minkeColorSystem, minkeIconSystem } from '@/utils/option.js'
+import MkIcon from '@/components/mk-icon'
import './index.scss'
class UniqueForm extends Component {
static propTpyes = {
- dict: PropTypes.object, // 瀛楀吀椤�
card: PropTypes.object, // 瀛楁淇℃伅
columns: PropTypes.array, // 鍒楀悕闆嗗悎
markChange: PropTypes.func // 淇敼鍑芥暟
@@ -53,7 +53,7 @@
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>
+ cell.label = <div className={_type + cell.value}>{record.icon ? <MkIcon type={record.icon} /> : cell.value}</div>
return cell
})
@@ -145,7 +145,7 @@
selectIcon: val,
options: this.state.options.map(option => {
option.children = option.children.map(cell => {
- cell.label = <div className={'font ' + cell.value}><Icon type={val} /></div>
+ cell.label = <div className={'font ' + cell.value}><MkIcon type={val} /></div>
return cell
})
@@ -193,7 +193,7 @@
rules: [
{
required: true,
- message: this.props.dict['form.required.select'] + '瀛楁!'
+ message: '璇烽�夋嫨瀛楁!'
}
]
})(
@@ -228,7 +228,7 @@
rules: [
{
required: true,
- message: this.props.dict['form.required.select'] + '瀵规瘮鏂瑰紡!'
+ message: '璇烽�夋嫨瀵规瘮鏂瑰紡!'
}
]
})(
@@ -256,7 +256,7 @@
rules: [
{
required: true,
- message: this.props.dict['form.required.select'] + '瀵规瘮瀛楁!'
+ message: '璇烽�夋嫨瀵规瘮瀛楁!'
}
]
})(
@@ -278,7 +278,7 @@
rules: [
{
required: true,
- message: this.props.dict['form.required.select'] + '鏍囪鏂瑰紡!'
+ message: '璇烽�夋嫨鏍囪鏂瑰紡!'
}
]
})(
@@ -314,25 +314,24 @@
<Select.Option value="hint">鎻愮ず寤鸿鎬у浘鏍�</Select.Option>
<Select.Option value="edit">缂栬緫绫诲浘鏍�</Select.Option>
<Select.Option value="data">鏁版嵁绫诲浘鏍�</Select.Option>
- <Select.Option value="trademark">鍝佺墝鍜屾爣璇�</Select.Option>
<Select.Option value="normal">缃戠珯閫氱敤鍥炬爣</Select.Option>
</Select>
)}
</Form.Item>
</Col> : null}
{signType === 'icon' ? <Col span={6}>
- <Form.Item label={'鍥炬爣'}>
+ <Form.Item label="鍥炬爣">
{getFieldDecorator('icon', {
initialValue: '',
rules: [
{
required: true,
- message: this.props.dict['form.required.select'] + '鍥炬爣!'
+ message: '璇烽�夋嫨鍥炬爣!'
}
]
})(
<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>)}
+ {icons.map(icon => <Select.Option key={icon} value={icon}><MkIcon type={icon} /></Select.Option>)}
</Select>
)}
</Form.Item>
@@ -344,7 +343,7 @@
rules: [
{
required: true,
- message: this.props.dict['form.required.select'] + '棰滆壊!'
+ message: '璇烽�夋嫨棰滆壊!'
}
]
})(
--
Gitblit v1.8.0