Merge pull request #7428 in DESIGN/design from final/11.0 to persist/11.0

* commit '0bd092cda48fbf2e8c89687510c97b237a19bcdd': (171 commits)
  REPORT-65371 【主题边框】附件截图，滚动条显示有问题
  REPORT-65343 FR11-新自适应开发者调试-新建模板，直接点击开发者调试进行模板保存和预览，此时虽然弹出保存路径弹窗，但对话框弹窗还没有点击的时候模板web就打开了且报错，因为模板没保存成功；设计器端可以看到模板被关闭了
  REPORT-65365 【主题边框】多次切换单元格样式后切换自定义，边框线有问题
  REPORT-65358 【主题边框】单元格样式双线显示有问题
  REPORT-65307 二轮冒烟测试-远程模板锁定优化-国际化问题-弹窗显示不全
  REPORT-65170【主题边框】悬浮元素的预览图，右下的边框线看不到
  REPORT-65192 公式合法性检测错误字符位置返回不正确 1.如果返回错误位置，则模糊处理
  KERNEL-9928 重构水印加载 1.改成常量
  KERNEL-9928 重构水印加载 1.适配一下面板
  REPORT-65192 公式合法性检测错误字符位置返回不正确 1.处理一下极少出现的情况，默认返回0的位置吧。
  REPORT-65170【主题边框】悬浮元素的预览图，右下的边框线看不到
  REPORT-65090:将builder的形式换成普通的创建focusPoint的方式
  REPORT-65124 【模板主题】单元格样式编辑的效果有问题
  问题修复
  REPORT-65125 【模板主题】双击数据列设置格式，没有保存成功
  REPORT-64920 复制粘贴接口报错处理
  CHART-22503 标题、图例、轴标题、轴标签、数据表等字符颜色控件-多余增加了自动
  REPORT-65087 共享数据集兼容性问题
  REPORT-65090：修复埋点格式错误bug
  REPORT-62611 远程设计websocket断开提示优化-toast弹窗在设计器界面居左后显示异常
  ...

build.gradle

