Merge pull request #118 in BA/design from ~NEIL/design:release to release

* commit '8ce32a4fffdb348e71f7a1d186a62245713b1d5c':
  1
  1
  1
  冲突
  冲突
  1
  1
  冲突

designer/src/com/fr/design/report/mobile/MobileRadioGroupPane.java

@@ -1,11 +1,11 @@
 package com.fr.design.report.mobile;
 
+import com.fr.base.mobile.MobileFitAttrState;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.ibutton.UIRadioButton;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
-import com.fr.base.mobile.MobileFitAttrState;
 import com.fr.stable.StringUtils;
 
 import javax.swing.*;

designer/src/com/fr/design/report/mobile/ReportMobileAttrPane.java

@@ -1,10 +1,10 @@
 package com.fr.design.report.mobile;
 
+import com.fr.base.mobile.MobileFitAttrState;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.general.Inter;
 import com.fr.report.mobile.ElementCaseMobileAttr;
-import com.fr.base.mobile.MobileFitAttrState;
 
 import javax.swing.*;
 import java.awt.*;

designer_base/src/com/fr/design/ExtraDesignClassManager.java

@@ -126,7 +126,7 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi
 
     private DesignerEnvProcessor envProcessor;
 
-    private TableDataPaneProcessor tableDataPaneProcessor;
+    private TableDataTreePaneProcessor tableDataTreePaneProcessor;
 
     private Set<ElementUIProvider> elementUIProviders;
 
@@ -134,17 +134,23 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi
 
     private Set<ExportAttrTabProvider> exportAttrTabProviders;
 
-    private Set<BackgroundQuickUIProvider> backgroundQuickUIProviders;
+    private WidgetDesignHandler widgetDesignHandler;
 
-    private Set<BackgroundUIProvider> backgroundUIProviders;
+    public WidgetDesignHandler getWidgetDesignHandler() {
+        return widgetDesignHandler;
+    }
+
+    public void setWidgetDesignHandler(Level level, PluginSimplify simplify) throws Exception {
+        widgetDesignHandler = (WidgetDesignHandler) level;
+    }
 
