@nocobase/server 1.7.0-alpha.1 → 1.7.0-alpha.3

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.
@@ -82,7 +82,7 @@ async function parseVariables(ctx, next) {
82
82
  // 新的命名方式,防止和 formily 内置变量冲突
83
83
  $nDate: (0, import_utils.getDateVars)(),
84
84
  $user: getUser(ctx),
85
- $nRole: ctx.state.currentRole
85
+ $nRole: ctx.state.currentRole === "__union__" ? ctx.state.currentRoles : ctx.state.currentRole
86
86
  }
87
87
  });
88
88
  await next();
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nocobase/server",
3
- "version": "1.7.0-alpha.1",
3
+ "version": "1.7.0-alpha.3",
4
4
  "main": "lib/index.js",
5
5
  "types": "./lib/index.d.ts",
6
6
  "license": "AGPL-3.0",
@@ -10,19 +10,19 @@
10
10
  "@koa/cors": "^5.0.0",
11
11
  "@koa/multer": "^3.0.2",
12
12
  "@koa/router": "^9.4.0",
13
- "@nocobase/acl": "1.7.0-alpha.1",
14
- "@nocobase/actions": "1.7.0-alpha.1",
15
- "@nocobase/auth": "1.7.0-alpha.1",
16
- "@nocobase/cache": "1.7.0-alpha.1",
17
- "@nocobase/data-source-manager": "1.7.0-alpha.1",
18
- "@nocobase/database": "1.7.0-alpha.1",
19
- "@nocobase/evaluators": "1.7.0-alpha.1",
20
- "@nocobase/lock-manager": "1.7.0-alpha.1",
21
- "@nocobase/logger": "1.7.0-alpha.1",
22
- "@nocobase/resourcer": "1.7.0-alpha.1",
23
- "@nocobase/sdk": "1.7.0-alpha.1",
24
- "@nocobase/telemetry": "1.7.0-alpha.1",
25
- "@nocobase/utils": "1.7.0-alpha.1",
13
+ "@nocobase/acl": "1.7.0-alpha.3",
14
+ "@nocobase/actions": "1.7.0-alpha.3",
15
+ "@nocobase/auth": "1.7.0-alpha.3",
16
+ "@nocobase/cache": "1.7.0-alpha.3",
17
+ "@nocobase/data-source-manager": "1.7.0-alpha.3",
18
+ "@nocobase/database": "1.7.0-alpha.3",
19
+ "@nocobase/evaluators": "1.7.0-alpha.3",
20
+ "@nocobase/lock-manager": "1.7.0-alpha.3",
21
+ "@nocobase/logger": "1.7.0-alpha.3",
22
+ "@nocobase/resourcer": "1.7.0-alpha.3",
23
+ "@nocobase/sdk": "1.7.0-alpha.3",
24
+ "@nocobase/telemetry": "1.7.0-alpha.3",
25
+ "@nocobase/utils": "1.7.0-alpha.3",
26
26
  "@types/decompress": "4.2.7",
27
27
  "@types/ini": "^1.3.31",
28
28
  "@types/koa-send": "^4.1.3",
@@ -56,5 +56,5 @@
56
56
  "@types/serve-handler": "^6.1.1",
57
57
  "@types/ws": "^8.5.5"
58
58
  },
59
- "gitHead": "e411c9728b4d1f16b0beac16e40dd3499352b052"
59
+ "gitHead": "153723ec01c4e9ba179f9d5a32190057dbed453f"
60
60
  }