@nocobase/plugin-users 0.20.0-alpha.14 → 0.20.0-alpha.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/externalVersion.js
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
module.exports = {
|
|
2
2
|
"react": "18.2.0",
|
|
3
3
|
"antd": "5.12.8",
|
|
4
|
-
"@nocobase/client": "0.20.0-alpha.
|
|
4
|
+
"@nocobase/client": "0.20.0-alpha.15",
|
|
5
5
|
"@formily/react": "2.3.0",
|
|
6
6
|
"@formily/core": "2.3.0",
|
|
7
|
-
"@nocobase/plugin-acl": "0.20.0-alpha.
|
|
7
|
+
"@nocobase/plugin-acl": "0.20.0-alpha.15",
|
|
8
8
|
"react-i18next": "11.18.6",
|
|
9
|
-
"@nocobase/database": "0.20.0-alpha.
|
|
10
|
-
"@nocobase/server": "0.20.0-alpha.
|
|
11
|
-
"@nocobase/utils": "0.20.0-alpha.
|
|
12
|
-
"@nocobase/cache": "0.20.0-alpha.
|
|
9
|
+
"@nocobase/database": "0.20.0-alpha.15",
|
|
10
|
+
"@nocobase/server": "0.20.0-alpha.15",
|
|
11
|
+
"@nocobase/utils": "0.20.0-alpha.15",
|
|
12
|
+
"@nocobase/cache": "0.20.0-alpha.15",
|
|
13
13
|
"@formily/shared": "2.3.0",
|
|
14
|
-
"@nocobase/actions": "0.20.0-alpha.
|
|
14
|
+
"@nocobase/actions": "0.20.0-alpha.15"
|
|
15
15
|
};
|
|
@@ -46,17 +46,21 @@ const listExcludeRole = async (ctx, next) => {
|
|
|
46
46
|
}
|
|
47
47
|
});
|
|
48
48
|
const userIds = users.map((user) => user.id);
|
|
49
|
+
if (userIds.length) {
|
|
50
|
+
ctx.action.mergeParams({
|
|
51
|
+
filter: {
|
|
52
|
+
id: {
|
|
53
|
+
$notIn: userIds
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
const { filter } = ctx.action.params;
|
|
49
59
|
const [rows, count] = await repo.findAndCount({
|
|
50
60
|
context: ctx,
|
|
51
61
|
offset: (page - 1) * pageSize,
|
|
52
62
|
limit: pageSize,
|
|
53
|
-
|
|
54
|
-
// notIn: [] will be translated to "WHERE id IS NULL"
|
|
55
|
-
filter: userIds.length ? {
|
|
56
|
-
id: {
|
|
57
|
-
$notIn: userIds
|
|
58
|
-
}
|
|
59
|
-
} : {}
|
|
63
|
+
filter
|
|
60
64
|
});
|
|
61
65
|
ctx.body = {
|
|
62
66
|
count,
|
package/package.json
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"displayName.zh-CN": "用户",
|
|
5
5
|
"description": "Provides basic user model, as well as created by and updated by fields.",
|
|
6
6
|
"description.zh-CN": "提供了基础的用户模型，以及创建人和最后更新人字段。",
|
|
7
|
-
"version": "0.20.0-alpha.
|
|
7
|
+
"version": "0.20.0-alpha.15",
|
|
8
8
|
"license": "AGPL-3.0",
|
|
9
9
|
"main": "./dist/server/index.js",
|
|
10
10
|
"homepage": "https://docs.nocobase.com/handbook/users",
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"@nocobase/test": "0.x",
|
|
25
25
|
"@nocobase/utils": "0.x"
|
|
26
26
|
},
|
|
27
|
-
"gitHead": "
|
|
27
|
+
"gitHead": "ec192dcfe2dadda913e2d4c67b3706d78d5d3b9c",
|
|
28
28
|
"keywords": [
|
|
29
29
|
"Users & permissions"
|
|
30
30
|
]
|