From a702f534bad26a814f332954ca234cfba3d458fe Mon Sep 17 00:00:00 2001
From: chenos <chenlinxh@gmail.com>
Date: Wed, 17 Nov 2021 18:54:02 +0800
Subject: [PATCH] feat: add roles field to users collection

---
 .../admin-layout/Collections/index.tsx        |   6 ++
 .../database-field/interfaces/linkTo.ts       |   6 +-
 packages/client/src/schemas/select/index.tsx  |  11 +-
 .../src/db/en-US/part1/01-ui_schemas.sql      |   2 +-
 .../src/db/en-US/part1/02-collections.sql     |   6 +-
 .../src/db/en-US/part1/03-fields.sql          |   2 +-
 .../src/db/en-US/part2/06-t_2uhu4szs1kq.sql   |   0
 .../src/db/en-US/part2/07-t_fsveob6p269.sql   |   0
 .../src/db/en-US/part2/08-t_geso7fru7a9.sql   |   0
 .../src/db/en-US/part2/09-t_bphcojtl8bx.sql   |   0
 .../src/db/en-US/part2/10-t_jh7a28dsfzi.sql   |   0
 .../src/db/en-US/part2/12-roles.sql           |   6 +-
 .../db/en-US/part2/13-action_permissions.sql  |  34 +++---
 .../db/en-US/part2/14-field_permissions.sql   |   0
 .../db/en-US/part2/15-roles_ui_schemas.sql    | 102 +++++++++---------
 .../src/db/zh-CN/part1/01-ui_schemas.sql      |   2 +-
 .../src/db/zh-CN/part1/02-collections.sql     |   6 +-
 .../src/db/zh-CN/part1/03-fields.sql          |   2 +-
 .../src/db/zh-CN/part2/06-t_2uhu4szs1kq.sql   |   0
 .../src/db/zh-CN/part2/07-t_fsveob6p269.sql   |   0
 .../src/db/zh-CN/part2/08-t_geso7fru7a9.sql   |   0
 .../src/db/zh-CN/part2/09-t_bphcojtl8bx.sql   |   0
 .../src/db/zh-CN/part2/10-t_jh7a28dsfzi.sql   |   0
 .../src/db/zh-CN/part2/11-t_p13gbi31uux.sql   |   0
 .../src/db/zh-CN/part2/12-roles.sql           |   6 +-
 .../db/zh-CN/part2/13-action_permissions.sql  |  34 +++---
 .../db/zh-CN/part2/14-field_permissions.sql   |   0
 .../db/zh-CN/part2/15-roles_ui_schemas.sql    | 102 +++++++++---------
 .../src/collections/roles.ts                  |   4 +-
 .../plugin-users/src/collections/users.ts     |  11 +-
 30 files changed, 179 insertions(+), 163 deletions(-)
 mode change 100644 => 100755 packages/plugin-client/src/db/en-US/part2/06-t_2uhu4szs1kq.sql
 mode change 100644 => 100755 packages/plugin-client/src/db/en-US/part2/07-t_fsveob6p269.sql
 mode change 100644 => 100755 packages/plugin-client/src/db/en-US/part2/08-t_geso7fru7a9.sql
 mode change 100644 => 100755 packages/plugin-client/src/db/en-US/part2/09-t_bphcojtl8bx.sql
 mode change 100644 => 100755 packages/plugin-client/src/db/en-US/part2/10-t_jh7a28dsfzi.sql
 mode change 100644 => 100755 packages/plugin-client/src/db/en-US/part2/12-roles.sql
 mode change 100644 => 100755 packages/plugin-client/src/db/en-US/part2/13-action_permissions.sql
 mode change 100644 => 100755 packages/plugin-client/src/db/en-US/part2/14-field_permissions.sql
 mode change 100644 => 100755 packages/plugin-client/src/db/en-US/part2/15-roles_ui_schemas.sql
 mode change 100644 => 100755 packages/plugin-client/src/db/zh-CN/part2/06-t_2uhu4szs1kq.sql
 mode change 100644 => 100755 packages/plugin-client/src/db/zh-CN/part2/07-t_fsveob6p269.sql
 mode change 100644 => 100755 packages/plugin-client/src/db/zh-CN/part2/08-t_geso7fru7a9.sql
 mode change 100644 => 100755 packages/plugin-client/src/db/zh-CN/part2/09-t_bphcojtl8bx.sql
 mode change 100644 => 100755 packages/plugin-client/src/db/zh-CN/part2/10-t_jh7a28dsfzi.sql
 mode change 100644 => 100755 packages/plugin-client/src/db/zh-CN/part2/11-t_p13gbi31uux.sql
 mode change 100644 => 100755 packages/plugin-client/src/db/zh-CN/part2/12-roles.sql
 mode change 100644 => 100755 packages/plugin-client/src/db/zh-CN/part2/13-action_permissions.sql
 mode change 100644 => 100755 packages/plugin-client/src/db/zh-CN/part2/14-field_permissions.sql
 mode change 100644 => 100755 packages/plugin-client/src/db/zh-CN/part2/15-roles_ui_schemas.sql

