doway-coms 1.8.2 → 1.8.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "1.8.2",
+  "version": "1.8.4",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",

package/packages/BasePulldown/src/index.vue

@@ -926,8 +926,9 @@ export default {
                 })
                 return tempD.length !== fieldNames.length
               })
+              let arr = []
               // 分为有参查询和无参查询
-              if (tempExp.expressions.length && fieldNames.length == 1) {
+              if (tempExp.expressions.length && fieldNames.length >= 1) {
                 for (let j = 0; j < fieldNames.length; j++) {
                   let mapArr = tempArr.map(
                     (item) => item[fieldNames[j].linkField]
@@ -943,7 +944,7 @@ export default {
               } else {
                 tempArr.forEach((item) => {
                   // 接口字段可能和表字段field不一致，linkField一致
-                  let arr = []
+
                   for (let j = 0; j < fieldNames.length; j++) {
                     if (
                       info[fieldNames[j].field] == item[fieldNames[j].linkField]
@@ -956,13 +957,28 @@ export default {
                   }
                 })
               }
+              let repeatArr = []
+              for (let j = 0; j < fieldNames.length; j++) {
+                if (
+                  this.row[fieldNames[j].linkField] ===
+                  info[fieldNames[j].field]
+                ) {
+                  repeatArr.push(true)
+                }
+              }
+              if (repeatArr.length === fieldNames.length) {
+                info.sysRepeat = true
+              }
               if (info.sysRepeat && this.contrasts.length) {
                 let flag = 0
                 info.sysRepeat = false
                 XEUtils.arrayEach(this.propTableData, (item) => {
                   if (item[this.field] === info[this.field]) {
                     XEUtils.arrayEach(this.contrasts, (loop) => {
-                      if (item[loop] === this.row[loop]  && item.id !== this.row.id) {
+                      if (
+                        item[loop] === this.row[loop] &&
+                        item.id !== this.row.id
+                      ) {
                         flag++
                       }
                     })