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

package/client/components/ui/table.tsx

@@ -0,0 +1,113 @@
+import * as React from 'react';
+import { cn } from 'cn';
+
+function Table({ className, ...props }: React.ComponentProps<'table'>) {
+  return (
+    <div
+      data-slot='table-container'
+      className='relative w-full overflow-x-auto'
+    >
+      <table
+        data-slot='table'
+        className={cn('w-full caption-bottom text-sm', className)}
+        {...props}
+      />
+    </div>
+  );
+}
+
+function TableHeader({ className, ...props }: React.ComponentProps<'thead'>) {
+  return (
+    <thead
+      data-slot='table-header'
+      className={cn('[&_tr]:border-b', className)}
+      {...props}
+    />
+  );
+}
+
+function TableBody({ className, ...props }: React.ComponentProps<'tbody'>) {
+  return (
+    <tbody
+      data-slot='table-body'
+      className={cn('[&_tr:last-child]:border-0', className)}
+      {...props}
+    />
+  );
+}
+
+function TableFooter({ className, ...props }: React.ComponentProps<'tfoot'>) {
+  return (
+    <tfoot
+      data-slot='table-footer'
+      className={cn(
+        'border-t bg-muted/50 font-medium [&>tr]:last:border-b-0',
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+function TableRow({ className, ...props }: React.ComponentProps<'tr'>) {
+  return (
+    <tr
+      data-slot='table-row'
+      className={cn(
+        'border-b transition-colors hover:bg-muted/50 has-aria-expanded:bg-muted/50 data-[state=selected]:bg-muted',
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+function TableHead({ className, ...props }: React.ComponentProps<'th'>) {
+  return (
+    <th
+      data-slot='table-head'
+      className={cn(
+        'h-10 px-2 text-left align-middle font-medium whitespace-nowrap text-foreground [&:has([role=checkbox])]:pr-0',
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+function TableCell({ className, ...props }: React.ComponentProps<'td'>) {
+  return (
+    <td
+      data-slot='table-cell'
+      className={cn(
+        'p-2 align-middle whitespace-nowrap [&:has([role=checkbox])]:pr-0',
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+function TableCaption({
+  className,
+  ...props
+}: React.ComponentProps<'caption'>) {
+  return (
+    <caption
+      data-slot='table-caption'
+      className={cn('mt-4 text-sm text-muted-foreground', className)}
+      {...props}
+    />
+  );
+}
+
+export {
+  Table,
+  TableHeader,
+  TableBody,
+  TableFooter,
+  TableHead,
+  TableRow,
+  TableCell,
+  TableCaption,
+};

package/client/layouts/components/app-sidebar.tsx

@@ -33,7 +33,7 @@ import { AppBrand } from './app-brand.js';
 
 /**
  * The shell's sidebar state: shadcn's provider, with the desktop icon mode kept in the shared sidebar preference
- * (`use-sidebar-preference.ts`) so every layout on this origin opens it the same way. Whether the phone's sheet is
+ * (`use-sidebar-preference.ts`) so every layout of this application opens it the same way. Whether the phone's sheet is
  * open stays local to the layout.
  */
 export function AppSidebarProvider({

package/client/layouts/use-sidebar-preference.ts

@@ -1,57 +1,77 @@
-import { useSyncExternalStore, type SetStateAction } from 'react';
-
-// All applications and layout surfaces on this origin share this preference.
-const storageKey = 'nocobase:sidebar:collapsed';
-const changeEvent = 'nocobase:sidebar-preference-change';
-let memoryValue = false;
-let memoryOnly = false;
-
-function getSnapshot(): boolean {
-  if (memoryOnly) return memoryValue;
-  try {
-    memoryValue = localStorage.getItem(storageKey) === 'true';
-  } catch {
-    // Storage may be unavailable; keep the current session's preference.
+import {
+  createContext,
+  useContext,
+  useSyncExternalStore,
+  type SetStateAction,
+} from 'react';
+
+// Each application shares its preference across layouts and tabs, never across scopes.
+export function createSidebarPreferenceStore(scope: string) {
+  const storageKey = `nocobase:sidebar:collapsed:${scope}`;
+  const changeEvent = `nocobase:sidebar-preference-change:${scope}`;
+  let memoryValue = false;
+  let memoryOnly = false;
+
+  function getSnapshot(): boolean {
+    if (memoryOnly) return memoryValue;
+    try {
+      memoryValue = localStorage.getItem(storageKey) === 'true';
+    } catch {
+      // Storage may be unavailable; keep this application's session preference.
+    }
+    return memoryValue;
   }
-  return memoryValue;
-}
 
-function subscribe(notify: () => void): () => void {
-  const onStorage = (event: StorageEvent) => {
-    if (event.key === storageKey || event.key === null) notify();
-  };
-  window.addEventListener('storage', onStorage);
-  window.addEventListener(changeEvent, notify);
-  return () => {
-    window.removeEventListener('storage', onStorage);
-    window.removeEventListener(changeEvent, notify);
-  };
-}
+  function subscribe(notify: () => void): () => void {
+    const onStorage = (event: StorageEvent) => {
+      if (event.key === storageKey || event.key === null) notify();
+    };
+    window.addEventListener('storage', onStorage);
+    window.addEventListener(changeEvent, notify);
+    return () => {
+      window.removeEventListener('storage', onStorage);
+      window.removeEventListener(changeEvent, notify);
+    };
+  }
 
-function setCollapsed(update: SetStateAction<boolean>): void {
-  const current = getSnapshot();
-  memoryValue = typeof update === 'function' ? update(current) : update;
-  try {
-    localStorage.setItem(storageKey, String(memoryValue));
-  } catch {
-    memoryOnly = true;
-    // The toggle remains usable when storage is blocked.
+  function setCollapsed(update: SetStateAction<boolean>): void {
+    const current = getSnapshot();
+    memoryValue = typeof update === 'function' ? update(current) : update;
+    try {
+      localStorage.setItem(storageKey, String(memoryValue));
+    } catch {
+      memoryOnly = true;
+      // The toggle remains usable when storage is blocked.
+    }
+    window.dispatchEvent(new Event(changeEvent));
   }
-  window.dispatchEvent(new Event(changeEvent));
+
+  return { getSnapshot, subscribe, setCollapsed };
 }
 
-function getServerSnapshot(): boolean {
-  return false;
+type SidebarPreferenceStore = ReturnType<typeof createSidebarPreferenceStore>;
+
+export function createAppSidebarPreferenceStore(basename: string = '') {
+  const normalizedBasename = `/${basename.replace(/^\/+|\/+$/g, '')}`;
+  return createSidebarPreferenceStore(`app:${normalizedBasename}`);
 }
 
+const SidebarPreferenceContext = createContext<SidebarPreferenceStore | null>(
+  null,
+);
+
+export const SidebarPreferenceProvider = SidebarPreferenceContext.Provider;
+
 export function useSidebarPreference(): readonly [
   boolean,
   (update: SetStateAction<boolean>) => void,
 ] {
+  const store = useContext(SidebarPreferenceContext);
+  if (!store) throw new Error('SidebarPreferenceProvider is required.');
   const collapsed = useSyncExternalStore(
-    subscribe,
-    getSnapshot,
-    getServerSnapshot,
+    store.subscribe,
+    store.getSnapshot,
+    () => false,
   );
-  return [collapsed, setCollapsed];
+  return [collapsed, store.setCollapsed];
 }

package/client/locales/system/en-US.ts

@@ -1,3 +1,4 @@
+import settings from './settings-en-US.js';
 import type { LocaleResource } from '@nocobase/i18n';
 import deviceApprovalEnUS from '#extensions/nocobase-device-approval/locales/en-US';
 import inboxEnUS from '#extensions/nocobase-inbox/locales/en-US';
@@ -7,6 +8,12 @@ import inboxEnUS from '#extensions/nocobase-inbox/locales/en-US';
  * upgrade replaces this file, so put the application's own copy in `../en-US.ts` rather than here.
  */
 const systemEnUS = {
+  settings,
+  'auth.preparingSession': 'Preparing your session…',
+  'auth.connectionFailed': 'Unable to connect',
+  'auth.connectionFailedDescription':
+    'The realtime connection could not be prepared. Retry to enter the application, or sign out.',
+
   'auth.passwordResetSuccess':
     'Your password has been reset. Sign in with your new password.',
   'auth.requestNewResetLink': 'Request a new reset link',

package/client/locales/system/settings-en-US.ts

@@ -0,0 +1,141 @@
+const settings = {
+  revokeRoles: 'Revoke roles',
+  keyConflict: 'This role key is already in use.',
+  userPermissions: 'User management',
+  readUsers: 'View users',
+  createUsers: 'Create users',
+  updateUsers: 'Edit users',
+  inviteUsers: 'Invite users',
+  deleteUsers: 'Delete users',
+  resetUserPassword: 'Reset password',
+  assignRole: 'Assign roles',
+
+  assignedRoles: 'Assigned roles',
+  actionSaved: 'Updated access for "{{name}}"',
+
+  identityConflict: 'This email or username is already in use.',
+  signInAgain: 'Sign in again',
+  passwordPolicy: 'Password does not meet the current password policy.',
+
+  reload: 'Reload role',
+  title: 'System settings',
+  users: 'Users',
+  roles: 'Roles and permissions',
+  usersDescription: 'Manage accounts, access and active sessions.',
+  rolesDescription: 'Define what each role can access and do.',
+  userSearch: 'Search names, usernames or emails',
+  roleSearch: 'Search role names',
+  newUser: 'New user',
+  editUser: 'Edit user',
+  newRole: 'New role',
+  editRole: 'Edit role',
+  name: 'Name',
+  username: 'Username',
+  email: 'Email',
+  password: 'Initial password',
+  roleName: 'Role name',
+  key: 'Key',
+  status: 'Status',
+  actions: 'Actions',
+  actionsFor: 'Actions for {{name}}',
+  all: 'All statuses',
+  enabled: 'Enabled',
+  disabled: 'Disabled',
+  clear: 'Clear filters',
+  noResults: 'No matching results',
+  clearHint: 'Try a different search or clear the filters.',
+  noUsers: 'No users yet',
+  noRoles: 'No roles yet',
+  create: 'Create',
+  edit: 'Edit',
+  save: 'Save',
+  cancel: 'Cancel',
+  saving: 'Saving…',
+  confirm: 'Confirm',
+  enable: 'Enable',
+  disable: 'Disable',
+  revokeSessions: 'Revoke sessions',
+  disableTitle: 'Disable user "{{name}}"?',
+  disableHint:
+    'This user will be unable to sign in and existing sessions will end.',
+  enableTitle: 'Enable user "{{name}}"?',
+  enableHint: 'This user will be able to sign in again.',
+  revokeTitle: 'Revoke sessions for "{{name}}"?',
+  revokeHint: 'This user will need to sign in again.',
+  revokeRoleTitle: 'Revoke roles from "{{name}}"?',
+  revokeRoleHint: 'Access granted by the listed roles will be removed.',
+  created: 'Created user "{{name}}"',
+  saved: 'Saved "{{name}}"',
+  rolesSaved: 'Updated roles for "{{name}}"',
+  required: 'Enter a value for this field',
+  invalidEmail: 'Enter a valid email address',
+  protected: 'Protected',
+  custom: 'Custom',
+  protectedHint:
+    'This role is protected. Only explicitly permitted changes are available.',
+  unsaved: 'Unsaved changes',
+  discardTitle: 'Discard changes?',
+  discardHint: 'Your unsaved changes will be lost.',
+  failed: 'Unable to complete the request. Try again.',
+  retry: 'Retry',
+  loading: 'Loading',
+  denied: 'You do not have access. Contact an administrator.',
+  missing: 'This record does not exist or has been deleted.',
+  conflict:
+    'This role has changed. Reload it and merge your changes before saving.',
+  sessionEnded: 'Your session has ended. Sign in again.',
+  previous: 'Previous',
+  next: 'Next',
+  total_one: '{{count}} user',
+  total_other: '{{count}} users',
+  access: 'Access',
+  permissionSearch: 'Search categories, groups or permissions',
+  enabledOnly: 'Enabled only',
+  noPermissions: 'No permissions to configure',
+  permissionCategories: 'Permission categories',
+  selectAllPermissions: 'All',
+  selectVisiblePermissions: 'Select visible permissions in {{name}}',
+  permissionSummary: '{{enabled}} of {{total}} enabled',
+  noRecordScope: 'No records (not authorized)',
+  permissionFilter: {
+    limit: 'Up to 20 conditions',
+    configure: 'Conditions',
+    title: 'Configure record filter',
+    description:
+      'Apply conditions to the role draft, then save the role to make them effective.',
+    all: 'Match all conditions',
+    any: 'Match any condition',
+    field: 'Field',
+    operator: 'Operator',
+    valueType: 'Value type',
+    value: 'Value',
+    text: 'Text',
+    number: 'Number',
+    boolean: 'Boolean',
+    true: 'Yes',
+    false: 'No',
+    add: 'Add condition',
+    remove: 'Remove',
+    cancel: 'Cancel',
+    apply: 'Apply',
+    invalid:
+      'Choose valid fields and complete all values. Include at least one condition.',
+    advanced:
+      'This existing filter uses advanced conditions. It will be preserved unless you explicitly reconfigure it.',
+    reconfigure: 'Reconfigure',
+    operators: {
+      $eq: 'Equals',
+      $ne: 'Does not equal',
+      $includes: 'Contains',
+      $gt: 'Greater than',
+      $gte: 'At least',
+      $lt: 'Less than',
+      $lte: 'At most',
+      $empty: 'Is empty',
+      $notEmpty: 'Is not empty',
+    },
+  },
+  recordScope: 'Record scope',
+  levelFor: 'Scope for {{name}}',
+};
+export default settings;

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

@@ -0,0 +1,135 @@
+const settings = {
+  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,16 @@
+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 = {
+  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={
         <>