fix: when the component is configured in a loop, the key value changes and renders error

liujuping · JackLian · commit 5db418efe41f · 2023-03-03T17:37:51.000+08:00
diff --git a/packages/renderer-core/src/renderer/base.tsx b/packages/renderer-core/src/renderer/base.tsx
@@ -774,6 +774,11 @@ export default function baseRendererFactory(): IBaseRenderComponent {
           {
             ...schema,
             loop: undefined,
+            props: {
+              ...schema.props,
+              // 循环下 key 不能为常量，这样会造成 key 值重复，渲染异常
+              key: isJSExpression(schema.props?.key) ? schema.props?.key : null,
+            },
           },
           loopSelf,
           parentInfo,
diff --git a/packages/types/src/shell/api/plugins.ts b/packages/types/src/shell/api/plugins.ts
@@ -13,6 +13,11 @@ export interface IPluginPreferenceMananger {
 export type PluginOptionsType = string | number | boolean | object;
 
 export interface IPublicApiPlugins {
+  /**
+   * 可以通过 plugin api 获取其他插件 export 导出的内容
+   */
+  [key: string]: any;
+
   register(
     pluginModel: IPublicTypePlugin,
     options?: Record<string, PluginOptionsType>,
@@ -21,6 +26,7 @@ export interface IPublicApiPlugins {
 
   /**
    * 引擎初始化时可以提供全局配置给到各插件，通过这个方法可以获得本插件对应的配置
+   *
    * use this to get preference config for this plugin when engine.init() called
    */
   getPluginPreference(
@@ -29,24 +35,28 @@ export interface IPublicApiPlugins {
 
   /**
    * 获取指定插件
+   *
    * get plugin instance by name
    */
   get(pluginName: string): IPublicModelPluginInstance | null;
 
   /**
    * 获取所有的插件实例
+   *
    * get all plugin instances
    */
   getAll(): IPublicModelPluginInstance[];
 
   /**
    * 判断是否有指定插件
+   *
    * check if plugin with certain name exists
    */
   has(pluginName: string): boolean;
 
   /**
    * 删除指定插件
+   *
    * delete plugin instance by name
    */
   delete(pluginName: string): void;
diff --git a/packages/types/src/shell/type/props-map.ts b/packages/types/src/shell/type/props-map.ts
@@ -1,3 +1,3 @@
-import { IPublicTypeCompositeObject } from './';
+import { IPublicTypeCompositeObject, IPublicTypeNodeData } from './';
 
-export type IPublicTypePropsMap = IPublicTypeCompositeObject;
+export type IPublicTypePropsMap = IPublicTypeCompositeObject<IPublicTypeNodeData | IPublicTypeNodeData[]>;
diff --git a/packages/types/src/shell/type/value-type.ts b/packages/types/src/shell/type/value-type.ts
@@ -131,6 +131,6 @@ export interface IPublicTypeJSONObject {
 }
 
 export type IPublicTypeCompositeArray = IPublicTypeCompositeValue[];
-export interface IPublicTypeCompositeObject {
-  [key: string]: IPublicTypeCompositeValue;
+export interface IPublicTypeCompositeObject<T = IPublicTypeCompositeValue> {
+  [key: string]: IPublicTypeCompositeValue | T;
 }

Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,6 @@ export interface IPublicTypeJSONObject {`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`export type IPublicTypeCompositeArray = IPublicTypeCompositeValue[];`
`134`		`-export interface IPublicTypeCompositeObject {`
`135`		`- [key: string]: IPublicTypeCompositeValue;`
	`134`	`+export interface IPublicTypeCompositeObject<T = IPublicTypeCompositeValue> {`
	`135`	`+ [key: string]: IPublicTypeCompositeValue \| T;`
`136`	`136`	`}`