From 56cf1b98d331c88eb6b0de8d03a85ce06f19f901 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 22 一月 2022 00:23:01 +0800
Subject: [PATCH] 2022-01-22
---
src/tabviews/custom/components/card/table-card/index.jsx | 5 +-
src/tabviews/custom/components/card/cardcellList/index.jsx | 4 +-
src/tabviews/custom/components/card/prop-card/index.jsx | 9 ++--
src/pc/quotecomponent/settingform/index.jsx | 2
src/tabviews/custom/components/table/normal-table/index.jsx | 5 +-
src/menu/components/card/cardcellcomponent/elementform/index.jsx | 3 +
src/tabviews/custom/components/timeline/normal-timeline/index.jsx | 5 +-
src/tabviews/custom/components/carousel/data-card/index.jsx | 5 +-
src/menu/components/card/cardcellcomponent/formconfig.jsx | 10 +++++
src/tabviews/custom/components/table/edit-table/index.jsx | 5 +-
src/tabviews/custom/components/carousel/prop-card/index.jsx | 5 +-
src/tabviews/custom/components/card/balcony/index.jsx | 5 --
src/views/mobdesign/index.jsx | 19 ++++++---
src/tabviews/custom/components/card/data-card/index.jsx | 9 ++--
14 files changed, 56 insertions(+), 35 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/elementform/index.jsx b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
index b3eda93..4d259c2 100644
--- a/src/menu/components/card/cardcellcomponent/elementform/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
@@ -101,6 +101,9 @@
if (['text', 'number', 'picture', 'slider', 'barcode', 'qrcode', 'video'].includes(eleType)) {
if (datatype === 'dynamic') {
_options.push('field')
+ if (eleType === 'number') {
+ _options.push('decimal')
+ }
} else if (eleType === 'picture' || eleType === 'video') {
_options.push('url')
} else {
diff --git a/src/menu/components/card/cardcellcomponent/formconfig.jsx b/src/menu/components/card/cardcellcomponent/formconfig.jsx
index c101166..ee0f0b8 100644
--- a/src/menu/components/card/cardcellcomponent/formconfig.jsx
+++ b/src/menu/components/card/cardcellcomponent/formconfig.jsx
@@ -162,6 +162,16 @@
]
},
{
+ type: 'number',
+ key: 'decimal',
+ min: 0,
+ max: 18,
+ decimal: 0,
+ label: '灏忔暟浣�',
+ initVal: card.decimal === undefined ? '' : card.decimal,
+ required: false
+ },
+ {
type: 'text',
key: 'prefix',
label: '鍓嶇紑',
diff --git a/src/pc/quotecomponent/settingform/index.jsx b/src/pc/quotecomponent/settingform/index.jsx
index 96a871f..6ab0f32 100644
--- a/src/pc/quotecomponent/settingform/index.jsx
+++ b/src/pc/quotecomponent/settingform/index.jsx
@@ -16,7 +16,7 @@
if (appMenus) {
try {
appMenus = JSON.parse(appMenus)
- appMenus = appMenus.filter(item => item.keys_type !== 'index')
+ appMenus = appMenus.filter(item => item.keys_type === 'navbar')
} catch (e) {
appMenus = []
}
diff --git a/src/tabviews/custom/components/card/balcony/index.jsx b/src/tabviews/custom/components/card/balcony/index.jsx
index 72ad28f..eea3e51 100644
--- a/src/tabviews/custom/components/card/balcony/index.jsx
+++ b/src/tabviews/custom/components/card/balcony/index.jsx
@@ -37,7 +37,6 @@
UNSAFE_componentWillMount () {
const { data, BID } = this.props
let _config = fromJS(this.props.config).toJS()
- let _cols = new Map()
let _data = { $$empty: true }
let _sync = false
@@ -57,10 +56,6 @@
if (_data) {
_data.$$BID = BID || ''
}
-
- _config.columns.forEach(item => {
- _cols.set(item.field, item)
- })
if (_config.wrap.position === 'fixed') {
_config.style.position = 'fixed'
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 5608b31..c564e14 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -335,8 +335,8 @@
val = Math.abs(val)
}
- if (card.col && card.col.type === 'number') {
- let decimal = card.col.decimal || 0
+ if (typeof(card.decimal) === 'number') {
+ let decimal = card.decimal
if (card.format === 'percent') {
decimal = decimal - 2
diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx
index 704b8bc..7f5f993 100644
--- a/src/tabviews/custom/components/card/data-card/index.jsx
+++ b/src/tabviews/custom/components/card/data-card/index.jsx
@@ -144,18 +144,19 @@
}
_config.columns.forEach(item => {
+ if (item.type !== 'number') return
_cols.set(item.field, item)
})
_card.elements = _card.elements.map(item => {
- if (item.field && _cols.has(item.field)) {
- item.col = _cols.get(item.field)
+ if (item.eleType === 'number' && item.field && _cols.has(item.field) && typeof(item.decimal) !== 'number') {
+ item.decimal = _cols.get(item.field).decimal || 0
}
return item
})
_card.backElements = _card.backElements.map(item => {
- if (item.field && _cols.has(item.field)) {
- item.col = _cols.get(item.field)
+ if (item.eleType === 'number' && item.field && _cols.has(item.field) && typeof(item.decimal) !== 'number') {
+ item.decimal = _cols.get(item.field).decimal || 0
}
return item
})
diff --git a/src/tabviews/custom/components/card/prop-card/index.jsx b/src/tabviews/custom/components/card/prop-card/index.jsx
index e4dc898..cb439f0 100644
--- a/src/tabviews/custom/components/card/prop-card/index.jsx
+++ b/src/tabviews/custom/components/card/prop-card/index.jsx
@@ -70,6 +70,7 @@
}
_config.columns.forEach(item => {
+ if (item.type !== 'number') return
_cols.set(item.field, item)
})
@@ -87,14 +88,14 @@
}
_width += card.setting.width
card.elements = card.elements.map(item => {
- if (item.field && _cols.has(item.field)) {
- item.col = _cols.get(item.field)
+ if (item.eleType === 'number' && item.field && _cols.has(item.field) && typeof(item.decimal) !== 'number') {
+ item.decimal = _cols.get(item.field).decimal || 0
}
return item
})
card.backElements = card.backElements.map(item => {
- if (item.field && _cols.has(item.field)) {
- item.col = _cols.get(item.field)
+ if (item.eleType === 'number' && item.field && _cols.has(item.field) && typeof(item.decimal) !== 'number') {
+ item.decimal = _cols.get(item.field).decimal || 0
}
return item
})
diff --git a/src/tabviews/custom/components/card/table-card/index.jsx b/src/tabviews/custom/components/card/table-card/index.jsx
index 14107bf..998bb1b 100644
--- a/src/tabviews/custom/components/card/table-card/index.jsx
+++ b/src/tabviews/custom/components/card/table-card/index.jsx
@@ -77,13 +77,14 @@
}
_config.columns.forEach(item => {
+ if (item.type !== 'number') return
_cols.set(item.field, item)
})
_config.subcards.forEach(card => {
card.elements = card.elements.map(item => {
- if (item.field && _cols.has(item.field)) {
- item.col = _cols.get(item.field)
+ if (item.eleType === 'number' && item.field && _cols.has(item.field) && typeof(item.decimal) !== 'number') {
+ item.decimal = _cols.get(item.field).decimal || 0
}
return item
})
diff --git a/src/tabviews/custom/components/carousel/data-card/index.jsx b/src/tabviews/custom/components/carousel/data-card/index.jsx
index 7de4d1f..41caced 100644
--- a/src/tabviews/custom/components/carousel/data-card/index.jsx
+++ b/src/tabviews/custom/components/carousel/data-card/index.jsx
@@ -58,6 +58,7 @@
}
_config.columns.forEach(item => {
+ if (item.type !== 'number') return
_cols.set(item.field, item)
})
@@ -68,8 +69,8 @@
}
_card.elements = _card.elements.map(item => {
- if (item.field && _cols.has(item.field)) {
- item.col = _cols.get(item.field)
+ if (item.eleType === 'number' && item.field && _cols.has(item.field) && typeof(item.decimal) !== 'number') {
+ item.decimal = _cols.get(item.field).decimal || 0
}
return item
})
diff --git a/src/tabviews/custom/components/carousel/prop-card/index.jsx b/src/tabviews/custom/components/carousel/prop-card/index.jsx
index 4004576..04a76d7 100644
--- a/src/tabviews/custom/components/carousel/prop-card/index.jsx
+++ b/src/tabviews/custom/components/carousel/prop-card/index.jsx
@@ -61,6 +61,7 @@
}
_config.columns.forEach(item => {
+ if (item.type !== 'number') return
_cols.set(item.field, item)
})
@@ -70,8 +71,8 @@
card.style.cursor = 'pointer'
}
card.elements = card.elements.map(item => {
- if (item.field && _cols.has(item.field)) {
- item.col = _cols.get(item.field)
+ if (item.eleType === 'number' && item.field && _cols.has(item.field) && typeof(item.decimal) !== 'number') {
+ item.decimal = _cols.get(item.field).decimal || 0
}
return item
})
diff --git a/src/tabviews/custom/components/table/edit-table/index.jsx b/src/tabviews/custom/components/table/edit-table/index.jsx
index 083affa..b594372 100644
--- a/src/tabviews/custom/components/table/edit-table/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/index.jsx
@@ -77,14 +77,15 @@
}
_config.columns.forEach(item => {
+ if (item.type !== 'number') return
_cols.set(item.field, item)
})
_config.cols.forEach(column => {
if (column.type === 'custom') {
column.elements = column.elements.map(item => {
- if (item.field && _cols.has(item.field)) {
- item.col = _cols.get(item.field)
+ if (item.eleType === 'number' && item.field && _cols.has(item.field) && typeof(item.decimal) !== 'number') {
+ item.decimal = _cols.get(item.field).decimal || 0
}
return item
})
diff --git a/src/tabviews/custom/components/table/normal-table/index.jsx b/src/tabviews/custom/components/table/normal-table/index.jsx
index 72585ec..b7e0ba2 100644
--- a/src/tabviews/custom/components/table/normal-table/index.jsx
+++ b/src/tabviews/custom/components/table/normal-table/index.jsx
@@ -110,14 +110,15 @@
}
_config.columns.forEach(item => {
+ if (item.type !== 'number') return
_cols.set(item.field, item)
})
_config.cols.forEach(column => {
if (column.type === 'custom') {
column.elements = column.elements.map(item => {
- if (item.field && _cols.has(item.field)) {
- item.col = _cols.get(item.field)
+ if (item.eleType === 'number' && item.field && _cols.has(item.field) && typeof(item.decimal) !== 'number') {
+ item.decimal = _cols.get(item.field).decimal || 0
}
return item
})
diff --git a/src/tabviews/custom/components/timeline/normal-timeline/index.jsx b/src/tabviews/custom/components/timeline/normal-timeline/index.jsx
index d49100c..98098fe 100644
--- a/src/tabviews/custom/components/timeline/normal-timeline/index.jsx
+++ b/src/tabviews/custom/components/timeline/normal-timeline/index.jsx
@@ -67,13 +67,14 @@
_config.wrap.contentHeight = _config.wrap.title ? 'calc(100% - 45px)' : '100%'
_config.columns.forEach(item => {
+ if (item.type !== 'number') return
_cols.set(item.field, item)
})
card = _config.subcards[0]
card.elements = card.elements.map(item => {
- if (item.field && _cols.has(item.field)) {
- item.col = _cols.get(item.field)
+ if (item.eleType === 'number' && item.field && _cols.has(item.field) && typeof(item.decimal) !== 'number') {
+ item.decimal = _cols.get(item.field).decimal || 0
}
return item
})
diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index c10b914..7145ac9 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -1464,13 +1464,18 @@
insert = (item) => {
let config = fromJS(this.state.config).toJS()
- if (item.type === 'topbar' && config.components.findIndex(m => m.type === 'topbar') > -1) {
- notification.warning({
- top: 92,
- message: '瀵艰埅鏍忎笉鍙噸澶嶆坊鍔狅紒',
- duration: 5
- })
- return
+ if (item.type === 'topbar') {
+ if (config.components.findIndex(m => m.type === 'topbar') > -1) {
+ notification.warning({
+ top: 92,
+ message: '瀵艰埅鏍忎笉鍙噸澶嶆坊鍔狅紒',
+ duration: 5
+ })
+ return
+ }
+ if (!config.style.paddingTop) {
+ config.style.paddingTop = '50px'
+ }
}
config.components.push(item)
--
Gitblit v1.8.0