doway-coms 1.6.23 → 1.6.25

package/package.json

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

package/packages/BasePulldown/src/index.vue

@@ -47,7 +47,7 @@
           </ValidationProvider>
         </template>
         <template #dropdown>
-          <div class="pulldown-grid interceptor-class" >
+          <div class="pulldown-grid interceptor-class">
             <vxe-grid
               size="mini"
               border
@@ -88,37 +88,43 @@
                   </div>
                 </div>
               </template>
-<!--              普通输入框的过滤筛选-->
+              <!--              普通输入框的过滤筛选-->
               <template #text_filter="{ column }">
                 <div class="interceptor-class">
-                  <div
-                      v-for="(item, $index) in column.filters"
-                      :key="$index"
-                    >
-                  <a-input allowClear v-model="item.data" @keyup.enter.native="filterConfirm(column)" style="margin-bottom: 5px;" />
+                  <div v-for="(item, $index) in column.filters" :key="$index">
+                    <a-input
+                      allowClear
+                      v-model="item.data"
+                      @keyup.enter.native="filterConfirm(column)"
+                      style="margin-bottom: 5px"
+                    />
                   </div>
                   <a-button @click="filterAddExp(column)">添加条件</a-button>
                   <a-button @click="filterConfirm(column)">确认</a-button>
                 </div>
               </template>
-<!--              选择筛选框-->
+              <!--              选择筛选框-->
               <template #select_filter="{ column }">
                 <div class="interceptor-class">
                   <a-checkbox-group
                     v-model="column.filters[0].data"
                     @keyup.enter.native="filterConfirm(column)"
                   >
-                    <div style="max-height:200px;overflow-y:scroll">
-                      <div style="text-align:left;" v-for="loopSource in column.params.dataSource" :key="loopSource.value">
+                    <div style="max-height: 200px; overflow-y: scroll">
+                      <div
+                        style="text-align: left"
+                        v-for="loopSource in column.params.dataSource"
+                        :key="loopSource.value"
+                      >
                         <a-checkbox
                           :value="loopSource.value"
-                          style="margin: 5px 0;"
-                        >{{ loopSource.caption }}
+                          style="margin: 5px 0"
+                          >{{ loopSource.caption }}
                         </a-checkbox>
                       </div>
                     </div>
                   </a-checkbox-group>
-                  <br>
+                  <br />
                   <a-button @click="filterConfirm(column)">确认</a-button>
                 </div>
               </template>
@@ -194,7 +200,7 @@ import XEUtils from "xe-utils";
 import { sysRowState, sysFormState, controlType } from "../../utils/enum";
 import { replaceParamString, replaceParam } from "../../utils/common";
 import request from "../../utils/request";
-import {Input, Button, Row, Col, Checkbox} from "ant-design-vue";
+import { Input, Button, Row, Col, Checkbox } from "ant-design-vue";
 import { ValidationProvider } from "vee-validate";
 import { Pulldown } from "vxe-table";
 import { Tooltip } from "ant-design-vue";
