@nocobase/app-template-default 1.0.0-beta.68 → 1.0.0-beta.70

package/client/locales/system/settings-zh-CN.ts

@@ -0,0 +1,136 @@
+const settings = {
+  unnamedPage: '未命名页面（{{path}}）',
+  revokeRoles: '撤销角色',
+  keyConflict: '此角色标识已被使用。',
+  userPermissions: '用户管理',
+  readUsers: '查看用户',
+  createUsers: '创建用户',
+  updateUsers: '编辑用户',
+  inviteUsers: '邀请用户',
+  deleteUsers: '删除用户',
+  resetUserPassword: '重置密码',
+  assignRole: '分配角色',
+
+  assignedRoles: '已分配角色',
+  actionSaved: '已更新“{{name}}”的访问状态',
+
+  identityConflict: '此邮箱或用户名已被使用。',
+  signInAgain: '重新登录',
+  passwordPolicy: '密码不符合当前密码策略。',
+
+  reload: '重新加载角色',
+  title: '系统设置',
+  users: '用户管理',
+  roles: '角色与权限',
+  usersDescription: '管理用户账户、角色及登录会话。',
+  rolesDescription: '设置每个角色可访问的页面与可执行的操作。',
+  userSearch: '搜索姓名、用户名或邮箱',
+  roleSearch: '搜索角色名称',
+  newUser: '新建用户',
+  editUser: '编辑用户',
+  newRole: '新建角色',
+  editRole: '编辑角色',
+  name: '姓名',
+  username: '用户名',
+  email: '邮箱',
+  password: '初始密码',
+  roleName: '角色名称',
+  key: '标识',
+  status: '状态',
+  actions: '操作',
+  actionsFor: '{{name}} 的操作',
+  all: '全部状态',
+  enabled: '启用',
+  disabled: '停用',
+  clear: '清除筛选',
+  noResults: '没有匹配的结果',
+  clearHint: '请更换搜索条件或清除筛选。',
+  noUsers: '暂无用户',
+  noRoles: '暂无角色',
+  create: '创建',
+  edit: '编辑',
+  save: '保存',
+  cancel: '取消',
+  saving: '正在保存…',
+  confirm: '确认',
+  enable: '启用',
+  disable: '禁用',
+  revokeSessions: '撤销会话',
+  disableTitle: '禁用用户“{{name}}”？',
+  disableHint: '该用户将无法登录，现有会话将失效。',
+  enableTitle: '启用用户“{{name}}”？',
+  enableHint: '该用户可以重新登录。',
+  revokeTitle: '撤销用户“{{name}}”的会话？',
+  revokeHint: '该用户需要重新登录。',
+  revokeRoleTitle: '撤销“{{name}}”的角色？',
+  revokeRoleHint: '将移除所列角色授予的访问权限。',
+  created: '已创建用户“{{name}}”',
+  saved: '已保存“{{name}}”',
+  rolesSaved: '已更新“{{name}}”的角色',
+  required: '请填写此字段',
+  invalidEmail: '请输入有效邮箱',
+  protected: '受保护',
+  custom: '自定义',
+  protectedHint: '此角色受系统保护，仅允许明确授权的修改。',
+  unsaved: '有未保存的更改',
+  discardTitle: '放弃未保存的更改？',
+  discardHint: '未保存的更改将丢失。',
+  failed: '请求失败，请重试。',
+  retry: '重试',
+  loading: '加载中',
+  denied: '无权查看，请联系管理员。',
+  missing: '记录不存在或已被删除。',
+  conflict: '角色已被其他人修改，请重新加载后合并。',
+  sessionEnded: '会话已结束，请重新登录。',
+  previous: '上一页',
+  next: '下一页',
+  total_one: '共 {{count}} 位用户',
+  total_other: '共 {{count}} 位用户',
+  access: '访问',
+  permissionSearch: '搜索分类、分组或权限',
+  enabledOnly: '仅看已开启',
+  noPermissions: '暂无可配置权限',
+  permissionCategories: '权限分类',
+  selectAllPermissions: '全选',
+  selectVisiblePermissions: '选择“{{name}}”中显示的权限',
+  permissionSummary: '已开启 {{enabled}} / {{total}}',
+  noRecordScope: '无记录（未授权）',
+  permissionFilter: {
+    limit: '最多支持 20 个条件',
+    configure: '筛选条件',
+    title: '配置记录筛选',
+    description: '应用条件后还需保存角色，权限才会生效。',
+    all: '满足全部条件',
+    any: '满足任一条件',
+    field: '字段',
+    operator: '比较方式',
+    valueType: '值类型',
+    value: '值',
+    text: '文本',
+    number: '数字',
+    boolean: '是或否',
+    true: '是',
+    false: '否',
+    add: '添加条件',
+    remove: '移除',
+    cancel: '取消',
+    apply: '应用',
+    invalid: '请选择有效字段并填写完整的值，至少保留一个条件。',
+    advanced: '现有筛选包含高级条件，将保留原样；重新配置后应用才会替换。',
+    reconfigure: '重新配置',
+    operators: {
+      $eq: '等于',
+      $ne: '不等于',
+      $includes: '包含',
+      $gt: '大于',
+      $gte: '大于或等于',
+      $lt: '小于',
+      $lte: '小于或等于',
+      $empty: '为空',
+      $notEmpty: '不为空',
+    },
+  },
+  recordScope: '数据范围',
+  levelFor: '{{name}} 的范围',
+};
+export default settings;

