Merge branch 'develop-zhouyi' into 'develop'

fix: 组件注销问题

See merge request GFP/RBC/rbc-frontend!144

develop/@gms/gms-plugin-billexpand/src/control/approval-user-control/approval-user-control.vue

@@ -193,9 +193,9 @@ export default {
     window.GMS.vbus.$on('approval-user-control-add', this.handleAdd)
     this.getSuggestionOptions()
   },
-  beforeUnmount() {
-    window.GMS.vbus.$off('approval-user-control-edit')
-    window.GMS.vbus.$off('approval-user-control-add')
+  beforeDestroy() {
+    window.GMS.vbus.$off('approval-user-control-edit', this.openEditModal)
+    window.GMS.vbus.$off('approval-user-control-add', this.handleAdd)
   },
   methods: {
     showDeletePopover(suggestion) {

develop/@gms/gms-plugin-billexpand/src/control/baseDataSelect/edit-modal.vue

@@ -138,7 +138,7 @@ export default {
     }
     this.$refs.modal.$el.addEventListener('click', this.stopPropagation)
   },
-  beforeUnmount() {
+  beforeDestroy() {
     this.$refs.modal.$el.removeeventlistener('click', this.stopPropagation)
   },
   methods: {

develop/@gms/gms-plugin-mainpage-workflowcard/src/views/gms-app.vue

@@ -42,18 +42,19 @@ export default {
 		}
   },
   mounted() {
-    window.GMS.vbus.$on('widgetPluginPropertiesChange', (val) => {
-      if (!val.id || val.id != this.itemSetting.type + this.itemSetting.id) return
-      val = val.properties || []
-      this.reimburseList = this.mapProperties(val)
-    })
+    window.GMS.vbus.$on('widgetPluginPropertiesChange', this.widgetPluginPropertiesChange)
     this.$root.$on('updated', this.refresh)
   },
-  beforeUnmount() {
+  beforeDestroy() {
     this.$root.$off('updated', this.refresh)
-    window.GMS.vbus.$off('widgetPluginPropertiesChange')
+    window.GMS.vbus.$off('widgetPluginPropertiesChange', this.widgetPluginPropertiesChange)
   },
 	methods: {
+    widgetPluginPropertiesChange(val) {
+      if (!val.id || val.id != this.itemSetting.type + this.itemSetting.id) return
+      val = val.properties || []
+      this.reimburseList = this.mapProperties(val)
+    },
     refresh(visible) {
       if (visible == 'show') {
         const list = [...this.reimburseList]

develop/@rbc/bill-runner-query/src/views/query-runner.vue

@@ -44,7 +44,7 @@ export default {
     }
     this.$root.$on('updated', this.refresh)
   },
-  beforeUnmount() {
+  beforeDestroy() {
     this.$root.$off('updated', this.refresh)
   },
   methods: {

develop/@rbc/workflow-job-view/src/app.vue

@@ -110,7 +110,7 @@ export default {
     window.GMS.vbus.$on('refresh-workflow-job-view', this.handleSearch)
     this.$root.$on('updated', this.handleSearch)
   },
-  beforeUnmount() {
+  beforeDestroy() {
     window.GMS.vbus.$off('refresh-workflow-job-view', this.handleSearch)
     this.$root.$off('updated', this.handleSearch)
   },