fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-07-02 03:02:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into next

Browse Source
This commit is contained in:
katherinehhh 2024-12-14 21:25:21 +08:00
commit 98ceee6066
5 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/client/src/locale/en-US.json
View File

@ -776,7 +776,7 @@
"Quick duplicate": "Quick duplicate",
"Duplicate and continue": "Duplicate and continue",
"Please configure the duplicate fields": "Please configure the duplicate fields",
"Add": "Create",
"Add": "Add",
"Add new mode": "Add new mode",
"Quick add": "Quick add",
"Modal add": "Modal add",

4
packages/core/client/src/schema-component/antd/collection-select/__tests__/collection-select.test.tsx
View File

@ -50,7 +50,7 @@ describe('CollectionSelect', () => {
>
<div
aria-label="block-item-demo title"
class="nb-block-item nb-form-item css-wrgn5s ant-nb-block-item css-dev-only-do-not-override-11aiz3o"
class="nb-block-item nb-form-item css-1elzyjx ant-nb-block-item css-dev-only-do-not-override-11aiz3o"
role="button"
>
<div
@ -187,7 +187,7 @@ describe('CollectionSelect', () => {
>
<div
aria-label="block-item-demo title"
class="nb-block-item nb-form-item css-wrgn5s ant-nb-block-item css-dev-only-do-not-override-11aiz3o"
class="nb-block-item nb-form-item css-1elzyjx ant-nb-block-item css-dev-only-do-not-override-11aiz3o"
role="button"
>
<div

2
packages/plugins/@nocobase/plugin-public-forms/src/client/components/AdminPublicFormPage.tsx
View File

@ -109,7 +109,6 @@ export function AdminPublicFormPage() {
const isUnderSubApp = window.location.pathname.startsWith('/apps');
const link =
baseURL + (isUnderSubApp ? `/apps/${app.name}/public-forms/${params.name}` : `/public-forms/${params.name}`);
console.log(link);
navigator.clipboard.writeText(link);
message.success(t('Link copied successfully'));
};
@ -120,7 +119,6 @@ export function AdminPublicFormPage() {
style={{
margin: '-24px',
padding: '10px',
background: '#fff',
display: 'flex',
alignItems: 'center',
justifyContent: 'space-between',

16
packages/plugins/@nocobase/plugin-public-forms/src/client/components/PublicFormPage.tsx
View File

@ -22,6 +22,7 @@ import {
useRequest,
ACLCustomContext,
VariablesProvider,
GlobalThemeProvider,
AssociationField,
Action,
DatePicker,
@ -274,5 +275,18 @@ function InternalPublicForm() {
}
export function PublicFormPage() {
return <InternalPublicForm />;
return (
<GlobalThemeProvider
theme={{
token: {
marginBlock: 18,
borderRadiusBlock: 0,
boxShadowTertiary: 'none',
fontSize: 14,
},
}}
>
<InternalPublicForm />
</GlobalThemeProvider>
);
}

4
packages/plugins/@nocobase/plugin-theme-editor/src/server/builtinThemes.ts
View File

@ -17,7 +17,7 @@ export const defaultTheme: Omit<ThemeItem, 'id'> = {
optional: true,
isBuiltIn: true,
uid: 'default',
default: false,
default: process.env.__E2E__ ? true : false,
};
export const dark: Omit<ThemeItem, 'id'> = {
@ -44,7 +44,7 @@ export const compact: Omit<ThemeItem, 'id'> = {
optional: true,
isBuiltIn: true,
uid: 'compact',
default: true,
default: process.env.__E2E__ ? false : true,
};
/** 同时包含 `紧凑` 和 `暗黑` 两种模式 */