diff --git a/package.json b/package.json index 47fbe6219..05ce4833f 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,6 @@ "@types/react-dom": "^17.0.0", "@typescript-eslint/eslint-plugin": "^4.9.1", "@typescript-eslint/parser": "^4.8.2", - "antd": "^4.18.9", "classnames": "^2.3.1", "concurrently": "^7.0.0", "cross-env": "^7.0.3", diff --git a/packages/app/client/package.json b/packages/app/client/package.json index 224f1c9e3..9461ee4a9 100644 --- a/packages/app/client/package.json +++ b/packages/app/client/package.json @@ -14,7 +14,7 @@ "@types/react": "^17.0.0", "@types/react-dom": "^17.0.0", "@umijs/test": "^3.5.20", - "antd": "^4.19.5", + "antd": "~4.19.5", "react": "17.x", "react-dom": "17.x", "umi": "^3.5.20" diff --git a/packages/core/client/package.json b/packages/core/client/package.json index 515132fb9..0c0adf3da 100644 --- a/packages/core/client/package.json +++ b/packages/core/client/package.json @@ -31,7 +31,7 @@ "@formily/react": "^2.0.15", "@nocobase/utils": "0.7.0-alpha.2", "ahooks": "^3.0.5", - "antd": "^4.18.9", + "antd": "~4.19.5", "axios": "^0.24.0", "classnames": "^2.3.1", "file-saver": "^2.0.5", diff --git a/packages/core/client/src/schema-component/antd/menu/Menu.tsx b/packages/core/client/src/schema-component/antd/menu/Menu.tsx index 3a59999e1..9bcf32d90 100644 --- a/packages/core/client/src/schema-component/antd/menu/Menu.tsx +++ b/packages/core/client/src/schema-component/antd/menu/Menu.tsx @@ -264,7 +264,8 @@ export const Menu: ComposedMenu = observer((props) => { } }} mode={mode === 'mix' ? 'horizontal' : mode} - openKeys={defaultOpenKeys} + defaultOpenKeys={defaultOpenKeys} + defaultSelectedKeys={defaultSelectedKeys} selectedKeys={defaultSelectedKeys} > {designable && ( diff --git a/packages/core/client/src/schema-initializer/buttons/BlockInitializers.tsx b/packages/core/client/src/schema-initializer/buttons/BlockInitializers.tsx index ec3446eba..06c69a09e 100644 --- a/packages/core/client/src/schema-initializer/buttons/BlockInitializers.tsx +++ b/packages/core/client/src/schema-initializer/buttons/BlockInitializers.tsx @@ -44,10 +44,12 @@ export const BlockInitializers = { ], }, { + key: 'media', type: 'itemGroup', title: '{{t("Media")}}', children: [ { + key: 'markdown', type: 'item', title: '{{t("Markdown")}}', component: 'MarkdownBlockInitializer', diff --git a/yarn.lock b/yarn.lock index cb491ba01..789ee5e63 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4109,7 +4109,7 @@ ansi-styles@^5.0.0: resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b" integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA== -antd@^4.18.9, antd@^4.19.5: +antd@~4.19.5: version "4.19.5" resolved "https://registry.npmjs.org/antd/-/antd-4.19.5.tgz#38d08f3e1391a7a69c2ca76f50968bb12ec2ac93" integrity sha512-C4H/VJqlVO5iMvHZyiV27R8SbPs4jsOKCGPhDXIHUry/RnUCbMmVeQaPRfUIxSI1NbqDflsuQfevPtz1svyIlg==