@@ -228,9 +234,9 @@ export default {
       sorts: [],
       defaultSort: [],
       filterExpression: {
-        operator: 'and',
-        expressions: []
-      }
+        operator: "and",
+        expressions: [],
+      },
     };
   },
   props: {
@@ -430,39 +436,39 @@ export default {
       if (this.columns[i].isCheckbox === true) {
         this.columns[i]["type"] = "checkbox";
       }
-      if(!this.columns[i].controlType) {
-        this.columns[i].controlType = 'text'
+      if (!this.columns[i].controlType) {
+        this.columns[i].controlType = "text";
       }
       // 设置字段的过滤插槽
-      if(this.columns[i].filter) {
+      if (this.columns[i].filter) {
         this.columns[i]["filterMultiple"] = false;
 
-        switch(this.columns[i].controlType) {
-          case 'checkbox':
-            this.columns[i]['slots'] = {
-              filter: `checkbox_filter`
-            }
-            break
-          case 'select':
-            this.columns[i]['slots'] = {
-              filter: `select_filter`
-            }
-            this.columns[i]['filters'] = [
+        switch (this.columns[i].controlType) {
+          case "checkbox":
+            this.columns[i]["slots"] = {
+              filter: `checkbox_filter`,
+            };
+            break;
+          case "select":
+            this.columns[i]["slots"] = {
+              filter: `select_filter`,
+            };
+            this.columns[i]["filters"] = [
               {
-                data: []
-              }
-            ]
-            break
+                data: [],
+              },
+            ];
+            break;
           default:
-            this.columns[i]['slots'] = {
-              filter: `text_filter`
-            }
-            this.columns[i]['filters'] = [
+            this.columns[i]["slots"] = {
+              filter: `text_filter`,
+            };
+            this.columns[i]["filters"] = [
               {
-                data: ''
-              }
-            ]
-            break
+                data: "",
+              },
+            ];
+            break;
         }
       }
       // 默认排序
@@ -542,7 +548,7 @@ export default {
     inputClickEvent(event) {
       if (this.$refs.pulldownRef.isPanelVisible() === false) {
         this.$refs.pulldownRef.showPanel();
-        this.clearColumnFilter()
+        this.clearColumnFilter();
         this.searchData();
       } else {
         this.$refs.pulldownRef.hidePanel();
@@ -765,9 +771,9 @@ export default {
       if (this.isOld === true) {
         tempExp = "";
       }
-      if(this.filterExpression.expressions.length > 0) {
-        tempExp.expressions.push(this.filterExpression)
-      }else if (this.currentValue) {
+      if (this.filterExpression.expressions.length > 0) {
+        tempExp.expressions.push(this.filterExpression);
+      } else if (this.currentValue) {
         for (let i = 0; i < this.filterCols.length; i++) {
           if (this.isOld === true) {
             tempExp =
@@ -867,7 +873,7 @@ export default {
             vm.gridPagerConfig.total = responseData.extData.totalRows;
           } else {
             vm.searchRows = responseData.content;
-            vm.$refs.pupupGridView.loadData(vm.searchRows)
+            vm.$refs.pupupGridView.loadData(vm.searchRows);
             vm.gridPagerConfig.total = responseData.otherContent.totalRows;
           }
           if (repeatRowInfo.field) {
@@ -887,7 +893,7 @@ export default {
           }
           // 若当前表格内只有一行，则不进行判断
           if (vm.propTableData.length == 1) {
-            return
+            return;
           }
           // 设置字段sysRepeat后，所定字段的值全部相同则不可选择
           let fieldNames = vm.columns
@@ -898,23 +904,36 @@ export default {
                 linkField: y.linkField,
               };
             });
-            if (fieldNames.length) {
+          if (fieldNames.length) {
             vm.searchRows.forEach((info) => {
+              // 当一次创建多行时，过滤需特定字段不可为空的
+              // 获取数组对象，根据选定字段，过滤选定字段都为空的
+              let tempArr = vm.propTableData.filter((currentInfo) => {
+                let tempD = [];
+                fieldNames.forEach((z) => {
+                  // 字段的值若为null、undefined，记录过滤掉
+                  if (!currentInfo[z.linkField]) {
+                    tempD.push(true);
+                  }
+                });
+                return tempD.length !== fieldNames.length;
+              });
               // 分为有参查询和无参查询
-              if (tempExp.expressions.length) {
-                let arr = []
+              if (tempExp.expressions.length && fieldNames.length == 1) {
                 for (let j = 0; j < fieldNames.length; j++) {
-                  let mapArr = vm.propTableData.map(item => item[fieldNames[j].linkField])
-                  let setArr = new Set(mapArr)
+                  let mapArr = tempArr.map(
+                    (item) => item[fieldNames[j].linkField]
+                  );
+                  let setArr = new Set(mapArr);
                   if (setArr.size < mapArr.length) {
-                    arr.push(true)
+                    arr.push(true);
                   }
                 }
                 if (fieldNames.length === arr.length) {
                   info.sysRepeat = true;
                 }
               } else {
-                vm.propTableData.forEach((item) => {
+                tempArr.forEach((item) => {
                   // 接口字段可能和表字段field不一致，linkField一致
                   let arr = [];
                   for (let j = 0; j < fieldNames.length; j++) {
@@ -927,7 +946,7 @@ export default {
                   if (fieldNames.length === arr.length) {
                     info.sysRepeat = true;
                   }
-                })
+                });
               }
             })
           }
@@ -966,126 +985,127 @@ export default {
     },
 
     // 下拉容器筛选条件被触发
-    filterVisible({column}) {
-      XEUtils.remove(column.filters, item => {
-        return item.data === ''
-      })
-      if(column.filters.length === 0) {
+    filterVisible({ column }) {
+      XEUtils.remove(column.filters, (item) => {
+        return item.data === "";
+      });
+      if (column.filters.length === 0) {
         column.filters.push({
-          data: ''
-        })
+          data: "",
+        });
       }
     },
     filterConfirm(column) {
-      let vm = this
+      let vm = this;
       this.filterExpression = {
-        operator: 'and',
-        expressions: []
-      }
-      let col= this.columns.find(x=>x.field === column.field)
-      switch(col.controlType) {
-        case 'select':
-          column.filters[0].checked =
-            column.filters[0].data.length > 0
+        operator: "and",
+        expressions: [],
+      };
+      let col = this.columns.find((x) => x.field === column.field);
+      switch (col.controlType) {
+        case "select":
+          column.filters[0].checked = column.filters[0].data.length > 0;
           break;
         default:
-          column.filters[0].checked =
-            column.filters[0].data !== ''
+          column.filters[0].checked = column.filters[0].data !== "";
           break;
       }
-        //通知外部筛选改变事件
-      let columns = this.$refs.pupupGridView.getTableColumn().collectColumn
-      XEUtils.each(columns, item => {
+      //通知外部筛选改变事件
+      let columns = this.$refs.pupupGridView.getTableColumn().collectColumn;
+      XEUtils.each(columns, (item) => {
         let filterExpression = {
-          operator: 'or',
-          expressions: []
-        }
-        if(!col.controlType) {
-          col.controlType = 'text'
+          operator: "or",
+          expressions: [],
+        };
+        if (!col.controlType) {
+          col.controlType = "text";
         }
         switch (col.controlType) {
-          case 'select':
-            if(item.filters && item.filters[0].checked) {
-              XEUtils.each(item.filters[0].data, loopItem => {
-                  filterExpression.expressions.push({
-                    field: item.field,
-                    operator: "EQ",
-                    value: loopItem
-                  })
-              })
-              if(filterExpression.expressions.length > 0) {
-                vm.filterExpression.expressions.push(filterExpression)
+          case "select":
+            if (item.filters && item.filters[0].checked) {
+              XEUtils.each(item.filters[0].data, (loopItem) => {
+                filterExpression.expressions.push({
+                  field: item.field,
+                  operator: "EQ",
+                  value: loopItem,
+                });
+              });
+              if (filterExpression.expressions.length > 0) {
+                vm.filterExpression.expressions.push(filterExpression);
               }
             }
-            break
+            break;
           default:
-            if(item.filters && item.filters[0].checked) {
-              XEUtils.each(item.filters, loopItem => {
-                if(loopItem.data) {
+            if (item.filters && item.filters[0].checked) {
+              XEUtils.each(item.filters, (loopItem) => {
+                if (loopItem.data) {
                   filterExpression.expressions.push({
                     field: item.field,
                     operator: "CO",
-                    value: loopItem.data
-                  })
+                    value: loopItem.data,
+                  });
                 }
-              })
-              if(filterExpression.expressions.length > 0) {
-                vm.filterExpression.expressions.push(filterExpression)
+              });
+              if (filterExpression.expressions.length > 0) {
+                vm.filterExpression.expressions.push(filterExpression);
               }
             }
-            break
+            break;
         }
-      })
-      this.gridPagerConfig.currentPage = 1
-      this.searchData()
-      this.$refs.pupupGridView.closeFilter()
+      });
+      this.gridPagerConfig.currentPage = 1;
+      this.searchData();
+      this.$refs.pupupGridView.closeFilter();
     },
-        // 添加筛选条件
+    // 添加筛选条件
     filterAddExp(column) {
-      column['filters'].push({
-        data: ''
-      })
+      column["filters"].push({
+        data: "",
+      });
     },
 
-  //   清除筛选条件
+    //   清除筛选条件
     clearColumnFilter() {
-      let columns = []
-      let vm = this
+      let columns = [];
+      let vm = this;
       try {
-        columns = this.$refs.pupupGridView.getTableColumn().collectColumn
-      }catch (err) {
-        console.debug(err)
+        columns = this.$refs.pupupGridView.getTableColumn().collectColumn;
+      } catch (err) {
+        console.debug(err);
       }
-        XEUtils.each(columns, item => {
-          let col= vm.columns.find(x=>x.field === item.field)
-          if(!col) {
-            return
-          }
-          if(!col.controlType) {
-            col.controlType = 'text'
-          }
-          switch(col.controlType) {
-            case 'select':
-              if(item.filters && item.filters[0].checked) {
-                item.filters = [{
-                  data: []
-                }]
-              }
-              break;
-            default:
-              if(item.filters && item.filters[0].checked) {
-                item.filters = [{
-                  data: ''
-                }]
-              }
-              break;
-          }
-
-        })
-        this.filterExpression = {
-          operator: 'and',
-          expressions: []
+      XEUtils.each(columns, (item) => {
+        let col = vm.columns.find((x) => x.field === item.field);
+        if (!col) {
+          return;
+        }
+        if (!col.controlType) {
+          col.controlType = "text";
+        }
+        switch (col.controlType) {
+          case "select":
+            if (item.filters && item.filters[0].checked) {
+              item.filters = [
+                {
+                  data: [],
+                },
+              ];
+            }
+            break;
+          default:
+            if (item.filters && item.filters[0].checked) {
+              item.filters = [
+                {
+                  data: "",
+                },
+              ];
+            }
+            break;
         }
+      });
+      this.filterExpression = {
+        operator: "and",
+        expressions: [],
+      };
     },
   },
 };
@@ -1103,12 +1123,12 @@ export default {
 .d-grid-control {
   height: 30px;
 }
-  .interceptor-class {
-    padding: 10px;
-    ::v-deep .ant-btn {
-      margin: 10px 10px 0;
-    }
+.interceptor-class {
+  padding: 10px;
+  ::v-deep .ant-btn {
+    margin: 10px 10px 0;
   }
+}
 </style>
 
 

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,

package/packages/utils/store.js

@@ -163,12 +163,6 @@ export default new Vuex.Store({
         SET_IDENTITY_URL:(state,url) => {
           state.identityUrl = url
         },
-        SET_PUR_SCH_DEFAULT_START_TIME:(state,purSchDefaultStartTime)=>{
-          state.purSchDefaultStartTime = purSchDefaultStartTime
-        },
-        SET_PUR_SCH_DEFAULT_CLOSING_TIME:(state,purSchDefaultClosingTime)=>{
-          state.purSchDefaultClosingTime = purSchDefaultClosingTime
-        },
       },
       actions: {
         /**