From c547c75fce3c2d9badcb496da7d8e5443e22dbfc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 03 八月 2024 17:10:41 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/debug/index.jsx | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/menu/debug/index.jsx b/src/menu/debug/index.jsx
index 91caad6..3b440ad 100644
--- a/src/menu/debug/index.jsx
+++ b/src/menu/debug/index.jsx
@@ -720,8 +720,10 @@
_item.type = 'text'
} else if (_item.type === 'number' || _item.type === 'rate') {
_item.fieldlen = item.decimal || 0
- } else if (_item.type === 'date') {
+ } else if (_item.type === 'date') {
_item.type = item.declareType === 'nvarchar(50)' ? 'text' : 'date'
+ } else if (_item.type === 'datetime') {
+ _item.type = 'date'
} else if (item.declare === 'decimal') {
_item.type = 'number'
_item.fieldlen = item.decimal || 0
@@ -767,8 +769,10 @@
_item.type = 'text'
} else if (_item.type === 'number' || _item.type === 'rate') {
_item.fieldlen = item.decimal || 0
- } else if (_item.type === 'date') {
+ } else if (_item.type === 'date') {
_item.type = item.declareType === 'nvarchar(50)' ? 'text' : 'date'
+ } else if (_item.type === 'datetime') {
+ _item.type = 'date'
} else if (item.declare === 'decimal') {
_item.type = 'number'
_item.fieldlen = item.decimal || 0
@@ -2199,7 +2203,7 @@
this.setState({status: this.verSqls.length > 0 ? 'loading' : 'over', execId: item.uuid})
- console.info(`/* 缁勪欢锛�${item.name} 妫�楠岄」锛�${item.label} */`)
+ window.mkInfo(`/* 缁勪欢锛�${item.name} 妫�楠岄」锛�${item.label} */`)
Api.sDebug(item.sql).then(result => {
if (result.status || result.ErrCode === '-2') {
--
Gitblit v1.8.0