From 91e232bb0b910f3670bdbccd65cc218d55e1eda9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 十二月 2022 16:08:20 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/form/simple-form/index.jsx | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/menu/components/form/simple-form/index.jsx b/src/menu/components/form/simple-form/index.jsx
index 30ea2af..a6de6f5 100644
--- a/src/menu/components/form/simple-form/index.jsx
+++ b/src/menu/components/form/simple-form/index.jsx
@@ -348,10 +348,7 @@
index = i
}
- let label = item.label || ''
- if (item.field && item.field.toLowerCase() !== label.toLowerCase()) {
- label = label + ' (' + item.field + ')'
- }
+ let label = `${item.field || ''}锛�${item.label}锛塦
if (['text', 'number', 'textarea', 'color'].includes(item.type) && _item.field !== item.field) {
_inputfields.push({
@@ -476,7 +473,8 @@
let param = {
func: 's_debug_sql',
exec_type: 'y',
- LText: res.dataSource
+ LText: `declare @mk_organization nvarchar(512)
+ ${res.dataSource}`
}
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
--
Gitblit v1.8.0