From c79dd122752ef2bc503bb9f867951de3727141a1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 08 四月 2025 10:59:25 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/templates/zshare/modalform/index.jsx | 4 ++--
src/views/syscheck/index.jsx | 37 ++++++++++++++++++++++++++++++++++++-
2 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/src/templates/zshare/modalform/index.jsx b/src/templates/zshare/modalform/index.jsx
index 6f8dced..fb520c8 100644
--- a/src/templates/zshare/modalform/index.jsx
+++ b/src/templates/zshare/modalform/index.jsx
@@ -394,11 +394,11 @@
this.record.initval = ''
this.record.fieldlength = 50
_fieldval.initval = ''
-
+
if (value === 'text' || value === 'number') {
this.record.enter = 'sub'
_fieldval.enter = 'sub'
- } else if (['select', 'link', 'popSelect', 'vercode'].includes(value)) {
+ } else if (['select', 'link', 'switch', 'check', 'date', 'datemonth', 'popSelect', 'vercode'].includes(value)) {
_fieldval.enter = 'false'
}
diff --git a/src/views/syscheck/index.jsx b/src/views/syscheck/index.jsx
index 6095b3a..dfe1de8 100644
--- a/src/views/syscheck/index.jsx
+++ b/src/views/syscheck/index.jsx
@@ -523,7 +523,22 @@
if (item.setting && item.setting.interType === 'system') {
item.setting.$name = item.$menuname || ''
-
+
+ if (!item.setting.primaryKey) {
+ window.mkInfo(`${item.$menuname} 鏈缃富閿紒`)
+ } else if (item.columns) {
+ let columns = item.columns.map(c => c.field)
+ if (!columns.includes(item.setting.primaryKey)) {
+ window.mkInfo(`${item.$menuname} 涓婚敭宸插け鏁堬紒`)
+ }
+ }
+
+ item.scripts && item.scripts.forEach(c => {
+ if (/"ErrCode":\s*"true"/.test(c.sql)) {
+ window.mkInfo(`${item.$menuname} 鏁版嵁婧愯嚜瀹氫箟鑴氭湰涓娇鐢ㄤ簡"ErrCode":"true"锛乣)
+ }
+ })
+
sqls.push({uuid: item.uuid, type: 'datasource', LText: item.setting.$name})
}
@@ -749,8 +764,25 @@
if (cell.callbackType === 'script' && cell.verify && cell.verify.cbScripts) {
sqls.push({uuid: 'back_' + cell.uuid, type: 'btnCallBack', LText: cell.logLabel})
}
+
+ if (cell.verify) {
+ cell.verify.scripts && cell.verify.scripts.forEach(c => {
+ if (/"ErrCode":\s*"true"/.test(c.sql)) {
+ window.mkInfo(`${cell.logLabel} 鑷畾涔夎剼鏈腑浣跨敤浜�"ErrCode":"true"锛乣)
+ }
+ })
+ cell.verify.cbScripts && cell.verify.cbScripts.forEach(c => {
+ if (/"ErrCode":\s*"true"/.test(c.sql)) {
+ window.mkInfo(`${cell.logLabel} 鍥炶皟鑴氭湰涓娇鐢ㄤ簡"ErrCode":"true"锛乣)
+ }
+ })
+ }
+
if (['pop', 'formSubmit'].includes(cell.OpenType) && cell.modal && cell.modal.fields) {
cell.modal.fields.forEach(form => {
+ // if (form.type === 'fileupload' && form.compress !== 'oss') {
+ // window.mkInfo(`${cell.logLabel}-${form.label}`)
+ // }
// 鏁版嵁婧恠ql璇彞锛岄澶勭悊锛屾潈闄愰粦鍚嶅崟瀛楁璁剧疆涓洪殣钘忚〃鍗�
if (['select', 'link', 'multiselect', 'radio', 'checkbox', 'checkcard'].includes(form.type) && form.resourceType === '1') {
sqls.push({uuid: md5(cell.uuid + form.uuid), type: 'form', LText: `${cell.logLabel}-${form.label}锛堣〃鍗曪級`})
@@ -781,6 +813,9 @@
}
if (cell.execMode === 'pop' && cell.modal && cell.modal.fields) {
cell.modal.fields.forEach(form => {
+ // if (form.type === 'fileupload' && form.compress !== 'oss') {
+ // window.mkInfo(`${cell.logLabel}-${form.label}`)
+ // }
// 鏁版嵁婧恠ql璇彞锛岄澶勭悊锛屾潈闄愰粦鍚嶅崟瀛楁璁剧疆涓洪殣钘忚〃鍗�
if (['select', 'link', 'multiselect', 'radio', 'checkbox', 'checkcard'].includes(form.type) && form.resourceType === '1') {
sqls.push({uuid: md5(cell.uuid + form.uuid), type: 'form', LText: `${cell.logLabel}-${form.label}锛堣〃鍗曪級`})
--
Gitblit v1.8.0