From 43a517b80f2803e0dcf6658113520c4a14c8c17f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 22 五月 2023 18:21:52 +0800
Subject: [PATCH] 2023-05-22
---
src/menu/components/table/edit-table/columns/tableIn/customscript/index.jsx | 94 +++++++++++++++++++++++++++++++++++------------
1 files changed, 70 insertions(+), 24 deletions(-)
diff --git a/src/menu/components/table/edit-table/columns/tableIn/customscript/index.jsx b/src/menu/components/table/edit-table/columns/tableIn/customscript/index.jsx
index 1c83631..a4a7025 100644
--- a/src/menu/components/table/edit-table/columns/tableIn/customscript/index.jsx
+++ b/src/menu/components/table/edit-table/columns/tableIn/customscript/index.jsx
@@ -11,7 +11,6 @@
class CustomForm extends Component {
static propTpyes = {
- dict: PropTypes.object, // 瀛楀吀椤�
btn: PropTypes.object, // 鎸夐挳淇℃伅
scripts: PropTypes.array, // 鑷畾涔夎剼鏈垪琛�
usefulfields: PropTypes.any, // 鍙敤瀛楁
@@ -37,7 +36,7 @@
fields.push('jskey')
let _sql = `Declare @${btn.sheet} table (${usefulfields.map(item => item.field + ' ' + item.type).join(',')},jskey nvarchar(50),data_type nvarchar(50),BID nvarchar(50))
- Declare @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(50),@mk_organization nvarchar(50),@login_city nvarchar(50),@ErrorCode nvarchar(50), @retmsg nvarchar(4000),@tbid Nvarchar(512)
+ Declare @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100),@ErrorCode nvarchar(50), @retmsg nvarchar(4000),@tbid Nvarchar(512)
Select @ErrorCode='', @retmsg=''
`
@@ -48,21 +47,52 @@
}
edit = (record) => {
+ const { type } = this.props
+
this.setState({
editItem: record
})
- this.props.form.setFieldsValue({
- sql: record.sql,
- position: record.position || 'back'
- })
+ if (type === 'fullscreen') {
+ this.props.form.setFieldsValue({
+ sql: record.sql
+ })
+ } else {
+ this.props.form.setFieldsValue({
+ sql: record.sql,
+ position: record.position || 'back'
+ })
+ }
}
handleConfirm = () => {
+ const { type } = this.props
+ const { editItem } = this.state
// 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭�
this.props.form.validateFieldsAndScroll((err, values) => {
+ if (type === 'fullscreen' && err) {
+ notification.warning({
+ top: 92,
+ message: '璇疯緭鍏ql!',
+ duration: 5
+ })
+ return
+ }
if (!err) {
+ if (/^[\s\n]+$/.test(values.sql)) {
+ notification.warning({
+ top: 92,
+ message: '璇疯緭鍏ql!',
+ duration: 5
+ })
+ return
+ }
+
values.uuid = this.state.editItem ? this.state.editItem.uuid : ''
+
+ if (type === 'fullscreen' && editItem) {
+ values.status = editItem.status || 'true'
+ }
let _quot = values.sql.match(/'{1}/g)
let _lparen = values.sql.match(/\({1}/g)
@@ -90,6 +120,13 @@
notification.warning({
top: 92,
message: '鑷畾涔塻ql璇彞涓紝涓嶅彲鍑虹幇瀛楃 -- 锛屾敞閲婅鐢� /*鍐呭*/',
+ duration: 5
+ })
+ return
+ } else if (/,,/ig.test(values.sql)) {
+ notification.warning({
+ top: 92,
+ message: '鑷畾涔塻ql璇彞涓紝涓嶅彲鍑虹幇杩炵画鐨勮嫳鏂囬�楀彿锛�,,锛�',
duration: 5
})
return
@@ -160,19 +197,20 @@
LText: this.state.verifySql + _initCustomScript + _prevCustomScript + _backCustomScript + tail
}
- param.LText = param.LText.replace(/@\$|\$@/ig, '')
-
+ param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id)@/ig, `'${param.timestamp}'`)
+ param.LText = param.LText.replace(/\n/g, ' ')
+
// 澶栬仈鏁版嵁搴撴浛鎹�
if (window.GLOB.externalDatabase !== null) {
param.LText = param.LText.replace(/@db@/ig, window.GLOB.externalDatabase)
}
param.LText = Utils.formatOptions(param.LText)
- param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
this.setState({loading: true})
- Api.getLocalConfig(param).then(res => {
+ Api.genericInterface(param).then(res => {
if (res.status) {
this.setState({
loading: false,
@@ -181,7 +219,7 @@
this.props.scriptsChange(values)
})
this.props.form.setFieldsValue({
- sql: ''
+ sql: ' '
})
} else {
this.setState({loading: false})
@@ -227,6 +265,9 @@
}
let _sql = this.props.form.getFieldValue('sql')
+ if (/^\s+$/.test(_sql)) {
+ _sql = ''
+ }
if (_sql) {
_sql = _sql + `
@@ -245,8 +286,8 @@
}
render() {
- const { systemScripts, btn } = this.props
- const { usefulfields } = this.state
+ const { systemScripts, btn, type } = this.props
+ const { usefulfields, editItem } = this.state
const { getFieldDecorator } = this.props.form
const formItemLayout = {
labelCol: {
@@ -262,22 +303,24 @@
return (
<Form {...formItemLayout} className="verify-form" id="verify-excelin-custom-scripts">
<Row gutter={24}>
- {btn.sheet ? <Col span={8}>
+ {!type && btn.sheet ? <Col span={8}>
<Form.Item label={'琛ㄥ悕'} style={{whiteSpace: 'nowrap', margin: 0}}>
{btn.sheet}
</Form.Item>
</Col> : null}
- <Col span={10}>
+ {!type ? <Col span={10}>
<Form.Item label={'鎶ラ敊瀛楁'} style={{margin: 0, whiteSpace: 'nowrap'}}>
ErrorCode锛堝鍔犲悗缂�NT琛ㄧず鏁版嵁涓嶅洖婊氾紝濡侲NT銆丯NT銆丗NT銆丯MNT锛�, retmsg
</Form.Item>
- </Col>
- {usefulfields ? <Col span={24} className="sqlfield">
+ </Col> : null}
+ {!type ? <Col span={24} className="sqlfield">
<Form.Item label={'鍙敤瀛楁'}>
- BID, ID, LoginUID, SessionUid, UserID, Appkey, UserName, FullName, RoleID, mk_departmentcode, mk_organization, login_city, {usefulfields},data_type锛堟敞锛歫skey涓轰富閿�硷紝鏂板鏃跺墠绔敓鎴愶紱data_type涓烘搷浣滅被鍨嬶紝鏂板 - add銆佷慨鏀� - upt銆佸垹闄� - del锛�
+ <Tooltip mouseLeaveDelay={0.3} mouseEnterDelay={0.3} placement="top" title={'鍏叡鍊硷紝璇锋寜鐓xxx@鏍煎紡浣跨敤銆�'}><span style={{color: '#1890ff'}}>BID, ID, LoginUID, SessionUid, UserID, Appkey, time_id</span></Tooltip>,
+ <Tooltip mouseLeaveDelay={0.3} mouseEnterDelay={0.3} placement="top" title={'绯荤粺鍙橀噺锛岀郴缁熶細瀹氫箟鍙橀噺骞惰祴鍊笺��'}><span style={{color: '#fa8c16'}}>UserName, FullName, RoleID, mk_departmentcode, mk_organization, mk_user_type, mk_nation, mk_province, mk_city, mk_district, mk_address</span></Tooltip>,
+ {usefulfields},data_type锛堟敞锛歫skey涓轰富閿�硷紝鏂板鏃跺墠绔敓鎴愶紱data_type涓烘搷浣滅被鍨嬶紝鏂板 - add銆佷慨鏀� - upt銆佸垹闄� - del锛�
</Form.Item>
</Col> : null}
- <Col span={8} style={{whiteSpace: 'nowrap'}}>
+ {!type ? <Col span={8} style={{whiteSpace: 'nowrap'}}>
<Form.Item style={{marginBottom: 0}} label={
<Tooltip placement="bottomLeft" title={'鑷畾涔夎剼鏈笌榛樿sql浣嶇疆鍏崇郴銆�'}>
<QuestionCircleOutlined className="mk-form-tip" />
@@ -294,8 +337,8 @@
</Radio.Group>
)}
</Form.Item>
- </Col>
- <Col span={10}>
+ </Col> : null}
+ {!type ? <Col span={10}>
<Form.Item style={{marginBottom: 0}} label={'蹇嵎娣诲姞'}>
<Select
showSearch
@@ -306,6 +349,9 @@
<Select.Option key="default" value={'default'}>
榛樿sql
</Select.Option>
+ <Select.Option key="debugger" value={`z_debug: select @ErrorCode='E',@retmsg='娴嬭瘯鏂偣' goto aaa`}>
+ 娴嬭瘯鏂偣
+ </Select.Option>
{systemScripts.map((option, i) =>
<Select.Option key={i} value={option.value}>
{option.name}
@@ -313,10 +359,10 @@
)}
</Select>
</Form.Item>
- </Col>
+ </Col> : null}
<Col span={6} className="add">
<Button onClick={this.handleConfirm} loading={this.state.loading} className="mk-green" style={{marginBottom: 15, marginLeft: 40}}>
- 淇濆瓨
+ {type === 'fullscreen' && !editItem ? '娣诲姞' : '淇濆瓨'}
</Button>
<Button onClick={this.handleCancel} style={{marginBottom: 15, marginLeft: 10}}>
鍙栨秷
@@ -329,7 +375,7 @@
rules: [
{
required: true,
- message: this.props.dict['form.required.input'] + 'sql!'
+ message: '璇疯緭鍏ql!'
}
]
})(<CodeMirror />)}
--
Gitblit v1.8.0