From b4022f22fff06e306196fa1348e2ebe63def9d09 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 22 一月 2024 10:04:13 +0800
Subject: [PATCH] 2024-01-22
---
src/menu/debug/index.jsx | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/menu/debug/index.jsx b/src/menu/debug/index.jsx
index afaf6ae..45f63fd 100644
--- a/src/menu/debug/index.jsx
+++ b/src/menu/debug/index.jsx
@@ -1776,10 +1776,14 @@
item.setting.interType = 'system'
item.setting.execute = btn.verify.defaultSql || 'true'
item.setting.dataresource = btn.verify.dataresource || ''
- item.setting.primaryKey = btn.verify.primaryKey || component.setting.primaryKey || 'ID'
+ item.setting.primaryKey = btn.verify.primaryKey || ''
item.setting.queryType = btn.verify.queryType
item.setting.laypage = btn.pagination
item.setting.order = btn.verify.order || ''
+
+ if (btn.Ot === 'requiredOnce') {
+ item.setting.primaryKey = btn.verify.primaryKey || component.setting.primaryKey || 'ID'
+ }
item.scripts = btn.verify.scripts || []
@@ -1811,9 +1815,20 @@
item.$searches = fromJS(searches).toJS()
searches = formatSearch(searches)
- let _columns = item.columns || []
+ let _columns = []
if (item.subtype === 'dualdatacard') {
_columns = [...item.columns, ...item.subColumns]
+ } else if (item.columns) {
+ _columns = [...item.columns]
+ }
+
+ if (item.setting.primaryKey) {
+ let key = item.setting.primaryKey.toLowerCase()
+ if (_columns.findIndex(cell => cell.field.toLowerCase() === key) === -1) {
+ _columns.push({
+ field: item.setting.primaryKey
+ })
+ }
}
let arr_field = _columns.map(col => col.field).join(',')
--
Gitblit v1.8.0