From fe21d23b147ed5cec22b4f76a88840b05495d4ad Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 18 六月 2022 22:33:59 +0800
Subject: [PATCH] 2022-06-18
---
src/utils/utils.js | 79 +++++++--------------------------------
1 files changed, 15 insertions(+), 64 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index b3a0d14..1f78e17 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -705,63 +705,6 @@
}
/**
- * @description 鑾峰彇鎼滅储鐢ㄤ簬姝ｅ垯鏇挎崲
- * @param {Array} searches 鎼滅储鏉′欢
- * @return {String} searchText 鎷兼帴缁撴灉
- */
- static getRegOptions (searches) {
- if (!searches || searches.length === 0) return []
-
- let options = []
- let fieldmap = new Map()
- searches.forEach(search => {
- let item = {
- key: search.field,
- value: '0'
- }
-
- if (fieldmap.has(item.key)) {
- item.key = item.key + '1'
- }
-
- fieldmap.set(item.key, true)
-
- if (search.type === 'group') {
- options.push({
- key: search.field,
- value: '0'
- })
- options.push({
- key: search.datefield,
- value: '0'
- })
- options.push({
- key: search.datefield + '1',
- value: '0'
- })
- options.push(item)
- } else if (['datemonth', 'dateweek', 'daterange'].includes(search.type)) {
- options.push(item)
- options.push({
- key: item.key + '1',
- value: '0'
- })
- } else if (search.type === 'text' || search.type === 'select') {
- item.key.split(',').forEach(field => {
- let cell = JSON.parse(JSON.stringify(item))
- cell.key = field
-
- options.push(cell)
- })
- } else {
- options.push(item)
- }
- })
-
- return options
- }
-
- /**
* @description 鑾峰彇鍥剧墖鐪熷疄璺緞
* @return {String} url 鍥剧墖璺緞
*/
@@ -1507,7 +1450,7 @@
}
// 娣诲姞鏁版嵁涓瓧娈碉紝琛ㄥ崟鍊间紭鍏�(鎸夐挳涓嶉�夎鎴栧琛屾嫾鎺ユ椂璺宠繃)
- if (data && !btn.$forbid && btn.Ot !== 'notRequired' && btn.Ot !== 'requiredOnce') {
+ if (data && btn.Ot !== 'notRequired' && btn.Ot !== 'requiredOnce') {
datavars = {...data, ...datavars}
const setField = (col) => {
@@ -2124,26 +2067,30 @@
*/
export function getMark (marks, record, style = {}) {
let icon = null
- let color = null
+ let innerStyle = null
let position = null
style = JSON.parse(JSON.stringify(style))
marks.some(mark => {
- let originVal = record[mark.field[0]] + ''
+ let originVal = record[mark.field[0]]
let contrastVal = ''
let result = false
if (mark.field[1] === 'static') {
- contrastVal = mark.contrastValue + ''
+ contrastVal = mark.contrastValue
} else {
- contrastVal = record[mark.field[2]] + ''
+ contrastVal = record[mark.field[2]]
}
+
+ if (originVal === undefined || contrastVal === undefined) return false
if (mark.match === '=') {
result = originVal === contrastVal
} else if (mark.match === '!=') {
result = originVal !== contrastVal
} else if (mark.match === 'like') {
+ originVal = originVal + ''
+ contrastVal = contrastVal + ''
result = originVal.indexOf(contrastVal) > -1
} else if (mark.match === '>') {
result = parseFloat(originVal) > parseFloat(contrastVal)
@@ -2157,20 +2104,24 @@
if (type === 'font') {
style.color = mark.color
+ innerStyle = {color: mark.color}
} else if (type === 'background') {
style.background = mark.color
if (mark.fontColor) {
style.color = mark.fontColor
+ innerStyle = {color: mark.fontColor}
}
} else if (type === 'underline') {
style.textDecoration = 'underline'
style.color = mark.color
+ innerStyle = {color: mark.color, textDecoration: 'underline'}
} else if (type === 'line-through') {
style.textDecoration = 'line-through'
style.color = mark.color
+ innerStyle = {color: mark.color, textDecoration: 'line-through'}
} else if (type.indexOf('icon') > -1) {
icon = mark.signType[mark.signType.length - 1]
- color = mark.color
+ innerStyle = {color: mark.color}
if (type === 'iconfront' || mark.signType[1] === 'front') {
position = 'front'
} else {
@@ -2184,7 +2135,7 @@
return {
style,
icon,
- color,
+ innerStyle,
position
}
}
--
Gitblit v1.8.0