From d7ec8fbd65cd7225ce8d405a0ee0a1f166f44d7b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 16 九月 2021 17:23:54 +0800
Subject: [PATCH] 2021-09-16
---
src/utils/utils.js | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index d3948e4..84bcc0f 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -261,7 +261,7 @@
let _initval = JSON.parse(item.initval)
let _vals = [moment().subtract(_initval[0], 'days').format('YYYY-MM-DD'), moment().subtract(_initval[1], 'days').format('YYYY-MM-DD')]
item.initval = _vals.join(',')
- } catch {
+ } catch (e) {
item.initval = ''
}
}
@@ -309,7 +309,7 @@
} else if (_type === 'customized') {
try {
_val = JSON.parse(_val)
- } catch {
+ } catch (e) {
_val = [0, 0]
}
_dateRange = [moment().subtract(_val[0], 'days').format('YYYY-MM-DD'),
@@ -703,8 +703,6 @@
if (item.type === 'link') {
arrfield.push(item.linkField)
- } else if ((item.type === 'select' || item.type === 'radio') && item.linkSubField && item.linkSubField.length > 0) {
- arrfield.push(...item.linkSubField)
} else if (item.type === 'checkcard') {
arrfield = item.fields.map(f => f.field)
arrfield.push(item.cardValField)
@@ -712,6 +710,12 @@
arrfield.push(item.urlField)
}
}
+ if (['select', 'radio', 'link', 'checkcard'].includes(item.type) && item.linkSubField && item.linkSubField.length > 0) {
+ arrfield.push(...item.linkSubField)
+ }
+ if (item.disableField) {
+ arrfield.push(item.disableField)
+ }
arrfield = Array.from(new Set(arrfield))
--
Gitblit v1.8.0