From 63308f94601f7af331791658fd42a07705db23b6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 28 四月 2022 11:43:06 +0800
Subject: [PATCH] Merge branch 'master' into bms

---
 src/utils/utils.js |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/utils/utils.js b/src/utils/utils.js
index 91cd72f..bf0877d 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -249,9 +249,9 @@
       item.required = !item.hidden && item.required === 'true'
       item.advanced = item.advanced === 'true'
       item.$forbid = item.query === 'false'
+      item.precision = item.precision || 'day'
 
       if (item.type === 'date') { // 鏃堕棿鎼滅储
-        item.precision = item.precision || 'day'
         let format = 'YYYY-MM-DD'
         if (item.precision === 'day') {
 
@@ -269,7 +269,6 @@
       } else if (item.type === 'dateweek') {
         item.initval = item.initval ? moment().subtract(item.initval * 7, 'days').format('YYYY-MM-DD') : ''
       } else if (item.type === 'daterange') {
-        item.precision = item.precision || 'day'
         let format = 'YYYY-MM-DD'
         if (item.precision === 'day') {
 
@@ -381,7 +380,7 @@
         label: cell.label,
         value: cell.initval,
         required: cell.required,
-        precision: cell.precision || '',
+        precision: cell.precision || 'day',
         forbid: cell.$forbid
       }
       

--
Gitblit v1.8.0