From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
index 82c757b..50df4a3 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
@@ -12,6 +12,7 @@
import ColumnForm from './columnform'
import CustomScript from './customscript'
import asyncComponent from '@/utils/asyncComponent'
+import MKEmitter from '@/utils/events.js'
import './index.scss'
const { TabPane } = Tabs
@@ -154,7 +155,7 @@
render: (text, record) => record.status === 'false' ?
(
<div style={{color: '#ff4d4f'}}>
- {this.props.dict['model.status.forbidden']}
+ 绂佺敤
<StopOutlined style={{marginLeft: '5px'}} />
</div>
) :
@@ -178,7 +179,7 @@
return (
<div>
- {title ? <span style={{color: '#a50'}}>{title}</span> : null}
+ {title ? <span style={{color: '#a50'}}>{title}<span style={{fontSize: '12px', marginLeft: '5px'}}>{_text.length}</span></span> : null}
<Paragraph copyable={{ text: text }} ellipsis={{ rows: 4, expandable: true }}>{_text}</Paragraph>
</div>
)
@@ -205,7 +206,7 @@
render: (text, record) => record.status === 'false' ?
(
<div style={{color: '#ff4d4f'}}>
- {this.props.dict['model.status.forbidden']}
+ 绂佺敤
<StopOutlined style={{marginLeft: '5px'}} />
</div>
) :
@@ -518,6 +519,8 @@
verify.scripts.push(values)
}
+ MKEmitter.emit('editLineId', values.uuid)
+
this.setState({
verify: verify
})
@@ -734,7 +737,7 @@
return (
<div id="verify-excel-box-tab">
- <Tabs activeKey={activeKey} className="verify-card-box" onChange={this.tabchange}>
+ <Tabs activeKey={activeKey} className="excelin-verify-card-box" onChange={this.tabchange}>
<TabPane tab="鍩虹楠岃瘉" key="basemsg">
<Form {...formItemLayout}>
<Row gutter={24}>
@@ -797,7 +800,7 @@
</span>
} key="unique">
<UniqueForm fields={verify.columns} dict={this.props.dict} uniqueChange={this.uniqueChange}/>
- <EditTable actions={['edit', 'move', 'del']} data={verify.uniques} columns={uniqueColumns} onChange={this.changeUniques}/>
+ <EditTable actions={['edit', 'move', 'del', 'status']} data={verify.uniques} columns={uniqueColumns} onChange={this.changeUniques}/>
</TabPane> : null}
{card.intertype === 'system' ? <TabPane tab={
<span>
@@ -806,7 +809,6 @@
</span>
} key="scripts">
<CustomScript
- dict={this.props.dict}
btn={this.props.card}
usefulfields={verify.columns}
scripts={verify.scripts}
@@ -815,14 +817,6 @@
wrappedComponentRef={(inst) => this.scriptsForm = inst}
/>
<EditTable actions={['move']} data={verify.scripts} columns={scriptsColumns} onChange={(scripts) => {this.setState({verify: {...verify, scripts}})}}/>
- {/* <Table
- bordered
- rowKey="uuid"
- className="custom-table"
- dataSource={verify.scripts}
- columns={scriptsColumns}
- pagination={false}
- /> */}
</TabPane> : null}
<TabPane tab="淇℃伅鎻愮ず" key="tip">
<Form {...formItemLayout}>
--
Gitblit v1.8.0