Browse Source

MOBILE-32704 11.0部分插件内置

fix-lag
Heyman 3 years ago
parent
commit
fb41e9e602
  1. 34
      designer-base/src/main/java/com/fr/design/ExtraDesignClassManager.java
  2. 4
      designer-base/src/main/java/com/fr/design/mainframe/mobile/provider/DefaultMobileParamUIProvider.java
  3. 4
      designer-base/src/main/java/com/fr/design/mainframe/mobile/provider/EmptyMobileParamUIProvider.java
  4. 2
      designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/DefaultMobileParamDefinePane.java
  5. 2
      designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/EmptyMobileParamDefinePane.java
  6. 4
      designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileParamDefinePane.java
  7. 7
      designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileParamSettingPane.java
  8. 43
      designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStylePane.java
  9. 2
      designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/AccessibleMobileParamEditor.java
  10. 9
      designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ParaMobileDefinePane.java

34
designer-base/src/main/java/com/fr/design/ExtraDesignClassManager.java

@ -18,14 +18,6 @@ import com.fr.design.fun.TableDataDefineProvider;
import com.fr.design.fun.ToolbarItemProvider;
import com.fr.design.gui.core.WidgetOption;
import com.fr.design.gui.core.WidgetOptionFactory;
import com.fr.design.mainframe.mobile.provider.combo.SimpleComboCheckBoxStyleProvider;
import com.fr.design.mainframe.mobile.provider.combo.SimpleComboStyleProvider;
import com.fr.design.mainframe.mobile.provider.date.NavigationStyleProvider;
import com.fr.design.mainframe.mobile.provider.date.SimpleDateStyleProvider;
import com.fr.design.mainframe.mobile.provider.date.SimpleStyleProvider;
import com.fr.design.mainframe.mobile.provider.radiogroup.CapsuleRadioGroupStyleProvider;
import com.fr.design.mainframe.mobile.provider.radiogroup.ImageRadioGroupStyleProvider;
import com.fr.design.mainframe.mobile.provider.radiogroup.UnitedRadioGroupStyleProvider;
import com.fr.design.menu.ShortCut;
import com.fr.design.widget.Appearance;
import com.fr.design.widget.mobile.WidgetMobilePane;
@ -275,35 +267,15 @@ public class ExtraDesignClassManager extends AbstractExtraClassManager implement
return map;
}
public MobileWidgetStyleProvider[] getMobileStyleOfWidget(String xType) {
public List<MobileWidgetStyleProvider> getMobileStyleOfWidget(String xType) {
Set<MobileWidgetStyleProvider> set = getArray(MobileWidgetStyleProvider.XML_TAG);
Set<MobileWidgetStyleProvider> allSet = new HashSet<>();
SimpleStyleProvider simpleStyleProvider = new SimpleStyleProvider();
NavigationStyleProvider navigationStyleProvider = new NavigationStyleProvider();
SimpleDateStyleProvider simpleDateStyleProvider = new SimpleDateStyleProvider();
SimpleComboStyleProvider simpleComboStyleProvider = new SimpleComboStyleProvider();
SimpleComboCheckBoxStyleProvider simpleComboCheckBoxStyleProvider = new SimpleComboCheckBoxStyleProvider();
CapsuleRadioGroupStyleProvider capsuleRadioGroupStyleProvider = new CapsuleRadioGroupStyleProvider();
UnitedRadioGroupStyleProvider unitedRadioGroupStyleProvider = new UnitedRadioGroupStyleProvider();
ImageRadioGroupStyleProvider imageRadioGroupStyleProvider = new ImageRadioGroupStyleProvider();
allSet.add(simpleStyleProvider);
allSet.add(navigationStyleProvider);
allSet.add(simpleDateStyleProvider);
allSet.add(simpleComboStyleProvider);
allSet.add(simpleComboCheckBoxStyleProvider);
allSet.add(capsuleRadioGroupStyleProvider);
allSet.add(unitedRadioGroupStyleProvider);
allSet.add(imageRadioGroupStyleProvider);
allSet.addAll(set);
List<MobileWidgetStyleProvider> providers = new ArrayList<>();
for (MobileWidgetStyleProvider provider : allSet) {
for (MobileWidgetStyleProvider provider : set) {
if (ComparatorUtils.equalsIgnoreCase(provider.xTypeForWidget(), xType)) {
providers.add(provider);
}
}
return providers.toArray(new MobileWidgetStyleProvider[providers.size()]);
return providers;
}
@Override

4
designer-base/src/main/java/com/fr/design/mainframe/mobile/provider/topparam/DefaultMobileParamUIProvider.java → designer-base/src/main/java/com/fr/design/mainframe/mobile/provider/DefaultMobileParamUIProvider.java

@ -1,8 +1,8 @@
package com.fr.design.mainframe.mobile.provider.topparam;
package com.fr.design.mainframe.mobile.provider;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.fun.impl.AbstractMobileParamUIProvider;
import com.fr.design.mainframe.mobile.ui.topparam.DefaultMobileParamDefinePane;
import com.fr.design.mainframe.mobile.ui.DefaultMobileParamDefinePane;
import com.fr.form.ui.mobile.MobileParamStyle;
import com.fr.form.ui.mobile.impl.DefaultMobileParameterStyle;
import com.fr.locale.InterProviderFactory;

4
designer-base/src/main/java/com/fr/design/mainframe/mobile/provider/topparam/EmptyMobileParamUIProvider.java → designer-base/src/main/java/com/fr/design/mainframe/mobile/provider/EmptyMobileParamUIProvider.java

@ -1,8 +1,8 @@
package com.fr.design.mainframe.mobile.provider.topparam;
package com.fr.design.mainframe.mobile.provider;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.fun.impl.AbstractMobileParamUIProvider;
import com.fr.design.mainframe.mobile.ui.topparam.EmptyMobileParamDefinePane;
import com.fr.design.mainframe.mobile.ui.EmptyMobileParamDefinePane;
import com.fr.form.ui.mobile.MobileParamStyle;
import com.fr.report.fun.MobileParamStyleProvider;
import com.fr.report.mobile.EmptyMobileParamStyle;

2
designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/topparam/DefaultMobileParamDefinePane.java → designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/DefaultMobileParamDefinePane.java

@ -1,4 +1,4 @@
package com.fr.design.mainframe.mobile.ui.topparam;
package com.fr.design.mainframe.mobile.ui;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.i18n.Toolkit;

2
designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/topparam/EmptyMobileParamDefinePane.java → designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/EmptyMobileParamDefinePane.java

@ -1,4 +1,4 @@
package com.fr.design.mainframe.mobile.ui.topparam;
package com.fr.design.mainframe.mobile.ui;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.i18n.Toolkit;

4
designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/topparam/MobileParamDefinePane.java → designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileParamDefinePane.java

@ -1,9 +1,9 @@
package com.fr.design.mainframe.mobile.ui.topparam;
package com.fr.design.mainframe.mobile.ui;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.fun.MobileParamUIProvider;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.mainframe.mobile.provider.topparam.EmptyMobileParamUIProvider;
import com.fr.design.mainframe.mobile.provider.EmptyMobileParamUIProvider;
import com.fr.form.ui.mobile.MobileParamStyle;
import com.fr.general.ComparatorUtils;
import com.fr.invoke.Reflect;

7
designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/topparam/MobileParamSettingPane.java → designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileParamSettingPane.java

@ -1,13 +1,14 @@
package com.fr.design.mainframe.mobile.ui.topparam;
package com.fr.design.mainframe.mobile.ui;
import com.fr.design.ExtraDesignClassManager;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.dialog.BasicPane;
import com.fr.design.fun.MobileParamUIProvider;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.mainframe.mobile.provider.topparam.DefaultMobileParamUIProvider;
import com.fr.design.mainframe.mobile.provider.topparam.EmptyMobileParamUIProvider;
import com.fr.design.mainframe.mobile.provider.DefaultMobileParamUIProvider;
import com.fr.design.mainframe.mobile.provider.EmptyMobileParamUIProvider;
import com.fr.design.mainframe.mobile.provider.topparam.MobileTopParamStyleProvider;
import com.fr.design.mainframe.mobile.ui.MobileParamDefinePane;
import com.fr.form.ui.mobile.MobileParamStyle;
import com.fr.general.ComparatorUtils;
import com.fr.report.ExtraReportClassManager;

43
designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStylePane.java

@ -5,10 +5,19 @@ import com.fr.design.beans.BasicBeanPane;
import com.fr.design.dialog.BasicPane;
import com.fr.design.fun.MobileWidgetStyleProvider;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.mainframe.mobile.provider.combo.SimpleComboCheckBoxStyleProvider;
import com.fr.design.mainframe.mobile.provider.combo.SimpleComboStyleProvider;
import com.fr.design.mainframe.mobile.provider.date.NavigationStyleProvider;
import com.fr.design.mainframe.mobile.provider.date.SimpleDateStyleProvider;
import com.fr.design.mainframe.mobile.provider.date.SimpleStyleProvider;
import com.fr.design.mainframe.mobile.provider.radiogroup.CapsuleRadioGroupStyleProvider;
import com.fr.design.mainframe.mobile.provider.radiogroup.ImageRadioGroupStyleProvider;
import com.fr.design.mainframe.mobile.provider.radiogroup.UnitedRadioGroupStyleProvider;
import com.fr.form.ui.Widget;
import com.fr.form.ui.container.WScaleLayout;
import com.fr.form.ui.mobile.MobileStyle;
import com.fr.form.ui.widget.CRBoundsWidget;
import com.fr.general.ComparatorUtils;
import com.fr.log.FineLoggerFactory;
import com.fr.stable.ArrayUtils;
@ -16,8 +25,12 @@ import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import java.awt.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
public class MobileStylePane extends BasicPane {
@ -129,7 +142,35 @@ public class MobileStylePane extends BasicPane {
private MobileWidgetStyleProvider[] getMobileWidgetStyleProviders() {
DefaultMobileWidgetStyleProvider defaultMobileWidgetStyleProvider = new DefaultMobileWidgetStyleProvider();
MobileWidgetStyleProvider[] styleProviders = ExtraDesignClassManager.getInstance().getMobileStyleOfWidget(widget.getXType());
SimpleStyleProvider simpleStyleProvider = new SimpleStyleProvider();
NavigationStyleProvider navigationStyleProvider = new NavigationStyleProvider();
SimpleDateStyleProvider simpleDateStyleProvider = new SimpleDateStyleProvider();
SimpleComboStyleProvider simpleComboStyleProvider = new SimpleComboStyleProvider();
SimpleComboCheckBoxStyleProvider simpleComboCheckBoxStyleProvider = new SimpleComboCheckBoxStyleProvider();
CapsuleRadioGroupStyleProvider capsuleRadioGroupStyleProvider = new CapsuleRadioGroupStyleProvider();
UnitedRadioGroupStyleProvider unitedRadioGroupStyleProvider = new UnitedRadioGroupStyleProvider();
ImageRadioGroupStyleProvider imageRadioGroupStyleProvider = new ImageRadioGroupStyleProvider();
Set<MobileWidgetStyleProvider> set = new HashSet<>();
set.add(simpleStyleProvider);
set.add(navigationStyleProvider);
set.add(simpleDateStyleProvider);
set.add(simpleComboStyleProvider);
set.add(simpleComboCheckBoxStyleProvider);
set.add(capsuleRadioGroupStyleProvider);
set.add(unitedRadioGroupStyleProvider);
set.add(imageRadioGroupStyleProvider);
List<MobileWidgetStyleProvider> providers = new ArrayList<>();
for (MobileWidgetStyleProvider provider : set) {
if (ComparatorUtils.equalsIgnoreCase(provider.xTypeForWidget(), widget.getXType())) {
providers.add(provider);
}
}
List<MobileWidgetStyleProvider> otherProviders = ExtraDesignClassManager.getInstance().getMobileStyleOfWidget(widget.getXType());
providers.addAll(otherProviders);
MobileWidgetStyleProvider[] styleProviders = providers.toArray(new MobileWidgetStyleProvider[providers.size()]);
styleProviders = ArrayUtils.insert(0, styleProviders, defaultMobileWidgetStyleProvider);
return styleProviders;
}

2
designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/AccessibleMobileParamEditor.java

@ -4,7 +4,7 @@ import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.mainframe.FormDesigner;
import com.fr.design.mainframe.WidgetPropertyPane;
import com.fr.design.mainframe.mobile.ui.topparam.MobileParamSettingPane;
import com.fr.design.mainframe.mobile.ui.MobileParamSettingPane;
import com.fr.design.mainframe.widget.wrappers.MobileParamWrapper;
import com.fr.form.ui.container.WParameterLayout;
import com.fr.form.ui.mobile.MobileParamStyle;

9
designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ParaMobileDefinePane.java

@ -15,24 +15,17 @@ import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.mainframe.FormDesigner;
import com.fr.design.mainframe.MobileWidgetListPane;
import com.fr.design.mainframe.WidgetPropertyPane;
import com.fr.design.mainframe.mobile.ui.topparam.MobileParamSettingPane;
import com.fr.design.mainframe.mobile.ui.MobileParamSettingPane;
import com.fr.design.mainframe.widget.accessibles.AccessibleMobileParamEditor;
import com.fr.form.ui.container.WParameterLayout;
import com.fr.form.ui.container.WSortLayout;
import com.fr.form.ui.mobile.MobileParamStyle;
import com.fr.general.CloudCenter;
import com.fr.log.FineLoggerFactory;
import com.fr.report.mobile.EmptyMobileParamStyle;
import javax.swing.BorderFactory;
import javax.swing.JPanel;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Cursor;
import java.awt.Desktop;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.net.URI;
import java.util.Set;
/**

Loading…
Cancel
Save