doway-coms 1.8.3 → 1.8.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -928,13 +928,13 @@ export default {
|
|
|
928
928
|
})
|
|
929
929
|
let arr = []
|
|
930
930
|
// 分为有参查询和无参查询
|
|
931
|
-
if (tempExp.expressions.length && fieldNames.length
|
|
931
|
+
if (tempExp.expressions.length && fieldNames.length >= 1) {
|
|
932
932
|
for (let j = 0; j < fieldNames.length; j++) {
|
|
933
933
|
let mapArr = tempArr.map(
|
|
934
934
|
(item) => item[fieldNames[j].linkField]
|
|
935
935
|
)
|
|
936
936
|
let setArr = new Set(mapArr)
|
|
937
|
-
if (setArr.size
|
|
937
|
+
if (setArr.size < mapArr.length) {
|
|
938
938
|
arr.push(true)
|
|
939
939
|
}
|
|
940
940
|
}
|
|
@@ -957,6 +957,18 @@ export default {
|
|
|
957
957
|
}
|
|
958
958
|
})
|
|
959
959
|
}
|
|
960
|
+
let repeatArr = []
|
|
961
|
+
for (let j = 0; j < fieldNames.length; j++) {
|
|
962
|
+
if (
|
|
963
|
+
this.row[fieldNames[j].linkField] ===
|
|
964
|
+
info[fieldNames[j].field]
|
|
965
|
+
) {
|
|
966
|
+
repeatArr.push(true)
|
|
967
|
+
}
|
|
968
|
+
}
|
|
969
|
+
if (repeatArr.length === fieldNames.length) {
|
|
970
|
+
info.sysRepeat = true
|
|
971
|
+
}
|
|
960
972
|
if (info.sysRepeat && this.contrasts.length) {
|
|
961
973
|
let flag = 0
|
|
962
974
|
info.sysRepeat = false
|