doway-coms 2.11.49 → 2.11.52

package/package.json

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

package/packages/BaseGrid/src/index.vue

@@ -3511,7 +3511,7 @@ export default {
           colInfo.params.controlType === controlType.select ||
           colInfo.params.controlType === controlType.checkbox
         ) {
-          colInfo.filters[0].data.bindingValues.push(item)
+          colInfo.filters[0].data.bindingValues.push(XEUtils.clone(item,true))
           this.$set(
             col.filters[0].data,
             'bindingValues',
@@ -3524,7 +3524,7 @@ export default {
             item.value[0] === 0 ||
             item.value[1] === 0
           ) {
-            colInfo.filters[0].data.bindingValues.push(item)
+            colInfo.filters[0].data.bindingValues.push(XEUtils.clone(item,true))
             this.$set(
               col.filters[0].data,
               'bindingValues',
@@ -3725,29 +3725,32 @@ export default {
     filterVisible({ column, visible }) {
       // 筛选前关闭所有展开行
       this.closeAllExpand()
-      if (visible) {
-        if(column.filters[0].data ==undefined){
-          column.filters[0]={
-            data:{
-              displayValues:[],
-              bindingValues:[]
-            }
+      //重新设置绑定值
+      if(column.filters[0].data ==undefined){
+        column.filters[0]={
+          data:{
+            displayValues:[],
+            bindingValues:[]
           }
         }
-        //重新赋值过滤的显示值
-        column.filters[0].data.displayValues = []
-        column.filters[0].data.displayValueSearchText = ''
-        XEUtils.arrayEach(column.filters[0].data.bindingValues, (item) => {
-          column.filters[0].data.displayValues.push(item)
+      }
+      //重新赋值过滤的显示值
+      column.filters[0].data.displayValues = []
+      column.filters[0].data.displayValueSearchText = ''
+      XEUtils.arrayEach(column.filters[0].data.bindingValues, (item) => {
+        column.filters[0].data.displayValues.push(XEUtils.clone(item,true))
+      })
+      if (
+        column.params.controlType !== controlType.select &&
+        column.params.controlType !== controlType.multiSelect
+      ) {
+        column.filters[0].data.displayValues.push({
+          value: [null, null],
         })
-        if (
-          column.params.controlType !== controlType.select &&
-          column.params.controlType !== controlType.multiSelect
-        ) {
-          column.filters[0].data.displayValues.push({
-            value: [null, null],
-          })
-        }
+      }
+
+
+      if (visible) {
         //设置第一个输入框光标选中
         let tempClassName = column.field + '_filter_0'
         setTimeout(() => {
@@ -3932,7 +3935,7 @@ export default {
         ) {
           // 复选清空筛选初始数据过滤
           if (!item.value) {
-            colInfo.filters[0].data.bindingValues.push(item)
+            colInfo.filters[0].data.bindingValues.push(XEUtils.clone(item,true))
           }
         } else {
           if (
@@ -3941,7 +3944,7 @@ export default {
             item.value[0] === 0 ||
             item.value[1] === 0
           ) {
-            colInfo.filters[0].data.bindingValues.push(item)
+            colInfo.filters[0].data.bindingValues.push(XEUtils.clone(item,true))
           }
         }
       })

package/packages/HistoryModal/src/index.vue

@@ -8,7 +8,7 @@
         :mask="true"
         :lock-view="true"
         :lock-scroll="true"
-        :zIndex="1000000"
+        :zIndex="1000"
         :resize="true"
         :position="{top: '5%',left: '5%'}"
         @close="handleClose"
@@ -133,6 +133,7 @@ export default {
       this.$nextTick(() => {
         // 设置表格高度，减去头部和边距
         this.gridHeight = this.$refs.gridContent.offsetHeight - 20
+        this.$refs.gridView.reloadColumn(this.innerColumns)
       })
     },
     handleClose() {

package/packages/styles/hps/default.less

@@ -64,5 +64,5 @@
   border-top-right-radius:8px;
 }
 .ant-tabs-nav .ant-tabs-tab{
-  padding: 4px 16px!important;
+  padding: 5px 16px!important;
 }