Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

jero-web/src/components/libraryAddForm/index.vue

@@ -332,7 +332,12 @@
               if (res.success) {
                 this.confirmLoading = false
                 this.$message.success(this.$t('OperationSuccessful'))
-                eventBUs.$emit('searchReset')
+                if (this.formInline.id) {
+                  eventBUs.$emit('searchGetData')
+                } else {
+                  eventBUs.$emit('searchReset')
+                }
+
                 this.$emit('addFormClick')
               } else {
                 this.confirmLoading = false

jero-web/src/components/libraryPush/index.vue

@@ -115,7 +115,7 @@
             this.visible = false
             this.visibleTree = false
             this.$emit('clearSelected')
-            eventBUs.$emit('searchReset')
+            eventBUs.$emit('searchGetData')
           } else {
             this.$message.warning(this.$t('operationFailed'))
           }
@@ -188,7 +188,7 @@
   .drawer-bootom-button {
     position: absolute;
     bottom: 0;
-    z-index:100;
+    z-index: 100;
     width: 100%;
     border-top: 1px solid #e8e8e8;
     padding: 10px 16px;