From 137fb8ea6af2789b3238b22bac31d80bced41dfe Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 28 七月 2021 11:39:39 +0800
Subject: [PATCH] 2021-07-28
---
src/templates/sharecomponent/fieldscomponent/index.jsx | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/templates/sharecomponent/fieldscomponent/index.jsx b/src/templates/sharecomponent/fieldscomponent/index.jsx
index 8447dd0..8f2a184 100644
--- a/src/templates/sharecomponent/fieldscomponent/index.jsx
+++ b/src/templates/sharecomponent/fieldscomponent/index.jsx
@@ -19,6 +19,7 @@
state = {
dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+ appType: sessionStorage.getItem('appType'),
fields: [], // 瀛楁闆�
tableVisible: false, // 妯℃�佹鎺у埗
}
@@ -54,7 +55,7 @@
} else if (type === 'columns') {
// 娣诲姞鏄剧ず鍒楋紝瀛楁闆嗕腑瀛樺湪鏄剧ず鍒楀瓧娈碉紝浣跨敤鏄剧ず鍒楀璞℃浛鎹㈠瓧娈甸泦锛岃缃暟鎹被鍨�
config.columns.forEach(item => {
- if (columns.has(item.field.toLowerCase())) {
+ if (item.field && columns.has(item.field.toLowerCase())) {
let _datatype = columns.get(item.field.toLowerCase()).datatype
columns.set(item.field.toLowerCase(), {...item, selected: true, datatype: _datatype})
}
@@ -162,7 +163,7 @@
config.search = items
} else if (type === 'columns') {
config.columns.forEach(item => {
- if (columnsMap.has(item.field.toLowerCase())) {
+ if (item.field && columnsMap.has(item.field.toLowerCase())) {
let cell = columnsMap.get(item.field.toLowerCase())
if (cell.selected) {
@@ -216,12 +217,13 @@
let _columns = [...columnsMap.values()]
_columns.forEach(item => {
+ let _t = item.$datatype || (item.type === 'number' ? 'Decimal(18,0)' : 'Nvarchar(50)')
if (item.selected) {
let newcard = {
uuid: Utils.getuuid(),
label: item.label,
field: item.field,
- datatype: item.type === 'number' ? 'Decimal(18,0)' : 'Nvarchar(50)'
+ datatype: _t
}
items.push(newcard)
@@ -247,7 +249,10 @@
let _columns = [...columnsMap.values()]
let lastItem = config.fields[config.fields.length - 1]
- let span = lastItem ? lastItem.span || 12 : 12
+ let span = this.state.appType === 'mob' ? 24 : 12
+ if (lastItem && lastItem.span) {
+ span = lastItem.span
+ }
_columns.forEach(item => { // 寰幆娣诲姞鏂板瀛楁
if (item.selected) {
--
Gitblit v1.8.0