From 422e566764decc740601a95118aa3a189ba7ffa6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 10 五月 2021 10:08:50 +0800
Subject: [PATCH] 2021-05-10
---
src/tabviews/home/index.jsx | 5 ++
src/templates/sharecomponent/actioncomponent/verifyexcelout/columnform/index.jsx | 14 +++---
src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx | 60 +++++++++++++++---------------
3 files changed, 42 insertions(+), 37 deletions(-)
diff --git a/src/tabviews/home/index.jsx b/src/tabviews/home/index.jsx
index 9505906..dfb3f7d 100644
--- a/src/tabviews/home/index.jsx
+++ b/src/tabviews/home/index.jsx
@@ -24,6 +24,11 @@
componentDidMount () {
this.loadHomeConfig()
+ if (this.props.permMenus.length > 0 && JSON.stringify(this.props.permAction) !== '{}') {
+ this.setState({
+ waiting: false
+ })
+ }
}
UNSAFE_componentWillReceiveProps (nextProps) {
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/columnform/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/columnform/index.jsx
index d050d57..90f6b83 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/columnform/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/columnform/index.jsx
@@ -1,6 +1,6 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Button, Input, InputNumber, Radio } from 'antd'
+import { Form, Row, Col, Button, Input, InputNumber } from 'antd'
import './index.scss'
class ExcelOutColumn extends Component {
@@ -40,7 +40,7 @@
return (
<Form {...formItemLayout} className="verify-form">
<Row gutter={24}>
- <Col span={5}>
+ <Col span={7}>
<Form.Item label={dict['model.form.field']}>
{getFieldDecorator('Column', {
initialValue: '',
@@ -53,7 +53,7 @@
})(<Input placeholder="" autoComplete="off" />)}
</Form.Item>
</Col>
- <Col span={5}>
+ <Col span={7}>
<Form.Item label={dict['model.name']}>
{getFieldDecorator('Text', {
initialValue: '',
@@ -66,7 +66,7 @@
})(<Input placeholder="" autoComplete="off" />)}
</Form.Item>
</Col>
- <Col span={5}>
+ <Col span={7}>
<Form.Item label={dict['model.form.columnWidth']}>
{getFieldDecorator('Width', {
initialValue: 20,
@@ -79,7 +79,7 @@
})(<InputNumber min={5} max={200} precision={0} />)}
</Form.Item>
</Col>
- <Col span={5}>
+ {/* <Col span={5}>
<Form.Item label="绫诲瀷">
{getFieldDecorator('type', {
initialValue: 'text'
@@ -90,8 +90,8 @@
</Radio.Group>
)}
</Form.Item>
- </Col>
- <Col span={4} className="add">
+ </Col> */}
+ <Col span={3} className="add">
<Button onClick={this.handleConfirm} type="primary" className="mk-green">
娣诲姞
</Button>
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
index 6a0f7b9..06c042c 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
@@ -33,14 +33,14 @@
inputType: 'input',
editable: true,
unique: true,
- width: '20%'
+ width: '25%'
},
{
title: this.props.dict['model.name'],
dataIndex: 'Text',
inputType: 'input',
editable: true,
- width: '20%'
+ width: '25%'
},
{
title: this.props.dict['model.form.columnWidth'],
@@ -49,34 +49,34 @@
min: 5,
max: 200,
editable: true,
- width: '20%'
+ width: '25%'
},
- {
- title: '绫诲瀷',
- dataIndex: 'type',
- inputType: 'select',
- editable: true,
- required: false,
- width: '20%',
- render: (text) => {
- if (text === 'image') {
- return '鍥剧墖'
- } else {
- return '鏂囨湰'
- }
- },
- options: [
- {value: 'text', text: '鏂囨湰'},
- {value: 'image', text: '鍥剧墖'}
- ]
- },
+ // {
+ // title: '绫诲瀷',
+ // dataIndex: 'type',
+ // inputType: 'select',
+ // editable: true,
+ // required: false,
+ // width: '20%',
+ // render: (text) => {
+ // if (text === 'image') {
+ // return '鍥剧墖'
+ // } else {
+ // return '鏂囨湰'
+ // }
+ // },
+ // options: [
+ // {value: 'text', text: '鏂囨湰'},
+ // {value: 'image', text: '鍥剧墖'}
+ // ]
+ // },
{
title: '鍙栫粷瀵瑰��',
dataIndex: 'abs',
inputType: 'select',
editable: true,
required: false,
- width: '20%',
+ width: '25%',
render: (text) => {
if (text === 'true') {
return '鏄�'
@@ -106,12 +106,12 @@
if (card.intertype !== 'system') {
_verify.enable = 'false'
}
- if (_verify.columns[0] && !_verify.columns[0].type) {
- _verify.columns = _verify.columns.map(col => {
- col.type = col.type || 'text'
- return col
- })
- }
+ // if (_verify.columns[0] && !_verify.columns[0].type) {
+ // _verify.columns = _verify.columns.map(col => {
+ // col.type = col.type || 'text'
+ // return col
+ // })
+ // }
let defaultscript = ''
if (!_verify.script && card.intertype === 'system') {
@@ -395,7 +395,7 @@
Text: item.label,
Width: 20,
abs: 'false',
- type: 'text',
+ // type: 'text',
uuid: Utils.getuuid()
})
})
--
Gitblit v1.8.0