@nocobase/portal-template-default 1.0.3 → 1.0.4

package/src/locales/zh-CN.ts

@@ -1,11 +1,62 @@
 export const starter = {
+  "shell.workspace": "AI 应用工作区",
+  "shell.footer.freedom": "AI 自由构建。",
+  "shell.footer.reliability": "NocoBase 保障可靠运行。",
+  "auth.signOut": "退出登录",
+  "auth.signingOut": "正在退出...",
+  "buttons.apply": "应用",
+  "buttons.clear": "清除",
+  "buttons.undo": "撤销",
+  "pages.error.title": "页面不存在",
+  "pages.error.description": "你访问的页面不存在。",
+  "pages.error.backHome": "返回首页",
+  "table.filter.text.placeholder": "输入筛选内容...",
+  "table.filter.numeric.placeholder": "输入筛选数值...",
+  "table.filter.combobox.placeholder": "请选择...",
+  "table.filter.combobox.search": "搜索...",
+  "table.filter.combobox.noResults": "没有找到结果。",
+  "table.filter.operator.placeholder": "搜索操作符...",
+  "table.filter.operator.noResults": "没有找到操作符。",
+  "table.filter.operator.eq": "等于",
+  "table.filter.operator.ne": "不等于",
+  "table.filter.operator.lt": "小于",
+  "table.filter.operator.gt": "大于",
+  "table.filter.operator.lte": "小于或等于",
+  "table.filter.operator.gte": "大于或等于",
+  "table.filter.operator.in": "包含于数组",
+  "table.filter.operator.nin": "不包含于数组",
+  "table.filter.operator.ina": "包含于数组（区分大小写）",
+  "table.filter.operator.nina": "不包含于数组（区分大小写）",
+  "table.filter.operator.contains": "包含",
+  "table.filter.operator.ncontains": "不包含",
+  "table.filter.operator.containss": "包含（区分大小写）",
+  "table.filter.operator.ncontainss": "不包含（区分大小写）",
+  "table.filter.operator.between": "介于",
+  "table.filter.operator.nbetween": "不介于",
+  "table.filter.operator.null": "为空",
+  "table.filter.operator.nnull": "不为空",
+  "table.filter.operator.startswith": "开头是",
+  "table.filter.operator.nstartswith": "开头不是",
+  "table.filter.operator.startswiths": "开头是（区分大小写）",
+  "table.filter.operator.nstartswiths": "开头不是（区分大小写）",
+  "table.filter.operator.endswith": "结尾是",
+  "table.filter.operator.nendswith": "结尾不是",
+  "table.filter.operator.endswiths": "结尾是（区分大小写）",
+  "table.filter.operator.nendswiths": "结尾不是（区分大小写）",
+  "table.filter.operator.eqs": "等于（区分大小写）",
+  "table.filter.operator.nes": "不等于（区分大小写）",
   "buttons.create": "新建",
   "buttons.edit": "编辑",
   "buttons.show": "查看",
   "buttons.delete": "删除",
   "buttons.refresh": "刷新",
   "buttons.cancel": "取消",
+  "buttons.close": "关闭",
   "buttons.confirm": "确定要执行此操作吗？",
+  "unsavedChanges.title": "放弃未保存的修改？",
+  "unsavedChanges.description": "当前修改尚未保存，离开后这些修改将会丢失。",
+  "unsavedChanges.stay": "继续编辑",
+  "unsavedChanges.leave": "放弃修改",
   "views.create.title": "新建{{resource}}",
   "views.create.description": "在 NocoBase 工作区中添加新的{{resource}}。",
   "views.edit.title": "编辑{{resource}}",
@@ -49,6 +100,11 @@ export const app = {
   "users.actions.view": "查看用户",
   "users.actions.edit": "编辑用户",
   "users.actions.delete": "删除用户",
+  "users.drawer.create.title": "新建用户",
+  "users.drawer.create.description": "添加可以登录此 NocoBase 应用的用户。",
+  "users.drawer.edit.title": "编辑用户",
+  "users.drawer.edit.description": "更新用户的身份和联系方式。",
+  "users.drawer.show.description": "查看用户的身份、联系方式和关联角色。",
   "users.form.create.submit": "创建用户",
   "users.form.create.submitting": "正在创建...",
   "users.form.edit.submit": "保存修改",
@@ -72,8 +128,29 @@ export const app = {
   "users.detail.timestamps": "时间信息",
   "users.detail.noRoles": "尚未分配角色",
   "users.detail.unnamed": "未命名用户",
+  "users.detail.loadError.title": "无法加载用户",
+  "users.detail.loadError.description":
+    "该用户可能已不存在，或者你没有权限查看此用户。",
   "users.ai.table": "用户表格",
   "users.ai.detail": "用户详情",
   "users.ai.createForm": "新建用户表单",
   "users.ai.editForm": "编辑用户表单",
+  "common.yes": "是",
+  "common.no": "否",
+  "roles.drawer.description": "查看与当前用户关联的角色信息。",
+  "roles.fields.name": "名称",
+  "roles.fields.title": "标题",
+  "roles.fields.description": "描述",
+  "roles.fields.default": "默认角色",
+  "roles.fields.hidden": "隐藏",
+  "roles.fields.allowConfigure": "允许配置",
+  "roles.fields.createdAt": "创建时间",
+  "roles.fields.updatedAt": "更新时间",
+  "roles.detail.identity": "角色标识",
+  "roles.detail.settings": "角色设置",
+  "roles.detail.actions": "允许的操作",
+  "roles.detail.timestamps": "时间信息",
+  "roles.detail.unavailable":
+    "无法加载更多角色详情，当前展示用户关联数据中已有的信息。",
+  "roles.ai.detail": "角色详情",
 } as const;

package/src/pages/users/create.tsx

@@ -1,30 +1,67 @@
 import { type HttpError, useTranslate } from "@refinedev/core";
 import { useForm } from "@refinedev/react-hook-form";
 import { useMemo } from "react";
-import { useNavigate } from "react-router";
 
-import { CreateView } from "@/components/resources/views/create-view";
 import { Button } from "@/components/ui/button";
-import { Card, CardContent } from "@/components/ui/card";
 import { Form } from "@/components/ui/form";
 import { useAIForm, type AIFormField } from "@/extensions/nocobase-ai";
+import {
+  RouteDrawer,
+  RouteDrawerFooter,
+  useRefineUnsavedChangesGuard,
+  useRouteSurfaceClose,
+} from "@/extensions/nocobase-route-surfaces";
 import {
   applyAIUserFormValues,
   getAIUserFormFields,
   getAIUserFormValues,
 } from "./form-context";
 import { UserFormFields } from "./form-fields";
+import { userRoutes } from "./routes";
 import type { UserFormValues, UserRecord } from "./types";
 
 export const UserCreate = () => {
   const translate = useTranslate();
-  const navigate = useNavigate();
+  const { beforeClose, confirmation } = useRefineUnsavedChangesGuard();
+
+  return (
+    <>
+      <RouteDrawer
+        title={translate(
+          "users.drawer.create.title",
+          { ns: "app" },
+          "Create user"
+        )}
+        description={translate(
+          "users.drawer.create.description",
+          { ns: "app" },
+          "Add a user who can sign in to this NocoBase application."
+        )}
+        closeLabel={translate("buttons.close", "Close")}
+        closeTo={userRoutes.list}
+        beforeClose={beforeClose}
+      >
+        <UserCreateForm />
+      </RouteDrawer>
+      {confirmation}
+    </>
+  );
+};
+
+function UserCreateForm() {
+  const translate = useTranslate();
+  const close = useRouteSurfaceClose();
   const {
     refineCore: { onFinish },
     ...form
   } = useForm<UserRecord, HttpError, UserFormValues>({
     refineCoreProps: {
-      redirect: "list",
+      resource: "users",
+      action: "create",
+      redirect: false,
+      onMutationSuccess: () => {
+        void close({ skipBeforeClose: true });
+      },
     },
     defaultValues: {
       nickname: "",
@@ -34,7 +71,6 @@ export const UserCreate = () => {
       password: "",
     },
   });
-
   const aiFields = useMemo<AIFormField[]>(
     () => getAIUserFormFields(translate),
     [translate]
@@ -48,51 +84,38 @@ export const UserCreate = () => {
   });
 
   return (
-    <CreateView>
-      <Card className="max-w-3xl">
-        <CardContent>
-          <Form {...form}>
-            <form
-              ref={aiFormRef}
-              onSubmit={form.handleSubmit((values) => onFinish(values))}
-              className="resource-form"
-            >
-              <UserFormFields
-                form={form}
-                includePassword
-                translate={translate}
-              />
-
-              <div className="flex flex-wrap gap-2">
-                <Button
-                  type="submit"
-                  {...form.saveButtonProps}
-                  disabled={form.formState.isSubmitting}
-                >
-                  {form.formState.isSubmitting
-                    ? translate(
-                        "users.form.create.submitting",
-                        { ns: "app" },
-                        "Creating..."
-                      )
-                    : translate(
-                        "users.form.create.submit",
-                        { ns: "app" },
-                        "Create user"
-                      )}
-                </Button>
-                <Button
-                  type="button"
-                  variant="outline"
-                  onClick={() => navigate(-1)}
-                >
-                  {translate("users.form.cancel", { ns: "app" }, "Cancel")}
-                </Button>
-              </div>
-            </form>
-          </Form>
-        </CardContent>
-      </Card>
-    </CreateView>
+    <Form {...form}>
+      <form
+        ref={aiFormRef}
+        onSubmit={form.handleSubmit((values) => onFinish(values))}
+        className="flex min-h-0 flex-1 flex-col"
+      >
+        <div className="resource-form min-h-0 flex-1 overflow-y-auto px-5 py-5">
+          <UserFormFields form={form} includePassword translate={translate} />
+        </div>
+        <RouteDrawerFooter className="flex-row justify-end">
+          <Button type="button" variant="outline" onClick={() => void close()}>
+            {translate("users.form.cancel", { ns: "app" }, "Cancel")}
+          </Button>
+          <Button
+            type="submit"
+            {...form.saveButtonProps}
+            disabled={form.formState.isSubmitting}
+          >
+            {form.formState.isSubmitting
+              ? translate(
+                  "users.form.create.submitting",
+                  { ns: "app" },
+                  "Creating..."
+                )
+              : translate(
+                  "users.form.create.submit",
+                  { ns: "app" },
+                  "Create user"
+                )}
+          </Button>
+        </RouteDrawerFooter>
+      </form>
+    </Form>
   );
-};
+}

package/src/pages/users/edit.tsx

@@ -1,38 +1,78 @@
-import {
-  type HttpError,
-  useResourceParams,
-  useTranslate,
-} from "@refinedev/core";
+import { type HttpError, useTranslate } from "@refinedev/core";
 import { useForm } from "@refinedev/react-hook-form";
 import { useMemo } from "react";
-import { useNavigate } from "react-router";
+import { useParams } from "react-router";
 
-import { EditView } from "@/components/resources/views/edit-view";
 import { Button } from "@/components/ui/button";
-import { Card, CardContent } from "@/components/ui/card";
 import { Form } from "@/components/ui/form";
 import { useAIForm, type AIFormField } from "@/extensions/nocobase-ai";
+import {
+  RouteDrawer,
+  RouteDrawerFooter,
+  useRefineUnsavedChangesGuard,
+  useRouteSurfaceClose,
+} from "@/extensions/nocobase-route-surfaces";
 import {
   applyAIUserFormValues,
   getAIUserFormFields,
   getAIUserFormValues,
 } from "./form-context";
 import { UserFormFields } from "./form-fields";
+import { getUserShowPath, userRoutes } from "./routes";
 import type { UserFormValues, UserRecord } from "./types";
 
-export const UserEdit = () => {
+export const UserEdit = ({
+  returnTo = "list",
+}: {
+  returnTo?: "list" | "show";
+}) => {
   const translate = useTranslate();
-  const navigate = useNavigate();
-  const { id } = useResourceParams();
+  const { id } = useParams<{ id: string }>();
+  const closeTo =
+    returnTo === "show" && id ? getUserShowPath(id) : userRoutes.list;
+  const { beforeClose, confirmation } = useRefineUnsavedChangesGuard();
+
+  return (
+    <>
+      <RouteDrawer
+        title={translate(
+          "users.drawer.edit.title",
+          { ns: "app" },
+          "Edit user"
+        )}
+        description={translate(
+          "users.drawer.edit.description",
+          { ns: "app" },
+          "Update this user's identity and contact information."
+        )}
+        closeLabel={translate("buttons.close", "Close")}
+        closeTo={closeTo}
+        beforeClose={beforeClose}
+      >
+        <UserEditForm id={id} />
+      </RouteDrawer>
+      {confirmation}
+    </>
+  );
+};
+
+function UserEditForm({ id }: { id?: string }) {
+  const translate = useTranslate();
+  const close = useRouteSurfaceClose();
   const {
     refineCore: { onFinish },
     ...form
   } = useForm<UserRecord, HttpError, UserFormValues>({
     refineCoreProps: {
-      redirect: "list",
+      action: "edit",
+      resource: "users",
+      id,
+      redirect: false,
+      onMutationSuccess: () => {
+        void close({ skipBeforeClose: true });
+      },
     },
   });
-
   const aiFields = useMemo<AIFormField[]>(
     () => getAIUserFormFields(translate),
     [translate]
@@ -46,47 +86,38 @@ export const UserEdit = () => {
   });
 
   return (
-    <EditView>
-      <Card className="max-w-3xl">
-        <CardContent>
-          <Form {...form}>
-            <form
-              ref={aiFormRef}
-              onSubmit={form.handleSubmit((values) => onFinish(values))}
-              className="resource-form"
-            >
-              <UserFormFields form={form} translate={translate} />
-
-              <div className="flex flex-wrap gap-2">
-                <Button
-                  type="submit"
-                  {...form.saveButtonProps}
-                  disabled={form.formState.isSubmitting}
-                >
-                  {form.formState.isSubmitting
-                    ? translate(
-                        "users.form.edit.submitting",
-                        { ns: "app" },
-                        "Saving..."
-                      )
-                    : translate(
-                        "users.form.edit.submit",
-                        { ns: "app" },
-                        "Save changes"
-                      )}
-                </Button>
-                <Button
-                  type="button"
-                  variant="outline"
-                  onClick={() => navigate(-1)}
-                >
-                  {translate("users.form.cancel", { ns: "app" }, "Cancel")}
-                </Button>
-              </div>
-            </form>
-          </Form>
-        </CardContent>
-      </Card>
-    </EditView>
+    <Form {...form}>
+      <form
+        ref={aiFormRef}
+        onSubmit={form.handleSubmit((values) => onFinish(values))}
+        className="flex min-h-0 flex-1 flex-col"
+      >
+        <div className="resource-form min-h-0 flex-1 overflow-y-auto px-5 py-5">
+          <UserFormFields form={form} translate={translate} />
+        </div>
+        <RouteDrawerFooter className="flex-row justify-end">
+          <Button type="button" variant="outline" onClick={() => void close()}>
+            {translate("users.form.cancel", { ns: "app" }, "Cancel")}
+          </Button>
+          <Button
+            type="submit"
+            {...form.saveButtonProps}
+            disabled={form.formState.isSubmitting}
+          >
+            {form.formState.isSubmitting
+              ? translate(
+                  "users.form.edit.submitting",
+                  { ns: "app" },
+                  "Saving..."
+                )
+              : translate(
+                  "users.form.edit.submit",
+                  { ns: "app" },
+                  "Save changes"
+                )}
+          </Button>
+        </RouteDrawerFooter>
+      </form>
+    </Form>
   );
-};
+}

package/src/pages/users/index.ts

@@ -1,4 +1,7 @@
 export * from "./create";
 export * from "./edit";
+export * from "./layout";
 export * from "./list";
+export * from "./role-detail";
+export * from "./routes";
 export * from "./show";

package/src/pages/users/layout.tsx

@@ -0,0 +1,15 @@
+import { Outlet } from "react-router";
+
+import { ResourceAccessGuard } from "@/components/access-control/resource-access-guard";
+import { UserList } from "./list";
+
+export function UserResourceLayout() {
+  return (
+    <>
+      <ResourceAccessGuard resource="users" action="list">
+        <UserList />
+      </ResourceAccessGuard>
+      <Outlet />
+    </>
+  );
+}

package/src/pages/users/list.tsx

@@ -2,22 +2,21 @@ import { useGetLocale, useTranslate } from "@refinedev/core";
 import { useTable } from "@refinedev/react-table";
 import { createColumnHelper } from "@tanstack/react-table";
 import { Eye, Pencil, Trash2 } from "lucide-react";
-import { useMemo } from "react";
+import { useCallback, useMemo } from "react";
+import { useNavigate } from "react-router";
 
 import { DataTable } from "@/components/data-table/data-table";
 import { DeleteButton } from "@/components/resources/buttons/delete";
 import { EditButton } from "@/components/resources/buttons/edit";
 import { ShowButton } from "@/components/resources/buttons/show";
 import { ListView } from "@/components/resources/views/list-view";
-import { Badge } from "@/components/ui/badge";
 import { useAIPageElementHandle } from "@/extensions/nocobase-ai";
-import { resolveTranslatableText } from "@/lib/i18n";
 import type { Role } from "@/lib/nocobase/acl";
+import { RoleBadges } from "./role-badges";
+import { resolveRoleLabel } from "./role-utils";
+import { getRolePath } from "./routes";
 import type { UserRecord } from "./types";
 
-const getRoleLabel = (role: Role) =>
-  resolveTranslatableText(role.title || role.name, { ns: "starter" });
-
 const isRootUser = (record: UserRecord) =>
   record.roles?.some((role) => role.name === "root") ?? false;
 
@@ -25,6 +24,11 @@ export const UserList = () => {
   const translate = useTranslate();
   const getLocale = useGetLocale();
   const locale = getLocale();
+  const navigate = useNavigate();
+  const showRole = useCallback(
+    (role: Role) => navigate(getRolePath(role.name)),
+    [navigate]
+  );
 
   const columns = useMemo(() => {
     const columnHelper = createColumnHelper<UserRecord>();
@@ -61,17 +65,7 @@ export const UserList = () => {
         enableSorting: false,
         cell: ({ getValue }) => {
           const roles = getValue() ?? [];
-          return roles.length ? (
-            <div className="flex flex-wrap gap-1">
-              {roles.map((role) => (
-                <Badge key={role.name} variant="secondary">
-                  {getRoleLabel(role)}
-                </Badge>
-              ))}
-            </div>
-          ) : (
-            "-"
-          );
+          return <RoleBadges roles={roles} onSelect={showRole} empty="-" />;
         },
       }),
       columnHelper.accessor("createdAt", {
@@ -97,6 +91,7 @@ export const UserList = () => {
         cell: ({ row }) => (
           <div className="flex items-center gap-1">
             <EditButton
+              resource="users"
               recordItemId={row.original.id}
               variant="ghost"
               size="icon"
@@ -114,6 +109,7 @@ export const UserList = () => {
               <Pencil />
             </EditButton>
             <ShowButton
+              resource="users"
               recordItemId={row.original.id}
               variant="ghost"
               size="icon"
@@ -132,6 +128,7 @@ export const UserList = () => {
             </ShowButton>
             {isRootUser(row.original) ? null : (
               <DeleteButton
+                resource="users"
                 recordItemId={row.original.id}
                 variant="ghost"
                 size="icon"
@@ -156,12 +153,13 @@ export const UserList = () => {
         size: 144,
       }),
     ];
-  }, [locale, translate]);
+  }, [locale, showRole, translate]);
 
   const table = useTable<UserRecord>({
     columns,
     refineCoreProps: {
-      syncWithLocation: true,
+      resource: "users",
+      syncWithLocation: false,
       meta: {
         appends: ["roles"],
       },
@@ -188,7 +186,7 @@ export const UserList = () => {
         phone: record.phone,
         roles: record.roles?.map((role) => ({
           name: role.name,
-          title: getRoleLabel(role),
+          title: resolveRoleLabel(role),
         })),
         createdAt: record.createdAt,
       })),
@@ -196,7 +194,7 @@ export const UserList = () => {
   });
 
   return (
-    <ListView>
+    <ListView resource="users">
       <div ref={tableContext.ref}>
         <DataTable table={table} />
       </div>

package/src/pages/users/role-badges.tsx

@@ -0,0 +1,43 @@
+import type { Role } from "@/lib/nocobase/acl";
+import { Badge } from "@/components/ui/badge";
+import { ChevronRight } from "lucide-react";
+import { resolveRoleLabel } from "./role-utils";
+
+export function RoleBadges({
+  roles,
+  onSelect,
+  empty,
+}: {
+  roles: Role[];
+  onSelect: (role: Role) => void;
+  empty: string;
+}) {
+  if (!roles.length) {
+    return <span className="text-sm text-muted-foreground">{empty}</span>;
+  }
+
+  return (
+    <div className="flex flex-wrap gap-1">
+      {roles.map((role) => {
+        const label = resolveRoleLabel(role);
+        return (
+          <button
+            key={role.name}
+            type="button"
+            className="rounded-full outline-none focus-visible:ring-3 focus-visible:ring-ring/50"
+            onClick={() => onSelect(role)}
+            title={label}
+          >
+            <Badge
+              variant="secondary"
+              className="cursor-pointer transition-colors hover:bg-[color-mix(in_oklch,var(--secondary),var(--foreground)_8%)]"
+            >
+              {label}
+              <ChevronRight data-icon="inline-end" />
+            </Badge>
+          </button>
+        );
+      })}
+    </div>
+  );
+}