@@ -69,6 +69,7 @@ allprojects {
         implementation 'org.swingexplorer:swag:1.0'
         implementation 'net.java.dev.jna:jna:5.4.0'
         implementation 'org.apache.tomcat:tomcat-catalina:8.5.72'
+        implementation 'org.apache.tomcat:tomcat-websocket:8.5.72'
         implementation 'io.socket:socket.io-client:0.7.0'
         implementation 'com.fr.third:fine-third:' + frVersion
         implementation 'com.fr.core:fine-core:' + frDevVersion

designer-base/src/main/java/com/fr/common/exception/ThrowableHandler.java

@@ -0,0 +1,12 @@
+package com.fr.common.exception;
+
+/**
+ * @author hades
+ * @version 11.0
+ * Created by hades on 2021/12/7
+ */
+public interface ThrowableHandler {
+
+    boolean process(Throwable e);
+
+}

designer-base/src/main/java/com/fr/design/DesignerEnvManager.java

@@ -53,7 +53,8 @@ import com.fr.stable.xml.XMLReadable;
 import com.fr.stable.xml.XMLTools;
 import com.fr.stable.xml.XMLWriter;
 import com.fr.stable.xml.XMLableReader;
-import com.fr.third.apache.log4j.FileAppender;
+import com.fr.third.apache.logging.log4j.core.appender.FileAppender;
+import com.fr.third.apache.logging.log4j.core.layout.PatternLayout;
 import com.fr.third.org.apache.commons.io.FilenameUtils;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.WorkContextCallback;
@@ -324,18 +325,18 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
                 if (!new File(fileName).exists()) {
                     StableUtils.makesureFileExist(new File(fileName));
                 }
-                LogHandler handler = new LogHandler<FileAppender>() {
-                    final FileAppender appender = new FileAppender(
-                            new com.fr.third.apache.log4j.PatternLayout("%d{HH:mm:ss} %t %p [%c] %m%n"),
-                            fileName
-                    );
+                LogHandler<FileAppender> handler = new LogHandler<FileAppender>() {
+                    final FileAppender appender = FileAppender.newBuilder().
+                            setName(FileAppender.class.getSimpleName()).
+                            setLayout(PatternLayout.newBuilder().withPattern("%d{HH:mm:ss} %t %p [%c] %m%n").build()).
+                            withFileName(fileName).build();
 
                     @Override
                     public FileAppender getHandler() {
                         return appender;
                     }
                 };
-
+                handler.getHandler().start();
                 FineLoggerFactory.getLogger().addLogAppender(handler);
             } catch (SecurityException e) {
                 FineLoggerFactory.getLogger().error(e.getMessage(), e);

designer-base/src/main/java/com/fr/design/actions/community/BugAction.java

@@ -17,7 +17,7 @@ public class BugAction extends AbstractDesignerSSO {
 
     @Override
     public String getJumpUrl() {
-        return CloudCenter.getInstance().acquireUrlByKind("bbs.bugs", "http://bbs.fanruan.com/forum-156-1.html");
+        return CloudCenter.getInstance().acquireUrlByKind("bbs.bugs", "https://service.fanruan.com/PF/FR/feedback?type=2");
     }
 
     public static final MenuKeySet BUG = new MenuKeySet() {

designer-base/src/main/java/com/fr/design/actions/community/NeedAction.java

@@ -18,7 +18,7 @@ public class NeedAction extends AbstractDesignerSSO {
 
     @Override
     public String getJumpUrl() {
-        return CloudCenter.getInstance().acquireUrlByKind("bbs.needs", "http://bbs.fanruan.com/forum-56-1.html");
+        return CloudCenter.getInstance().acquireUrlByKind("bbs.needs", "https://service.fanruan.com/PF/FR/feedback?type=1");
     }
 
     public static final MenuKeySet NEED = new MenuKeySet() {

designer-base/src/main/java/com/fr/design/actions/community/StudyPlanAction.java

@@ -0,0 +1,17 @@
+package com.fr.design.actions.community;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.login.AbstractDesignerSSO;
+import com.fr.general.CloudCenter;
+
+public class StudyPlanAction extends AbstractDesignerSSO {
+    public StudyPlanAction() {
+        this.setName(Toolkit.i18nText("Fine-Design_Study_Plan"));
+        this.setSmallIcon("/com/fr/design/images/bbs/studyPlan");
+    }
+
+    @Override
+    public String getJumpUrl() {
+        return CloudCenter.getInstance().acquireUrlByKind("bbs.studyPlan", "https://edu.fanruan.com/studypath/finereport");
+    }
+}

designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java

@@ -29,7 +29,6 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.layout.VerticalFlowLayout;
-import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.vcs.VcsConfigManager;
 import com.fr.design.mainframe.vcs.common.VcsHelper;
 import com.fr.design.os.impl.SupportOSImpl;
@@ -45,14 +44,12 @@ import com.fr.locale.InterProviderFactory;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.Constants;
 import com.fr.stable.os.OperatingSystem;
-import com.fr.third.apache.log4j.Level;
+import com.fr.third.apache.logging.log4j.Level;
 import com.fr.transaction.Configurations;
 import com.fr.transaction.Worker;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.server.vcs.VcsOperator;
 import com.fr.workspace.server.vcs.git.config.GcConfig;
-import com.sun.javafx.tk.FileChooserType;
-import javafx.stage.FileChooser;
 
 import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;

designer-base/src/main/java/com/fr/design/base/clipboard/ClipboardFilter.java

@@ -27,11 +27,7 @@ public abstract class ClipboardFilter {
     }
     
     public static <T> T cut(T selection) {
-
-        ExtraDesignClassManager manager = PluginModule.getAgent(PluginModule.ExtraDesign);
-        Set<ClipboardHandlerProvider> providers = manager.getArray(ClipboardHandlerProvider.XML_TAG);
-        providers.addAll(clipboardHandlerProviders);
-        for (ClipboardHandlerProvider provider : providers) {
+        for (ClipboardHandlerProvider provider : getClipboardHandlerProviders()) {
             if (provider.support(selection)) {
                 selection = ((ClipboardHandlerProvider<T>) provider).cut(selection);
             }
@@ -40,10 +36,7 @@ public abstract class ClipboardFilter {
     }
     
     public static <T> T copy(T selection) {
-        ExtraDesignClassManager manager = PluginModule.getAgent(PluginModule.ExtraDesign);
-        Set<ClipboardHandlerProvider> providers = manager.getArray(ClipboardHandlerProvider.XML_TAG);
-        providers.addAll(clipboardHandlerProviders);
-        for (ClipboardHandlerProvider provider : providers) {
+        for (ClipboardHandlerProvider provider : getClipboardHandlerProviders()) {
             if (provider.support(selection)) {
                 selection = ((ClipboardHandlerProvider<T>) provider).copy(selection);
             }
@@ -52,15 +45,27 @@ public abstract class ClipboardFilter {
     }
     
     public static <T> T paste(T selection) {
-        ExtraDesignClassManager manager = PluginModule.getAgent(PluginModule.ExtraDesign);
-        Set<ClipboardHandlerProvider> providers = manager.getArray(ClipboardHandlerProvider.XML_TAG);
-        providers.addAll(clipboardHandlerProviders);
-
-        for (ClipboardHandlerProvider provider : providers) {
+        for (ClipboardHandlerProvider provider : getClipboardHandlerProviders()) {
             if (provider.support(selection)) {
                 selection = ((ClipboardHandlerProvider<T>) provider).paste(selection);
             }
         }
         return selection;
     }
+
+    private static Set<ClipboardHandlerProvider> getClipboardHandlerProviders() {
+        Set<ClipboardHandlerProvider> providers = new HashSet<>();
+
+        for (ClipboardHandlerProvider clipboardHandlerProvider : clipboardHandlerProviders) {
+            providers.add(clipboardHandlerProvider);
+        }
+
+        ExtraDesignClassManager manager = PluginModule.getAgent(PluginModule.ExtraDesign);
+        Set<ClipboardHandlerProvider> pluginProviders = manager.getArray(ClipboardHandlerProvider.XML_TAG);
+        for (ClipboardHandlerProvider clipboardHandlerProvider : pluginProviders) {
+            providers.add(clipboardHandlerProvider);
+        }
+
+        return providers;
+    }
 }

designer-base/src/main/java/com/fr/design/cell/CellRectangleStylePreviewPane.java

@@ -0,0 +1,180 @@
+package com.fr.design.cell;
+
+import com.fr.base.CellBorderSourceFlag;
+import com.fr.base.CellBorderStyle;
+import com.fr.base.Style;
+import com.fr.design.mainframe.theme.utils.DefaultThemedTemplateCellElementCase;
+import com.fr.general.IOUtils;
+import com.fr.report.cell.TemplateCellElement;
+
+import javax.swing.JPanel;
+import java.awt.AlphaComposite;
+import java.awt.Color;
+import java.awt.Composite;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.GridLayout;
+import java.awt.Rectangle;
+import java.awt.RenderingHints;
+import java.awt.image.BufferedImage;
+
+/**
+ * @author Starryi
+ * @version 1.0
+ * Created by Starryi on 2021/9/3
+ */
+public class CellRectangleStylePreviewPane extends JPanel {
+
+    private static final BufferedImage transparentBackgroundImage = IOUtils.readImage("/com/fr/design/images/transparent_background.png");
+    private final float transparentBackgroundWidth;
+    private final float transparentBackgroundHeight;
+
+    private static final int ROW_COUNT = 2;
+    private static final int COLUMN_COUNT = 2;
+
+    private final TemplateCellElement[][] cellElementGrid = new TemplateCellElement[ROW_COUNT][COLUMN_COUNT];
+    private final int[][] borderSourceFlags = new int[ROW_COUNT][COLUMN_COUNT];
+    private final CellStylePreviewPane[][] cellStylePreviewPaneGrid = new CellStylePreviewPane[ROW_COUNT][COLUMN_COUNT];
+
+    public CellRectangleStylePreviewPane(boolean supportInnerBorder) {
+        transparentBackgroundWidth = transparentBackgroundImage.getWidth(null);
+        transparentBackgroundHeight = transparentBackgroundImage.getHeight(null);
+
+        setLayout(new GridLayout(2, 2));
+        setOpaque(false);
+        setBackground(null);
+
+        for (int r = 0; r < ROW_COUNT; r++) {
+            for (int c = 0; c < COLUMN_COUNT; c++) {
+                CellStylePreviewPane pane = new CellStylePreviewPane(c, r, COLUMN_COUNT, ROW_COUNT, false, false);
+                TemplateCellElement cellElement = DefaultThemedTemplateCellElementCase.createInstance(c, r);
+                int flags = CellBorderSourceFlag.INVALID_BORDER_SOURCE;
+                if (supportInnerBorder) {
+                    flags = CellBorderSourceFlag.ALL_BORDER_SOURCE_OUTER;
+                    if (r != 0) {
+                        flags |= CellBorderSourceFlag.TOP_BORDER_SOURCE_INNER;
+                    }
+                    if (r != ROW_COUNT - 1) {
+                        flags |= CellBorderSourceFlag.BOTTOM_BORDER_SOURCE_INNER;
+                    }
+                    if (c != 0) {
+                        flags |= CellBorderSourceFlag.LEFT_BORDER_SOURCE_INNER;
+                    }
+                    if (c != COLUMN_COUNT - 1) {
+                        flags |= CellBorderSourceFlag.RIGHT_BORDER_SOURCE_INNER;
+                    }
+                }
+
+
+                pane.setStyle(cellElement.getStyle());
+                add(pane);
+
+                cellElementGrid[r][c] = cellElement;
+                borderSourceFlags[r][c] = flags;
+                cellStylePreviewPaneGrid[r][c] = pane;
+            }
+        }
+    }
+
+    public void setPlainText(String text) {
+        cellStylePreviewPaneGrid[0][1].setPaintText(text);
+        cellStylePreviewPaneGrid[1][1].setPaintText(text);
+        repaint();
+    }
+
+    public void setStyle(Style style, CellBorderStyle borderStyle) {
+        for (int i = 0; i < ROW_COUNT; i++) {
+            for (int j = 0; j < COLUMN_COUNT; j++) {
+                CellStylePreviewPane pane = cellStylePreviewPaneGrid[i][j];
+                TemplateCellElement cellElement = cellElementGrid[i][j];
+                int flag = borderSourceFlags[i][j];
+                cellElement.setStyle(CellBorderSourceFlag.deriveBorderedStyle(style, borderStyle, flag));
+
+                pane.setStyle(cellElement.getStyle());
+            }
+        }
+        repaint();
+    }
+
+    @Override
+    public void setPreferredSize(Dimension preferredSize) {
+        super.setPreferredSize(preferredSize);
+        int hw = preferredSize.width / 2;
+        int hh = preferredSize.height / 2;
+        cellStylePreviewPaneGrid[0][0].setPreferredSize(new Dimension(hw, hh));
+        cellStylePreviewPaneGrid[0][1].setPreferredSize(new Dimension(hw, hh));
+        cellStylePreviewPaneGrid[1][0].setPreferredSize(new Dimension(hw, hh));
+        cellStylePreviewPaneGrid[1][1].setPreferredSize(new Dimension(hw, hh));
+    }
+
+    @Override
+    public Dimension getPreferredSize() {
+        Dimension d00 = cellStylePreviewPaneGrid[0][0].getPreferredSize();
+        Dimension d01 = cellStylePreviewPaneGrid[0][1].getPreferredSize();
+        Dimension d10 = cellStylePreviewPaneGrid[1][0].getPreferredSize();
+        Dimension d11 = cellStylePreviewPaneGrid[1][1].getPreferredSize();
+
+        int width = Math.max(d00.width + d01.width, d10.width + d11.width);
+        int height = Math.max(d00.height + d10.height, d01.height + d11.height);
+
+        return new Dimension(width, height);
+    }
+
+    @Override
+    public void paint(Graphics g) {
+        Graphics2D g2d = (Graphics2D) g;
+        g2d.clearRect(0, 0, getWidth(), getHeight());
+
+        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+        g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
+
+        paintTransparentBackground((Graphics2D) g, cellElementGrid[0][0].getStyle());
+
+        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
+        g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_OFF);
+
+        super.paint(g);
+    }
+
+    @Override
+    public Rectangle getBounds() {
+        return super.getBounds();
+    }
+
+    private void paintTransparentBackground(Graphics2D g2d, Style style) {
+        float alpha = computeTransparentBackgroundAlpha(style);
+
+        float scaleWidth = 1.0F * getWidth() / transparentBackgroundWidth;
+        float scaleHeight = 1.0F * getHeight() / transparentBackgroundHeight;
+        float maxScale = Math.max(scaleWidth, scaleHeight);
+
+        if (maxScale <= 1) {
+            scaleWidth = scaleHeight = 1;
+        } else {
+            scaleHeight = scaleWidth = maxScale;
+        }
+
+        Composite oldComposite = g2d.getComposite();
+        g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_ATOP, alpha));
+        g2d.drawImage(transparentBackgroundImage, 0, 0, (int) (transparentBackgroundWidth * scaleWidth), (int) (transparentBackgroundHeight * scaleHeight), null);
+        g2d.setComposite(oldComposite);
+    }
+
+    private float computeTextColorBrightness(Style style) {
+        Color fontColor = style.getFRFont().getForeground();
+        return fontColor.getRed() * 0.299F + fontColor.getGreen() * 0.587F + fontColor.getBlue() * 0.114F;
+    }
+
+    private float computeTransparentBackgroundAlpha(Style style) {
+        float textBrightness = computeTextColorBrightness(style);
+
+        float alpha = 1.0F;
+        if (textBrightness < 50) {
+            alpha = 0.2F;
+        } else if (textBrightness < 160){
+            alpha = 0.5F;
+        }
+        return alpha;
+    }
+}

designer-base/src/main/java/com/fr/design/cell/CellStylePreviewPane.java

@@ -1,19 +1,27 @@
 package com.fr.design.cell;
 
+import com.fr.base.BaseUtils;
+import com.fr.base.GraphHelper;
 import com.fr.base.NameStyle;
 import com.fr.base.ScreenResolution;
 import com.fr.base.Style;
+import com.fr.general.FRFont;
 import com.fr.general.IOUtils;
+import com.fr.stable.Constants;
+import com.fr.stable.unit.PT;
 
 import javax.swing.JPanel;
 import java.awt.AlphaComposite;
 import java.awt.Color;
 import java.awt.Composite;
 import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.RenderingHints;
 import java.awt.image.BufferedImage;
+import java.util.List;
 
 /**
  * @author Starryi
@@ -22,33 +30,61 @@ import java.awt.image.BufferedImage;
  */
 public class CellStylePreviewPane extends JPanel {
 
+    public static final int MINIMUM_HEIGHT = 40;
     private static final BufferedImage transparentBackgroundImage = IOUtils.readImage("/com/fr/design/images/transparent_background.png");
     private final float transparentBackgroundWidth;
     private final float transparentBackgroundHeight;
     private String paintText = "Report";
     private Style style = Style.DEFAULT_STYLE;
 
-    public CellStylePreviewPane() {
+    private final int column;
+    private final int row;
+    private final int columnSpan;
+    private final int rowSpan;
+
+    private final boolean autoClearCanvas;
+    private final boolean paintingMosaic;
+
+    public CellStylePreviewPane(int column, int row, int columnSpan, int rowSpan, boolean autoClearCanvas, boolean paintingMosaic) {
+        this.column = column;
+        this.row = row;
+        this.columnSpan = columnSpan;
+        this.rowSpan = rowSpan;
+        this.autoClearCanvas  = autoClearCanvas;
+        this.paintingMosaic = paintingMosaic;
         transparentBackgroundWidth = transparentBackgroundImage.getWidth(null);
         transparentBackgroundHeight = transparentBackgroundImage.getHeight(null);
+        setPreferredSize(new Dimension(0, 0));
+    }
+
+    public void setPaintText(String paintText) {
+        this.paintText = paintText;
+        repaint();
     }
 
     public void setStyle(Style style) {
         this.style = style;
-        if (style instanceof NameStyle) {
-            paintText = ((NameStyle) style).getName();
-        }
         repaint();
     }
 
+    public void setStyle(NameStyle style) {
+        paintText = style.getName();
+        setStyle(style.getRealStyle());
+    }
+
     @Override
     public void paint(Graphics g) {
         Graphics2D g2d = (Graphics2D) g;
-        g.clearRect(0, 0, getWidth(), getHeight());
+        if (autoClearCanvas) {
+            g2d.clearRect(0, 0, getWidth(), getHeight());
+        }
         g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
         g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
 
-        paintTransparentBackground(g2d, style);
+        if (paintingMosaic) {
+            paintTransparentBackground(g2d, style);
+        }
+
         paintCellStyle(g2d, style);
 
         g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
@@ -107,11 +143,78 @@ public class CellStylePreviewPane extends JPanel {
 
         Style.paintContent(g2d, paintText, style, width, height, resolution);
 
-        Style.paintBorder(g2d, style, width, height);
+        paintCellBorder(g2d, style);
+    }
+
+    protected void paintCellBorder(Graphics2D g2d, Style style) {
+        float adjustLeft = 0;
+        float adjustTop = 0;
+        float adjustRight = 0;
+        float adjustBottom = 0;
+        if (column == 0) {
+            adjustLeft = computeHalfSize4StyledBorder(style.getBorderLeft());
+        }
+        if (row == 0) {
+            adjustTop = computeHalfSize4StyledBorder(style.getBorderTop());
+        }
+        if (column == columnSpan - 1) {
+            adjustRight = -computeHalfSize4StyledBorder(style.getBorderRight());
+        }
+        if (row == rowSpan - 1) {
+            adjustBottom = -computeHalfSize4StyledBorder(style.getBorderBottom());
+        }
+
+        g2d.translate(adjustLeft, adjustTop);
+        Style.paintBorder(g2d, style, getWidth() - adjustLeft + adjustRight, getHeight() - adjustTop + adjustBottom);
+        g2d.translate(-adjustLeft, -adjustTop);
+    }
+
+    private float computeHalfSize4StyledBorder(int border) {
+        float size = GraphHelper.getLineStyleSize(border) / 2.0F;
+
+        if (border == Constants.LINE_DOUBLE) {
+            size += GraphHelper.getLineStyleSize(Constants.LINE_THIN) / 2.0F;
+        } else if (border == Constants.LINE_DOUBLE_DOT) {
+            size += GraphHelper.getLineStyleSize(Constants.LINE_DOT) / 2.0F;
+        }
+
+        return size;
     }
 
     @Override
-    public Dimension getMinimumSize() {
-        return getPreferredSize();
+    public Dimension getPreferredSize() {
+        Dimension size = super.getPreferredSize();
+        int width = size.width;
+        int height = size.height;
+
+        if (height != 0) {
+            // 使用者设置了一个高度
+            return size;
+        } else if (width == 0) {
+            // 使用者未设置任何尺寸
+            return new Dimension(width, MINIMUM_HEIGHT);
+        } else {
+            // 使用者设置了宽度，但未设置高度
+            return getAutoWrapContentPreferredSize(width, height);
+        }
+    }
+
+    private Dimension getAutoWrapContentPreferredSize(int width, int height) {
+        int resolution = ScreenResolution.getScreenResolution();
+
+        // 计算文本区域高度
+        final FRFont frFont = style.getFRFont();
+        final Font rfont = frFont.applyResolutionNP(resolution);
+        final FontMetrics metrics = GraphHelper.getFontMetrics(rfont);
+        final int textLineHeight = metrics.getHeight();
+        final double textLineSpacing = PT.pt2pix(style.getLineSpacing(), resolution);
+
+        List<?> textLineList = BaseUtils.getLineTextList(paintText, style, rfont, height, width, resolution);
+
+        double textLinesHeight = textLineList.size() * textLineHeight + Math.max(0, textLineList.size() - 1) * textLineSpacing;
+
+        height = (int) Math.max(MINIMUM_HEIGHT, textLinesHeight);
+
+        return new Dimension(width, height);
     }
 }

designer-base/src/main/java/com/fr/design/config/DesignerProperties.java

@@ -0,0 +1,52 @@
+package com.fr.design.config;
+
+import com.fr.general.IOUtils;
+import com.fr.log.FineLoggerFactory;
+import com.fr.stable.StableUtils;
+import com.fr.stable.StringUtils;
+
+import java.io.BufferedInputStream;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.util.Properties;
+
+public class DesignerProperties {
+    private static DesignerProperties holder = null;
+    private boolean supportLoginEntry = true;
+
+    public DesignerProperties() {
+        String filePath = StableUtils.pathJoin(StableUtils.getInstallHome(),  "/config/config.properties");
+        InputStream is = null;
+        try {
+            is = new BufferedInputStream(new FileInputStream(filePath));
+            Properties ps = new Properties();
+            ps.load(is);
+            this.initProperties(ps);
+        } catch (FileNotFoundException e) {
+            // ignore
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e, e.getMessage());
+        } finally {
+            IOUtils.close(is);
+        }
+    }
+
+    public static DesignerProperties getInstance() {
+        if (holder == null) {
+            holder = new DesignerProperties();
+        }
+        return holder;
+    }
+
+    private void initProperties(Properties ps) {
+        String supportLoginEntry = ps.getProperty("supportLoginEntry");
+        if (StringUtils.isNotEmpty(supportLoginEntry)) {
+            this.supportLoginEntry = Boolean.valueOf(supportLoginEntry);
+        }
+    }
+
+    public boolean isSupportLoginEntry() {
+        return supportLoginEntry;
+    }
+}

designer-base/src/main/java/com/fr/design/constants/TableDataConstants.java

@@ -0,0 +1,5 @@
+package com.fr.design.constants;
+
+public class TableDataConstants {
+    public static final String SEPARATOR = "_";
+}

designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java

@@ -36,8 +36,6 @@ import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 import com.fr.workspace.WorkContext;
 
-import java.util.HashSet;
-import java.util.Set;
 import javax.swing.AbstractButton;
 import javax.swing.Action;
 import javax.swing.DefaultCellEditor;
@@ -55,8 +53,10 @@ import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import java.util.EventObject;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 
 /**
  * Coder: zack
@@ -83,6 +83,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
     protected String[] allDSNames;
     protected ConnectionTableAction connectionTableAction;
     protected ToolBarDef toolbarDef;
+    protected TableDataTreePaneListener listener = null;
 
 
     private String type = "";
@@ -142,6 +143,17 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
 
     public abstract void dgEdit(final AbstractTableDataPane<?> uPanel, String originalName, boolean isUpdate);
 
+    public void showEditPane(final AbstractTableDataPane<?> tableDataPane, String originalName, TableDataTreePaneListener listener) {
+        this.listener = listener;
+        dgEdit(tableDataPane, originalName);
+    }
+
+    public interface TableDataTreePaneListener {
+        void doOk();
+
+        void doCancel();
+    }
+
     protected void doPropertyChange(BasicDialog dg, BasicPane.NamePane nPanel, final String oldName) {
         type = dg.getTitle();
         nPanel.setShowText(StringUtils.BLANK);

designer-base/src/main/java/com/fr/design/data/BasicTableDataUtils.java

@@ -1,6 +1,7 @@
 package com.fr.design.data;
 
 import com.fr.data.TableDataSource;
+import com.fr.design.constants.TableDataConstants;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.i18n.Toolkit;
 import com.fr.stable.StringUtils;
@@ -11,8 +12,6 @@ import com.fr.stable.StringUtils;
  * Created by hades on 2020/4/27
  */
 public abstract class BasicTableDataUtils {
-    private static final String SEPARATOR = "_";
-
     private static final int LEN = 2;
 
 
@@ -38,10 +37,10 @@ public abstract class BasicTableDataUtils {
 
     public static String getTableDataName(boolean isCover, TableDataSource tds, String tdName, String srcName, boolean isDsNameRepeaded) {
         if (isCover) {
-            return srcName + SEPARATOR + tdName;
+            return srcName + TableDataConstants.SEPARATOR + tdName;
         }
         if (tds.getTableData(tdName) != null || isDsNameRepeaded) {//如果有同名的就拼上来源名称
-            tdName = srcName + SEPARATOR + tdName;
+            tdName = srcName + TableDataConstants.SEPARATOR  + tdName;
         }
         int i = 0;
         while (tds.getTableData(tdName) != null) {

designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java

@@ -1,12 +1,12 @@
 package com.fr.design.data.datapane;
 
 import com.fr.base.TableData;
-import com.fr.concurrent.NamedThreadFactory;
 import com.fr.data.core.DataCoreUtils;
 import com.fr.data.core.db.DBUtils;
 import com.fr.data.core.db.TableProcedure;
 import com.fr.data.core.db.dialect.Dialect;
 import com.fr.data.core.db.dialect.DialectFactory;
+import com.fr.data.impl.Connection;
 import com.fr.data.impl.DBTableData;
 import com.fr.data.operator.DataOperator;
 import com.fr.design.DesignerEnvManager;
@@ -19,7 +19,7 @@ import com.fr.design.data.datapane.preview.PreviewTablePane;
 import com.fr.design.data.tabledata.Prepare4DataSourceChange;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.icombobox.FilterableComboBoxModel;
-import com.fr.design.gui.icombobox.SearchPreTaskTreeComboBox;
+import com.fr.design.gui.icombobox.TableSearchTreeComboBox;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.icombobox.UIComboBoxEditor;
 import com.fr.design.gui.icombobox.UIComboBoxRenderer;
@@ -40,11 +40,6 @@ import com.fr.stable.StringUtils;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.server.connection.DBConnectAuth;
 
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.util.Collections;
-import java.util.concurrent.CancellationException;
 import javax.swing.JList;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -58,21 +53,20 @@ import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeCellRenderer;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeCellRenderer;
-import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
 import java.awt.event.FocusAdapter;
 import java.awt.event.FocusEvent;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Enumeration;
+import java.util.Collections;
 import java.util.List;
 import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.FutureTask;
+import java.util.concurrent.CancellationException;
 
 /**
  * @author zhou
@@ -97,41 +91,12 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
     /**
      * 表名
      */
-    protected SearchPreTaskTreeComboBox tableNameComboBox;
-
-    private static final ExecutorService SERVICE = Executors.newSingleThreadExecutor(new NamedThreadFactory("ChoosePane"));
+    protected TableSearchTreeComboBox tableNameComboBox;
 
     private SwingWorker populateWorker;
 
     private SwingWorker<List<String>, Void> initWorker;
 
-    private PopupMenuListener popupMenuListener = new PopupMenuListener() {
-
-        @Override
-        public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
-            FutureTask<Void> task = new FutureTask<Void>(new Callable<Void>() {
-                @Override
-                public Void call() throws Exception {
-                    calculateTableDataNames();
-                    return null;
-                }
-            });
-            tableNameComboBox.setPreSearchTask(task);
-            SERVICE.submit(task);
-        }
-
-        @Override
-        public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
-            // Do nothing
-        }
-
-        @Override
-        public void popupMenuCanceled(PopupMenuEvent e) {
-            // Do nothing
-        }
-    };
-
-
     private PopupMenuListener listener = new PopupMenuListener() {
         @Override
         public void popupMenuCanceled(PopupMenuEvent e) {
@@ -181,7 +146,7 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
         schemaBox = new StringUIComboBox();
         schemaBox.setEditor(new ComboBoxEditor());
 
-        tableNameComboBox = new SearchPreTaskTreeComboBox(new JTree(new DefaultMutableTreeNode()), tableNameTreeRenderer, false);
+        tableNameComboBox = new TableSearchTreeComboBox(this, new JTree(new DefaultMutableTreeNode()), tableNameTreeRenderer);
         tableNameComboBox.setEditable(true);
         tableNameComboBox.setRenderer(listCellRenderer);
         registerDSChangeListener();
@@ -198,7 +163,6 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
         });
         schemaBox.addPopupMenuListener(listener);
         addFocusListener();
-        this.tableNameComboBox.addPopupMenuListener(popupMenuListener);
     }
 
     protected void addDSBoxListener() {
@@ -355,7 +319,7 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
         GUICoreUtils.setSelectedItemQuietly(tableNameComboBox, -1);
     }
 
-    protected com.fr.data.impl.Connection getConnection() {
+    public Connection getConnection() {
         String selectedDSName = this.getDSName();
         if (StringUtils.isEmpty(selectedDSName)) {
             return null; // peter:选中了当前的零长度的节点,直接返回.
@@ -455,56 +419,6 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
         return "choosepane";
     }
 
-    protected void calculateTableDataNames() {
-        JTree tree = tableNameComboBox.getTree();
-        if (tree == null) {
-            return;
-        }
-        DefaultMutableTreeNode rootTreeNode = (DefaultMutableTreeNode) tree.getModel().getRoot();
-        rootTreeNode.removeAllChildren();
-
-        String selectedDSName = this.getDSName();
-        com.fr.data.impl.Connection selectedDatabase = this.getConnection();
-        if (selectedDatabase == null) {
-            return;
-        }
-        try {
-            String schema = StringUtils.isEmpty(this.schemaBox.getSelectedItem()) ? null : this.schemaBox.getSelectedItem();
-            TableProcedure[] sqlTableArray = DataCoreUtils.getTables(selectedDatabase, TableProcedure.TABLE, schema, DesignerEnvManager.getEnvManager().isOracleSystemSpace());
-            if (sqlTableArray.length > 0) {
-                ExpandMutableTreeNode tableTreeNode = new ExpandMutableTreeNode(selectedDSName + "-" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_SQL_Table"));
-                rootTreeNode.add(tableTreeNode);
-                for (int i = 0; i < sqlTableArray.length; i++) {
-                    ExpandMutableTreeNode tableChildTreeNode = new ExpandMutableTreeNode(sqlTableArray[i]);
-                    tableTreeNode.add(tableChildTreeNode);
-                }
-            }
-            TableProcedure[] sqlViewArray = DataCoreUtils.getTables(selectedDatabase, TableProcedure.VIEW, schema, DesignerEnvManager.getEnvManager().isOracleSystemSpace());
-            if (sqlViewArray.length > 0) {
-                ExpandMutableTreeNode viewTreeNode = new ExpandMutableTreeNode(selectedDSName + "-" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_SQL_View"));
-                rootTreeNode.add(viewTreeNode);
-                for (int i = 0; i < sqlViewArray.length; i++) {
-                    ExpandMutableTreeNode viewChildTreeNode = new ExpandMutableTreeNode(sqlViewArray[i]);
-                    viewTreeNode.add(viewChildTreeNode);
-                }
-            }
-            ((DefaultTreeModel) tree.getModel()).reload();
-            // daniel 展开所有tree
-            TreeNode root = (TreeNode) tree.getModel().getRoot();
-            TreePath parent = new TreePath(root);
-            TreeNode node = (TreeNode) parent.getLastPathComponent();
-            for (Enumeration e = node.children(); e.hasMoreElements(); ) {
-                TreeNode n = (TreeNode) e.nextElement();
-                TreePath path = parent.pathByAddingChild(n);
-                tree.expandPath(path);
-            }
-        } catch (Exception e) {
-            FineLoggerFactory.getLogger().error(e.getMessage(), e);
-            FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"),
-                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Failed"), JOptionPane.ERROR_MESSAGE);
-        }
-    }
-
     /**
      * 创建选中的数据集数据
      *
@@ -558,22 +472,23 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
         return tableData;
     }
 
-    protected String getDSName() {
+    public String getDSName() {
         return this.dsNameComboBox.getSelectedItem();
     }
 
+    public String getSchema() {
+        return this.schemaBox.getSelectedItem();
+    }
+
     protected void failedToFindTable() {
         // Do nothing
     }
 
     protected String getTableName() {
         String tableName = "";
-        Object obj = this.tableNameComboBox.getSelectedItemObject();
+        Object obj = this.tableNameComboBox.getSelectedItem();
         if (obj == null) {
-            obj = this.tableNameComboBox.getSelectedItem();
-            if (obj == null) {
-                obj = this.tableNameComboBox.getEditor().getItem();
-            }
+            obj = this.tableNameComboBox.getEditor().getItem();
         }
         if (obj instanceof TreePath) {
             Object tp = ((ExpandMutableTreeNode) ((TreePath) obj).getLastPathComponent()).getUserObject();

designer-base/src/main/java/com/fr/design/data/datapane/ChoosePaneSupportFormula.java

@@ -83,7 +83,7 @@ public class ChoosePaneSupportFormula extends ChoosePane {
      *
      * @return
      */
-    protected String getDSName() {
+    public String getDSName() {
         String selectedDSName = null;
         String item = Utils.objectToString(this.dsNameComboBox.getEditor().getItem());
         // 没有选中的列表项 那么看看是不是手输值

designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java

@@ -361,11 +361,18 @@ public class TableDataTreePane extends BasicTableDataTreePane {
 
                 //单独编辑数据集关闭，修改缓存配置状态，刷新下一键开启/关闭按钮
                 checkButtonEnabled();
+
+                if (listener != null) {
+                    listener.doOk();
+                }
             }
 
             @Override
             public void doCancel() {
                 super.doCancel();
+                if (listener != null) {
+                    listener.doCancel();
+                }
             }
         });
         tdNamePanel.addPropertyChangeListener(new PropertyChangeAdapter() {

designer-base/src/main/java/com/fr/design/data/datapane/connect/AdvancePane.java

@@ -0,0 +1,147 @@
+package com.fr.design.data.datapane.connect;
+
+import com.fr.data.impl.JDBCDatabaseConnection;
+import com.fr.data.pool.DBCPConnectionPoolAttr;
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.editor.editor.IntegerEditor;
+import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.itextfield.UITextField;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.stable.StringUtils;
+
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+
+/**
+ * @author xiqiu
+ * @date 2021/11/22
+ * @description
+ */
+public class AdvancePane extends BasicPane {
+    private IntegerEditor DBCP_MAX_ACTIVE = new IntegerEditor();
+    private UIComboBox DBCP_TESTONBORROW = new UIComboBox(new String[]{Toolkit.i18nText("Fine-Design_Basic_No"), Toolkit.i18nText("Fine-Design_Basic_Yes")});
+    private IntegerEditor DBCP_MAX_WAIT = new IntegerEditor();
+    private SpecialUITextField DBCP_VALIDATION_QUERY = new SpecialUITextField();
+
+
+    public AdvancePane() {
+
+        DBCP_VALIDATION_QUERY.addFocusListener(new JTextFieldHintListener(DBCP_VALIDATION_QUERY));
+        ;
+        double p = TableLayout.PREFERRED;
+        DBCP_VALIDATION_QUERY.setColumns(15);
+        double[] rowSizeDbcp = {p, p, p, p};
+        double[] columnDbcp = {p, p};
+        Component[][] comps = {
+                {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Max_Active") + ":", SwingConstants.RIGHT), DBCP_MAX_ACTIVE},
+                {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Validation_Query") + ":", SwingConstants.RIGHT), DBCP_VALIDATION_QUERY},
+                {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_On_Borrow") + ":", SwingConstants.RIGHT), DBCP_TESTONBORROW},
+                {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Max_Wait_Time") + ":", SwingConstants.RIGHT), DBCP_MAX_WAIT}
+        };
+
+        JPanel contextPane = TableLayoutHelper.createGapTableLayoutPane(comps, rowSizeDbcp, columnDbcp, 11, 11);
+        this.add(contextPane);
+        this.setPreferredSize(new Dimension(630, 120));
+        this.setLayout(FRGUIPaneFactory.createLeftZeroVgapNormalHgapLayout());
+    }
+
+
+    public void populate(JDBCDatabaseConnection jdbcDatabase) {
+        DBCPConnectionPoolAttr dbcpAttr = jdbcDatabase.getDbcpAttr();
+        if (dbcpAttr == null) {
+            dbcpAttr = new DBCPConnectionPoolAttr();
+            jdbcDatabase.setDbcpAttr(dbcpAttr);
+        }
+        this.DBCP_MAX_ACTIVE.setValue(dbcpAttr.getMaxActive());
+        this.DBCP_MAX_WAIT.setValue(dbcpAttr.getMaxWait());
+        this.DBCP_VALIDATION_QUERY.setText(dbcpAttr.getValidationQuery());
+        this.DBCP_TESTONBORROW.setSelectedIndex(dbcpAttr.isTestOnBorrow() ? 1 : 0);
+
+    }
+
+    public void update(JDBCDatabaseConnection jdbcDatabase) {
+        DBCPConnectionPoolAttr dbcpAttr = jdbcDatabase.getDbcpAttr();
+        if (dbcpAttr == null) {
+            dbcpAttr = new DBCPConnectionPoolAttr();
+            jdbcDatabase.setDbcpAttr(dbcpAttr);
+        }
+        dbcpAttr.setMaxActive(this.DBCP_MAX_ACTIVE.getValue().intValue());
+        dbcpAttr.setMaxWait(this.DBCP_MAX_WAIT.getValue().intValue());
+        dbcpAttr.setValidationQuery(this.DBCP_VALIDATION_QUERY.getText());
+        dbcpAttr.setTestOnBorrow(this.DBCP_TESTONBORROW.getSelectedIndex() == 0 ? false : true);
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return Toolkit.i18nText("Fine-Design_Basic_Advanced_Setup");
+    }
+
+
+    private class JTextFieldHintListener implements FocusListener {
+        private SpecialUITextField textField;
+
+        public JTextFieldHintListener(SpecialUITextField jTextField) {
+            this.textField = jTextField;
+        }
+
+        @Override
+        public void focusGained(FocusEvent e) {
+            //获取焦点时，清空提示内容
+            String temp = textField.getText();
+            textField.setForeground(Color.BLACK);
+            textField.setTextOrigin(temp);
+
+        }
+
+        @Override
+        public void focusLost(FocusEvent e) {
+            //失去焦点时，没有输入内容，显示提示内容
+            String temp = textField.getTextOrigin();
+            textField.setText(temp);
+        }
+    }
+
+    private class SpecialUITextField extends UITextField {
+
+        @Override
+        public String getText() {
+            String text = super.getText();
+            if (isUseless(text)) {
+                return StringUtils.EMPTY;
+            }
+            return text;
+        }
+
+        @Override
+        public void setText(String text) {
+            if (isUseless(text)) {
+                this.setForeground(Color.GRAY);
+                super.setText(Toolkit.i18nText("Fine-Design_Dbcp_Default_Query"));
+            } else {
+                this.setForeground(Color.BLACK);
+                super.setText(text);
+            }
+        }
+
+        public String getTextOrigin() {
+            return super.getText();
+        }
+
+        public void setTextOrigin(String text) {
+            super.setText(text);
+        }
+
+        private boolean isUseless(String text) {
+            return text == null || text.isEmpty() || Toolkit.i18nText("Fine-Design_Dbcp_Default_Query").equals(text);
+        }
+    }
+}

designer-base/src/main/java/com/fr/design/data/datapane/connect/DBCPAttrPane.java

@@ -20,6 +20,7 @@ import javax.swing.JPanel;
 import javax.swing.JTextField;
 import javax.swing.SwingConstants;
 import java.awt.BorderLayout;
+import java.awt.Color;
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.Window;
@@ -45,13 +46,8 @@ public class DBCPAttrPane extends BasicPane {
     private static final int EMPTY_FETCHSIZE = -2;
     // carl:DBCP的一些属性
     private IntegerEditor DBCP_INITIAL_SIZE = new IntegerEditor();
-    private IntegerEditor DBCP_MAX_ACTIVE = new IntegerEditor();
-    private IntegerEditor DBCP_MAX_IDLE = new IntegerEditor();
     private IntegerEditor DBCP_MIN_IDLE = new IntegerEditor();
-    private IntegerEditor DBCP_MAX_WAIT = new IntegerEditor();
-    private UITextField DBCP_VALIDATION_QUERY = new UITextField();
 
-    private UIComboBox DBCP_TESTONBORROW = new UIComboBox(new String[]{Toolkit.i18nText("Fine-Design_Basic_No"), Toolkit.i18nText("Fine-Design_Basic_Yes")});
     private UIComboBox DBCP_TESTONRETURN = new UIComboBox(new String[]{Toolkit.i18nText("Fine-Design_Basic_No"), Toolkit.i18nText("Fine-Design_Basic_Yes")});
     private UIComboBox DBCP_TESTWHILEIDLE = new UIComboBox(new String[]{Toolkit.i18nText("Fine-Design_Basic_No"), Toolkit.i18nText("Fine-Design_Basic_Yes")});
 
@@ -75,25 +71,19 @@ public class DBCPAttrPane extends BasicPane {
         defaultPane = this;
 
         // JPanel northFlowPane
-        northFlowPane = FRGUIPaneFactory.createTitledBorderPane(Toolkit.i18nText("Fine-Design_Basic_ConnectionPool_Attr"));
-        northFlowPane.setPreferredSize(new Dimension(630, 320));
+        northFlowPane = FRGUIPaneFactory.createTopVerticalTitledBorderPane(Toolkit.i18nText("Fine-Design_Basic_ConnectionPool_Attr"));
+        northFlowPane.setPreferredSize(new Dimension(630, 330));
         defaultPane.add(northFlowPane, BorderLayout.NORTH);
 
-        DBCP_VALIDATION_QUERY.setColumns(15);
         // ContextPane
 
         double f = TableLayout.FILL;
         // double p = TableLayout.PREFERRED;
-        double[] rowSize = {f, f, f, f, f, f, f, f, f, f, f, f};
+        double[] rowSize = {f, f, f, f, f, f, f};
         double[] columnSize = {f, f};
         Component[][] comps = {
                 {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Initial_Size") + ":", SwingConstants.RIGHT), DBCP_INITIAL_SIZE},
-                {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Max_Active") + ":", SwingConstants.RIGHT), DBCP_MAX_ACTIVE},
-                {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Max_Idle") + ":", SwingConstants.RIGHT), DBCP_MAX_IDLE},
                 {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Min_Idle") + ":", SwingConstants.RIGHT), DBCP_MIN_IDLE},
-                {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Max_Wait_Time") + ":", SwingConstants.RIGHT), DBCP_MAX_WAIT},
-                {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Validation_Query") + ":", SwingConstants.RIGHT), DBCP_VALIDATION_QUERY},
-                {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_On_Borrow") + ":", SwingConstants.RIGHT), DBCP_TESTONBORROW},
                 {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_On_Return") + ":", SwingConstants.RIGHT), DBCP_TESTONRETURN},
                 {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_While_Idle") + ":", SwingConstants.RIGHT), DBCP_TESTWHILEIDLE},
                 {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Evictionruns_millis") + ":", SwingConstants.RIGHT),
@@ -102,8 +92,13 @@ public class DBCPAttrPane extends BasicPane {
                 {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Mix_Evictable_Idle_Time_Millis") + ":", SwingConstants.RIGHT),
                         DBCP_MINEVICTABLEIDLETIMEMILLIS}};
 
-        JPanel contextPane = TableLayoutHelper.createGapTableLayoutPane(comps, rowSize, columnSize, 10, 4);
+        JPanel contextPane = TableLayoutHelper.createGapTableLayoutPane(comps, rowSize, columnSize, 10, 10);
         northFlowPane.add(contextPane);
+        JPanel boxFlowInnerContainer = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(0, 5, 5);
+        UILabel uiLabel = new UILabel(Toolkit.i18nText("Fine-Design_Dbcp_Warning"));
+        uiLabel.setForeground(Color.RED);
+        boxFlowInnerContainer.add(uiLabel);
+        northFlowPane.add(boxFlowInnerContainer);
     }
 
     public void populate(JDBCDatabaseConnection jdbcDatabase) {
@@ -113,12 +108,7 @@ public class DBCPAttrPane extends BasicPane {
             jdbcDatabase.setDbcpAttr(dbcpAttr);
         }
         this.DBCP_INITIAL_SIZE.setValue(dbcpAttr.getInitialSize());
-        this.DBCP_MAX_ACTIVE.setValue(dbcpAttr.getMaxActive());
-        this.DBCP_MAX_IDLE.setValue(dbcpAttr.getMaxIdle());
-        this.DBCP_MAX_WAIT.setValue(dbcpAttr.getMaxWait());
         this.DBCP_MIN_IDLE.setValue(dbcpAttr.getMinIdle());
-        this.DBCP_VALIDATION_QUERY.setText(dbcpAttr.getValidationQuery());
-        this.DBCP_TESTONBORROW.setSelectedIndex(dbcpAttr.isTestOnBorrow() ? 1 : 0);
         this.DBCP_TESTONRETURN.setSelectedIndex(dbcpAttr.isTestOnReturn() ? 1 : 0);
         this.DBCP_TESTWHILEIDLE.setSelectedIndex(dbcpAttr.isTestWhileIdle() ? 1 : 0);
         this.DBCP_MINEVICTABLEIDLETIMEMILLIS.setValue(dbcpAttr.getMinEvictableIdleTimeMillis() / TIME_MULTIPLE);
@@ -141,12 +131,7 @@ public class DBCPAttrPane extends BasicPane {
             jdbcDatabase.setDbcpAttr(dbcpAttr);
         }
         dbcpAttr.setInitialSize(this.DBCP_INITIAL_SIZE.getValue().intValue());
-        dbcpAttr.setMaxActive(this.DBCP_MAX_ACTIVE.getValue().intValue());
-        dbcpAttr.setMaxIdle(this.DBCP_MAX_IDLE.getValue().intValue());
-        dbcpAttr.setMaxWait(this.DBCP_MAX_WAIT.getValue().intValue());
         dbcpAttr.setMinIdle(this.DBCP_MIN_IDLE.getValue().intValue());
-        dbcpAttr.setValidationQuery(this.DBCP_VALIDATION_QUERY.getText());
-        dbcpAttr.setTestOnBorrow(this.DBCP_TESTONBORROW.getSelectedIndex() == 0 ? false : true);
         dbcpAttr.setTestOnReturn(this.DBCP_TESTONRETURN.getSelectedIndex() == 0 ? false : true);
         dbcpAttr.setTestWhileIdle(this.DBCP_TESTWHILEIDLE.getSelectedIndex() == 0 ? false : true);
         dbcpAttr.setMinEvictableIdleTimeMillis(((Number) this.DBCP_MINEVICTABLEIDLETIMEMILLIS.getValue()).intValue() * TIME_MULTIPLE);

designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java

@@ -14,11 +14,11 @@ import com.fr.data.solution.processor.SolutionProcessor;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilable.ActionLabel;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.scrollruler.ModLineBorder;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.rpc.ExceptionHandler;
@@ -34,6 +34,7 @@ import javax.swing.JDialog;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
+import javax.swing.ScrollPaneConstants;
 import javax.swing.SwingUtilities;
 import javax.swing.SwingWorker;
 import javax.swing.UIManager;
@@ -60,6 +61,8 @@ import java.util.concurrent.ExecutionException;
  * Database Connection pane.
  */
 public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connection> extends BasicBeanPane<com.fr.data.impl.Connection> {
+    private static int MAX_MAIN_PANEL_HEIGHT = 430;
+    private static int MAX_MAIN_PANEL_WIDTH = 675;
 
     private UILabel message;
     private UIButton okButton;
@@ -305,6 +308,10 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
 
     protected abstract E updateSubDatabaseConnectionBean();
 
+    protected JPanel getAdvancePane() {
+        throw new UnsupportedOperationException();
+    }
+
     protected void initComponents() {
         message = new UILabel();
         uiLabel = new UILabel();
@@ -330,15 +337,14 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
 
         // Center
         mainPanel = mainPanel();
-        northPane.add(mainPanel, BorderLayout.CENTER);
-        JPanel advancedPanel = FRGUIPaneFactory.createBorderLayout_L_Pane();
-        advancedPanel.setBorder(BorderFactory.createTitledBorder(
-                new ModLineBorder(ModLineBorder.TOP),
-                Toolkit.i18nText("Fine-Design_Basic_Advanced")
-        ));
+        JPanel advancedPanel = FRGUIPaneFactory.createTopVerticalTitledBorderPane(Toolkit.i18nText("Fine-Design_Basic_Advanced"));
         if (mainPanel instanceof JDBCDefPane) {
-            ActionLabel actionLabel = new ActionLabel(Toolkit.i18nText("Fine-Design_Basic_Advanced_Setup"));
+            mainPanel.setPreferredSize(new Dimension(MAX_MAIN_PANEL_WIDTH, 280));
+            advancedPanel.setPreferredSize(new Dimension(MAX_MAIN_PANEL_WIDTH, 210));
+            northPane.add(mainPanel, BorderLayout.CENTER);
+            ActionLabel actionLabel = new ActionLabel(Toolkit.i18nText("Fine-Design_Advanced_More_Settings"));
             actionLabel.addActionListener(new ActionListener() {
+                @Override
                 public void actionPerformed(ActionEvent evt) {
                     JDialog wDialog = createJDialog();
                     if (wDialog != null) {
@@ -349,10 +355,24 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
             JPanel actionLabelPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
             actionLabelPanel.setBorder(BorderFactory.createEmptyBorder(2, 4, 4, 20));
             actionLabelPanel.add(actionLabel, BorderLayout.WEST);
+            JPanel advancePane = getAdvancePane();
+            if (advancePane != null) {
+                advancedPanel.add(advancePane);
+            }
             advancedPanel.add(actionLabelPanel);
 
         } else {
             //非jdbc配置布局保持不变
+            advancedPanel.setPreferredSize(new Dimension(MAX_MAIN_PANEL_WIDTH, 60));
+            if (mainPanel.getPreferredSize().height > MAX_MAIN_PANEL_HEIGHT || mainPanel.getPreferredSize().width > MAX_MAIN_PANEL_WIDTH) {
+                UIScrollPane jp = new
+                        UIScrollPane(mainPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+                jp.setPreferredSize(new Dimension(MAX_MAIN_PANEL_WIDTH, MAX_MAIN_PANEL_HEIGHT));
+                northPane.add(jp, BorderLayout.CENTER);
+            } else {
+                mainPanel.setPreferredSize(new Dimension(MAX_MAIN_PANEL_WIDTH, MAX_MAIN_PANEL_HEIGHT));
+                northPane.add(mainPanel, BorderLayout.CENTER);
+            }
             // ChartSet
             String[] defaultEncode = new String[]{Toolkit.i18nText("Fine-Design_Encode_Auto")};
             charSetComboBox = new UIComboBox(ArrayUtils.addAll(defaultEncode, EncodeConstants.ENCODING_ARRAY));
@@ -406,6 +426,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
     public static class JDBC extends DatabaseConnectionPane<JDBCDatabaseConnection> {
         private static JDBCDefPane jdbcDefPane = new JDBCDefPane();
         private static DBCPAttrPane dbcpAttrPane = new DBCPAttrPane();
+        private static AdvancePane advancePane = new AdvancePane();
 
         @Override
         protected JPanel mainPanel() {
@@ -425,15 +446,22 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
         protected void populateSubDatabaseConnectionBean(JDBCDatabaseConnection ob) {
             jdbcDefPane.populate(ob);
             dbcpAttrPane.populate(jdbcDefPane.getJDBCDatabase());
+            advancePane.populate(jdbcDefPane.getJDBCDatabase());
         }
 
         @Override
         protected JDBCDatabaseConnection updateSubDatabaseConnectionBean() {
             JDBCDatabaseConnection jdbcDatabaseConnection = jdbcDefPane.update();
             dbcpAttrPane.update(jdbcDatabaseConnection);
+            advancePane.update(jdbcDatabaseConnection);
             return jdbcDatabaseConnection;
         }
 
+        @Override
+        protected JPanel getAdvancePane() {
+            return advancePane;
+        }
+
         @Override
         protected String title4PopupWindow() {
             return "JDBC";

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java

@@ -715,8 +715,8 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
                 if (useGlobal(getTableData(), strategyConfig)) {
                     //使用全局配置
                     strategyConfig = StrategyConfigHelper.createStrategyConfig(true);
-                } else if (getTableData().isShare()) {
-                    //使用共享数据集兼容配置
+                } else if (strategyConfig == null && getTableData().isShare()) {
+                    //没有配置时，使用共享数据集兼容配置
                     strategyConfig = StrategyConfigHelper.createStrategyConfig(true, false, true);
                 }
             }

designer-base/src/main/java/com/fr/design/event/ComponentChangeListener.java

@@ -0,0 +1,7 @@
+package com.fr.design.event;
+
+import java.awt.*;
+
+public interface ComponentChangeListener {
+    void initListener(Container changedComponent);
+}

designer-base/src/main/java/com/fr/design/event/ComponentChangeObserver.java

@@ -0,0 +1,6 @@
+package com.fr.design.event;
+
+
+public interface ComponentChangeObserver {
+     void registerChangeListener(ComponentChangeListener uiChangeableListener);
+}

designer-base/src/main/java/com/fr/design/extra/PluginInstalledPane.java

@@ -60,11 +60,14 @@ public class PluginInstalledPane extends PluginAbstractViewPane {
             public void actionPerformed(ActionEvent e) {
                 PluginView plugin = controlPane.getSelectedPlugin();
                 if (plugin != null) {
-                    boolean isActive = plugin.isActive();
-                    PluginMarker pluginMarker = PluginMarker.create(plugin.getID(), plugin.getVersion());
-                    final String modifyMessage = isActive ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Has_Been_Actived") : com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Has_Been_Disabled");
-                    if (isActive) {
-                        PluginManager.getController().forbid(pluginMarker, new PluginTaskCallback() {
+                    PluginContext pluginContext = getPluginContextByView(plugin);
+                    if (pluginContext == null) {
+                        return;
+                    }
+                    boolean running = pluginContext.isRunning();
+                    final String modifyMessage = running ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Has_Been_Actived") : com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Has_Been_Disabled");
+                    if (running) {
+                        PluginManager.getController().forbidPersistently(pluginContext.getMarker(), new PluginTaskCallback() {
                             @Override
                             public void done(PluginTaskResult result) {
                                 if (result.isSuccess()) {
@@ -75,7 +78,7 @@ public class PluginInstalledPane extends PluginAbstractViewPane {
                             }
                         });
                     } else {
-                        PluginManager.getController().enable(pluginMarker, new PluginTaskCallback() {
+                        PluginManager.getController().enablePersistently(pluginContext.getMarker(), new PluginTaskCallback() {
                             @Override
                             public void done(PluginTaskResult result) {
                                 if (result.isSuccess()) {
@@ -145,13 +148,25 @@ public class PluginInstalledPane extends PluginAbstractViewPane {
     }
 
     private void changeTextForButton(PluginView plugin) {
-        if (plugin.isActive()) {
+        PluginContext pluginContext = getPluginContextByView(plugin);
+        if (pluginContext == null) {
+            return;
+        }
+        if (pluginContext.isRunning()) {
             disableButton.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Disable"));
         } else {
             disableButton.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Active"));
         }
     }
 
+    private PluginContext getPluginContextByView(PluginView pluginView) {
+        if (pluginView != null) {
+            PluginMarker pluginMarker = PluginMarker.create(pluginView.getID(), pluginView.getVersion());
+            return PluginManager.getContext(pluginMarker);
+        }
+        return null;
+    }
+
     @Override
     protected String title4PopupWindow() {
         return "Installed";

designer-base/src/main/java/com/fr/design/extra/PluginOperateUtils.java

@@ -99,9 +99,9 @@ public class PluginOperateUtils {
             public void run() {
                 PluginMarker pluginMarker = PluginUtils.createPluginMarker(pluginInfo);
                 PluginContext plugin = PluginManager.getContext(pluginMarker);
-                boolean active = plugin.isActive();
-                PluginTaskCallback modifyStatusCallback = new ModifyStatusCallback(active, jsCallback);
-                if (active) {
+                boolean isRunning = plugin.isRunning();
+                PluginTaskCallback modifyStatusCallback = new ModifyStatusCallback(isRunning, jsCallback);
+                if (isRunning) {
                     PluginXmlElement forbidReminder = plugin.getXml().getElement(PluginElementName.ForbidReminder);
                     if (forbidReminder != null && forbidReminder.getContent() != null) {
                         // 禁用前提示
@@ -113,14 +113,14 @@ public class PluginOperateUtils {
                                 JOptionPane.WARNING_MESSAGE
                         );
                         if (rv == JOptionPane.OK_OPTION) {
-                            PluginManager.getController().forbid(pluginMarker, modifyStatusCallback);
+                            PluginManager.getController().forbidPersistently(pluginMarker, modifyStatusCallback);
                         }
                     } else {
                         // 正常禁用
-                        PluginManager.getController().forbid(pluginMarker, modifyStatusCallback);
+                        PluginManager.getController().forbidPersistently(pluginMarker, modifyStatusCallback);
                     }
                 } else {
-                    PluginManager.getController().enable(pluginMarker, modifyStatusCallback);
+                    PluginManager.getController().enablePersistently(pluginMarker, modifyStatusCallback);
                 }
             }
         });

designer-base/src/main/java/com/fr/design/extra/PluginUtils.java

@@ -269,7 +269,8 @@ public class PluginUtils {
                 jo.put("vendor", pluginContext.getVendor());
                 jo.put("price", pluginContext.getPrice());
                 jo.put("requiredJarTime", pluginContext.getRequiredJarTime());
-                jo.put("active", pluginContext.isActive());
+                // 前端需求的active实际上是插件的运行状态，通过isRunning()获取
+                jo.put("active", pluginContext.isRunning());
                 jo.put("hidden", pluginContext.isHidden());
                 jo.put("free", pluginContext.isFree());
                 jo.put("licDamaged", pluginContext.isLicDamaged());

designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java

@@ -253,7 +253,11 @@ public class HistoryTemplateListCache implements CallbackEvent {
         for (int i = 0; i < vCount; i++) {
             JTemplate overTemplate = historyList.get(i);
 
-            if (overTemplate.getEditingFILE().exists() && overTemplate.isALLSaved() && overTemplate != editingTemplate) {
+            boolean replaceWithJVirtualTemplate = overTemplate.getEditingFILE().exists()
+                                                    && overTemplate.isALLSaved()
+                                                    && overTemplate != editingTemplate
+                                                    && overTemplate.checkEnable();
+            if (replaceWithJVirtualTemplate) {
                 closeVirtualSelectedReport(overTemplate);
                 historyList.set(i, new JVirtualTemplate(overTemplate.getEditingFILE()));
             }

designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java

@@ -4,7 +4,6 @@ package com.fr.design.file;
 import com.fr.base.BaseUtils;
 import com.fr.base.GraphHelper;
 import com.fr.base.vcs.DesignerMode;
-import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.imenu.UIMenuItem;
@@ -17,6 +16,7 @@ import com.fr.design.utils.DesignUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.design.utils.gui.GUIPaintUtils;
 import com.fr.design.worker.WorkerManager;
+import com.fr.design.utils.TemplateUtils;
 import com.fr.design.worker.save.CallbackSaveWorker;
 import com.fr.file.FILE;
 import com.fr.general.ComparatorUtils;
@@ -269,7 +269,7 @@ public class MutilTempalteTabPane extends JComponent {
 
 
     private String tempalteShowName(JTemplate<?, ?> template) {
-        String name = template.getTemplateName();
+        String name = TemplateUtils.createLockeTemplatedName(template, template.getTemplateName());
         if (!template.isSaved() && !name.endsWith(" *")) {
             name += " *";
         }

designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java

@@ -12,7 +12,11 @@ import com.fr.design.gui.itree.filetree.TemplateFileTree;
 import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.lock.LockInfoUtils;
 import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.DesignerFrameFileDealerPane;
+import com.fr.design.lock.LockInfoDialog;
+import com.fr.design.mainframe.JTemplate;
 import com.fr.file.FILE;
 import com.fr.file.FileNodeFILE;
 import com.fr.file.filetree.FileNode;
@@ -21,12 +25,15 @@ import com.fr.form.fit.web.editpreview.FileLockStateObservable;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.IOUtils;
 import com.fr.log.FineLoggerFactory;
+import com.fr.workspace.base.UserInfo;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.CoreConstants;
 import com.fr.stable.StableUtils;
 import com.fr.stable.project.ProjectConstants;
 import com.fr.workspace.WorkContext;
 
+import com.fr.report.lock.LockInfoOperator;
+import java.util.UUID;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
@@ -50,6 +57,8 @@ import java.util.Enumeration;
 import java.util.Objects;
 import java.util.Observable;
 import java.util.Observer;
+import org.jetbrains.annotations.Nullable;
+
 
 import static javax.swing.JOptionPane.WARNING_MESSAGE;
 import static javax.swing.JOptionPane.YES_NO_OPTION;
@@ -113,6 +122,7 @@ public class TemplateTreePane extends JPanel implements FileOperations {
                 if (toolBarStateChangeListener != null) {
                     toolBarStateChangeListener.stateChange();
                 }
+                DesignerFrameFileDealerPane.getInstance().refreshRightToolBarBy(reportletsTree.getSelectedFileNode());
             }
         };
         // lx: add mouse listener
@@ -216,15 +226,44 @@ public class TemplateTreePane extends JPanel implements FileOperations {
         if (node == null) {
             return;
         }
+        String reportPath = reportletsTree.getSelectedTemplatePath();
+        final String selectedFilePath = StableUtils.pathJoin(ProjectConstants.REPORTLETS_NAME, reportPath);
         String lock = node.getLock();
-        if (lock != null && !lock.equals(node.getUserID())) {
+        boolean showLockInfo = LockInfoUtils.isCompatibleOperator()
+                                || LockInfoUtils.unableGetLockInfo()
+                                || WorkContext.getCurrent().get(LockInfoOperator.class).isTplUnLocked(selectedFilePath)
+                                ? (lock != null && !lock.equals(node.getUserID()))
+                                : WorkContext.getCurrent().get(LockInfoOperator.class).isTplLocked(selectedFilePath);
+        if (showLockInfo) {
+            UserInfo userInfo = WorkContext.getCurrent().get(LockInfoOperator.class).getUserInfo(selectedFilePath);
+            node.setLock(UUID.randomUUID().toString());
+            // 对于开发者预览占位锁定 定位到tab中
+            checkDevelopForBiddenTemplate(selectedFilePath);
+            LockInfoDialog.show(userInfo);
             return;
+        } else {
+            node.setLock(null);
         }
-        String reportPath = reportletsTree.getSelectedTemplatePath();
-        final String selectedFilePath = StableUtils.pathJoin(ProjectConstants.REPORTLETS_NAME, reportPath);
         DesignerContext.getDesignerFrame().openTemplate(new FileNodeFILE(new FileNode(selectedFilePath, false)));
     }
 
+    private void checkDevelopForBiddenTemplate(String selectedFilePath) {
+        JTemplate<?, ?> template = getOpenedTemplate(selectedFilePath);
+        if (template != null && template.isForbidden()) {
+            DesignerContext.getDesignerFrame().openTemplate(new FileNodeFILE(new FileNode(selectedFilePath, false)));
+        }
+    }
+
+    @Nullable
+    private JTemplate<?, ?>  getOpenedTemplate(String path) {
+        for (JTemplate<?, ?> template : HistoryTemplateListCache.getInstance().getHistoryList()) {
+            if (ComparatorUtils.equals(template.getEditingFILE().getPath(), path)) {
+                return template;
+            }
+        }
+        return null;
+    }
+
     /**
      * 打开文件夹
      */
@@ -248,6 +287,7 @@ public class TemplateTreePane extends JPanel implements FileOperations {
         // 刷新远程文件夹权限
         NodeAuthProcessor.getInstance().refresh();
         reportletsTree.refresh();
+        DesignerFrameFileDealerPane.getInstance().refreshRightToolBarBy(null);
         FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Basic_Template_File_Tree_Refresh_Successfully") + "!");
     }
 

designer-base/src/main/java/com/fr/design/formula/FormulaPane.java

@@ -290,6 +290,11 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         initTextPane();
         initTipsPane();
         initVariableTreeAndDescriptionArea();
+        refocusInWindow();
+    }
+
+    public void refocusInWindow() {
+        SwingUtilities.invokeLater(() -> formulaTextArea.requestFocusInWindow());
     }
 
     private void initVariableTreeAndDescriptionArea() {
@@ -862,8 +867,12 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         if (checkResult.isValid()) {
             showMessageDialog(checkResult.getTips(), checkResult.isValid());
         } else {
-            String position = Toolkit.i18nText("Fine-Design_Basic_Formula_The") + (checkResult.getFormulaCoordinates().getColumns())
-                    + Toolkit.i18nText("Fine-Design_Basic_Formula_Error_Position") + " ";
+            int columns = checkResult.getFormulaCoordinates().getColumns();
+            String position = StringUtils.EMPTY;
+            if (columns >= 0) {
+                position = Toolkit.i18nText("Fine-Design_Basic_Formula_The") + columns
+                        + Toolkit.i18nText("Fine-Design_Basic_Formula_Error_Position") + " ";
+            }
             int confirmDialog = FineJOptionPane.showConfirmDialog(
                     FormulaPane.this,
                     position + messageTips,
@@ -874,7 +883,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
                     new String[]{Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Result"), Toolkit.i18nText("Fine-Design_Basic_Formula_Continue")},
                     Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Result"));
             if (confirmDialog == 0) {
-                formulaTextArea.setCaretPosition(checkResult.getFormulaCoordinates().getColumns());
+                formulaTextArea.setCaretPosition(Math.max(columns, 0));
                 formulaTextArea.requestFocus();
                 return false;
             }

designer-base/src/main/java/com/fr/design/formula/exception/function/FormulaCheckWrongFunction.java

@@ -73,6 +73,8 @@ public class FormulaCheckWrongFunction implements Function<Exception, FormulaChe
         if (invalidFormula.contains(",")) {
             invalidFormula = invalidFormula.substring(0, invalidFormula.indexOf(","));
         }
-        return formulaText.indexOf(invalidFormula);
+        int index = formulaText.indexOf(invalidFormula);
+        return index;
     }
+
 }

designer-base/src/main/java/com/fr/design/gui/controlpane/UIListGroupControlPane.java

@@ -125,7 +125,9 @@ public abstract class UIListGroupControlPane extends UIControlPane implements Li
         for (int i = 0, size = widget.getListenerSize(); i < size; i++) {
             Listener listener = widget.getListener(i);
             if (!listener.isDefault()) {
-                nameObjectList.add(i, new NameObject(switchLang(listener.getEventName()) + (i + 1), listener));
+                String eventName = switchLang(listener.getEventName()) + (nameObjectList.size() + 1);
+                NameObject nameObject = new NameObject(eventName, listener);
+                nameObjectList.add(nameObject);
             }
         }
         populate(getHelper().processCatalog(nameObjectList));

designer-base/src/main/java/com/fr/design/gui/frpane/AbstractAttrNoScrollPane.java

@@ -3,6 +3,8 @@ package com.fr.design.gui.frpane;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.event.GlobalNameListener;
 import com.fr.design.event.GlobalNameObserver;
+import com.fr.design.event.ComponentChangeListener;
+import com.fr.design.event.ComponentChangeObserver;
 import com.fr.design.event.UIObserver;
 import com.fr.design.event.UIObserverListener;
 import com.fr.stable.StringUtils;
@@ -103,6 +105,15 @@ public abstract class AbstractAttrNoScrollPane extends BasicPane {
 					}
 				});
 			}
+			if(tmpComp instanceof ComponentChangeObserver){
+				ComponentChangeObserver uiChangeableObserver = ((ComponentChangeObserver)tmpComp);
+				uiChangeableObserver.registerChangeListener(new ComponentChangeListener() {
+					@Override
+					public void initListener(Container changedComponent) {
+						AbstractAttrNoScrollPane.this.initListener(changedComponent);
+					}
+				});
+			}
 		}
 	}
 

designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java

@@ -242,12 +242,22 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe
             rtd = treeTableDataComboBox.getSelcetedTableData();
             name = treeTableDataComboBox.getSelectedItem().getTableDataName();
         }
+        final String tableDataName = name;
         AbstractTableDataWrapper atdw = new TemplateTableDataWrapper(rtd, "");
-        tdtp.dgEdit(atdw.creatTableDataPane(), name);
-        treeTableDataComboBox.refresh();
-        treeTableDataComboBox.setSelectedTableDataByName(name);
-        textPane.populate(1);
-        valuePane.populate(1);
+        tdtp.showEditPane(atdw.creatTableDataPane(), name, new BasicTableDataTreePane.TableDataTreePaneListener() {
+            @Override
+            public void doOk() {
+                // 去除缓存列，后面刷新会重新选中
+                DesignTableDataManager.removeSelectedColumnNames(tableDataName);
+                treeTableDataComboBox.refresh();
+                treeTableDataComboBox.setSelectedTableDataByName(tableDataName);
+            }
+
+            @Override
+            public void doCancel() {
+
+            }
+        });
     }
 
 }

designer-base/src/main/java/com/fr/design/gui/frpane/TreeSettingPane.java

@@ -127,7 +127,7 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI {
 			buildBox.setSelectedIndex(1);
 			TableDataDictionary dictionary = treeEditor.getDictionary();
 			autoBuildPane.populate(dictionary);
-		} else if (treeEditor.isLayerBuild()) {
+		} else if (treeEditor.isFastLayerBuild()) {
 			buildBox.setSelectedIndex(0);
 			java.util.List<LayerConfig> layerConfigList = treeEditor.getLayerConfigs();
 			LayerConfig[] layerConfigs = new LayerConfig[layerConfigList.size()];
@@ -156,12 +156,12 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI {
 		if (buildBox.getSelectedIndex() == 1) {
 			TableDataDictionary dictionary = this.autoBuildPane.update();
 			te.setAutoBuild(true);
-			te.setLayerBuild(false);
+			te.setFastLayerBuild(false);
 			te.setDictionary(dictionary);
 			te.setNodeOrDict(dictionary);
 		} else if (buildBox.getSelectedIndex() == 2) {
 			te.setAutoBuild(false);
-			te.setLayerBuild(false);
+			te.setFastLayerBuild(false);
 			NameObject no = this.controlPane.update();
 			if (no != null) {
 				TreeEditor editor = (TreeEditor) no.getObject();
@@ -181,7 +181,7 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI {
 		} else {
 			LayerConfig[] configs = (LayerConfig[]) layerDataControlPane.update().getObject();
 			te.setAutoBuild(false);
-			te.setLayerBuild(true);
+			te.setFastLayerBuild(true);
 			te.setLayerConfigs(Arrays.asList(configs));
 		}
 		return te;
@@ -215,12 +215,12 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI {
 		if (buildBox.getSelectedIndex() == 1) {
 			TableDataDictionary dictionary = this.autoBuildPane.update();
 			tcb.setAutoBuild(true);
-            tcb.setLayerBuild(false);
+            tcb.setFastLayerBuild(false);
             tcb.setDictionary(dictionary);
             tcb.setNodeOrDict(dictionary);
         } else if (buildBox.getSelectedIndex() == 2) {
             tcb.setAutoBuild(false);
-            tcb.setLayerBuild(false);
+            tcb.setFastLayerBuild(false);
             NameObject no = this.controlPane.update();
             if (no != null) {
                 if (no.getObject() instanceof TreeComboBoxEditor) {
@@ -244,7 +244,7 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI {
 		}else {
             LayerConfig[] configs = (LayerConfig[]) layerDataControlPane.update().getObject();
             tcb.setAutoBuild(false);
-            tcb.setLayerBuild(true);
+            tcb.setFastLayerBuild(true);
             tcb.setLayerConfigs(Arrays.asList(configs));
         }
 		return tcb;

designer-base/src/main/java/com/fr/design/gui/icheckbox/UICheckBox.java

@@ -58,7 +58,7 @@ public class UICheckBox extends JCheckBox implements UIObserver, GlobalNameObser
         super(locText, b);
         setUI(new UICheckBoxUI());
         initListener();
-        this.markMnemonic=markMnemonic;
+        this.markMnemonic = markMnemonic;
     }
 
     public UICheckBox(String text, Icon icon) {
@@ -100,6 +100,10 @@ public class UICheckBox extends JCheckBox implements UIObserver, GlobalNameObser
     }
 
 
+    public void removeChangeListener() {
+        uiObserverListener = null;
+    }
+
     @Override
     public void setGlobalName(String name) {
         checkboxName = name;

designer-base/src/main/java/com/fr/design/gui/icombobox/FRTreeComboBox.java

@@ -248,7 +248,7 @@ public class FRTreeComboBox extends UIComboBox {
 
     private static TreePopup treePopup;
 
-    private static class FRTreeComboBoxUI extends BasicComboBoxUI implements MouseListener{
+    protected static class FRTreeComboBoxUI extends BasicComboBoxUI implements MouseListener{
         private boolean isRollover = false;
 
         public FRTreeComboBoxUI() {
@@ -535,7 +535,7 @@ public class FRTreeComboBox extends UIComboBox {
     public class FrTreeSearchComboBoxEditor extends UIComboBoxEditor implements DocumentListener {
         private volatile boolean setting = false;
         private FRTreeComboBox comboBox;
-        private Object item;
+        protected Object item;
 
         public FrTreeSearchComboBoxEditor(FRTreeComboBox comboBox) {
             super();

designer-base/src/main/java/com/fr/design/gui/icombobox/SearchPreTaskTreeComboBox.java

@@ -1,77 +0,0 @@
-package com.fr.design.gui.icombobox;
-
-import com.fr.log.FineLoggerFactory;
-
-import javax.swing.JTree;
-import javax.swing.SwingWorker;
-import javax.swing.tree.TreeCellRenderer;
-import java.util.concurrent.FutureTask;
-
-/**
- * 模糊搜索前需执行完前置任务的TreeComboBox
- * @author Lucian.Chen
- * @version 10.0
- * Created by Lucian.Chen on 2021/4/14
- */
-public class SearchPreTaskTreeComboBox extends FRTreeComboBox {
-
-    /**
-     * 模糊搜索前任务
-     */
-    private FutureTask<Void> preSearchTask;
-
-    public SearchPreTaskTreeComboBox(JTree tree, TreeCellRenderer renderer, boolean editable) {
-        super(tree, renderer, editable);
-    }
-
-    public FutureTask<Void> getPreSearchTask() {
-        return preSearchTask;
-    }
-
-    public void setPreSearchTask(FutureTask<Void> preSearchTask) {
-        this.preSearchTask = preSearchTask;
-    }
-
-    protected UIComboBoxEditor createEditor() {
-        return new SearchPreTaskComboBoxEditor(this);
-    }
-
-    private class SearchPreTaskComboBoxEditor extends FrTreeSearchComboBoxEditor {
-
-        public SearchPreTaskComboBoxEditor(FRTreeComboBox comboBox) {
-            super(comboBox);
-        }
-
-        protected void changeHandler() {
-            if (isSetting()) {
-                return;
-            }
-            setPopupVisible(true);
-            new SwingWorker<Void, Void>() {
-                @Override
-                protected Void doInBackground() {
-                    FutureTask<Void> task = getPreSearchTask();
-                    try {
-                        // 确保模糊搜索前任务执行完成后，再进行模糊搜索
-                        if (task != null) {
-                            task.get();
-                        }
-                    } catch (Exception e) {
-                        FineLoggerFactory.getLogger().error(e.getMessage(), e);
-                    }
-                    if (task != null) {
-                        // 任务执行后置空，否则会被别的操作重复触发
-                        setPreSearchTask(null);
-                    }
-                    return null;
-                }
-
-                @Override
-                protected void done() {
-                    // 模糊搜索
-                    search();
-                }
-            }.execute();
-        }
-    }
-}

designer-base/src/main/java/com/fr/design/gui/icombobox/TableSearchTreeComboBox.java

@@ -0,0 +1,217 @@
+package com.fr.design.gui.icombobox;
+
+import com.fr.data.core.DataCoreUtils;
+import com.fr.data.core.db.TableProcedure;
+import com.fr.data.impl.Connection;
+import com.fr.design.DesignerEnvManager;
+import com.fr.design.data.datapane.ChoosePane;
+import com.fr.design.dialog.FineJOptionPane;
+import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.log.FineLoggerFactory;
+import com.fr.stable.ArrayUtils;
+import com.fr.stable.Filter;
+import com.fr.stable.StringUtils;
+
+import javax.swing.JOptionPane;
+import javax.swing.JTree;
+import javax.swing.SwingWorker;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.TreeCellRenderer;
+import javax.swing.tree.TreeNode;
+import javax.swing.tree.TreePath;
+import java.awt.event.MouseEvent;
+import java.util.Enumeration;
+
+/**
+ * 实现模糊搜索表名的FRTreeComboBox
+ * FRTreeComboBox：搜索后滚动到首个匹配节点
+ * SearchFRTreeComboBox：显示所有匹配的节点
+ *
+ * @author Lucian.Chen
+ * @version 10.0
+ * Created by Lucian.Chen on 2021/4/14
+ */
+public class TableSearchTreeComboBox extends FRTreeComboBox {
+    // 持有父容器，需要实时获取其他组件值
+    private final ChoosePane parent;
+
+    public TableSearchTreeComboBox(ChoosePane parent, JTree tree, TreeCellRenderer renderer) {
+        super(tree, renderer);
+        this.parent = parent;
+        setUI(new TableSearchTreeComboBoxUI());
+    }
+
+    protected UIComboBoxEditor createEditor() {
+        return new TableSearchComboBoxEditor(this);
+    }
+
+    @Override
+    protected String pathToString(TreePath path) {
+        Object obj = ((DefaultMutableTreeNode) path.getLastPathComponent()).getUserObject();
+        if (obj instanceof TableProcedure) {
+            return ((TableProcedure) obj).getName();
+        }
+        return super.pathToString(path);
+    }
+
+    @Override
+    public void setSelectedItemString(String _name) {
+        super.setSelectedItemString(_name);
+        // 会因为连续两次选中的值一致，导致未触发编辑框联动
+        this.getEditor().setItem(_name);
+    }
+
+    /**
+     * 执行模糊搜索
+     */
+    private void searchExecute() {
+        UIComboBoxEditor searchEditor = (UIComboBoxEditor) this.getEditor();
+        new SwingWorker<Void, Void>() {
+            @Override
+            protected Void doInBackground() {
+                processTableDataNames(
+                        parent.getDSName(),
+                        parent.getConnection(),
+                        parent.getSchema(),
+                        createFilter((String) searchEditor.getItem()));
+                return null;
+            }
+
+            @Override
+            protected void done() {
+                expandTree();
+                // 输入框获取焦点
+                searchEditor.getEditorComponent().requestFocus();
+            }
+        }.execute();
+    }
+
+    private TableNameFilter createFilter(String text) {
+        return StringUtils.isEmpty(text) ? EMPTY_FILTER : new TableNameFilter(text);
+    }
+
+    /**
+     * 查询数据库表，并构建节点目录
+     *
+     * @param databaseName 数据库名
+     * @param connection   数据连接
+     * @param schema       模式
+     * @param filter       模糊搜索过滤器
+     */
+    private void processTableDataNames(String databaseName, Connection connection, String schema, TableNameFilter filter) {
+        if (tree == null) {
+            return;
+        }
+        DefaultMutableTreeNode rootTreeNode = (DefaultMutableTreeNode) tree.getModel().getRoot();
+        rootTreeNode.removeAllChildren();
+
+        if (connection == null) {
+            return;
+        }
+        try {
+            schema = StringUtils.isEmpty(schema) ? null : schema;
+            TableProcedure[] sqlTableArray = DataCoreUtils.getTables(connection, TableProcedure.TABLE, schema, DesignerEnvManager.getEnvManager().isOracleSystemSpace());
+            if (ArrayUtils.isNotEmpty(sqlTableArray)) {
+                ExpandMutableTreeNode tableTreeNode = new ExpandMutableTreeNode(databaseName + "-" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_SQL_Table"));
+                rootTreeNode.add(tableTreeNode);
+                addArrayNode(tableTreeNode, sqlTableArray, filter);
+            }
+            TableProcedure[] sqlViewArray = DataCoreUtils.getTables(connection, TableProcedure.VIEW, schema, DesignerEnvManager.getEnvManager().isOracleSystemSpace());
+            if (ArrayUtils.isNotEmpty(sqlViewArray)) {
+                ExpandMutableTreeNode viewTreeNode = new ExpandMutableTreeNode(databaseName + "-" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_SQL_View"));
+                rootTreeNode.add(viewTreeNode);
+                addArrayNode(viewTreeNode, sqlViewArray, filter);
+            }
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"),
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Failed"), JOptionPane.ERROR_MESSAGE);
+        }
+    }
+
+    private void addArrayNode(ExpandMutableTreeNode rootNode, TableProcedure[] sqlArray, TableNameFilter filter) {
+        if (sqlArray != null) {
+            for (TableProcedure procedure : sqlArray) {
+                if (filter.accept(procedure)) {
+                    ExpandMutableTreeNode viewChildTreeNode = new ExpandMutableTreeNode(procedure);
+                    rootNode.add(viewChildTreeNode);
+                }
+            }
+        }
+    }
+
+    /**
+     * 展开节点
+     */
+    private void expandTree() {
+        ((DefaultTreeModel) tree.getModel()).reload();
+        // daniel 展开所有tree
+        TreeNode root = (TreeNode) tree.getModel().getRoot();
+        TreePath parent = new TreePath(root);
+        TreeNode node = (TreeNode) parent.getLastPathComponent();
+        for (Enumeration e = node.children(); e.hasMoreElements(); ) {
+            TreeNode n = (TreeNode) e.nextElement();
+            TreePath path = parent.pathByAddingChild(n);
+            tree.expandPath(path);
+        }
+    }
+
+    private static final TableNameFilter EMPTY_FILTER = new TableNameFilter() {
+        public boolean accept(TableProcedure procedure) {
+            return true;
+        }
+    };
+
+    /**
+     * 表名模糊搜索实现
+     */
+    private static class TableNameFilter implements Filter<TableProcedure> {
+        private String searchFilter;
+
+        public TableNameFilter() {
+        }
+
+        public TableNameFilter(String searchFilter) {
+            this.searchFilter = searchFilter.toLowerCase().trim();
+        }
+
+        // 表名匹配
+        @Override
+        public boolean accept(TableProcedure procedure) {
+            return procedure.getName().toLowerCase().contains(searchFilter);
+        }
+    }
+
+    /**
+     * 重写FRTreeComboBoxUI，实现点击下拉时触发模糊搜索
+     */
+    private class TableSearchTreeComboBoxUI extends FRTreeComboBoxUI {
+
+        @Override
+        public void mouseClicked(MouseEvent e) {
+            searchExecute();
+        }
+    }
+
+    /**
+     * 重写输入框编辑器，实现输入框模糊搜索逻辑
+     */
+    private class TableSearchComboBoxEditor extends FrTreeSearchComboBoxEditor {
+
+        public TableSearchComboBoxEditor(FRTreeComboBox comboBox) {
+            super(comboBox);
+        }
+
+        @Override
+        protected void changeHandler() {
+            if (isSetting()) {
+                return;
+            }
+            setPopupVisible(true);
+            this.item = textField.getText();
+            searchExecute();
+        }
+    }
+}

designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java

@@ -31,22 +31,22 @@ public class ProgressDialog extends UIDialog {
         super(parent);
         setUndecorated(true);
         setSize(parent.getSize());
-        setLocationRelativeTo(null);
+        setLocation(parent.getLocation());
         OSSupportCenter.buildAction(new OSBasedAction() {
             @Override
             public void execute(Object... objects) {
                 setOpacity(0.5f);
             }
         }, SupportOSImpl.OPACITY);
-        initComponent();
+        initComponent(parent);
     }
 
-    private void initComponent() {
+    private void initComponent(Frame parent) {
 
         centerDialog = new JDialog(this);
         centerDialog.setSize(new Dimension(482, 124));
         centerDialog.setUndecorated(true);
-        GUICoreUtils.centerWindow(centerDialog);
+        centerDialog.setLocationRelativeTo(parent);
         JPanel panel = new JPanel();
         panel.setBorder(new UIProgressBorder(3, UIConstants.DEFAULT_BG_RULER, 14, 46, 47, 37, 47));
         panel.setLayout(new BorderLayout(4, 15));

designer-base/src/main/java/com/fr/design/gui/itextfield/UIAutoCompletionField.java

@@ -256,10 +256,9 @@ public class UIAutoCompletionField extends UITextField implements DocumentListen
      *
      */
     public void setText(String t) {
-        if (this.isOpen == true) {
-            if (!UIAutoCompletionField.this.isShowing()) {
-                return;
-            }
+        boolean unavailable = !this.isEnabled() && !this.isEditable();
+        if (unavailable) {
+            return;
         }
         try {
             Document doc = getDocument();

designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java

@@ -4,7 +4,6 @@ package com.fr.design.gui.style;
  * Copyright(c) 2001-2010, FineReport Inc, All Rights Reserved.
  */
 
-import com.fr.base.BaseUtils;
 import com.fr.base.CellBorderStyle;
 import com.fr.base.Style;
 import com.fr.design.constants.LayoutConstants;
@@ -17,14 +16,21 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.style.color.NewColorSelectBox;
-
+import com.fr.design.utils.gui.AdjustWorkBookDefaultStyleUtils;
+import com.fr.general.IOUtils;
 import com.fr.stable.Constants;
 import com.fr.stable.CoreConstants;
 
-import javax.swing.*;
+import javax.swing.Icon;
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.GridLayout;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
@@ -38,7 +44,6 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
     private static final String[] BORDERARRAY = {"currentLineCombo", "currentLineColorPane", "outerToggleButton", "topToggleButton",
             "leftToggleButton", "bottomToggleButton", "rightToggleButton", "innerToggleButton", "horizontalToggleButton", "verticalToggleButton"};
     private static final Set<String> BORDER_SET = new HashSet<>(Arrays.asList(BORDERARRAY));
-    private boolean insideMode = false;
 
     private UIToggleButton topToggleButton;
     private UIToggleButton horizontalToggleButton;
@@ -50,11 +55,8 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
     private UIToggleButton innerToggleButton;
     private UIToggleButton outerToggleButton;
 
-    private LineComboBox currentLineCombo;
-    private NewColorSelectBox currentLineColorPane;
-    private JPanel panel;
-    private JPanel borderPanel;
-    private JPanel backgroundPanel;
+    protected LineComboBox currentLineCombo;
+    protected NewColorSelectBox currentLineColorPane;
     private BackgroundPane backgroundPane;
     private GlobalNameListener globalNameListener = null;
 
@@ -81,18 +83,18 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
                 new Component[]{null, null},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color") + "    ", SwingConstants.LEFT), currentLineColorPane},
                 new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Out_Border") + "    ", SwingConstants.LEFT), outerToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("com/fr/design/images/m_format/out.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/out_white.png")}, false)},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Out_Border") + "    ", SwingConstants.LEFT), outerToggleButton = new UIToggleButton(new Icon[]{IOUtils.readIcon("com/fr/design/images/m_format/out.png"), IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/out_white.png")}, false)},
                 new Component[]{null, externalPane},
                 new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_In_Border") + "    ", SwingConstants.LEFT), innerToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("com/fr/design/images/m_format/in.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/in_white.png")}, false)},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_In_Border") + "    ", SwingConstants.LEFT), innerToggleButton = new UIToggleButton(new Icon[]{IOUtils.readIcon("com/fr/design/images/m_format/in.png"), IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/in_white.png")}, false)},
                 new Component[]{null, insidePane},
                 new Component[]{null, null}
         };
         double[] rowSize = {p, p, p, p, p, p, p, p, p, p, p};
         double[] columnSize = {p, f};
         int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}};
-        panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_SMALL, LayoutConstants.VGAP_MEDIUM);
-        borderPanel = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Border"), 280, 24, panel);
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_SMALL, LayoutConstants.VGAP_MEDIUM);
+        JPanel borderPanel = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Border"), 280, 24, panel);
         this.add(borderPanel, BorderLayout.NORTH);
 
         UILabel backgroundFillLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Background_Fill"));
@@ -102,7 +104,7 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
         JPanel backgroundContainPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{backgroundFillLabel, backgroundPane}},
                 TableLayoutHelper.FILL_LASTCOLUMN, LayoutConstants.VGAP_SMALL, LayoutConstants.VGAP_MEDIUM);
 
-        backgroundPanel = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background"), 280, 24, backgroundContainPane);
+        JPanel backgroundPanel = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background"), 280, 24, backgroundContainPane);
         this.add(backgroundPanel, BorderLayout.CENTER);
         initAllNames();
         outerToggleButton.addChangeListener(outerToggleButtonChangeListener);
@@ -130,12 +132,12 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
     };
 
     private void initButtonsWithIcon() {
-        topToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("/com/fr/base/images/dialog/border/top.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/top_white.png")}, false);
-        leftToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("/com/fr/base/images/dialog/border/left.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/left_white.png")}, false);
-        bottomToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("/com/fr/base/images/dialog/border/bottom.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bottom_white.png")}, false);
-        rightToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("/com/fr/base/images/dialog/border/right.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/right_white.png")}, false);
-        horizontalToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("/com/fr/base/images/dialog/border/horizontal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/horizontal_white.png")}, false);
-        verticalToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("/com/fr/base/images/dialog/border/vertical.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/vertical_white.png")}, false);
+        topToggleButton = new UIToggleButton(new Icon[]{IOUtils.readIcon("/com/fr/base/images/dialog/border/top.png"), IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/top_white.png")}, false);
+        leftToggleButton = new UIToggleButton(new Icon[]{IOUtils.readIcon("/com/fr/base/images/dialog/border/left.png"), IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/left_white.png")}, false);
+        bottomToggleButton = new UIToggleButton(new Icon[]{IOUtils.readIcon("/com/fr/base/images/dialog/border/bottom.png"), IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bottom_white.png")}, false);
+        rightToggleButton = new UIToggleButton(new Icon[]{IOUtils.readIcon("/com/fr/base/images/dialog/border/right.png"), IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/right_white.png")}, false);
+        horizontalToggleButton = new UIToggleButton(new Icon[]{IOUtils.readIcon("/com/fr/base/images/dialog/border/horizontal.png"), IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/horizontal_white.png")}, false);
+        verticalToggleButton = new UIToggleButton(new Icon[]{IOUtils.readIcon("/com/fr/base/images/dialog/border/vertical.png"), IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/vertical_white.png")}, false);
         this.currentLineCombo = new LineComboBox(CoreConstants.UNDERLINE_STYLE_ARRAY);
         this.currentLineColorPane = new NewColorSelectBox(100);
     }
@@ -174,15 +176,15 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
         cellBorderStyle.setRightStyle(style.getBorderRight());
         cellBorderStyle.setRightColor(style.getBorderRightColor());
         this.backgroundPane.populateBean(style.getBackground());
-        this.populateBean(cellBorderStyle, false, style.getBorderTop(), style.getBorderTopColor());
+        this.populateBean(cellBorderStyle, false);
 
     }
 
-    public void populateBean(CellBorderStyle cellBorderStyle, boolean insideMode, int currentStyle, Color currentColor) {
-        this.insideMode = insideMode;
+    public void populateBean(CellBorderStyle cellBorderStyle, boolean insideMode) {
+        populateBean(cellBorderStyle, insideMode, true);
+    }
 
-        this.currentLineCombo.setSelectedLineStyle(cellBorderStyle.getTopStyle() == Constants.LINE_NONE ? Constants.LINE_THIN : cellBorderStyle.getTopStyle());
-        this.currentLineColorPane.setSelectObject(cellBorderStyle.getTopColor());
+    public void populateBean(CellBorderStyle cellBorderStyle, boolean insideMode, boolean onlyInspectTop) {
 
         this.topToggleButton.setSelected(cellBorderStyle.getTopStyle() != Constants.LINE_NONE);
         this.bottomToggleButton.setSelected(cellBorderStyle.getBottomStyle() != Constants.LINE_NONE);
@@ -195,16 +197,53 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
         this.innerToggleButton.setSelected(cellBorderStyle.getInnerBorder() != Constants.LINE_NONE);
         this.outerToggleButton.setSelected(cellBorderStyle.getOuterBorderStyle() != Constants.LINE_NONE);
 
-        this.innerToggleButton.setEnabled(this.insideMode);
-        this.horizontalToggleButton.setEnabled(this.insideMode);
-        this.verticalToggleButton.setEnabled(this.insideMode);
+        this.innerToggleButton.setEnabled(insideMode);
+        this.horizontalToggleButton.setEnabled(insideMode);
+        this.verticalToggleButton.setEnabled(insideMode);
+
+        populateLineStyleAndColor(cellBorderStyle, onlyInspectTop);
+    }
+
+    public void populateLineStyleAndColor(CellBorderStyle cellBorderStyle, boolean onlyInspectTop) {
+        resetLineStyleAndColorSetting();
+
+        if (cellBorderStyle.getTopStyle() != Constants.LINE_NONE) {
+            this.currentLineCombo.setSelectedLineStyle(cellBorderStyle.getTopStyle());
+            this.currentLineColorPane.setSelectObject(cellBorderStyle.getTopColor());
+        } else if (!onlyInspectTop) {
+            if (cellBorderStyle.getBottomStyle() != Constants.LINE_NONE) {
+                this.currentLineCombo.setSelectedLineStyle(cellBorderStyle.getBottomStyle());
+                this.currentLineColorPane.setSelectObject(cellBorderStyle.getBottomColor());
+            } else if (cellBorderStyle.getLeftStyle() != Constants.LINE_NONE) {
+                this.currentLineCombo.setSelectedLineStyle(cellBorderStyle.getLeftStyle());
+                this.currentLineColorPane.setSelectObject(cellBorderStyle.getLeftColor());
+            } else if (cellBorderStyle.getRightStyle() != Constants.LINE_NONE) {
+                this.currentLineCombo.setSelectedLineStyle(cellBorderStyle.getRightStyle());
+                this.currentLineColorPane.setSelectObject(cellBorderStyle.getRightColor());
+            } else if (cellBorderStyle.getVerticalStyle() != Constants.LINE_NONE) {
+                this.currentLineCombo.setSelectedLineStyle(cellBorderStyle.getVerticalStyle());
+                this.currentLineColorPane.setSelectObject(cellBorderStyle.getVerticalColor());
+            } else if (cellBorderStyle.getHorizontalStyle() != Constants.LINE_NONE) {
+                this.currentLineCombo.setSelectedLineStyle(cellBorderStyle.getHorizontalStyle());
+                this.currentLineColorPane.setSelectObject(cellBorderStyle.getHorizontalColor());
+            }
+        }
+
+        if (this.currentLineCombo.getSelectedLineStyle() == Constants.LINE_NONE) {
+            this.currentLineCombo.setSelectedLineStyle(Constants.LINE_THIN);
+        }
+    }
+
+    private void resetLineStyleAndColorSetting() {
+        this.currentLineCombo.setSelectedLineStyle(Constants.LINE_NONE);
+        this.currentLineColorPane.setSelectObject(null);
     }
 
     @Override
     public Style update(Style style) {
 
         if (style == null) {
-            style = Style.DEFAULT_STYLE;
+            style = AdjustWorkBookDefaultStyleUtils.adjustCellElement(Style.DEFAULT_STYLE);
         }
 
         if (backgroundPane.currentPane.isBackgroundChange()) {
@@ -213,7 +252,7 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
         if (BORDER_SET.contains(globalNameListener.getGlobalName())) {
             CellBorderStyle cellBorderStyle = this.update();
             style = style.deriveBorder(cellBorderStyle.getTopStyle(), cellBorderStyle.getTopColor(), cellBorderStyle.getBottomStyle(), cellBorderStyle.getBottomColor(),
-                                       cellBorderStyle.getLeftStyle(), cellBorderStyle.getLeftColor(), cellBorderStyle.getRightStyle(), cellBorderStyle.getRightColor());
+                    cellBorderStyle.getLeftStyle(), cellBorderStyle.getLeftColor(), cellBorderStyle.getRightStyle(), cellBorderStyle.getRightColor());
         }
 
         return style;
@@ -253,16 +292,8 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
         }
         cellBorderStyle.setHorizontalStyle(horizontalToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE);
 
-        if (leftToggleButton.isSelected() && bottomToggleButton.isSelected() && rightToggleButton.isSelected() && topToggleButton.isSelected()) {
-            outerToggleButton.setSelected(true);
-        } else {
-            outerToggleButton.setSelected(false);
-        }
-        if (verticalToggleButton.isSelected() && horizontalToggleButton.isSelected()) {
-            innerToggleButton.setSelected(true);
-        } else {
-            innerToggleButton.setSelected(false);
-        }
+        outerToggleButton.setSelected(leftToggleButton.isSelected() && bottomToggleButton.isSelected() && rightToggleButton.isSelected() && topToggleButton.isSelected());
+        innerToggleButton.setSelected(verticalToggleButton.isSelected() && horizontalToggleButton.isSelected());
         return cellBorderStyle;
     }
 

designer-base/src/main/java/com/fr/design/gui/style/TextFormatPane.java

@@ -7,7 +7,6 @@ import com.fr.base.TextFormat;
 import com.fr.data.core.FormatField;
 import com.fr.data.core.FormatField.FormatContents;
 import com.fr.design.border.UIRoundedBorder;
-import com.fr.design.constants.LayoutConstants;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.event.GlobalNameListener;
 import com.fr.design.event.GlobalNameObserver;
@@ -18,21 +17,18 @@ import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.icombobox.UIComboBoxRenderer;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
-import com.fr.design.layout.TableLayout;
-import com.fr.design.layout.TableLayoutHelper;
 import com.fr.general.ComparatorUtils;
 import com.fr.stable.StringUtils;
 
 import javax.swing.BorderFactory;
+import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.JPanel;
-import javax.swing.SwingConstants;
 import javax.swing.UIManager;
 import javax.swing.border.Border;
 import javax.swing.border.TitledBorder;
 import java.awt.BorderLayout;
-import java.awt.CardLayout;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Dimension;
@@ -43,7 +39,6 @@ import java.awt.event.ItemListener;
 import java.math.RoundingMode;
 import java.text.Format;
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
 
 /**
  * @author Starryi
@@ -68,69 +63,45 @@ public class TextFormatPane extends AbstractBasicStylePane implements GlobalName
 
     private static final Integer[] DATE_TYPES = new Integer[]{FormatContents.NULL, FormatContents.DATE, FormatContents.TIME};
 
-    private Format format;
-
-    private UIComboBox typeComboBox;
-    private TextFontComboBox textField;
-    private UILabel sampleLabel;
-    private JPanel contentPane;
-    private JPanel txtCenterPane;
-    private JPanel centerPane;
-    private JPanel optionPane;
-    private UICheckBox roundingBox;
-    private JPanel formatFontPane;
+    protected UIComboBox typeComboBox;
+    protected TextFontComboBox<String> textField;
+    protected UICheckBox roundingBox;
+    protected UILabel previewLabel;
+
     private boolean isRightFormat;
     private boolean isDate = false;
     private GlobalNameListener globalNameListener = null;
 
-    /**
-     * Constructor.
-     */
     public TextFormatPane() {
-        this.initComponents(TYPES);
-    }
 
-    protected UIComboBox getTypeComboBox() {
-        return typeComboBox;
+        initFormatTypesComboBox();
+        initTextFontComboBox4GeneralFormats();
+        initRoundingCheckBox4PercentFormat();
+        initPreviewLabel4GeneralFormat();
+
+        initLayout();
+
+        setTextFieldVisible(false);
+        setRoundingBoxVisible(false);
+        setPreviewLabelVisible(false);
     }
 
-    protected void initComponents(Integer[] types) {
-        this.setLayout(new BorderLayout(0, 4));
-        initSampleLabel();
-        contentPane = new JPanel(new BorderLayout(0, 4)) {
-            @Override
-            public Dimension getPreferredSize() {
-                return new Dimension(super.getPreferredSize().width, 65);
-            }
-        };
-        typeComboBox = new UIComboBox(types);
-        UIComboBoxRenderer render = createComBoxRender();
-        typeComboBox.setRenderer(render);
+    private void initFormatTypesComboBox() {
+        typeComboBox = new UIComboBox(TextFormatPane.TYPES);
+        typeComboBox.setRenderer(createComBoxRender());
         typeComboBox.addItemListener(itemListener);
         typeComboBox.setGlobalName("typeComboBox");
-        contentPane.add(sampleLabel, BorderLayout.NORTH);
+        typeComboBox.setPreferredSize(new Dimension(155,20));
+    }
 
-        txtCenterPane = new JPanel(new BorderLayout());
-        textField = new TextFontComboBox();
+    private void initTextFontComboBox4GeneralFormats() {
+        textField = new TextFontComboBox<>();
         textField.addItemListener(textFieldItemListener);
         textField.setEditable(true);
         textField.setGlobalName("textField");
-        txtCenterPane.add(textField, BorderLayout.NORTH);
-
-        contentPane.add(txtCenterPane, BorderLayout.CENTER);
-
-        centerPane = new JPanel(new CardLayout());
-        centerPane.add(new JPanel(), "hide");
-        centerPane.setPreferredSize(new Dimension(0, 0));
-        centerPane.add(contentPane, "show");
-
-        typeComboBox.setPreferredSize(new Dimension(155,20));
-        JPanel typePane = new JPanel(new BorderLayout());
-        typePane.add(typeComboBox, BorderLayout.CENTER);
-        typePane.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 0));
+    }
 
-        JPanel option = new JPanel(new BorderLayout());
-        option.add(new UILabel(Toolkit.i18nText("Fine-Design_Report_Base_Option"), SwingConstants.LEFT), BorderLayout.WEST);
+    private void initRoundingCheckBox4PercentFormat() {
         roundingBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Report_Base_Option_Half_Up"));
         roundingBox.setBorder(BorderFactory.createEmptyBorder(0, 30, 0, 0));
         roundingBox.addItemListener(new ItemListener() {
@@ -139,54 +110,13 @@ public class TextFormatPane extends AbstractBasicStylePane implements GlobalName
             }
         });
         roundingBox.setGlobalName("roundingBox");
-        option.add(roundingBox, BorderLayout.CENTER);
-        optionPane = new JPanel(new CardLayout());
-        optionPane.add(new JPanel(), "hide");
-        optionPane.setPreferredSize(new Dimension(0, 0));
-        optionPane.add(option, "show");
-
-        Component[][] components = getComponent(centerPane, typePane);
-        this.add(createContentPane(components), BorderLayout.CENTER);
-    }
-
-    protected JPanel createContentPane (Component[][] components) {
-        double f = TableLayout.FILL;
-        double p = TableLayout.PREFERRED;
-        double[] rowSize = new double[components.length];
-        Arrays.fill(rowSize, p);
-        double[] columnSize = {p, f};
-        int[][] rowCount = new int[components.length][2];
-        Arrays.fill(rowCount, new int[] {1, 1});
-        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_LARGE, LayoutConstants.VGAP_MEDIUM);
-    }
-
-
-    protected Component[][] getComponent (JPanel centerPane, JPanel typePane) {
-        return new Component[][]{
-                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_Base_Format"), SwingConstants.LEFT), typePane},
-                new Component[]{centerPane, null},
-                new Component[]{optionPane, null},
-        };
-    }
-
-    protected UIComboBoxRenderer createComBoxRender() {
-        return new UIComboBoxRenderer() {
-            @Override
-            public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
-                JLabel label = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
-                if (value instanceof Integer) {
-                    label.setText(" " + FormatField.getInstance().getName((Integer) value));
-                }
-                return label;
-            }
-        };
     }
 
-    private void initSampleLabel() {
+    private void initPreviewLabel4GeneralFormat() {
         Border interBorder = new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 4);
         String title = Toolkit.i18nText("Fine-Design_Report_Base_StyleFormat_Sample");
         Border border = BorderFactory.createTitledBorder(interBorder, title, TitledBorder.LEFT, 0, null, UIConstants.LINE_COLOR);
-        sampleLabel = new UILabel(FormatField.getInstance().getFormatValue()) {
+        previewLabel = new UILabel(FormatField.getInstance().getFormatValue()) {
 
             @Override
             public void paint(Graphics g) {
@@ -198,12 +128,65 @@ public class TextFormatPane extends AbstractBasicStylePane implements GlobalName
                 g.setColor(UIConstants.LINE_COLOR);
                 FontMetrics cellFM = g.getFontMetrics();
                 int textWidth = cellFM.stringWidth(getText());
-                GraphHelper.drawString(g, getText(), (width - textWidth) / 2, 26);
+                GraphHelper.drawString(g, getText(), (width - textWidth) / 2F, 26);
                 g.setColor(original);
             }
         };
-        sampleLabel.setHorizontalAlignment(UILabel.CENTER);
-        sampleLabel.setBorder(border);
+        previewLabel.setHorizontalAlignment(UILabel.CENTER);
+        previewLabel.setBorder(border);
+    }
+
+    protected void initLayout() {
+        JPanel labeledFormatTypeComboBoxPane = new JPanel(new BorderLayout(20, 0));
+        labeledFormatTypeComboBoxPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Report_Base_Format")), BorderLayout.WEST);
+        labeledFormatTypeComboBoxPane.add(typeComboBox, BorderLayout.CENTER);
+
+        JPanel labeledRoundingCheckboxPane = new JPanel(new BorderLayout(0, 0));
+        labeledRoundingCheckboxPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Report_Base_Option")), BorderLayout.WEST);
+        labeledRoundingCheckboxPane.add(roundingBox, BorderLayout.CENTER);
+
+        addComponents(4, new JComponent[] { labeledFormatTypeComboBoxPane, textField, labeledRoundingCheckboxPane, previewLabel});
+    }
+
+    protected void setTextFieldVisible(boolean visible) {
+        textField.setVisible(visible);
+    }
+
+    protected void setRoundingBoxVisible(boolean visible) {
+        roundingBox.getParent().setVisible(visible);
+    }
+
+    protected void setPreviewLabelVisible(boolean visible) {
+        previewLabel.setVisible(visible);
+    }
+
+    protected void addComponents(int gap, JComponent[] components) {
+        JPanel container = this;
+        container.setLayout(new BorderLayout(0, gap));
+        for (JComponent component: components) {
+            if (component != null) {
+                container.add(component, BorderLayout.NORTH);
+                JPanel nextContainer = new JPanel(new BorderLayout(0, gap));
+                container.add(nextContainer, BorderLayout.CENTER);
+                container = nextContainer;
+            }
+        }
+        if (container.getComponentCount() == 0) {
+            container.getParent().remove(container);
+        }
+    }
+
+    protected UIComboBoxRenderer createComBoxRender() {
+        return new UIComboBoxRenderer() {
+            @Override
+            public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+                JLabel label = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+                if (value instanceof Integer) {
+                    label.setText(" " + FormatField.getInstance().getName((Integer) value));
+                }
+                return label;
+            }
+        };
     }
 
 
@@ -231,8 +214,6 @@ public class TextFormatPane extends AbstractBasicStylePane implements GlobalName
      * Populate
      */
     public void populateBean(Format format) {
-        this.format = format;
-
         if (format == null) {
             this.typeComboBox.setSelectedIndex(FormatContents.NULL);
         } else {
@@ -325,17 +306,17 @@ public class TextFormatPane extends AbstractBasicStylePane implements GlobalName
      * Refresh preview label.
      */
     private void refreshPreviewLabel() {
-        this.sampleLabel.setText(FormatField.getInstance().getFormatValue());
-        this.sampleLabel.setForeground(UIManager.getColor("Label.foreground"));
+        this.previewLabel.setText(FormatField.getInstance().getFormatValue());
+        this.previewLabel.setForeground(UIManager.getColor("Label.foreground"));
         try {
             isRightFormat = true;
             if (StringUtils.isEmpty(String.valueOf(textField.getSelectedItem()))) {
                 return;
             }
-            this.sampleLabel.setText(FormatField.getInstance().getFormatValue(getFormatContents(), String.valueOf(textField.getSelectedItem())));
+            this.previewLabel.setText(FormatField.getInstance().getFormatValue(getFormatContents(), String.valueOf(textField.getSelectedItem())));
         } catch (Exception e) {
-            this.sampleLabel.setForeground(Color.red);
-            this.sampleLabel.setText(e.getMessage());
+            this.previewLabel.setForeground(Color.red);
+            this.previewLabel.setText(e.getMessage());
             isRightFormat = false;
         }
     }
@@ -354,28 +335,16 @@ public class TextFormatPane extends AbstractBasicStylePane implements GlobalName
         public void itemStateChanged(ItemEvent e) {
             if (e.getStateChange() == ItemEvent.SELECTED) {
                 int contents = getFormatContents();
-                String[] items = FormatField.getInstance().getFormatArray(contents, false);
-                CardLayout cardLayout = (CardLayout) centerPane.getLayout();
 
-                if (isTextOrNull()) {
-                    centerPane.setPreferredSize(new Dimension(0, 0));
-                    cardLayout.show(centerPane, "hide");
-                } else {
+                if (!isTextOrNull()) {
                     textField.removeAllItems();
+                    String[] items = FormatField.getInstance().getFormatArray(contents, false);
                     textField.setItemArray(items);
                     textField.setSelectedIndex(0);
-                    centerPane.setPreferredSize(new Dimension(270, 65));
-                    cardLayout.show(centerPane, "show");
-                }
-                CardLayout optionLayout = ((CardLayout) optionPane.getLayout());
-                if (getFormatContents() == FormatContents.PERCENT) {
-                    optionPane.setPreferredSize(new Dimension(100, 20));
-                    optionLayout.show(optionPane, "show");
-                } else {
-                    optionPane.setPreferredSize(new Dimension(0, 0));
-                    optionLayout.show(optionPane, "hide");
-                    roundingBox.setSelected(false);
                 }
+                setTextFieldVisible(!isTextOrNull());
+                setPreviewLabelVisible(!isTextOrNull());
+                setRoundingBoxVisible(getFormatContents() == FormatContents.PERCENT);
             }
 
         }
@@ -403,10 +372,20 @@ public class TextFormatPane extends AbstractBasicStylePane implements GlobalName
      * update
      */
     public Style update(Style style) {
-        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), "textField")
-                || ComparatorUtils.equals(globalNameListener.getGlobalName(), "typeComboBox")
-                || ComparatorUtils.equals(globalNameListener.getGlobalName(), "roundingBox")) {
-            return style.deriveFormat(this.update());
+        return updateByGlobalNamedSetting(style);
+    }
+
+    private Style updateByGlobalNamedSetting(Style style) {
+        if (globalNameListener != null) {
+            String[] alterSettingNames = new String[] {"typeComboBox", "textField", "roundingBox"};
+            String globalSettingName =  globalNameListener.getGlobalName();
+            if (StringUtils.isNotEmpty(globalSettingName)) {
+                for (String alterSettingName : alterSettingNames) {
+                    if (ComparatorUtils.equals(alterSettingName, globalSettingName)) {
+                        return style.deriveFormat(this.update());
+                    }
+                }
+            }
         }
         return style;
     }

designer-base/src/main/java/com/fr/design/lock/LockInfoDialog.java

@@ -0,0 +1,122 @@
+package com.fr.design.lock;
+
+import com.fr.design.file.TemplateTreePane;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.DesignSizeI18nManager;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.DesignerFrameFileDealerPane;
+import com.fr.design.utils.TemplateUtils;
+import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.file.FileNodeFILE;
+import com.fr.file.filetree.FileNode;
+import com.fr.general.IOUtils;
+import com.fr.stable.StableUtils;
+import com.fr.stable.StringUtils;
+import com.fr.stable.project.ProjectConstants;
+import com.fr.workspace.base.UserInfo;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.FlowLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import javax.swing.BorderFactory;
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+
+/**
+ * @author hades
+ * @version 11.0
+ * Created by hades on 2021/12/2
+ */
+public class LockInfoDialog extends JDialog {
+
+    private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm");
+
+    public LockInfoDialog(UserInfo userInfo) {
+        super(DesignerContext.getDesignerFrame());
+        JPanel panel = new JPanel(new BorderLayout());
+        panel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0));
+        panel.add(createContentPane(userInfo), BorderLayout.CENTER);
+        panel.add(createControlPane(), BorderLayout.SOUTH);
+        this.getContentPane().add(panel);
+        this.setTitle(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Title_Hint"));
+        this.setSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.lock.LockInfoDialog"));
+        this.setResizable(false);
+        this.setModal(true);
+        GUICoreUtils.centerWindow(this);
+        this.setVisible(true);
+    }
+
+    private JPanel createContentPane(UserInfo userInfo) {
+        JPanel contentPanel = new JPanel(new BorderLayout());
+        contentPanel.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0));
+        JPanel messagePane = new JPanel(new BorderLayout(13, 0));
+        UILabel iconLabel = new UILabel(IOUtils.readIcon("/com/fr/design/images/warnings/warning32.png"));
+        iconLabel.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0));
+        messagePane.add(iconLabel, BorderLayout.WEST);
+        UILabel tipLabel = new UILabel(Toolkit.i18nText("Fine-Design_Template_Lock_And_SaveAs_Tip"));
+        tipLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+        messagePane.add(tipLabel, BorderLayout.CENTER);
+        contentPanel.add(messagePane, BorderLayout.NORTH);
+        JPanel detailInfoPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane();
+        detailInfoPane.setBorder(BorderFactory.createEmptyBorder(0, 45, 0,0));
+        if (userInfo != null && StringUtils.isNotEmpty(userInfo.getUserName())) {
+            UILabel label = createLabel(Toolkit.i18nText("Fine-Design_Template_Lock_Holder", userInfo.getUserName()));
+            label .setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+            detailInfoPane.add(label);
+        }
+        if (userInfo != null && StringUtils.isNotEmpty(userInfo.getIp())) {
+            detailInfoPane.add(createLabel(Toolkit.i18nText("Fine-Design_Template_Lock_Holder_Ip", userInfo.getIp()) ));
+        }
+        detailInfoPane.add(createLabel(Toolkit.i18nText("Fine-Design_Template_Lock_Get_Time", FORMATTER.format(LocalDateTime.now()))));
+        contentPanel.add(detailInfoPane, BorderLayout.CENTER);
+        return contentPanel;
+    }
+
+    private UILabel createLabel(String text) {
+        UILabel label = new UILabel(text);
+        label.setForeground(Color.GRAY);
+        label.setBorder(BorderFactory.createEmptyBorder(8, 0, 0, 0));
+        return label;
+    }
+
+    private  JPanel createControlPane() {
+        JPanel controlPane = new JPanel(new FlowLayout(FlowLayout.RIGHT, 10, 5));
+        controlPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0,5));
+        UIButton saveAsButton = new UIButton(Toolkit.i18nText("Fine_Design_Template_Lock_Save_As"));
+        UIButton cancelButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Button_Cancel"));
+        saveAsButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                dispose();
+                FileNode node = TemplateTreePane.getInstance().getFileNode();
+                if (node == null) {
+                    return;
+                }
+                final String selectedFilePath = StableUtils.pathJoin(ProjectConstants.REPORTLETS_NAME, TemplateTreePane.getInstance().getFilePath());
+                TemplateUtils.createAndOpenTemplate(Toolkit.i18nText("Fine_Design_Template_Lock_Copy"), new FileNodeFILE(new FileNode(selectedFilePath, false)), true);
+            }
+        });
+        cancelButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                dispose();
+            }
+        });
+        controlPane.add(saveAsButton);
+        controlPane.add(cancelButton);
+        return controlPane;
+    }
+
+
+    public static void show(UserInfo userInfo) {
+        DesignerFrameFileDealerPane.getInstance().refreshRightToolBarBy(TemplateTreePane.getInstance().getFileNode());
+        new LockInfoDialog(userInfo);
+    }
+
+}

designer-base/src/main/java/com/fr/design/lock/LockInfoUtils.java

@@ -0,0 +1,23 @@
+package com.fr.design.lock;
+
+import com.fr.report.lock.DefaultLockInfoOperator;
+import com.fr.report.lock.LockInfoOperator;
+import com.fr.start.server.FineEmbedServer;
+import com.fr.workspace.WorkContext;
+
+/**
+ * @author hades
+ * @version 11.0
+ * Created by hades on 2021/12/8
+ */
+public class LockInfoUtils {
+
+    public static boolean isCompatibleOperator() {
+        LockInfoOperator lockInfoOperator = WorkContext.getCurrent().get(LockInfoOperator.class);
+        return  lockInfoOperator instanceof DefaultLockInfoOperator;
+    }
+
+    public static boolean unableGetLockInfo() {
+        return WorkContext.getCurrent().isLocal() && !FineEmbedServer.isRunning();
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java

@@ -35,8 +35,11 @@ import com.fr.design.menu.ShortCut;
 import com.fr.design.os.impl.MacOsAddListenerAction;
 import com.fr.design.os.impl.SupportOSImpl;
 import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.design.utils.TemplateUtils;
+import com.fr.design.lock.LockInfoDialog;
 import com.fr.event.EventDispatcher;
 import com.fr.exception.DecryptTemplateException;
+import com.fr.exception.TplLockedException;
 import com.fr.exit.DesignerExiter;
 import com.fr.file.FILE;
 import com.fr.file.FILEFactory;
@@ -57,6 +60,7 @@ import com.fr.workspace.WorkContext;
 import com.fr.workspace.Workspace;
 import com.fr.workspace.connect.WorkspaceConnectionInfo;
 
+import java.util.UUID;
 import javax.swing.Icon;
 import javax.swing.JComponent;
 import javax.swing.JFrame;
@@ -678,7 +682,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
             if (!editingTemplate.getEditingFILE().exists()) {
                 path = FILEFactory.MEM_PREFIX + path;
             } else if (path.startsWith(ProjectConstants.REPORTLETS_NAME)) {
-                path = workspace.getPath() + File.separator + path;
+                path = workspace.getPath() + File.separator + TemplateUtils.createLockeTemplatedName(editingTemplate, path);
             }
             defaultTitleSB.append("    ").append(path);
         }
@@ -962,6 +966,11 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
             }
         } catch (Throwable t) {
             FineLoggerFactory.getLogger().error(t.getMessage(), t);
+            if (t.getCause() instanceof TplLockedException) {
+                TemplateTreePane.getInstance().getFileNode().setLock(UUID.randomUUID().toString());
+                LockInfoDialog.show(null);
+                return;
+            }
             addAndActivateJTemplate();
         }
 

designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java

@@ -43,6 +43,7 @@ import com.fr.file.FileNodeFILE;
 import com.fr.file.filetree.FileNode;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralContext;
+import com.fr.general.IOUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.context.PluginContext;
 import com.fr.plugin.injectable.PluginModule;
@@ -56,6 +57,7 @@ import com.fr.stable.project.ProjectConstants;
 import com.fr.third.org.apache.commons.io.FilenameUtils;
 import com.fr.workspace.WorkContext;
 
+import com.fr.report.lock.LockInfoOperator;
 import javax.swing.BorderFactory;
 import javax.swing.JDialog;
 import javax.swing.JOptionPane;
@@ -127,6 +129,8 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
 
     private UIToolbar toolBar;
 
+    private UIToolbar rightToolBar;
+
     private NewFolderAction newFolderAction = new NewFolderAction();
 
     private RefreshTreeAction refreshTreeAction = new RefreshTreeAction();
@@ -148,7 +152,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         toolBar.setBorderPainted(true);
         JPanel tooBarPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         JPanel parent = new JPanel(new BorderLayout());
-        parent.add(toolBar, BorderLayout.CENTER);
+        parent.add(createUpToolBarPane(), BorderLayout.CENTER);
         parent.setBorder(BorderFactory.createEmptyBorder(3, 0, 4, 0));
         tooBarPane.add(parent, BorderLayout.CENTER);
         tooBarPane.add(new UIMenuHighLight(), BorderLayout.SOUTH);
@@ -186,6 +190,56 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         selectedOperation.refresh();
     }
 
+    private JPanel createUpToolBarPane() {
+        JPanel panel = new JPanel(new BorderLayout());
+        panel.add(toolBar, BorderLayout.CENTER);
+        if (WorkContext.getCurrent().isRoot()) {
+            rightToolBar = new UIToolbar(FlowLayout.RIGHT);
+            rightToolBar.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIConstants.TOOLBAR_BORDER_COLOR));
+            rightToolBar.setBorderPainted(true);
+            UILabel tipLabel = new UILabel(Toolkit.i18nText("Fine_Design_Template_Lock_Status"));
+            tipLabel.setForeground(Color.GRAY);
+            rightToolBar.add(tipLabel);
+            UIButton button = new UIButton(IOUtils.readIcon("/com/fr/design/images/toolbarbtn/lock.png"));
+            button.setRolloverIcon(IOUtils.readIcon("/com/fr/design/images/toolbarbtn/unlock.png"));
+            button.setBorderPainted(false);
+            button.setContentAreaFilled(false);
+            button.set4ToolbarButton();
+            button.setToolTipText(Toolkit.i18nText("Fine_Design_Template_Unlock_Tip"));
+            button.addActionListener(new ActionListener() {
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                   int option =  FineJOptionPane.showOptionDialog(DesignerContext.getDesignerFrame(),
+                                                     Toolkit.i18nText("Fine_Design_Template_UnLock_Tip"),
+                                                                  Toolkit.i18nText("Fine-Design_Basic_Alert"),
+                                                                  JOptionPane.YES_NO_OPTION,
+                                                                  JOptionPane.WARNING_MESSAGE,
+                                                                  IOUtils.readIcon("/com/fr/design/images/warnings/warning32.png"),
+                                                                  new Object[] {Toolkit.i18nText("Fine_Design_Template_UnLock_I_Known"), Toolkit.i18nText("Fine-Design_Basic_Button_Cancel")}, null);
+                   if (option == JOptionPane.YES_OPTION) {
+                       String path = StableUtils.pathJoin(ProjectConstants.REPORTLETS_NAME, TemplateTreePane.getInstance().getTemplateFileTree().getSelectedTemplatePath());
+                       boolean success = WorkContext.getCurrent().get(LockInfoOperator.class).unLockTpl(path);
+                       if (success) {
+                           FileNode fileNode = TemplateTreePane.getInstance().getFileNode();
+                           refreshRightToolBarBy(fileNode);
+                       } else {
+                           FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
+                                                             Toolkit.i18nText("Fine-Design_Template_Unlock_Failed"),
+                                                             Toolkit.i18nText("Fine-Design_Basic_Alert"),
+                                                             JOptionPane.WARNING_MESSAGE);
+                           FineLoggerFactory.getLogger().error("Unlock {} failed", path);
+                       }
+                       TemplateTreePane.getInstance().refresh();
+                   }
+                }
+            });
+            rightToolBar.add(button);
+            refreshRightToolBarBy(TemplateTreePane.getInstance().getFileNode());
+            panel.add(rightToolBar, BorderLayout.EAST);
+        }
+        return panel;
+    }
+
     public final void setCurrentEditingTemplate(JTemplate<?, ?> jt) {
 
         DesignModelAdapter.setCurrentModelAdapter(jt.getModel());
@@ -545,6 +599,19 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         }
     }
 
+    public void refreshRightToolBarBy(FileNode fileNode) {
+        if (rightToolBar != null) {
+            boolean locked = fileNode != null
+                            && StringUtils.isNotEmpty(fileNode.getLock())
+                            && !ComparatorUtils.equals(fileNode.getLock(), fileNode.getUserID());
+            boolean visible = locked
+                              && WorkContext.getCurrent().isRoot()
+                              && WorkContext.getCurrent().get(LockInfoOperator.class).isUnLockable()
+                              && !WorkContext.getCurrent().get(LockInfoOperator.class).isTplUnLocked(fileNode.getEnvPath());
+            rightToolBar.setVisible(visible);
+        }
+    }
+
     /**
      * 重命名对话框
      * 支持快捷键Enter，ESC

designer-base/src/main/java/com/fr/design/mainframe/DesignerUIModeConfig.java

@@ -1,19 +1,16 @@
-package com.fr.design.fit;
+package com.fr.design.mainframe;
 
 import com.fr.base.ScreenResolution;
 import com.fr.design.fun.ReportLengthUNITProvider;
 import com.fr.design.unit.UnitConvertUtil;
 import com.fr.general.ComparatorUtils;
-import com.fr.general.FRScreen;
 import com.fr.stable.Constants;
 
-import java.awt.Dimension;
-
 /**
  * Created by kerry on 2020-06-05
  */
 public class DesignerUIModeConfig {
-    private DesignerUIMode mode = DesignerUIMode.NEW_UI_MODE;
+    private DesignerUIMode mode = DesignerUIMode.ABSOLUTE_MEASURE_UI_MODE;
 
     private static class DesignerUIModeConfigHolder {
         private static final DesignerUIModeConfig designerUIModeConfig = new DesignerUIModeConfig();
@@ -33,22 +30,22 @@ public class DesignerUIModeConfig {
      *
      * @return boolean
      */
-    public boolean newUIMode() {
-        return ComparatorUtils.equals(DesignerUIMode.NEW_UI_MODE, mode);
+    public boolean simulateWebUIMode() {
+        return ComparatorUtils.equals(DesignerUIMode.SIMULATE_WEB_UI_MODE, mode);
     }
 
     /**
      * 设置新ui模式
      */
-    public void setNewUIMode() {
-        this.mode = DesignerUIMode.NEW_UI_MODE;
+    public void setSimulateWebUIMode() {
+        this.mode = DesignerUIMode.SIMULATE_WEB_UI_MODE;
     }
 
     /**
      * 设置老ui模式
      */
-    public void setOldUIMode() {
-        this.mode = DesignerUIMode.OLD_UI_MODE;
+    public void setAbsoluteMeasureUIMode() {
+        this.mode = DesignerUIMode.ABSOLUTE_MEASURE_UI_MODE;
     }
 
     /**
@@ -70,55 +67,38 @@ public class DesignerUIModeConfig {
         return mode.getScreenResolution();
     }
 
-    /**
-     * 根据屏幕尺寸获取设计时的FRScreen
-     *
-     * @param screen 屏幕尺寸
-     * @return FRScreen
-     */
-    public FRScreen getDesignScreenByDimension(Dimension screen) {
-        return mode.getDesignScreenByDimension(screen);
-    }
 
     private enum DesignerUIMode {
-        OLD_UI_MODE {
+        ABSOLUTE_MEASURE_UI_MODE {
             @Override
             protected ReportLengthUNITProvider parseLengthUNIT(int unitType) {
                 return UnitConvertUtil.parseLengthUNIT(unitType);
             }
 
-            @Override
-            protected FRScreen getDesignScreenByDimension(Dimension screen) {
-                return FRScreen.getDesignScreenByDimension(screen);
-            }
-
             @Override
             protected int getScreenResolution() {
                 return ScreenResolution.getScreenResolution();
             }
+
         },
-        NEW_UI_MODE {
+        SIMULATE_WEB_UI_MODE {
             @Override
             protected ReportLengthUNITProvider parseLengthUNIT(int unitType) {
                 return new PXReportLengthUNIT();
             }
 
-            @Override
-            protected FRScreen getDesignScreenByDimension(Dimension screen) {
-                return FRScreen.p1440;
-            }
-
             @Override
             protected int getScreenResolution() {
                 return Constants.DEFAULT_WEBWRITE_AND_SCREEN_RESOLUTION;
             }
+
         };
 
         protected abstract ReportLengthUNITProvider parseLengthUNIT(int unitType);
 
-        protected abstract FRScreen getDesignScreenByDimension(Dimension screen);
 
         protected abstract int getScreenResolution();
+
     }
 
 }

designer-base/src/main/java/com/fr/design/mainframe/DesktopCardPane.java

@@ -11,9 +11,11 @@ import com.fr.design.dialog.BasicPane;
 import com.fr.design.event.TargetModifiedEvent;
 import com.fr.design.event.TargetModifiedListener;
 import com.fr.design.gui.itoolbar.UIToolbar;
+import com.fr.design.utils.LoadingUtils;
 
 import javax.swing.JComponent;
 import javax.swing.JLayeredPane;
+import javax.swing.JPanel;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.util.HashMap;
@@ -30,12 +32,14 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener
     private static final int TRANSPARENT_LAYER = 1;
     private static final int LOADING_LAYER = 2;
     private static final int FAILED_LAYER = 3;
+    private static final int FORBIDDEN_LAYER = 4;
 
     private static final long serialVersionUID = 1L;
     private JTemplate<?, ?> component;
     private TransparentPane transparentPane = new TransparentPane();
-    private OpenLoadingPane loadingPane = new OpenLoadingPane();
+    private JPanel loadingPane = LoadingUtils.createLoadingPane();
     private OpenFailedPane failedPane = new OpenFailedPane();
+    private ForbiddenPane forbiddenPane = new ForbiddenPane();
 
     Map<Component, Boolean> backUpToolbarComponentState = new HashMap<>();
 
@@ -52,6 +56,7 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener
         setLayout(new BorderLayout());
         layeredPane.add(transparentPane, TRANSPARENT_LAYER);
         layeredPane.add(failedPane, FAILED_LAYER);
+        layeredPane.add(forbiddenPane, FORBIDDEN_LAYER);
         add(layeredPane, BorderLayout.CENTER);
     }
 
@@ -93,6 +98,8 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener
             showOpenStatus();
         } else if (jt.isOpenFailed()) {
             showOpenFailedCover(jt.getTemplateOpenFailedTip());
+        } else if (jt.isForbidden()) {
+            showForbiddenStatus();
         } else {
             hideCover();
         }
@@ -138,6 +145,13 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener
         }
     }
 
+    public void showForbiddenStatus() {
+        component.setVisible(false);
+        layeredPane.moveToFront(forbiddenPane);
+        forbidToolBar();
+        EastRegionContainerPane.getInstance().updateAllPropertyPane();
+    }
+
     public void hideCover() {
         recoverToolBar();
         transparentPane.stop();

designer-base/src/main/java/com/fr/design/mainframe/ForbiddenPane.java

@@ -0,0 +1,190 @@
+package com.fr.design.mainframe;
+
+import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.DesignSizeI18nManager;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.guide.base.GuideView;
+import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.general.IOUtils;
+import com.fr.log.FineLoggerFactory;
+import com.fr.workspace.WorkContext;
+import com.fr.report.lock.LockInfoOperator;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.LayoutManager;
+import java.awt.RenderingHints;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.SwingWorker;
+
+/**
+ * @author hades
+ * @version 11.0
+ * Created by hades on 2021/12/6
+ */
+public class ForbiddenPane extends JPanel {
+
+    private static final ImageIcon LOCK_ICON = new ImageIcon(IOUtils.readImage("/com/fr/design/images/mainframe/lock_template.png"));
+    private static final Color TIP_COLOR = new Color(108, 174, 235);
+    private static final Color BUTTON_COLOR = new Color(63, 155, 249);
+    private static final int Y_GAP = 10;
+    private static final int X_GAP = 10;
+    private static final int ARC = 4;
+
+    private final UILabel lockLabel;
+    private final UILabel tipLabel;
+    private final JButton refreshButton;
+
+    public ForbiddenPane() {
+
+        setLayout(new LayoutManager() {
+
+            @Override
+            public void removeLayoutComponent(Component comp) {
+            }
+
+            @Override
+            public Dimension preferredLayoutSize(Container parent) {
+                return parent.getPreferredSize();
+            }
+
+            @Override
+            public Dimension minimumLayoutSize(Container parent) {
+                return null;
+            }
+
+            @Override
+            public void layoutContainer(Container parent) {
+                int width = parent.getParent().getWidth();
+                int height = parent.getParent().getHeight();
+                int lockLabelWidth = lockLabel.getPreferredSize().width;
+                int lockLabelHeight = lockLabel.getPreferredSize().height;
+                int lockLabelX = (width - lockLabelWidth) / 2;
+                int lockLabelY = (height - lockLabelHeight) / 2;
+                int tipLabelWidth = tipLabel.getPreferredSize().width;
+                int tipLabelHeight = tipLabel.getPreferredSize().height;
+                int tipLabelX = (width - tipLabelWidth) / 2 + X_GAP;
+                int tipLabelY = lockLabelY + lockLabelHeight;
+                int refreshButtonWidth = refreshButton.getPreferredSize().width;
+                int refreshButtonHeight = refreshButton.getPreferredSize().height;
+                int refreshButtonX = (width - refreshButtonWidth) / 2 + X_GAP;
+                int refreshButtonY = tipLabelY + refreshButtonHeight + Y_GAP;
+                lockLabel.setBounds(lockLabelX, lockLabelY, lockLabelWidth, lockLabelHeight);
+                tipLabel.setBounds(tipLabelX, tipLabelY, tipLabelWidth, tipLabelHeight);
+                refreshButton.setBounds(refreshButtonX, refreshButtonY, refreshButtonWidth, refreshButtonHeight);
+            }
+
+            @Override
+            public void addLayoutComponent(String name, Component comp) {
+            }
+        });
+        setBackground(Color.WHITE);
+        lockLabel = new UILabel(LOCK_ICON);
+        tipLabel = new UILabel(Toolkit.i18nText("Fine_Design_Template_Has_Been_Locked_Tip"));
+        Font labelFont = tipLabel.getFont();
+        tipLabel.setFont(new Font(labelFont.getName(), labelFont.getStyle(), 14));
+        tipLabel.setForeground(TIP_COLOR);
+        refreshButton = new JButton(Toolkit.i18nText("Fine-Design_Basic_Refresh")) {
+            @Override
+            public void paintComponent(Graphics g) {
+                Graphics2D g2d = (Graphics2D) g;
+                g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+                g2d.setColor(BUTTON_COLOR);
+                g2d.fillRoundRect(0, 0, getWidth(), getHeight(), ARC, ARC);
+                super.paintComponent(g2d);
+            }
+        };
+        refreshButton.setPreferredSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.mainframe.ForbiddenPane.refreshButton"));
+        refreshButton.setForeground(Color.WHITE);
+        refreshButton.setBorderPainted(false);
+        refreshButton.setContentAreaFilled(false);
+        refreshButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                final JTemplate<?, ?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+                if (template == null) {
+                    return;
+                }
+                // 展示下画面
+                LoadingDialog loadingDialog = new LoadingDialog();
+                loadingDialog.showDialog();
+                new SwingWorker<Boolean, Void>(){
+
+                    @Override
+                    protected Boolean doInBackground() throws Exception {
+                        return WorkContext.getCurrent().get(LockInfoOperator.class).isTplLocked(template.getEditingFILE().getPath());
+                    }
+
+                    @Override
+                    protected void done() {
+                        boolean unLocked;
+                        loadingDialog.hideDialog();
+                        try {
+                            unLocked = !get();
+                            if (unLocked) {
+                                template.whenClose();
+                                JTemplate<?, ?> newTemplate = JTemplateFactory.createJTemplate(template.getEditingFILE());
+                                HistoryTemplateListCache.getInstance().replaceCurrentEditingTemplate(newTemplate);
+                                DesignerContext.getDesignerFrame().addAndActivateJTemplate(newTemplate);
+                            }
+                        } catch (Exception e) {
+                            loadingDialog.hideDialog();
+                            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                        }
+                    }
+                }.execute();
+            }
+        });
+        add(lockLabel);
+        add(tipLabel);
+        add(refreshButton);
+    }
+}
+
+class LoadingDialog extends JDialog {
+
+    private static final ImageIcon LOADING_ICON = new ImageIcon(IOUtils.readImage("/com/fr/design/images/mainframe/refreh_icon.png"));
+
+    private GuideView guideView;
+
+    public LoadingDialog() {
+        super(DesignerContext.getDesignerFrame());
+        setLayout(new BorderLayout());
+        this.getContentPane().setBackground(Color.WHITE);
+        this.setResizable(false);
+        this.setUndecorated(true);
+        this.setAlwaysOnTop(true);
+        this.setModal(false);
+        this.setSize(new Dimension(400, 100));
+        this.add(new UILabel(LOADING_ICON, UILabel.CENTER), BorderLayout.NORTH);
+        this.add(new UILabel(Toolkit.i18nText(Toolkit.i18nText("Fine_Design_Template_Refresh")), UILabel.CENTER), BorderLayout.CENTER);
+        GUICoreUtils.centerWindow(this);
+    }
+
+    public void showDialog() {
+        DesignerContext.getDesignerFrame().setExtendedState(JFrame.MAXIMIZED_BOTH);
+        guideView = new GuideView(DesignerContext.getDesignerFrame());
+        GUICoreUtils.centerWindow(DesignerContext.getDesignerFrame(), guideView);
+        guideView.setBounds(DesignerContext.getDesignerFrame().getBounds());
+        guideView.setVisible(true);
+        this.setVisible(true);
+    }
+
+    public void hideDialog() {
+        this.dispose();
+        guideView.dismissGuide();
+    }
+
+}

designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java

@@ -58,6 +58,7 @@ import com.fr.design.ui.util.UIUtil;
 import com.fr.design.utils.DesignUtils;
 import com.fr.design.worker.save.CallbackSaveWorker;
 import com.fr.design.worker.save.EmptyCallBackSaveWorker;
+import com.fr.design.worker.save.SaveFailureHandler;
 import com.fr.design.write.submit.DBManipulationInWidgetEventPane;
 import com.fr.design.write.submit.DBManipulationPane;
 import com.fr.event.EventDispatcher;
@@ -83,8 +84,11 @@ import com.fr.plugin.observer.PluginEvent;
 import com.fr.plugin.observer.PluginEventListener;
 import com.fr.plugin.observer.PluginEventType;
 import com.fr.plugin.observer.PluginListenerRegistration;
+import com.fr.report.InconsistentLockException;
+import com.fr.report.UnLockedException;
 import com.fr.report.cell.Elem;
 import com.fr.report.cell.cellattr.CellImage;
+import com.fr.report.lock.LockInfoOperator;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Filter;
 import com.fr.stable.ProductConstants;
@@ -124,6 +128,8 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     protected U authorityUndoState = null;
     protected T template; // 当前模板
     private boolean isNewCreateTpl = false; //当前模板是否为新建模板
+    private volatile boolean forbidden;
+
     /**
      * 模板过程的相关信息
      *
@@ -640,6 +646,8 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
      */
     public void redo() {
         this.getUndoManager().redo();
+        // 重做前模版使用主题可能已经被删除或修改，需要重置模版样式
+        checkAndResetTheme();
         fireSuperTargetModified();
     }
 
@@ -959,10 +967,11 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
             return false;
         }
         try {
+            checkBeforeSave();
             export();
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
-            JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), e.getMessage(), "Save Error", JOptionPane.ERROR_MESSAGE);
+            SaveFailureHandler.getInstance().process(e);
             return false;
         }
         this.editingFILE = editingFILE;
@@ -977,6 +986,17 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         return isNewCreateTpl;
     }
 
+    protected void checkBeforeSave() throws Exception {
+        // 保存前校验下未解锁
+        if (WorkContext.getCurrent().get(LockInfoOperator.class).isTplUnLocked(getEditingFILE().getPath())) {
+            throw new UnLockedException();
+        }
+        // 校验锁定信息是否一致
+        if (getEditingFILE().exists() && !WorkContext.getCurrent().get(LockInfoOperator.class).isConsistentLock(getEditingFILE().getPath())) {
+            throw new InconsistentLockException();
+        }
+    }
+
     protected boolean export() throws Exception {
         return this.getTarget().export(TemplateResourceManager.getResource().saveTemplate(getEditingFILE()));
 
@@ -1618,6 +1638,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
             if (editingFILE == null || editingFILE instanceof MemFILE) {
                 return false;
             }
+            checkBeforeSave();
             export();
             this.editingFILE = editingFILE;
             return true;
@@ -1806,8 +1827,16 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         this.openFailed = openFailed;
     }
 
+    public boolean isForbidden() {
+        return forbidden;
+    }
+
+    public void setForbidden(boolean forbidden) {
+        this.forbidden = forbidden;
+    }
+
     public boolean checkEnable() {
-        return !isSaving() && !isOpening() && !isOpenFailed();
+        return !isSaving() && !isOpening() && !isOpenFailed() && !isForbidden();
     }
 
     public String getRuntimeId() {
@@ -1840,4 +1869,13 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         templateThemeButton.setText(name);
         templateThemeButton.setToolTipText(name);
     }
+
+    public void generateForBiddenTemplate() {
+
+    }
+
+    public void setDesignerUIMode(){
+        DesignerUIModeConfig.getInstance().setAbsoluteMeasureUIMode();
+    }
+
 }

designer-base/src/main/java/com/fr/design/mainframe/NorthRegionContainerPane.java

@@ -151,7 +151,7 @@ public class NorthRegionContainerPane extends JPanel {
                 public void execute(Object... objects) {
                     bbsLoginPane[0] = ad.createBBSLoginPane();
                 }
-            }, SupportOSImpl.USERINFOPANE);
+            }, SupportOSImpl. BBS_USER_LOGIN_PANE);
             processor.hold(northEastPane, LogMessageBar.getInstance(), bbsLoginPane[0]);
         }
         northEastPane.add(ad.createAlphaFinePane());
@@ -166,7 +166,7 @@ public class NorthRegionContainerPane extends JPanel {
             public void execute(Object... objects) {
                 northEastPane.add(ad.createBBSLoginPane());
             }
-        }, SupportOSImpl.USERINFOPANE);
+        }, SupportOSImpl.BBS_USER_LOGIN_PANE);
 
     }
 

designer-base/src/main/java/com/fr/design/mainframe/PX.java

@@ -1,4 +1,4 @@
-package com.fr.design.fit;
+package com.fr.design.mainframe;
 
 import com.fr.stable.Constants;
 import com.fr.stable.unit.LEN_UNIT;

designer-base/src/main/java/com/fr/design/mainframe/PXReportLengthUNIT.java

@@ -1,4 +1,4 @@
-package com.fr.design.fit;
+package com.fr.design.mainframe;
 
 import com.fr.design.fun.impl.AbstractReportLengthUNITProvider;
 import com.fr.stable.unit.UNIT;

designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ColorBackgroundQuickPane.java

@@ -19,7 +19,17 @@ public class ColorBackgroundQuickPane extends BackgroundQuickPane {
 
     public ColorBackgroundQuickPane() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        colorSelectBox = new NewColorSelectBox(100);
+        colorSelectBox = new NewColorSelectBox(100) {
+            @Override
+            public boolean shouldResponseChangeListener() {
+                // ColorBackgroundQuickPane注册监听器ChangeListenerImpl的逻辑不能丢，因为里面有修改字段backgroundChange的逻辑.
+                // 所以在监听器重复注册以及UndoState重复生成时，应该保留ChangeListenerImpl, 而放弃NewColorSelectBox内部自己注册
+                // ChangeListener
+                // REPORT-63760 【主题切换】撤销以后，样式设置有问题
+                // REPORT-64006 【模板主题】单元格自定义样式背景色设置不生效
+                return false;
+            }
+        };
         this.add(colorSelectBox, BorderLayout.NORTH);
     }
 
@@ -40,11 +50,6 @@ public class ColorBackgroundQuickPane extends BackgroundQuickPane {
        return this.colorSelectBox.getSelectObject();
     }
 
-    /**
-     * 给组件登记一个观察者监听事件
-     *
-     * @param listener 观察者监听事件
-     */
     @Override
     public void registerChangeListener(final UIObserverListener listener) {
         this.colorSelectBox.addSelectChangeListener(new ChangeListenerImpl(listener));

designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogAppender.java

@@ -1,41 +1,41 @@
 package com.fr.design.mainframe.loghandler;
 
-
-import com.fr.third.apache.log4j.AppenderSkeleton;
-import com.fr.third.apache.log4j.Level;
-import com.fr.third.apache.log4j.spi.LoggingEvent;
-
+import com.fr.third.apache.logging.log4j.Level;
+import com.fr.third.apache.logging.log4j.core.Filter;
+import com.fr.third.apache.logging.log4j.core.Layout;
+import com.fr.third.apache.logging.log4j.core.LogEvent;
+import com.fr.third.apache.logging.log4j.core.appender.AbstractAppender;
+import com.fr.third.apache.logging.log4j.core.config.Property;
+import com.fr.third.apache.logging.log4j.core.layout.PatternLayout;
+import java.io.Serializable;
 import java.util.Date;
 
 /**
  * Created by Administrator on 2017/7/18 0018.
  */
-public class DesignerLogAppender extends AppenderSkeleton {
+public class DesignerLogAppender extends AbstractAppender {
 
-    public DesignerLogAppender() {
-        this.layout = new com.fr.third.apache.log4j.PatternLayout("%d{HH:mm:ss} %t %p [%c] %m%n");
+    protected DesignerLogAppender(String name, Filter filter,
+                                  Layout<? extends Serializable> layout,
+                                  boolean ignoreExceptions,
+                                  Property[] properties) {
+        super(name, filter, layout, ignoreExceptions, properties);
     }
 
-    protected void append(LoggingEvent event) {
-        this.subAppend(event);
+    public static DesignerLogAppender createDesignerLogAppender() {
+        return new DesignerLogAppender(DesignerLogAppender.class.getSimpleName(), null, PatternLayout.newBuilder().withPattern("%d{HH:mm:ss} %t %p [%c] %m%n %throwable{0}").build(), false,  Property.EMPTY_ARRAY);
     }
 
-    public boolean requiresLayout() {
-        return true;
+    @Override
+    public void append(LogEvent event) {
+        this.subAppend(event);
     }
 
-    public synchronized void close() {
-        if (this.closed) {
-            return;
-        }
-        this.closed = true;
-
-    }
 
-    public void subAppend(LoggingEvent event) {
+    public void subAppend(LogEvent event) {
         synchronized (DesignerLogHandler.getInstance()) {
             Level level = event.getLevel();
-            String msg = this.layout.format(event);
+            String msg = (String) this.toSerializable(event);
             DesignerLogHandler.getInstance().printRemoteLog(msg, level, new Date());
         }
     }

designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java

@@ -9,10 +9,9 @@ import com.fr.general.ComparatorUtils;
 import com.fr.general.log.Log4jConfig;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
-import com.fr.third.apache.log4j.Level;
-import com.fr.third.apache.log4j.spi.LoggingEvent;
-import com.fr.third.apache.log4j.spi.ThrowableInformation;
 
+import com.fr.third.apache.logging.log4j.Level;
+import com.fr.third.apache.logging.log4j.core.LogEvent;
 import javax.swing.AbstractAction;
 import javax.swing.ActionMap;
 import javax.swing.InputMap;
@@ -128,7 +127,7 @@ public class DesignerLogHandler {
 
                 JPopupMenu jPopupMenu = new JPopupMenu();
 
-                int logLevelInt = Log4jConfig.getInstance().getRootLevel().toInt();
+                int logLevelInt = Log4jConfig.getInstance().getRootLevel().intLevel();
                 if (logLevelInt <= DesignerLogger.INFO_INT) {
                     jPopupMenu.add(showInfo);
                     jPopupMenu.add(showError);
@@ -240,23 +239,22 @@ public class DesignerLogHandler {
             return resultPane;
         }
 
-        public void printStackTrace(LoggingEvent event) {
+        public void printStackTrace(LogEvent event) {
 
-            int intLevel = event.getLevel().toInt();
-            Date date = new Date(event.getTimeStamp());
-            ThrowableInformation information = event.getThrowableInformation();
+            int intLevel = event.getLevel().intLevel();
+            Date date = new Date(event.getTimeMillis());
             if (intLevel == DesignerLogger.INFO_INT && showInfo.isSelected()) {
-                printMessage(event.getRenderedMessage(), intLevel, date, information == null ? null : information.getThrowable());
+                printMessage(event.getMessage().getFormattedMessage(), intLevel, date, event.getThrown());
             } else if (intLevel == DesignerLogger.ERROR_INT && showError.isSelected()) {
-                printMessage(event.getRenderedMessage(), intLevel, date, information == null ? null : information.getThrowable());
+                printMessage(event.getMessage().getFormattedMessage(), intLevel, date, event.getThrown());
             } else if (intLevel == DesignerLogger.WARN_INT && showServer.isSelected()) {
-                printMessage(event.getRenderedMessage(), intLevel, date, information == null ? null : information.getThrowable());
+                printMessage(event.getMessage().getFormattedMessage(), intLevel, date, event.getThrown());
             }
         }
 
         public void printStackTrace(String message, Level level, Date date) {
 
-            int intLevel = level.toInt();
+            int intLevel = level.intLevel();
             if (intLevel == DesignerLogger.INFO_INT && showInfo.isSelected()) {
                 printMessage(message, intLevel, date);
             } else if (intLevel == DesignerLogger.ERROR_INT && showError.isSelected()) {

designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogger.java

@@ -1,26 +1,25 @@
 package com.fr.design.mainframe.loghandler;
 
 import com.fr.log.FineLoggerFactory;
-import com.fr.third.apache.log4j.Level;
-import com.fr.third.apache.log4j.spi.LoggingEvent;
-import com.fr.third.apache.log4j.spi.ThrowableInformation;
+import com.fr.third.apache.logging.log4j.Level;
+import com.fr.third.apache.logging.log4j.core.LogEvent;
 
 /**
  * 设计器日志记录
  */
 public class DesignerLogger {
-    public static final int INFO_INT = Level.INFO.toInt();
+    public static final int INFO_INT = Level.INFO.intLevel();
 
-    public static final int ERROR_INT = Level.ERROR.toInt();
+    public static final int ERROR_INT = Level.ERROR.intLevel();
 
-    public static final int WARN_INT = Level.WARN.toInt();
+    public static final int WARN_INT = Level.WARN.intLevel();
 
     /**
      * 记录LoggingEvent对象
      *
      * @param event
      */
-    public static void log(LoggingEvent event) {
+    public static void log(LogEvent event) {
         if (event == null) {
             return;
         }
@@ -30,29 +29,27 @@ public class DesignerLogger {
     public enum LogParser {
         DEFAULT(-1) {
             @Override
-            public void log(LoggingEvent event) {
+            public void log(LogEvent event) {
 
             }
         },
-        INFO(Level.INFO.toInt()) {
+        INFO(Level.INFO.intLevel()) {
             @Override
-            public void log(LoggingEvent event) {
-                FineLoggerFactory.getLogger().info(event.getRenderedMessage());
+            public void log(LogEvent event) {
+                FineLoggerFactory.getLogger().info(event.getMessage().getFormattedMessage());
             }
         },
-        WARN(Level.WARN.toInt()) {
+        WARN(Level.WARN.intLevel()) {
             @Override
-            public void log(LoggingEvent event) {
-                ThrowableInformation information = event.getThrowableInformation();
-                FineLoggerFactory.getLogger().warn(event.getRenderedMessage(), information == null ? null : information.getThrowable());
+            public void log(LogEvent event) {
+                FineLoggerFactory.getLogger().warn(event.getMessage().getFormattedMessage(), event.getThrown());
             }
         },
 
-        ERROR(Level.ERROR.toInt()) {
+        ERROR(Level.ERROR.intLevel()) {
             @Override
-            public void log(LoggingEvent event) {
-                ThrowableInformation information = event.getThrowableInformation();
-                FineLoggerFactory.getLogger().error(event.getRenderedMessage(), information == null ? null : information.getThrowable());
+            public void log(LogEvent event) {
+                FineLoggerFactory.getLogger().error(event.getMessage().getFormattedMessage(), event.getThrown());
             }
         };
         private int level;
@@ -65,8 +62,8 @@ public class DesignerLogger {
             return level;
         }
 
-        public static LogParser parse(LoggingEvent event) {
-            int intLevel = event.getLevel().toInt();
+        public static LogParser parse(LogEvent event) {
+            int intLevel = event.getLevel().intLevel();
             for (LogParser logParser : values()) {
                 if (logParser.getLevel() == intLevel) {
                     return logParser;
@@ -76,7 +73,7 @@ public class DesignerLogger {
 
         }
 
-        public void log(LoggingEvent event) {
+        public void log(LogEvent event) {
         }
     }
 }

designer-base/src/main/java/com/fr/design/mainframe/share/ComponentShareUtil.java

@@ -2,11 +2,14 @@ package com.fr.design.mainframe.share;
 
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.locale.impl.ShowOnlineWidgetMark;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.mainframe.reuse.ComponentReuseNotificationInfo;
 import com.fr.form.share.constants.ComponentPath;
 import com.fr.form.share.group.filter.ReuFilter;
 import com.fr.design.DesignerCloudURLManager;
+import com.fr.general.locale.LocaleCenter;
+import com.fr.general.locale.LocaleMark;
 import com.fr.workspace.WorkContext;
 
 /**
@@ -23,7 +26,12 @@ public class ComponentShareUtil {
      * @return
      */
     public static boolean needSwitch2OnlineTab() {
-        return DesignerCloudURLManager.getInstance().isConnected() && !hasTouched() && isCurrentTplNewCreate();
+        return DesignerCloudURLManager.getInstance().isConnected() && !hasTouched() && isCurrentTplNewCreate() && isShowOnlineWidgetRepoPane();
+    }
+
+    public static boolean isShowOnlineWidgetRepoPane() {
+        LocaleMark<Boolean> localeMark = LocaleCenter.getMark(ShowOnlineWidgetMark.class);
+        return localeMark.getValue();
     }
 
     /**

designer-base/src/main/java/com/fr/design/mainframe/theme/ThemedCellStyleListPane.java

@@ -1,22 +1,21 @@
-package com.fr.design.mainframe.cell.settingpane.style;
+package com.fr.design.mainframe.theme;
 
-import com.fr.base.NameStyle;
-import com.fr.base.Style;
 import com.fr.base.theme.TemplateTheme;
 import com.fr.base.theme.settings.ThemedCellStyle;
 import com.fr.design.beans.FurtherBasicBeanPane;
-import com.fr.design.cell.CellStylePreviewPane;
+import com.fr.design.cell.CellRectangleStylePreviewPane;
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.gui.ibutton.UIRadioButton;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerBean;
-import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.general.ComparatorUtils;
+import com.fr.general.IOUtils;
 
 import javax.swing.BorderFactory;
 import javax.swing.DefaultListModel;
+import javax.swing.Icon;
 import javax.swing.JList;
 import javax.swing.JPanel;
 import javax.swing.ListCellRenderer;
@@ -27,21 +26,22 @@ import javax.swing.event.ListSelectionListener;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Dimension;
+import java.awt.Graphics;
 import java.io.Serializable;
 import java.util.List;
 
-public class ThemedCellStyleListPane extends FurtherBasicBeanPane<NameStyle> implements DesignerBean {
+public class ThemedCellStyleListPane extends FurtherBasicBeanPane<ThemedCellStyle> implements DesignerBean {
 
     private static final int LEFT_BORDER = 10;
     private static final int RIGHT_BORDER = 10;
-    private final DefaultListModel<NameStyle> defaultListModel;
-    private final JList<NameStyle> styleList;
+    private final DefaultListModel<ThemedCellStyle> defaultListModel;
+    private final JList<ThemedCellStyle> styleList;
     private ChangeListener changeListener;
 
-    public ThemedCellStyleListPane() {
+    public ThemedCellStyleListPane(boolean supportInnerBorder) {
         defaultListModel = new DefaultListModel<>();
         styleList = new JList<>(defaultListModel);
-        styleList.setCellRenderer(new RadioButtonListCellRenderer());
+        styleList.setCellRenderer(new RadioButtonListCellRangeRenderer(supportInnerBorder));
         styleList.setOpaque(false);
         styleList.setBackground(null);
         styleList.addListSelectionListener(new ListSelectionListener() {
@@ -55,15 +55,8 @@ public class ThemedCellStyleListPane extends FurtherBasicBeanPane<NameStyle> imp
         setLayout(FRGUIPaneFactory.createBorderLayout());
         add(styleList, BorderLayout.CENTER);
         setBorder(BorderFactory.createEmptyBorder(0 ,LEFT_BORDER, 0, RIGHT_BORDER));
-
-        DesignerContext.setDesignerBean("predefinedStyle", this);
     }
 
-    /**
-     * 添加改变监听
-     *
-     * @param changeListener 监听事件
-     */
     public void addChangeListener(ChangeListener changeListener) {
         this.changeListener = changeListener;
     }
@@ -77,7 +70,7 @@ public class ThemedCellStyleListPane extends FurtherBasicBeanPane<NameStyle> imp
     }
 
     @Override
-    public void populateBean(NameStyle ob) {
+    public void populateBean(ThemedCellStyle ob) {
         refreshBeanElement();
         if (ob == null) {
             styleList.setSelectedIndex(0);
@@ -92,32 +85,21 @@ public class ThemedCellStyleListPane extends FurtherBasicBeanPane<NameStyle> imp
     }
 
     @Override
-    public NameStyle updateBean() {
+    public ThemedCellStyle updateBean() {
         return styleList.getSelectedValue();
     }
 
-    /**
-     * 获取面板标题
-     *
-     * @return 标题
-     */
+    @Override
     public String title4PopupWindow() {
         return Toolkit.i18nText("Fine-Design_Report_Predefined_Style");
     }
 
-    /**
-     * 是否可以接纳对象
-     *
-     * @param ob 组件对象
-     * @return 是否可以接纳对象
-     */
+    @Override
     public boolean accept(Object ob) {
-        return ob instanceof NameStyle;
+        return ob instanceof ThemedCellStyle;
     }
 
-    /**
-     * 刷新组件对象
-     */
+    @Override
     public void refreshBeanElement() {
         defaultListModel.removeAllElements();
         JTemplate<?, ?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
@@ -125,36 +107,48 @@ public class ThemedCellStyleListPane extends FurtherBasicBeanPane<NameStyle> imp
             TemplateTheme theme = template.getTemplateTheme();
             List<ThemedCellStyle> styleList = theme.getCellStyleList().getCellStyleList();
             for (ThemedCellStyle themedCellStyle: styleList) {
-                String name = themedCellStyle.getName();
-                Style realStyle = themedCellStyle.getStyle();
-                NameStyle nameStyle = NameStyle.getPassiveInstance(name, realStyle);
-                defaultListModel.addElement(nameStyle);
+                defaultListModel.addElement(themedCellStyle);
             }
         }
         styleList.setModel(defaultListModel);
     }
 
-    private static class RadioButtonListCellRenderer extends JPanel implements ListCellRenderer<Object>, Serializable {
+    private static class RadioButtonListCellRangeRenderer extends JPanel implements ListCellRenderer<ThemedCellStyle>, Serializable {
+
+        private static final Icon selectedMarkIcon = IOUtils.readIcon("/com/fr/design/form/images/marked.png");
 
-        private final UIRadioButton button;
-        private final CellStylePreviewPane previewArea;
+        private final CellRectangleStylePreviewPane previewArea;
+        private boolean selected = false;
 
-        public RadioButtonListCellRenderer() {
+        public RadioButtonListCellRangeRenderer(boolean supportInnerBorder) {
             super();
-            setLayout(new BorderLayout(20, 0));
-            setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-            setPreferredSize(new Dimension(getPreferredSize().width, 40));
-            button = new UIRadioButton();
-            previewArea = new CellStylePreviewPane();
-            add(button, BorderLayout.WEST);
+            setLayout(new BorderLayout(5, 0));
+            setBorder(BorderFactory.createEmptyBorder(5, 0, 5, 0));
+            previewArea = new CellRectangleStylePreviewPane(supportInnerBorder);
             add(previewArea, BorderLayout.CENTER);
         }
 
         @Override
-        public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
-            button.setSelected(isSelected);
-            previewArea.setStyle((Style) value);
+        public Component getListCellRendererComponent(JList<? extends ThemedCellStyle> list, ThemedCellStyle value, int index, boolean isSelected, boolean cellHasFocus) {
+            this.selected = isSelected;
+            previewArea.setPlainText(value.getName());
+            previewArea.setStyle(value.getStyle(), value.getCellBorderStyle());
+
+            int preferredWidth = list.getWidth() - 15;
+            preferredWidth = Math.max(0, preferredWidth);
+            int preferredHeight = 0;
+            previewArea.setPreferredSize(new Dimension(preferredWidth, preferredHeight));
+
             return this;
         }
+
+        @Override
+        public void paint(Graphics g) {
+            super.paint(g);
+
+            if (selected) {
+                selectedMarkIcon.paintIcon(this, g, getWidth() - selectedMarkIcon.getIconWidth(), 5);
+            }
+        }
     }
 }

designer-base/src/main/java/com/fr/design/mainframe/theme/ThemedFeatureController.java

@@ -0,0 +1,17 @@
+package com.fr.design.mainframe.theme;
+
+import com.fr.workspace.WorkContext;
+import com.fr.workspace.server.theme.SupportThemedCellInnerBorderFeature;
+import com.fr.workspace.server.theme.ThemedCellBorderFeature;
+
+/**
+ * @author Starryi
+ * @version 1.0
+ * Created by Starryi on 2021/11/26
+ */
+public class ThemedFeatureController {
+    public static boolean isCellStyleSupportInnerBorder() {
+        ThemedCellBorderFeature controller = WorkContext.getCurrent().get(ThemedCellBorderFeature.class);
+        return controller instanceof SupportThemedCellInnerBorderFeature;
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/theme/dialog/TemplateThemeDialog.java

@@ -28,15 +28,14 @@ public abstract class TemplateThemeDialog extends JDialog {
 
     private final JPanel contentContainer;
     private final JPanel actionContainer;
+    private final int dialogContentHeight;
 
     public TemplateThemeDialog(Window parent, String title, int contentWidth, int contentHeight) {
         super(parent, ModalityType.APPLICATION_MODAL);
-
         setTitle(title);
         setResizable(false);
         setLayout(FRGUIPaneFactory.createBorderLayout());
-
-        int dialogContentHeight = contentHeight + DIALOG_BOTTOM_ACTION_BAR_HEIGHT;
+        dialogContentHeight = contentHeight + DIALOG_BOTTOM_ACTION_BAR_HEIGHT;
         int dialogWindowHeight = dialogContentHeight + DIALOG_TITLE_HEIGHT;
 
         setSize(new Dimension(contentWidth, dialogWindowHeight));
@@ -54,6 +53,12 @@ public abstract class TemplateThemeDialog extends JDialog {
         setContentPane(contentContainer);
     }
 
+    @Override
+    public void doLayout() {
+        this.setSize(new Dimension(this.getWidth(), dialogContentHeight + this.getInsets().top));
+        super.doLayout();
+    }
+
     protected void setupContentPane() {
         contentContainer.add(createContentPane(), BorderLayout.CENTER, 0);
     }
@@ -63,10 +68,11 @@ public abstract class TemplateThemeDialog extends JDialog {
     }
 
     protected UIButton[] createLeftButtons() {
-        return new UIButton[] {};
+        return new UIButton[]{};
     }
+
     protected UIButton[] createRightButtons() {
-        return new UIButton[] {};
+        return new UIButton[]{};
     }
 
     public void setupActionButtons() {
@@ -89,7 +95,7 @@ public abstract class TemplateThemeDialog extends JDialog {
     }
 
     private JPanel createActionsContainer(int align, UIButton... buttons) {
-        JPanel container = new JPanel(new FlowLayout(align, DIALOG_BOTTOM_ACTION_BUTTON_GAP,  0));
+        JPanel container = new JPanel(new FlowLayout(align, DIALOG_BOTTOM_ACTION_BUTTON_GAP, 0));
         int paddingVertical = getPaddingVertical();
         container.setBorder(BorderFactory.createEmptyBorder(paddingVertical, 0, paddingVertical, 0));
 
@@ -97,7 +103,7 @@ public abstract class TemplateThemeDialog extends JDialog {
             return container;
         }
 
-        for (UIButton button: buttons) {
+        for (UIButton button : buttons) {
             if (button != null) {
                 button.setPreferredSize(new Dimension(button.getPreferredSize().width, DIALOG_BOTTOM_ACTION_BUTTON_HEIGHT));
                 container.add(button);
@@ -111,7 +117,7 @@ public abstract class TemplateThemeDialog extends JDialog {
         return createActionsContainer(FlowLayout.RIGHT, buttons);
     }
 
-    private int getPaddingVertical(){
+    private int getPaddingVertical() {
         return (DIALOG_BOTTOM_ACTION_BAR_HEIGHT - DIALOG_BOTTOM_ACTION_BUTTON_HEIGHT) / 2;
     }
 

designer-base/src/main/java/com/fr/design/mainframe/theme/edit/CellStyleListEditPane.java

@@ -1,9 +1,7 @@
 package com.fr.design.mainframe.theme.edit;
 
-import com.fr.base.Style;
 import com.fr.base.theme.settings.ThemedCellStyle;
 import com.fr.base.theme.settings.ThemedCellStyleList;
-import com.fr.config.predefined.PredefinedCellStyle;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.dialog.FineJOptionPane;
@@ -32,9 +30,11 @@ import com.fr.stable.Nameable;
 import com.fr.stable.StringUtils;
 
 import javax.swing.BorderFactory;
+import javax.swing.DefaultListModel;
 import javax.swing.JList;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.ListModel;
 import javax.swing.SwingUtilities;
 import java.awt.BorderLayout;
 import java.awt.Component;
@@ -103,26 +103,14 @@ public class CellStyleListEditPane extends JListControlPane {
 
     @Override
     protected JNameEdList createJNameList() {
-        JNameEdList nameEdList = super.createJNameList();
-        nameEdList.setCellEditor(new DefaultListCellEditor(new UITextField()) {
-            @Override
-            public Component getListCellEditorComponent(JList list, Object value, boolean isSelected, int index) {
-                ListModelElement element = (ListModelElement) getModel().getElementAt(index);
-                if (element != null) {
-                    NameObject selectNameObject = (NameObject) element.wrapper;
-                    ThemedCellStyle cellStyle = (ThemedCellStyle) (selectNameObject.getObject());
-                    if (!cellStyle.isRemovable()) {
-                        return null;
-                    }
-                }
-                return super.getListCellEditorComponent(list, value, isSelected, index);
-            }
-        });
+        JNameEdList nameEdList = new NoIconNamedList(new DefaultListModel());
+        nameEdList.setCellEditor(new UnEditableListCellEditor(new UITextField()));
+        nameEdList.setCellRenderer(new NoIconNameableListCellRenderer());
         return nameEdList;
     }
 
     @Override
-    public BasicBeanPane createPaneByCreators(NameableCreator creator) {
+    public BasicBeanPane<?> createPaneByCreators(NameableCreator creator) {
         CellStyleEditPane stylePane = (CellStyleEditPane) super.createPaneByCreators(creator);
         stylePane.registerAttrChangeListener(attributeChangeListener);
         return stylePane;
@@ -256,23 +244,15 @@ public class CellStyleListEditPane extends JListControlPane {
             this(CellStyleEditPane.class);
         }
 
-        public CellStyleNameObjectCreator(Class<? extends BasicBeanPane> updatePane) {
+        public CellStyleNameObjectCreator(Class<? extends BasicBeanPane<?>> updatePane) {
             super(i18nText("Fine-Design_Predefined_Cell_New_Style"), ThemedCellStyle.class, updatePane);
         }
 
         @Override
         public Nameable createNameable(UnrepeatedNameHelper helper) {
-            ThemedCellStyle cellStyle = new ThemedCellStyle();
+            ThemedCellStyle cellStyle = ThemedCellStyle.createInstanceUsed4New();
             cellStyle.setName(menuName);
-            cellStyle.setStyle(Style.getInstance());
-            cellStyle.setRemovable(true);
-            cellStyle.setUse4Default(false);
-            cellStyle.setUse4BigTitle(false);
-            cellStyle.setUse4SmallTitle(false);
-            cellStyle.setUse4Header(false);
-            cellStyle.setUse4MainText(false);
-            cellStyle.setUse4SupportInfo(false);
-            cellStyle.setUse4HighlightText(false);
+
             return new NameObject(helper.createUnrepeatedName(this.menuName()), cellStyle);
         }
 
@@ -304,4 +284,46 @@ public class CellStyleListEditPane extends JListControlPane {
             return ((ThemedCellStyle) ob).isUse4Default();
         }
     }
+
+    private class NoIconNameableListCellRenderer extends NameableListCellRenderer {
+        @Override
+        public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+            Component component = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+            if (component instanceof NameableListCellRenderer) {
+                ((NameableListCellRenderer) component).setIcon(null);
+                ((NameableListCellRenderer) component).setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 0));
+            }
+            return component;
+        }
+    }
+    private class NoIconNamedList extends JNameEdList {
+
+        public NoIconNamedList(ListModel dataModel) {
+            super(dataModel);
+        }
+
+        @Override
+        public int getIconWidth() {
+            return 0;
+        }
+    }
+    private class UnEditableListCellEditor extends DefaultListCellEditor {
+
+        public UnEditableListCellEditor(UITextField textField) {
+            super(textField);
+        }
+
+        @Override
+        public Component getListCellEditorComponent(JList list, Object value, boolean isSelected, int index) {
+            ListModelElement element = (ListModelElement) getModel().getElementAt(index);
+            if (element != null) {
+                NameObject selectNameObject = (NameObject) element.wrapper;
+                ThemedCellStyle cellStyle = (ThemedCellStyle) (selectNameObject.getObject());
+                if (!cellStyle.isRemovable()) {
+                    return null;
+                }
+            }
+            return super.getListCellEditorComponent(list, value, isSelected, index);
+        }
+    }
 }

designer-base/src/main/java/com/fr/design/mainframe/theme/edit/cell/CellStyleEditPane.java

@@ -1,7 +1,9 @@
 package com.fr.design.mainframe.theme.edit.cell;
 
+import com.fr.base.CellBorderStyle;
+import com.fr.base.Style;
 import com.fr.base.theme.settings.ThemedCellStyle;
-import com.fr.design.cell.CellStylePreviewPane;
+import com.fr.design.cell.CellRectangleStylePreviewPane;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.dialog.AttrScrollPane;
 import com.fr.design.dialog.BasicPane;
@@ -14,6 +16,7 @@ import com.fr.design.gui.style.AlignmentPane;
 import com.fr.design.gui.style.BorderPane;
 import com.fr.design.gui.style.TextFontTippedPane;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.mainframe.theme.ThemedFeatureController;
 import com.fr.design.mainframe.theme.ui.BorderUtils;
 
 import javax.swing.BorderFactory;
@@ -35,7 +38,7 @@ import static com.fr.design.i18n.Toolkit.i18nText;
  */
 public class CellStyleEditPane extends MultiTabPane<ThemedCellStyle> {
     private ThemedCellStyle cellStyle;
-    private CellStylePreviewPane previewArea;
+    private CellRectangleStylePreviewPane previewArea;
     private boolean populating;
     private AttributeChangeListener attributeChangeListener;
 
@@ -74,7 +77,11 @@ public class CellStyleEditPane extends MultiTabPane<ThemedCellStyle> {
 
         for (BasicPane basicPane : paneList) {
             ((AbstractBasicStylePane) basicPane).populateBean(ob.getStyle());
-            previewArea.setStyle(ob.getStyle());
+            previewArea.setPlainText(ob.getName());
+            previewArea.setStyle(ob.getStyle(), ob.getCellBorderStyle());
+            if (ThemedFeatureController.isCellStyleSupportInnerBorder() && basicPane instanceof BorderPane) {
+                ((BorderPane) basicPane).populateBean(ob.getCellBorderStyle(), true, false);
+            }
         }
         this.populating = false;
     }
@@ -82,9 +89,35 @@ public class CellStyleEditPane extends MultiTabPane<ThemedCellStyle> {
     @Override
     public ThemedCellStyle updateBean() {
         AbstractBasicStylePane basicStylePane = (AbstractBasicStylePane) paneList.get(tabPane.getSelectedIndex());
-        this.cellStyle.setStyle(basicStylePane.update(this.cellStyle.getStyle()));
+        Style style = basicStylePane.update(this.cellStyle.getStyle());
+        CellBorderStyle borderStyle = createDefaultBorderStyleFromStyle(style);
+
+
+        if (ThemedFeatureController.isCellStyleSupportInnerBorder() && basicStylePane instanceof BorderPane) {
+            borderStyle = ((BorderPane) basicStylePane).update();
+        }
+
+        this.cellStyle.setStyle(style);
+        this.cellStyle.setCellBorderStyle(borderStyle);
+
         return this.cellStyle;
     }
+    private CellBorderStyle createDefaultBorderStyleFromStyle(Style style) {
+        CellBorderStyle cellBorderStyle = new CellBorderStyle();
+        cellBorderStyle.setTopStyle(style.getBorderTop());
+        cellBorderStyle.setTopColor(style.getBorderTopColor());
+
+        cellBorderStyle.setBottomStyle(style.getBorderBottom());
+        cellBorderStyle.setBottomColor(style.getBorderBottomColor());
+
+        cellBorderStyle.setLeftStyle(style.getBorderLeft());
+        cellBorderStyle.setLeftColor(style.getBorderLeftColor());
+
+        cellBorderStyle.setRightStyle(style.getBorderRight());
+        cellBorderStyle.setRightColor(style.getBorderRightColor());
+
+        return cellBorderStyle;
+    }
 
     @Override
     public boolean accept(Object ob) {
@@ -102,21 +135,25 @@ public class CellStyleEditPane extends MultiTabPane<ThemedCellStyle> {
 
     @Override
     protected void initLayout() {
-        this.setLayout(FRGUIPaneFactory.createBorderLayout());
-
-        JPanel jPanel = new JPanel();
-        jPanel.setLayout(new BorderLayout(0, 4));
+        this.setLayout(new BorderLayout(0, 10));
+        this.setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 4));
 
         JPanel previewPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        previewArea = new CellStylePreviewPane();
-        previewArea.setPreferredSize(new Dimension(223, 30));
-        previewPane.setBorder(BorderUtils.createTitleBorder(i18nText("Fine-Design_Basic_Preview")));
-        previewPane.add(previewArea, BorderLayout.CENTER);
+        previewArea = new CellRectangleStylePreviewPane(true);
+        previewArea.setPreferredSize(new Dimension(207, 48));
+        previewPane.setBorder(BorderFactory.createCompoundBorder(
+                BorderUtils.createTitleBorder(i18nText("Fine-Design_Basic_Preview")),
+                BorderFactory.createEmptyBorder(4, 4, 4, 4)));
+        previewPane.add(previewArea, BorderLayout.NORTH);
 
         this.add(previewPane, BorderLayout.NORTH);
 
-        this.add(jPanel, BorderLayout.CENTER);
-        jPanel.add(tabPane, BorderLayout.NORTH);
+        JPanel settingsPane = new JPanel();
+        this.add(settingsPane, BorderLayout.CENTER);
+
+        settingsPane.setLayout(new BorderLayout(0, 4));
+
+        settingsPane.add(tabPane, BorderLayout.NORTH);
         JPanel attrListenerPane = new AbstractAttrNoScrollPane() {
 
             @Override
@@ -135,23 +172,33 @@ public class CellStyleEditPane extends MultiTabPane<ThemedCellStyle> {
                         }
                         ThemedCellStyle cellStyle = updateBean();
                         if (cellStyle != null) {
-                            previewArea.setStyle(cellStyle.getStyle());
+                            previewArea.setPlainText(cellStyle.getName());
+                            previewArea.setStyle(cellStyle.getStyle(), cellStyle.getCellBorderStyle());
                         }
                         fireAttrChangeListener();
                     }
                 });
-                BasicScrollPane basicScrollPane = new AttrScrollPane() {
+                return new EmptyBorderAttrScrollPane() {
                     @Override
                     protected JPanel createContentPane() {
                         return centerPane;
                     }
                 };
-                return basicScrollPane;
             }
         };
-        jPanel.add(attrListenerPane, BorderLayout.CENTER);
+        settingsPane.add(attrListenerPane, BorderLayout.CENTER);
     }
 
     @Override
     public void updateBean(ThemedCellStyle ob) {}
+
+
+    private static abstract class EmptyBorderAttrScrollPane extends AttrScrollPane {
+
+        @Override
+        protected void layoutContentPane() {
+            super.layoutContentPane();
+            leftcontentPane.setBorder(BorderFactory.createMatteBorder(0, 0, 0, 5, original));
+        }
+    }
 }

designer-base/src/main/java/com/fr/design/mainframe/theme/edit/chart/ChartFontPane.java

@@ -56,7 +56,11 @@ public class ChartFontPane extends BasicPane {
         fontSizeComboBox = new UIComboBox(FONT_SIZES);
         bold = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold.png"));
         italic = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic.png"));
-        fontColor = new UIColorButton();
+        fontColor = getColorButton();
+    }
+
+    protected UIColorButton getColorButton() {
+        return new UIColorButton();
     }
 
     protected void initComponents() {

designer-base/src/main/java/com/fr/design/mainframe/theme/edit/chart/ChartLabelStylePane.java

@@ -2,6 +2,8 @@ package com.fr.design.mainframe.theme.edit.chart;
 
 import com.fr.base.theme.settings.ThemedChartStyle;
 import com.fr.design.gui.ibutton.UIButtonGroup;
+import com.fr.design.gui.ibutton.UIColorButton;
+import com.fr.design.gui.ibutton.UIColorButtonWithAuto;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
 
@@ -25,6 +27,11 @@ public class ChartLabelStylePane extends AbstractChartStylePane {
         autoButton = new UIButtonGroup<>(new String[]{Toolkit.i18nText("Fine-Design_Chart_Auto"),
                 Toolkit.i18nText("Fine-Design_Chart_Custom")});
         chartFontPane = new ChartFontPane() {
+            @Override
+            protected UIColorButton getColorButton() {
+                return new UIColorButtonWithAuto();
+            }
+
             public String getUILabelText() {
                 return Toolkit.i18nText("Fine-Design_Chart_Label_Character");
             }

designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ui/ColorListPane.java

@@ -139,7 +139,7 @@ public class ColorListPane extends JPanel implements UIObserver {
         return true;
     }
 
-    private static class ColorButton extends AbstractSelectBox<Color> {
+    public static class ColorButton extends AbstractSelectBox<Color> {
         private Color color;
         private NewColorSelectPane colorPane;
         private ChangeListener changeListener;

designer-base/src/main/java/com/fr/design/mainframe/theme/preview/ReportThemePreviewPane.java

@@ -45,8 +45,9 @@ public class ReportThemePreviewPane extends TemplateThemePreviewPane<ReportTheme
         chartPreviewPane.populate(initColumnChart());
         chartPreviewPane.setCallbackEvent(this);
         reportPreviewPane = new ECReportPreviewPane();
-        this.add(reportPreviewPane, BorderLayout.CENTER);
-        this.add(chartPreviewPane, BorderLayout.SOUTH);
+        reportPreviewPane.setPreferredSize(new Dimension(615, 297));
+        this.add(reportPreviewPane, BorderLayout.NORTH);
+        this.add(chartPreviewPane, BorderLayout.CENTER);
     }
 
     @Override

designer-base/src/main/java/com/fr/design/mainframe/theme/preview/ecpreview/AbstractECPreviewPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.mainframe.theme.preview.ecpreview;
 
+import com.fr.base.CellBorderStyle;
 import com.fr.base.Style;
 import com.fr.base.theme.TemplateTheme;
 import com.fr.base.theme.settings.ThemedCellStyle;
@@ -11,29 +12,6 @@ import com.fr.design.mainframe.theme.preview.ecpreview.cell.AbstractPreviewCell;
 import java.util.List;
 
 public abstract class AbstractECPreviewPane extends UINoOpaquePanel implements ThemePreviewed<TemplateTheme> {
-    protected Style getReportBigTitleStyle(ThemedCellStyleList cellStyleList) {
-        return getCellStyle(cellStyleList.getUse4BigTitle());
-    }
-    protected Style getReportHeaderStyle(ThemedCellStyleList cellStyleList) {
-        return getCellStyle(cellStyleList.getUse4Header());
-    }
-
-    protected Style getMainContentStyle(ThemedCellStyleList cellStyleList) {
-        return getCellStyle(cellStyleList.getUse4MainText());
-    }
-
-    protected Style getHighLightStyle(ThemedCellStyleList cellStyleList) {
-        return getCellStyle(cellStyleList.getUse4HighlightText());
-    }
-
-    protected Style getSmallTitleStyle(ThemedCellStyleList cellStyleList) {
-        return getCellStyle(cellStyleList.getUse4SmallTitle());
-    }
-
-    protected Style getAssistMsgStyle(ThemedCellStyleList cellStyleList) {
-        return getCellStyle(cellStyleList.getUse4SupportInfo());
-    }
-
     private Style getCellStyle(ThemedCellStyle themedCellStyle) {
         if (themedCellStyle == null) {
             return Style.DEFAULT_STYLE;
@@ -42,9 +20,19 @@ public abstract class AbstractECPreviewPane extends UINoOpaquePanel implements T
         return style != null ? style : Style.DEFAULT_STYLE;
     }
 
-    protected void refresh(List<AbstractPreviewCell> list, Style style) {
+    private CellBorderStyle getCellBorderStyle(ThemedCellStyle themedCellStyle) {
+        if (themedCellStyle == null) {
+            return null;
+        }
+        return themedCellStyle.getCellBorderStyle();
+    }
+
+    protected void refresh(List<AbstractPreviewCell> list, ThemedCellStyle themedCellStyle) {
+        Style style = getCellStyle(themedCellStyle);
+        CellBorderStyle borderStyle = getCellBorderStyle(themedCellStyle);
+
         for (AbstractPreviewCell cell : list) {
-            cell.refresh(style);
+            cell.refresh(style, borderStyle);
         }
     }
 

designer-base/src/main/java/com/fr/design/mainframe/theme/preview/ecpreview/ECPreviewPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.mainframe.theme.preview.ecpreview;
 
+import com.fr.base.CellBorderSourceFlag;
 import com.fr.base.theme.TemplateTheme;
 import com.fr.base.theme.settings.ThemedCellStyleList;
 import com.fr.design.i18n.Toolkit;
@@ -36,8 +37,16 @@ public class ECPreviewPane extends AbstractECPreviewPane {
         JPanel extCenterPane = FRGUIPaneFactory.createBorderLayout_NO_Opaque_Pane();
         this.add(extCenterPane, BorderLayout.CENTER);
         extCenterPane.add(titlePane, BorderLayout.NORTH);
-        for (int i = 0; i < COL_COUNT; i++) {
+        for (int c = 0; c < COL_COUNT; c++) {
             PreviewCell cell = new PreviewCell(Toolkit.i18nText("Fine-Design_Basic_Predefined_Style_Header"));
+            int flag = CellBorderSourceFlag.ALL_BORDER_SOURCE_OUTER;
+            if (c > 0) {
+                flag |= CellBorderSourceFlag.LEFT_BORDER_SOURCE_INNER;
+            }
+            if (c < COL_COUNT - 1) {
+                flag |= CellBorderSourceFlag.RIGHT_BORDER_SOURCE_INNER;
+            }
+            cell.setBorderSourceFlag(flag);
             cell.setPreferredSize(new Dimension(103, 36));
             titlePane.add(cell);
             headerCellList.add(cell);
@@ -46,6 +55,22 @@ public class ECPreviewPane extends AbstractECPreviewPane {
         extCenterPane.add(contentPane, BorderLayout.CENTER);
         for (int i = 0; i < COL_COUNT * CONTENT_ROW_COUNT; i++) {
             PreviewCell cell = new PreviewCell(Toolkit.i18nText("Fine-Design_Basic_Predefined_Style_Main_Text"));
+            int r = i / COL_COUNT;
+            int c = i % COL_COUNT;
+            int flag = CellBorderSourceFlag.ALL_BORDER_SOURCE_OUTER;
+            if (r > 0) {
+                flag |= CellBorderSourceFlag.TOP_BORDER_SOURCE_INNER;
+            }
+            if (r < CONTENT_ROW_COUNT - 1) {
+                flag |= CellBorderSourceFlag.BOTTOM_BORDER_SOURCE_INNER;
+            }
+            if (c > 0) {
+                flag |= CellBorderSourceFlag.LEFT_BORDER_SOURCE_INNER;
+            }
+            if (c < COL_COUNT - 1) {
+                flag |= CellBorderSourceFlag.RIGHT_BORDER_SOURCE_INNER;
+            }
+            cell.setBorderSourceFlag(flag);
             cell.setPreferredSize(new Dimension(103, 30));
             contentPane.add(cell);
             contentCellList.add(cell);
@@ -53,8 +78,16 @@ public class ECPreviewPane extends AbstractECPreviewPane {
 
         JPanel endPane = new UINoOpaquePanel(new GridLayout());
         extCenterPane.add(endPane, BorderLayout.SOUTH);
-        for (int i = 0; i < COL_COUNT; i++) {
+        for (int c = 0; c < COL_COUNT; c++) {
             PreviewCell cell = new PreviewCell(Toolkit.i18nText("Fine-Design_Basic_Predefined_Style_Highlight_Text"));
+            int flag = CellBorderSourceFlag.ALL_BORDER_SOURCE_OUTER;
+            if (c > 0) {
+                flag |= CellBorderSourceFlag.LEFT_BORDER_SOURCE_INNER;
+            }
+            if (c < COL_COUNT - 1) {
+                flag |= CellBorderSourceFlag.RIGHT_BORDER_SOURCE_INNER;
+            }
+            cell.setBorderSourceFlag(flag);
             cell.setPreferredSize(new Dimension(103, 30));
             endPane.add(cell);
             highLightCellList.add(cell);
@@ -62,6 +95,7 @@ public class ECPreviewPane extends AbstractECPreviewPane {
 
         JPanel extSouthPane = FRGUIPaneFactory.createBorderLayout_NO_Opaque_Pane();
         PreviewCell assistCell = new PreviewCell(Toolkit.i18nText("Fine-Design_Basic_Predefined_Style_Assist_Text"));
+        assistCell.setBorderSourceFlag(CellBorderSourceFlag.ALL_BORDER_SOURCE_OUTER);
         assistCell.setPreferredSize(new Dimension(123, 30));
         assistCellList.add(assistCell);
         extSouthPane.add(assistCell);
@@ -71,11 +105,10 @@ public class ECPreviewPane extends AbstractECPreviewPane {
     @Override
     public void refresh(TemplateTheme theme) {
         ThemedCellStyleList cellStyleConfig = theme.getCellStyleList();
-        refresh(headerCellList, getReportHeaderStyle(cellStyleConfig));
-        refresh(contentCellList, getMainContentStyle(cellStyleConfig));
-        refresh(highLightCellList, getHighLightStyle(cellStyleConfig));
-        refresh(highLightCellList, getHighLightStyle(cellStyleConfig));
-        refresh(assistCellList, getAssistMsgStyle(cellStyleConfig));
+        refresh(headerCellList, cellStyleConfig.getUse4Header());
+        refresh(contentCellList, cellStyleConfig.getUse4MainText());
+        refresh(highLightCellList, cellStyleConfig.getUse4HighlightText());
+        refresh(assistCellList, cellStyleConfig.getUse4SupportInfo());
     }
 
 

designer-base/src/main/java/com/fr/design/mainframe/theme/preview/ecpreview/ECReportPreviewPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.mainframe.theme.preview.ecpreview;
 
+import com.fr.base.CellBorderSourceFlag;
 import com.fr.base.theme.ReportTheme;
 import com.fr.base.theme.TemplateTheme;
 import com.fr.base.theme.settings.ThemedCellStyleList;
@@ -22,12 +23,12 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class ECReportPreviewPane extends UINoOpaquePanel implements ThemePreviewed<ReportTheme> {
-    private final List<AbstractPreviewCell> headerTitleCellList = new ArrayList<>();
-    private final List<AbstractPreviewCell> headerCellList = new ArrayList<>();
-    private final List<AbstractPreviewCell> titleCellList = new ArrayList<>();
-    private final List<AbstractPreviewCell> contentCellList = new ArrayList<>();
-    private final List<AbstractPreviewCell> highLightCellList = new ArrayList<>();
-    private final List<AbstractPreviewCell> assistCellList = new ArrayList<>();
+    private final List<AbstractPreviewCell> headerTitleCellList = new ArrayList<>();    // 大标题样式单元格
+    private final List<AbstractPreviewCell> headerCellList = new ArrayList<>();         // 表头样式单元格
+    private final List<AbstractPreviewCell> titleCellList = new ArrayList<>();          // 小标题样式单元格
+    private final List<AbstractPreviewCell> contentCellList = new ArrayList<>();        // 正文样式单元格
+    private final List<AbstractPreviewCell> highLightCellList = new ArrayList<>();      // 高亮文本样式单元格
+    private final List<AbstractPreviewCell> assistCellList = new ArrayList<>();         // 辅助信息样式单元格
     private static final int CONTENT_ROW_COUNT = 3;
     private static final int COL_COUNT = 5;
 
@@ -64,31 +65,38 @@ public class ECReportPreviewPane extends UINoOpaquePanel implements ThemePreview
         private JPanel createNorthPane() {
             JPanel northPane = FRGUIPaneFactory.createBorderLayout_NO_Opaque_Pane();
             AbstractPreviewCell bigTitleCell = new PreviewCell(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Profile_Pane_Cell_Style_Big_Title"));
+            bigTitleCell.setBorderSourceFlag(CellBorderSourceFlag.ALL_BORDER_SOURCE_OUTER);
             bigTitleCell.setPreferredSize(new Dimension(615, 46));
             headerTitleCellList.add(bigTitleCell);
             northPane.add(bigTitleCell, BorderLayout.NORTH);
             CornerPreviewCell cornerCell = new CornerPreviewCell(new String[]{Toolkit.i18nText("Fine-Design_Basic_Column_Name"),
                     Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Profile_Pane_EC_Data"), Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Profile_Pane_Row_Name")},
                     new Point2D[]{new Point(159, 71), new Point(225, 49)});
+            cornerCell.setBorderSourceFlag(CellBorderSourceFlag.INVALID_BORDER_SOURCE);
             cornerCell.setPreferredSize(new Dimension(225, 71));
             titleCellList.add(cornerCell);
             northPane.add(cornerCell, BorderLayout.WEST);
             JPanel centerPane = FRGUIPaneFactory.createBorderLayout_NO_Opaque_Pane();
             northPane.add(centerPane, BorderLayout.CENTER);
             PreviewCell cell = new PreviewCell(Toolkit.i18nText("Fine-Design_Basic_Predefined_Style_Small_Title"));
+            cell.setBorderSourceFlag(CellBorderSourceFlag.ALL_BORDER_SOURCE_OUTER);
             titleCellList.add(cell);
             cell.setPreferredSize(new Dimension(308, 38));
             centerPane.add(cell, BorderLayout.NORTH);
             JPanel eastSouthPane = new UINoOpaquePanel(new GridLayout());
-            PreviewCell cell1 = new PreviewCell(Toolkit.i18nText("Fine-Design_Basic_Predefined_Style_Header"));
-            PreviewCell cell2 = new PreviewCell(Toolkit.i18nText("Fine-Design_Basic_Predefined_Style_Header"));
-            PreviewCell cell3 = new PreviewCell(Toolkit.i18nText("Fine-Design_Basic_Predefined_Style_Header"));
-            headerCellList.add(cell1);
-            headerCellList.add(cell2);
-            headerCellList.add(cell3);
-            eastSouthPane.add(cell1);
-            eastSouthPane.add(cell2);
-            eastSouthPane.add(cell3);
+            for (int c = 0; c < CONTENT_ROW_COUNT; c++) {
+                PreviewCell headerCell = new PreviewCell(Toolkit.i18nText("Fine-Design_Basic_Predefined_Style_Header"));
+                int flag = CellBorderSourceFlag.ALL_BORDER_SOURCE_OUTER;
+                if (c > 0) {
+                    flag |= CellBorderSourceFlag.LEFT_BORDER_SOURCE_INNER;
+                }
+                if (c < CONTENT_ROW_COUNT - 1) {
+                    flag |= CellBorderSourceFlag.RIGHT_BORDER_SOURCE_INNER;
+                }
+                headerCell.setBorderSourceFlag(flag);
+                headerCellList.add(headerCell);
+                eastSouthPane.add(headerCell);
+            }
             centerPane.add(eastSouthPane, BorderLayout.CENTER);
             return northPane;
         }
@@ -102,8 +110,16 @@ public class ECReportPreviewPane extends UINoOpaquePanel implements ThemePreview
             cell1.setPreferredSize(new Dimension(112, 153));
             westPane.add(cell1, BorderLayout.WEST);
             JPanel gridPane = new UINoOpaquePanel(new GridLayout(5, 1));
-            for (int i = 0; i < COL_COUNT; i++) {
+            for (int r = 0; r < COL_COUNT; r++) {
                 PreviewCell cell = new PreviewCell(Toolkit.i18nText("Fine-Design_Basic_Predefined_Style_Header"));
+                int flag = CellBorderSourceFlag.ALL_BORDER_SOURCE_OUTER;
+                if (r > 0) {
+                    flag |= CellBorderSourceFlag.TOP_BORDER_SOURCE_INNER;
+                }
+                if (r < COL_COUNT - 1) {
+                    flag |= CellBorderSourceFlag.BOTTOM_BORDER_SOURCE_INNER;
+                }
+                cell.setBorderSourceFlag(flag);
                 cell.setPreferredSize(new Dimension(113, 31));
                 headerCellList.add(cell);
                 gridPane.add(cell);
@@ -114,11 +130,36 @@ public class ECReportPreviewPane extends UINoOpaquePanel implements ThemePreview
             centerPane.add(innerCenterPane, BorderLayout.CENTER);
             for (int i = 0; i < COL_COUNT * CONTENT_ROW_COUNT; i++) {
                 PreviewCell cell ;
-                if ((i + 1) % CONTENT_ROW_COUNT == 0) {
+                int r = i / CONTENT_ROW_COUNT;
+                int c = i % CONTENT_ROW_COUNT;
+                if (c == CONTENT_ROW_COUNT - 1) {
                     cell = new PreviewCell(Toolkit.i18nText("Fine-Design_Basic_Predefined_Style_Highlight_Text"));
+                    int flag = CellBorderSourceFlag.ALL_BORDER_SOURCE_OUTER;
+                    if (r != 0) {
+                        flag |= CellBorderSourceFlag.TOP_BORDER_SOURCE_INNER;
+                    }
+                    if (r != COL_COUNT - 1) {
+                        flag |= CellBorderSourceFlag.BOTTOM_BORDER_SOURCE_INNER;
+                    }
+                    cell.setBorderSourceFlag(flag);
                     highLightCellList.add(cell);
                 } else {
                     cell = new PreviewCell(Toolkit.i18nText("Fine-Design_Basic_Predefined_Style_Main_Text"));
+                    int flag = CellBorderSourceFlag.ALL_BORDER_SOURCE_OUTER;
+                    if (r > 0) {
+                        flag |= CellBorderSourceFlag.TOP_BORDER_SOURCE_INNER;
+                    }
+                    if (r < COL_COUNT - 1) {
+                        flag |= CellBorderSourceFlag.BOTTOM_BORDER_SOURCE_INNER;
+                    }
+                    if (c > 0) {
+                        flag |= CellBorderSourceFlag.LEFT_BORDER_SOURCE_INNER;
+                    }
+                    if (c < CONTENT_ROW_COUNT - 2) {
+                        flag |= CellBorderSourceFlag.RIGHT_BORDER_SOURCE_INNER;
+                    }
+                    cell.setBorderSourceFlag(flag);
+
                     contentCellList.add(cell);
                 }
                 cell.setPreferredSize(new Dimension(123, 31));
@@ -132,6 +173,7 @@ public class ECReportPreviewPane extends UINoOpaquePanel implements ThemePreview
         private JPanel createSouthPane(){
             JPanel southPane = FRGUIPaneFactory.createBorderLayout_NO_Opaque_Pane();
             PreviewCell assistCell = new PreviewCell(Toolkit.i18nText("Fine-Design_Basic_Predefined_Style_Assist_Text"));
+            assistCell.setBorderSourceFlag(CellBorderSourceFlag.ALL_BORDER_SOURCE_OUTER);
             assistCell.setPreferredSize(new Dimension(123, 30));
             assistCellList.add(assistCell);
             southPane.add(assistCell, BorderLayout.CENTER);
@@ -141,12 +183,12 @@ public class ECReportPreviewPane extends UINoOpaquePanel implements ThemePreview
         @Override
         public void refresh(TemplateTheme theme) {
             ThemedCellStyleList cellStyleConfig = theme.getCellStyleList();
-            refresh(headerTitleCellList, getReportBigTitleStyle(cellStyleConfig));
-            refresh(headerCellList, getReportHeaderStyle(cellStyleConfig));
-            refresh(contentCellList, getMainContentStyle(cellStyleConfig));
-            refresh(titleCellList, getSmallTitleStyle(cellStyleConfig));
-            refresh(highLightCellList, getHighLightStyle(cellStyleConfig));
-            refresh(assistCellList, getAssistMsgStyle(cellStyleConfig));
+            refresh(headerTitleCellList, cellStyleConfig.getUse4BigTitle());
+            refresh(headerCellList, cellStyleConfig.getUse4Header());
+            refresh(contentCellList, cellStyleConfig.getUse4MainText());
+            refresh(titleCellList, cellStyleConfig.getUse4SmallTitle());
+            refresh(highLightCellList, cellStyleConfig.getUse4HighlightText());
+            refresh(assistCellList, cellStyleConfig.getUse4SupportInfo());
         }
     }
 }

designer-base/src/main/java/com/fr/design/mainframe/theme/preview/ecpreview/cell/AbstractPreviewCell.java

@@ -1,25 +1,47 @@
 package com.fr.design.mainframe.theme.preview.ecpreview.cell;
 
+import com.fr.base.CellBorderSourceFlag;
+import com.fr.base.CellBorderStyle;
 import com.fr.base.Style;
+import com.fr.stable.Constants;
+
 import javax.swing.JComponent;
 import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 
 public abstract class AbstractPreviewCell extends JComponent {
+    private static final double BORDER_INSET = 0.5D;
     protected Style style = Style.DEFAULT_STYLE;
     private static final int NO_SCALE_RESOLUTION = 100;
+    private int borderSourceFlag = CellBorderSourceFlag.INVALID_BORDER_SOURCE;
 
+    public void setBorderSourceFlag(int borderSourceFlag) {
+        this.borderSourceFlag = borderSourceFlag;
+    }
 
-    public void refresh(Style style) {
-        this.style = style;
+    public void refresh(Style style, CellBorderStyle borderStyle) {
+        this.style = CellBorderSourceFlag.deriveBorderedStyle(style, borderStyle, borderSourceFlag);
     }
 
     public void paint(Graphics g) {
         Graphics2D g2d = (Graphics2D) g;
         Style.paintBackground(g2d, style, getWidth(), getHeight());
         paintContent(g2d, NO_SCALE_RESOLUTION);
-        Style.paintBorder(g2d, style, getWidth(), getHeight());
+        paintBorder(g2d);
+    }
+
+    private void paintBorder(Graphics2D g2d) {
+        double width = getWidth();
+        double height = getHeight();
+        if (style.getBorderLeft() == Constants.LINE_SLIM || style.getBorderRight() == Constants.LINE_SLIM) {
+            width -= BORDER_INSET;
+        }
+        if (style.getBorderBottom() == Constants.LINE_SLIM || style.getBorderTop() == Constants.LINE_SLIM) {
+            height -= BORDER_INSET;
+        }
+        g2d.setClip(null);
+        Style.paintBorder(g2d, style, width, height);
     }
 
     protected abstract void paintContent(Graphics2D g2d, int resolution);

designer-base/src/main/java/com/fr/design/mainframe/toast/ToastMsgDialog.java

@@ -3,6 +3,7 @@ package com.fr.design.mainframe.toast;
 import com.fr.concurrent.NamedThreadFactory;
 import com.fr.design.dialog.UIDialog;
 import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.DesignerFrame;
 import com.fr.module.ModuleContext;
 
 import javax.swing.JPanel;
@@ -51,12 +52,16 @@ public class ToastMsgDialog extends UIDialog {
         hide_height = dimension.height;
         setSize(new Dimension(dimension.width, 0));
         contentPane.setSize(dimension);
-        setLocationRelativeTo(DesignerContext.getDesignerFrame().getContentFrame());
-        int positionY = DesignerContext.getDesignerFrame().getContentFrame().getLocationOnScreen().y + 10;
-        setLocation((DesignerContext.getDesignerFrame().getWidth() - dimension.width) / 2, positionY);
+        setRelativeLocation(dimension);
         addMouseEvent(contentPane);
     }
 
+    private void setRelativeLocation(Dimension dimension) {
+        DesignerFrame designerFrame = DesignerContext.getDesignerFrame();
+        int positionX = designerFrame.getLocationOnScreen().x + (designerFrame.getWidth() - dimension.width) / 2;
+        int positionY = designerFrame.getContentFrame().getLocationOnScreen().y + 10;
+        this.setLocation(positionX, positionY);
+    }
 
     private Dimension calculatePreferSize() {
         Dimension contentDimension = contentPane.getPreferredSize();
@@ -106,7 +111,7 @@ public class ToastMsgDialog extends UIDialog {
                         Dimension dimension = ToastMsgDialog.this.getSize();
                         ToastMsgDialog.this.setSize(new Dimension(dimension.width, dimension.height - 5));
                     }
-                }, 0,50, TimeUnit.MILLISECONDS);
+                }, 0, 50, TimeUnit.MILLISECONDS);
 
             }
         }, 5000, TimeUnit.MILLISECONDS);

designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java

@@ -17,6 +17,7 @@ import com.fr.design.actions.community.FacebookFansAction;
 import com.fr.design.actions.community.NeedAction;
 import com.fr.design.actions.community.QuestionAction;
 import com.fr.design.actions.community.SignAction;
+import com.fr.design.actions.community.StudyPlanAction;
 import com.fr.design.actions.community.TechSolutionAction;
 import com.fr.design.actions.community.TechSupportAction;
 import com.fr.design.actions.community.TemplateStoreAction;
@@ -601,6 +602,7 @@ public abstract class ToolBarMenuDock {
                 shortCuts.add(new TutorialAction());
             }
         }, SupportLocaleImpl.TUTORIAL_COMMUNITY);
+        shortCuts.add(new StudyPlanAction());
         shortCuts.add(new QuestionAction());
         shortCuts.add(new TechSolutionAction());
 

designer-base/src/main/java/com/fr/design/os/impl/SupportOSImpl.java

@@ -1,6 +1,7 @@
 package com.fr.design.os.impl;
 
 import com.fr.base.FRContext;
+import com.fr.design.config.DesignerProperties;
 import com.fr.design.jdk.JdkVersion;
 import com.fr.general.CloudCenter;
 import com.fr.general.GeneralContext;
@@ -22,11 +23,11 @@ import java.util.Locale;
 public enum SupportOSImpl implements SupportOS {
 
     /**
-     * ARM下屏蔽登录
+     * 屏蔽登录入口
      */
-    USERINFOPANE{
+    BBS_USER_LOGIN_PANE {
         public boolean support(){
-            return Arch.getArch() != Arch.ARM;
+            return Arch.getArch() != Arch.ARM && DesignerProperties.getInstance().isSupportLoginEntry();
         }
     },
     /**

designer-base/src/main/java/com/fr/design/report/WatermarkSettingPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.report;
 
+import com.fr.base.iofile.attr.WaterMarkProvideConstant;
 import com.fr.base.iofile.attr.WatermarkAttr;
 import com.fr.design.dialog.AbstractTemplateServerSettingPane;
 import com.fr.report.core.ReportUtils;
@@ -42,13 +43,13 @@ public class WatermarkSettingPane extends AbstractTemplateServerSettingPane {
     }
 
     public void populate(WatermarkAttr watermark) {
-        if (!watermark.isValid()) {
+        if (watermark.getWaterMarkProvider().equals(WaterMarkProvideConstant.TEMPLATE)) {
+            chooseComboBox.setSelectedIndex(SINGLE_SET);
+            watermarkPane.populate(watermark);
+        } else {
             chooseComboBox.setSelectedIndex(SERVER_SET);
             populateServerSettings();
-            return;
         }
-        chooseComboBox.setSelectedIndex(SINGLE_SET);
-        watermarkPane.populate(watermark);
     }
 
 

designer-base/src/main/java/com/fr/design/utils/LoadingUtils.java

@@ -1,35 +1,29 @@
-package com.fr.design.mainframe;
+package com.fr.design.utils;
 
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
 import com.fr.general.IOUtils;
+
+import javax.swing.ImageIcon;
+import javax.swing.JPanel;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.LayoutManager;
-import javax.swing.ImageIcon;
-import javax.swing.JPanel;
-
-/**
- * @author hades
- * @version 10.0
- * Created by hades on 2021/4/9
- */
-public class OpenLoadingPane extends JPanel {
 
-    private static final ImageIcon LOADING_ICON = new ImageIcon(IOUtils.readImage("/com/fr/design/images/mainframe/openloading.png"));
+public class LoadingUtils {
+    private static final ImageIcon LOADING_ICON = new ImageIcon(IOUtils.readImage("/com/fr/design/images/mainframe/loading.png"));
     private static final Color TIP_COLOR = new Color(108, 174, 235);
     private static final int Y_GAP = 50;
     private static final int X_GAP = 10;
 
-    private UILabel loadingLabel;
-    private UILabel tipLabel;
-
-    public OpenLoadingPane() {
-
-        setLayout(new LayoutManager() {
-
+    public static JPanel createLoadingPane() {
+        JPanel jPanel = new JPanel();
+        UILabel loadingLabel = new UILabel(LOADING_ICON);
+        UILabel tipLabel = new UILabel(Toolkit.i18nText("Fine-Design_Open_Template_Loading"));
+        tipLabel.setForeground(TIP_COLOR);
+        jPanel.setLayout(new LayoutManager() {
             @Override
             public void removeLayoutComponent(Component comp) {
             }
@@ -64,12 +58,10 @@ public class OpenLoadingPane extends JPanel {
             public void addLayoutComponent(String name, Component comp) {
             }
         });
-        setBackground(Color.WHITE);
-        loadingLabel = new UILabel(LOADING_ICON);
-        tipLabel = new UILabel(Toolkit.i18nText("Fine-Design_Open_Template_Loading"));
-        tipLabel.setForeground(TIP_COLOR);
-        add(loadingLabel);
-        add(tipLabel);
 
+        jPanel.setBackground(Color.WHITE);
+        jPanel.add(loadingLabel);
+        jPanel.add(tipLabel);
+        return jPanel;
     }
 }

designer-base/src/main/java/com/fr/design/utils/TemplateUtils.java

@@ -0,0 +1,135 @@
+package com.fr.design.utils;
+
+import com.fr.base.extension.FileExtension;
+import com.fr.base.io.BaseBook;
+import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.file.TemplateTreePane;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.JTemplate;
+import com.fr.design.worker.save.SaveFailureHandler;
+import com.fr.file.FILE;
+import com.fr.file.FILEChooserPane;
+import com.fr.file.filter.ChooseFileFilter;
+import com.fr.log.FineLoggerFactory;
+import com.fr.stable.ArrayUtils;
+import com.fr.stable.CoreConstants;
+import com.fr.stable.ProductConstants;
+import com.fr.workspace.WorkContext;
+import com.fr.workspace.server.lock.TplOperator;
+import java.io.ByteArrayOutputStream;
+import java.io.OutputStream;
+import javax.swing.SwingWorker;
+
+/**
+ * @author hades
+ * @version 11.0
+ * Created by hades on 2021/12/5
+ */
+public class TemplateUtils {
+
+    public static void createAndOpenTemplate(String prefix, FILE file, boolean needOpen) {
+        String fileName = file.getName();
+        String oldPath = file.getPath();
+        int indexOfLastDot = fileName.lastIndexOf(CoreConstants.DOT);
+        if (indexOfLastDot < 0) {
+            return;
+        }
+        String suffix = fileName.substring(indexOfLastDot + 1);
+        FILEChooserPane fileChooserPane =  FILEChooserPane.getInstance(true, true);
+        fileChooserPane.setFileNameTextField(prefix + fileName, suffix);
+        FileExtension fileExtension = FileExtension.parse(suffix);
+        fileChooserPane.addChooseFILEFilter(new ChooseFileFilter(fileExtension, ProductConstants.APP_NAME + Toolkit.i18nText("Fine-Design_Report_Template_File")));
+        fileChooserPane.disableFileNameTextFiled();
+        int result = fileChooserPane.showSaveDialog(DesignerContext.getDesignerFrame(), suffix);
+        fileChooserPane.enableFileNameTextFiled();
+
+        if (isCancel(result)) {
+            return;
+        }
+
+        if (isOk(result)) {
+            file = fileChooserPane.getSelectedFILE();
+            _createAndOpenTemplate(file, oldPath, needOpen);
+        }
+
+    }
+
+
+    private static void _createAndOpenTemplate(FILE file, String oldPath, boolean needOpen){
+        new SwingWorker<Void, Void>() {
+
+            @Override
+            protected Void doInBackground() throws Exception {
+                byte[] content = new byte[0];
+                if (!needOpen) {
+                    // 从当前编辑模板中生成备份文件
+                    JTemplate<?, ?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+                    ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+                    BaseBook target = template.getTarget();
+                    if (target != null) {
+                        target.export(outputStream);
+                        content = outputStream.toByteArray();
+                    }
+                } else {
+                    content = WorkContext.getWorkResource().readFully(oldPath);
+                }
+                if (ArrayUtils.isEmpty(content)) {
+                    throw new Exception(oldPath + " content is empty" );
+                }
+                OutputStream out = null;
+                try {
+                    // 加锁
+                    WorkContext.getCurrent().get(TplOperator.class).saveAs(file.getPath());
+                    out = file.asOutputStream();
+                    out.write(content);
+                } finally {
+                    try {
+                        if (out != null) {
+                            out.close();
+                        }
+                    } finally {
+                        // 解锁
+                        WorkContext.getCurrent().get(TplOperator.class).closeAndFreeFile(file.getPath());
+                    }
+
+                }
+                return null;
+            }
+
+            @Override
+            protected void done() {
+                try {
+                    get();
+                    if (needOpen) {
+                        DesignerContext.getDesignerFrame().openTemplate(file);
+                    }
+                    // 备份成功刷新下目录树 展示出来备份的模板
+                    TemplateTreePane.getInstance().refresh();
+                } catch (Exception e) {
+                    SaveFailureHandler.getInstance().process(e);
+                    FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                }
+            }
+        }.execute();
+
+    }
+
+    private static boolean isCancel(int result) {
+        return result == FILEChooserPane.CANCEL_OPTION ||
+                result == FILEChooserPane.JOPTIONPANE_CANCEL_OPTION;
+    }
+
+    private static boolean isOk(int result) {
+        return result == FILEChooserPane.JOPTIONPANE_OK_OPTION ||
+                result == FILEChooserPane.OK_OPTION;
+    }
+
+    public static String createLockeTemplatedName(JTemplate<?, ?> template, String name) {
+        int index = name.lastIndexOf(CoreConstants.DOT);
+        if (index < 0 || !template.isForbidden()) {
+            return name;
+        }
+        return name.substring(0, index) + Toolkit.i18nText("Fine_Design_Template_Has_Been_Locked") + name.substring(index);
+    }
+}

designer-base/src/main/java/com/fr/design/utils/gui/AdjustWorkBookDefaultStyleUtils.java

@@ -17,6 +17,7 @@ public class AdjustWorkBookDefaultStyleUtils {
 
     private static final Color TEMPLATE_BACKGROUND = new Color(16, 11, 43);
     private static final Color CELL_ELEMENT_BORDER = new Color(110, 110, 110);
+    private static final Color CELL_ELEMENT_FONT_FOREGROUND = Color.WHITE;
 
     private static Color currentStoryBack = null;
 
@@ -31,13 +32,24 @@ public class AdjustWorkBookDefaultStyleUtils {
     public static void adjustCellElement(CellElement cellElement) {
         if (DesignModeContext.isDuchampMode()) {
             Style style = cellElement.getStyle();
-            style = style.deriveFRFont(style.getFRFont().applyForeground(Color.WHITE));
+            style = adjustCellElement(style);
+            cellElement.setStyle(style);
+        }
+    }
+
+    public static Style adjustCellElement(Style style) {
+        if (DesignModeContext.isDuchampMode()) {
+            style = style.deriveFRFont(style.getFRFont().applyForeground(CELL_ELEMENT_FONT_FOREGROUND));
             style = style.deriveBorder(0, CELL_ELEMENT_BORDER,
                     0, CELL_ELEMENT_BORDER,
                     0, CELL_ELEMENT_BORDER,
                     0, CELL_ELEMENT_BORDER);
-            cellElement.setStyle(style);
         }
+        return style;
+    }
+
+    public static Color adjustCellElementFontForeground(Color color) {
+        return DesignModeContext.isDuchampMode() ? CELL_ELEMENT_FONT_FOREGROUND : color;
     }
 
     public static void adjustFloatElement(FloatElement floatElement) {

designer-base/src/main/java/com/fr/design/worker/open/OpenWorker.java

@@ -3,18 +3,23 @@ package com.fr.design.worker.open;
 import com.fr.base.chart.exception.ChartNotFoundException;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.file.MutilTempalteTabPane;
+import com.fr.design.file.TemplateTreePane;
 import com.fr.design.i18n.Toolkit;
+import com.fr.design.lock.LockInfoDialog;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.DesignerFrameFileDealerPane;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.utils.DesignUtils;
 import com.fr.design.worker.WorkerManager;
 import com.fr.exception.DecryptTemplateException;
+import com.fr.exception.TplLockedException;
 import com.fr.file.FILE;
 import com.fr.general.ComparatorUtils;
 import com.fr.log.FineLoggerFactory;
 
 import com.fr.stable.StringUtils;
+import java.util.UUID;
 import javax.swing.JOptionPane;
 import javax.swing.SwingWorker;
 import javax.swing.UIManager;
@@ -81,6 +86,11 @@ public class OpenWorker<T> extends SwingWorker<T, Void> {
                                                   JOptionPane.ERROR_MESSAGE,
                                                   UIManager.getIcon("OptionPane.errorIcon"));
             }
+            if (cause.getCause() instanceof TplLockedException) {
+                MutilTempalteTabPane.getInstance().closeCurrentTpl();
+                TemplateTreePane.getInstance().getFileNode().setLock(UUID.randomUUID().toString());
+                LockInfoDialog.show(null);
+            }
             FineLoggerFactory.getLogger().error(t.getMessage(), t);
             return;
         }

designer-base/src/main/java/com/fr/design/worker/save/CallbackSaveWorker.java

@@ -63,6 +63,15 @@ public class CallbackSaveWorker extends SaveWorker {
         }
     }
 
+    public void addSuccessCallbackBeforeLast(Runnable successRunnable) {
+        if (successRunnableList == null) {
+            successRunnableList = new LinkedList<>();
+        }
+        if (successRunnable != null) {
+            successRunnableList.add(successRunnableList.size() - 1, successRunnable);
+        }
+    }
+
     public void addFailCallback(Runnable failRunnable) {
         if (failRunnableList == null) {
             failRunnableList = new LinkedList<>();

designer-base/src/main/java/com/fr/design/worker/save/SaveFailureHandler.java

@@ -0,0 +1,122 @@
+package com.fr.design.worker.save;
+
+import com.fr.common.exception.ThrowableHandler;
+import com.fr.design.dialog.FineJOptionPane;
+import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.JTemplate;
+import com.fr.design.ui.util.UIUtil;
+import com.fr.design.utils.TemplateUtils;
+import com.fr.file.FileNodeFILE;
+import com.fr.file.filetree.FileNode;
+import com.fr.general.IOUtils;
+import com.fr.report.UnLockedException;
+import com.fr.workspace.exception.DiskSpaceFullException;
+import com.fr.report.InconsistentLockException;
+import java.awt.Frame;
+import javax.swing.JOptionPane;
+
+/**
+ * @author hades
+ * @version 11.0
+ * Created by hades on 2021/12/7
+ */
+public class SaveFailureHandler implements ThrowableHandler {
+
+    private static final SaveFailureHandler INSTANCE = new SaveFailureHandler();
+
+    public static SaveFailureHandler getInstance() {
+        return INSTANCE;
+    }
+
+    @Override
+    public boolean process(Throwable e) {
+        UIUtil.invokeLaterIfNeeded(new Runnable() {
+            @Override
+            public void run() {
+                for (Handler handler : Handler.values()) {
+                    try {
+                        if (handler.process(e)) {
+                            break;
+                        }
+                    } catch (Exception ignored) {
+                    }
+                }
+            }
+        });
+        return true;
+    }
+
+    public enum Handler implements ThrowableHandler {
+
+        FullDisk {
+            @Override
+            public boolean process(Throwable e) {
+                if (e.getCause() instanceof DiskSpaceFullException
+                        || e instanceof DiskSpaceFullException
+                        || e.getCause().getCause() instanceof DiskSpaceFullException) {
+                    FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
+                                                      Toolkit.i18nText("Fine_Design_Template_Save_Failed_By_Full_Disk"),
+                                                      Toolkit.i18nText("Fine-Design_Basic_Alert"),
+                                                      JOptionPane.WARNING_MESSAGE,
+                                                      IOUtils.readIcon("/com/fr/design/images/warnings/warning32.png"));
+                    return true;
+                }
+                return false;
+            }
+        },
+        UnLocked {
+            @Override
+            public boolean process(Throwable e) {
+                if (e.getCause() instanceof UnLockedException || e instanceof UnLockedException) {
+                    processByBack(Toolkit.i18nText("Fine_Design_Template_Has_Been_UnLocked"));
+                    return true;
+                }
+                return false;
+            }
+        },
+
+        InconsistentLock {
+            @Override
+            public boolean process(Throwable e) {
+                if (e.getCause() instanceof InconsistentLockException || e instanceof InconsistentLockException) {
+                    processByBack(Toolkit.i18nText("Fine_Design_Template_Save_Failed_By_Lock_Inconsistency"));
+                    return true;
+                }
+                return false;
+            }
+        },
+
+        Other {
+            @Override
+            public boolean process(Throwable e) {
+                boolean minimized = (DesignerContext.getDesignerFrame().getExtendedState() & Frame.ICONIFIED ) != 0;
+                FineJOptionPane.showMessageDialog(
+                        minimized ? null : DesignerContext.getDesignerFrame(),
+                        Toolkit.i18nText("Fine-Design-Basic_Save_Failure"),
+                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
+                        JOptionPane.ERROR_MESSAGE);
+                return true;
+            }
+        };
+
+
+        protected void processByBack(String tip) {
+            int option = FineJOptionPane.showOptionDialog(DesignerContext.getDesignerFrame(),
+                                                          tip,
+                                                          Toolkit.i18nText("Fine-Design_Basic_Alert"),
+                                                          JOptionPane.YES_NO_OPTION,
+                                                          JOptionPane.WARNING_MESSAGE,
+                                                          IOUtils.readIcon("/com/fr/design/images/warnings/warning32.png"),
+                                                          new Object[] {Toolkit.i18nText("Fine_Design_Template_SaveAs_Backup"), Toolkit.i18nText("Fine-Design_Basic_Button_Cancel")}, null);
+            if (option == JOptionPane.YES_OPTION) {
+                JTemplate<?, ?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+                if (template != null) {
+                    TemplateUtils.createAndOpenTemplate(Toolkit.i18nText("Fine_Design_Template_Backup"), new FileNodeFILE(new FileNode(template.getPath(), false)), false);
+                }
+            }
+        }
+
+    }
+}

designer-base/src/main/java/com/fr/design/worker/save/SaveWorker.java

@@ -1,8 +1,6 @@
 package com.fr.design.worker.save;
 
-import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.file.HistoryTemplateListCache;
-import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.DesignerFrameFileDealerPane;
 import com.fr.design.mainframe.EastRegionContainerPane;
@@ -10,11 +8,9 @@ import com.fr.design.mainframe.JTemplate;
 import com.fr.design.worker.WorkerManager;
 import com.fr.general.ComparatorUtils;
 import com.fr.log.FineLoggerFactory;
-import java.awt.Frame;
 import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import javax.swing.JOptionPane;
 import javax.swing.SwingWorker;
 
 /**
@@ -55,12 +51,7 @@ public class SaveWorker extends SwingWorker<Boolean, Void> {
         } catch (Exception e) {
             processResult();
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
-            boolean minimized = (DesignerContext.getDesignerFrame().getExtendedState() & Frame.ICONIFIED ) != 0;
-            FineJOptionPane.showMessageDialog(
-                    minimized ? null : DesignerContext.getDesignerFrame(),
-                    Toolkit.i18nText("Fine-Design-Basic_Save_Failure"),
-                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
-                    JOptionPane.ERROR_MESSAGE);
+            SaveFailureHandler.getInstance().process(e);
             return;
         }
         processResult();

designer-base/src/main/java/com/fr/file/FILEChooserPane.java

@@ -664,6 +664,16 @@ public class FILEChooserPane extends BasicPane {
         fileNameTextField.setFilter(new DefaultCompletionFilter(names));
     }
 
+    public void disableFileNameTextFiled() {
+        fileNameTextField.setEditable(false);
+        fileNameTextField.setEnabled(false);
+    }
+
+    public void enableFileNameTextFiled() {
+        fileNameTextField.setEditable(true);
+        fileNameTextField.setEnabled(true);
+    }
+
     /**
      * 移除文件后缀的方法
      * 解决cptx文件的另存为操作默认会出现双后缀的bug(xxx.cptx.cpt)

designer-base/src/main/java/com/fr/start/BaseDesigner.java

@@ -32,6 +32,7 @@ import com.fr.process.engine.core.CarryMessageEvent;
 import com.fr.process.engine.core.FineProcessContext;
 import com.fr.stable.OperatingSystem;
 
+import com.fr.workspace.base.WorkspaceStatus;
 import java.awt.Window;
 import java.io.File;
 import java.lang.reflect.Method;
@@ -84,6 +85,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
                 if (eventPipe != null) {
                     eventPipe.fire(new CarryMessageEvent(ReportState.STOP.getValue()));
                 }
+                EventDispatcher.fire(WorkspaceStatus.Prepared);
                 collectUserInformation();
             }
         });

designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java

@@ -8,8 +8,10 @@ import com.fr.stable.EncodeConstants;
 import com.fr.stable.ProductConstants;
 import com.fr.stable.StringUtils;
 import com.fr.startup.FineWebApplicationInitializer;
+import com.fr.third.guava.collect.Sets;
 import com.fr.third.springframework.web.SpringServletContainerInitializer;
 import com.fr.third.springframework.web.context.support.AnnotationConfigWebApplicationContext;
+import com.fr.web.socketio.WebSocketEndpoint;
 import com.fr.workspace.WorkContext;
 import org.apache.catalina.Context;
 import org.apache.catalina.LifecycleException;
@@ -17,6 +19,7 @@ import org.apache.catalina.Wrapper;
 import org.apache.catalina.loader.WebappLoader;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.webresources.StandardRoot;
+import org.apache.tomcat.websocket.server.WsSci;
 
 import java.io.File;
 import java.util.HashSet;
@@ -92,6 +95,7 @@ public class FineEmbedServerActivator extends Activator {
         Set<Class<?>> classes = new HashSet<Class<?>>();
         classes.add(FineWebApplicationInitializer.class);
         context.addServletContainerInitializer(initializer, classes);
+        context.addServletContainerInitializer(new WsSci(), Sets.newHashSet(WebSocketEndpoint.class));
     }
 
     // tomcat的maxPostSize会影响到post参数获取，默认2M

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

@@ -12,4 +12,6 @@ com.fr.design.web.pane.text.field=450*20
 com.fr.design.actions.server.dialog=800*630
 com.fr.design.report.fit.templatePane.dialog=800*400
 com.fr.design.report.fit.firstColumn=120*20
-com.fr.design.report.fit.column=160*20
+com.fr.design.report.fit.column=160*20
+com.fr.design.lock.LockInfoDialog=500*180
+com.fr.design.mainframe.ForbiddenPane.refreshButton=75*24

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

@@ -11,4 +11,6 @@ com.fr.design.web.pane.text.field=400*20
 com.fr.design.actions.server.dialog=700*630
 com.fr.design.report.fit.templatePane.dialog=600*400
 com.fr.design.report.fit.firstColumn=170*20
-com.fr.design.report.fit.column=100*20
+com.fr.design.report.fit.column=100*20
+com.fr.design.lock.LockInfoDialog=500*180
+com.fr.design.mainframe.ForbiddenPane.refreshButton=68*24

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

@@ -11,4 +11,6 @@ com.fr.design.web.pane.text.field=450*20
 com.fr.design.actions.server.dialog=700*630
 com.fr.design.report.fit.templatePane.dialog=600*400
 com.fr.design.report.fit.firstColumn=130*20
-com.fr.design.report.fit.column=100*20
+com.fr.design.report.fit.column=100*20
+com.fr.design.lock.LockInfoDialog=500*180
+com.fr.design.mainframe.ForbiddenPane.refreshButton=80*24

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

@@ -12,4 +12,6 @@ com.fr.design.web.pane.text.field=450*20
 com.fr.design.actions.server.dialog=700*630
 com.fr.design.report.fit.templatePane.dialog=600*400
 com.fr.design.report.fit.firstColumn=80*20
-com.fr.design.report.fit.column=100*20
+com.fr.design.report.fit.column=100*20
+com.fr.design.lock.LockInfoDialog=400*160
+com.fr.design.mainframe.ForbiddenPane.refreshButton=68*24

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

@@ -11,4 +11,6 @@ com.fr.design.web.pane.text.field=450*20
 com.fr.design.actions.server.dialog=700*630
 com.fr.design.report.fit.templatePane.dialog=600*400
 com.fr.design.report.fit.firstColumn=80*20
-com.fr.design.report.fit.column=100*20
+com.fr.design.report.fit.column=100*20
+com.fr.design.lock.LockInfoDialog=400*160
+com.fr.design.mainframe.ForbiddenPane.refreshButton=68*24

designer-base/src/main/resources/com/fr/design/images/bbs/studyPlan_normal.svg

@@ -0,0 +1 @@
+<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><title>l</title><path d="M8.77.94A7.13,7.13,0,0,0,3.27,2.8,7.2,7.2,0,0,0,8.14,15.3a7.11,7.11,0,0,0,3.23-.77l-.54-1a6,6,0,1,1,2.34-2.08.59.59,0,0,0,1,.65A7.2,7.2,0,0,0,8.77.94Z"/><path d="M6.35,8.54h3.73a1.66,1.66,0,0,0,0-3.31H6.79a1.08,1.08,0,0,0-2.06.47A1.08,1.08,0,0,0,5.81,6.78a1.1,1.1,0,0,0,1-.61h3.29a.72.72,0,0,1,0,1.43H6.35a1.82,1.82,0,0,0,0,3.63H9.73a.87.87,0,0,0,.69.35.86.86,0,1,0-.73-1.29H6.35a.88.88,0,0,1,0-1.75ZM6.19,5.71a.38.38,0,1,1-.38-.38A.38.38,0,0,1,6.19,5.71ZM10.42,11a.28.28,0,0,1-.27-.28.27.27,0,0,1,.54,0A.28.28,0,0,1,10.42,11Z"/></svg>

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

@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0.5 0.5H1.45833V1H1.5V1.5H0.5V0.5ZM2.375 0.5H3.29167V1.5H2.375V0.5ZM4.20833 0.5H5.125V1.5H4.20833V0.5ZM6.04167 0.5H6.95833V1.5H6.04167V0.5ZM7.875 0.5H8.79167V1.5H7.875V0.5ZM9.70833 0.5H10.625V1.5H9.70833V0.5ZM11.5417 0.5H12.5V1.5H11.5V1H11.5417V0.5ZM0.5 3.5V2.5H1.5V3.5H0.5ZM12.5 2.5V3.5H11.5V2.5H12.5ZM0.5 5.5V4.5H1.5V5.5H0.5ZM12.5 4.5V5.5H11.5V4.5H12.5ZM0.5 7.5V6.5H1.5V7.5H0.5ZM12.5 6.5V7.5H11.5V6.5H12.5ZM0.5 8.5H1.5V9H1.45833V9.5H0.5V8.5ZM3.29167 9.5H2.375V8.5H3.29167V9.5ZM5.125 9.5H4.20833V8.5H5.125V9.5ZM6.95833 9.5H6.04167V8.5H6.95833V9.5ZM8.79167 9.5H7.875V8.5H8.79167V9.5ZM10.625 9.5H9.70833V8.5H10.625V9.5ZM12.5 8.5V9.5H11.5417V9H11.5V8.5H12.5Z" fill="#C2C2C2"/>
+<path d="M13.7602 15.0001C13.6857 15.0001 13.6111 15.0001 13.5365 15.0001C13.5351 14.9878 13.5275 14.9838 13.5159 14.9829C13.4597 14.9786 13.407 14.96 13.3549 14.9404C13.171 14.8709 13.0205 14.7576 12.9224 14.5854C12.8273 14.4184 12.7603 14.2374 12.6794 14.0632C12.5792 13.8474 12.4849 13.6289 12.3875 13.4118C12.3159 13.2522 12.243 13.0932 12.1714 12.9336C12.074 12.7165 11.9766 12.4993 11.8808 12.2815C11.8719 12.2612 11.35 12.6864 10.3153 13.5573C10.2385 13.622 10.1238 13.6121 10.0591 13.5353C10.0316 13.5026 10.0165 13.4613 10.0164 13.4186L10.001 7.3649C10.0007 7.26448 10.0819 7.18287 10.1823 7.18262C10.2218 7.18252 10.2603 7.19528 10.2919 7.21898L15.462 11.0966C15.5424 11.1568 15.5587 11.2708 15.4985 11.3512C15.4692 11.3902 15.4254 11.4159 15.377 11.4223C13.9063 11.6183 13.1749 11.723 13.1829 11.7363C13.2803 11.8984 13.3767 12.061 13.4745 12.2229C13.6247 12.4719 13.776 12.7203 13.9265 12.9692C14.0725 13.2107 14.2166 13.4534 14.3643 13.6939C14.4748 13.874 14.5144 14.0685 14.4805 14.275C14.4214 14.635 14.1357 14.9218 13.7808 14.9828C13.7695 14.9847 13.7616 14.9878 13.7602 15.0001Z" fill="#C2C2C2"/>
+<path d="M10.1424 7.01206C10.1424 7.05547 10.1424 7.09902 10.1424 7.14242C10.0952 7.14242 10.048 7.14242 10.0008 7.14242C9.98988 6.88542 10.098 7.06584 10.1424 7.01206Z" fill="#C2C2C2"/>
+</svg>

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

@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0.5 0.5H1.45833V1H1.5V1.5H0.5V0.5ZM2.375 0.5H3.29167V1.5H2.375V0.5ZM4.20833 0.5H5.125V1.5H4.20833V0.5ZM6.04167 0.5H6.95833V1.5H6.04167V0.5ZM7.875 0.5H8.79167V1.5H7.875V0.5ZM9.70833 0.5H10.625V1.5H9.70833V0.5ZM11.5417 0.5H12.5V1.5H11.5V1H11.5417V0.5ZM0.5 3.5V2.5H1.5V3.5H0.5ZM12.5 2.5V3.5H11.5V2.5H12.5ZM0.5 5.5V4.5H1.5V5.5H0.5ZM12.5 4.5V5.5H11.5V4.5H12.5ZM0.5 7.5V6.5H1.5V7.5H0.5ZM12.5 6.5V7.5H11.5V6.5H12.5ZM0.5 8.5H1.5V9H1.45833V9.5H0.5V8.5ZM3.29167 9.5H2.375V8.5H3.29167V9.5ZM5.125 9.5H4.20833V8.5H5.125V9.5ZM6.95833 9.5H6.04167V8.5H6.95833V9.5ZM8.79167 9.5H7.875V8.5H8.79167V9.5ZM10.625 9.5H9.70833V8.5H10.625V9.5ZM12.5 8.5V9.5H11.5417V9H11.5V8.5H12.5Z" fill="#8F8F92"/>
+<path d="M13.7602 15.0001C13.6857 15.0001 13.6111 15.0001 13.5365 15.0001C13.5351 14.9878 13.5275 14.9838 13.5159 14.9829C13.4597 14.9786 13.407 14.96 13.3549 14.9404C13.171 14.8709 13.0205 14.7576 12.9224 14.5854C12.8273 14.4184 12.7603 14.2374 12.6794 14.0632C12.5792 13.8474 12.4849 13.6289 12.3875 13.4118C12.3159 13.2522 12.243 13.0932 12.1714 12.9336C12.074 12.7165 11.9766 12.4993 11.8808 12.2815C11.8719 12.2612 11.35 12.6864 10.3153 13.5573C10.2385 13.622 10.1238 13.6121 10.0591 13.5353C10.0316 13.5026 10.0165 13.4613 10.0164 13.4186L10.001 7.3649C10.0007 7.26448 10.0819 7.18287 10.1823 7.18262C10.2218 7.18252 10.2603 7.19528 10.2919 7.21898L15.462 11.0966C15.5424 11.1568 15.5587 11.2708 15.4985 11.3512C15.4692 11.3902 15.4254 11.4159 15.377 11.4223C13.9063 11.6183 13.1749 11.723 13.1829 11.7363C13.2803 11.8984 13.3767 12.061 13.4745 12.2229C13.6247 12.4719 13.776 12.7203 13.9265 12.9692C14.0725 13.2107 14.2166 13.4534 14.3643 13.6939C14.4748 13.874 14.5144 14.0685 14.4805 14.275C14.4214 14.635 14.1357 14.9218 13.7808 14.9828C13.7695 14.9847 13.7616 14.9878 13.7602 15.0001Z" fill="#333334"/>
+<path d="M10.1424 7.01206C10.1424 7.05547 10.1424 7.09902 10.1424 7.14242C10.0952 7.14242 10.048 7.14242 10.0008 7.14242C9.98988 6.88542 10.098 7.06584 10.1424 7.01206Z" fill="#333334"/>
+</svg>

designer-base/src/main/resources/com/fr/design/images/sort/asc.svg

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>升序备份</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="画板" transform="translate(-641.000000, -632.000000)">
+            <g id="升序备份" transform="translate(641.000000, 632.000000)">
+                <rect id="矩形" x="0" y="0" width="16" height="16"></rect>
+                <g id="编组-2" transform="translate(1.000000, 2.000000)" fill="#{fillColor}">
+                    <rect id="矩形" x="10.5" y="1" width="1" height="11"></rect>
+                    <path d="M11.16,0.213333333 L13.76,3.68 C13.8262742,3.76836556 13.8083656,3.89372583 13.72,3.96 C13.6853808,3.98596443 13.643274,4 13.6,4 L8.4,4 C8.28954305,4 8.2,3.91045695 8.2,3.8 C8.2,3.75672596 8.21403557,3.71461923 8.24,3.68 L10.84,0.213333333 C10.9062742,0.124967773 11.0316344,0.107059163 11.12,0.173333333 C11.1351611,0.184704183 11.1486292,0.1981722 11.16,0.213333333 Z" id="三角形"></path>
+                    <rect id="矩形" x="0" y="4" width="7" height="1"></rect>
+                    <rect id="矩形备份-3" x="0" y="0.5" width="6" height="1"></rect>
+                    <rect id="矩形备份" x="0" y="7.5" width="8" height="1"></rect>
+                    <rect id="矩形备份-2" x="0" y="11" width="9" height="1"></rect>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>