diff --git a/packages/client/src/components/admin-layout/Collections/index.tsx b/packages/client/src/components/admin-layout/Collections/index.tsx
index f7dc01f61..6addd80ab 100644
--- a/packages/client/src/components/admin-layout/Collections/index.tsx
+++ b/packages/client/src/components/admin-layout/Collections/index.tsx
@@ -652,6 +652,7 @@ function CreateFieldButton() {
           <Space style={{ float: 'right' }}>
             <Button
               onClick={async () => {
+                console.log('form.values', form.values);
                 await form.clearFormGraph();
                 setVisible(false);
               }}
@@ -661,6 +662,9 @@ function CreateFieldButton() {
             <Button
               type={'primary'}
               onClick={async () => {
+                const fieldInterface = interfaces.get(form.values?.interface);
+                fieldInterface?.initialize && fieldInterface?.initialize(form.values);
+                console.log('form.values', form.values);
                 await resource.save(form.values);
                 setVisible(false);
                 await form.reset();
@@ -755,6 +759,8 @@ function EditFieldButton() {
             <Button
               type={'primary'}
               onClick={async () => {
+                const fieldInterface = interfaces.get(form.values?.interface);
+                fieldInterface?.initialize && fieldInterface?.initialize(form.values);
                 await resource.save(form.values, {
                   resourceKey: ctx.record.key,
                 });
diff --git a/packages/client/src/schemas/database-field/interfaces/linkTo.ts b/packages/client/src/schemas/database-field/interfaces/linkTo.ts
index 3031e3e0b..57ae1de94 100644
--- a/packages/client/src/schemas/database-field/interfaces/linkTo.ts
+++ b/packages/client/src/schemas/database-field/interfaces/linkTo.ts
@@ -36,7 +36,11 @@ export const linkTo: FieldOptions = {
         values.sourceKey = 'id';
       }
       if (!values.targetKey) {
-        values.targetKey = 'id';
+        if (values.target === 'roles') {
+          values.targetKey = 'name';
+        } else {
+          values.targetKey = 'id';
+        }
       }
     }
   },
diff --git a/packages/client/src/schemas/select/index.tsx b/packages/client/src/schemas/select/index.tsx
index 5f0768281..795fa3c38 100644
--- a/packages/client/src/schemas/select/index.tsx
+++ b/packages/client/src/schemas/select/index.tsx
@@ -275,12 +275,12 @@ Select.useSelect = () => {
 };
 
 export const useSelectedRowKeys = () => {
-  const { selectedRows } = useContext(SelectedRowsContext);
+  const { rowKey, selectedRows } = useContext(SelectedRowsContext);
   const [selectedRowKeys, setSelectedRowKeys] = useState<any>(
-    selectedRows.map((row) => row.id),
+    selectedRows.map((row) => row[rowKey]),
   );
   useEffect(() => {
-    setSelectedRowKeys(selectedRows.map((row) => row.id));
+    setSelectedRowKeys(selectedRows.map((row) => row[rowKey]));
   }, [selectedRows]);
   console.log('useSelectedRowKeys', selectedRows);
   return { selectedRowKeys, setSelectedRowKeys };
@@ -333,6 +333,7 @@ Select.Drawer = connect(
       };
     }
     const [selectedRows, setSelectedRows] = useState(toArr(field.value));
+    console.log('fieldNames', { fieldNames, field, value });
     console.log('useSelectedRowKeys.toArr', toArr(field.value));
     useEffect(() => {
       setSelectedRows(toArr(field.value));
@@ -395,7 +396,7 @@ Select.Drawer = connect(
             }}
           ></AntdSelect>
           <SelectedRowsContext.Provider
-            value={{ selectedRows, setSelectedRows }}
+            value={{ rowKey: collectionField?.targetKey || 'id', selectedRows, setSelectedRows }}
           >
             <CollectionProvider collectionName={collectionField?.target}>
               <RecursionField
@@ -447,7 +448,7 @@ Select.Drawer = connect(
         value: 'id',
         ...(get(schema['x-component-props'], 'fieldNames') || {}),
       };
-      console.log({ fieldNames, field, value });
+      console.log('fieldNames', { fieldNames, field, value });
       if (!value) {
         return null;
       }
diff --git a/packages/plugin-client/src/db/en-US/part1/01-ui_schemas.sql b/packages/plugin-client/src/db/en-US/part1/01-ui_schemas.sql
index c27c9fdb9..28831ea67 100644
--- a/packages/plugin-client/src/db/en-US/part1/01-ui_schemas.sql
+++ b/packages/plugin-client/src/db/en-US/part1/01-ui_schemas.sql
@@ -1568,6 +1568,6 @@ INSERT INTO "ui_schemas" ("key", "name", "title", "type", "x-component", "option
 INSERT INTO "ui_schemas" ("key", "name", "title", "type", "x-component", "options", "async", "sort", "created_at", "updated_at", "parent_key") VALUES
 ('17mcgd6s6d7',	'liia3b09auv',	'Star on GitHub',	'void',	'Menu.URL',	'{"version":"2.0","x-designable-bar":"Menu.DesignableBar","x-component-props":{"href":"https://github.com/nocobase/nocobase","icon":"githuboutlined"}}',	'0',	12,	'2021-11-08 14:27:02.538+00',	'2021-11-08 14:27:02.538+00',	'qqzzjakwkwl');
 INSERT INTO "ui_schemas" ("key", "name", "title", "type", "x-component", "options", "async", "sort", "created_at", "updated_at", "parent_key") VALUES
-('sarppf56eim',	NULL,	'{{t("Roles")}}',	'array',	'Select.Drawer',	'{"x-component-props":{},"x-decorator":"FormItem","x-designable-bar":"Select.Drawer.DesignableBar"}',	'0',	4,	'2021-11-16 08:32:08.041+00',	'2021-11-16 08:32:08.041+00',	NULL);
+('sarppf56eim',	NULL,	'{{t("Roles")}}',	'array',	'Select.Drawer',	'{"x-component-props":{"fieldNames": {"label": "title","value": "name"}},"x-decorator":"FormItem","x-designable-bar":"Select.Drawer.DesignableBar"}',	'0',	4,	'2021-11-16 08:32:08.041+00',	'2021-11-16 08:32:08.041+00',	NULL);
 INSERT INTO "ui_schemas" ("key", "name", "title", "type", "x-component", "options", "async", "sort", "created_at", "updated_at", "parent_key") VALUES
 ('bhqy0xdfiog',	NULL,	'{{t("Role name")}}',	'string',	'Input',	'{}',	'0',	5,	'2021-11-16 09:32:00.3+00',	'2021-11-16 09:32:00.3+00',	NULL);
diff --git a/packages/plugin-client/src/db/en-US/part1/02-collections.sql b/packages/plugin-client/src/db/en-US/part1/02-collections.sql
index ba2dd138f..408d16c5e 100644
--- a/packages/plugin-client/src/db/en-US/part1/02-collections.sql
+++ b/packages/plugin-client/src/db/en-US/part1/02-collections.sql
@@ -1,8 +1,8 @@
 DELETE FROM "collections";
 INSERT INTO "collections" ("name", "logging", "title", "privilege", "sortable", "options", "sort", "created_at", "updated_at", "ui_schema_key") VALUES
-('users',	'1',	'{{t("Users")}}',	'undelete',	'"sort"',	'{"createdBy":false,"updatedBy":false}',	2,	'2021-09-02 15:07:56.914+00',	'2021-09-15 00:59:20.676+00',	NULL),
+('users',	'1',	'{{t("Users")}}',	'undelete',	'"sort"',	'{"createdBy":false,"updatedBy":false,"scopes":{"withPassword":{"attributes":{"include":["password"]}}},"defaultScope":{"attributes":{"exclude":["password"]}}}',	1,	'2021-11-17 04:49:27.376+00',	'2021-11-17 04:49:27.376+00',	NULL),
+('roles',	'1',	'{{t("Roles")}}',	NULL,	'"sort"',	'{}',	2,	'2021-11-17 04:49:27.529+00',	'2021-11-17 04:49:27.529+00',	NULL);
+INSERT INTO "collections" ("name", "logging", "title", "privilege", "sortable", "options", "sort", "created_at", "updated_at", "ui_schema_key") VALUES
 ('t_fsveob6p269',	'1',	'Customers',	NULL,	'"sort"',	'{}',	5,	'2021-09-12 01:05:52.722+00',	'2021-09-18 04:15:23.113+00',	NULL),
 ('t_geso7fru7a9',	'1',	'Orders',	NULL,	'"sort"',	'{}',	4,	'2021-09-12 01:06:05.19+00',	'2021-09-18 04:15:42.566+00',	NULL),
 ('t_2uhu4szs1kq',	'1',	'Tasks',	NULL,	'"sort"',	'{}',	3,	'2021-09-03 08:17:30.495+00',	'2021-09-18 04:15:42.572+00',	NULL);
-INSERT INTO "collections" ("name", "logging", "title", "privilege", "sortable", "options", "sort", "created_at", "updated_at", "ui_schema_key") VALUES
-('roles',	'1',	'{{t("Roles")}}',	NULL,	'"sort"',	'{}',	2,	'2021-11-16 09:25:52.28+00',	'2021-11-16 09:25:52.28+00',	NULL);
diff --git a/packages/plugin-client/src/db/en-US/part1/03-fields.sql b/packages/plugin-client/src/db/en-US/part1/03-fields.sql
index 8bf6e1803..72f289863 100644
--- a/packages/plugin-client/src/db/en-US/part1/03-fields.sql
+++ b/packages/plugin-client/src/db/en-US/part1/03-fields.sql
@@ -52,7 +52,7 @@ INSERT INTO "fields" ("key", "name", "interface", "data_type", "privilege", "sta
 ('sbrf1cdkpb9',	'h1f9o1xvevb',	'createdAt',	'date',	'undelete',	1,	'{"field":"created_at"}',	1,	'2021-09-12 01:06:55.123+00',	'2021-09-12 01:06:55.133+00',	NULL,	NULL,	'oo7ejuze28i',	NULL);
 
 INSERT INTO "fields" ("key", "name", "interface", "data_type", "privilege", "state", "options", "sort", "created_at", "updated_at", "parent_key", "collection_name", "reverse_key", "ui_schema_key") VALUES
-('f_v3j9yv454ch',	'roles',	'linkTo',	'belongsToMany',	NULL,	1,	'{"target":"roles","foreignKey":"user_id","otherKey":"role_id","sourceKey":"id","targetKey":"id"}',	NULL,	'2021-11-16 08:32:08.033+00',	'2021-11-16 08:32:08.049+00',	NULL,	'users',	NULL,	'sarppf56eim'),
+('f_v3j9yv454ch',	'roles',	'linkTo',	'belongsToMany',	NULL,	1,	'{"target":"roles","foreignKey":"user_id","otherKey":"role_name","sourceKey":"id","targetKey":"name"}',	NULL,	'2021-11-16 08:32:08.033+00',	'2021-11-16 08:32:08.049+00',	NULL,	'users',	NULL,	'sarppf56eim'),
 ('f_jd6k0hxqe91',	'title',	'string',	'string',	NULL,	1,	'{}',	NULL,	'2021-11-16 08:32:08.096+00',	'2021-11-16 08:32:08.113+00',	NULL,	'roles',	NULL,	'bhqy0xdfiog'),
 ('f_9jeplea2nwz',	'name',	NULL,	'uid',	NULL,	0,	'{"unique":true,"prefix":"r_"}',	NULL,	'2021-11-16 08:32:08.121+00',	'2021-11-16 08:32:08.121+00',	NULL,	'roles',	NULL,	NULL),
 ('f_no8fg9nvnuk',	'actionPermissions',	NULL,	'hasMany',	NULL,	0,	'{"target":"action_permissions"}',	NULL,	'2021-11-16 08:32:08.128+00',	'2021-11-16 08:32:08.128+00',	NULL,	'roles',	NULL,	NULL),
diff --git a/packages/plugin-client/src/db/en-US/part2/06-t_2uhu4szs1kq.sql b/packages/plugin-client/src/db/en-US/part2/06-t_2uhu4szs1kq.sql
old mode 100644
new mode 100755
diff --git a/packages/plugin-client/src/db/en-US/part2/07-t_fsveob6p269.sql b/packages/plugin-client/src/db/en-US/part2/07-t_fsveob6p269.sql
old mode 100644
new mode 100755
diff --git a/packages/plugin-client/src/db/en-US/part2/08-t_geso7fru7a9.sql b/packages/plugin-client/src/db/en-US/part2/08-t_geso7fru7a9.sql
old mode 100644
new mode 100755
diff --git a/packages/plugin-client/src/db/en-US/part2/09-t_bphcojtl8bx.sql b/packages/plugin-client/src/db/en-US/part2/09-t_bphcojtl8bx.sql
old mode 100644
new mode 100755
diff --git a/packages/plugin-client/src/db/en-US/part2/10-t_jh7a28dsfzi.sql b/packages/plugin-client/src/db/en-US/part2/10-t_jh7a28dsfzi.sql
old mode 100644
new mode 100755
diff --git a/packages/plugin-client/src/db/en-US/part2/12-roles.sql b/packages/plugin-client/src/db/en-US/part2/12-roles.sql
old mode 100644
new mode 100755
index b8f94518c..b515b20a7
--- a/packages/plugin-client/src/db/en-US/part2/12-roles.sql
+++ b/packages/plugin-client/src/db/en-US/part2/12-roles.sql
@@ -1,4 +1,4 @@
 DELETE FROM "roles";
-INSERT INTO "roles" ("id", "name", "title", "sort", "created_at", "updated_at", "created_by_id", "updated_by_id") VALUES
-(1, 'r_tfs4qtaxjcs',	'Admin',	1,	'2021-09-14 02:12:19.98+00',	'2021-09-14 02:12:19.98+00',	1,	1),
-(2, 'r_np59b00ex8z',	'Member',	2,	'2021-09-14 02:12:35.799+00',	'2021-09-14 02:12:35.799+00',	1,	1);
+INSERT INTO "roles" ("name", "title", "sort", "created_at", "updated_at", "created_by_id", "updated_by_id") VALUES
+('r_tfs4qtaxjcs',	'Admin',	1,	'2021-09-14 02:12:19.98+00',	'2021-09-14 02:12:19.98+00',	1,	1),
+('r_np59b00ex8z',	'Member',	2,	'2021-09-14 02:12:35.799+00',	'2021-09-14 02:12:35.799+00',	1,	1);
diff --git a/packages/plugin-client/src/db/en-US/part2/13-action_permissions.sql b/packages/plugin-client/src/db/en-US/part2/13-action_permissions.sql
old mode 100644
new mode 100755
index 7fb085b45..2da1d9d8a
--- a/packages/plugin-client/src/db/en-US/part2/13-action_permissions.sql
+++ b/packages/plugin-client/src/db/en-US/part2/13-action_permissions.sql
@@ -1,18 +1,18 @@
 DELETE FROM "action_permissions";
-INSERT INTO "action_permissions" ("id", "action_name", "created_at", "updated_at", "collection_name", "user_id", "created_by_id", "updated_by_id", "role_id", "scope_id") VALUES
-(1,	'create',	'2021-09-14 02:19:38.019+00',	'2021-09-14 02:19:45.64+00',	't_geso7fru7a9',	NULL,	1,	1,	NULL,	NULL),
-(2,	'get',	'2021-09-14 02:19:38.04+00',	'2021-09-14 02:19:45.64+00',	't_geso7fru7a9',	NULL,	1,	1,	NULL,	NULL),
-(3,	'update',	'2021-09-14 02:19:38.053+00',	'2021-09-14 02:19:45.64+00',	't_geso7fru7a9',	NULL,	1,	1,	NULL,	NULL),
-(4,	'destroy',	'2021-09-14 02:19:38.067+00',	'2021-09-14 02:19:45.64+00',	't_geso7fru7a9',	NULL,	1,	1,	NULL,	NULL),
-(5,	'create',	'2021-09-14 02:19:45.601+00',	'2021-09-14 02:19:53.3+00',	't_2uhu4szs1kq',	NULL,	1,	1,	NULL,	NULL),
-(6,	'get',	'2021-09-14 02:19:45.616+00',	'2021-09-14 02:19:53.3+00',	't_2uhu4szs1kq',	NULL,	1,	1,	NULL,	NULL),
-(7,	'update',	'2021-09-14 02:19:45.625+00',	'2021-09-14 02:19:53.3+00',	't_2uhu4szs1kq',	NULL,	1,	1,	NULL,	NULL),
-(8,	'destroy',	'2021-09-14 02:19:45.633+00',	'2021-09-14 02:19:53.3+00',	't_2uhu4szs1kq',	NULL,	1,	1,	NULL,	NULL),
-(13,	'create',	'2021-09-14 02:20:00.337+00',	'2021-09-14 02:20:00.337+00',	'users',	NULL,	1,	1,	1,	NULL),
-(14,	'get',	'2021-09-14 02:20:00.347+00',	'2021-09-14 02:20:00.347+00',	'users',	NULL,	1,	1,	1,	NULL),
-(15,	'update',	'2021-09-14 02:20:00.356+00',	'2021-09-14 02:20:00.356+00',	'users',	NULL,	1,	1,	1,	NULL),
-(16,	'destroy',	'2021-09-14 02:20:00.364+00',	'2021-09-14 02:20:00.364+00',	'users',	NULL,	1,	1,	1,	NULL),
-(9,	'create',	'2021-09-14 02:19:53.259+00',	'2021-09-14 02:20:00.371+00',	't_fsveob6p269',	NULL,	1,	1,	NULL,	NULL),
-(10,	'get',	'2021-09-14 02:19:53.274+00',	'2021-09-14 02:20:00.371+00',	't_fsveob6p269',	NULL,	1,	1,	NULL,	NULL),
-(11,	'update',	'2021-09-14 02:19:53.284+00',	'2021-09-14 02:20:00.371+00',	't_fsveob6p269',	NULL,	1,	1,	NULL,	NULL),
-(12,	'destroy',	'2021-09-14 02:19:53.294+00',	'2021-09-14 02:20:00.371+00',	't_fsveob6p269',	NULL,	1,	1,	NULL,	NULL);
+INSERT INTO "action_permissions" ("id", "action_name", "created_at", "updated_at", "collection_name", "user_id", "created_by_id", "updated_by_id", "role_name", "scope_id") VALUES
+(1,	'create',	'2021-09-14 02:19:38.019+00',	'2021-09-14 02:19:45.64+00',	't_geso7fru7a9',	NULL,	1,	1,	'r_tfs4qtaxjcs',	NULL),
+(2,	'get',	'2021-09-14 02:19:38.04+00',	'2021-09-14 02:19:45.64+00',	't_geso7fru7a9',	NULL,	1,	1,	'r_tfs4qtaxjcs',	NULL),
+(3,	'update',	'2021-09-14 02:19:38.053+00',	'2021-09-14 02:19:45.64+00',	't_geso7fru7a9',	NULL,	1,	1,	'r_tfs4qtaxjcs',	NULL),
+(4,	'destroy',	'2021-09-14 02:19:38.067+00',	'2021-09-14 02:19:45.64+00',	't_geso7fru7a9',	NULL,	1,	1,	'r_tfs4qtaxjcs',	NULL),
+(5,	'create',	'2021-09-14 02:19:45.601+00',	'2021-09-14 02:19:53.3+00',	't_2uhu4szs1kq',	NULL,	1,	1,	'r_tfs4qtaxjcs',	NULL),
+(6,	'get',	'2021-09-14 02:19:45.616+00',	'2021-09-14 02:19:53.3+00',	't_2uhu4szs1kq',	NULL,	1,	1,	'r_tfs4qtaxjcs',	NULL),
+(7,	'update',	'2021-09-14 02:19:45.625+00',	'2021-09-14 02:19:53.3+00',	't_2uhu4szs1kq',	NULL,	1,	1,	'r_tfs4qtaxjcs',	NULL),
+(8,	'destroy',	'2021-09-14 02:19:45.633+00',	'2021-09-14 02:19:53.3+00',	't_2uhu4szs1kq',	NULL,	1,	1,	'r_tfs4qtaxjcs',	NULL),
+(13,	'create',	'2021-09-14 02:20:00.337+00',	'2021-09-14 02:20:00.337+00',	'users',	NULL,	1,	1,	'r_tfs4qtaxjcs',	NULL),
+(14,	'get',	'2021-09-14 02:20:00.347+00',	'2021-09-14 02:20:00.347+00',	'users',	NULL,	1,	1,	'r_tfs4qtaxjcs',	NULL),
+(15,	'update',	'2021-09-14 02:20:00.356+00',	'2021-09-14 02:20:00.356+00',	'users',	NULL,	1,	1,	'r_tfs4qtaxjcs',	NULL),
+(16,	'destroy',	'2021-09-14 02:20:00.364+00',	'2021-09-14 02:20:00.364+00',	'users',	NULL,	1,	1,	'r_tfs4qtaxjcs',	NULL),
+(9,	'create',	'2021-09-14 02:19:53.259+00',	'2021-09-14 02:20:00.371+00',	't_fsveob6p269',	NULL,	1,	1,	'r_tfs4qtaxjcs',	NULL),
+(10,	'get',	'2021-09-14 02:19:53.274+00',	'2021-09-14 02:20:00.371+00',	't_fsveob6p269',	NULL,	1,	1,	'r_tfs4qtaxjcs',	NULL),
+(11,	'update',	'2021-09-14 02:19:53.284+00',	'2021-09-14 02:20:00.371+00',	't_fsveob6p269',	NULL,	1,	1,	'r_tfs4qtaxjcs',	NULL),
+(12,	'destroy',	'2021-09-14 02:19:53.294+00',	'2021-09-14 02:20:00.371+00',	't_fsveob6p269',	NULL,	1,	1,	'r_tfs4qtaxjcs',	NULL);
diff --git a/packages/plugin-client/src/db/en-US/part2/14-field_permissions.sql b/packages/plugin-client/src/db/en-US/part2/14-field_permissions.sql
old mode 100644
new mode 100755
diff --git a/packages/plugin-client/src/db/en-US/part2/15-roles_ui_schemas.sql b/packages/plugin-client/src/db/en-US/part2/15-roles_ui_schemas.sql
old mode 100644
new mode 100755
index 691967497..6b8c3443a
--- a/packages/plugin-client/src/db/en-US/part2/15-roles_ui_schemas.sql
+++ b/packages/plugin-client/src/db/en-US/part2/15-roles_ui_schemas.sql
@@ -1,52 +1,52 @@
 DELETE FROM "roles_ui_schemas";
-INSERT INTO "roles_ui_schemas" ("created_at", "updated_at", "ui_schema_key", "role_id") VALUES
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'0b73gccskc2',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'hall72478p5',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'im4un32remd',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'wfa10dg0vyl',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'k33sn747t75',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'6chv7wh9gy9',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'h41g5aiikz1',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'66g7jbpqsen',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'on7wtx4zj4i',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'2fmrebsf4gp',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'p5e092zc0ot',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'2eacz1979l5',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'ouuvop86xkn',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'6zdy7upftb2',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'h3irsnu3clo',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'2891oprcahh',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'tqpxc3hilti',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'kme85fmbfdp',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'75uiuzj3a2y',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'o6vjinhjhad',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'knyew80qe7m',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'gd7t6lt75n9',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'1i8da3k889z',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'mqr5sytnrex',	1),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'im4un32remd',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'wfa10dg0vyl',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'k33sn747t75',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'6chv7wh9gy9',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'h41g5aiikz1',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'66g7jbpqsen',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'on7wtx4zj4i',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'2fmrebsf4gp',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'p5e092zc0ot',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'2eacz1979l5',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'ouuvop86xkn',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'6zdy7upftb2',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'h3irsnu3clo',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'2891oprcahh',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'tqpxc3hilti',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'kme85fmbfdp',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'75uiuzj3a2y',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'o6vjinhjhad',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'knyew80qe7m',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'43f9otxtq42',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'dhye1xbbr3n',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'1i8da3k889z',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'mqr5sytnrex',	2),
-('2021-09-14 02:22:46.7+00',	'2021-09-14 02:22:46.7+00',	'0b73gccskc2',	2),
-('2021-09-14 02:22:53.939+00',	'2021-09-14 02:22:53.939+00',	'hall72478p5',	2),
-('2021-09-14 02:26:04.313+00',	'2021-09-14 02:26:04.313+00',	'gd7t6lt75n9',	2);
+INSERT INTO "roles_ui_schemas" ("created_at", "updated_at", "ui_schema_key", "role_name") VALUES
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'0b73gccskc2',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'hall72478p5',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'im4un32remd',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'wfa10dg0vyl',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'k33sn747t75',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'6chv7wh9gy9',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'h41g5aiikz1',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'66g7jbpqsen',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'on7wtx4zj4i',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'2fmrebsf4gp',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'p5e092zc0ot',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'2eacz1979l5',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'ouuvop86xkn',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'6zdy7upftb2',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'h3irsnu3clo',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'2891oprcahh',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'tqpxc3hilti',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'kme85fmbfdp',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'75uiuzj3a2y',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'o6vjinhjhad',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'knyew80qe7m',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'gd7t6lt75n9',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'1i8da3k889z',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'mqr5sytnrex',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'im4un32remd',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'wfa10dg0vyl',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'k33sn747t75',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'6chv7wh9gy9',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'h41g5aiikz1',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'66g7jbpqsen',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'on7wtx4zj4i',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'2fmrebsf4gp',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'p5e092zc0ot',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'2eacz1979l5',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'ouuvop86xkn',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'6zdy7upftb2',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'h3irsnu3clo',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'2891oprcahh',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'tqpxc3hilti',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'kme85fmbfdp',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'75uiuzj3a2y',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'o6vjinhjhad',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'knyew80qe7m',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'43f9otxtq42',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'dhye1xbbr3n',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'1i8da3k889z',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'mqr5sytnrex',	'r_np59b00ex8z'),
+('2021-09-14 02:22:46.7+00',	'2021-09-14 02:22:46.7+00',	'0b73gccskc2',	'r_np59b00ex8z'),
+('2021-09-14 02:22:53.939+00',	'2021-09-14 02:22:53.939+00',	'hall72478p5',	'r_np59b00ex8z'),
+('2021-09-14 02:26:04.313+00',	'2021-09-14 02:26:04.313+00',	'gd7t6lt75n9',	'r_np59b00ex8z');
diff --git a/packages/plugin-client/src/db/zh-CN/part1/01-ui_schemas.sql b/packages/plugin-client/src/db/zh-CN/part1/01-ui_schemas.sql
index 52f6d46c8..1688386ae 100644
--- a/packages/plugin-client/src/db/zh-CN/part1/01-ui_schemas.sql
+++ b/packages/plugin-client/src/db/zh-CN/part1/01-ui_schemas.sql
@@ -1568,6 +1568,6 @@ INSERT INTO "ui_schemas" ("key", "name", "title", "type", "x-component", "option
 INSERT INTO "ui_schemas" ("key", "name", "title", "type", "x-component", "options", "async", "sort", "created_at", "updated_at", "parent_key") VALUES
 ('17mcgd6s6d7',	'liia3b09auv',	'关注 GitHub',	'void',	'Menu.URL',	'{"version":"2.0","x-designable-bar":"Menu.DesignableBar","x-component-props":{"href":"https://github.com/nocobase/nocobase","icon":"githuboutlined"}}',	'0',	12,	'2021-11-08 14:27:02.538+00',	'2021-11-08 14:27:02.538+00',	'qqzzjakwkwl');
 INSERT INTO "ui_schemas" ("key", "name", "title", "type", "x-component", "options", "async", "sort", "created_at", "updated_at", "parent_key") VALUES
-('sarppf56eim',	NULL,	'{{t("Roles")}}',	'array',	'Select.Drawer',	'{"x-component-props":{},"x-decorator":"FormItem","x-designable-bar":"Select.Drawer.DesignableBar"}',	'0',	4,	'2021-11-16 08:32:08.041+00',	'2021-11-16 08:32:08.041+00',	NULL);
+('sarppf56eim',	NULL,	'{{t("Roles")}}',	'array',	'Select.Drawer',	'{"x-component-props":{"fieldNames": {"label": "title","value": "name"}},"x-decorator":"FormItem","x-designable-bar":"Select.Drawer.DesignableBar"}',	'0',	4,	'2021-11-16 08:32:08.041+00',	'2021-11-16 08:32:08.041+00',	NULL);
 INSERT INTO "ui_schemas" ("key", "name", "title", "type", "x-component", "options", "async", "sort", "created_at", "updated_at", "parent_key") VALUES
 ('bhqy0xdfiog',	NULL,	'{{t("Role name")}}',	'string',	'Input',	'{}',	'0',	5,	'2021-11-16 09:32:00.3+00',	'2021-11-16 09:32:00.3+00',	NULL);
diff --git a/packages/plugin-client/src/db/zh-CN/part1/02-collections.sql b/packages/plugin-client/src/db/zh-CN/part1/02-collections.sql
index ad77ef1ca..f6c810b49 100644
--- a/packages/plugin-client/src/db/zh-CN/part1/02-collections.sql
+++ b/packages/plugin-client/src/db/zh-CN/part1/02-collections.sql
@@ -1,8 +1,8 @@
 DELETE FROM "collections";
 INSERT INTO "collections" ("name", "logging", "title", "privilege", "sortable", "options", "sort", "created_at", "updated_at", "ui_schema_key") VALUES
-('users',	'1',	'{{t("Users")}}',	'undelete',	'"sort"',	'{"createdBy":false,"updatedBy":false}',	2,	'2021-09-02 15:07:56.914+00',	'2021-09-15 00:59:20.676+00',	NULL),
+('users',	'1',	'{{t("Users")}}',	'undelete',	'"sort"',	'{"createdBy":false,"updatedBy":false,"scopes":{"withPassword":{"attributes":{"include":["password"]}}},"defaultScope":{"attributes":{"exclude":["password"]}}}',	1,	'2021-11-17 04:49:27.376+00',	'2021-11-17 04:49:27.376+00',	NULL),
+('roles',	'1',	'{{t("Roles")}}',	NULL,	'"sort"',	'{}',	2,	'2021-11-17 04:49:27.529+00',	'2021-11-17 04:49:27.529+00',	NULL);
+INSERT INTO "collections" ("name", "logging", "title", "privilege", "sortable", "options", "sort", "created_at", "updated_at", "ui_schema_key") VALUES
 ('t_fsveob6p269',	'1',	'顾客',	NULL,	'"sort"',	'{}',	5,	'2021-09-12 01:05:52.722+00',	'2021-09-18 04:15:23.113+00',	NULL),
 ('t_geso7fru7a9',	'1',	'订单',	NULL,	'"sort"',	'{}',	4,	'2021-09-12 01:06:05.19+00',	'2021-09-18 04:15:42.566+00',	NULL),
 ('t_2uhu4szs1kq',	'1',	'任务',	NULL,	'"sort"',	'{}',	3,	'2021-09-03 08:17:30.495+00',	'2021-09-18 04:15:42.572+00',	NULL);
-INSERT INTO "collections" ("name", "logging", "title", "privilege", "sortable", "options", "sort", "created_at", "updated_at", "ui_schema_key") VALUES
-('roles',	'1',	'{{t("Roles")}}',	NULL,	'"sort"',	'{}',	2,	'2021-11-16 09:25:52.28+00',	'2021-11-16 09:25:52.28+00',	NULL);
diff --git a/packages/plugin-client/src/db/zh-CN/part1/03-fields.sql b/packages/plugin-client/src/db/zh-CN/part1/03-fields.sql
index ad8c2210e..27b2d01be 100644
--- a/packages/plugin-client/src/db/zh-CN/part1/03-fields.sql
+++ b/packages/plugin-client/src/db/zh-CN/part1/03-fields.sql
@@ -52,7 +52,7 @@ INSERT INTO "fields" ("key", "name", "interface", "data_type", "privilege", "sta
 ('sbrf1cdkpb9',	'h1f9o1xvevb',	'createdAt',	'date',	'undelete',	1,	'{"field":"created_at"}',	1,	'2021-09-12 01:06:55.123+00',	'2021-09-12 01:06:55.133+00',	NULL,	NULL,	'oo7ejuze28i',	NULL);
 
 INSERT INTO "fields" ("key", "name", "interface", "data_type", "privilege", "state", "options", "sort", "created_at", "updated_at", "parent_key", "collection_name", "reverse_key", "ui_schema_key") VALUES
-('f_v3j9yv454ch',	'roles',	'linkTo',	'belongsToMany',	NULL,	1,	'{"target":"roles","foreignKey":"user_id","otherKey":"role_id","sourceKey":"id","targetKey":"id"}',	NULL,	'2021-11-16 08:32:08.033+00',	'2021-11-16 08:32:08.049+00',	NULL,	'users',	NULL,	'sarppf56eim'),
+('f_v3j9yv454ch',	'roles',	'linkTo',	'belongsToMany',	NULL,	1,	'{"target":"roles","foreignKey":"user_id","otherKey":"role_name","sourceKey":"id","targetKey":"name"}',	NULL,	'2021-11-16 08:32:08.033+00',	'2021-11-16 08:32:08.049+00',	NULL,	'users',	NULL,	'sarppf56eim'),
 ('f_jd6k0hxqe91',	'title',	'string',	'string',	NULL,	1,	'{}',	NULL,	'2021-11-16 08:32:08.096+00',	'2021-11-16 08:32:08.113+00',	NULL,	'roles',	NULL,	'bhqy0xdfiog'),
 ('f_9jeplea2nwz',	'name',	NULL,	'uid',	NULL,	0,	'{"unique":true,"prefix":"r_"}',	NULL,	'2021-11-16 08:32:08.121+00',	'2021-11-16 08:32:08.121+00',	NULL,	'roles',	NULL,	NULL),
 ('f_no8fg9nvnuk',	'actionPermissions',	NULL,	'hasMany',	NULL,	0,	'{"target":"action_permissions"}',	NULL,	'2021-11-16 08:32:08.128+00',	'2021-11-16 08:32:08.128+00',	NULL,	'roles',	NULL,	NULL),
diff --git a/packages/plugin-client/src/db/zh-CN/part2/06-t_2uhu4szs1kq.sql b/packages/plugin-client/src/db/zh-CN/part2/06-t_2uhu4szs1kq.sql
old mode 100644
new mode 100755
diff --git a/packages/plugin-client/src/db/zh-CN/part2/07-t_fsveob6p269.sql b/packages/plugin-client/src/db/zh-CN/part2/07-t_fsveob6p269.sql
old mode 100644
new mode 100755
diff --git a/packages/plugin-client/src/db/zh-CN/part2/08-t_geso7fru7a9.sql b/packages/plugin-client/src/db/zh-CN/part2/08-t_geso7fru7a9.sql
old mode 100644
new mode 100755
diff --git a/packages/plugin-client/src/db/zh-CN/part2/09-t_bphcojtl8bx.sql b/packages/plugin-client/src/db/zh-CN/part2/09-t_bphcojtl8bx.sql
old mode 100644
new mode 100755
diff --git a/packages/plugin-client/src/db/zh-CN/part2/10-t_jh7a28dsfzi.sql b/packages/plugin-client/src/db/zh-CN/part2/10-t_jh7a28dsfzi.sql
old mode 100644
new mode 100755
diff --git a/packages/plugin-client/src/db/zh-CN/part2/11-t_p13gbi31uux.sql b/packages/plugin-client/src/db/zh-CN/part2/11-t_p13gbi31uux.sql
old mode 100644
new mode 100755
diff --git a/packages/plugin-client/src/db/zh-CN/part2/12-roles.sql b/packages/plugin-client/src/db/zh-CN/part2/12-roles.sql
old mode 100644
new mode 100755
index 9542ecf5e..c203402d0
--- a/packages/plugin-client/src/db/zh-CN/part2/12-roles.sql
+++ b/packages/plugin-client/src/db/zh-CN/part2/12-roles.sql
@@ -1,4 +1,4 @@
 DELETE FROM "roles";
-INSERT INTO "roles" ("id", "name", "title", "sort", "created_at", "updated_at", "created_by_id", "updated_by_id") VALUES
-(1, 'r_tfs4qtaxjcs',	'管理员',	1,	'2021-09-14 02:12:19.98+00',	'2021-09-14 02:12:19.98+00',	1,	1),
-(2, 'r_np59b00ex8z',	'普通成员',	2,	'2021-09-14 02:12:35.799+00',	'2021-09-14 02:12:35.799+00',	1,	1);
+INSERT INTO "roles" ("name", "title", "sort", "created_at", "updated_at", "created_by_id", "updated_by_id") VALUES
+('r_tfs4qtaxjcs',	'管理员',	1,	'2021-09-14 02:12:19.98+00',	'2021-09-14 02:12:19.98+00',	1,	1),
+('r_np59b00ex8z',	'普通成员',	2,	'2021-09-14 02:12:35.799+00',	'2021-09-14 02:12:35.799+00',	1,	1);
diff --git a/packages/plugin-client/src/db/zh-CN/part2/13-action_permissions.sql b/packages/plugin-client/src/db/zh-CN/part2/13-action_permissions.sql
old mode 100644
new mode 100755
index 7fb085b45..2da1d9d8a
--- a/packages/plugin-client/src/db/zh-CN/part2/13-action_permissions.sql
+++ b/packages/plugin-client/src/db/zh-CN/part2/13-action_permissions.sql
@@ -1,18 +1,18 @@
 DELETE FROM "action_permissions";
-INSERT INTO "action_permissions" ("id", "action_name", "created_at", "updated_at", "collection_name", "user_id", "created_by_id", "updated_by_id", "role_id", "scope_id") VALUES
-(1,	'create',	'2021-09-14 02:19:38.019+00',	'2021-09-14 02:19:45.64+00',	't_geso7fru7a9',	NULL,	1,	1,	NULL,	NULL),
-(2,	'get',	'2021-09-14 02:19:38.04+00',	'2021-09-14 02:19:45.64+00',	't_geso7fru7a9',	NULL,	1,	1,	NULL,	NULL),
-(3,	'update',	'2021-09-14 02:19:38.053+00',	'2021-09-14 02:19:45.64+00',	't_geso7fru7a9',	NULL,	1,	1,	NULL,	NULL),
-(4,	'destroy',	'2021-09-14 02:19:38.067+00',	'2021-09-14 02:19:45.64+00',	't_geso7fru7a9',	NULL,	1,	1,	NULL,	NULL),
-(5,	'create',	'2021-09-14 02:19:45.601+00',	'2021-09-14 02:19:53.3+00',	't_2uhu4szs1kq',	NULL,	1,	1,	NULL,	NULL),
-(6,	'get',	'2021-09-14 02:19:45.616+00',	'2021-09-14 02:19:53.3+00',	't_2uhu4szs1kq',	NULL,	1,	1,	NULL,	NULL),
-(7,	'update',	'2021-09-14 02:19:45.625+00',	'2021-09-14 02:19:53.3+00',	't_2uhu4szs1kq',	NULL,	1,	1,	NULL,	NULL),
-(8,	'destroy',	'2021-09-14 02:19:45.633+00',	'2021-09-14 02:19:53.3+00',	't_2uhu4szs1kq',	NULL,	1,	1,	NULL,	NULL),
-(13,	'create',	'2021-09-14 02:20:00.337+00',	'2021-09-14 02:20:00.337+00',	'users',	NULL,	1,	1,	1,	NULL),
-(14,	'get',	'2021-09-14 02:20:00.347+00',	'2021-09-14 02:20:00.347+00',	'users',	NULL,	1,	1,	1,	NULL),
-(15,	'update',	'2021-09-14 02:20:00.356+00',	'2021-09-14 02:20:00.356+00',	'users',	NULL,	1,	1,	1,	NULL),
-(16,	'destroy',	'2021-09-14 02:20:00.364+00',	'2021-09-14 02:20:00.364+00',	'users',	NULL,	1,	1,	1,	NULL),
-(9,	'create',	'2021-09-14 02:19:53.259+00',	'2021-09-14 02:20:00.371+00',	't_fsveob6p269',	NULL,	1,	1,	NULL,	NULL),
-(10,	'get',	'2021-09-14 02:19:53.274+00',	'2021-09-14 02:20:00.371+00',	't_fsveob6p269',	NULL,	1,	1,	NULL,	NULL),
-(11,	'update',	'2021-09-14 02:19:53.284+00',	'2021-09-14 02:20:00.371+00',	't_fsveob6p269',	NULL,	1,	1,	NULL,	NULL),
-(12,	'destroy',	'2021-09-14 02:19:53.294+00',	'2021-09-14 02:20:00.371+00',	't_fsveob6p269',	NULL,	1,	1,	NULL,	NULL);
+INSERT INTO "action_permissions" ("id", "action_name", "created_at", "updated_at", "collection_name", "user_id", "created_by_id", "updated_by_id", "role_name", "scope_id") VALUES
+(1,	'create',	'2021-09-14 02:19:38.019+00',	'2021-09-14 02:19:45.64+00',	't_geso7fru7a9',	NULL,	1,	1,	'r_tfs4qtaxjcs',	NULL),
+(2,	'get',	'2021-09-14 02:19:38.04+00',	'2021-09-14 02:19:45.64+00',	't_geso7fru7a9',	NULL,	1,	1,	'r_tfs4qtaxjcs',	NULL),
+(3,	'update',	'2021-09-14 02:19:38.053+00',	'2021-09-14 02:19:45.64+00',	't_geso7fru7a9',	NULL,	1,	1,	'r_tfs4qtaxjcs',	NULL),
+(4,	'destroy',	'2021-09-14 02:19:38.067+00',	'2021-09-14 02:19:45.64+00',	't_geso7fru7a9',	NULL,	1,	1,	'r_tfs4qtaxjcs',	NULL),
+(5,	'create',	'2021-09-14 02:19:45.601+00',	'2021-09-14 02:19:53.3+00',	't_2uhu4szs1kq',	NULL,	1,	1,	'r_tfs4qtaxjcs',	NULL),
+(6,	'get',	'2021-09-14 02:19:45.616+00',	'2021-09-14 02:19:53.3+00',	't_2uhu4szs1kq',	NULL,	1,	1,	'r_tfs4qtaxjcs',	NULL),
+(7,	'update',	'2021-09-14 02:19:45.625+00',	'2021-09-14 02:19:53.3+00',	't_2uhu4szs1kq',	NULL,	1,	1,	'r_tfs4qtaxjcs',	NULL),
+(8,	'destroy',	'2021-09-14 02:19:45.633+00',	'2021-09-14 02:19:53.3+00',	't_2uhu4szs1kq',	NULL,	1,	1,	'r_tfs4qtaxjcs',	NULL),
+(13,	'create',	'2021-09-14 02:20:00.337+00',	'2021-09-14 02:20:00.337+00',	'users',	NULL,	1,	1,	'r_tfs4qtaxjcs',	NULL),
+(14,	'get',	'2021-09-14 02:20:00.347+00',	'2021-09-14 02:20:00.347+00',	'users',	NULL,	1,	1,	'r_tfs4qtaxjcs',	NULL),
+(15,	'update',	'2021-09-14 02:20:00.356+00',	'2021-09-14 02:20:00.356+00',	'users',	NULL,	1,	1,	'r_tfs4qtaxjcs',	NULL),
+(16,	'destroy',	'2021-09-14 02:20:00.364+00',	'2021-09-14 02:20:00.364+00',	'users',	NULL,	1,	1,	'r_tfs4qtaxjcs',	NULL),
+(9,	'create',	'2021-09-14 02:19:53.259+00',	'2021-09-14 02:20:00.371+00',	't_fsveob6p269',	NULL,	1,	1,	'r_tfs4qtaxjcs',	NULL),
+(10,	'get',	'2021-09-14 02:19:53.274+00',	'2021-09-14 02:20:00.371+00',	't_fsveob6p269',	NULL,	1,	1,	'r_tfs4qtaxjcs',	NULL),
+(11,	'update',	'2021-09-14 02:19:53.284+00',	'2021-09-14 02:20:00.371+00',	't_fsveob6p269',	NULL,	1,	1,	'r_tfs4qtaxjcs',	NULL),
+(12,	'destroy',	'2021-09-14 02:19:53.294+00',	'2021-09-14 02:20:00.371+00',	't_fsveob6p269',	NULL,	1,	1,	'r_tfs4qtaxjcs',	NULL);
diff --git a/packages/plugin-client/src/db/zh-CN/part2/14-field_permissions.sql b/packages/plugin-client/src/db/zh-CN/part2/14-field_permissions.sql
old mode 100644
new mode 100755
diff --git a/packages/plugin-client/src/db/zh-CN/part2/15-roles_ui_schemas.sql b/packages/plugin-client/src/db/zh-CN/part2/15-roles_ui_schemas.sql
old mode 100644
new mode 100755
index 691967497..6b8c3443a
--- a/packages/plugin-client/src/db/zh-CN/part2/15-roles_ui_schemas.sql
+++ b/packages/plugin-client/src/db/zh-CN/part2/15-roles_ui_schemas.sql
@@ -1,52 +1,52 @@
 DELETE FROM "roles_ui_schemas";
-INSERT INTO "roles_ui_schemas" ("created_at", "updated_at", "ui_schema_key", "role_id") VALUES
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'0b73gccskc2',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'hall72478p5',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'im4un32remd',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'wfa10dg0vyl',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'k33sn747t75',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'6chv7wh9gy9',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'h41g5aiikz1',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'66g7jbpqsen',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'on7wtx4zj4i',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'2fmrebsf4gp',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'p5e092zc0ot',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'2eacz1979l5',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'ouuvop86xkn',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'6zdy7upftb2',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'h3irsnu3clo',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'2891oprcahh',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'tqpxc3hilti',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'kme85fmbfdp',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'75uiuzj3a2y',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'o6vjinhjhad',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'knyew80qe7m',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'gd7t6lt75n9',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'1i8da3k889z',	1),
-('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'mqr5sytnrex',	1),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'im4un32remd',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'wfa10dg0vyl',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'k33sn747t75',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'6chv7wh9gy9',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'h41g5aiikz1',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'66g7jbpqsen',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'on7wtx4zj4i',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'2fmrebsf4gp',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'p5e092zc0ot',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'2eacz1979l5',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'ouuvop86xkn',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'6zdy7upftb2',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'h3irsnu3clo',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'2891oprcahh',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'tqpxc3hilti',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'kme85fmbfdp',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'75uiuzj3a2y',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'o6vjinhjhad',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'knyew80qe7m',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'43f9otxtq42',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'dhye1xbbr3n',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'1i8da3k889z',	2),
-('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'mqr5sytnrex',	2),
-('2021-09-14 02:22:46.7+00',	'2021-09-14 02:22:46.7+00',	'0b73gccskc2',	2),
-('2021-09-14 02:22:53.939+00',	'2021-09-14 02:22:53.939+00',	'hall72478p5',	2),
-('2021-09-14 02:26:04.313+00',	'2021-09-14 02:26:04.313+00',	'gd7t6lt75n9',	2);
+INSERT INTO "roles_ui_schemas" ("created_at", "updated_at", "ui_schema_key", "role_name") VALUES
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'0b73gccskc2',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'hall72478p5',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'im4un32remd',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'wfa10dg0vyl',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'k33sn747t75',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'6chv7wh9gy9',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'h41g5aiikz1',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'66g7jbpqsen',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'on7wtx4zj4i',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'2fmrebsf4gp',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'p5e092zc0ot',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'2eacz1979l5',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'ouuvop86xkn',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'6zdy7upftb2',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'h3irsnu3clo',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'2891oprcahh',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'tqpxc3hilti',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'kme85fmbfdp',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'75uiuzj3a2y',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'o6vjinhjhad',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'knyew80qe7m',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'gd7t6lt75n9',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'1i8da3k889z',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:19:13.669+00',	'2021-09-14 02:19:13.669+00',	'mqr5sytnrex',	'r_tfs4qtaxjcs'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'im4un32remd',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'wfa10dg0vyl',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'k33sn747t75',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'6chv7wh9gy9',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'h41g5aiikz1',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'66g7jbpqsen',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'on7wtx4zj4i',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'2fmrebsf4gp',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'p5e092zc0ot',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'2eacz1979l5',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'ouuvop86xkn',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'6zdy7upftb2',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'h3irsnu3clo',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'2891oprcahh',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'tqpxc3hilti',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'kme85fmbfdp',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'75uiuzj3a2y',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'o6vjinhjhad',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'knyew80qe7m',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'43f9otxtq42',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'dhye1xbbr3n',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'1i8da3k889z',	'r_np59b00ex8z'),
+('2021-09-14 02:20:09.49+00',	'2021-09-14 02:20:09.49+00',	'mqr5sytnrex',	'r_np59b00ex8z'),
+('2021-09-14 02:22:46.7+00',	'2021-09-14 02:22:46.7+00',	'0b73gccskc2',	'r_np59b00ex8z'),
+('2021-09-14 02:22:53.939+00',	'2021-09-14 02:22:53.939+00',	'hall72478p5',	'r_np59b00ex8z'),
+('2021-09-14 02:26:04.313+00',	'2021-09-14 02:26:04.313+00',	'gd7t6lt75n9',	'r_np59b00ex8z');
diff --git a/packages/plugin-permissions/src/collections/roles.ts b/packages/plugin-permissions/src/collections/roles.ts
index 9778698eb..f7e37e182 100644
--- a/packages/plugin-permissions/src/collections/roles.ts
+++ b/packages/plugin-permissions/src/collections/roles.ts
@@ -8,8 +8,8 @@ export default {
     {
       type: 'uid',
       name: 'name',
-      unique: true,
-      // primaryKey: true,
+      // unique: true,
+      primaryKey: true,
       prefix: 'r_',
       state: 0,
     },
diff --git a/packages/plugin-users/src/collections/users.ts b/packages/plugin-users/src/collections/users.ts
index cbebfacbd..514c6a9f3 100644
--- a/packages/plugin-users/src/collections/users.ts
+++ b/packages/plugin-users/src/collections/users.ts
@@ -58,14 +58,19 @@ export default {
       name: 'roles',
       target: 'roles',
       foreignKey: 'user_id',
-      otherKey: 'role_id',
+      otherKey: 'role_name',
       sourceKey: 'id',
-      targetKey: 'id',
+      targetKey: 'name',
       uiSchema: {
         type: 'array',
         title: '{{t("Roles")}}',
         'x-component': 'Select.Drawer',
-        'x-component-props': {},
+        'x-component-props': {
+          fieldNames: {
+            label: 'title',
+            value: 'name',
+          },
+        },
         'x-decorator': 'FormItem',
         'x-designable-bar': 'Select.Drawer.DesignableBar',
       },