feat(form:select,cascader,tree-select): default value when cleared

ng-alain · Oct 18, 2024 · d64ae08 · d64ae08
1 parent 70e40b8
commit d64ae08
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 4 deletions.
diff --git a/packages/form/src/widgets/select/schema.ts b/packages/form/src/widgets/select/schema.ts
@@ -132,6 +132,11 @@ export interface SFSelectWidgetSchema extends SFUISchemaItem {
    */
   clearIcon?: TemplateRef<NzSafeAny>;
 
+  /**
+   * 清空时默认值，默认：`undefined`
+   */
+  clearValue?: NzSafeAny;
+
   /**
    * 自定义当前选中的条目图标
    */

diff --git a/packages/form/src/widgets/select/select.widget.ts b/packages/form/src/widgets/select/select.widget.ts
@@ -161,7 +161,7 @@ export class SelectWidget extends ControlUIWidget<SFSelectWidgetSchema> implemen
     if (this.ui.change) {
       this.ui.change(values, this.getOrgData(values));
     }
-    this.setValue(values == null ? undefined : values);
+    this.setValue(values == null ? this.ui.clearValue : values);
   }
 
   private getOrgData(values: SFValue): SFSchemaEnum | SFSchemaEnum[] {

diff --git a/packages/form/widgets/cascader/schema.ts b/packages/form/widgets/cascader/schema.ts
@@ -24,6 +24,11 @@ export interface SFCascaderWidgetSchema extends SFUISchemaItem {
    */
   allowClear?: boolean;
 
+  /**
+   * 清空时默认值，默认：`undefined`
+   */
+  clearValue?: NzSafeAny;
+
   /**
    * 清除按钮的标题，默认：`清除`
    */

diff --git a/packages/form/widgets/cascader/widget.ts b/packages/form/widgets/cascader/widget.ts
@@ -83,7 +83,7 @@ export class CascaderWidget extends ControlUIWidget<SFCascaderWidgetSchema> impl
   }
 
   _change(value: NzSafeAny[] | null): void {
-    this.setValue(value);
+    this.setValue(value == null ? this.ui.clearValue : value);
     if (this.ui.change) {
       this.ui.change(value);
     }

diff --git a/packages/form/widgets/tree-select/schema.ts b/packages/form/widgets/tree-select/schema.ts
@@ -20,6 +20,11 @@ export interface SFTreeSelectWidgetSchema extends SFUISchemaItem {
    */
   allowClear?: boolean;
 
+  /**
+   * 清空时默认值，默认：`undefined`
+   */
+  clearValue?: NzSafeAny;
+
   /**
    * 下拉菜单和选择器同宽，默认：`true`
    */

diff --git a/packages/form/widgets/tree-select/widget.ts b/packages/form/widgets/tree-select/widget.ts
@@ -92,9 +92,8 @@ export class TreeSelectWidget extends ControlUIWidget<SFTreeSelectWidgetSchema>
   }
 
   change(value: NzSafeAny[] | NzSafeAny): void {
-    console.log(value);
     if (this.ui.change) this.ui.change(value);
-    this.setValue(value);
+    this.setValue(value == null ? this.ui.clearValue : value);
   }
 
   expandChange(e: NzFormatEmitEvent): void {