-    public TableDataPaneProcessor getTableDataPaneProcessor() {
+    public TableDataTreePaneProcessor getTableDataTreePaneProcessor() {
-        return tableDataPaneProcessor;
+        return tableDataTreePaneProcessor;
     }
 
-    public void setTableDataPaneProcessor(Level level, PluginSimplify simplify) {
+    public void setTableDataSourceOPProcessor(Level level, PluginSimplify simplify) {
-        validAPILevel(level, TableDataPaneProcessor.CURRENT_LEVEL, simplify.getPluginName());
+        validAPILevel(level, TableDataTreePaneProcessor.CURRENT_LEVEL, simplify.getPluginName());
-        tableDataPaneProcessor = (TableDataPaneProcessor) level;
+        tableDataTreePaneProcessor = (TableDataTreePaneProcessor) level;
     }
 
     public DesignerEnvProcessor getEnvProcessor() {
@@ -759,51 +765,6 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi
         widgetAttrProviders.add((WidgetPropertyUIProvider) level);
     }
 
-    public ExportAttrTabProvider[] getExportAttrTabProviders() {
-        if (exportAttrTabProviders == null) {
-            return new ExportAttrTabProvider[0];
-        }
-        return exportAttrTabProviders.toArray(new ExportAttrTabProvider[exportAttrTabProviders.size()]);
-    }
-
-    public void addExportAttrTabProvider(Level level, PluginSimplify simplify) throws Exception {
-        if (exportAttrTabProviders == null) {
-            exportAttrTabProviders = new HashSet<ExportAttrTabProvider>();
-        }
-        validAPILevel(level, ExportAttrTabProvider.CURRENT_LEVEL, simplify.getPluginName());
-        exportAttrTabProviders.add((ExportAttrTabProvider) level);
-    }
-
-    public BackgroundQuickUIProvider[] getBackgroundQuickUIProviders() {
-        if (backgroundQuickUIProviders == null) {
-            return new BackgroundQuickUIProvider[0];
-        }
-        return backgroundQuickUIProviders.toArray(new BackgroundQuickUIProvider[backgroundQuickUIProviders.size()]);
-    }
-
-    public void addBackgroundQuickUIProvider(Level level, PluginSimplify simplify) throws Exception {
-        if (backgroundQuickUIProviders == null) {
-            backgroundQuickUIProviders = new HashSet<>();
-        }
-        validAPILevel(level, BackgroundQuickUIProvider.CURRENT_LEVEL, simplify.getPluginName());
-        backgroundQuickUIProviders.add((BackgroundQuickUIProvider) level);
-    }
-
-    public BackgroundUIProvider[] getBackgroundUIProviders() {
-        if (backgroundUIProviders == null) {
-            return new BackgroundUIProvider[0];
-        }
-        return backgroundUIProviders.toArray(new BackgroundUIProvider[backgroundUIProviders.size()]);
-    }
-
-    public void addBackgroundUIProvider(Level level, PluginSimplify simplify) throws Exception {
-        if (backgroundUIProviders == null) {
-            backgroundUIProviders = new HashSet<>();
-        }
-        validAPILevel(level, BackgroundUIProvider.CURRENT_LEVEL, simplify.getPluginName());
-        backgroundUIProviders.add((BackgroundUIProvider) level);
-    }
-
     /**
      * 文件名
      *
@@ -858,8 +819,6 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi
             readWidgetRelated(tagName, impl, simplify);
             //数据集, 数据连接
             readTableDataRelated(tagName, className, simplify);
-            // 样式相关的
-            readStyleRelated(tagName, impl, simplify);
             if (tagName.equals(ParameterWidgetOptionProvider.XML_TAG)) {
                 addParameterWidgetOption(impl, simplify);
             } else if (tagName.equals(PreviewProvider.MARK_STRING)) {
@@ -894,10 +853,12 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi
                 addSupportDesignApps(impl, simplify);
             } else if (tagName.equals(DesignerEnvProcessor.XML_TAG)) {
                 setEnvProcessor(impl, simplify);
-            } else if (tagName.equals(TableDataPaneProcessor.XML_TAG)) {
+            } else if (tagName.equals(TableDataTreePaneProcessor.XML_TAG)) {
-                setTableDataPaneProcessor(impl, simplify);
+                setTableDataSourceOPProcessor(impl, simplify);
             } else if (tagName.equals(ElementUIProvider.MARK_STRING)) {
                 addElementUIProvider(impl, simplify);
+            } else if (tagName.equals(WidgetDesignHandler.XML_TAG)) {
+                setWidgetDesignHandler(impl, simplify);
             }else if (tagName.equals(WidgetPropertyUIProvider.XML_TAG)) {
                 addWidgetAttrProvider(impl, simplify);
             } else if (tagName.equals(ExportAttrTabProvider.XML_TAG)) {
@@ -910,6 +871,21 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi
         }
     }
 
+    public ExportAttrTabProvider[] getExportAttrTabProviders() {
+        if (exportAttrTabProviders == null) {
+            return new ExportAttrTabProvider[0];
+        }
+        return exportAttrTabProviders.toArray(new ExportAttrTabProvider[exportAttrTabProviders.size()]);
+    }
+
+    public void addExportAttrTabProvider(Level level, PluginSimplify simplify) throws Exception {
+        if (exportAttrTabProviders == null) {
+            exportAttrTabProviders = new HashSet<ExportAttrTabProvider>();
+        }
+        validAPILevel(level, ExportAttrTabProvider.CURRENT_LEVEL, simplify.getPluginName());
+        exportAttrTabProviders.add((ExportAttrTabProvider) level);
+    }
+
     private void readTableDataRelated(String tagName, String className, PluginSimplify simplify) {
         if (tagName.equals(TableDataCreatorProvider.XML_TAG)) {
             setTableDataCreatorProvider(className);
@@ -934,14 +910,6 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi
         }
     }
 
-    private void readStyleRelated(String tagName, Level impl, PluginSimplify simplify) throws Exception {
-        if (tagName.equals(BackgroundQuickUIProvider.MARK_STRING)) {
-            addBackgroundQuickUIProvider(impl, simplify);
-        } else if (tagName.equals(BackgroundUIProvider.MARK_STRING)) {
-            addBackgroundUIProvider(impl, simplify);
-        }
-    }
-
     /**
      * 写xml
      *

designer_base/src/com/fr/design/condition/LiteConditionPane.java

@@ -517,6 +517,8 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
 
         // formulaPane
         JPanel formulaPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        // 95106 公式区域限定宽高, 显示两行即可, 在新窗口编辑.
+        formulaPane.setPreferredSize(new Dimension(450, 40));
         formulaConditionPane.add(formulaPane, BorderLayout.CENTER);
         formulaPane.setBorder(BorderFactory.createEmptyBorder(2, 0, 2, 2));
         formulaPane.add(GUICoreUtils.createBorderPane(new UILabel(Inter.getLocText("FR-Designer_LiteCondition_Formula") + "="), BorderLayout.NORTH), BorderLayout.WEST);