From d59f518f466274b2caeb2e01c10c92deafe7c93b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 09 二月 2022 11:48:29 +0800
Subject: [PATCH] 2022-02-09
---
src/templates/sharecomponent/columncomponent/colspanform/index.jsx | 60 +++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 39 insertions(+), 21 deletions(-)
diff --git a/src/templates/sharecomponent/columncomponent/colspanform/index.jsx b/src/templates/sharecomponent/columncomponent/colspanform/index.jsx
index 2fdbe29..0c9be7e 100644
--- a/src/templates/sharecomponent/columncomponent/colspanform/index.jsx
+++ b/src/templates/sharecomponent/columncomponent/colspanform/index.jsx
@@ -1,9 +1,11 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Input, InputNumber, Select, Radio } from 'antd'
+import { Form, Row, Col, Input, InputNumber, Select, Radio, Tooltip } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
+
import { formRule } from '@/utils/option.js'
import TransferForm from '@/templates/zshare/transferform'
-import './index.scss'
+// import './index.scss'
class MainSearch extends Component {
static propTpyes = {
@@ -19,7 +21,7 @@
if (_form && _form.select) {
_form.select()
}
- } catch {
+ } catch (e) {
console.warn('琛ㄥ崟focus澶辫触锛�')
}
}
@@ -62,6 +64,7 @@
}
render() {
+ const { card } = this.props
const { getFieldDecorator } = this.props.form
const formItemLayout = {
labelCol: {
@@ -74,12 +77,12 @@
}
}
return (
- <Form {...formItemLayout} className="commontable-cospan-column-form" id="columncolspan">
+ <Form {...formItemLayout} style={{minHeight: '190px'}} id="columncolspan">
<Row gutter={24}>
<Col span={12}>
<Form.Item label={this.props.dict['model.name']}>
{getFieldDecorator('label', {
- initialValue: this.props.card.label,
+ initialValue: card.label,
rules: [
{
required: true,
@@ -109,7 +112,7 @@
<Col span={12}>
<Form.Item label={this.props.dict['model.form.align']}>
{getFieldDecorator('Align', {
- initialValue: this.props.card.Align,
+ initialValue: card.Align,
rules: [
{
required: true,
@@ -130,20 +133,37 @@
<Col span={12}>
<Form.Item label={this.props.dict['model.form.columnWidth']}>
{getFieldDecorator('Width', {
- initialValue: this.props.card.Width,
+ initialValue: card.Width,
rules: [
{
required: true,
message: this.props.dict['form.required.input'] + this.props.dict['model.form.columnWidth'] + '!'
}
]
- })(<InputNumber min={1} max={1000} precision={0} />)}
+ })(<InputNumber min={1} max={1000} precision={0} onPressEnter={this.handleSubmit} />)}
+ </Form.Item>
+ </Col>
+ <Col span={12}>
+ <Form.Item label={
+ <Tooltip placement="topLeft" title="閫夋嫨鏄剧ず鍒嗙粍锛岃〃鏍间細灞曞紑娣诲姞鍒嗙粍鐨勫瓙鍒楋紝姝ゆ椂鎺掑垪鏂瑰紡浼氬け鏁堛��">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 鏄剧ず鍒嗙粍
+ </Tooltip>
+ }>
+ {getFieldDecorator('unfold', {
+ initialValue: card.unfold || 'false'
+ })(
+ <Radio.Group>
+ <Radio value="true">{this.props.dict['model.true']}</Radio>
+ <Radio value="false">{this.props.dict['model.false']}</Radio>
+ </Radio.Group>
+ )}
</Form.Item>
</Col>
<Col span={12}>
<Form.Item label={this.props.dict['model.hidden']}>
{getFieldDecorator('Hide', {
- initialValue: this.props.card.Hide || 'false',
+ initialValue: card.Hide || 'false',
rules: [
{
required: true,
@@ -159,30 +179,28 @@
</Form.Item>
</Col>
<Col span={12}>
- <Form.Item label={this.props.dict['header.form.order']}>
+ <Form.Item label="鎺掑垪">
{getFieldDecorator('order', {
- initialValue: this.props.card.order,
+ initialValue: card.order,
rules: [
{
required: true,
- message: this.props.dict['form.required.select'] + this.props.dict['header.form.order'] + '!'
+ message: this.props.dict['form.required.select'] + '鎺掑垪!'
}
]
})(
- <Select
- getPopupContainer={() => document.getElementById('columncolspan')}
- >
- <Select.Option value="vertical">{this.props.dict['header.form.vertical']}</Select.Option>
- <Select.Option value="horizontal">{this.props.dict['header.form.horizontal']}</Select.Option>
- <Select.Option value="vertical2">{this.props.dict['header.form.vertical2']}</Select.Option>
- <Select.Option value="topPicBottomText">{this.props.dict['header.form.topPicBottomText']}</Select.Option>
- <Select.Option value="leftPicRightText">{this.props.dict['header.form.leftPicRightText']}</Select.Option>
+ <Select getPopupContainer={() => document.getElementById('columncolspan')} >
+ <Select.Option value="vertical">绾靛悜</Select.Option>
+ <Select.Option value="horizontal">妯悜</Select.Option>
+ <Select.Option value="vertical2">绾靛悜(2鍒�)</Select.Option>
+ <Select.Option value="topPicBottomText">涓婂浘涓嬫枃</Select.Option>
+ <Select.Option value="leftPicRightText">宸﹀浘鍙虫枃</Select.Option>
</Select>
)}
</Form.Item>
</Col>
<Col span={24}>
- <TransferForm dict={this.props.dict} columns={this.props.columns} ref="column-transfer" selected={this.props.card.sublist}/>
+ <TransferForm columns={this.props.columns} ref="column-transfer" selected={card.sublist}/>
</Col>
</Row>
</Form>
--
Gitblit v1.8.0