From 2b45840e53d250f517874bea495bffaeda172807 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 03 三月 2022 12:52:16 +0800
Subject: [PATCH] 2022-03-03
---
src/utils/utils.js | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 53170d2..5cfdffc 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -707,14 +707,16 @@
static getSelectQueryOptions (item) {
let arrfield = [item.valueField, item.valueText]
- if (item.type === 'link') {
- arrfield.push(item.linkField)
- } else if (item.type === 'checkcard') {
+ if (item.type === 'checkcard') {
arrfield = item.fields.map(f => f.field)
arrfield.push(item.cardValField)
if (item.urlField) {
arrfield.push(item.urlField)
}
+ }
+
+ if (item.linkField) {
+ arrfield.push(item.linkField)
}
if (['select', 'radio', 'link', 'checkcard'].includes(item.type) && item.linkSubField && item.linkSubField.length > 0) {
arrfield.push(...item.linkSubField)
@@ -1393,7 +1395,7 @@
}
_initFormfields.push(`@${_key}=${val}`)
} else if (['date', 'datemonth', 'datetime'].includes(form.type)) {
- _initFormfields.push(`@${_key}='${form.value || '1900-01-01'}'`)
+ _initFormfields.push(`@${_key}='${form.value || '1949-10-01'}'`)
} else {
_initFormfields.push(`@${_key}='${form.value}'`)
}
@@ -1438,7 +1440,7 @@
let _val = datavars.hasOwnProperty(_key) ? datavars[_key] : ''
if (col.datatype && /^date/ig.test(col.datatype) && !_val) {
- _val = '1900-01-01'
+ _val = '1949-10-01'
}
_initvars.push(_key)
@@ -2046,6 +2048,7 @@
let icon = null
let color = null
let position = null
+ style = JSON.parse(JSON.stringify(style))
marks.some(mark => {
let originVal = record[mark.field[0]] + ''
--
Gitblit v1.8.0