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

fix: change the logic of the expression transform

Browse Source
This commit is contained in:
MrWindlike 2022-07-07 17:00:31 +08:00
parent 7d99c274ea
commit 29876f491e
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
packages/editor-sdk/src/components/Widgets/ExpressionWidget.tsx
View File

@ -95,36 +95,41 @@ const customTreeTypeDefCreator = (dataTree: Record<string, Record<string, unknow
return { ...def };
};
const getCode = (value: unknown): { code: string; type: string } => {
const getCode = (value: unknown): string => {
const type = typeof value;
if (type === 'object' || type === 'boolean') {
value = JSON.stringify(value, null, 2);
} else if (value === undefined) {
value = '';
let code = '';
if (value === undefined || value === null) {
code = '';
} else if (type === 'object' || type === 'boolean') {
code = `{{${JSON.stringify(value, null, 2)}}}`;
} else if (type === 'number') {
code = `{{${value}}}`;
} else {
value = String(value);
code = String(value);
}
return {
code: value as string,
type,
};
return code;
};
const getParsedValue = (raw: string, type: string) => {
if (isExpression(raw)) {
return raw;
}
if (type === 'object' || type === 'boolean') {
if (type === 'object' || type === 'array' || type === 'boolean') {
try {
return JSON.parse(raw);
} catch (error) {
// TODO: handle error
return {};
return raw;
}
}
if (type === 'number') {
return toNumber(raw);
}
return raw;
};
@ -151,9 +156,10 @@ export const ExpressionWidget: React.FC<WidgetProps<ExpressionWidgetType>> = pro
const { value, services, spec, onChange } = props;
const { widgetOptions } = spec;
const { stateManager } = services;
const { code, type } = useMemo(() => {
return getCode(value);
}, [value]);
const code = useMemo(() => getCode(value), [value]);
// if the spec has the only one type, then use its type
// otherwise, keep the expression as the string type
const type = typeof spec.type === 'string' ? spec.type : 'string';
const [defs, setDefs] = useState<any>();
const [evaledValue, setEvaledValue] = useState<any>({ value: null });
const [error, setError] = useState<string | null>(null);
@ -163,7 +169,7 @@ export const ExpressionWidget: React.FC<WidgetProps<ExpressionWidgetType>> = pro
(code: string) => {
try {
const value = getParsedValue(code, type);
const result = isExpression(code)
const result = isExpression(value)
? services.stateManager.maskedEval(value)
: value;