From 62e2946d9029a40b4406a39275c7863dccbbeadf Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 19 二月 2024 18:21:59 +0800
Subject: [PATCH] 2024-02-19
---
src/templates/zshare/createinterface/index.jsx | 2
src/tabviews/zshare/topSearch/index.scss | 3 +
src/menu/datasource/verifycard/customscript/index.jsx | 4 +-
src/utils/utils-custom.js | 44 ++++++++++++----------
src/utils/utils.js | 2
src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx | 44 ++++++++++++----------
6 files changed, 55 insertions(+), 44 deletions(-)
diff --git a/src/menu/datasource/verifycard/customscript/index.jsx b/src/menu/datasource/verifycard/customscript/index.jsx
index b7ae1f7..7c60348 100644
--- a/src/menu/datasource/verifycard/customscript/index.jsx
+++ b/src/menu/datasource/verifycard/customscript/index.jsx
@@ -34,14 +34,14 @@
const { searches } = this.props
this.setState({
- usefulfields: getSearchFields(searches)
+ usefulFields: getSearchFields(searches)
})
}
UNSAFE_componentWillReceiveProps (nextProps) {
if (!is(fromJS(this.props.searches), fromJS(nextProps.searches))) {
this.setState({
- usefulfields: getSearchFields(nextProps.searches)
+ usefulFields: getSearchFields(nextProps.searches)
})
}
}
diff --git a/src/tabviews/zshare/topSearch/index.scss b/src/tabviews/zshare/topSearch/index.scss
index cefe1d5..3444190 100644
--- a/src/tabviews/zshare/topSearch/index.scss
+++ b/src/tabviews/zshare/topSearch/index.scss
@@ -6,6 +6,9 @@
float: none;
vertical-align: top;
}
+ .ant-checkbox-wrapper {
+ color: rgba(0, 0, 0, 0.85);
+ }
.ant-form-item {
display: flex;
margin-bottom: 0px;
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
index 7527155..5acaeb6 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
@@ -811,28 +811,32 @@
const { card } = this.props
const { activeKey, verify } = this.state
- if (card.intertype !== 'system' || verify.dataType !== 'custom') {
+ if (activeKey === 'setting') {
+ this.settingForm.handleConfirm().then(res => {
+ if (card.intertype !== 'system' || verify.dataType !== 'custom') {
+ this.setState({activeKey: val, verify: {...verify, ...res}})
+ } else {
+ this.setState({
+ verify: {...verify, ...res}
+ }, () => {
+ this.setState({loading: true})
+ this.sqlverify(() => { // 楠岃瘉鎴愬姛
+ this.setState({
+ activeKey: val,
+ loading: false
+ })
+ }, () => { // 楠岃瘉澶辫触
+ this.setState({
+ activeKey: val,
+ loading: false
+ })
+ }, verify.scripts)
+ })
+ }
+ })
+ } else if (card.intertype !== 'system' || verify.dataType !== 'custom') {
this.setState({activeKey: val})
return
- } else if (activeKey === 'setting') {
- this.settingForm.handleConfirm().then(res => {
- this.setState({
- verify: {...verify, ...res}
- }, () => {
- this.setState({loading: true})
- this.sqlverify(() => { // 楠岃瘉鎴愬姛
- this.setState({
- activeKey: val,
- loading: false
- })
- }, () => { // 楠岃瘉澶辫触
- this.setState({
- activeKey: val,
- loading: false
- })
- }, verify.scripts)
- })
- })
} else if (activeKey === 'columns') {
if (this.columnRef && this.columnRef.state.editingKey) {
notification.warning({
diff --git a/src/templates/zshare/createinterface/index.jsx b/src/templates/zshare/createinterface/index.jsx
index b059099..7baa09f 100644
--- a/src/templates/zshare/createinterface/index.jsx
+++ b/src/templates/zshare/createinterface/index.jsx
@@ -108,7 +108,7 @@
searchText.push('(' + item.field + ' >= @' + item.field + '@ AND ' + item.field + ' < @' + item.field + '1@)')
} else if (item.type === 'range') {
- searchText.push('(' + item.field + ' >= @' + item.field + '@ AND ' + item.field + ' <= @' + item.field + '1@)')
+ searchText.push('(' + item.field + ' >= @' + item.field + '@ AND ' + item.field + ' < @' + item.field + '1@)')
} else {
searchText.push(item.field + ' ' + item.match + ' @' + item.field + '@')
}
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index b426415..8926d01 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -1058,7 +1058,7 @@
searchText.push('(' + item.key + ' >= \'' + val[0] + '\' AND ' + item.key + ' < \'' + val[1] + '\')')
} else if (item.type === 'range') {
let val = item.value.split(',')
- searchText.push('(' + item.key + ' >= ' + (val[0] || -999999) + ' AND ' + item.key + ' <= ' + (val[1] || 999999) + ')')
+ searchText.push('(' + item.key + ' >= ' + (val[0] || -999999) + ' AND ' + item.key + ' < ' + (val[1] || 999999) + ')')
} else if (item.type === 'datemonth') {
if (item.match === '=') {
searchText.push('(' + item.key + ' = \'' + item.value + '\')')
@@ -1186,39 +1186,43 @@
let _usefulFields = []
searches.forEach(item => {
- if (!item.field) return
+ let key = item.key || item.field
+
+ if (!key) return
if (item.type === 'group') {
- _usefulFields.push(item.field)
- _usefulFields.push(item.datefield)
- _usefulFields.push(item.datefield + '1')
+ _usefulFields.push(key)
+ if (item.datefield) {
+ _usefulFields.push(item.datefield)
+ _usefulFields.push(item.datefield + '1')
+ }
} else if (item.type === 'dateweek') {
- _usefulFields.push(item.field)
- _usefulFields.push(item.field + '1')
+ _usefulFields.push(key)
+ _usefulFields.push(key + '1')
} else if (item.type === 'datemonth') {
if (item.match === '=') {
- _usefulFields.push(item.field)
+ _usefulFields.push(key)
} else {
- _usefulFields.push(item.field)
- _usefulFields.push(item.field + '1')
+ _usefulFields.push(key)
+ _usefulFields.push(key + '1')
}
} else if (item.type === 'range') {
- _usefulFields.push(item.field)
- _usefulFields.push(item.field + '1')
+ _usefulFields.push(key)
+ _usefulFields.push(key + '1')
} else if (item.type === 'daterange') {
- let _skey = item.field
- let _ekey = item.field + '1'
+ let _skey = key
+ let _ekey = key + '1'
- if (/,/.test(item.field)) {
- _skey = item.field.split(',')[0]
- _ekey = item.field.split(',')[1]
+ if (/,/.test(key)) {
+ _skey = key.split(',')[0]
+ _ekey = key.split(',')[1]
}
_usefulFields.push(_skey)
_usefulFields.push(_ekey)
- } else if (item.type === 'date' && _usefulFields.includes(item.field)) {
- _usefulFields.push(item.field + '1')
+ } else if (item.type === 'date' && _usefulFields.includes(key)) {
+ _usefulFields.push(key + '1')
} else {
- _usefulFields.push(item.field)
+ _usefulFields.push(key)
}
})
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 414255a..e6eb0cf 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -690,7 +690,7 @@
} else if (item.type === 'range') {
let val = item.value.split(',')
- searchText.push('(' + item.key + ' >= ' + (val[0] || -999999) + ' AND ' + item.key + ' <= ' + (val[1] || 999999) + ')')
+ searchText.push('(' + item.key + ' >= ' + (val[0] || -999999) + ' AND ' + item.key + ' < ' + (val[1] || 999999) + ')')
} else {
searchText.push('(' + item.key + ' ' + item.match + ' \'' + item.value + '\')')
}
--
Gitblit v1.8.0