three-trees-ui 1.0.44 → 1.0.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-trees-ui",
-  "version": "1.0.44",
+  "version": "1.0.45",
   "publicPath": "/ui",
   "author": "hotent",
   "private": false,

package/packages/Table/src/Table.vue

@@ -460,14 +460,14 @@
       if (this.isLoadTable) {
         this.load()
       }
-      this.calcTableHeight()
+      this.calcTableHeight(300)
       this.$watch('showAdvancedSearch', (n, o) => {
         if (n !== o) {
           if (n) {
             this.quickSearchWord = null
           }
           // 显示或收起搜索面板时，重新计算表格高度
-          this.calcTableHeight(300)
+          this.calcTableHeight(800)
           this.$emit('advanced-show', n)
         }
       })
@@ -832,7 +832,8 @@
       initTablePanelHeight() {
         this.tablePanelHeight = this.$refs.tablePanel.$el.clientHeight
       },
-      calcTableHeight(delay) {
+      async calcTableHeight(delay) {
+        await this.$nextTick()
         // 动态计算表格的高度，自适应当前容器
         setTimeout(() => {
           const toolbarPanelHeight =

package/packages/TableSearchPanel/src/main.vue

@@ -44,6 +44,10 @@
           return value > 0 && value < 5
         },
       },
+      resetSearchLoad: {
+        type: Boolean,
+        default: false,
+      },
       labelWidth: {
         type: Number,
         default: 70,
@@ -133,6 +137,8 @@
         }
       },
       reset() {
+       
+        
         if (this.formModelExpression) {
           Object.keys(this.data[this.formModelExpression]).forEach((key) => {
             this.$set(
@@ -146,7 +152,12 @@
           vm.$emit('input-reset')
         })
         this.$nextTick(() => {
-          this.search()
+           if(this.resetSearchLoad){
+                this.$emit('resetSearch',this.resetSearchLoad);
+                return;
+           }else{
+              this.search()
+           }
         })
       },
     },

package/packages/TemplateForm/src/main.vue

@@ -145,7 +145,7 @@
       },
     },
     watch: {
-      templateKey: function(n, o) {
+      templateKey: function (n, o) {
         if (n && o && n != o) {
           this.init()
         }
@@ -201,9 +201,8 @@
       printDetail() {
         this.$refs.btnRegion.style.display = 'none'
         setTimeout(() => {
-          document.body.innerHTML = document.getElementsByClassName(
-            'custom-form'
-          )[0].innerHTML
+          document.body.innerHTML =
+            document.getElementsByClassName('custom-form')[0].innerHTML
           window.print()
           this.$refs.btnRegion.style.display = 'block'
           location.reload()
@@ -256,6 +255,9 @@
               .then((result) => {
                 if (result.state) {
                   if (this.closeSave) {
+                    if (this.isMobile) {
+                      this.$notify({ type: 'success', message: result.message })
+                    }
                     this.close()
                     return
                   }
@@ -286,7 +288,10 @@
                   this.disabled = false
                 }
               })
-              .catch(() => {
+              .catch((err) => {
+                if (this.isMobile) {
+                  this.$notify.error(err)
+                }
                 this.disabled = false
               })
           })