Compare commits

...
2 Commits
Author SHA1 Message Date
chenxing 2bd7ef3b80 refactor(header): 命令面板去背景联动,结果右侧标注应用类型
build / build (push) Successful in 1m21s
用户三点修订:
1. 面板已是模态框,去掉背景应用列表的同步过滤(解开 mittBus.searchChange 整条链)
2. 结果右侧灰色小字显示应用类型(来源 BoaAppType.name,与 /apps 分组标题同源)
3. 类型呈现暂按方案 A(右侧灰字);方案 B(类型分组)对照稿见 design/07

- Header.vue: watch(searchAppText) 不再 emit("searchChange");cmdkResult 由
  getFlattenAppList(纯 flatten,会丢类型名)改为遍历 curUserAppList 分组展开并挂
  appTypeName;模板加 .app-cmdk-type
- AppList.vue: 删 searchAppText / searchAppList / isSearch 与模板搜索态分支、
  .no-search-box 样式、孤儿导入 flatten(lodash) 与 requireImg;删 mittBus 监听
- utils/mitt.ts: 删 searchChange 事件类型
- assets/styles/header.scss: 加 .app-cmdk-type 样式
- harness-main.ts: mock curUserAppList 补齐 BoaAppType 分组结构(id + name),
  原 mock 丢了 name 导致类型名取不到

