test/nocobase2
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2024-12-04 13:18:55 +08:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

Merge branch 'main' into next

Browse Source
This commit is contained in:
GitHub Actions Bot 2024-08-29 07:42:34 +00:00
commit 269aaa8637
4 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/core/client/src/modules/blocks/data-blocks/details-single/ReadPrettyFormItemInitializers.tsx
View File

@ -85,6 +85,9 @@ const commonOptions = {
type: 'void', type: 'void',
'x-editable': false, 'x-editable': false,
'x-decorator': 'FormItem', 'x-decorator': 'FormItem',
'x-decorator-props': {
engine: 'handlebars',
},
// 'x-designer': 'Markdown.Void.Designer', // 'x-designer': 'Markdown.Void.Designer',
'x-toolbar': 'FormItemSchemaToolbar', 'x-toolbar': 'FormItemSchemaToolbar',
'x-settings': 'blockSettings:markdown', 'x-settings': 'blockSettings:markdown',

3
packages/core/client/src/modules/blocks/other-blocks/markdown/MarkdownFormItemInitializer.tsx
View File

@ -23,6 +23,9 @@ export const MarkdownFormItemInitializer = () => {
type: 'void', type: 'void',
'x-editable': false, 'x-editable': false,
'x-decorator': 'FormItem', 'x-decorator': 'FormItem',
'x-decorator-props': {
engine: 'handlebars',
},
// 'x-designer': 'Markdown.Void.Designer', // 'x-designer': 'Markdown.Void.Designer',
'x-toolbar': 'FormItemSchemaToolbar', 'x-toolbar': 'FormItemSchemaToolbar',
'x-settings': 'blockSettings:markdown', 'x-settings': 'blockSettings:markdown',

2
packages/core/client/src/schema-component/antd/markdown/Markdown.Void.tsx
View File

@ -95,7 +95,7 @@ const MarkdownEditor = (props: MarkdownEditorProps) => {
<VariableSelect options={options} setOptions={setOptions} onInsert={onInsert} /> <VariableSelect options={options} setOptions={setOptions} onInsert={onInsert} />
</div> </div>
<Space style={{ position: 'absolute', bottom: 25, right: 5 }}> <Space style={{ position: 'absolute', bottom: 30, right: 5 }}>
<Button <Button
onClick={(e) => { onClick={(e) => {
props.onCancel?.(e); props.onCancel?.(e);

1
packages/core/client/src/schema-settings/SchemaSettingsRenderEngine.tsx
View File

@ -38,6 +38,7 @@ export function SchemaSettingsRenderEngine() {
options={options} options={options}
value={field.decoratorProps.engine || 'string'} value={field.decoratorProps.engine || 'string'}
onChange={(engine) => { onChange={(engine) => {
fieldSchema['x-decorator-props'] = fieldSchema['x-decorator-props'] || {};
fieldSchema['x-decorator-props'].engine = engine; fieldSchema['x-decorator-props'].engine = engine;
field.decoratorProps.engine = engine; field.decoratorProps.engine = engine;
dn.emit('patch', { dn.emit('patch', {