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/menu/components/table/edit-table/columns/tableIn/index.jsx | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/menu/components/table/edit-table/columns/tableIn/index.jsx b/src/menu/components/table/edit-table/columns/tableIn/index.jsx
index 633ae38..61698fb 100644
--- a/src/menu/components/table/edit-table/columns/tableIn/index.jsx
+++ b/src/menu/components/table/edit-table/columns/tableIn/index.jsx
@@ -80,7 +80,7 @@
render: (text, record) => record.status === 'false' ?
(
<div>
- {this.props.dict['model.status.forbidden']}
+ 绂佺敤
<StopTwoTone style={{marginLeft: '5px'}} twoToneColor="#ff4d4f" />
</div>
) :
@@ -100,12 +100,12 @@
render: (text) => {
let title = text.match(/^\s*\/\*.+\*\//)
title = title && title[0] ? title[0] : ''
- text = title ? text.replace(title, '') : text
+ let _text = title ? text.replace(title, '') : text
return (
<div>
- {title ? <span style={{color: '#a50'}}>{title}</span> : null}
- <Paragraph copyable ellipsis={{ rows: 4, expandable: true }}>{text}</Paragraph>
+ {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>
)
}
@@ -133,7 +133,7 @@
render: (text, record) => record.status === 'false' ?
(
<div>
- {this.props.dict['model.status.forbidden']}
+ 绂佺敤
<StopTwoTone style={{marginLeft: '5px'}} twoToneColor="#ff4d4f" />
</div>
) :
@@ -527,7 +527,7 @@
return (
<div id="verify-excel-box-tab">
- <Tabs activeKey={activeKey} className="verify-card-box" onChange={this.tabchange}>
+ <Tabs activeKey={activeKey} className="tablein-verify-card-box" onChange={this.tabchange}>
<TabPane tab="鍩虹楠岃瘉" key="basemsg">
<Form {...formItemLayout}>
<Row gutter={24}>
--
Gitblit v1.8.0