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

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

Browse Source
This commit is contained in:
semmy 2021-11-29 20:59:45 +08:00
commit e058c509ea
12 changed files with 46 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -35,6 +35,7 @@
"@types/koa": "^2.13.1", "@types/koa": "^2.13.1",
"@types/koa-mount": "^4.0.1", "@types/koa-mount": "^4.0.1",
"@types/lodash": "^4.14.169", "@types/lodash": "^4.14.169",
"@types/marked": "^4.0.1",
"@types/mockjs": "^1.0.3", "@types/mockjs": "^1.0.3",
"@types/node": "^12.6.8", "@types/node": "^12.6.8",
"@types/react": "^17.0.0", "@types/react": "^17.0.0",

2
packages/client/package.json
View File

@ -33,7 +33,7 @@
"flat": "^5.0.2", "flat": "^5.0.2",
"html-react-parser": "^1.2.7", "html-react-parser": "^1.2.7",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"micromark": "~2.11.0", "marked": "^4.0.5",
"monaco-editor": "^0.25.2", "monaco-editor": "^0.25.2",
"react-big-calendar": "^0.33.6", "react-big-calendar": "^0.33.6",
"react-helmet": "^6.1.0", "react-helmet": "^6.1.0",

7
packages/client/src/components/admin-layout/Permissions/ActionPermissionField.tsx
View File

