From 13fcf5880bd38bafe92f0b4a3ede7fd7d5e2448b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 03 四月 2024 17:54:16 +0800
Subject: [PATCH] 2024-04-03
---
src/menu/components/table/edit-table/options.jsx | 2 +-
src/tabviews/zshare/topSearch/index.jsx | 6 +++---
src/utils/utils-custom.js | 8 ++++----
src/utils/utils.js | 10 +++++-----
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/menu/components/table/edit-table/options.jsx b/src/menu/components/table/edit-table/options.jsx
index 1ce116a..f3e8d31 100644
--- a/src/menu/components/table/edit-table/options.jsx
+++ b/src/menu/components/table/edit-table/options.jsx
@@ -129,7 +129,7 @@
{value: 'default', label: '澶�'},
{value: 'middle', label: '涓�'},
{value: 'small', label: '灏�'},
- {value: 'mini', label: '杩蜂綘'},
+ // {value: 'mini', label: '杩蜂綘'},
]
},
{
diff --git a/src/tabviews/zshare/topSearch/index.jsx b/src/tabviews/zshare/topSearch/index.jsx
index 355e75a..8e82f35 100644
--- a/src/tabviews/zshare/topSearch/index.jsx
+++ b/src/tabviews/zshare/topSearch/index.jsx
@@ -601,11 +601,11 @@
}
if (item.linkField) {
- _item.ParentID = cell[item.linkField]
+ _item.ParentID = cell[item.linkField] + ''
}
if (item.type !== 'checkcard') {
- _item.Value = cell[item.valueField]
+ _item.Value = cell[item.valueField] + ''
_item.Text = cell[item.valueText] + ''
if (map.has(_item.ParentID + _item.Value)) return
@@ -620,7 +620,7 @@
map.set(_item.ParentID + _item.Value, 0)
} else {
- _item.$value = cell[item.cardValField]
+ _item.$value = cell[item.cardValField] + ''
_item = {..._item, ...cell}
if (item.urlField) {
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 9390ede..209bc75 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -1009,7 +1009,7 @@
} else if (item.type === 'daterange') {
value = '1949-10-01 00:00:00.000,1949-10-02 00:00:00.000'
} else if (item.type === 'range') {
- value = item.initval || `${item.minValue || '-999999'},${item.maxValue || '999999'}`
+ value = item.initval || `${item.minValue || '-999999999'},${item.maxValue || '999999999'}`
} else if (item.type === 'multiselect' || (item.type === 'checkcard' && item.multiple === 'true')) {
type = 'multi'
}
@@ -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] || -999999999) + ' AND ' + item.key + ' <= ' + (val[1] || 999999999) + ')')
} else if (item.type === 'datemonth') {
if (item.match === '=') {
searchText.push('(' + item.key + ' = \'' + item.value + '\')')
@@ -1122,10 +1122,10 @@
let val = item.value.split(',')
options.push({
reg: new RegExp('@' + item.key + '@', 'ig'),
- value: `${val[0] || -999999}`
+ value: `${val[0] || -999999999}`
}, {
reg: new RegExp('@' + item.key + '1@', 'ig'),
- value: `${val[1] || 999999}`
+ value: `${val[1] || 999999999}`
})
} else if (item.type === 'datemonth') {
if (item.match === '=') {
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 39f1c5d..c46bc39 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -554,8 +554,8 @@
} else if (item.type === 'range') {
let val = item.value.split(',')
- newsearches[item.key] = val[0] || -999999
- newsearches[item.key + '1'] = val[1] || 999999
+ newsearches[item.key] = val[0] || -999999999
+ newsearches[item.key + '1'] = val[1] || 999999999
} else if (item.type === 'dateweek') {
let _startval = ''
let _endval = ''
@@ -703,7 +703,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] || -999999999) + ' AND ' + item.key + ' <= ' + (val[1] || 999999999) + ')')
} else {
searchText.push('(' + item.key + ' ' + item.match + ' \'' + item.value + '\')')
}
@@ -779,9 +779,9 @@
let copy = JSON.parse(JSON.stringify(item))
copy.key = copy.key + '1'
- copy.value = val[1] || 999999
+ copy.value = val[1] || 999999999
- item.value = val[0] || -999999
+ item.value = val[0] || -999999999
options.push(item)
options.push(copy)
--
Gitblit v1.8.0