mirror/sunmao-ui
2
0
Fork 0
mirror of https://github.com/smartxworks/sunmao-ui.git synced 2024-11-27 08:39:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(RecordWidget): allow use the widget for object

Browse Source
This commit is contained in:
MrWindlike 2022-07-29 10:22:22 +08:00
parent 30d335040e
commit 0b11b9fe30
2 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/editor-sdk/src/components/Form/ArrayTable.tsx
View File

@ -147,7 +147,7 @@ export const ArrayTable: React.FC<ArrayTableProps> = props => {
/>
))
) : (
<Tr span>
<Tr>
<Td colSpan={(displayedKeys.length || 1) + 2} textAlign="center">
No Data
</Td>

44
packages/editor-sdk/src/components/Form/RecordEditor.tsx
View File

@ -10,6 +10,8 @@ import { ExpressionEditor } from '../Form/ExpressionEditor';
import { WidgetProps } from '../../types/widget';
import { mergeWidgetOptionsIntoSpec } from '../../utils/widget';
import { ExpressionEditorProps } from './ExpressionEditor';
import { generateDefaultValueFromSpec } from '@sunmao-ui/shared';
import { JSONSchema7 } from 'json-schema';
const IGNORE_SPEC_TYPES = ['array', 'object'];
@ -60,16 +62,16 @@ const RowItem = (props: RowItemProps) => {
}),
[]
);
const valueSpec = useMemo(() => spec?.properties?.[rowKey], [spec, rowKey]);
const valueSpec = useMemo(
() => (onlySetValue ? spec?.properties?.[rowKey] : spec?.patternProperties?.['^.*$']),
[spec, rowKey, onlySetValue]
);
const valueSpecWithExpressionOptions = useMemo(
() =>
valueSpec && typeof valueSpec !== 'boolean'
? {
...valueSpec,
widgetOptions: {
compactOptions: expressionOptions.compactOptions,
},
}
? mergeWidgetOptionsIntoSpec<'core/v1/expression'>(valueSpec, {
compactOptions: expressionOptions.compactOptions,
})
: Type.Any({
widget: 'core/v1/expression',
widgetOptions: {
@ -131,15 +133,16 @@ const RowItem = (props: RowItemProps) => {
<HStack minWidth={0} flex="2 2 66.66%" alignItems="center">
{valueSpec === undefined ||
typeof valueSpec === 'boolean' ||
IGNORE_SPEC_TYPES.includes(String(valueSpec.type)) ? (
<ExpressionWidget
component={component}
path={nextPath}
spec={valueSpecWithExpressionOptions}
services={services}
level={level + 1}
value={value}
onChange={onValueChange}
(IGNORE_SPEC_TYPES.includes(String(valueSpec.type)) &&
valueSpecWithExpressionOptions?.widget === undefined) ? (
<ExpressionWidget
component={component}
path={nextPath}
spec={valueSpecWithExpressionOptions}
services={services}
level={level + 1}
value={value}
onChange={onValueChange}
/>
) : (
<SpecWidget
@ -214,8 +217,13 @@ export const RecordEditor: React.FC<RecordEditorProps> = props => {
);
const onAddRow = useCallback(() => {
setRows(prev => [...prev, ['', '']]);
}, []);
const propSpec = spec?.patternProperties?.['^.*$'];
setRows(prev => [
...prev,
['', propSpec ? generateDefaultValueFromSpec(propSpec as JSONSchema7) : ''],
]);
}, [spec]);
const onRemoveRow = useCallback(
(i: number) => {
const newRows = produce(rows, draft => {