From f21cfff3c0754d574256169347ff942882b29282 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 29 十月 2023 21:57:16 +0800
Subject: [PATCH] 2023-10-29
---
src/menu/debug/index.jsx | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/menu/debug/index.jsx b/src/menu/debug/index.jsx
index 68dea66..d761bee 100644
--- a/src/menu/debug/index.jsx
+++ b/src/menu/debug/index.jsx
@@ -315,7 +315,7 @@
card.backElements.forEach(cell => {
if (cell.eleType !== 'button' || cell.hidden === 'true') return
- let sql = this.resetButton(item, cell, process)
+ let sql = this.resetButton(item, cell, process, null, true)
if (sql) {
if (typeof(sql) === 'string') {
@@ -364,11 +364,18 @@
})
}
- resetButton = (item, cell, process, group) => {
+ resetButton = (item, cell, process, group, isback) => {
let sql = ''
if (['exec', 'prompt', 'pop', 'form', 'formSubmit'].includes(cell.OpenType)) {
if (cell.intertype === 'system' || cell.procMode === 'system') { // 绯荤粺鎺ュ彛
- sql = this.getSysDefaultSql(cell, item, process, group)
+ if (item.subtype === 'dualdatacard' && isback) {
+ let _item = fromJS(item).toJS()
+ _item.columns = _item.subColumns || []
+ _item.setting.primaryKey = _item.setting.subKey
+ sql = this.getSysDefaultSql(cell, _item, process, group)
+ } else {
+ sql = this.getSysDefaultSql(cell, item, process, group)
+ }
}
} else if (cell.OpenType === 'excelIn') {
if (cell.intertype === 'system') {
@@ -615,8 +622,6 @@
}
columns.forEach(col => {
- if (col.field === 'works_flow_param') return
-
if (col.type === 'colspan' || col.type === 'old_colspan') {
col.subcols.forEach(cell => {
setField(cell)
@@ -1715,7 +1720,7 @@
${_tailScript}
aaa:
if @ErrorCode!=''
- insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select '1949-10-01 15:00:00',@ErrorCode, @retmsg,'1949-10-01 15:00:00'
+ insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,'1949-10-01 15:00:00'
`
} else if (_tailScript) {
sql = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@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) select @ErrorCode='',@retmsg =''
@@ -1723,7 +1728,7 @@
${_tailScript}
aaa:
if @ErrorCode!=''
- insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select '1949-10-01 15:00:00',@ErrorCode, @retmsg,'1949-10-01 15:00:00'
+ insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,'1949-10-01 15:00:00'
`
} else {
sql = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@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) select @ErrorCode='',@retmsg =''
--
Gitblit v1.8.0