@jiangood/open-admin 3.1.11 → 3.1.12

package/package.json

@@ -15,7 +15,7 @@
     "less": "^4.2.0",
     "typescript": "^5.9.3",
     "typescript-eslint": "^8.67.0",
-    "vite": "^8.0.0"
+    "vite": "^8.3.3"
   },
   "peerDependencies": {
     "@ant-design/icons": "^6.0.0",
@@ -26,7 +26,7 @@
     "cropperjs": "^1.6.2",
     "dayjs": "^1.11.13",
     "lodash": "^4.17.23",
-    "qs": "^6.14.0",
+    "qs": "^6.16.1",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
@@ -55,7 +55,7 @@
     "lint": "eslint src --max-warnings=0",
     "lint:fix": "eslint src --fix"
   },
-  "version": "3.1.11",
+  "version": "3.1.12",
   "overrides": {
     "zod-validation-error": "^4.0.2"
   }

package/src/framework/GlobalData.ts

@@ -12,7 +12,7 @@ export interface SiteInfo {
     waterMark?: boolean;
     /** 登录失效（空闲超时/未登录）时全局弹窗的提示文案，对应 sys.login-expired-message */
     loginExpiredMessage?: string;
-    /** 后端声明为 publicVisible 的系统配置，key → value */
+    /** 后端声明为 publicVisible 的参数项，key → value */
     config?: Record<string, unknown>;
     [key: string]: unknown;
 }
