diff --git a/.github/workflows/manual-build-pro-image.yml b/.github/workflows/manual-build-pro-image.yml index fb49d1a9f9..620f340ce2 100644 --- a/.github/workflows/manual-build-pro-image.yml +++ b/.github/workflows/manual-build-pro-image.yml @@ -1,7 +1,7 @@ name: Manual build pro image concurrency: - group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.inputs.pr_number }}-${{ github.event.inputs.nocobase_pr_number }} + group: ${{ github.workflow }}-${{ github.ref }}-${{ inputs.pr_number }}-${{ inputs.nocobase_pr_number }} cancel-in-progress: true run-name: Build pro image ${{ github.ref }}-${{ inputs.pr_number }}-${{ inputs.nocobase_pr_number }} diff --git a/.github/workflows/manual-build-pro-plugin-image.yml b/.github/workflows/manual-build-pro-plugin-image.yml index 591d40edc9..30574a92a0 100644 --- a/.github/workflows/manual-build-pro-plugin-image.yml +++ b/.github/workflows/manual-build-pro-plugin-image.yml @@ -1,10 +1,10 @@ name: Build pro plugin docker image concurrency: - group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.inputs.pro_plugin }}-${{ github.events.inputs.pr_number }}-${{ github.events.inputs.nocobase_pr_number }} + group: ${{ github.workflow }}-${{ github.ref }}-${{ inputs.pro_plugin }}-${{ inputs.pr_number }}-${{ inputs.nocobase_pr_number }} cancel-in-progress: true -run-name: Build pro plugin image ${{ github.ref }}-${{ github.event.inputs.pro_plugin }}-${{ github.events.inputs.pr_number }}-${{ github.events.inputs.nocobase_pr_number }} +run-name: Build pro plugin image ${{ github.ref }}-${{ inputs.pro_plugin }}-${{ inputs.pr_number }}-${{ inputs.nocobase_pr_number }} on: workflow_dispatch: diff --git a/packages/core/client/package.json b/packages/core/client/package.json index 145f372332..372bb54f29 100644 --- a/packages/core/client/package.json +++ b/packages/core/client/package.json @@ -32,8 +32,8 @@ "@nocobase/utils": "1.4.0-alpha", "ahooks": "^3.7.2", "antd": "5.12.8", - "antd-style": "3.4.5", "axios": "^1.7.0", + "antd-style": "3.7.1", "bignumber.js": "^9.1.2", "classnames": "^2.3.1", "cronstrue": "^2.11.0", diff --git a/packages/core/client/src/collection-manager/interfaces/number.ts b/packages/core/client/src/collection-manager/interfaces/number.ts index be89ced87c..13b534dbf4 100644 --- a/packages/core/client/src/collection-manager/interfaces/number.ts +++ b/packages/core/client/src/collection-manager/interfaces/number.ts @@ -47,6 +47,9 @@ export class NumberFieldInterface extends CollectionFieldInterface { { value: '0.001', label: '1.000' }, { value: '0.0001', label: '1.0000' }, { value: '0.00001', label: '1.00000' }, + { value: '0.000001', label: '1.000000' }, + { value: '0.0000001', label: '1.0000000' }, + { value: '0.00000001', label: '1.00000000' }, ], }, }; diff --git a/packages/core/client/src/modules/blocks/data-blocks/form/hooks/useDataFormItemProps.ts b/packages/core/client/src/modules/blocks/data-blocks/form/hooks/useDataFormItemProps.ts index 934e66acc5..f584b4089a 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/form/hooks/useDataFormItemProps.ts +++ b/packages/core/client/src/modules/blocks/data-blocks/form/hooks/useDataFormItemProps.ts @@ -7,11 +7,18 @@ * For more information, please refer to: https://www.nocobase.com/agreement. */ -import { useForm } from '@formily/react'; import { useCollectionRecordData } from '../../../../../data-source/collection-record/CollectionRecordProvider'; import { useSatisfiedActionValues } from '../../../../../schema-settings/LinkageRules/useActionValues'; +import { useFormBlockContext } from '../../../../../block-provider'; +import { useSubFormValue } from '../../../../../schema-component/antd/association-field/hooks'; export function useDataFormItemProps() { - const data = useCollectionRecordData(); - const { valueMap: style } = useSatisfiedActionValues({ category: 'style', formValues: data }); + const record = useCollectionRecordData(); + const { form } = useFormBlockContext(); + const subForm = useSubFormValue(); + const { valueMap: style } = useSatisfiedActionValues({ + category: 'style', + formValues: subForm?.formValue || form?.values || record, + form, + }); return { wrapperStyle: style }; } diff --git a/packages/core/client/src/modules/blocks/data-blocks/table/__e2e__/schemaSettings.test.ts b/packages/core/client/src/modules/blocks/data-blocks/table/__e2e__/schemaSettings.test.ts index cfbfd1bc41..3dfed1f5f8 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/table/__e2e__/schemaSettings.test.ts +++ b/packages/core/client/src/modules/blocks/data-blocks/table/__e2e__/schemaSettings.test.ts @@ -936,7 +936,7 @@ test.describe('actions schema settings', () => { ).toBeVisible(); }); - test('open mode', async ({ page, mockPage }) => { + test.skip('open mode', async ({ page, mockPage }) => { const nocoPage = await mockPage(testingOfOpenModeForAddChild).waitForInit(); await nocoPage.goto(); diff --git a/packages/core/client/src/schema-component/antd/action/index.tsx b/packages/core/client/src/schema-component/antd/action/index.tsx index 22db0e3b38..80766dbb69 100644 --- a/packages/core/client/src/schema-component/antd/action/index.tsx +++ b/packages/core/client/src/schema-component/antd/action/index.tsx @@ -8,6 +8,7 @@ */ export * from './Action'; +export * from './Action.Designer'; export * from './ActionBar'; export * from './context'; export * from './hooks'; @@ -15,5 +16,5 @@ export * from './hooks/useGetAriaLabelOfAction'; export * from './hooks/useGetAriaLabelOfDrawer'; export * from './hooks/useGetAriaLabelOfModal'; export * from './hooks/useGetAriaLabelOfPopover'; -export * from './Action.Designer'; export * from './types'; +export * from './zIndexContext'; diff --git a/packages/core/client/src/schema-component/antd/collection-select/__tests__/collection-select.test.tsx b/packages/core/client/src/schema-component/antd/collection-select/__tests__/collection-select.test.tsx index 8c625c2dc0..f83305e4bd 100644 --- a/packages/core/client/src/schema-component/antd/collection-select/__tests__/collection-select.test.tsx +++ b/packages/core/client/src/schema-component/antd/collection-select/__tests__/collection-select.test.tsx @@ -45,7 +45,7 @@ describe('CollectionSelect', () => { expect(container).toMatchInlineSnapshot(`
{ role="button" >