From cd8bf53b0a1ed5ec9e668bfe190e149f5b7489de Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 23 八月 2021 18:28:21 +0800
Subject: [PATCH] 2021-08-23
---
src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx
index 3a5c827..84d523f 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx
@@ -49,7 +49,7 @@
}
let _sql = `Declare @${btn.sheet} table (${columns.map(item => item.Column + ' ' + item.type).join(',')},jskey nvarchar(50) )
- Declare @UserName nvarchar(50),@FullName nvarchar(50),@ErrorCode nvarchar(50), @retmsg nvarchar(4000),@tbid Nvarchar(512)
+ Declare @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@login_city nvarchar(50),@ErrorCode nvarchar(50), @retmsg nvarchar(4000),@tbid Nvarchar(512)
Select @ErrorCode='', @retmsg=''
`
@@ -147,6 +147,25 @@
}
})
+ if (!values.uuid) {
+ if (values.position === 'init') {
+ _initCustomScript += `
+ /* 鍒濆鍖栬剼鏈� */
+ ${values.sql}
+ `
+ } else if (values.position === 'front') {
+ _prevCustomScript += `
+ /* 榛樿sql鍓嶈剼鏈� */
+ ${values.sql}
+ `
+ } else {
+ _backCustomScript += `
+ /* 榛樿sql鍚庤剼鏈� */
+ ${values.sql}
+ `
+ }
+ }
+
let param = {
func: 's_debug_sql',
exec_type: 'y',
@@ -210,8 +229,10 @@
fields = fields + ','
}
- let database = btn.sheet.match(/(.*)\.(.*)\./ig) || ''
- let sheet = btn.sheet.replace(/(.*)\.(.*)\./ig, '')
+ let database = btn.sheet.match(/(.*)\.(.*)\.|@db@/ig) || ''
+ let sheet = btn.sheet.replace(/(.*)\.(.*)\.|@db@/ig, '')
+
+ database = database ? (database[0] || '') : ''
_value = `Insert into ${database}${sheet} (${fields}createuserid,createuser,createstaff,bid)\nSelect ${fields}@userid@,@username,@fullname,@BID@ From @${sheet}`
} else {
@@ -259,9 +280,9 @@
{btn.sheet}
</Form.Item>
</Col> : null}
- <Col span={16}>
- <Form.Item label={'鎶ラ敊瀛楁'} style={{margin: 0}}>
- ErrorCode, retmsg
+ <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">
--
Gitblit v1.8.0