@@ -22,6 +22,8 @@ export interface LoginInfo {
     account?: string;
     phone?: string;
     email?: string;
+    /** 头像文件 objectName，页面按 /file/{avatar} 访问 */
+    avatar?: string;
     unit?: string;
     dept?: string;
     roles?: string;

package/src/framework/biz/OrgTree.tsx

@@ -22,7 +22,7 @@ export class OrgTree extends React.Component<OrgTreeProps, OrgTreeState> {
     }
 
     componentDidMount() {
-        HttpClient.get('admin/sysOrg/tree', null).then(tree => {
+        HttpClient.get('admin/sys-org/tree', null).then(tree => {
             this.setState({treeData: tree.data, treeDataLoading: false})
         }).catch(() => {
             // 失败时结束 loading 并置空（组件会显示空状态提示），避免一直停留在骨架屏；

package/src/framework/biz/RoleTree.tsx

@@ -22,7 +22,7 @@ export class RoleTree extends React.Component<RoleTreeProps, RoleTreeState> {
     }
 
     componentDidMount() {
-        HttpClient.get('admin/sysRole/biz-tree', null).then(tree => {
+        HttpClient.get('admin/sys-role/biz-tree', null).then(tree => {
             this.setState({treeData: tree.data, treeDataLoading: false})
         }).catch(() => {
             // 失败时结束 loading 并置空（组件会显示空状态提示），避免一直停留在骨架屏；

package/src/framework/biz/UserPicker.tsx

@@ -20,9 +20,9 @@ export interface UserPickerProps {
     width?: number;
     /** 内容区高度，默认 530（刚好容纳默认每页 10 行，不出现表格内部纵向滚动） */
     height?: number;
-    /** 分页数据源地址，默认 admin/sysUser/page */
+    /** 分页数据源地址，默认 admin/sys-user/page */
     requestUrl?: string;
-    /** 按 id 查询用户详情地址（用于回显），默认 admin/sysUser/by-ids */
+    /** 按 id 查询用户详情地址（用于回显），默认 admin/sys-user/by-ids */
     usersUrl?: string;
     /** 确定按钮 loading */
     confirmLoading?: boolean;
@@ -88,9 +88,9 @@ export class UserPicker extends React.Component<UserPickerProps, UserPickerState
         }
     }
 
-    getRequestUrl = () => this.props.requestUrl || 'admin/sysUser/page';
+    getRequestUrl = () => this.props.requestUrl || 'admin/sys-user/page';
 
-    getUsersUrl = () => this.props.usersUrl || 'admin/sysUser/by-ids';
+    getUsersUrl = () => this.props.usersUrl || 'admin/sys-user/by-ids';
 
     init = () => {
         this.formRef.current?.resetFields();

package/src/framework/biz/index.tsx

@@ -11,22 +11,22 @@ export * from './pickerUser'
 
 class InnerFieldUserSelect extends React.Component<ComponentProps<typeof FieldRemoteSelect>> {
     render() {
-        return <FieldRemoteSelect url="admin/sysUser/options" {...this.props} />;
+        return <FieldRemoteSelect url="admin/sys-user/options" {...this.props} />;
     }
 }
 class InnerFieldUserSelectMultiple extends React.Component<ComponentProps<typeof FieldRemoteSelect>> {
     render() {
-        return <FieldRemoteSelect url="admin/sysUser/options" multiple {...this.props} />;
+        return <FieldRemoteSelect url="admin/sys-user/options" multiple {...this.props} />;
     }
 }
 class InnerFieldUnitTreeSelect extends React.Component<ComponentProps<typeof FieldRemoteTreeSelect>> {
     render() {
-        return <FieldRemoteTreeSelect url="admin/sysOrg/unit-tree" {...this.props} />;
+        return <FieldRemoteTreeSelect url="admin/sys-org/unit-tree" {...this.props} />;
     }
 }
 class InnerFieldDeptTreeSelect extends React.Component<ComponentProps<typeof FieldRemoteTreeSelect>> {
     render() {
-        return <FieldRemoteTreeSelect url="admin/sysOrg/dept-tree" {...this.props} />;
+        return <FieldRemoteTreeSelect url="admin/sys-org/dept-tree" {...this.props} />;
     }
 }
 class InnerFieldOrgTreeMultipleSelect extends React.Component<ComponentProps<typeof FieldRemoteTreeSelect>> {

package/src/framework/components/LinkButton/index.tsx

@@ -2,6 +2,10 @@ import React from "react";
 import {Button} from "antd";
 import {PageUtils} from "../../utils";
 
+/**
+ * 链接跳转按钮。
+ * `label` 参数已弃用：目标页面的标题请使用 pageMeta.title。
+ */
 export function LinkButton(props) {
     const {path, label, children, size = 'small', ...rest} = props;
     return <Button size={size} {...rest} onClick={() => {

package/src/framework/components/OrgSwitcher/index.tsx

@@ -18,7 +18,7 @@ export class OrgSwitcher extends React.Component<Record<string, never>, {tree: O
     state = {tree: [], currentOrgId: null};
 
     componentDidMount() {
-        HttpClient.get("admin/myOrgs", null).then(data => {
+        HttpClient.get("admin/my-orgs", null).then(data => {
             if (data.data) {
                 this.setState({tree: data.data.tree || [], currentOrgId: data.data.currentOrgId || null});
             }
@@ -26,7 +26,7 @@ export class OrgSwitcher extends React.Component<Record<string, never>, {tree: O
     }
 
     handleChange = (orgId: string) => {
-        HttpClient.post("admin/switchOrg", {orgId}, null).then(() => {
+        HttpClient.post("admin/switch-org", {orgId}, null).then(() => {
             setTimeout(() => location.reload(), 1000);
         });
     };

package/src/framework/components/Page/index.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { Space, Typography } from "antd";
+import { Space } from "antd";
 import './index.less'
 import { PermActions, type PermAction } from "../../biz/PermActions";
 import { PermUtils } from "../../utils";
@@ -19,8 +19,6 @@ interface PageProps {
     /** @deprecated 页面底色已默认跟随布局底色，该参数不再产生差异；保留仅为兼容旧写法 */
     backgroundGray?: boolean;
     debug?: boolean;
-    title?: React.ReactNode;
-    description?: React.ReactNode;
     /** 右侧操作区：推荐传 PermAction[]（数据驱动），兼容带 perm 属性的节点 */
     actions?: PermAction[] | React.ReactNode;
     children?: React.ReactNode;
@@ -28,8 +26,7 @@ interface PageProps {
 
 export class Page extends React.Component<PageProps> {
     render() {
-        const { padding = true, debug = false, title, description, actions, children } = this.props;
-        const hasHeader = title != null || description != null || actions != null;
+        const { padding = true, debug = false, actions, children } = this.props;
         const style: React.CSSProperties = {};
 
         if (padding) {
@@ -41,18 +38,13 @@ export class Page extends React.Component<PageProps> {
         }
 
         return <div className={'oa-page'} style={style}>
-            {hasHeader && (
+            {actions != null && (
                 <div className="oa-page-header">
                     <div className="oa-page-header-top">
-                        <div className="oa-page-header-left">
-                            <div>
-                                {title && <Typography.Title level={5} style={{ margin: 0 }}>{title}</Typography.Title>}
-                                {description && <div><Typography.Text type="secondary">{description}</Typography.Text></div>}
-                            </div>
-                        </div>
-                        {actions != null && (Array.isArray(actions)
+                        <div className="oa-page-header-left"/>
+                        {Array.isArray(actions)
                             ? <PermActions actions={actions}/>
-                            : renderActionNodes(actions))}
+                            : renderActionNodes(actions)}
                     </div>
                 </div>
             )}

package/src/framework/components/ProTable/index.tsx

@@ -71,6 +71,8 @@ export interface ProTableProps<T = unknown> {
     bordered?: boolean;
     /** 树形数据模式，关闭分页且不传 page/size 参数 */
     treeMode?: boolean;
+    /** 无数据时的提示文案，默认“暂无数据” */
+    emptyText?: React.ReactNode;
 }
 
 interface ProTableState<T = unknown> {
@@ -256,7 +258,7 @@ this.setState({loading: true})
                     bordered={this.props.bordered ?? false}
                     locale={{
                         emptyText: <Empty image={Empty.PRESENTED_IMAGE_SIMPLE}
-                                           description={hasFilter ? '没有符合条件的数据' : '暂无数据'}/>,
+                                           description={hasFilter ? '没有符合条件的数据' : (this.props.emptyText ?? '暂无数据')}/>,
                     }}
                 />
             </div>

package/src/framework/components/ThemeSettings/index.tsx

@@ -7,19 +7,15 @@ import {
     DEFAULT_SIDER_BG,
     applyThemePreset,
     getActivePresetKey,
-    getThemeMode,
     resetAllSettings,
-    setThemeMode,
     DENSITY_PRESETS,
     RADIUS_PRESETS,
     applyDensityPreset,
     getActiveDensityKey,
     applyRadiusPreset,
     getActiveRadiusKey,
-    getLayoutMode,
-    setLayoutMode,
 } from '../../config';
-import type { ThemeMode, ThemeDensity, ThemeRadius, LayoutMode } from '../../config';
+import type { ThemeDensity, ThemeRadius } from '../../config';
 import { EventBus } from '../../utils/EventBus';
 
 export interface ThemeSettingsProps {
@@ -32,29 +28,23 @@ function SectionTitle({ children }: { children: React.ReactNode }) {
 }
 
 /**
- * 界面设置面板：外观模式、主题色、界面密度、圆角、界面布局。
+ * 界面设置面板：主题色、界面密度、圆角。
+ * 明暗模式由顶栏的太阳/月亮按钮切换，此处不再重复提供。
  * 所有变更即时生效并持久化到 localStorage。
  */
 export function ThemeSettings({ open, onClose }: ThemeSettingsProps) {
     const [activeKey, setActiveKey] = React.useState(getActivePresetKey());
-    const [mode, setMode] = React.useState<ThemeMode>(getThemeMode());
     const [density, setDensity] = React.useState<ThemeDensity>(getActiveDensityKey());
     const [radius, setRadius] = React.useState<ThemeRadius>(getActiveRadiusKey());
-    const [layout, setLayout] = React.useState<LayoutMode>(getLayoutMode());
 
     React.useEffect(() => {
         const offTheme = EventBus.on('themeChange', () => {
             setActiveKey(getActivePresetKey());
-            setMode(getThemeMode());
             setDensity(getActiveDensityKey());
             setRadius(getActiveRadiusKey());
         });
-        const offLayout = EventBus.on('layoutChange', () => {
-            setLayout(getLayoutMode());
-        });
         return () => {
             offTheme();
-            offLayout();
         };
     }, []);
 
@@ -63,20 +53,8 @@ export function ThemeSettings({ open, onClose }: ThemeSettingsProps) {
 
     return (
         <Drawer title="界面设置" open={open} onClose={onClose} size={340}>
-            <div style={{ fontWeight: 600 }}>外观模式</div>
-            <Segmented
-                block
-                style={{ marginTop: 12 }}
-                value={mode}
-                onChange={value => setThemeMode(value as ThemeMode)}
-                options={[
-                    { label: '浅色', value: 'light' },
-                    { label: '深色', value: 'dark' },
-                ]}
-            />
-
-            <SectionTitle>主题色</SectionTitle>
-            <div style={{ display: 'grid', gridTemplateColumns: 'repeat(2, 1fr)', gap: 12 }}>
+            <div style={{ fontWeight: 600 }}>主题色</div>
+            <div style={{ display: 'grid', gridTemplateColumns: 'repeat(2, 1fr)', gap: 12, marginTop: 12 }}>
                 {THEME_PRESETS.map(preset => {
                     const primary = preset.colors.colorPrimary || DEFAULT_COLORS.colorPrimary || '#1677ff';
                     const sider = preset.colors.siderBg || DEFAULT_SIDER_BG;
@@ -152,17 +130,6 @@ export function ThemeSettings({ open, onClose }: ThemeSettingsProps) {
                 }))}
             />
 
-            <SectionTitle>界面布局</SectionTitle>
-            <Segmented
-                block
-                value={layout}
-                onChange={value => setLayoutMode(value as LayoutMode)}
-                options={[
-                    { label: '多标签页', value: 'tabs' },
-                    { label: '单页', value: 'single' },
-                ]}
-            />
-
             <Button block style={{ marginTop: 20 }} onClick={() => resetAllSettings()}>
                 恢复默认
             </Button>

package/src/framework/config/index.ts

@@ -8,6 +8,9 @@ export {
     toggleThemeMode,
     applyThemePreset,
     getActivePresetKey,
+    getDefaultPresetKey,
+    setDefaultThemePreset,
+    hasStoredPreset,
     applyDensityPreset,
     getActiveDensityKey,
     applyRadiusPreset,
@@ -27,13 +30,22 @@ export type { ThemeColors, ThemeMode, ThemePreset, ThemeDensity, ThemeRadius, Th
 
 export {
     getLayoutMode,
+    getDefaultLayoutMode,
     setLayoutMode,
+    setDefaultLayoutMode,
     toggleLayoutMode,
     resetLayoutMode,
+    hasStoredLayoutMode,
     DEFAULT_LAYOUT_MODE,
 } from './layoutConfig'
 export type { LayoutMode } from './layoutConfig'
 
+export {
+    applyServerUiDefaults,
+    UI_THEME_PRESET_KEY,
+    UI_TABS_ENABLED_KEY,
+} from './uiDefaults'
+
 import { resetUserTheme } from './themeConfig'
 import { resetLayoutMode } from './layoutConfig'
 

package/src/framework/config/layoutConfig.ts

@@ -4,29 +4,64 @@ export type LayoutMode = 'tabs' | 'single';
 
 const LAYOUT_MODE_KEY = 'oa-layout-tabs';
 
+/** 页签模式（多页签）/ 单页模式 */
 export const DEFAULT_LAYOUT_MODE: LayoutMode = 'tabs';
 
 const LAYOUT_MODES: LayoutMode[] = ['tabs', 'single'];
 
-function readStoredLayoutMode(): LayoutMode {
-    if (typeof window === 'undefined') return DEFAULT_LAYOUT_MODE;
+function readStoredLayoutMode(): LayoutMode | null {
+    if (typeof window === 'undefined') return null;
     try {
         const mode = localStorage.getItem(LAYOUT_MODE_KEY);
         if (mode && LAYOUT_MODES.includes(mode as LayoutMode)) return mode as LayoutMode;
     } catch {
         // 隐私模式下 localStorage 不可用，忽略
     }
-    return DEFAULT_LAYOUT_MODE;
+    return null;
 }
 
-let currentLayoutMode: LayoutMode = readStoredLayoutMode();
+/** 用户是否在本地自定义过页签模式 */
+export function hasStoredLayoutMode(): boolean {
+    return readStoredLayoutMode() !== null;
+}
+
+function removeStoredLayoutMode() {
+    if (typeof window === 'undefined') return;
+    try {
+        localStorage.removeItem(LAYOUT_MODE_KEY);
+    } catch {
+        // 忽略
+    }
+}
+
+/** 全局默认布局（来自参数设置，未自定义用户使用） */
+let defaultLayoutMode: LayoutMode = DEFAULT_LAYOUT_MODE;
+
+let currentLayoutMode: LayoutMode = readStoredLayoutMode() ?? DEFAULT_LAYOUT_MODE;
 
-/** 当前布局模式：'tabs' 多标签页 / 'single' 单页 */
+/** 当前页签模式：'tabs' 多页签 / 'single' 单页 */
 export function getLayoutMode(): LayoutMode {
     return currentLayoutMode;
 }
 
-/** 设置布局模式，持久化并广播 layoutChange 供管理布局重渲染 */
+export function getDefaultLayoutMode(): LayoutMode {
+    return defaultLayoutMode;
+}
+
+/**
+ * 应用参数设置下发的全局默认页签模式。
+ * 仅在用户本地没有自定义时生效；已自定义用户保持个人选择。
+ */
+export function setDefaultLayoutMode(mode: LayoutMode) {
+    if (!LAYOUT_MODES.includes(mode)) return;
+    defaultLayoutMode = mode;
+    if (hasStoredLayoutMode() || currentLayoutMode === mode) return;
+
+    currentLayoutMode = mode;
+    EventBus.emit('layoutChange', mode);
+}
+
+/** 设置页签模式，持久化并广播 layoutChange 供管理布局重渲染 */
 export function setLayoutMode(mode: LayoutMode) {
     if (!LAYOUT_MODES.includes(mode) || currentLayoutMode === mode) return;
     currentLayoutMode = mode;
@@ -46,7 +81,11 @@ export function toggleLayoutMode(): LayoutMode {
     return next;
 }
 
-/** 恢复默认布局（多标签页） */
+/** 恢复默认页签模式：清除本地覆盖，回到参数设置的全局默认 */
 export function resetLayoutMode() {
-    setLayoutMode(DEFAULT_LAYOUT_MODE);
+    removeStoredLayoutMode();
+    if (currentLayoutMode === defaultLayoutMode) return;
+
+    currentLayoutMode = defaultLayoutMode;
+    EventBus.emit('layoutChange', currentLayoutMode);
 }

package/src/framework/config/themeConfig.ts

@@ -92,7 +92,10 @@ export const RADIUS_PRESETS: ThemeRadiusPreset[] = [
 
 export const DEFAULT_RADIUS_KEY: ThemeRadius = 'default';
 
-/** 可选主题预设；antd 预设不做任何颜色覆盖，保持 100% 原生观感 */
+/**
+ * 可选主题预设；antd 预设不做任何颜色覆盖，保持 100% 原生观感。
+ * 按色相环顺序排列：蓝 → 蓝灰 → 靛蓝 → 紫 → 粉 → 红 → 橙 → 绿 → 青，便于用户按相近色比较选择。
+ */
 export const THEME_PRESETS: ThemePreset[] = [
     {
         key: 'antd',
@@ -100,24 +103,24 @@ export const THEME_PRESETS: ThemePreset[] = [
         colors: {},
     },
     {
-        key: 'cyan',
-        name: '青碧',
+        key: 'graphite',
+        name: '石墨灰',
         colors: {
-            colorPrimary: '#13c2c2',
-            siderBg: '#0C2E2E',
-            siderSubBg: '#0C2E2E',
-            siderTriggerBg: '#082222',
+            colorPrimary: '#2f3542',
+            siderBg: '#1B2026',
+            siderSubBg: '#1B2026',
+            siderTriggerBg: '#141A20',
             siderHoverBg: 'rgba(255,255,255,0.06)',
         },
     },
     {
-        key: 'green',
-        name: '翠竹',
+        key: 'indigo',
+        name: '靛蓝',
         colors: {
-            colorPrimary: '#389e0d',
-            siderBg: '#10291A',
-            siderSubBg: '#10291A',
-            siderTriggerBg: '#0B1E13',
+            colorPrimary: '#4f46e5',
+            siderBg: '#1E1B4B',
+            siderSubBg: '#1E1B4B',
+            siderTriggerBg: '#17143C',
             siderHoverBg: 'rgba(255,255,255,0.06)',
         },
     },
@@ -132,6 +135,17 @@ export const THEME_PRESETS: ThemePreset[] = [
             siderHoverBg: 'rgba(255,255,255,0.06)',
         },
     },
+    {
+        key: 'pink',
+        name: '樱花粉',
+        colors: {
+            colorPrimary: '#eb2f96',
+            siderBg: '#2B1024',
+            siderSubBg: '#2B1024',
+            siderTriggerBg: '#200B1A',
+            siderHoverBg: 'rgba(255,255,255,0.06)',
+        },
+    },
     {
         key: 'red',
         name: '中国红',
@@ -155,13 +169,24 @@ export const THEME_PRESETS: ThemePreset[] = [
         },
     },
     {
-        key: 'graphite',
-        name: '石墨灰',
+        key: 'green',
+        name: '翠竹',
         colors: {
-            colorPrimary: '#2f3542',
-            siderBg: '#1B2026',
-            siderSubBg: '#1B2026',
-            siderTriggerBg: '#141A20',
+            colorPrimary: '#389e0d',
+            siderBg: '#10291A',
+            siderSubBg: '#10291A',
+            siderTriggerBg: '#0B1E13',
+            siderHoverBg: 'rgba(255,255,255,0.06)',
+        },
+    },
+    {
+        key: 'cyan',
+        name: '青碧',
+        colors: {
+            colorPrimary: '#13c2c2',
+            siderBg: '#0C2E2E',
+            siderSubBg: '#0C2E2E',
+            siderTriggerBg: '#082222',
             siderHoverBg: 'rgba(255,255,255,0.06)',
         },
     },
@@ -174,6 +199,8 @@ const THEME_RADIUS_KEY = 'oa-theme-radius';
 
 /** 业务侧传入的颜色基线（由 setThemeColors 设置） */
 let businessColors: Partial<ThemeColors> | null = null;
+/** 全局默认预设 key（来自参数设置，未自定义用户使用） */
+let defaultPresetKey: string = DEFAULT_PRESET_KEY;
 /** 用户选择的预设 key（持久化到 localStorage） */
 let presetKey: string = readStoredPreset();
 let densityKey: ThemeDensity = readStoredDensity();
@@ -192,15 +219,24 @@ function readStoredMode(): ThemeMode {
     }
 }
 
-function readStoredPreset(): string {
-    if (typeof window === 'undefined') return DEFAULT_PRESET_KEY;
+function readStoredPresetKey(): string | null {
+    if (typeof window === 'undefined') return null;
     try {
         const key = localStorage.getItem(THEME_PRESET_KEY);
         if (key && THEME_PRESETS.some(p => p.key === key)) return key;
     } catch {
         // 隐私模式下 localStorage 不可用，忽略
     }
-    return DEFAULT_PRESET_KEY;
+    return null;
+}
+
+function readStoredPreset(): string {
+    return readStoredPresetKey() ?? DEFAULT_PRESET_KEY;
+}
+
+/** 用户是否在本地自定义过主题色预设 */
+export function hasStoredPreset(): boolean {
+    return readStoredPresetKey() !== null;
 }
 
 function persistPreset(key: string) {
@@ -243,6 +279,15 @@ function writeStored(key: string, value: string) {
     }
 }
 
+function removeStored(key: string) {
+    if (typeof window === 'undefined') return;
+    try {
+        localStorage.removeItem(key);
+    } catch {
+        // 忽略
+    }
+}
+
 function getActiveDensity(): ThemeDensityPreset | undefined {
     return DENSITY_PRESETS.find(p => p.key === densityKey);
 }
@@ -454,6 +499,26 @@ export function getActivePresetKey(): string {
     return presetKey;
 }
 
+export function getDefaultPresetKey(): string {
+    return defaultPresetKey;
+}
+
+/**
+ * 应用参数设置下发的全局默认主题色。
+ * 仅在用户本地没有自定义预设时生效；已自定义用户保持个人选择，
+ * 但其「恢复默认」会回到这里设置的值。
+ */
+export function setDefaultThemePreset(key: string) {
+    if (!THEME_PRESETS.some(p => p.key === key)) return;
+    defaultPresetKey = key;
+    if (hasStoredPreset() || presetKey === key) return;
+
+    presetKey = key;
+    invalidate();
+    syncCssVars(getToken());
+    EventBus.emit('themeChange', currentMode);
+}
+
 /** 应用界面密度预设，持久化并广播 themeChange */
 export function applyDensityPreset(key: ThemeDensity) {
     if (!DENSITY_PRESETS.some(p => p.key === key)) return;
@@ -482,13 +547,16 @@ export function getActiveRadiusKey(): ThemeRadius {
     return radiusKey;
 }
 
-/** 恢复默认：颜色 / 密度 / 圆角 / 明暗 全部复位（不影响布局，布局由 resetAllSettings 统一处理） */
+/**
+ * 恢复默认：主题色回到参数设置的全局默认，密度 / 圆角 / 明暗复位（不影响布局，布局由 resetAllSettings 统一处理）。
+ * 主题色会同时清除本地覆盖，之后管理员调整全局默认值时重新生效。
+ */
 export function resetUserTheme() {
-    presetKey = DEFAULT_PRESET_KEY;
+    presetKey = defaultPresetKey;
     densityKey = DEFAULT_DENSITY_KEY;
     radiusKey = DEFAULT_RADIUS_KEY;
     currentMode = 'light';
-    persistPreset(presetKey);
+    removeStored(THEME_PRESET_KEY);
     writeStored(THEME_DENSITY_KEY, densityKey);
     writeStored(THEME_RADIUS_KEY, radiusKey);
     writeStored(THEME_MODE_KEY, currentMode);

package/src/framework/config/uiDefaults.ts

@@ -0,0 +1,26 @@
+import { setDefaultThemePreset } from './themeConfig';
+import { setDefaultLayoutMode } from './layoutConfig';
+
+/** 参数设置中「默认界面」分组的配置键 */
+export const UI_THEME_PRESET_KEY = 'sys.ui.theme-preset';
+export const UI_TABS_ENABLED_KEY = 'sys.ui.tabs-enabled';
+
+/**
+ * 应用后端下发的全局默认界面配置（来自 site-info.config）。
+ *
+ * 只对未在本地自定义过的用户生效；已自定义用户保持个人设置，
+ * 其「恢复默认」会回到这里设置的全局默认值。
+ */
+export function applyServerUiDefaults(config?: Record<string, unknown> | null) {
+    if (!config) return;
+
+    const preset = config[UI_THEME_PRESET_KEY];
+    if (typeof preset === 'string') {
+        setDefaultThemePreset(preset);
+    }
+
+    const tabsEnabled = config[UI_TABS_ENABLED_KEY];
+    if (typeof tabsEnabled === 'boolean') {
+        setDefaultLayoutMode(tabsEnabled ? 'tabs' : 'single');
+    }
+}

package/src/framework/fields/FieldEditor/index.tsx

@@ -35,7 +35,7 @@ export class FieldEditor extends React.Component<FieldEditorProps, {loading: boo
     render() {
         const {loading} = this.state;
         const isPublic = this.props.isPublic ?? true;
-        const uploadUrl = UrlUtils.contextPath('/admin/sysFile/upload') + '?isPublic=' + isPublic;
+        const uploadUrl = UrlUtils.contextPath('/admin/sys-file/upload') + '?isPublic=' + isPublic;
         const jsUrl = UrlUtils.contextPath('/admin/tinymce/tinymce.min.js');
         const {value, onChange, height} = this.props;
         const editorHeight = height || 300;