mirror of
https://github.com/nocobase/nocobase
synced 2024-11-15 07:15:36 +00:00
Merge branch 'main' into next
Some checks are pending
Build Docker Image / build-and-push (push) Waiting to run
Build Pro Image / build-and-push (push) Waiting to run
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase FrontEnd Test / frontend-test (18) (push) Waiting to run
Some checks are pending
Build Docker Image / build-and-push (push) Waiting to run
Build Pro Image / build-and-push (push) Waiting to run
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase FrontEnd Test / frontend-test (18) (push) Waiting to run
This commit is contained in:
commit
80fab037ad
12
CHANGELOG.md
12
CHANGELOG.md
@ -7,6 +7,18 @@ 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.16-alpha](https://github.com/nocobase/nocobase/compare/v1.2.15-alpha...v1.2.16-alpha) - 2024-07-12
|
||||
|
||||
### Merged
|
||||
|
||||
- fix: issue with iframe URL not opening correctly [`#4873`](https://github.com/nocobase/nocobase/pull/4873)
|
||||
|
||||
### Commits
|
||||
|
||||
- chore(versions): 😊 publish v1.2.16-alpha [`a64015d`](https://github.com/nocobase/nocobase/commit/a64015d1cb8f4926652de19e1ebe1175776e8b33)
|
||||
- chore: update .env.example [`df4abfd`](https://github.com/nocobase/nocobase/commit/df4abfdfb79b26e52ab07ed13cbf5f9b82775db4)
|
||||
- chore: update changelog [`a7b0c36`](https://github.com/nocobase/nocobase/commit/a7b0c36af1fffe658513ca87b5af1498bf8e1449)
|
||||
|
||||
## [v1.2.15-alpha](https://github.com/nocobase/nocobase/compare/v1.2.14-alpha...v1.2.15-alpha) - 2024-07-11
|
||||
|
||||
### Merged
|
||||
|
@ -15,6 +15,8 @@ import {
|
||||
useCollection_deprecated,
|
||||
useCollectionManager_deprecated,
|
||||
useCompile,
|
||||
useDataBlockProps,
|
||||
useDataSourceHeaders,
|
||||
} from '@nocobase/client';
|
||||
import lodash from 'lodash';
|
||||
import { saveAs } from 'file-saver';
|
||||
@ -105,6 +107,8 @@ export const useImportStartAction = () => {
|
||||
const { setVisible, fieldSchema } = useActionContext();
|
||||
const { setImportModalVisible, setImportStatus, setImportResult } = useImportContext();
|
||||
const { upload } = form.values;
|
||||
const dataBlockProps = useDataBlockProps();
|
||||
const headers = useDataSourceHeaders(dataBlockProps.dataSource);
|
||||
useEffect(() => {
|
||||
form.reset();
|
||||
}, []);
|
||||
@ -143,6 +147,7 @@ export const useImportStartAction = () => {
|
||||
setImportStatus(ImportStatus.IMPORTING);
|
||||
try {
|
||||
const { data }: any = await apiClient.axios.post(`${name}:importXlsx`, formData, {
|
||||
headers,
|
||||
timeout: 10 * 60 * 1000,
|
||||
});
|
||||
setImportResult(data);
|
||||
|
@ -60,7 +60,7 @@ export const Iframe: any = observer(
|
||||
setSrc(dataUrl);
|
||||
} else {
|
||||
try {
|
||||
const targetUrl = parseURLAndParams(url, params || []);
|
||||
const targetUrl = await parseURLAndParams(url, params || []);
|
||||
setSrc(targetUrl);
|
||||
} catch (error) {
|
||||
console.error('Error fetching target URL:', error);
|
||||
|
Loading…
Reference in New Issue
Block a user