doway-coms 1.6.22 → 1.6.24

package/package.json

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

package/packages/BasePulldown/src/index.vue

@@ -898,23 +898,38 @@ export default {
                 linkField: y.linkField,
               };
             });
-          if (fieldNames.length) {
+            if (fieldNames.length) {
             vm.searchRows.forEach((info) => {
-              vm.propTableData.forEach((item) => {
-                // 接口字段可能和表字段field不一致，linkField一致
-                let arr = [];
+              // 分为有参查询和无参查询
+              if (tempExp.expressions.length) {
+                let arr = []
                 for (let j = 0; j < fieldNames.length; j++) {
-                  if (
-                    info[fieldNames[j].field] == item[fieldNames[j].linkField]
-                  ) {
-                    arr.push(true);
+                  let mapArr = vm.propTableData.map(item => item[fieldNames[j].linkField])
+                  let setArr = new Set(mapArr)
+                  if (setArr.size < mapArr.length) {
+                    arr.push(true)
                   }
                 }
                 if (fieldNames.length === arr.length) {
                   info.sysRepeat = true;
                 }
-              });
-            });
+              } else {
+                vm.propTableData.forEach((item) => {
+                  // 接口字段可能和表字段field不一致，linkField一致
+                  let arr = [];
+                  for (let j = 0; j < fieldNames.length; j++) {
+                    if (
+                      info[fieldNames[j].field] == item[fieldNames[j].linkField]
+                    ) {
+                      arr.push(true);
+                    }
+                  }
+                  if (fieldNames.length === arr.length) {
+                    info.sysRepeat = true;
+                  }
+                })
+              }
+            })
           }
         })
         .catch((error) => {

package/packages/utils/common.js

@@ -542,7 +542,13 @@ export function getExportParams(columns) {
   return tempParams
 }
 export function setFormButtons(toolBtns,statusBtns,permissionBtns){
-  XEUtils.arrayEach(permissionBtns,loopBtn=>{
+  // 将获取的数据进行排序
+  let tempSortArr = permissionBtns.sort(function(a,b){
+    a.sort = a.sort?a.sort:1
+    b.sort = b.sort?b.sort:1
+    return a.sort-b.sort
+  })
+  XEUtils.arrayEach(tempSortArr,loopBtn=>{
       let pushBtn = {
         code: loopBtn.code,
         caption: loopBtn.name,