From 7dc49e1e0715b60ef67bdae6d5bab060a09a55b3 Mon Sep 17 00:00:00 2001 From: "coral.chen@fanruan.com" Date: Mon, 22 May 2023 09:57:23 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-89967=20=E6=8E=A7=E4=BB=B6=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=80=BC=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mobile/component/MobilePasswordEditSettingPane.java | 5 ----- .../designer/mobile/component/MobileTextAreaSettingPane.java | 5 +++++ .../designer/mobile/component/MobileTextEditSettingPane.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobilePasswordEditSettingPane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobilePasswordEditSettingPane.java index 3cf5adccb1..e90bf577e0 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobilePasswordEditSettingPane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobilePasswordEditSettingPane.java @@ -23,11 +23,6 @@ public class MobilePasswordEditSettingPane extends MobileTextEditSettingPane { this.add(showPassword, BorderLayout.NORTH); } - @Override - protected boolean getClearDefaultState() { - return true; - } - @Override public void populateBean(MobileTextEditAttr ob) { super.populateBean(ob); diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobileTextAreaSettingPane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobileTextAreaSettingPane.java index d660508e6e..bfcb185b70 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobileTextAreaSettingPane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobileTextAreaSettingPane.java @@ -23,6 +23,11 @@ public class MobileTextAreaSettingPane extends MobileTextEditSettingPane { this.add(showWordCount, BorderLayout.NORTH); } + @Override + protected boolean getClearDefaultState() { + return false; + } + @Override public void populateBean(MobileTextEditAttr ob) { super.populateBean(ob); diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobileTextEditSettingPane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobileTextEditSettingPane.java index 56d340e4d0..9b2758a2d2 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobileTextEditSettingPane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobileTextEditSettingPane.java @@ -27,7 +27,7 @@ public class MobileTextEditSettingPane extends BasicBeanPane } protected boolean getClearDefaultState() { - return false; + return true; } protected void initLayout() { @@ -38,7 +38,7 @@ public class MobileTextEditSettingPane extends BasicBeanPane @Override public void populateBean(MobileTextEditAttr ob) { - allowOneClickClear.setSelected(ob.isAllowOneClickClear() != null && ob.isAllowOneClickClear()); + allowOneClickClear.setSelected(ob.isAllowOneClickClear() == null || ob.isAllowOneClickClear()); } @Override