From 1e4a7720c748bc0206b02b30f4a2e0b3dafb54f3 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 19 二月 2024 13:31:13 +0800
Subject: [PATCH] 2024-02-19
---
src/templates/sharecomponent/actioncomponent/verifyexcelout/customscript/index.jsx | 51 +++++++--------------------------------------------
1 files changed, 7 insertions(+), 44 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/customscript/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/customscript/index.jsx
index 7acae2d..444e507 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/customscript/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/customscript/index.jsx
@@ -7,7 +7,7 @@
import Api from '@/api'
import Utils from '@/utils/utils.js'
-import { checkSQL } from '@/utils/utils-custom.js'
+import { checkSQL, getSearchFields } from '@/utils/utils-custom.js'
import CodeMirror from '@/templates/zshare/codemirror'
// import './index.scss'
@@ -27,12 +27,16 @@
}
UNSAFE_componentWillMount () {
- this.resetfield(this.props.searches)
+ this.setState({
+ usefulfields: getSearchFields(this.props.searches)
+ })
}
UNSAFE_componentWillReceiveProps(nextProps) {
if (!is(fromJS(this.props.searches), fromJS(nextProps.searches))) {
- this.resetfield(nextProps.searches)
+ this.setState({
+ usefulfields: getSearchFields(nextProps.searches)
+ })
}
}
@@ -85,47 +89,6 @@
duration: 5
})
}
- })
- }
-
- resetfield = (searches) => {
- let _usefulFields = []
- searches.forEach(item => {
- if (!item.field) return
-
- if (item.type === 'group') {
- _usefulFields.push(item.field)
- _usefulFields.push(item.datefield)
- _usefulFields.push(item.datefield + '1')
- } else if (item.type === 'dateweek') {
- _usefulFields.push(item.field)
- _usefulFields.push(item.field + '1')
- } else if (item.type === 'datemonth') {
- if (item.match === '=') {
- _usefulFields.push(item.field)
- } else {
- _usefulFields.push(item.field)
- _usefulFields.push(item.field + '1')
- }
- } else if (item.type === 'daterange') {
- let _skey = item.field
- let _ekey = item.field + '1'
-
- if (/,/.test(item.field)) {
- _skey = item.field.split(',')[0]
- _ekey = item.field.split(',')[1]
- }
- _usefulFields.push(_skey)
- _usefulFields.push(_ekey)
- } else if (item.type === 'date' && _usefulFields.includes(item.field)) {
- _usefulFields.push(item.field + '1')
- } else {
- _usefulFields.push(item.field)
- }
- })
-
- this.setState({
- usefulfields: _usefulFields.join(', ')
})
}
--
Gitblit v1.8.0