diff --git a/packages/core/client/src/built-in/assistant/Assistant.provider.tsx b/packages/core/client/src/built-in/assistant/Assistant.provider.tsx index 3dd366805..1287e6305 100644 --- a/packages/core/client/src/built-in/assistant/Assistant.provider.tsx +++ b/packages/core/client/src/built-in/assistant/Assistant.provider.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { useContextMenu, useDesignable, useHotkeys } from '@tachybase/client'; +import { Icon, useContextMenu, useDesignable, useHotkeys } from '@tachybase/client'; import { CalculatorOutlined, @@ -30,7 +30,7 @@ export const AssistantProvider = ({ children }) => { }> } onClick={() => setOpen(true)} /> } + icon={} type={designable ? 'primary' : 'default'} onClick={() => setDesignable(!designable)} /> diff --git a/packages/core/client/src/locale/en_US.json b/packages/core/client/src/locale/en_US.json index 19d254fdd..9911ea0ad 100644 --- a/packages/core/client/src/locale/en_US.json +++ b/packages/core/client/src/locale/en_US.json @@ -149,6 +149,7 @@ "Select grouping field": "Select grouping field", "Media": "Media", "Markdown": "Markdown", + "Demonstration text": "Demonstration text", "Wysiwyg": "Wysiwyg", "Chart blocks": "Chart blocks", "Column chart": "Column chart", @@ -157,7 +158,7 @@ "Pie chart": "Pie chart", "Area chart": "Area chart", "Other chart": "Other chart", - "Other blocks": "Other blocks", + "Other blocks": "Advanced blocks", "In configuration": "In configuration", "Chart title": "Chart title", "Chart type": "Chart type", @@ -843,5 +844,6 @@ "Disable Right Menu":"Disable Right Menu", "Full Screen":"Full Screen", "Designer Mode":"Designer Mode", + "Embedded page": "Embedded page", "There are no full screen blocks available at the current location":"There are no full screen blocks available at the current location" } diff --git a/packages/core/client/src/locale/zh-CN.json b/packages/core/client/src/locale/zh-CN.json index 45c12af16..2210692e4 100644 --- a/packages/core/client/src/locale/zh-CN.json +++ b/packages/core/client/src/locale/zh-CN.json @@ -176,7 +176,7 @@ "Pie chart": "饼图", "Area chart": "面积图", "Other chart": "其他图表", - "Other blocks": "其他区块", + "Other blocks": "高级区块", "In configuration": "配置中", "Chart title": "图表标题", "Chart type": "图表类型", @@ -958,5 +958,7 @@ "Designer Mode":"设计者模式", "There are no full screen blocks available at the current location":"当前位置没有可全屏区块", "Exit Full Screen":"退出全屏", + "Embedded page": "嵌入页面", + "Demonstration text": "演示文本", "User settings":"个人设置" } diff --git a/packages/core/client/src/modules/actions/add-new/createFormBlockInitializers.tsx b/packages/core/client/src/modules/actions/add-new/createFormBlockInitializers.tsx index 004598870..926a3928e 100644 --- a/packages/core/client/src/modules/actions/add-new/createFormBlockInitializers.tsx +++ b/packages/core/client/src/modules/actions/add-new/createFormBlockInitializers.tsx @@ -32,7 +32,7 @@ export const createFormBlockInitializers_deprecated = new CompatibleSchemaInitia children: [ { name: 'markdown', - title: '{{t("Markdown")}}', + title: '{{t("Demonstration text")}}', Component: 'MarkdownBlockInitializer', }, ], @@ -89,7 +89,7 @@ export const createFormBlockInitializers = new CompatibleSchemaInitializer( children: [ { name: 'markdown', - title: '{{t("Markdown")}}', + title: '{{t("Demonstration text")}}', Component: 'MarkdownBlockInitializer', }, ], diff --git a/packages/core/client/src/modules/actions/add-record/customizeCreateFormBlockInitializers.tsx b/packages/core/client/src/modules/actions/add-record/customizeCreateFormBlockInitializers.tsx index f98ddeef9..823384352 100644 --- a/packages/core/client/src/modules/actions/add-record/customizeCreateFormBlockInitializers.tsx +++ b/packages/core/client/src/modules/actions/add-record/customizeCreateFormBlockInitializers.tsx @@ -30,7 +30,7 @@ export const customizeCreateFormBlockInitializers_deprecated = new CompatibleSch children: [ { name: 'markdown', - title: '{{t("Markdown")}}', + title: '{{t("Demonstration text")}}', Component: 'MarkdownBlockInitializer', }, ], @@ -65,7 +65,7 @@ export const customizeCreateFormBlockInitializers = new CompatibleSchemaInitiali children: [ { name: 'markdown', - title: '{{t("Markdown")}}', + title: '{{t("Demonstration text")}}', Component: 'MarkdownBlockInitializer', }, ], diff --git a/packages/core/client/src/modules/actions/view-edit-popup/RecordFormBlockInitializers.tsx b/packages/core/client/src/modules/actions/view-edit-popup/RecordFormBlockInitializers.tsx index b338cdfc4..a22a5da4c 100644 --- a/packages/core/client/src/modules/actions/view-edit-popup/RecordFormBlockInitializers.tsx +++ b/packages/core/client/src/modules/actions/view-edit-popup/RecordFormBlockInitializers.tsx @@ -29,7 +29,7 @@ export const recordFormBlockInitializers = new SchemaInitializer({ children: [ { name: 'markdown', - title: '{{t("Markdown")}}', + title: '{{t("Demonstration text")}}', Component: 'MarkdownBlockInitializer', }, ], diff --git a/packages/core/client/src/modules/blocks/other-blocks/markdown/MarkdownBlockInitializer.tsx b/packages/core/client/src/modules/blocks/other-blocks/markdown/MarkdownBlockInitializer.tsx index 44cb0df03..4dd32724e 100644 --- a/packages/core/client/src/modules/blocks/other-blocks/markdown/MarkdownBlockInitializer.tsx +++ b/packages/core/client/src/modules/blocks/other-blocks/markdown/MarkdownBlockInitializer.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { FormOutlined } from '@ant-design/icons'; +import { FileTextOutlined } from '@ant-design/icons'; import { useTranslation } from 'react-i18next'; import { SchemaInitializerItem, useSchemaInitializer, useSchemaInitializerItem } from '../../../../application'; @@ -13,7 +13,7 @@ export const MarkdownBlockInitializer = () => { return ( } + icon={} onClick={() => { insert({ type: 'void', diff --git a/packages/core/client/src/modules/page/BlockInitializers.tsx b/packages/core/client/src/modules/page/BlockInitializers.tsx index d532e63aa..995e79224 100644 --- a/packages/core/client/src/modules/page/BlockInitializers.tsx +++ b/packages/core/client/src/modules/page/BlockInitializers.tsx @@ -66,7 +66,7 @@ export const blockInitializers_deprecated = new CompatibleSchemaInitializer({ children: [ { name: 'markdown', - title: '{{t("Markdown")}}', + title: '{{t("Demonstration text")}}', Component: 'MarkdownBlockInitializer', }, ], @@ -137,7 +137,7 @@ export const blockInitializers = new CompatibleSchemaInitializer( children: [ { name: 'markdown', - title: '{{t("Markdown")}}', + title: '{{t("Demonstration text")}}', Component: 'MarkdownBlockInitializer', }, ], 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 dcb80c5e5..face30532 100644 --- a/packages/core/client/src/schema-component/antd/menu/Menu.tsx +++ b/packages/core/client/src/schema-component/antd/menu/Menu.tsx @@ -11,8 +11,8 @@ import { } from '@tachybase/schema'; import { error } from '@tachybase/utils/client'; -import { AppstoreOutlined, InsertRowAboveOutlined, MoreOutlined } from '@ant-design/icons'; -import { Menu as AntdMenu, Button, Card, Col, Dropdown, MenuProps, Popover, Row } from 'antd'; +import { AppstoreAddOutlined } from '@ant-design/icons'; +import { Menu as AntdMenu, Button, Card, MenuProps, Popover } from 'antd'; import { createPortal } from 'react-dom'; import { useTranslation } from 'react-i18next'; @@ -203,7 +203,7 @@ const HeaderMenu = ({ ); }} > -