From 920e94fc5483b081b3d43c86df8f56d838f2f14d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 06 一月 2024 22:07:15 +0800
Subject: [PATCH] 2024-01-06

---
 src/utils/utils.js |   86 +++++++++++++++++++++++++++++++++++-------
 1 files changed, 71 insertions(+), 15 deletions(-)

diff --git a/src/utils/utils.js b/src/utils/utils.js
index 3177c1d..f4dc5e3 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -260,10 +260,13 @@
           format = 'YYYY-MM-DD HH:mm:ss'
         }
 
+        item.format = format
         item.initval = item.initval ? moment().subtract(item.initval, 'days').format(format) : ''
       } else if (item.type === 'datemonth') {
+        item.format = 'YYYY-MM'
         item.initval = item.initval ? moment().subtract(item.initval, 'month').format('YYYY-MM') : ''
       } else if (item.type === 'dateweek') {
+        item.format = 'YYYY-MM-DD'
         item.initval = item.initval ? moment().subtract(item.initval * 7, 'days').format('YYYY-MM-DD') : ''
       } else if (item.type === 'daterange') {
         let format = 'YYYY-MM-DD'
@@ -276,19 +279,65 @@
         } else if (item.precision === 'second') {
           format = 'YYYY-MM-DD HH:mm:ss'
         }
-        if (item.initval === 'week') {
-          item.initval = [moment().startOf('week').format(format), moment().endOf('week').format(format)].join(',')
-        } else if (item.initval === 'month') {
-          item.initval = [moment().startOf('month').format(format), moment().endOf('month').format(format)].join(',')
-        } else if (item.initval === 'lastMonth') {
-          item.initval = [moment().subtract(1, 'months').startOf('month').format(format), moment().subtract(1, 'months').endOf('month').format(format)].join(',')
-        } else if (item.initval) {
-          try {
-            let _initval = JSON.parse(item.initval)
-            let _vals = [moment().subtract(_initval[0], 'days').format(format), moment().subtract(_initval[1], 'days').format(format)]
-            item.initval = _vals.join(',')
-          } catch (e) {
+
+        item.format = format
+
+        if (item.initval) {
+          if (!item.dateShift) {
+            if (item.initval === 'week') {
+              item.initval = [moment().startOf('week').format(format), moment().endOf('week').format(format)].join(',')
+            } else if (item.initval === 'month') {
+              item.initval = [moment().startOf('month').format(format), moment().endOf('month').format(format)].join(',')
+            } else if (item.initval === 'lastMonth') {
+              item.initval = [moment().subtract(1, 'months').startOf('month').format(format), moment().subtract(1, 'months').endOf('month').format(format)].join(',')
+            } else if (item.initval) {
+              try {
+                let _initval = JSON.parse(item.initval)
+                let _vals = [moment().subtract(_initval[0], 'days').format(format), moment().subtract(_initval[1], 'days').format(format)]
+                item.initval = _vals.join(',')
+              } catch (e) {
+                item.initval = ''
+              }
+            }
+          } else {
+            item.$initval = item.initval
+            item.$supId = config.$pageId
+            if (config.setting && config.setting.supModule) {
+              item.$supId = config.setting.supModule
+            }
+
+            config.checkBid = true
+            config.setting.checkBid = true
+            item.checkShift = true
             item.initval = ''
+
+            let d = ''
+            if (window.GLOB.CacheData.has(item.$supId)) {
+              d = window.GLOB.CacheData.get(item.$supId)
+              d = d[item.dateShift] || ''
+              if (d) {
+                d = moment(d).format('YYYY-MM-DD')
+                d = d === 'Invalid date' ? '' : d
+              }
+            }
+
+            if (d) {
+              if (item.$initval === 'week') {
+                item.initval = [moment(d).startOf('week').format(format), moment(d).endOf('week').format(format)].join(',')
+              } else if (item.$initval === 'month') {
+                item.initval = [moment(d).startOf('month').format(format), moment(d).endOf('month').format(format)].join(',')
+              } else if (item.$initval === 'lastMonth') {
+                item.initval = [moment(d).subtract(1, 'months').startOf('month').format(format), moment(d).subtract(1, 'months').endOf('month').format(format)].join(',')
+              } else {
+                try {
+                  let _initval = JSON.parse(item.$initval)
+                  let _vals = [moment(d).subtract(_initval[0], 'days').format(format), moment(d).subtract(_initval[1], 'days').format(format)]
+                  item.initval = _vals.join(',')
+                } catch (e) {
+                  item.initval = ''
+                }
+              }
+            }
           }
         }
       } else if (item.type === 'group') {
@@ -348,9 +397,16 @@
           item.initval = ''
           item.initType = ''
         }
-      } else if ((item.type === 'select' || item.type === 'link') && item.initval === '$first' && item.resourceType === '1') {
-        item.initval = ''
-        item.$first = true
+      } else if ((item.type === 'select' || item.type === 'link') && item.resourceType === '1') {
+        if (/@BID@/ig.test(item.dataSource) && config.setting && config.setting.supModule) {
+          config.checkBid = true
+          config.setting.checkBid = true
+          item.checkBid = true
+        }
+        if (item.initval === '$first') {
+          item.initval = ''
+          item.$first = true
+        }
       }
       
       item.oriInitval = item.initval

--
Gitblit v1.8.0