Merge branch 'dev/v1.0.88_yf' of jianyu/web into feature/v1.0.91

apps/bigmember_pc/src/composables/quick-monitor/component/QuickMonitor.vue

@@ -142,6 +142,7 @@ defineExpose({
       :destroy-on-close="true"
       :visible="dialogConfig.show"
       :title="dialogConfig.title"
+      @click.native.stop
     >
       <template #footer>
         <button

apps/bigmember_pc/src/composables/quick-monitor/use/ent.js

@@ -1,4 +1,4 @@
-import { computed, getCurrentInstance, ref } from 'vue'
+import { computed, getCurrentInstance, nextTick, ref } from 'vue'
 import { useMonitorModel, useMonitorTipDialog } from './base'
 import { useStore } from '@/store'
 import {
@@ -182,8 +182,10 @@ function useEntQuickMonitorModel({ type, id, source }, options) {
           }
         })
         echoGroup.value = followedGroupId.toString()
-        doOpenDialog('monitor-change-group', {
-          groupList: res.data?.groupUserArr || []
+        nextTick(() => {
+          doOpenDialog('monitor-change-group', {
+            groupList: res.data?.groupUserArr || []
+          })
         })
       }
     })
@@ -234,7 +236,9 @@ function useEntQuickMonitorModel({ type, id, source }, options) {
       await doFetchGroup({ type: 'get' })
         .then((res) => {
           if (res.success) {
-            doOpenDialog('monitor-group', { groupList: res.data })
+            nextTick(() => {
+              doOpenDialog('monitor-group', { groupList: res.data })
+            })
           }
           else {
             if (res.data?.limit_count) {

apps/bigmember_pc/src/views/ent-intel/EntIntel.vue

@@ -125,7 +125,7 @@ export default {
         if (type === 'add') {
           this.$toast('新增分组成功')
         } else if (type === 'put') {
-          this.$toast('修改分组成功')
+          this.$toast('分组名称修改成功')
         } else if (type === 'del') {
           this.$toast('删除分组成功')
           setTimeout(() => {