doway-coms 2.2.4 → 2.2.6

package/package.json

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

package/packages/BaseGrid/src/index.vue

@@ -393,7 +393,6 @@
           </a-col>
         </a-row>
       </template>
-
       <!-- 筛选过滤 -->
       <template #text_filter="scope">
         <div class="interceptor-class">
@@ -1218,6 +1217,10 @@ export default {
     })
   },
   methods: {
+    // 关闭所有展开行
+    closeAllExpand() {
+      this.$refs.baseGrid.clearRowExpand()
+    },
     tagChange() {
       if (!this.$refs.tagView) return
       this.tagHeight = this.$refs.tagView.offsetHeight
@@ -2015,17 +2018,17 @@ export default {
         XEUtils.arrayEach(sortList, (loopSort) => {
           tempSortList.push([loopSort.field, loopSort.order])
         })
-        this.$emit('sortChange', tempSortList)
+        this.$emit('sortChange', tempSortList, this.filterExpression)
       }
     },
     currentChange(scope) {
       this.$emit('currentChange', scope.row)
     },
     pageSizeChange(page, pageSize) {
-      this.$emit('pageSizeChange', page, pageSize)
+      this.$emit('pageSizeChange', page, pageSize, this.filterExpression)
     },
     pageChange(page, pageSize) {
-      this.$emit('pageChange', page, pageSize)
+      this.$emit('pageChange', page, pageSize, this.filterExpression)
     },
     getCheckboxRecords() {
       return this.$refs.baseGrid.getCheckboxRecords(true)
@@ -2908,7 +2911,7 @@ export default {
         //设置筛选过滤条件
         this.setFilterExpression()
         //通知外部筛选改变事件
-        this.$emit('filterChange', { filterCol: colInfo })
+        this.$emit('filterChange', { filterCol: colInfo }, this.filterExpression)
       } else {
         // 手动触发重新筛选filterMethod()方法
         this.$refs.baseGrid.updateData()
@@ -3069,6 +3072,8 @@ export default {
       this.toolBarConfig.enabled = this.filterExpression.length > 0
     },
     filterVisible({ column, visible }) {
+      // 筛选前关闭所有展开行
+      this.closeAllExpand()
       if (visible) {
         //重新赋值过滤的显示值
         column.filters[0].data.displayValues = []

package/packages/utils/filters.js

@@ -463,6 +463,9 @@ export function gridDefaultValueDisplay(rowInfo,colInfo){
       if(colInfo.params.doRound){
         displayValue=XEUtils.round(displayValue,colInfo.params.precision)
       }
+      if(colInfo.params.percent){
+        displayValue=XEUtils.round(displayValue*100,colInfo.params.precision)+'%'
+      }
       break
 
   }