From 8fd5a21fcc66106bd14f445b567d44bb22178b9c Mon Sep 17 00:00:00 2001
From: chenxing <chenxing@yunhaixingtong.com>
Date: Tue, 18 Aug 2026 00:04:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81/=E6=93=8D=E4=BD=9C=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E4=B8=8B=E8=BD=BD=E6=94=B9location.href=EF=BC=9B?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=BB=84=E5=85=B3=E9=97=AD=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?select=EF=BC=9B=E6=89=80=E5=9C=A8=E7=BB=84=E6=94=B9=E5=8D=95?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/apiDefinitions.ts                     |  3 +-
 src/components/GroupTreeSearchPanel.vue       | 11 ++++--
 src/views/group-user/group/GroupMove.vue      |  2 +-
 .../group-user/user/EditUserContainer.vue     | 12 ++++---
 src/views/group-user/user/UserForm.vue        |  6 ++--
 src/views/oplog/OperationLogDetailModal.vue   |  2 +-
 src/views/push/PushLogDetailModal.vue         | 34 ++++++++-----------
 7 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/src/api/apiDefinitions.ts b/src/api/apiDefinitions.ts
index d255789..99da36d 100644
--- a/src/api/apiDefinitions.ts
+++ b/src/api/apiDefinitions.ts
@@ -90,5 +90,6 @@ export default {
   'AppSettings.getPushSetting': ['GET', '/api/app/GetPushSetting/{id}'],
   'Push.test': ['POST', '/api/push/Test'],
   'Push.recordList': ['GET', '/api/push/RecordList'],
-  'Push.retry': ['POST', '/api/push/Retry/{id}']
+  'Push.retry': ['POST', '/api/push/Retry/{id}'],
+  'Push.download': ['GET', '/api/push/Download/{id}']
 };
