冲突

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

@@ -126,11 +126,13 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi
 
     private DesignerEnvProcessor envProcessor;
 
-    private TableDataPaneProcessor tableDataPaneProcessor;
+    private TableDataTreePaneProcessor tableDataTreePaneProcessor;
 
     private Set<ElementUIProvider> elementUIProviders;
 
-    private Set<WidgetAttrProvider> widgetAttrProviders;
+    private Set<WidgetPropertyUIProvider> widgetAttrProviders;
+
+    private Set<ExportAttrTabProvider> exportAttrTabProviders;
 
     private WidgetDesignHandler widgetDesignHandler;
 
@@ -142,17 +144,13 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi
         widgetDesignHandler = (WidgetDesignHandler) level;
     }
 
-    private Set<BackgroundQuickUIProvider> backgroundQuickUIProviders;
+    public TableDataTreePaneProcessor getTableDataTreePaneProcessor() {
-
+        return tableDataTreePaneProcessor;
-    private Set<BackgroundUIProvider> backgroundUIProviders;
-
-    public TableDataPaneProcessor getTableDataPaneProcessor() {
-        return tableDataPaneProcessor;
     }
 
-    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() {
@@ -752,49 +750,19 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi
         elementUIProviders.add((ElementUIProvider) level);
     }
 
-    public WidgetAttrProvider[] getWidgetAttrProviders() {
+    public WidgetPropertyUIProvider[] getWidgetAttrProviders() {
         if (widgetAttrProviders == null) {
-            return new WidgetAttrProvider[0];
+            return new WidgetPropertyUIProvider[0];
         }
-        return widgetAttrProviders.toArray(new WidgetAttrProvider[widgetAttrProviders.size()]);
+        return widgetAttrProviders.toArray(new WidgetPropertyUIProvider[widgetAttrProviders.size()]);
     }
 
     public void addWidgetAttrProvider(Level level, PluginSimplify simplify) throws Exception {
         if (widgetAttrProviders == null) {
-            widgetAttrProviders = new HashSet<WidgetAttrProvider>();
+            widgetAttrProviders = new HashSet<WidgetPropertyUIProvider>();
-        }
-        validAPILevel(level, WidgetAttrProvider.CURRENT_LEVEL, simplify.getPluginName());
-        widgetAttrProviders.add((WidgetAttrProvider) 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()]);
         }
-
+        validAPILevel(level, WidgetPropertyUIProvider.CURRENT_LEVEL, simplify.getPluginName());
-    public void addBackgroundUIProvider(Level level, PluginSimplify simplify) throws Exception {
+        widgetAttrProviders.add((WidgetPropertyUIProvider) level);
-        if (backgroundUIProviders == null) {
-            backgroundUIProviders = new HashSet<>();
-        }
-        validAPILevel(level, BackgroundUIProvider.CURRENT_LEVEL, simplify.getPluginName());
-        backgroundUIProviders.add((BackgroundUIProvider) level);
     }
 
     /**
@@ -851,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)) {
@@ -887,14 +853,16 @@ 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(WidgetAttrProvider.XML_TAG)) {
-                addWidgetAttrProvider(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)) {
+                addExportAttrTabProvider(impl, simplify);
             }
         } catch (PluginInvalidLevelException e) {
             PluginMessage.remindUpdate(e.getMessage());
@@ -903,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);
@@ -927,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_form/src/com/fr/design/designer/properties/mobile/ElementCasePropertyTable.java

@@ -18,7 +18,7 @@ import java.util.ArrayList;
 /**
  * Created by Administrator on 2016/5/16/0016.
  */
-public class ElementCasePropertyTable extends AbstractPropertyTable{
+public class ElementCasePropertyTable extends AbstractPropertyTable {
 
     private XCreator xCreator;
     private FormDesigner designer;

designer_form/src/com/fr/design/designer/properties/mobile/ElementCasePropertyUI.java

@@ -9,7 +9,7 @@ import com.fr.general.Inter;
 /**
  * Created by Administrator on 2016/5/16/0016.
  */
-public class ElementCasePropertyUI extends AbstractWidgetPropertyUIProvider{
+public class ElementCasePropertyUI extends AbstractWidgetPropertyUIProvider {
 
     private XCreator xCreator;
 

designer_form/src/com/fr/design/designer/properties/mobile/MobileFitAlignmentItems.java

@@ -4,7 +4,7 @@ import com.fr.base.mobile.MobileFitAttrState;
 import com.fr.design.designer.properties.items.Item;
 import com.fr.design.designer.properties.items.ItemProvider;
 
-public class MobileFitAlignmentItems implements ItemProvider{
+public class MobileFitAlignmentItems implements ItemProvider {
 
     private static Item[] VALUE_ITEMS;
 

designer_form/src/com/fr/design/designer/properties/mobile/MobileFitEditor.java

@@ -6,7 +6,7 @@ import com.fr.design.mainframe.widget.editors.ComboEditor;
 
 import java.util.Vector;
 
-public class MobileFitEditor extends ComboEditor{
+public class MobileFitEditor extends ComboEditor {
     public MobileFitEditor() {
         this(new MobileFitAlignmentItems());
     }

designer_form/src/com/fr/design/designer/properties/mobile/MobileFitRender.java

@@ -2,7 +2,7 @@ package com.fr.design.designer.properties.mobile;
 
 import com.fr.design.mainframe.widget.renderer.EncoderCellRenderer;
 
-public class MobileFitRender extends EncoderCellRenderer{
+public class MobileFitRender extends EncoderCellRenderer {
 
     public MobileFitRender(){
         super(new MobileFitWrapper());

designer_form/src/com/fr/design/designer/properties/mobile/MobileFitWrapper.java

@@ -2,7 +2,7 @@ package com.fr.design.designer.properties.mobile;
 
 import com.fr.design.designer.properties.ItemWrapper;
 
-public class MobileFitWrapper extends ItemWrapper{
+public class MobileFitWrapper extends ItemWrapper {
     public MobileFitWrapper(){
         super(new MobileFitAlignmentItems());
     }