meixioacomponent 0.3.86 → 0.3.87

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meixioacomponent",
-  "version": "0.3.86",
+  "version": "0.3.87",
   "private": false,
   "author": "YuRi",
   "main": "lib/meixioacomponent.umd.min.js",

package/packages/components/base/baseDialog/index.vue

@@ -195,10 +195,15 @@ export default {
       })
     },
     closeDialog() {
-      this.isShow = false
-      this.$nextTick(() => {
-        this.$destroy()
-      })
+      const { isDestroy } = this.$props
+      if (isDestroy) {
+        this.isShow = false
+        this.$nextTick(() => {
+          this.$destroy()
+        })
+      } else {
+        this.centerDialogVisible = false
+      }
     },
     iconClick() {
       this.closeDialog()

package/packages/components/proPageTable/oa_pro_table.vue

@@ -184,6 +184,7 @@
       ref="dialog"
       :width="`1000px`"
       :title="`高级筛选`"
+    
       :modal="proScreenModel"
       :modallAppendToBody="false"
     >
@@ -226,7 +227,6 @@ import baseButtonHandle from '../base/baseButtonHandle/baseButtonHandle.vue' //
 
 //
 import componentConfig from '../../config/componentConfig'
-import { isatty } from 'tty'
 let canPush = true
 export default {
   name: 'baseProTable',
@@ -879,10 +879,9 @@ export default {
     background: inherit;
     .header-extend {
       display: flex;
+      align-items: center;
       flex-flow: row nowrap;
       justify-content: flex-start;
-      align-items: center;
-      margin-right: var(--margin-5);
     }
   }
   .table-suffix {