fix: fix setter hooks error

haloworld007 · LeoYuan · commit 8a3a0b824162 · 2022-05-26T14:58:03.000+08:00
diff --git a/packages/designer/src/designer/setting/utils.ts b/packages/designer/src/designer/setting/utils.ts
@@ -1,8 +1,8 @@
 // all this file for polyfill vision logic
-
 import { isValidElement } from 'react';
-import { isSetterConfig, isDynamicSetter } from '@alilc/lowcode-types';
+import { isSetterConfig, isDynamicSetter, FieldConfig, SetterConfig } from '@alilc/lowcode-types';
 import { getSetter } from '@alilc/lowcode-editor-core';
+import { SettingField } from './setting-field';
 
 function getHotterFromSetter(setter) {
   return setter && (setter.Hotter || (setter.type && setter.type.Hotter)) || []; // eslint-disable-line
@@ -35,7 +35,7 @@ export class Transducer {
 
   context: any;
 
-  constructor(context, config) {
+  constructor(context: SettingField, config: { setter: FieldConfig['setter'] }) {
     let { setter } = config;
 
     // 1. validElement
@@ -46,16 +46,29 @@ export class Transducer {
     } else if (isValidElement(setter) && setter.type.displayName === 'MixedSetter') {
       setter = setter.props?.setters?.[0];
     } else if (typeof setter === 'object' && setter.componentName === 'MixedSetter') {
-      setter = setter && setter.props && setter.props.setters && Array.isArray(setter.props.setters) && setter.props.setters[0];
+      setter = Array.isArray(setter?.props?.setters) && setter.props.setters[0];
     }
 
+    /**
+     * 两种方式标识是 FC 而不是动态 setter
+     * 1. 物料描述里面 setter 的配置，显式设置为 false
+     * 2. registerSetter 注册 setter 时显式设置为 false
+     */
+
+    let isDynamic = true;
+
     if (isSetterConfig(setter)) {
-      setter = setter.componentName;
+      const { componentName, isDynamic: dynamicFlag } = setter as SetterConfig;
+      setter = componentName;
+      isDynamic = dynamicFlag !== false;
     }
     if (typeof setter === 'string') {
-      setter = getSetter(setter)?.component;
+      const { component, isDynamic: dynamicFlag } = getSetter(setter) || {};
+      setter = component;
+      // 如果在物料配置中声明了，在 registerSetter 没有声明，取物料配置中的声明
+      isDynamic = dynamicFlag === undefined ? isDynamic : dynamicFlag !== false;
     }
-    if (isDynamicSetter(setter)) {
+    if (isDynamicSetter(setter) && isDynamic) {
       setter = setter.call(context, context);
     }
 
diff --git a/packages/editor-core/src/di/setter.ts b/packages/editor-core/src/di/setter.ts
@@ -15,6 +15,8 @@ export type RegisteredSetter = {
    */
   initialValue?: any | ((field: any) => any);
   recommend?: boolean;
+  // 标识是否为动态setter，默认为true
+  isDynamic?: boolean;
 };
 const settersMap = new Map<string, RegisteredSetter & {
   type: string;
diff --git a/packages/types/src/setter-config.ts b/packages/types/src/setter-config.ts
@@ -63,6 +63,8 @@ export interface SetterConfig {
    * @todo 物料协议推进
    */
   valueType?: CompositeValue[];
+  // 标识是否为动态setter，默认为true
+  isDynamic?: boolean;
 }
 
 // if *string* passed must be a registered Setter Name, future support blockSchema

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,8 @@ export interface SetterConfig {`
`63`	`63`	`* @todo 物料协议推进`
`64`	`64`	`*/`
`65`	`65`	`valueType?: CompositeValue[];`
	`66`	`+ // 标识是否为动态setter，默认为true`
	`67`	`+ isDynamic?: boolean;`
`66`	`68`	`}`
`67`	`69`
`68`	`70`	`// if string passed must be a registered Setter Name, future support blockSchema`