Merge pull request #13962 in DESIGN/design from bugfix/11.0 to feature/x

* commit 'c3c2aee77efbab828d74d72db040e1c03743ece8':
  REPORT-119601 fix:创建新模板按钮显示不全
  REPORT-119567 fix:设计器地图图表默认显示与其他不一致
  REPORT-119405 解决打包问题
  REPORT-119405 fix:设计器数据脱敏国际化显示问题
  REPORT-120129 【宕机】正式环境工程宕机分析原因

designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/rule/DesensitizationRuleChoosePane.java

@@ -18,9 +18,13 @@ import com.fr.stable.StringUtils;
 import com.fr.stable.collections.CollectionUtils;
 
 import javax.swing.AbstractCellEditor;
+import javax.swing.BorderFactory;
+import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTable;
+import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
+import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.TableCellEditor;
 import javax.swing.table.TableCellRenderer;
 import java.awt.CardLayout;
@@ -132,6 +136,16 @@ public class DesensitizationRuleChoosePane extends JPanel {
             this.setDefaultRenderer(DesensitizationRuleStatusPane.class, new DesensitizationRuleStatusPane());
             this.createTable().getColumnModel().getColumn(0).setMaxWidth(20);
             this.createTable().getColumnModel().getColumn(3).setMaxWidth(60);
+            this.createTable().getColumnModel().getColumn(3).setHeaderRenderer(new DefaultTableCellRenderer() {
+                @Override
+                public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
+                    JLabel headerLabel = new JLabel(value != null ? value.toString() : "");
+                    headerLabel.setToolTipText((String) value);
+                    headerLabel.setHorizontalAlignment(SwingConstants.CENTER);
+                    headerLabel.setBorder(BorderFactory.createMatteBorder(0, 0, 3, 0, new Color(216, 216, 216, 175)));
+                    return headerLabel;
+                }
+            });
         }
 
         @Override

designer-base/src/main/java/com/fr/design/editlock/EditLockChangeChecker.java

@@ -32,7 +32,7 @@ public abstract class EditLockChangeChecker {
      */
     public void start() {
         this.scheduler = Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("EditLockChangeChecker"));
-        this.scheduler.scheduleAtFixedRate(new Runnable() {
+        this.scheduler.scheduleWithFixedDelay(new Runnable() {
             @Override
             public void run() {
                 // 判断是否为远程设计环境

designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties

@@ -14,7 +14,7 @@ com.fr.design.report.fit.firstColumn=130*20
 com.fr.design.report.fit.column=100*20
 com.fr.design.lock.LockInfoDialog=500*180
 com.fr.design.mainframe.ForbiddenPane.refreshButton=80*24
-com.fr.start.common.DesignerOpenEmptyPanel.createButton=70*24
+com.fr.start.common.DesignerOpenEmptyPanel.createButton=90*24
 com.fr.design.cell.expand.sort.pane=267*165
 com.fr.design.sort.rule.item=125*20
 com.fr.design.ds.column.sort.pane=250*180

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AbstractChartTypePane.java

@@ -100,7 +100,7 @@ public abstract class AbstractChartTypePane<T extends ChartProvider> extends Fur
             }
         }
 
-        double[] columnSize = {p, vs, f};
+        double[] columnSize = {f};
         double[] rowSize = {p, p, p, p, p, p, p};
 
         if (styleList != null && !styleList.isEmpty()) {

designer-chart/src/main/java/com/fr/van/chart/map/designer/type/MapStatusPane.java

@@ -81,8 +81,8 @@ public class MapStatusPane extends JPanel {
         double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
         double s = TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH;
         double[] rowSize = {p, p, p};
-        double[] columnSize = {d, e};
-        double[] column = {d, s};
+        double[] columnSize = {p, e};
+        double[] column = {p, s};
 
         Component[][] comps = new Component[][]{
                 new Component[]{null, null},

designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapSourceChoosePane.java

@@ -36,7 +36,7 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver {
         this.setBorder(BorderFactory.createEmptyBorder(10, 5, 0, 0));
 
         double p = TableLayout.PREFERRED;
-        double[] columnSize = {230};
+        double[] columnSize = {TableLayout.FILL};
         double[] rowSize = {p, p, p, p, p, p, p, p};
 
         JPanel panel = new JPanel(new BorderLayout());