From 437c6d72f76072e5ab1b09e78101370805113c4b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 01 十月 2023 18:46:37 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/templates/sharecomponent/fieldscomponent/index.jsx | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/templates/sharecomponent/fieldscomponent/index.jsx b/src/templates/sharecomponent/fieldscomponent/index.jsx
index 1c09501..2886fa7 100644
--- a/src/templates/sharecomponent/fieldscomponent/index.jsx
+++ b/src/templates/sharecomponent/fieldscomponent/index.jsx
@@ -58,6 +58,7 @@
if (res.FDName && res.FDName.length > 0) {
tabmsg.columns = res.FDName.map(item => {
let _type = item.FieldType.toLowerCase()
+ let _datatype = item.FieldType.toLowerCase()
let _decimal = 0
let _length = 50
if (/^nvarchar/.test(_type)) {
@@ -80,6 +81,14 @@
} else {
_type = 'text'
}
+
+ if (/^nvarchar/.test(_datatype)) {
+ _datatype = _datatype.replace(/^nvarchar/, 'Nvarchar')
+ } else if (/^decimal/.test(_datatype)) {
+ _datatype = _datatype.replace(/^decimal/, 'Decimal')
+ } else if (/^int/.test(_datatype)) {
+ _datatype = _datatype.replace(/^int/, 'Int')
+ }
return {
field: item.FieldName || '',
@@ -88,7 +97,7 @@
datatype: _type,
decimal: _decimal,
length: _length,
- $datatype: item.FieldType.toLowerCase()
+ $datatype: _datatype
}
})
}
@@ -232,7 +241,7 @@
field: item.field,
Hide: 'false',
IsSort: 'true',
- type: item.type,
+ type: item.type === 'number' ? 'number' : 'text',
Width: item.type === 'number' ? 80 : 120
}
@@ -240,6 +249,12 @@
newcard.decimal = item.decimal
} else {
newcard.fieldlength = item.length || 50
+ }
+
+ if (item.type === 'date') {
+ newcard.textFormat = 'YYYY-MM-DD'
+ } else if (item.type === 'datetime') {
+ newcard.textFormat = 'YYYY-MM-DD HH:mm:ss'
}
items.push(newcard)
@@ -257,6 +272,7 @@
field: item.field,
datatype: _t
}
+
items.unshift(newcard)
keys.push(item.field.toLowerCase())
})
--
Gitblit v1.8.0