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/settingcomponent/settingform/simplescript/index.jsx | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/simplescript/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/simplescript/index.jsx
index cbae113..61ac6e4 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/simplescript/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/simplescript/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Form, Row, Col, Icon, Button, notification, Select, Popconfirm, Typography, Modal, Radio } from 'antd'
+import { Form, Row, Col, Button, notification, Select, Popconfirm, Typography, Modal, Radio } from 'antd'
+import { StopOutlined, CheckCircleOutlined, EditOutlined, SwapOutlined, DeleteOutlined } from '@ant-design/icons'
import moment from 'moment'
import Utils from '@/utils/utils.js'
@@ -39,12 +40,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>
)
}
@@ -55,9 +56,9 @@
width: '13%',
render: (text, record) => {
if (record.position === 'front') {
- return 'sql鍓�'
+ return <span style={{color: '#26C281'}}>sql鍓�</span>
} else {
- return 'sql鍚�'
+ return <span style={{color: '#1890ff'}}>sql鍚�</span>
}
}
},
@@ -67,15 +68,15 @@
width: '12%',
render: (text, record) => record.status === 'false' ?
(
- <div>
+ <div style={{color: '#ff4d4f'}}>
{this.props.dict['model.status.forbidden']}
- <Icon style={{marginLeft: '5px'}} type="stop" theme="twoTone" twoToneColor="#ff4d4f" />
+ <StopOutlined style={{marginLeft: '5px'}} />
</div>
) :
(
- <div>
+ <div style={{color: '#26C281'}}>
{this.props.dict['model.status.open']}
- <Icon style={{marginLeft: '5px'}} type="check-circle" theme="twoTone" twoToneColor="#52c41a" />
+ <CheckCircleOutlined style={{marginLeft: '5px'}}/>
</div>
)
},
@@ -86,14 +87,14 @@
dataIndex: 'operation',
render: (text, record) =>
(<div style={{textAlign: 'center'}}>
- <span className="operation-btn" title={this.props.dict['model.edit']} onClick={() => this.handleEdit(record)} style={{color: '#1890ff'}}><Icon type="edit" /></span>
- <span className="operation-btn" title={this.props.dict['header.form.status.change']} onClick={() => this.handleStatus(record)} style={{color: '#8E44AD'}}><Icon type="swap" /></span>
+ <span className="operation-btn" title={this.props.dict['model.edit']} onClick={() => this.handleEdit(record)} style={{color: '#1890ff'}}><EditOutlined /></span>
+ <span className="operation-btn" title={this.props.dict['header.form.status.change']} onClick={() => this.handleStatus(record)} style={{color: '#8E44AD'}}><SwapOutlined /></span>
<Popconfirm
overlayClassName="popover-confirm"
title={this.props.dict['model.query.delete']}
onConfirm={() => this.handleDelete(record)
}>
- <span className="operation-btn" style={{color: '#ff4d4f'}}><Icon type="delete" /></span>
+ <span className="operation-btn" style={{color: '#ff4d4f'}}><DeleteOutlined /></span>
</Popconfirm>
</div>)
}
@@ -431,12 +432,12 @@
</Col>
{usefulFields ? <Col span={24} className="sqlfield">
<Form.Item label={'鍙敤瀛楁'}>
- id, bid, loginuid, sessionuid, userid, username, fullname, RoleID, login_city, appkey, time_id{usefulFields ? ', ' + usefulFields : ''}
+ id, bid, loginuid, sessionuid, userid, username, fullname, RoleID, mk_departmentcode, mk_organization, login_city, appkey, time_id{usefulFields ? ', ' + usefulFields : ''}
</Form.Item>
</Col> : null}
{!usefulFields ? <Col span={24} className="sqlfield">
<Form.Item label={'鍙敤瀛楁'}>
- id, bid, loginuid, sessionuid, userid, username, fullname, RoleID, login_city, appkey, time_id
+ id, bid, loginuid, sessionuid, userid, username, fullname, RoleID, mk_departmentcode, mk_organization, login_city, appkey, time_id
</Form.Item>
</Col> : null}
{!usefulFields ? <Col span={8} style={{whiteSpace: 'nowrap'}}>
--
Gitblit v1.8.0