From aebfe9b957afbf36f45108eebc127ec9e8fe1d0c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 15 十月 2024 10:19:47 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/utils/utils.js | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index d63640a..cc69ca5 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -71,6 +71,7 @@
uuid.push(_options.substr(Math.floor(Math.random() * 0x20), 1))
}
uuid = timestamp + uuid.join('')
+ uuid = uuid.replace(/minke/ig, 'mnkie')
return uuid
}
@@ -416,7 +417,11 @@
item.$first = true
}
}
-
+
+ if (window.backend && ['select', 'link', 'multiselect', 'checkcard', 'radio'].includes(item.type) && item.resourceType === '1') {
+ item.uuid = md5(config.uuid + item.uuid)
+ }
+
item.oriInitval = item.initval
if (values) {
@@ -714,6 +719,15 @@
static getSearchkeys (searches) {
let searchText = []
+ let matchs = {
+ 'like': '01',
+ 'not like': '02',
+ '=': '03',
+ '>': '04',
+ '<': '05',
+ '>=': '06',
+ '<=': '07',
+ }
searches.forEach(item => {
if (item.forbid || !item.value) return
@@ -834,12 +848,12 @@
searchText.push({
key: item.key,
match: '>=',
- type: 'number',
+ type: 'text',
value: val[0] || -999999999
}, {
key: item.key,
match: '<=',
- type: 'number',
+ type: 'text',
value: val[1] || 999999999
})
} else {
@@ -847,6 +861,10 @@
}
})
+ searchText.forEach(item => {
+ item.match = matchs[item.match] || '01'
+ })
+
return searchText
}
--
Gitblit v1.8.0