diff --git a/src/components/GroupTreeSearchPanel.vue b/src/components/GroupTreeSearchPanel.vue
index ce96faa..2c4c7c6 100644
--- a/src/components/GroupTreeSearchPanel.vue
+++ b/src/components/GroupTreeSearchPanel.vue
@@ -36,6 +36,7 @@ const DEFAULT_CACHE_KEY = 'bsch.group-tree.selected-node'
 const props = withDefaults(defineProps<{
     treeApi: () => Promise<any[]>;
     autoClick?: boolean;
+    autoSelect?: boolean;
     defaultSearchVisible?: boolean;
     showCloseButton?: boolean;
     searchPlaceholder?: string;
@@ -43,6 +44,7 @@ const props = withDefaults(defineProps<{
     checkable?: boolean;
 }>(), {
     autoClick: false,
+    autoSelect: true,
     defaultSearchVisible: true,
     showCloseButton: false,
     searchPlaceholder: '输入组名称搜索',
@@ -155,9 +157,12 @@ async function loadTree(preferredId?: number | null) {
     if (!treeData.value.length) return;
 
     await nextTick();
-    const selectId = resolveInitialSelectId(treeData.value, preferredId);
-    if (selectId != null) {
-        refMyTree.value?.reloadTree(selectId);
+    // 默认自动选中首个可用节点（触发 on-change）；移动组等场景传 autoSelect=false 关闭，避免打开即误触"不能移动到自身"
+    if (props.autoSelect) {
+        const selectId = resolveInitialSelectId(treeData.value, preferredId);
+        if (selectId != null) {
+            refMyTree.value?.reloadTree(selectId);
+        }
     }
 }
 
diff --git a/src/views/group-user/group/GroupMove.vue b/src/views/group-user/group/GroupMove.vue
index 50b47fc..3917150 100644
--- a/src/views/group-user/group/GroupMove.vue
+++ b/src/views/group-user/group/GroupMove.vue
@@ -7,7 +7,7 @@
             </div>
             <div class="move-row move-label">移动至：</div>
             <GroupTreeSearchPanel v-if="visible" v-model:curTreeNode="selectedNode" :treeApi="moveTreeApi"
-                :defaultSearchVisible="true" :showCloseButton="false" @on-change="onPickTarget" />
+                :autoSelect="false" :defaultSearchVisible="true" :showCloseButton="false" @on-change="onPickTarget" />
             <div v-if="targetName" class="move-target">已选择目标：{{ targetName }}</div>
         </div>
         <template #footer>
diff --git a/src/views/group-user/user/EditUserContainer.vue b/src/views/group-user/user/EditUserContainer.vue
index 8781970..745c57e 100644
--- a/src/views/group-user/user/EditUserContainer.vue
+++ b/src/views/group-user/user/EditUserContainer.vue
@@ -104,22 +104,26 @@ async function open(row: any, groups: any[], curGroupId?: number | null, onSucce
     }
 
     // 3) 已绑定角色 -> appRoles 回填（相互独立）
+    // 所在组(只读)默认选中「当前组」：优先用进入编辑时的左侧树/列表组(curGroupId)，否则取用户所属组的第一个
+    const defaultGroupId = (curGroupId != null && userGroupIdsArr.value.includes(curGroupId))
+        ? curGroupId
+        : (userGroupIdsArr.value[0] ?? null);
     try {
         const userRolesResp = await Apis.GroupAuthz.userRoles({ params: { userId: row.id } });
         const userRoleIds: number[] = (Array.isArray(userRolesResp) ? userRolesResp : [])
             .map((r: any) => r.id)
             .filter((x: any): x is number => x != null);
         userRolesLoaded.value = true;
-        detailData.value = buildInitForm(row, userRoleIds, userGroupIdsArr.value);
+        detailData.value = buildInitForm(row, userRoleIds, defaultGroupId);
     } catch (e: any) {
         // 已绑定角色加载失败：仍回填其它字段，但标记未加载成功（提交时不回写，避免误清空）
-        detailData.value = buildInitForm(row, [], userGroupIdsArr.value);
+        detailData.value = buildInitForm(row, [], defaultGroupId);
         Message.error('加载用户已绑定角色失败：' + (e?.message || '未知错误'));
     }
 }
 
 /* ---------- 把行数据映射成表单回填数据 ---------- */
-function buildInitForm(row: any, userRoleIds: number[], userGroupIds: number[] = []) {
+function buildInitForm(row: any, userRoleIds: number[], defaultGroupId: number | null = null) {
     const roles: number[] = Array.isArray(row.roles) ? row.roles : [];
     // 用户身份（业务身份）= 1..7；角色属性已移除（超管手动入库、管理员走勾选）
     const userType = roles.filter(r => r >= 1 && r <= 7);
@@ -135,7 +139,7 @@ function buildInitForm(row: any, userRoleIds: number[], userGroupIds: number[] =
         gender: row.gender ?? 0,
         userType,
         appRoles: userRoleIds || [],
-        userGroupIds: userGroupIds || [],
+        userGroupId: defaultGroupId ?? null,
     };
 }
 
diff --git a/src/views/group-user/user/UserForm.vue b/src/views/group-user/user/UserForm.vue
index 3300395..2eab339 100644
--- a/src/views/group-user/user/UserForm.vue
+++ b/src/views/group-user/user/UserForm.vue
@@ -57,11 +57,11 @@
                 </Col>
             </Row>
 
-            <!-- 第 5 行：所在组(只读)（仅编辑展示，默认选中当前组；提交时不带 groupId，不改变所在组） -->
+            <!-- 第 5 行：所在组(只读)（仅编辑展示，普通单选、默认选中当前组；提交时不带 groupId，不改变所在组） -->
             <Row v-if="isEdit">
                 <Col span="24">
                 <FormItem label="所在组(只读)：">
-                    <Select v-model="form.userGroupIds" multiple transfer
+                    <Select v-model="form.userGroupId" transfer clearable
                         placeholder="默认选中当前组（提交不改变所在组）">
                         <Option v-for="g in userGroups" :key="g.id" :value="g.id" :label="g.name" />
                     </Select>
@@ -144,7 +144,7 @@ const defaultForm = (): Record<string, any> => ({
     gender: 0,
     userType: [] as number[],
     appRoles: [] as number[],
-    userGroupIds: [] as number[],
+    userGroupId: null as number | null,
 });
 
 const form = reactive(defaultForm());
diff --git a/src/views/oplog/OperationLogDetailModal.vue b/src/views/oplog/OperationLogDetailModal.vue
index 04d4c05..bb271d7 100644
--- a/src/views/oplog/OperationLogDetailModal.vue
+++ b/src/views/oplog/OperationLogDetailModal.vue
@@ -81,7 +81,7 @@ function formatTime(val: any): string {
 
 function handleDownload() {
     if (!props.row?.id) return;
-    window.open(`${$conf.serviceHost}/api/oplog/Download/${props.row.id}`);
+    location.href = `${$conf.serviceHost}/api/oplog/Download/${props.row.id}`;
 }
 </script>
 
diff --git a/src/views/push/PushLogDetailModal.vue b/src/views/push/PushLogDetailModal.vue
index 42de096..3bfa0a5 100644
--- a/src/views/push/PushLogDetailModal.vue
+++ b/src/views/push/PushLogDetailModal.vue
@@ -43,7 +43,8 @@
                 <span>{{ formatTime(row?.createdAt) }}</span>
             </FormItem>
             <FormItem label="请求体：">
-                <pre class="json-pre">{{ formatJson(row?.payload) }}</pre>
+                <a v-if="row?.id" href="javascript:;" class="download-link" @click.prevent="handleDownload">下载请求体</a>
+                <span v-else>-</span>
             </FormItem>
         </Form>
         <template #footer>
@@ -54,6 +55,7 @@
 
 <script lang="ts" setup>
 import { computed } from 'vue';
+import useCurrentInstance from '@/utils/hook/useCurrentInstance';
 import Utils from '@/utils';
 
 interface Props {
@@ -83,13 +85,11 @@ function onVisibleChange(val: boolean) {
     if (!val) emit('update:modelValue', false);
 }
 
-function formatJson(val: any): string {
-    if (!val) return '-';
-    try {
-        return JSON.stringify(JSON.parse(val), null, 2);
-    } catch {
-        return String(val);
-    }
+const { $conf } = useCurrentInstance();
+
+function handleDownload() {
+    if (!props.row?.id) return;
+    location.href = `${$conf.serviceHost}/api/push/Download/${props.row.id}`;
 }
 
 function formatTime(val: any): string {
@@ -127,18 +127,12 @@ function formatTime(val: any): string {
         word-break: break-all;
     }
 
-    .json-pre {
-        margin: 0;
-        padding: 10px 12px;
-        background: #f7f8fa;
-        border: 1px solid #e8eaec;
-        border-radius: 4px;
-        max-height: 240px;
-        overflow: auto;
-        white-space: pre-wrap;
-        word-break: break-all;
-        font-size: 13px;
-        line-height: 1.6;
+    .download-link {
+        color: #577afb;
+
+        &:hover {
+            color: #3d5afe;
+        }
     }
 }
 </style>