无jira 解决冲突

designer-base/src/main/java/com/fr/design/mainframe/chart/info/ChartInfo.java

@@ -19,6 +19,8 @@ import com.fr.stable.xml.XMLPrintWriter;
 import com.fr.stable.xml.XMLableReader;
 import com.fr.third.joda.time.DateTime;
 
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -27,7 +29,7 @@ import java.util.Map;
  * @version 10.0
  * Created by Bjorn on 2020-02-17
  */
-public class ChartInfo extends AbstractPointInfo {
+public class ChartInfo extends AbstractPointInfo implements Comparable<ChartInfo> {
     public static final String XML_TAG = "ChartInfo";
     private static final String CHART_CONSUMING_URL = CloudCenter.getInstance().acquireUrlByKind("chartinfo.consuming") + "/single";
     private static final String CHART_FUNCTION_URL = CloudCenter.getInstance().acquireUrlByKind("chart.info.function") + "/single";
@@ -338,4 +340,19 @@ public class ChartInfo extends AbstractPointInfo {
         chartInfo.chartConfigInfo = chartConfigInfo.clone();
         return chartInfo;
     }
+
+    @Override
+    public int compareTo(ChartInfo chartInfo) {
+        DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        try {
+            return format.parse(this.getCompareDate()).compareTo(format.parse(chartInfo.getCompareDate()));
+        } catch (Exception ex) {
+            return 1;
+        }
+    }
+
+    private String getCompareDate() {
+        return StringUtils.isNotEmpty(chartConsumingMap.get(ATTR_CHART_PROPERTY_END_TIME)) ?
+                chartConsumingMap.get(ATTR_CHART_PROPERTY_END_TIME) : chartConsumingMap.get(ATTR_CHART_TYPE_TIME);
+    }
 }

designer-base/src/main/java/com/fr/design/mainframe/chart/info/ChartInfoCollector.java

@@ -13,7 +13,10 @@ import com.fr.stable.xml.XMLPrintWriter;
 import com.fr.stable.xml.XMLableReader;
 import com.fr.third.joda.time.DateTime;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -269,7 +272,10 @@ public class ChartInfoCollector extends AbstractPointCollector<ChartInfo> {
         writer.end();
 
         writer.startTAG(XML_CHART_INFO_LIST);
-        for (ChartInfo chartInfo : pointInfoMap.values()) {
+
+        List<ChartInfo> list = new ArrayList<>(pointInfoMap.values());
+        Collections.sort(list);
+        for (ChartInfo chartInfo : list) {
             chartInfo.writeXML(writer);
         }
         writer.end();

designer-base/src/main/resources/com/fr/design/images/buttonicon/card_layout_16_normal.svg

@@ -2,6 +2,6 @@
 <svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>icon_tab块_normal</title>
     <g id="icon_tab块_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M7,1 L7,2 L15,2 L15,15 L1,15 L1,1 L7,1 Z M6,2 L2,2 L2,14 L14,14 L14,7 L6,7 L6,2 Z M12,11 L12,12 L4,12 L4,11 L12,11 Z M12,9 L12,10 L4,10 L4,9 L12,9 Z M10,3 L7,3 L7,6 L10,6 L10,3 Z M14,3 L11,3 L11,6 L14,6 L14,3 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
+        <path d="M15,2 L15,15 L1,15 L1,1 L7,1 L7,2 L15,2 Z M10,3 L7,3 L7,6 L10,6 L10,3 Z M14,3 L11,3 L11,6 L14,6 L14,3 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
     </g>
 </svg>

designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteLayout.java

@@ -569,35 +569,6 @@ public class XWAbsoluteLayout extends XLayoutContainer {
         }
     }
 
-    /**
-     * 重新调整子组件宽度
-     * @param width 宽度
-     * @param actualSize 是否按照实际大小计算
-     */
-    @Override
-    public void recalculateChildWidth(int width, boolean actualSize){
-        int componentCount = getComponentCount();
-        for (int i = 0; i < componentCount; i++) {
-            XCreator creator = (XCreator) getComponent(i);
-            creator.recalculateChildWidth(width, actualSize);
-        }
-    }
-
-    /**
-     * 重新调整子组件高度
-     * @param height 高度
-     * @param actualSize 是否按照实际大小计算
-     */
-    @Override
-    public void recalculateChildHeight(int height, boolean actualSize){
-        int componentCount = getComponentCount();
-        for (int i = 0; i < componentCount; i++) {
-            XCreator creator = (XCreator) getComponent(i);
-            creator.recalculateChildHeight(height, actualSize);
-        }
-    }
-
-
     /**
      * body大小手动调整的时候
      * 按照比例调整组件的高度

designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java

@@ -261,7 +261,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
             }
             //丢掉icon,修改按钮名称为编辑
             condition.setSmallIcon(UIConstants.BLACK_ICON);
-            condition.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit"));
+            condition.setName(Toolkit.i18nText("Fine-Design_Basic_Edit"));
             conditionUIButton = new UIButton(condition);
             Component[][] components = new Component[][]{
                     new Component[]{uiLabel, UIComponentUtils.wrapWithBorderLayoutPane(conditionUIButton)}