feat: fix prop module issue and ts type definition

liujuping · JackLian · commit 7c16bb1f9cc0 · 2023-02-21T18:35:09.000+08:00
diff --git a/packages/designer/src/designer/setting/setting-field.ts b/packages/designer/src/designer/setting/setting-field.ts
@@ -58,7 +58,7 @@ export class SettingField extends SettingPropEntry implements SettingEntry {
   constructor(
     parent: SettingEntry,
     config: IPublicTypeFieldConfig,
-    settingFieldCollector?: (name: string | number, field: SettingField) => void,
+    private settingFieldCollector?: (name: string | number, field: SettingField) => void,
   ) {
     super(parent, config.name, config.type);
     makeObservable(this);
@@ -137,7 +137,8 @@ export class SettingField extends SettingPropEntry implements SettingEntry {
 
   // &#21019;&#24314;&#23376;&#37197;&#32622;&#39033;&#65292;&#36890;&#24120;&#29992;&#20110; object/array &#31867;&#22411;&#25968;&#25454;
   createField(config: IPublicTypeFieldConfig): SettingField {
-    return new SettingField(this, config);
+    this.settingFieldCollector?.(getSettingFieldCollectorKey(this.parent, config), this);
+    return new SettingField(this, config, this.settingFieldCollector);
   }
 
   purge() {
diff --git a/packages/designer/src/designer/setting/setting-prop-entry.ts b/packages/designer/src/designer/setting/setting-prop-entry.ts
@@ -1,11 +1,12 @@
 import { obx, computed, makeObservable, runInAction, IEventBus, createModuleEventBus } from '@alilc/lowcode-editor-core';
 import { GlobalEvent, IPublicModelEditor, IPublicTypeSetValueOptions } from '@alilc/lowcode-types';
 import { uniqueId, isJSExpression, isSettingField } from '@alilc/lowcode-utils';
+import { Setters } from '@alilc/lowcode-shell';
 import { SettingEntry } from './setting-entry';
 import { INode } from '../../document';
 import { IComponentMeta } from '../../component-meta';
 import { Designer } from '../designer';
-import { Setters } from '@alilc/lowcode-shell';
+import { SettingField } from './setting-field';
 
 export class SettingPropEntry implements SettingEntry {
   // === static properties ===
@@ -52,7 +53,7 @@ export class SettingPropEntry implements SettingEntry {
 
   extraProps: any = {};
 
-  constructor(readonly parent: SettingEntry, name: string | number, type?: 'field' | 'group') {
+  constructor(readonly parent: SettingEntry | SettingField, name: string | number, type?: 'field' | 'group') {
     makeObservable(this);
     if (type == null) {
       const c = typeof name === 'string' ? name.slice(0, 1) : '';
diff --git a/packages/designer/src/document/node/props/prop.ts b/packages/designer/src/document/node/props/prop.ts
@@ -303,7 +303,7 @@ export class Prop implements IProp, IPropParent {
         return this._value;
       }
       const values = this.items!.map((prop) => {
-        return prop.export(stage);
+        return prop?.export(stage);
       });
       if (values.every((val) => val === undefined)) {
         return undefined;
diff --git a/packages/types/src/shell/type/field-extra-props.ts b/packages/types/src/shell/type/field-extra-props.ts
@@ -1,59 +1,72 @@
-import { IPublicModelSettingTarget } from '../model';
+import { IPublicModelSettingPropEntry, IPublicModelSettingTarget } from '../model';
 import { IPublicTypeLiveTextEditingConfig } from './';
 
 /**
  * extra props for field
  */
 export interface IPublicTypeFieldExtraProps {
+
   /**
    * &#26159;&#21542;&#24517;&#22635;&#21442;&#25968;
    */
   isRequired?: boolean;
+
   /**
    * default value of target prop for setter use
    */
   defaultValue?: any;
+
   /**
    * get value for field
    */
   getValue?: (target: IPublicModelSettingTarget, fieldValue: any) => any;
+
   /**
    * set value for field
    */
   setValue?: (target: IPublicModelSettingTarget, value: any) => void;
+
   /**
    * the field conditional show, is not set always true
    * @default undefined
    */
-  condition?: (target: IPublicModelSettingTarget) => boolean;
+  condition?: (target: IPublicModelSettingPropEntry) => boolean;
+
   /**
    * autorun when something change
    */
   autorun?: (target: IPublicModelSettingTarget) => void;
+
   /**
    * is this field is a virtual field that not save to schema
    */
   virtual?: (target: IPublicModelSettingTarget) => boolean;
+
   /**
    * default collapsed when display accordion
    */
   defaultCollapsed?: boolean;
+
   /**
    * important field
    */
   important?: boolean;
+
   /**
    * internal use
    */
   forceInline?: number;
+
   /**
    * &#26159;&#21542;&#25903;&#25345;&#21464;&#37327;&#37197;&#32622;
    */
   supportVariable?: boolean;
+
   /**
    * compatiable vision display
    */
   display?: 'accordion' | 'inline' | 'block' | 'plain' | 'popup' | 'entry';
+
   // @todo &#36825;&#20010; omit &#26159;&#21542;&#21512;&#29702;&#65311;
   /**
    * @todo &#24453;&#34917;&#20805;&#25991;&#26723;

Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,7 @@ export class Prop implements IProp, IPropParent {`
`303`	`303`	`return this._value;`
`304`	`304`	`}`
`305`	`305`	`const values = this.items!.map((prop) => {`
`306`		`- return prop.export(stage);`
	`306`	`+ return prop?.export(stage);`
`307`	`307`	`});`
`308`	`308`	`if (values.every((val) => val === undefined)) {`
`309`	`309`	`return undefined;`