@ -19,6 +19,7 @@ import Checkbox from 'antd/lib/checkbox/Checkbox';
import { useState } from 'react'; import { useState } from 'react';
import { useCompile } from '../../../hooks/useCompile'; import { useCompile } from '../../../hooks/useCompile';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { ArrayField } from '@formily/core';
const actionTypeMap = new Map( const actionTypeMap = new Map(
Object.entries({ Object.entries({
@ -30,7 +31,7 @@ const actionTypeMap = new Map(
); );
const useActionDataSource = () => { const useActionDataSource = () => {
const field = useField<Formily.Core.Models.ArrayField>(); const field = useField<ArrayField>();
const dataSource = []; const dataSource = [];
for (const [actionName, value] of actionTypeMap) { for (const [actionName, value] of actionTypeMap) {
const item = field?.value?.find((item) => { const item = field?.value?.find((item) => {
@ -50,7 +51,7 @@ const useFieldPermissions = () => {
const compile = useCompile(); const compile = useCompile();
const role = useContext(RoleContext); const role = useContext(RoleContext);
const ctx = useContext(TableRowContext); const ctx = useContext(TableRowContext);
const field = useField<Formily.Core.Models.ArrayField>(); const field = useField<ArrayField>();
const [dataSource, setDataSource] = useState([]); const [dataSource, setDataSource] = useState([]);
const findFieldKeys = (actionName): any[] => { const findFieldKeys = (actionName): any[] => {
const item = field?.value?.find((item) => { const item = field?.value?.find((item) => {
@ -189,7 +190,7 @@ export const ActionPermissionField = observer((props) => {
const compile = useCompile(); const compile = useCompile();
const role = useContext(RoleContext); const role = useContext(RoleContext);
const ctx = useContext(TableRowContext); const ctx = useContext(TableRowContext);
const field = useField<Formily.Core.Models.ArrayField>(); const field = useField<ArrayField>();
const actionDataSource = useActionDataSource(); const actionDataSource = useActionDataSource();
const { columns, dataSource, service } = useFieldPermissions(); const { columns, dataSource, service } = useFieldPermissions();
console.log('actionPermissions', field?.value); console.log('actionPermissions', field?.value);

4
packages/client/src/schemas/calendar/index.tsx
View File

@ -39,7 +39,7 @@ import { useContext } from 'react';
import { SchemaField, useDesignable } from '../../components/schema-renderer'; import { SchemaField, useDesignable } from '../../components/schema-renderer';
import { ActionBar } from './ActionBar'; import { ActionBar } from './ActionBar';
import { ActionDesignableBar } from './Action'; import { ActionDesignableBar } from './Action';
import { createForm } from '@formily/core'; import { ArrayField, createForm } from '@formily/core';
import { get } from 'lodash'; import { get } from 'lodash';
import flatten from 'flat'; import flatten from 'flat';
import { import {
@ -145,7 +145,7 @@ const toEvents = (data: any[], fieldNames: any) => {
export const Calendar: any = observer((props: any) => { export const Calendar: any = observer((props: any) => {
const { t } = useTranslation(); const { t } = useTranslation();
const field = useField<Formily.Core.Models.ArrayField>(); const field = useField<ArrayField>();
const { collectionName, fieldNames = {} } = props; const { collectionName, fieldNames = {} } = props;
console.log('Calendar', props); console.log('Calendar', props);
const { schema } = useDesignable(); const { schema } = useDesignable();

5
packages/client/src/schemas/database-field/index.tsx
View File

@ -52,6 +52,7 @@ import {
import { DndContext, DragOverlay } from '@dnd-kit/core'; import { DndContext, DragOverlay } from '@dnd-kit/core';
import { createPortal } from 'react-dom'; import { createPortal } from 'react-dom';
import { useClient } from '../../constate'; import { useClient } from '../../constate';
import { ArrayField } from '@formily/core';
interface SelectOptionProps { interface SelectOptionProps {
id: any; id: any;
@ -88,7 +89,7 @@ function SelectOption(props: SelectOptionProps) {
} }
export const DatabaseCollection = observer((props) => { export const DatabaseCollection = observer((props) => {
const field = useField<Formily.Core.Models.ArrayField>(); const field = useField<ArrayField>();
const [visible, setVisible] = useState(false); const [visible, setVisible] = useState(false);
const [open, setOpen] = useState(false); const [open, setOpen] = useState(false);
const schema = useFieldSchema(); const schema = useFieldSchema();
@ -320,7 +321,7 @@ export const DatabaseCollection = observer((props) => {
}); });
export const DatabaseField: any = observer((props) => { export const DatabaseField: any = observer((props) => {
const field = useField<Formily.Core.Models.ArrayField>(); const field = useField<ArrayField>();
useEffect(() => { useEffect(() => {
if (!field.value) { if (!field.value) {
field.setValue([]); field.setValue([]);

9
packages/client/src/schemas/display/index.tsx
View File

@ -20,6 +20,7 @@ import {
import { FullscreenOutlined } from '@ant-design/icons'; import { FullscreenOutlined } from '@ant-design/icons';
import moment from 'moment'; import moment from 'moment';
import { useCompile } from '../../hooks/useCompile'; import { useCompile } from '../../hooks/useCompile';
import { Field } from '@formily/core';
const PlaceholderContext = createContext<string>(''); const PlaceholderContext = createContext<string>('');
@ -113,7 +114,7 @@ const TextArea: React.FC<any> = (props) => {
}; };
const Select: React.FC<SelectProps<any>> = observer((props) => { const Select: React.FC<SelectProps<any>> = observer((props) => {
const field = useField<Formily.Core.Models.Field>(); const field = useField<Field>();
const prefixCls = usePrefixCls('description-select', props); const prefixCls = usePrefixCls('description-select', props);
const dataSource: any[] = field?.dataSource?.length const dataSource: any[] = field?.dataSource?.length
? field.dataSource ? field.dataSource
@ -157,7 +158,7 @@ const Select: React.FC<SelectProps<any>> = observer((props) => {
}); });
const ObjectSelect: React.FC<SelectProps<any>> = observer((props) => { const ObjectSelect: React.FC<SelectProps<any>> = observer((props) => {
const field = useField<Formily.Core.Models.Field>(); const field = useField<Field>();
const prefixCls = usePrefixCls('description-select', props); const prefixCls = usePrefixCls('description-select', props);
const dataSource: any[] = field?.dataSource?.length const dataSource: any[] = field?.dataSource?.length
? field.dataSource ? field.dataSource
@ -201,7 +202,7 @@ const ObjectSelect: React.FC<SelectProps<any>> = observer((props) => {
}); });
const TreeSelect: React.FC<TreeSelectProps<any>> = observer((props) => { const TreeSelect: React.FC<TreeSelectProps<any>> = observer((props) => {
const field = useField<Formily.Core.Models.Field>(); const field = useField<Field>();
const placeholder = usePlaceholder(); const placeholder = usePlaceholder();
const prefixCls = usePrefixCls('description-tree-select', props); const prefixCls = usePrefixCls('description-tree-select', props);
const dataSource = field?.dataSource?.length const dataSource = field?.dataSource?.length
@ -259,7 +260,7 @@ const TreeSelect: React.FC<TreeSelectProps<any>> = observer((props) => {
}); });
const Cascader: React.FC<CascaderProps> = observer((props) => { const Cascader: React.FC<CascaderProps> = observer((props) => {
const field = useField<Formily.Core.Models.Field>(); const field = useField<Field>();
const placeholder = usePlaceholder(); const placeholder = usePlaceholder();
const prefixCls = usePrefixCls('description-cascader', props); const prefixCls = usePrefixCls('description-cascader', props);
const dataSource: any[] = field?.dataSource?.length const dataSource: any[] = field?.dataSource?.length

4
packages/client/src/schemas/input/DesignableBar.tsx
View File

@ -34,9 +34,7 @@ export const DesignableBar = (props) => {
<Menu.Item onClick={() => {}}> <Menu.Item onClick={() => {}}>
<Switch <Switch
onChange={(checked) => { onChange={(checked) => {
// field.query(key).take((target: Formily.Core.Models.Field) => {
// target.required = checked;
// });
}} }}
checkedChildren="必填" checkedChildren="必填"
unCheckedChildren="非必填" unCheckedChildren="非必填"

13
packages/client/src/schemas/markdown/index.tsx
View File

@ -11,7 +11,6 @@ import { Button, Dropdown, Input as AntdInput, Menu, Modal, Space } from 'antd';
import { InputProps, TextAreaProps } from 'antd/lib/input'; import { InputProps, TextAreaProps } from 'antd/lib/input';
import { Display } from '../display'; import { Display } from '../display';
import { LoadingOutlined, MenuOutlined, DragOutlined } from '@ant-design/icons'; import { LoadingOutlined, MenuOutlined, DragOutlined } from '@ant-design/icons';
import micromark from 'micromark';
import { useDesignable } from '../../components/schema-renderer'; import { useDesignable } from '../../components/schema-renderer';
import { useContext, useState } from 'react'; import { useContext, useState } from 'react';
import AddNew from '../add-new'; import AddNew from '../add-new';
@ -23,6 +22,14 @@ import { isGridRowOrCol } from '../grid';
import './style.less'; import './style.less';
import { DragHandle } from '../../components/Sortable'; import { DragHandle } from '../../components/Sortable';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { marked } from 'marked';
export function markdown(text) {
if (!text) {
return '';
}
return marked.parse(text);
}
export const Markdown: any = connect( export const Markdown: any = connect(
AntdInput.TextArea, AntdInput.TextArea,
@ -45,7 +52,7 @@ export const Markdown: any = connect(
let value = ( let value = (
<div <div
className={'nb-markdown'} className={'nb-markdown'}
dangerouslySetInnerHTML={{ __html: micromark(text || '') }} dangerouslySetInnerHTML={{ __html: markdown(text) }}
/> />
); );
return <Display.TextArea {...props} text={text} value={value} />; return <Display.TextArea {...props} text={text} value={value} />;
@ -93,7 +100,7 @@ Markdown.Void = observer((props: any) => {
let value = ( let value = (
<div <div
className={'nb-markdown'} className={'nb-markdown'}
dangerouslySetInnerHTML={{ __html: micromark(text || '') }} dangerouslySetInnerHTML={{ __html: markdown(text) }}
/> />
); );
return field?.pattern !== 'readPretty' ? ( return field?.pattern !== 'readPretty' ? (

2
packages/client/src/schemas/select/index.tsx
View File

@ -439,7 +439,7 @@ Select.Drawer = connect(
mapReadPretty( mapReadPretty(
observer((props: any) => { observer((props: any) => {
const collectionField = useContext(CollectionFieldContext); const collectionField = useContext(CollectionFieldContext);
const field = useField<Formily.Core.Models.Field>(); const field = useField<Field>();
const { ...others } = props; const { ...others } = props;
const value = field.value || field.initialValue; const value = field.value || field.initialValue;
const { schema } = useDesignable(); const { schema } = useDesignable();

8
packages/client/src/schemas/table/index.tsx
View File

@ -55,7 +55,7 @@ import {
import { useResource as useGeneralResource } from '../../hooks/useResource'; import { useResource as useGeneralResource } from '../../hooks/useResource';
import SwitchMenuItem from '../../components/SwitchMenuItem'; import SwitchMenuItem from '../../components/SwitchMenuItem';
import { useMemo } from 'react'; import { useMemo } from 'react';
import { createForm,LifeCycleTypes } from '@formily/core'; import { ArrayField, createForm,LifeCycleTypes } from '@formily/core';
import { import {
ColDraggableContext, ColDraggableContext,
SortableBodyCell, SortableBodyCell,
@ -78,7 +78,7 @@ import { useCompile } from '../../hooks/useCompile';
export interface ITableContext { export interface ITableContext {
props: any; props: any;
field: Formily.Core.Models.ArrayField; field: ArrayField;
schema: Schema; schema: Schema;
service: BaseResult<any, any>; service: BaseResult<any, any>;
selectedRowKeys?: any; selectedRowKeys?: any;
@ -811,7 +811,7 @@ const TableMain = () => {
}; };
const usePagination = () => { const usePagination = () => {
const field = useField<Formily.Core.Models.ArrayField>(); const field = useField<ArrayField>();
const paginationProps = field.componentProps.pagination; const paginationProps = field.componentProps.pagination;
let pagination = paginationProps; let pagination = paginationProps;
@ -856,7 +856,7 @@ const TableProvider = (props: any) => {
...others ...others
} = props; } = props;
const { schema } = useDesignable(); const { schema } = useDesignable();
const field = useField<Formily.Core.Models.ArrayField>(); const field = useField<ArrayField>();
const [pagination, setPagination] = usePagination(); const [pagination, setPagination] = usePagination();
const { selectedRowKeys, setSelectedRowKeys } = useSelectedRowKeys(); const { selectedRowKeys, setSelectedRowKeys } = useSelectedRowKeys();
console.log('props.useSelectedRowKeys', selectedRowKeys); console.log('props.useSelectedRowKeys', selectedRowKeys);

7
packages/client/src/schemas/upload/index.tsx
View File

@ -29,6 +29,7 @@ import './style.less';
import cls from 'classnames'; import cls from 'classnames';
import { saveAs } from 'file-saver'; import { saveAs } from 'file-saver';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { Field } from '@formily/core';
const toArr = (value) => { const toArr = (value) => {
if (!isValid(value)) { if (!isValid(value)) {
@ -140,7 +141,7 @@ const normalizeFileList = (fileList: UploadFile[]) => {
}; };
const useValidator = (validator: (value: any) => string) => { const useValidator = (validator: (value: any) => string) => {
const field = useField<Formily.Core.Models.Field>(); const field = useField<Field>();
useEffect(() => { useEffect(() => {
const dispose = reaction( const dispose = reaction(
() => field.value, () => field.value,
@ -196,7 +197,7 @@ export const Upload: ComposedUpload = connect(
value: 'fileList', value: 'fileList',
}), }),
mapReadPretty((props) => { mapReadPretty((props) => {
const field = useField<Formily.Core.Models.Field>(); const field = useField<Field>();
console.log('field.value', field.value); console.log('field.value', field.value);
return (field.value || []).map((item) => ( return (field.value || []).map((item) => (
<div> <div>
@ -474,7 +475,7 @@ Upload.Attachment = connect(
); );
}, },
mapReadPretty((props) => { mapReadPretty((props) => {
const field = useField<Formily.Core.Models.Field>(); const field = useField<Field>();
const images = toImages(toArr(field.value)); const images = toImages(toArr(field.value));
const [photoIndex, setPhotoIndex] = useState(0); const [photoIndex, setPhotoIndex] = useState(0);
const [visible, setVisible] = useState(false); const [visible, setVisible] = useState(false);

10
yarn.lock
View File

@ -3884,6 +3884,11 @@
resolved "https://registry.npmmirror.com/@types/lodash/download/@types/lodash-4.14.176.tgz?cache=0&sync_timestamp=1634771944515&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Flodash%2Fdownload%2F%40types%2Flodash-4.14.176.tgz#641150fc1cda36fbfa329de603bbb175d7ee20c0" resolved "https://registry.npmmirror.com/@types/lodash/download/@types/lodash-4.14.176.tgz?cache=0&sync_timestamp=1634771944515&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Flodash%2Fdownload%2F%40types%2Flodash-4.14.176.tgz#641150fc1cda36fbfa329de603bbb175d7ee20c0"
integrity sha1-ZBFQ/BzaNvv6Mp3mA7uxddfuIMA= integrity sha1-ZBFQ/BzaNvv6Mp3mA7uxddfuIMA=
"@types/marked@^4.0.1":
version "4.0.1"
resolved "https://registry.npmjs.org/@types/marked/-/marked-4.0.1.tgz#d588a7bbc4d6551c5e75249bc106ffda96ae33c5"
integrity sha512-ZigEmCWdNUU7IjZEuQ/iaimYdDHWHfTe3kg8ORfKjyGYd9RWumPoOJRQXB0bO+XLkNwzCthW3wUIQtANaEZ1ag==
"@types/mathjax@^0.0.36": "@types/mathjax@^0.0.36":
version "0.0.36" version "0.0.36"
resolved "https://registry.nlark.com/@types/mathjax/download/@types/mathjax-0.0.36.tgz?cache=0&sync_timestamp=1629708335229&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40types%2Fmathjax%2Fdownload%2F%40types%2Fmathjax-0.0.36.tgz#18cf766f88ac0cd4e7ee8282b1286049bb6aa682" resolved "https://registry.nlark.com/@types/mathjax/download/@types/mathjax-0.0.36.tgz?cache=0&sync_timestamp=1629708335229&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40types%2Fmathjax%2Fdownload%2F%40types%2Fmathjax-0.0.36.tgz#18cf766f88ac0cd4e7ee8282b1286049bb6aa682"
@ -13159,6 +13164,11 @@ markdown-table@^2.0.0:
dependencies: dependencies:
repeat-string "^1.0.0" repeat-string "^1.0.0"
marked@^4.0.5:
version "4.0.5"
resolved "https://registry.npmjs.org/marked/-/marked-4.0.5.tgz#85f46937f6a4616de7cbe0e1433e1640c320c729"
integrity sha512-eUToMA5d5lunnipkCN7zFD0RiunCF2Uo6bImEt/Qx8LZMW7oPXTw7R+f+M5V3eS7164HjEDPfW8/TrefuFhDfw==
mathjax-full@^3.0.0: mathjax-full@^3.0.0:
version "3.2.0" version "3.2.0"
resolved "https://registry.nlark.com/mathjax-full/download/mathjax-full-3.2.0.tgz#e53269842a943d4df10502937518991268996c5c" resolved "https://registry.nlark.com/mathjax-full/download/mathjax-full-3.2.0.tgz#e53269842a943d4df10502937518991268996c5c"