From ffaf58b5b56138b537ac54ca02b0e8e70724d56e Mon Sep 17 00:00:00 2001
From: liujuping <liujup@foxmail.com>
Date: Thu, 16 Mar 2023 11:11:51 +0800
Subject: [PATCH] refactor: rename internalToShell to internalToShellField

---
 .../designer/src/designer/setting/setting-field.ts |  6 +++---
 .../src/designer/setting/setting-prop-entry.ts     | 12 ++++++------
 .../src/components/settings/settings-pane.tsx      | 14 +++++++-------
 packages/shell/src/model/setting-field.ts          |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/packages/designer/src/designer/setting/setting-field.ts b/packages/designer/src/designer/setting/setting-field.ts
index 36a30eb1c..7e91f02ce 100644
--- a/packages/designer/src/designer/setting/setting-field.ts
+++ b/packages/designer/src/designer/setting/setting-field.ts
@@ -73,7 +73,7 @@ INode
 
   onEffect(action: () => void): IPublicTypeDisposable;
 
-  internalToShell(): IPublicModelSettingField;
+  internalToShellField(): IPublicModelSettingField;
 }
 
 export class SettingField extends SettingPropEntry implements ISettingField {
@@ -143,7 +143,7 @@ export class SettingField extends SettingPropEntry implements ISettingField {
     }
     if (isDynamicSetter(this._setter)) {
       return untracked(() => {
-        const shellThis = this.internalToShell();
+        const shellThis = this.internalToShellField();
         return (this._setter as IPublicTypeDynamicSetter)?.call(shellThis, shellThis!);
       });
     }
@@ -296,7 +296,7 @@ export class SettingField extends SettingPropEntry implements ISettingField {
   }
 
 
-  internalToShell() {
+  internalToShellField() {
     return this.designer!.shellModelFactory.createSettingField(this);
   }
 }
diff --git a/packages/designer/src/designer/setting/setting-prop-entry.ts b/packages/designer/src/designer/setting/setting-prop-entry.ts
index e2f1be615..c061c4c8e 100644
--- a/packages/designer/src/designer/setting/setting-prop-entry.ts
+++ b/packages/designer/src/designer/setting/setting-prop-entry.ts
@@ -35,7 +35,7 @@ export interface ISettingPropEntry extends ISettingEntry {
 
   setValue(val: any, isHotValue?: boolean, force?: boolean, extraOptions?: IPublicTypeSetValueOptions): void;
 
-  internalToShell(): IPublicModelSettingField;
+  internalToShellField(): IPublicModelSettingField;
 }
 
 export class SettingPropEntry implements ISettingPropEntry {
@@ -157,7 +157,7 @@ export class SettingPropEntry implements ISettingPropEntry {
       if (this.type !== 'field') {
         const { getValue } = this.extraProps;
         return getValue
-          ? getValue(this.internalToShell()!, undefined) === undefined
+          ? getValue(this.internalToShellField()!, undefined) === undefined
             ? 0
             : 1
           : 0;
@@ -196,7 +196,7 @@ export class SettingPropEntry implements ISettingPropEntry {
     }
     const { getValue } = this.extraProps;
     try {
-      return getValue ? getValue(this.internalToShell()!, val) : val;
+      return getValue ? getValue(this.internalToShellField()!, val) : val;
     } catch (e) {
       console.warn(e);
       return val;
@@ -215,7 +215,7 @@ export class SettingPropEntry implements ISettingPropEntry {
     const { setValue } = this.extraProps;
     if (setValue && !extraOptions?.disableMutator) {
       try {
-        setValue(this.internalToShell()!, val);
+        setValue(this.internalToShellField()!, val);
       } catch (e) {
         /* istanbul ignore next */
         console.warn(e);
@@ -238,7 +238,7 @@ export class SettingPropEntry implements ISettingPropEntry {
     const { setValue } = this.extraProps;
     if (setValue) {
       try {
-        setValue(this.internalToShell()!, undefined);
+        setValue(this.internalToShellField()!, undefined);
       } catch (e) {
         /* istanbul ignore next */
         console.warn(e);
@@ -394,7 +394,7 @@ export class SettingPropEntry implements ISettingPropEntry {
     return v;
   }
 
-  internalToShell(): IPublicModelSettingField {
+  internalToShellField(): IPublicModelSettingField {
     return this.designer!.shellModelFactory.createSettingField(this);;
   }
 }
diff --git a/packages/editor-skeleton/src/components/settings/settings-pane.tsx b/packages/editor-skeleton/src/components/settings/settings-pane.tsx
index 539009241..0a70c36c9 100644
--- a/packages/editor-skeleton/src/components/settings/settings-pane.tsx
+++ b/packages/editor-skeleton/src/components/settings/settings-pane.tsx
@@ -80,7 +80,7 @@ class SettingFieldView extends Component<SettingFieldViewProps, SettingFieldView
     const { extraProps } = this.field;
     const { condition } = extraProps;
     try {
-      return typeof condition === 'function' ? condition(this.field.internalToShell()) !== false : true;
+      return typeof condition === 'function' ? condition(this.field.internalToShellField()) !== false : true;
     } catch (error) {
       console.error('exception when condition (hidden) is excuted', error);
     }
@@ -123,7 +123,7 @@ class SettingFieldView extends Component<SettingFieldViewProps, SettingFieldView
       if (setter.props) {
         setterProps = setter.props;
         if (typeof setterProps === 'function') {
-          setterProps = setterProps(this.field.internalToShell());
+          setterProps = setterProps(this.field.internalToShellField());
         }
       }
       if (setter.initialValue != null) {
@@ -190,7 +190,7 @@ class SettingFieldView extends Component<SettingFieldViewProps, SettingFieldView
     }
     // 当前 field 没有 value 值时，将 initialValue 写入 field
     // 之所以用 initialValue，而不是 defaultValue 是为了保持跟 props.onInitial 的逻辑一致
-    const _initialValue = typeof initialValue === 'function' ? initialValue(this.field.internalToShell()) : initialValue;
+    const _initialValue = typeof initialValue === 'function' ? initialValue(this.field.internalToShellField()) : initialValue;
     this.field.setValue(_initialValue);
   }
 
@@ -238,9 +238,9 @@ class SettingFieldView extends Component<SettingFieldViewProps, SettingFieldView
         forceInline: extraProps.forceInline,
         key: field.id,
         // === injection
-        prop: field.internalToShell(), // for compatible vision
+        prop: field.internalToShellField(), // for compatible vision
         selected: field.top?.getNode()?.internalToShellNode(),
-        field: field.internalToShell(),
+        field: field.internalToShellField(),
         // === IO
         value, // reaction point
         initialValue,
@@ -257,7 +257,7 @@ class SettingFieldView extends Component<SettingFieldViewProps, SettingFieldView
           if (initialValue == null) {
             return;
           }
-          const value = typeof initialValue === 'function' ? initialValue(field.internalToShell()) : initialValue;
+          const value = typeof initialValue === 'function' ? initialValue(field.internalToShellField()) : initialValue;
           this.setState({
             // eslint-disable-next-line react/no-unused-state
             value,
@@ -316,7 +316,7 @@ class SettingGroupView extends Component<SettingGroupViewProps> {
     const { field } = this.props;
     const { extraProps } = field;
     const { condition, display } = extraProps;
-    const visible = field.isSingle && typeof condition === 'function' ? condition(field.internalToShell()) !== false : true;
+    const visible = field.isSingle && typeof condition === 'function' ? condition(field.internalToShellField()) !== false : true;
 
     if (!visible) {
       return null;
diff --git a/packages/shell/src/model/setting-field.ts b/packages/shell/src/model/setting-field.ts
index 8cb634184..ffc97ccc8 100644
--- a/packages/shell/src/model/setting-field.ts
+++ b/packages/shell/src/model/setting-field.ts
@@ -143,7 +143,7 @@ export class SettingField implements IPublicModelSettingField {
       if (isCustomView(item)) {
         return item;
       }
-      return item.internalToShell();
+      return item.internalToShellField();
     });
   }