From 7f6fde759b506bec8bffafbab4e6a41319241d28 Mon Sep 17 00:00:00 2001
From: liujuping <liujup@foxmail.com>
Date: Fri, 26 Jan 2024 15:14:16 +0800
Subject: [PATCH] feat(setter): add field ts

---
 packages/editor-core/src/di/setter.ts                      | 6 +++---
 .../src/components/settings/settings-pane.tsx              | 4 ++--
 packages/editor-skeleton/src/transducers/parse-props.ts    | 3 ++-
 packages/types/src/shell/type/field-extra-props.ts         | 2 +-
 packages/types/src/shell/type/registered-setter.ts         | 7 +++++--
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/packages/editor-core/src/di/setter.ts b/packages/editor-core/src/di/setter.ts
index 437d9a89e..5af2c0230 100644
--- a/packages/editor-core/src/di/setter.ts
+++ b/packages/editor-core/src/di/setter.ts
@@ -1,5 +1,5 @@
 import { ReactNode } from 'react';
-import { IPublicApiSetters, IPublicTypeCustomView, IPublicTypeRegisteredSetter } from '@alilc/lowcode-types';
+import { IPublicApiSetters, IPublicModelSettingField, IPublicTypeCustomView, IPublicTypeRegisteredSetter } from '@alilc/lowcode-types';
 import { createContent, isCustomView } from '@alilc/lowcode-utils';
 
 const settersMap = new Map<string, IPublicTypeRegisteredSetter & {
@@ -28,7 +28,7 @@ export function registerSetter(
   if (!setter.initialValue) {
     const initial = getInitialFromSetter(setter.component);
     if (initial) {
-      setter.initialValue = (field: any) => {
+      setter.initialValue = (field: IPublicModelSettingField) => {
         return initial.call(field, field.getValue());
       };
     }
@@ -81,7 +81,7 @@ export class Setters implements ISetters {
     if (!setter.initialValue) {
       const initial = getInitialFromSetter(setter.component);
       if (initial) {
-        setter.initialValue = (field: any) => {
+        setter.initialValue = (field: IPublicModelSettingField) => {
           return initial.call(field, field.getValue());
         };
       }
diff --git a/packages/editor-skeleton/src/components/settings/settings-pane.tsx b/packages/editor-skeleton/src/components/settings/settings-pane.tsx
index 1d651bb5a..1561bf8bb 100644
--- a/packages/editor-skeleton/src/components/settings/settings-pane.tsx
+++ b/packages/editor-skeleton/src/components/settings/settings-pane.tsx
@@ -225,7 +225,7 @@ class SettingFieldView extends Component<SettingFieldViewProps, SettingFieldView
 
     const value = this.value;
 
-    let _onChange = extraProps?.onChange;
+    let onChangeAPI = extraProps?.onChange;
     let stageName = this.stageName;
 
     return createField(
@@ -261,7 +261,7 @@ class SettingFieldView extends Component<SettingFieldViewProps, SettingFieldView
             value,
           });
           field.setValue(value, true);
-          if (_onChange) _onChange(value, field);
+          if (onChangeAPI) onChangeAPI(value, field.internalToShellField());
         },
         onInitial: () => {
           if (initialValue == null) {
diff --git a/packages/editor-skeleton/src/transducers/parse-props.ts b/packages/editor-skeleton/src/transducers/parse-props.ts
index d22f07f43..573d24ac6 100644
--- a/packages/editor-skeleton/src/transducers/parse-props.ts
+++ b/packages/editor-skeleton/src/transducers/parse-props.ts
@@ -9,6 +9,7 @@ import {
   IPublicTypeTransformedComponentMetadata,
   IPublicTypeOneOfType,
   ConfigureSupportEvent,
+  IPublicModelSettingField,
 } from '@alilc/lowcode-types';
 
 function propConfigToFieldConfig(propConfig: IPublicTypePropConfig): IPublicTypeFieldConfig {
@@ -102,7 +103,7 @@ function propTypeToSetter(propType: IPublicTypePropType): IPublicTypeSetterType
           },
         },
         isRequired,
-        initialValue: (field: any) => {
+        initialValue: (field: IPublicModelSettingField) => {
           const data: any = {};
           items.forEach((item: any) => {
             let initial = item.defaultValue;
diff --git a/packages/types/src/shell/type/field-extra-props.ts b/packages/types/src/shell/type/field-extra-props.ts
index 3e2df280b..7aae7e0fe 100644
--- a/packages/types/src/shell/type/field-extra-props.ts
+++ b/packages/types/src/shell/type/field-extra-props.ts
@@ -77,5 +77,5 @@ export interface IPublicTypeFieldExtraProps {
   /**
    * onChange 事件
    */
-  onChange?: (value: any, field: any) => void;
+  onChange?: (value: any, field: IPublicModelSettingField) => void;
 }
diff --git a/packages/types/src/shell/type/registered-setter.ts b/packages/types/src/shell/type/registered-setter.ts
index 85cad5a80..55a90465a 100644
--- a/packages/types/src/shell/type/registered-setter.ts
+++ b/packages/types/src/shell/type/registered-setter.ts
@@ -1,17 +1,20 @@
+import { IPublicModelSettingField } from '../model';
 import { IPublicTypeCustomView, IPublicTypeTitleContent } from './';
 
 export interface IPublicTypeRegisteredSetter {
   component: IPublicTypeCustomView;
   defaultProps?: object;
   title?: IPublicTypeTitleContent;
+
   /**
    * for MixedSetter to check this setter if available
    */
-  condition?: (field: any) => boolean;
+  condition?: (field: IPublicModelSettingField) => boolean;
+
   /**
    * for MixedSetter to manual change to this setter
    */
-  initialValue?: any | ((field: any) => any);
+  initialValue?: any | ((field: IPublicModelSettingField) => any);
   recommend?: boolean;
   // 标识是否为动态 setter，默认为 true
   isDynamic?: boolean;