From d1cd5af5adb53e91efdd278328e1b6f8ad834fb5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 06 二月 2025 21:11:56 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/tabviews/zshare/topSearch/index.jsx | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/tabviews/zshare/topSearch/index.jsx b/src/tabviews/zshare/topSearch/index.jsx
index 6e31879..088db55 100644
--- a/src/tabviews/zshare/topSearch/index.jsx
+++ b/src/tabviews/zshare/topSearch/index.jsx
@@ -55,7 +55,7 @@
let linkFields = {}
let record = {}
let forbid = false // header涓笉璁剧疆楂樼骇鎼滅储
- let _setting = {showAdv: false, show: false, style: null}
+ let _setting = {showAdv: false, show: false, style: null, $pageId: config.$pageId || ''}
let BID = this.props.BID
let sysvals = {}
@@ -170,6 +170,10 @@
item.initval = [moment(d).startOf('month').format(item.format), moment(d).endOf('month').format(item.format)].join(',')
} else if (item.$initval === 'lastMonth') {
item.initval = [moment(d).subtract(1, 'months').startOf('month').format(item.format), moment(d).subtract(1, 'months').endOf('month').format(item.format)].join(',')
+ } else if (item.$initval === 'year') {
+ item.initval = [moment(d).startOf('year').format(item.format), moment(d).endOf('year').format(item.format)].join(',')
+ } else if (item.$initval === 'lastYear') {
+ item.initval = [moment(d).subtract(1, 'years').startOf('year').format(item.format), moment(d).subtract(1, 'years').endOf('year').format(item.format)].join(',')
} else {
try {
let _initval = JSON.parse(item.$initval)
@@ -445,6 +449,10 @@
item.initval = [moment(d).startOf('month').format(item.format), moment(d).endOf('month').format(item.format)].join(',')
} else if (item.$initval === 'lastMonth') {
item.initval = [moment(d).subtract(1, 'months').startOf('month').format(item.format), moment(d).subtract(1, 'months').endOf('month').format(item.format)].join(',')
+ } else if (item.$initval === 'year') {
+ item.initval = [moment(d).startOf('year').format(item.format), moment(d).endOf('year').format(item.format)].join(',')
+ } else if (item.$initval === 'lastYear') {
+ item.initval = [moment(d).subtract(1, 'years').startOf('year').format(item.format), moment(d).subtract(1, 'years').endOf('year').format(item.format)].join(',')
} else {
try {
let _initval = JSON.parse(item.$initval)
@@ -1060,6 +1068,11 @@
handleReset = () => {
const { setting } = this.state
+ if (setting.resetContrl === 'refresh') {
+ MKEmitter.emit('reloadMenuView', setting.$pageId, true)
+ return
+ }
+
let record = {}
let advanceValues = []
let searchlist = this.state.searchlist.map(item => {
--
Gitblit v1.8.0