更改校端权限

src/views/app/AppList.vue

@@ -18,9 +18,15 @@
         </div>
         <div class="main-container">
             <div class="search-wrap fix">
-                <Button class="fl" type="primary" @click="handleAdd">新增应用</Button>
+                <!-- 多校管理员：学校切换（覆盖仅对所选学校生效） -->
+                <Select v-if="multiSchool" v-model="currentSchoolId" class="fl school-select" transfer
+                    placeholder="全部学校（并集）" @on-change="onSchoolChange">
+                    <Option v-for="s in schoolList" :key="s.id" :value="s.id">{{ s.name }}</Option>
+                </Select>
+                <Button v-if="!isSchoolMode" class="fl" :class="{ 'ml-8': multiSchool }" type="primary"
+                    @click="handleAdd">新增应用</Button>
                 <Button class="fl ml-8" type="default" v-if="dataParams.categoryId != null"
-                    @click="sortModalVisible = true">排序管理</Button>
+                    @click="openSortModal">排序管理</Button>
                 <Input class="fr" v-model="keyword" placeholder="输入应用名称或appKey筛选" search clearable suffix="ios-search"
                     style="width:220px" @on-search="onSearch" @on-clear="onSearch" />
             </div>
@@ -30,11 +36,11 @@
 
         <!-- 容器组件：新增 / 编辑 -->
         <AddAppContainer ref="addRef" />
-        <EditAppContainer ref="editRef" />
+        <EditAppContainer ref="editRef" :schoolId="currentSchoolId" />
 
         <!-- 排序管理 -->
         <AppSort v-model="sortModalVisible" :categoryId="dataParams.categoryId" :categoryName="currentCategoryName"
-            @saved="onSortSaved" />
+            :schoolId="currentSchoolId" @saved="onSortSaved" />
 
         <!-- 推送设置 -->
         <PushSettingModal v-model="pushSettingVisible" :appId="currentApp.id" :appName="currentApp.name" />
@@ -53,10 +59,14 @@ import PushSettingModal from "./PushSettingModal.vue";
 import TablePageAlovaNew from '@/components/TablePageAlovaNew.vue';
 import { OperatorEnum } from '@/types';
 import AppSort from './AppSort.vue';
+import { useAppSchoolScope } from "@/utils/hook/useAppSchoolScope";
 
 const router = useRouter();
 const { $utils } = useCurrentInstance();
 
+// 学校管理员上下文：多校显示切换下拉，覆盖仅对所选学校生效（默认并集，写操作须先选定学校）
+const { isSchoolMode, multiSchool, schoolList, currentSchoolId, requireSchool } = useAppSchoolScope();
+
 const tableRef = ref<InstanceType<typeof TablePageAlovaNew> | null>(null);
 
 const sortModalVisible = ref(false);
@@ -79,29 +89,39 @@ function onCategoryClick(id: number | null) {
     tableRef.value?.refreshData();
 }
 
+/* ---------------- 多校切换：刷新类型与列表 ---------------- */
+function onSchoolChange() {
+    fetchTypeList();
+    tableRef.value?.refreshData();
+}
+
 /* ---------------- 输入框搜索：仅在触发搜索时提交 ---------------- */
 function onSearch() {
     dataParams.value.name = keyword.value.trim() || undefined;
     tableRef.value?.refreshData();
 }
 
-/* ---------------- 左侧应用类型 ---------------- */
-const { data: appTypeList, send: fetchTypeList } = useRequest(
-    Apis.AppSettings.appTypeList({
-        transform: (res: any) => {
-            const list: any[] = res ?? [];
-            return list.slice().sort((a, b) => (a.sortNo ?? 0) - (b.sortNo ?? 0));
-        },
-        cacheFor: null,
-    }),
-    { initialData: [] }
-);
+/* ---------------- 左侧应用类型（SCHOOL 模式合并学校私有改名/排序；随学校切换刷新） ---------------- */
+const appTypeList = ref<any[]>([]);
+async function fetchTypeList() {
+    try {
+        const res: any = await Apis.AppSettings.appTypeList({
+            params: { schoolId: currentSchoolId.value ?? undefined },
+            cacheFor: null,
+        });
+        appTypeList.value = ((res ?? []) as any[]).slice().sort((a, b) => (a.sortNo ?? 0) - (b.sortNo ?? 0));
+    } catch (e: any) {
+        console.warn(e?.message || "获取应用类型失败");
+    }
+}
+fetchTypeList();
 
 const tableApi = (params: { pageIndex: number; pageSize: number }) => {
     return Apis.AppSettings.appList({
         params: {
             categoryId: dataParams.value.categoryId ?? undefined,
             name: dataParams.value.name || undefined,
+            schoolId: currentSchoolId.value ?? undefined,
             pageIndex: params.pageIndex,
             pageSize: params.pageSize,
         },
@@ -154,12 +174,14 @@ const columns = [
         align: 'center',
         width: 280,
         render: (h: any, { row }: any) => {
-            return [
-                $utils.operatingTextHandle(h, '编辑', '', () => handleEdit(row)),
-                $utils.operatingTextHandle(h, '模块管理', '', () => goModuleManage(row)),
-                $utils.operatingTextHandle(h, '推送设置', '', () => openPushSetting(row)),
-                $utils.operatingTextHandle(h, '删除', 'text-error', () => handleDelete(row)),
-            ];
+            // SCHOOL 模式：仅编辑（名称/描述/图标，写学校覆盖表）；模块管理/推送设置/删除全部隐藏
+            const actions = [$utils.operatingTextHandle(h, '编辑', '', () => handleEdit(row))];
+            if (!isSchoolMode.value) {
+                actions.push($utils.operatingTextHandle(h, '模块管理', '', () => goModuleManage(row)));
+                actions.push($utils.operatingTextHandle(h, '推送设置', '', () => openPushSetting(row)));
+                actions.push($utils.operatingTextHandle(h, '删除', 'text-error', () => handleDelete(row)));
+            }
+            return actions;
         }
     },
 ];
@@ -196,11 +218,19 @@ function handleAdd() {
 const editRef = ref();
 
 function handleEdit(row: any) {
+    // 多校管理员：编辑写学校覆盖表，必须先选定学校（后端对模糊写目标直接拒绝）
+    if (!requireSchool()) return;
     editRef.value?.open(row.id, row, appTypeList.value, () => {
         tableRef.value?.reloadData(OperatorEnum.edit);
     });
 }
 
+/* ---------------- 排序管理入口（多校须先选定学校） ---------------- */
+function openSortModal() {
+    if (!requireSchool()) return;
+    sortModalVisible.value = true;
+}
+
 /* ---------------- 删除应用 ---------------- */
 async function handleDelete(row: any) {
     await MyConfirm({
@@ -246,6 +276,10 @@ const goModuleManage = (row: any) => {
     width: 180px;
 }
 
+.school-select {
+    width: 180px;
+}
+
 .tree-scroll {
     flex: 1;
     overflow: auto;