github/lowcode-engine
1
0
Fork 0
mirror of https://github.com/alibaba/lowcode-engine.git synced 2026-01-16 11:54:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: slot 兼容问题 + loop key bug fix

Browse Source
This commit is contained in:
mario.gk 2020-07-29 18:22:33 +08:00
parent 70607415d9
commit bc6401781a
3 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/designer/src/document/node/node.ts
View File

@ -813,9 +813,9 @@ export class Node<Schema extends NodeSchema = NodeSchema> {
* @deprecated * @deprecated
*/ */
registerAddon(key: string, exportData: () => any, isProp: boolean = false) { registerAddon(key: string, exportData: () => any, isProp: boolean = false) {
if (this._addons[key]) { // if (this._addons[key]) {
throw new Error(`node addon ${key} exist`); // throw new Error(`node addon ${key} exist`);
} // }
this._addons[key] = { exportData, isProp }; this._addons[key] = { exportData, isProp };
} }

34
packages/editor-preset-vision/src/bundle/upgrade-metadata.ts
View File

@ -281,21 +281,24 @@ export function upgradePropConfig(config: OldPropConfig, collector: ConfigCollec
} }
let initialFn = (slotName ? null : initial) || initialValue; let initialFn = (slotName ? null : initial) || initialValue;
if (slotName && initialValue === true) { // 在 upgrade reducer 做了 JSBlock ——> JSSlot
initialFn = (value: any, defaultValue: any) => { // if (slotName && initialValue === true) {
if (isJSSlot(value)) { // initialFn = (value: any, defaultValue: any) => {
return { // if (isJSSlot(value)) {
title: slotTitle || title, // return {
...value, // title: slotTitle || title,
}; // name: slotName,
} // ...value,
return { // };
type: 'JSSlot', // }
title: slotTitle || title, // return {
value: initialChildren, // type: 'JSSlot',
}; // title: slotTitle || title,
}; // name: slotName,
} // value: initialChildren,
// };
// };
// }
if (!slotName) { if (!slotName) {
if (accessor) { if (accessor) {
@ -401,6 +404,7 @@ export function upgradePropConfig(config: OldPropConfig, collector: ConfigCollec
return { return {
type: 'JSSlot', type: 'JSSlot',
title: slotTitle || title, title: slotTitle || title,
name: slotName,
value: value == null ? initialChildren : value, value: value == null ? initialChildren : value,
}; };
}, },

3
packages/react-renderer/src/engine/base.jsx
View File

@ -309,6 +309,8 @@ export default class BaseEngine extends PureComponent {
if (scopeKey && this.__compScopes[scopeKey]) { if (scopeKey && this.__compScopes[scopeKey]) {
props.__scope = this.__compScopes[scopeKey]; props.__scope = this.__compScopes[scopeKey];
} }
// FIXME 这里清除 key 是为了避免循环渲染中更改 key 导致的渲染重复
props.key = '';
if (schema.__ctx && schema.__ctx.lunaKey) { if (schema.__ctx && schema.__ctx.lunaKey) {
if (!isFileSchema(schema)) { if (!isFileSchema(schema)) {
engine && engine.props.onCompGetCtx(schema, self); engine && engine.props.onCompGetCtx(schema, self);
@ -317,6 +319,7 @@ export default class BaseEngine extends PureComponent {
} else if (typeof idx === 'number' && !props.key) { } else if (typeof idx === 'number' && !props.key) {
props.key = idx; props.key = idx;
} }
props.__id = schema.id; props.__id = schema.id;
const renderComp = (props) => { const renderComp = (props) => {
return engine.createElement( return engine.createElement(