ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nocobase-next' of https://github.com/nocobase/nocobase into nocobase-next

Browse Source
This commit is contained in:
Semmy 2022-03-30 16:10:43 +08:00
commit 02ff296178
5 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,7 @@ const MarkdownEditor = (props: any) => {
<Space style={{ position: 'absolute', bottom: 5, right: 5 }}>
<Button
onClick={(e) => {
props.onCancel && props.onCancel(e);
props.onCancel?.(e);
}}
>
{t('Cancel')}
@ -30,7 +30,7 @@ const MarkdownEditor = (props: any) => {
<Button
type={'primary'}
onClick={() => {
props.onSubmit && props.onSubmit(value);
props.onSubmit?.(value);
}}
>
{t('Save')}

4
packages/client/src/schema-component/antd/markdown/Markdown.tsx
View File

@ -4,7 +4,7 @@ import { Input as AntdInput } from 'antd';
import React from 'react';
import { ReadPretty as InputReadPretty } from '../input';
import { MarkdownVoid } from './Markdown.Void';
import { markdown } from './util';
import { convertToText, markdown } from './util';
export const Markdown: any = connect(
AntdInput.TextArea,
@ -19,7 +19,7 @@ export const Markdown: any = connect(
};
}),
mapReadPretty((props) => {
let text = props.value;
let text = convertToText(props.value);
let value = <div className={'nb-markdown'} dangerouslySetInnerHTML={{ __html: markdown(text) }} />;
return <InputReadPretty.TextArea {...props} text={text} value={value} />;
}),

8
packages/client/src/schema-component/antd/markdown/util.ts
View File

@ -6,3 +6,11 @@ export function markdown(text) {
}
return marked.parse(text);
}
export function convertToText(markdownText: string) {
const content = markdown(markdownText);
let temp = document.createElement('div');
temp.innerHTML = content;
const text = temp.innerText;
temp = null;
return text.replace(/[\n\r]/g, '');
}

6
packages/client/src/schema-initializer/Initializers/utils.ts
View File

@ -64,9 +64,13 @@ export const useTableColumnInitializerFields = () => {
.filter((field) => field?.interface && field?.interface !== 'subTable')
.map((field) => {
const componentProps = {};
if (field?.uiSchema['x-component']?.startsWith?.('Input')) {
if (
field?.uiSchema['x-component']?.startsWith?.('Input') ||
field?.uiSchema['x-component']?.startsWith?.('Markdown')
) {
componentProps['ellipsis'] = true;
}
if (field.interface === 'attachment') {
componentProps['size'] = 'small';
return {

3
packages/client/src/schema-initializer/SchemaInitializer.tsx
View File

@ -7,7 +7,7 @@ import {
SchemaInitializerButtonProps,
SchemaInitializerItemComponent,
SchemaInitializerItemOptions,
SchemaInitializerItemProps
SchemaInitializerItemProps,
} from './types';
const defaultWrap = (s: ISchema) => s;
@ -88,7 +88,6 @@ SchemaInitializer.Button = observer((props: SchemaInitializerButtonProps) => {
}
});
};
const menu = <Menu>{renderItems(items)}</Menu>;
if (!designable && props.designable !== true) {