注:本仓工作区另有并行会话 WIP(StatsBarModal 迁入 Settings / 主题预览),
本提交只含本案 5 个文件与 hunks,未触碰对方改动。
2026-10-08 19:10:14 +08:00
chenxing 4f36ff9ceb 外观偏好异步补齐D:设置页选择端双写服务端真源(fire-and-forget,本地体验不变)
- BaseApi 加三方法:getAppearance / saveMyTheme(紧凑编码,null=跟随)/ saveMyAvatarStyle
- Settings.vue 五个写键分支旁挂双写:pickMyTheme / followSchoolTheme(置 NULL) / pickMyAvatarStyle / followSchoolAvatar(置 NULL) / pickSide(写 yh-theme 的全部分支)
- 双写失败 console.warn 不弹错不回滚本地(本地体验与改造前逐字节一致)
- App.vue loadSchThemeDefault/loadSchAvatarDefault 保留不动(与 init 异步补齐幂等收敛)
- sync 件:UserAvatar.vue 监听 yh-appearance-updated + theme.ts 版本戳 20261008-1831-d9db725
- 注:本仓工作区另有并行会话 WIP(harness/命令面板),本提交只含本案文件与 hunks
2026-10-08 18:58:30 +08:00
9 changed files with 99 additions and 74 deletions
+29
View File
@@ -249,6 +249,35 @@ class Base extends Abstract {
return this.postRequest({ url });
}
// ===== 用户外观偏好(外观偏好服务端化 2026-10-08;后端契约见 AppearanceController)=====
/**
* 读当前用户外观偏好聚合:{myTheme, schTheme, avatarMy, avatarSch, logoUrl}(紧凑编码/绝对 URL,查不到为 null)。
* 各子应用 yh-theme-init 异步补齐段的同源数据源;选择端预留(本轮设置页双写用不到)。
*/
getAppearance() {
const url = path + "/appearance";
return this.getRequest<{
myTheme: string | null;
schTheme: string | null;
avatarMy: string | null;
avatarSch: string | null;
logoUrl: string | null;
}>({ url });
}
/** 保存用户自选主题档(紧凑编码 theme|sideDeep01|gradOn01|sideFollow01);null=跟随学校默认。设置页 fire-and-forget 双写:成功不提示、失败不回滚本地 */
saveMyTheme(themeState: string | null) {
const url = path + "/saveMyTheme";
return this.postRequest({ url, data: { themeState } as any });
}
/** 保存用户自选头像样式("text"|"silhouette");null=跟随学校默认。双写语义同 saveMyTheme */
saveMyAvatarStyle(avatarStyle: string | null) {
const url = path + "/saveMyAvatarStyle";
return this.postRequest({ url, data: { avatarStyle } as any });
}
savUserRole(info: any) {
const url = path + "/user/savUserRole";
return this.postRequest({ url, data: info as any });
+8
View File
@@ -181,6 +181,14 @@
text-overflow: ellipsis;
white-space: nowrap;
}
/* 应用类型:右侧灰字(来源 BoaAppType.name,与 /apps 分组标题同源) */
.app-cmdk-type {
flex-shrink: 0;
font-size: 11.5px;
color: #98a2b0;
font-weight: 400;
white-space: nowrap;
}
.app-cmdk-empty {
display: none;
padding: 28px 18px 32px;
+17 -6
View File
@@ -208,6 +208,7 @@
/>
<img v-else :src="$utils.appIconPath(item.icon)" class="app-cmdk-img" alt="" />
<span class="app-cmdk-name">{{ item.name }}</span>
<span class="app-cmdk-type" v-if="item.appTypeName">{{ item.appTypeName }}</span>
</div>
</div>
<div class="app-cmdk-empty" :class="{ 'is-show': !cmdkResult.length }">
@@ -409,9 +410,10 @@ onUnmounted(() => {
window.removeEventListener("keydown", onCmdkKeydown);
closeMsgWs();
});
watch(searchAppText, val => {
// 面板已是模态框,输入只驱动面板自身过滤;
// 不再 emit("searchChange") —— 背景应用网格保持原样(2026-10-08 用户修订 1)
watch(searchAppText, () => {
cmdkStagger.value = false; // 输入过滤时不重播逐条入场
mittBus.emit("searchChange", val);
});
// ===== 搜索命令面板(2026-10-08 定稿 B 方案)=====
const refCmdkList = ref<any>();
@@ -425,12 +427,21 @@ function vectorIconOf(item: any): string {
return appiconKeyOf(item?.name || "");
}
/** 结果取自 store(由 AppList.reloadAppData 写入),与背景应用网格同源同口径 */
/** 结果取自 store.curUserAppList(写入方 = AppList.reloadAppData)。
* 它是 BoaAppType 分组结构 [{ id, name, apps }],name 就是应用类型名;
* 展开时把类型名挂到每条上供右侧灰字展示。
* 注意别用 store.getFlattenAppList —— 它是纯 flatten,会把类型名丢掉 */
const cmdkResult = computed(() => {
const all = store.getFlattenAppList;
const q = (searchAppText.value || "").trim();
if (!q) return all;
return all.filter((x: any) => x.name.indexOf(q) !== -1);
const out: any[] = [];
(store.curUserAppList || []).forEach((group: any) => {
(group.apps || []).forEach((app: any) => {
if (!q || (app.name || "").indexOf(q) !== -1) {
out.push({ ...app, appTypeName: group.name });
}
});
});
return out;
});
function openSearch() {
+11 -2
View File
@@ -4,7 +4,7 @@
取值链/取字契约见《设置页修复与默认头像落地方案》§10.1/§10.2;样式全在本文件 <style scoped>(唯一 CSS 源,
不进通道 icons.src.css——通道 CSS 对 UserHome 不可达,内联分发才能消双份漂移,见同方案 §10.4)。
根元素即 .yh-avatar 圆:尺寸内联必须挂圆本身(挂外层 span 会被 flex 拉成椭圆,§12 踩坑)。 */
import { computed } from "vue";
import { computed, onBeforeUnmount, onMounted, ref } from "vue";
import { pickAvatarText, resolveAvatarStyle } from "@/utils/avatar";
const props = withDefaults(
@@ -22,7 +22,16 @@ const props = withDefaults(
);
const text = computed(() => (props.src ? "" : pickAvatarText(props.name)));
const style = computed(() => resolveAvatarStyle());
/* 外观偏好异步补齐(yh-theme-init 在挂载后拉服务端真源收敛 localStorage 键)会在
document 上派发 yh-appearance-updated;tick 自增让 style 依赖失效重读键,三态即时切换(无需刷新)。 */
const appearanceTick = ref(0);
const onAppearanceUpdated = () => { appearanceTick.value += 1; };
onMounted(() => document.addEventListener("yh-appearance-updated", onAppearanceUpdated));
onBeforeUnmount(() => document.removeEventListener("yh-appearance-updated", onAppearanceUpdated));
const style = computed(() => {
appearanceTick.value;
return resolveAvatarStyle();
});
/** 首字态 = style==="text" 且能取到字(契约 §10.2:二者缺一即剪影,取到字但档位是剪影时绝不能出字) */
const showText = computed(() => style.value === "text" && !!text.value);
+7 -1
View File
@@ -78,12 +78,18 @@ function applyMockState() {
],
curUserAppList: [
{
id: 1,
name: "常用应用",
apps: [
{ appKey: "100019", appCode: "flow", name: "流程中心" },
{ appKey: "100617", appCode: "notice", name: "通知公告" },
{ appKey: "100611", appCode: "leave", name: "请假" },
],
},
{
id: 2,
name: "教学应用",
apps: [{ appKey: "100611", appCode: "leave", name: "请假" }],
},
],
unreadCount: 5,
curUserSettingInfo: {
-1
View File
@@ -11,7 +11,6 @@ type MittType<T = any> = {
openBschIframePage: IframePageParmas; //打开iframe页面
showLightAppModal: LightAppModal; //打开lightapp模态框
searchReset: void; //重置搜索框
searchChange: string | null;
};
// 类型
+1 -1
View File
@@ -1,5 +1,5 @@
/**
* 本文件由 YschTheme scripts/gen-theme.mjs 从 assets-src/pc/theme-core.js 生成(版本 20261006-2013-75c1d10),勿手改。
* 本文件由 YschTheme scripts/gen-theme.mjs 从 assets-src/pc/theme-core.js 生成(版本 20261008-1831-d9db725),勿手改。
* 分发方式:YschTheme `npm run sync` 拷进各端 src/utils/theme.ts(与 ThemeSwitcher.vue 配套,MD5 对齐报告)。
* 运行时档位类名由 /static/js/yh-theme-init.js 在 <head> 内先行挂好,本模块只负责读写与切换。
*/
+2 -58
View File
@@ -1,7 +1,7 @@
<template>
<div class="app-list-wrapper base-mask">
<vuescroll :ops="scrollOps">
<template v-if="!isSearch" v-for="(item, index) in appList">
<template v-for="(item, index) in appList">
<h3 class="app-type-box">{{ item.name }}</h3>
<div
:class="{
@@ -39,42 +39,6 @@
</template>
</div>
</template>
<template v-if="!!isSearch">
<div class="app-list-box" v-if="searchAppList.length > 0">
<template v-for="item in searchAppList">
<ContextMenu
class="app-container app-container__mask"
:title="item.name"
@on-change="onMenuChange"
@select="onMenuSel"
:menu="[
{
label: '添加到桌面',
appId: item.id,
id: '1',
},
{
label: '新窗口打开',
appId: item.id,
url: item.webAddr,
id: '2',
},
]"
>
<a @click="linkPage(item)">
<AppIcon v-if="vectorIconOf(item)" :name="vectorIconOf(item)" scene="tile"
:tint="item.iconColor" />
<img v-else :src="requireImg('defappicon.png')"
v-real-img="$utils.appIconPath(item.icon)" />
<div class="app-name">{{ item.name }}</div>
</a>
</ContextMenu>
</template>
</div>
<div class="no-search-box" v-else>
<img :src="requireImg('no-search-bg.png')" alt="" />
</div>
</template>
</vuescroll>
</div>
</template>
@@ -86,11 +50,9 @@ import vuescroll from "vuescroll";
import { ref, onMounted, onUnmounted, computed, watch } from "vue";
import BaseApi from "@/api/BaseApi";
import { useDefaultStore } from "@/store";
import { requireImg } from "@/utils/hook/useImg";
import mittBus from "@/utils/mitt";
import { useRoute, useRouter } from "vue-router";
import { BschLoadTypeEnum, DesktopAppTypeEnum, LinkOpenTypeEnum } from "@/types";
import { flatten } from "lodash";
import UserSettingApi from "@/api/UserSettingApi";
import { Message } from "view-ui-plus";
import { bschLinkPage, openAppPage } from "@/utils/bschLinkPage";
@@ -120,15 +82,8 @@ const router = useRouter();
const store = useDefaultStore();
const { $conf, $utils } = useCurrentInstance();
const searchAppText = ref<string | null>(null),
appList = ref<any[]>([]);
const appList = ref<any[]>([]);
const searchAppList = computed(() => {
const allAppList = flatten(appList.value.map(x => x.apps));
return allAppList.filter(x => x.name.indexOf(searchAppText.value) !== -1);
});
const isSearch = computed(() => !!searchAppText.value);
const compMenuId = computed(() => {
let menuList = store.curUserMenuList.find(x => x.url == route.path);
return menuList ? menuList.id : -1;
@@ -137,13 +92,9 @@ const compMenuId = computed(() => {
onMounted(() => {
reloadAppData();
mittBus.emit("searchReset");
mittBus.on("searchChange", val => {
searchAppText.value = val;
});
});
onUnmounted(() => {
mittBus.emit("searchReset");
mittBus.off("searchChange");
});
watch(() => store.curRoleUid, reloadAppData);
@@ -237,11 +188,4 @@ function linkPage(item: any) {
flex-wrap: wrap;
}
}
.no-search-box {
text-align: center;
position: relative;
top: -50%;
-webkit-transform: translateY(40%);
transform: translateY(40%);
}
</style>
+24 -5
View File
@@ -1033,6 +1033,18 @@ function keyExists(key: string) {
}
}
/** ThemeState → 服务端紧凑编码 theme|sideDeep01|gradOn01|sideFollow01(与 SchSettings 存储形态同款) */
function themeToCompact(s: ThemeState): string {
return `${s.theme}|${s.sideDeep ? 1 : 0}|${s.gradOn ? 1 : 0}|${s.sideFollow ? 1 : 0}`;
}
/** 外观偏好服务端双写(2026-10-08):本地体验不变,fire-and-forget 补写真源——成功不提示、失败 console.warn 不回滚本地 */
function syncMyThemeRemote(s: ThemeState | null) {
BaseApi.saveMyTheme(s ? themeToCompact(s) : null).catch((e: any) => console.warn("[appearance] saveMyTheme 失败(本地已生效,不回滚):", e));
}
function syncMyAvatarRemote(style: string | null) {
BaseApi.saveMyAvatarStyle(style).catch((e: any) => console.warn("[appearance] saveMyAvatarStyle 失败(本地已生效,不回滚):", e));
}
// ---- 我的主题(所有人)----
const myCandidate = ref<string>(resolveEffectiveThemeState().theme);
const myOrigin = computed<"mine" | "school" | "system">(() => {
@@ -1052,17 +1064,20 @@ const myEffective = computed(() => {
function pickMyTheme(key: string) {
const cur = resolveEffectiveThemeState();
saveThemeState({ ...cur, theme: key } as ThemeState);
const state = { ...cur, theme: key } as ThemeState;
saveThemeState(state);
syncMyThemeRemote(state);
myCandidate.value = key;
myTick.value += 1;
}
/** 跟随学校默认 = 删用户自选键(之后回落学校档/系统默认,§3.3) */
/** 跟随学校默认 = 删用户自选键(之后回落学校档/系统默认,§3.3);服务端同步置 NULL */
function followSchoolTheme() {
try {
localStorage.removeItem(THEME_STORAGE_KEY);
} catch (e) {
/* 隐私模式静默 */
}
syncMyThemeRemote(null);
myTick.value += 1;
}
@@ -1170,16 +1185,18 @@ const myAvatarOriginLabel = computed(
() => ({ mine: "我的选择", school: "学校默认", system: "系统默认" })[myAvatarOrigin.value]
);
/** 选样式即写键即生效(saveAvatarStyle 直写 localStorage 无响应式,靠 tick 刷示例与来源标签) */
/** 选样式即写键即生效(saveAvatarStyle 直写 localStorage 无响应式,靠 tick 刷示例与来源标签);服务端双写真源 */
function pickMyAvatarStyle(key: AvatarStyle) {
saveAvatarStyle(key);
syncMyAvatarRemote(key);
myAvatarCandidate.value = key;
myAvatarTick.value += 1;
}
/** 跟随学校默认 = 删用户自选键(之后回落学校默认/系统默认,与 followSchoolTheme 同构) */
/** 跟随学校默认 = 删用户自选键(之后回落学校默认/系统默认,与 followSchoolTheme 同构);服务端同步置 NULL */
function followSchoolAvatar() {
clearAvatarStyle();
syncMyAvatarRemote(null);
myAvatarTick.value += 1;
}
@@ -1255,7 +1272,9 @@ const sideDeep = ref(resolveEffectiveThemeState().sideDeep);
const gradOn = ref(resolveEffectiveThemeState().gradOn);
function pickSide(patch: Partial<ThemeState>) {
saveThemeState({ ...resolveEffectiveThemeState(), ...patch } as ThemeState);
const state = { ...resolveEffectiveThemeState(), ...patch } as ThemeState;
saveThemeState(state);
syncMyThemeRemote(state);
myTick.value += 1;
}