From 71b872aa44de6266a344646d0e535895620d57a7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 05 一月 2020 22:45:06 +0800
Subject: [PATCH] 2020-01-05
---
src/utils/utils.js | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 4d06275..e4b03b9 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -426,7 +426,7 @@
let _datasource = item.dataSource
let sql = ''
- if (/\s/.test(_datasource)) {
+ if (/\s/.test(_datasource)) { // 鎷兼帴鍒悕
_datasource = '(' + _datasource + ') tb'
}
@@ -449,6 +449,7 @@
* @return {String} table 琛ㄥ悕
*/
static getSysDefaultSql (btn, setting, formdata) {
+ let primaryKey = setting.primaryKey || 'id'
let _sql = ''
if (btn.OpenType === 'pop' && btn.sqlType === 'insert') {
let keys = []
@@ -476,11 +477,11 @@
}
})
_form = _form.join(',')
- _sql = `update ${btn.sql} set ${_form},modifydate=getdate(),modifyuserid=@userid where ${setting.primaryKey}=@id`
+ _sql = `update ${btn.sql} set ${_form},modifydate=getdate(),modifyuserid=@userid where ${primaryKey}=@${primaryKey}`
} else if ((btn.OpenType === 'prompt' || btn.OpenType === 'exec') && btn.sqlType === 'LogicDelete') { // 閫昏緫鍒犻櫎
- _sql = `update ${btn.sql} set deleted=1,modifydate=getdate(),modifyuserid=@userid where ${setting.primaryKey}=@id`
+ _sql = `update ${btn.sql} set deleted=1,modifydate=getdate(),modifyuserid=@userid where ${primaryKey}=@${primaryKey}`
} else if ((btn.OpenType === 'prompt' || btn.OpenType === 'exec') && btn.sqlType === 'delete') {
- _sql = `insert into snote (remark,createuserid) select '鍒犻櫎琛�:${btn.sql} 鏁版嵁: id='+@id,@userid delete ${btn.sql} where ${setting.primaryKey}=@id`
+ _sql = `insert into snote (remark,createuserid) select '鍒犻櫎琛�:${btn.sql} 鏁版嵁: ${primaryKey}='+@${primaryKey},@userid delete ${btn.sql} where ${primaryKey}=@${primaryKey}`
}
return _sql
@@ -502,6 +503,7 @@
let form = ''
let formParam = ''
let _columns = []
+ let primaryKey = config.setting.primaryKey || 'ID'
if (config.search && config.search.length > 0) {
let _fields = new Map()
@@ -543,7 +545,7 @@
let Ltext = `create proc ${param.innerFunc}
( /*${menu.MenuName}*/
@BID nvarchar(50)='',
- @ID nvarchar(50)='',${formParam}
+ @${primaryKey} nvarchar(50)='',${formParam}
@PageIndex nvarchar(50)='',
@PageSize nvarchar(50)='',
@OrderCol nvarchar(50)='',
@@ -625,9 +627,12 @@
* @description 鍒涘缓瀛樺偍杩囩▼
* @return {String}
*/
- static getfunc (param, btn, menu, columns) {
+ static getfunc (param, btn, menu, config) {
+ console.log(menu)
let form = ''
let formParam = ''
+ let columns = config.columns
+ let primaryKey = config.setting.primaryKey || 'ID'
if (param.fields && param.fields.length > 0) {
let _fields = []
@@ -691,7 +696,7 @@
let Ltext = `create proc ${param.funcName}
( /*${menu.MenuName} ${btn.label}*/
@BID nvarchar(50)='',
- @ID nvarchar(50)='',${formParam}
+ @${primaryKey} nvarchar(50)='',${formParam}
@sEPTMenuNo nvarchar(50)='${param.menuNo}',
@lang nvarchar(50)='',
@debug nvarchar(50)='',
--
Gitblit v1.8.0