package/client/locales/system/zh-CN.ts

@@ -1,9 +1,38 @@
+import settings from './settings-zh-CN.js';
 import type { SystemResource } from './en-US.js';
 import deviceApprovalZhCN from '#extensions/nocobase-device-approval/locales/zh-CN';
 import inboxZhCN from '#extensions/nocobase-inbox/locales/zh-CN';
 
 /** The Chinese copy of what the template ships; see `./en-US.ts`. */
 const systemZhCN: SystemResource = {
+  flowDiagram: {
+    configure: '配置',
+    overview: '流程缩略导航',
+    actualSize: '实际大小',
+    states: '状态',
+    transitions: '转移',
+    configurable: '可配置参数',
+    current: '当前',
+    visited: '已经过',
+    initial: '初始状态',
+    final: '终止状态',
+    state: '状态',
+    zoomOut: '缩小',
+    zoomIn: '放大',
+    fit: '适应画布',
+
+    empty: '暂无可展示的状态。',
+    loading: '正在布局流程图…',
+    failed: '无法布局此流程图。',
+    nodeHelp: '按 Enter 或空格键选择状态。',
+    edgeHelp: '按 Enter 或空格键选择转移。',
+  },
+  settings,
+  'auth.preparingSession': '正在准备登录会话…',
+  'auth.connectionFailed': '连接失败',
+  'auth.connectionFailedDescription':
+    '实时连接暂时无法准备就绪。请重试后进入应用，或退出登录。',
+
   'auth.passwordResetSuccess': '密码已重置，请用新密码登录。',
   'auth.requestNewResetLink': '重新申请重置链接',
 

package/client/pages/auth/auth-page.css

@@ -35,3 +35,18 @@
 .dark .auth-page [data-slot='input-group'] input {
   background-color: transparent;
 }
+
+/* Keep login controls comfortable while tightening the form's vertical rhythm. */
+.auth-login-page main header {
+  margin-bottom: calc(var(--spacing) * 6);
+}
+
+.auth-login-page form > [data-slot='field-group'] {
+  gap: calc(var(--spacing) * 4);
+}
+
+.auth-login-page form [data-slot='input'],
+.auth-login-page form [data-slot='input-group'],
+.auth-login-page form button[type='submit'] {
+  height: calc(var(--spacing) * 10);
+}

package/client/pages/auth/login.tsx

@@ -21,6 +21,7 @@ export default function LoginPage(): ReactElement {
 
   return (
     <AuthPage
+      className='auth-login-page'
       description={t('auth.loginDescription')}
       title={t('auth.welcome')}
     >
@@ -36,7 +37,6 @@ export default function LoginPage(): ReactElement {
           {
             content: (
               <PasswordLoginForm
-                className='[&_[data-slot=input]]:h-12 [&_[data-slot=input-group]]:h-12 [&_button[type=submit]]:h-12'
                 error={login.error?.message}
                 footer={
                   signUpAvailable ? (

package/client/pages/auth/shared.tsx

@@ -8,6 +8,7 @@ import { AuthSplitLayout } from '#extensions/nocobase-auth-split-layout/auth-spl
 import './auth-page.css';
 
 export interface AuthPageProps {
+  readonly className?: string;
   readonly title: ReactNode;
   readonly description: ReactNode;
   readonly children: ReactNode;
@@ -20,6 +21,7 @@ export interface AuthPageProps {
  */
 export function AuthPage({
   children,
+  className,
   description,
   title,
 }: AuthPageProps): ReactElement {
@@ -28,7 +30,7 @@ export function AuthPage({
     <AuthSplitLayout
       aside={<BrandPanel />}
       asideLabel={t('auth.about')}
-      className='auth-page'
+      className={['auth-page', className].filter(Boolean).join(' ')}
       description={description}
       logo={
         <>

package/client/pages/settings/hooks.tsx

@@ -0,0 +1,137 @@
+import {
+  ApiClientError,
+  useApiClient,
+  useNavigationGuard,
+} from '@nocobase/app-client';
+import { useCan } from '@nocobase/app-plugin-authorization/client';
+import { useTranslation } from '@nocobase/i18n/client';
+import { useCallback, useEffect, useRef, useState } from 'react';
+import { useLocation } from 'react-router';
+import { ConfirmAction } from './shared.js';
+
+export function useSettingsData<T>(path: string, keepPreviousData = false) {
+  const api = useApiClient();
+  const [revision, setRevision] = useState(0);
+  const [result, setResult] = useState<{
+    path: string;
+    revision: number;
+    data?: T;
+    error?: unknown;
+    loading: boolean;
+  }>({ path, revision: -1, loading: true });
+  useEffect(() => {
+    let active = true;
+    void api.request<T>({ path }).then(
+      (data) => {
+        if (active) setResult({ path, revision, data, loading: false });
+      },
+      (error: unknown) => {
+        if (active)
+          setResult((old) => ({
+            ...(old.path === path &&
+            !(
+              error instanceof ApiClientError &&
+              [401, 403, 404].includes(error.status)
+            )
+              ? old
+              : {}),
+            path,
+            revision,
+            error,
+            loading: false,
+          }));
+      },
+    );
+    return () => {
+      active = false;
+    };
+  }, [api, path, revision]);
+  return {
+    ...(result.path === path || keepPreviousData
+      ? result
+      : { path, loading: true, data: undefined, error: undefined }),
+    loading: result.path !== path || result.revision !== revision,
+    error:
+      result.path === path && result.revision === revision
+        ? result.error
+        : undefined,
+    reload: useCallback(() => setRevision((value) => value + 1), []),
+    replaceData: useCallback(
+      (data: T) => setResult({ path, revision, data, loading: false }),
+      [path, revision],
+    ),
+  };
+}
+
+export function useUserPermission(action: string, id = '*') {
+  return useCan({ resource: { type: 'user', id }, action }).can;
+}
+export function useRolePermission(action: string) {
+  return useCan({
+    resource: { type: 'settings', id: 'authorization.permission-sets' },
+    action,
+  }).can;
+}
+/** The same decision covers overlay close, sidebar links, browser history and refresh. */
+export function useSettingsLeave(
+  dirty: boolean,
+  busy: boolean,
+  onDiscard?: () => void,
+) {
+  const { t } = useTranslation();
+  const location = useLocation();
+  const allowedRef = useRef(false);
+  useEffect(() => {
+    allowedRef.current = false;
+  }, [location.key]);
+  const pendingRef = useRef<
+    { promise: Promise<boolean>; resolve: (value: boolean) => void } | undefined
+  >(undefined);
+  const [open, setOpen] = useState(false);
+  const guard = () => {
+    if (allowedRef.current) return true;
+    if (busy) return false;
+    if (!dirty) return true;
+    if (pendingRef.current) return pendingRef.current.promise;
+    let resolve!: (value: boolean) => void;
+    const promise = new Promise<boolean>((done) => {
+      resolve = done;
+    });
+    pendingRef.current = { promise, resolve };
+    setOpen(true);
+    return promise;
+  };
+  useNavigationGuard(guard);
+  useEffect(() => {
+    if (!dirty) return;
+    const handler = (event: BeforeUnloadEvent) => {
+      event.preventDefault();
+      event.returnValue = '';
+    };
+    window.addEventListener('beforeunload', handler);
+    return () => window.removeEventListener('beforeunload', handler);
+  }, [dirty]);
+  const decide = (value: boolean) => {
+    if (value) onDiscard?.();
+    allowedRef.current = value;
+    pendingRef.current?.resolve(value);
+    pendingRef.current = undefined;
+    setOpen(false);
+  };
+  return {
+    guard,
+    allow: () => {
+      allowedRef.current = true;
+    },
+    dialog: (
+      <ConfirmAction
+        open={open}
+        title={t('settings.discardTitle')}
+        description={t('settings.discardHint')}
+        busy={false}
+        onCancel={() => decide(false)}
+        onConfirm={() => decide(true)}
+      />
+    ),
+  };
+}

package/client/pages/settings/page-permission-titles.ts

@@ -0,0 +1,7 @@
+import type { PagePermissionTitles } from './page-permissions.js';
+
+/** Permission labels for application pages without navigation/breadcrumb titles (including overlays).
+ * Keys are existing route names; values are application translation keys.
+ * Do not add navigation/breadcrumbs or change authorization ids just to name a permission.
+ */
+export const pagePermissionTitles: PagePermissionTitles = {};

package/client/pages/settings/page-permissions.ts

@@ -0,0 +1,42 @@
+import type { AppClientRegisteredRoute } from '@nocobase/app-client/plugins';
+import type { LocalizedText } from '@nocobase/app-plugin-authorization/client';
+import type { CatalogResource } from './permissions-model.js';
+
+/** Application route names are stable within their owner; labels never change stored grants. */
+export type PagePermissionTitles = Readonly<Record<string, string>>;
+
+export function pagePermissionTitle(
+  route: AppClientRegisteredRoute,
+  titles: PagePermissionTitles,
+): LocalizedText | undefined {
+  const key =
+    (route.source === 'application' && Object.hasOwn(titles, route.name)
+      ? titles[route.name]
+      : undefined) ??
+    route.navigation?.title ??
+    route.breadcrumb?.title;
+  return key?.trim() ? { key, ns: route.packageName } : undefined;
+}
+
+/** Preserve every existing resource id/action; never use a technical route id as its label. */
+export function pagePermissionResources(
+  routes: readonly AppClientRegisteredRoute[],
+  titles: PagePermissionTitles,
+  unnamed: (path: string) => string,
+): CatalogResource[] {
+  return routes.flatMap((route) => [
+    ...(route.componentLoader &&
+    typeof route.authz === 'object' &&
+    route.authz.resource.type === 'page'
+      ? [
+          {
+            type: 'page',
+            id: route.authz.resource.id,
+            title: pagePermissionTitle(route, titles) ?? unnamed(route.path),
+            actions: [{ name: 'access', title: { key: 'settings.access' } }],
+          },
+        ]
+      : []),
+    ...pagePermissionResources(route.children ?? [], titles, unnamed),
+  ]);
+}

package/client/pages/settings/permission-filters.tsx

@@ -0,0 +1,119 @@
+import type { PermissionEditorSection } from '#components/permission-editor';
+import {
+  PermissionFilter,
+  type PermissionFilterLabels,
+} from '#components/permission-filter';
+import type {
+  PermissionGrant,
+  AuthorizationOptionsResponse,
+} from '@nocobase/app-plugin-authorization/client';
+import { getScopeSelection } from './permissions-model.js';
+
+export function configurePermissionScopes(
+  sections: readonly PermissionEditorSection[],
+  catalog: AuthorizationOptionsResponse,
+  grants: readonly PermissionGrant[],
+  text: (key: string, fallback?: string) => string,
+  editing: string | undefined,
+  setEditing: (id: string | undefined) => void,
+  onApply: (id: string, value: unknown) => void,
+  disabled: boolean,
+): readonly PermissionEditorSection[] {
+  const labels: PermissionFilterLabels = {
+    limit: text('settings.permissionFilter.limit'),
+    configure: text('settings.permissionFilter.configure'),
+    title: text('settings.permissionFilter.title'),
+    description: text('settings.permissionFilter.description'),
+    all: text('settings.permissionFilter.all'),
+    any: text('settings.permissionFilter.any'),
+    field: text('settings.permissionFilter.field'),
+    operator: text('settings.permissionFilter.operator'),
+    valueType: text('settings.permissionFilter.valueType'),
+    value: text('settings.permissionFilter.value'),
+    text: text('settings.permissionFilter.text'),
+    number: text('settings.permissionFilter.number'),
+    boolean: text('settings.permissionFilter.boolean'),
+    true: text('settings.permissionFilter.true'),
+    false: text('settings.permissionFilter.false'),
+    add: text('settings.permissionFilter.add'),
+    remove: text('settings.permissionFilter.remove'),
+    cancel: text('settings.permissionFilter.cancel'),
+    apply: text('settings.permissionFilter.apply'),
+    invalid: text('settings.permissionFilter.invalid'),
+    advanced: text('settings.permissionFilter.advanced'),
+    reconfigure: text('settings.permissionFilter.reconfigure'),
+    operators: Object.fromEntries(
+      [
+        '$eq',
+        '$ne',
+        '$includes',
+        '$gt',
+        '$gte',
+        '$lt',
+        '$lte',
+        '$empty',
+        '$notEmpty',
+      ].map((key) => [key, text(`settings.permissionFilter.operators.${key}`)]),
+    ),
+  };
+  const resources = catalog.sections.flatMap((section) =>
+    section.subsections.flatMap((sub) => sub.resources),
+  );
+  return sections.map((section) => ({
+    ...section,
+    groups: section.groups.map((group) => ({
+      ...group,
+      rows: group.rows.map((row) => ({
+        ...row,
+        scopes:
+          row.scopes?.map((scope) => {
+            if (scope.level !== 'customFilter' && editing !== scope.id)
+              return scope;
+            const [type, resourceId, action, key] = JSON.parse(
+              scope.id,
+            ) as string[];
+            const definition = resources
+              .find(
+                (resource) =>
+                  resource.type === type && resource.id === resourceId,
+              )
+              ?.dataScopes?.[action ?? '']?.find((item) => item.key === key);
+            const value = getScopeSelection(grants, scope.id);
+            const params: unknown =
+              value && typeof value === 'object'
+                ? Reflect.get(value, 'params')
+                : undefined;
+            const filter: unknown =
+              params && typeof params === 'object'
+                ? Reflect.get(params, 'filter')
+                : undefined;
+            return {
+              ...scope,
+              configuration: (
+                <PermissionFilter
+                  open={editing === scope.id}
+                  onOpenChange={(open) =>
+                    setEditing(open ? scope.id : undefined)
+                  }
+                  value={filter}
+                  fields={(definition?.fields ?? []).map((field) => ({
+                    value: field,
+                    label: text(`settings.permissionFields.${field}`, field),
+                  }))}
+                  labels={labels}
+                  disabled={disabled}
+                  onApply={(filter) =>
+                    onApply(scope.id, {
+                      type: 'recordAccess',
+                      key: 'customFilter',
+                      params: { filter },
+                    })
+                  }
+                />
+              ),
+            };
+          }) ?? [],
+      })),
+    })),
+  }));
+}