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

fix: can use markdown in field description

Browse Source
This commit is contained in:
chenos 2021-01-23 14:15:41 +08:00
parent f1c0503916
commit e36415330f
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/app/src/components/views/Field/index.tsx
View File

@ -25,7 +25,7 @@ marked.setOptions({
const renderer = new marked.Renderer(); const renderer = new marked.Renderer();
renderer.link = ( href, title, text ) => `<a target="_blank" href="${ href }" title="${ title||'' }">${ text }</a>`; renderer.link = ( href, title, text ) => `<a target="_blank" href="${ href }" title="${ title||'' }">${ text }</a>`;
function markdown(text: string) { export function markdown(text: string) {
return marked(text, { return marked(text, {
renderer, renderer,
}); });

4
packages/app/src/components/views/Form/scopes.tsx
View File

@ -1,13 +1,15 @@
import React from 'react'; import React from 'react';
import { Tooltip } from 'antd'; import { Tooltip } from 'antd';
import { QuestionCircleOutlined } from '@ant-design/icons'; import { QuestionCircleOutlined } from '@ant-design/icons';
import { markdown } from '../Field';
export default { export default {
text(...args: any[]) { text(...args: any[]) {
return React.createElement('span', {}, ...args) return React.createElement('span', {}, ...args)
}, },
html(html: string) { html(html: string) {
return <div dangerouslySetInnerHTML={{__html: html}}></div> const text = decodeURIComponent(html);
return <div dangerouslySetInnerHTML={{__html: markdown(text)}}></div>
}, },
tooltip(title: string, offset = 3) { tooltip(title: string, offset = 3) {
return ( return (

6
packages/plugin-pages/src/actions/getView.ts
View File

@ -49,8 +49,8 @@ const transforms = {
const dataSource = field.get('dataSource').filter(item => item.key !== 'developerMode'); const dataSource = field.get('dataSource').filter(item => item.key !== 'developerMode');
field.set('dataSource', dataSource); field.set('dataSource', dataSource);
} }
if (field.get('component.type') === 'filter') { const { values } = ctx.action.params;
const { values } = ctx.action.params; if (field.get('component.type') === 'filter' && get(values, 'associatedKey')) {
const options = Field.parseApiJson(ctx.state.developerMode ? { const options = Field.parseApiJson(ctx.state.developerMode ? {
filter: { filter: {
collection_name: get(values, 'associatedKey'), collection_name: get(values, 'associatedKey'),
@ -70,7 +70,7 @@ const transforms = {
prop.type = 'string' prop.type = 'string'
} }
if (field.get('component.tooltip')) { if (field.get('component.tooltip')) {
prop.description = `{{html('${field.get('component.tooltip')}')}}`; prop.description = `{{html('${encodeURIComponent(field.get('component.tooltip'))}')}}`;
} }
if (field.get('name') === 'dataSource') { if (field.get('name') === 'dataSource') {