From 7e5200a09b2c6282382ec8725220f5561de139f6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 23 二月 2024 18:05:53 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx | 108 ++++++++++++++++++++++++++++--------------------------
1 files changed, 56 insertions(+), 52 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
index 58d7051..5acaeb6 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
@@ -85,6 +85,37 @@
]
},
{
+ title: '瀵煎嚭',
+ dataIndex: 'output',
+ inputType: 'radio',
+ editable: true,
+ required: false,
+ width: '12%',
+ render: (text) => {
+ if (text !== 'false') {
+ return '鏄�'
+ } else {
+ return '鍚�'
+ }
+ },
+ options: [
+ {value: 'true', text: '鏄�'},
+ {value: 'false', text: '鍚�'}
+ ]
+ },
+ {
+ title: '绾㈣壊鏍囬',
+ dataIndex: 'required',
+ width: '10%',
+ editable: true,
+ inputType: 'radio',
+ render: (text, record) => record.required === 'true' ? <span style={{color: 'red'}}>鏄�</span> : '鍚�',
+ options: [
+ {value: 'true', text: '鏄�'},
+ {value: 'false', text: '鍚�'}
+ ]
+ },
+ {
title: '鍙栫粷瀵瑰��',
dataIndex: 'abs',
inputType: 'radio',
@@ -117,38 +148,7 @@
keyVals: ['number'],
width: '12%',
render: (text, record) => record.type === 'number' ? text : ''
- },
- {
- title: '瀵煎嚭',
- dataIndex: 'output',
- inputType: 'radio',
- editable: true,
- required: false,
- width: '12%',
- render: (text) => {
- if (text !== 'false') {
- return '鏄�'
- } else {
- return '鍚�'
- }
- },
- options: [
- {value: 'true', text: '鏄�'},
- {value: 'false', text: '鍚�'}
- ]
- },
- {
- title: '绾㈣壊鏍囬',
- dataIndex: 'required',
- width: '10%',
- editable: true,
- inputType: 'radio',
- render: (text, record) => record.required === 'true' ? <span style={{color: 'red'}}>鏄�</span> : '鍚�',
- options: [
- {value: 'true', text: '鏄�'},
- {value: 'false', text: '鍚�'}
- ]
- },
+ }
],
scriptsColumns: [
{
@@ -811,28 +811,32 @@
const { card } = this.props
const { activeKey, verify } = this.state
- if (card.intertype !== 'system' || verify.dataType !== 'custom') {
+ if (activeKey === 'setting') {
+ this.settingForm.handleConfirm().then(res => {
+ if (card.intertype !== 'system' || verify.dataType !== 'custom') {
+ this.setState({activeKey: val, verify: {...verify, ...res}})
+ } else {
+ this.setState({
+ verify: {...verify, ...res}
+ }, () => {
+ this.setState({loading: true})
+ this.sqlverify(() => { // 楠岃瘉鎴愬姛
+ this.setState({
+ activeKey: val,
+ loading: false
+ })
+ }, () => { // 楠岃瘉澶辫触
+ this.setState({
+ activeKey: val,
+ loading: false
+ })
+ }, verify.scripts)
+ })
+ }
+ })
+ } else if (card.intertype !== 'system' || verify.dataType !== 'custom') {
this.setState({activeKey: val})
return
- } else if (activeKey === 'setting') {
- this.settingForm.handleConfirm().then(res => {
- this.setState({
- verify: {...verify, ...res}
- }, () => {
- this.setState({loading: true})
- this.sqlverify(() => { // 楠岃瘉鎴愬姛
- this.setState({
- activeKey: val,
- loading: false
- })
- }, () => { // 楠岃瘉澶辫触
- this.setState({
- activeKey: val,
- loading: false
- })
- }, verify.scripts)
- })
- })
} else if (activeKey === 'columns') {
if (this.columnRef && this.columnRef.state.editingKey) {
notification.warning({
--
Gitblit v1.8.0