test/nocobase2
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2024-11-30 03:08:31 +08:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

Merge branch 'main' into next

Browse Source
This commit is contained in:
xilesun 2024-07-16 10:06:20 +08:00
commit e759c9acfd
4 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
CHANGELOG.md
View File

@ -7,6 +7,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
## [v1.2.17-alpha](https://github.com/nocobase/nocobase/compare/v1.2.16-alpha...v1.2.17-alpha) - 2024-07-16
### Merged
- fix: dataSourceKey parameter error for external data sources in acl data scope list [`#4882`](https://github.com/nocobase/nocobase/pull/4882)
- chore: clear listener after transaction commited [`#4879`](https://github.com/nocobase/nocobase/pull/4879)
- chore(action-import): report sequelize error message [`#4878`](https://github.com/nocobase/nocobase/pull/4878)
- fix: create multiple auto incr field in mysql [`#4839`](https://github.com/nocobase/nocobase/pull/4839)
- fix: default values for fields should not be cleared after submission [`#4877`](https://github.com/nocobase/nocobase/pull/4877)
- fix(form): resolve issue with association fields not displaying content due to referenced templates [`#4876`](https://github.com/nocobase/nocobase/pull/4876)
- fix: real-time update issue for association field data scope in sub-table [`#4872`](https://github.com/nocobase/nocobase/pull/4872)
- fix: useImportStartAction [`#4875`](https://github.com/nocobase/nocobase/pull/4875)
### Commits
- chore(versions): 😊 publish v1.2.17-alpha [`c65c7f7`](https://github.com/nocobase/nocobase/commit/c65c7f708ecdb48740c0043ebcd615ae6201cca5)
- chore: update changelog [`b3efafc`](https://github.com/nocobase/nocobase/commit/b3efafc1b73fab1047618f8db6fe0099d1d9724a)
- Update bug_report.md [`596aa81`](https://github.com/nocobase/nocobase/commit/596aa81faba08149b7e074e949f189679e2c1735)
## [v1.2.16-alpha](https://github.com/nocobase/nocobase/compare/v1.2.15-alpha...v1.2.16-alpha) - 2024-07-12
### Merged

2
packages/core/client/src/application/Application.tsx
View File

@ -180,7 +180,7 @@ export class Application {
}
getName() {
return getSubAppName(this.getPublicPath()) || null;
return this.name || getSubAppName(this.getPublicPath()) || null;
}
getPublicPath() {

1
packages/plugins/@nocobase/plugin-acl/src/server/server.ts
View File

@ -104,6 +104,7 @@ export class PluginACLServer extends Plugin {
'roles.users:*',
'dataSources.roles:*',
'dataSources:list',
'dataSources.rolesResourcesScopes:*',
'roles.dataSourcesCollections:*',
'roles.dataSourceResources:*',
'dataSourcesRolesResourcesScopes:*',

4
packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/ScopeSelect.tsx
View File

@ -9,7 +9,7 @@
import { createForm } from '@formily/core';
import React, { createContext, useContext, useMemo, useState } from 'react';
import { FormProvider, SchemaComponent, useRecord } from '@nocobase/client';
import { FormProvider, SchemaComponent, useCollectionRecord, useRecord } from '@nocobase/client';
import { getScopesSchema } from './schemas/scopes';
const RolesResourcesScopesSelectedRowKeysContext = createContext(null);
@ -39,7 +39,7 @@ export const ScopeSelect = (props) => {
[],
);
const { key } = useRecord();
const { key } = useCollectionRecord()?.parentRecord.data || ({} as any);
const scopesSchema = getScopesSchema(key);
return (
<FormProvider form={form}>