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

* commit '561e9424d3358427cf8f5fcd9bf99a168d24f95c': (38 commits)
  REPORT-96424 高级js编辑器超链国际化处理
  REPORT-96424 高级js编辑器超链国际化处理
  REPORT-96567 文本控件无法正确设置输入方式
  无jira任务，补交遗漏代码
  fix: 开放fvs的版本控制入口 #REPORT-95402
  REPORT-94629 更新注释
  REPORT-94629 优化代码
  REPORT-94629 设计器tab组件操作异常
  REPORT-95731 多层饼图、矩形树图的汇总方式下拉项为空
  REPORT-95731 多层饼图、矩形树图的汇总方式下拉项为空
  REPORT-95156 review修改
  REPORT-95156 【FR设计器】报表块取消勾选移动端"组件可选中"，改变组件位置，撤销异常 【问题原因】 ElementCaseDefinePane 初始化panel的时候默认给了个true，导致拖动的时候，触发面板刷新检查的时候，组件未选中这个checkbox识别成了状态发生了变化，undoState记录的状态就不太对。 【改动思路】 两种改法： 初始化的时候，要根据传进来的FormDesigner来渲染checkbox数据。 组件初始化监听事件的位置不要放在初始化位置，参考图表块，放在pupolate时，保持一致。（选这个） 关于一次撤销导致两种状态发生变化的问题，是由于记录undo状态的位置靠前，导致新的状态还没有变化，就被记录了，把这个位置移动下。
  REPORT-95362 fix:tab上的toolTip被截断
  REPORT-95367 fix:关闭icon模糊
  REPORT-95068 && REPORT-95197 && REPORT-95194  && REPORT-95401 && REPORT-95218 && REPORT-94999  合并到final
  REPORT-95367 fix:关闭icon模糊
  修改代码行数
  往前遍历要到0
  REPORT-95401 && REPORT-95218【FVS支持多开】打开多个fvs之后打开frm，再次打开fvs，tab栏自适应异常【FVS支持多开】禁用插件，强制保存fvs模板，可以取消勾选
  REPORT-95362 fix:tab上的toolTip被截断
  ...

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

@@ -437,7 +437,7 @@ public class EnvChangeEntrance {
             @Override
             public void doOk() {
                 SaveSomeTemplatePane saveSomeTemplatePane = new SaveSomeTemplatePane(true, SwingUtilities.getWindowAncestor(envListPane));
-                if (!saveSomeTemplatePane.showSavePane()) {
+                if (!saveSomeTemplatePane.showSavePane(true)) {
                     // 用户取消保存时，取消切换目录操作
                     return;
                 }

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

@@ -572,7 +572,7 @@ public abstract class DesignTableDataManager {
                     parameter.setValue(parameterMap.get(parameter.getName()));
                 }
             }
-            parameterMap.put(SqlNoteConstants.SQL_NOTE_TEMPLATE, HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getEditingFILE().getPath());
+            addTemplateInfoIfNeed(parameterMap);
             return DataOperator.getInstance().previewTableData(TableDataSourceTailor.extractTableData(tableDataSource), tabledata, parameterMap, rowCount);
         } catch (Exception e) {
             throw new TableDataException(e.getMessage(), e);
@@ -592,6 +592,12 @@ public abstract class DesignTableDataManager {
         }
     }
 
+    private static void addTemplateInfoIfNeed(Map<String, Object> parameterMap) {
+        if (JTemplate.isValid(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate())) {
+            parameterMap.put(SqlNoteConstants.SQL_NOTE_TEMPLATE, HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getEditingFILE().getPath());
+        }
+    }
+
     private static boolean needInputParams(boolean mustInputParameters, ParameterProvider[] parameters) {
         if (mustInputParameters && ArrayUtils.isNotEmpty(parameters)) {
             return true;
@@ -669,7 +675,7 @@ public abstract class DesignTableDataManager {
         if (needLoadingBar) {
             MultiResultTableDataWrapper.loadingBar.start();
         }
-        parameterMap.put(SqlNoteConstants.SQL_NOTE_TEMPLATE, HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getEditingFILE().getPath());
+        addTemplateInfoIfNeed(parameterMap);
         return DataOperator.getInstance().previewMultiResultTableData(tableData, parameterMap, 0);
     }
 

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

@@ -589,7 +589,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
                         } else {
                             path = driverPath;
                         }
-                        if(JarFileParseUtil.hasDuplicateDriver(con.getDriver(), path)) {
+                        if(hasDuplicateDriver(con.getDriver(), path)) {
                             testResult.setForeground(Color.RED);
                             testResult.setText(Toolkit.i18nText("Fine_Designer_Driver_Conflict"));
                         } else {
@@ -605,7 +605,9 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
             return xBorderPanel;
         }
 
-
+        private boolean hasDuplicateDriver(String driver, String folder) {
+            return JarFileParseUtil.hasDuplicateDriver(driver, folder);
+        }
     }
 
 }

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

@@ -1,5 +1,6 @@
 package com.fr.design.file;
 
+import com.fr.base.svg.IconUtils;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.imenu.UIMenuItem;
@@ -7,7 +8,6 @@ import com.fr.design.gui.imenu.UIScrollPopUpMenu;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.utils.TemplateUtils;
-import com.fr.general.IOUtils;
 import com.fr.stable.StringUtils;
 import com.fr.stable.collections.CollectionUtils;
 
@@ -34,9 +34,9 @@ import java.util.Map;
  **/
 public class MultiTemplateTabMenuFactory {
 
-    private static final Icon CLOSE = IOUtils.readIcon("/com/fr/design/images/buttonicon/close_icon.png");
+    private static final Icon CLOSE = IconUtils.readIcon("/com/fr/design/standard/close/close");
-    private static final Icon MOUSE_OVER_CLOSE = IOUtils.readIcon("/com/fr/design/images/buttonicon/mouseoverclose icon.png");
+    private static final Icon MOUSE_OVER_CLOSE = IconUtils.readIcon("/com/fr/design/standard/close/close_mouseover.svg");
-    private static final Icon MOUSE_PRESS_CLOSE = IOUtils.readIcon("/com/fr/design/images/buttonicon/pressclose icon.png");
+    private static final Icon MOUSE_PRESS_CLOSE = IconUtils.readIcon("/com/fr/design/standard/close/close_press.svg");
 
     private static final int ITEM_SIZE = 25;
 

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

@@ -44,6 +44,7 @@ import javax.swing.JSeparator;
 import javax.swing.MenuElement;
 import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
+import javax.swing.ToolTipManager;
 import javax.swing.plaf.basic.BasicMenuItemUI;
 import java.awt.AWTEvent;
 import java.awt.AlphaComposite;
@@ -212,6 +213,35 @@ public class MultiTemplateTabPane extends JComponent {
         });
     }
 
+
+    /**
+     * 模板可以关闭的条件
+     */
+    class CloseCondition {
+        private CloseOption closeOption;
+
+        public CloseCondition(CloseOption closeOption) {
+            this.closeOption = closeOption;
+        }
+
+        /**
+         * 判断模板是否可以关闭，两个条件：1、是否满足CloseOption里面的条件（在左侧、在右侧等）2、是否和当前正在编辑模板属于同一种模板tab操作类型
+         * @param closeJTemplate
+         * @param tplIndex
+         * @param i
+         * @return
+         */
+        public boolean shouldClose(JTemplate closeJTemplate, int tplIndex, int i) {
+            boolean matchOption = this.closeOption.shouldClose(tplIndex, i);
+            JTemplate currentTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+            if (!JTemplate.isValid(currentTemplate)) {
+                return matchOption;
+            }
+            return matchOption && ComparatorUtils.equals(closeJTemplate.getTemplateTabOperatorType(),
+                    currentTemplate.getTemplateTabOperatorType());
+        }
+    }
+
     enum CloseOption {
         Left(Toolkit.i18nText("Fine-Design_Close_templates_To_The_Left")) {
             @Override
@@ -322,32 +352,34 @@ public class MultiTemplateTabPane extends JComponent {
 
         @Override
         public void actionPerformed(ActionEvent e) {
-            SaveSomeTemplatePane saveSomeTempaltePane = new SaveSomeTemplatePane(false);
+            //只有关闭所有模板才需要判断当前模板，关闭左侧、右侧、其他都不需要
-            if (saveSomeTempaltePane.showSavePane()) {
+            SaveSomeTemplatePane saveSomeTemplatePane = new SaveSomeTemplatePane(option == CloseOption.All);
+            CloseCondition closeCondition = new CloseCondition(option);
+            if (saveSomeTemplatePane.showSavePane(closeCondition, false)) {
 
                 JTemplate<?, ?>[] templates = new JTemplate<?, ?>[openedTemplate.size()];
                 for (int i = 0; i < openedTemplate.size(); i++) {
                     templates[i] = openedTemplate.get(i);
                 }
                 JTemplate<?, ?> currentTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
-                closeTemplate(templates, currentTemplate);
+                closeTemplate(closeCondition, templates, currentTemplate);
 
                 if (openedTemplate.size() == 0) {
                     DesignerContext.getDesignerFrame().addAndActivateJTemplate();
                 } else if (option == CloseOption.All){
-                    DesignerContext.getDesignerFrame().activateJTemplate(openedTemplate.get(0));
+                    //openedTemplate(0)是JVirtualTemplate时需重新打开
+                    openedTemplate.get(0).activeOldJTemplate();
                 } else {
-                    DesignerContext.getDesignerFrame().activateJTemplate(currentTemplate);
+                    currentTemplate.activeOldJTemplate();
                 }
 
                 MultiTemplateTabPane.getInstance().repaint();
             }
         }
 
-        private void closeTemplate(JTemplate<?, ?>[] templates, JTemplate<?, ?> currentTemplate) {
+        private void closeTemplate(CloseCondition closeCondition, JTemplate<?, ?>[] templates, JTemplate<?, ?> currentTemplate) {
-            String operator =  currentTemplate.getTemplateTabOperatorType();
             for (int i = 0; i < templates.length; i++) {
-                if (option.shouldClose(tplIndex, i) && ComparatorUtils.equals(operator, templates[i].getTemplateTabOperatorType())) {
+                if (closeCondition.shouldClose(templates[i], tplIndex, i)) {
                     JTemplate<?, ?> jTemplate = templates[i];
                     if (jTemplate == currentTemplate) {
                         currentTemplate = option == CloseOption.All ? null : templates[tplIndex];
@@ -725,6 +757,58 @@ public class MultiTemplateTabPane extends JComponent {
             minPaintIndex = 0;
             maxPaintIndex = openedTemplate.size() - 1;
         }
+        //需要根据每个tab的宽度重新check下实际的maxPaintIndex和minPaintIndex
+        checkActualPaintIndex();
+    }
+
+    /**
+     * 先计算出需要补充的tab个数
+     * @return
+     */
+    private int calTabCountComplemented(){
+        int a = 0;
+        for (int i = minPaintIndex; i <= maxPaintIndex; i++) {
+            JTemplate template = openedTemplate.get(i);
+            if (!showJTemplateTab(template)) {
+                a++;
+            }
+        }
+        return a;
+    }
+
+
+    /**
+     * 由于可能存在宽度为0的tab，所以这边需要重新check下，先往后补，再往前补
+     */
+    private void checkActualPaintIndex(){
+        int tabCount = calTabCountComplemented();
+        if (tabCount == 0){
+            return;
+        }
+        if (maxPaintIndex < openedTemplate.size() - 1) {
+            for (int i = maxPaintIndex + 1; i < openedTemplate.size(); i++) {
+                JTemplate template = openedTemplate.get(i);
+                if (showJTemplateTab(template)) {
+                    tabCount--;
+                }
+                maxPaintIndex++;
+                if (tabCount == 0){
+                    return;
+                }
+            }
+        }
+        if (minPaintIndex > 0){
+            for (int i = minPaintIndex - 1; i >= 0; i--) {
+                JTemplate template = openedTemplate.get(i);
+                if (showJTemplateTab(template)) {
+                    tabCount--;
+                }
+                minPaintIndex--;
+                if (tabCount == 0){
+                    return;
+                }
+            }
+        }
     }
 
 
@@ -996,9 +1080,12 @@ public class MultiTemplateTabPane extends JComponent {
             // selectIndex 没有变化，但是对应的模板已经变成了前一张模板
             if (closeIconIndex == selectedIndex || isCloseCurrent) {
                 // 如果当前关闭的模板在最右侧，那么预览上一个，防止数组越界
+                // 关闭的模板是当前选中的模板时，需要重新计算下一个待展示的模板的index
                 if (selectedIndex >= maxPaintIndex) {
                     // selectIndex 不会 <0 因为如果关闭的是打开的最后一个模板，那么关闭之后 openedTemplate.isEmpty() = true
                     selectedIndex = calNextShowJTemplateIndex(selectedIndex - 1);
+                } else {
+                    selectedIndex = calNextShowJTemplateIndex(selectedIndex);
                 }
                 isCloseCurrent = false;
             }
@@ -1119,6 +1206,7 @@ public class MultiTemplateTabPane extends JComponent {
 
     private class MultiTemplateTabMouseListener implements MouseListener {
 
+        private boolean oldLightWeightPopupEnabled;
 
         /**
          * 鼠标进入
@@ -1127,7 +1215,8 @@ public class MultiTemplateTabPane extends JComponent {
          */
         @Override
         public void mouseEntered(MouseEvent e) {
-            // do nothing
+            this.oldLightWeightPopupEnabled = ToolTipManager.sharedInstance().isLightWeightPopupEnabled();
+            ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
         }
 
         /**
@@ -1137,6 +1226,9 @@ public class MultiTemplateTabPane extends JComponent {
          */
         @Override
         public void mouseExited(MouseEvent e) {
+            ToolTipManager.sharedInstance().setEnabled(false);
+            ToolTipManager.sharedInstance().setEnabled(true);
+            ToolTipManager.sharedInstance().setLightWeightPopupEnabled(this.oldLightWeightPopupEnabled);
             listDownMode = LIST_DOWN;
             closeIconIndex = -1;
             mouseOveredIndex = -1;

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

@@ -17,6 +17,7 @@ import com.fr.design.mainframe.JTemplate;
 import com.fr.general.ComparatorUtils;
 
 import com.fr.log.FineLoggerFactory;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import javax.swing.border.EmptyBorder;
@@ -123,8 +124,10 @@ public class SaveSomeTemplatePane extends BasicPane {
                 if (index < 0) {
                     return;
                 }
+                boolean mustSaveBeforeSwitchEnv = judgeJTemplateMustSave
+                        && unSavedTemplate.get(index).needSaveBeforeSwitchEnv();
                 UICheckBox checkBox = (UICheckBox) templatesList.getModel().getElementAt(index);
-                checkBox.setSelected(!checkBox.isSelected());
+                checkBox.setSelected(mustSaveBeforeSwitchEnv ||!checkBox.isSelected());
 
                 //根据templateCheckBoxes中的选择情况来更新全选框的状态
                 int selectedCount = calculateSelectedNum();
@@ -162,8 +165,25 @@ public class SaveSomeTemplatePane extends BasicPane {
         return showSavePane(false);
     }
 
+    /**
+     * 显示保存模板提醒面板
+     *
+     * @param judgeJTemplateMustSave 模板是否必须保存
+     * @return
+     */
     public boolean showSavePane(boolean judgeJTemplateMustSave) {
-        populate(judgeJTemplateMustSave);
+        return showSavePane(null, judgeJTemplateMustSave);
+    }
+
+    /**
+     * 显示保存模板提醒面板
+     *
+     * @param option 具体关闭操作
+     * @param judgeJTemplateMustSave 模板是否必须保存
+     * @return
+     */
+    public boolean showSavePane(@Nullable MultiTemplateTabPane.CloseCondition option, boolean judgeJTemplateMustSave) {
+        initAndPopulate(option, judgeJTemplateMustSave);
         //如果有未保存的文件 ，则跳出保存对话框，选择要存储的项目
         if (!unSavedTemplate.isEmpty()) {
             dialog.setVisible(true);
@@ -177,11 +197,14 @@ public class SaveSomeTemplatePane extends BasicPane {
         return HistoryTemplateListPane.getInstance().getHistoryList();
     }
 
-    public void populate(boolean judgeJTemplateMustSave) {
+    private void initAndPopulate(@Nullable MultiTemplateTabPane.CloseCondition option, boolean judgeJTemplateMustSave) {
         java.util.List<JTemplate<?, ?>> opendedTemplate = getOpenedTemplatesToProcess();
         JTemplate<?, ?> currentTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
+        int currentIndex = opendedTemplate.indexOf(currentTemplate);
         for (int i = 0; i < opendedTemplate.size(); i++) {
-            if (isneedToAdd(opendedTemplate.get(i), currentTemplate)) {
+            //满足关闭条件的才继续判断文件是否发生了改动
+            boolean needClose = option == null || option.shouldClose(opendedTemplate.get(i), currentIndex, i);
+            if (needClose && isneedToAdd(opendedTemplate.get(i), currentTemplate)) {
                 unSavedTemplate.add(opendedTemplate.get(i));
             }
         }

designer-base/src/main/java/com/fr/design/javascript/JSContentWithDescriptionPane.java

@@ -20,6 +20,7 @@ import com.fr.design.javascript.jsapi.JSAPITreeHelper;
 import com.fr.design.javascript.jsapi.JSAPIUserObject;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.general.ComparatorUtils;
+import com.fr.general.GeneralContext;
 import com.fr.general.http.HttpToolbox;
 import com.fr.json.JSONArray;
 import com.fr.json.JSONException;
@@ -70,6 +71,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Locale;
 import java.util.concurrent.ExecutionException;
 
 public class JSContentWithDescriptionPane extends JSContentPane implements KeyListener {
@@ -393,9 +395,13 @@ public class JSContentWithDescriptionPane extends JSContentPane implements KeyLi
     private void updateHelpDocuments(Object value, List<HelpDocument> helpDocuments) {
         String url = LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY, PROPS_LINK_KEY_DEFAULT) + value.toString();
         try {
-            String result = HttpToolbox.get(url);
+            JSONArray jsonArray = null;
-            JSONObject jsonObject = new JSONObject(result);
+            //目前简中繁中之外的语言高级编辑器功能及文档不完善,右侧展示的文档链接列表暂时为空白
-            JSONArray jsonArray = jsonObject.optJSONArray("list");
+            if(GeneralContext.isChineseEnv()) {
+                String result = HttpToolbox.get(url);
+                JSONObject jsonObject = new JSONObject(result);
+                jsonArray = jsonObject.optJSONArray("list");
+            }
             if (jsonArray != null) {
                 for (int i = 0; i < jsonArray.length(); i++) {
                     JSONObject resultJSONObject = jsonArray.optJSONObject(i);

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

@@ -852,7 +852,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         if (jt == null || jt.getEditingFILE() == null) {
             return;
         }
-        if (currentTemplateDeactivateFail()) {
+        if (currentTemplateDeactivateFail(jt)) {
             return;
         }
         jt.addJTemplateActionListener(this);
@@ -877,7 +877,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         if (jt == null || jt.getEditingFILE() == null) {
             return;
         }
-        if (currentTemplateDeactivateFail()) {
+        if (currentTemplateDeactivateFail(jt)) {
             return;
         }
         getCenterTemplateCardPane().showJTemplate(jt);
@@ -939,9 +939,9 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
      *
      * @return 是否停用失败
      */
-    private boolean currentTemplateDeactivateFail() {
+    private boolean currentTemplateDeactivateFail(JTemplate  jt) {
         JTemplate currentEditingTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
-        return currentEditingTemplate != null && !currentEditingTemplate.deactivateTemplate();
+        return currentEditingTemplate != null && !currentEditingTemplate.deactivateTemplate(jt);
     }
 
 

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

@@ -54,6 +54,7 @@ import com.fr.plugin.injectable.PluginModule;
 import com.fr.plugin.manage.PluginFilter;
 import com.fr.plugin.observer.PluginEvent;
 import com.fr.plugin.observer.PluginEventListener;
+import com.fr.report.lock.LockInfoOperator;
 import com.fr.stable.CoreConstants;
 import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
@@ -61,7 +62,6 @@ 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;
@@ -537,7 +537,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         }
 
         private boolean pathSupportVcsAction(String path) {
-            if (FileExtension.CPT.matchExtension(path) || FileExtension.FRM.matchExtension(path)) {
+            if (FileExtension.CPT.matchExtension(path) || FileExtension.FRM.matchExtension(path) || FileExtension.VIS.matchExtension(path)) {
                 return true;
             }
             return false;

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

@@ -1373,6 +1373,17 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     }
 
 
+    /**
+     * 将要激活打开其他模板，使当前模板灭活
+     * 默认 do nothing 返回true
+     *
+     * @return true：成功停用当前模板
+     */
+    public boolean deactivateTemplate(JTemplate jTemplate) {
+        //兼容调用老的接口
+        return deactivateTemplate();
+    }
+
     /**
      * 返回当前支持的超链界面pane
      *

designer-base/src/main/resources/com/fr/design/config/default

@@ -1 +1,2 @@
 Fine-Designer_Login=i7hP48WAcuTrmxfN
+Fine-Designer_Reu_Share_CERTIFICATE_PUBLIC_KEY=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCtsz62CPSWXZE/IYZRiAuTSZkw1WOwer8+JFktK0uKLAUuQoBr+UjAMFtRA8W7JgKMDwZy/2liEAiXEOSPU/hrdV8DtT541LnGi1X/hXiRwuttPWYN3L2GYm/d5blU+FBNwghBIrdAxXTzYBc6P4KL/oYXnMdTIrkz8tYkG3QoFQIDAQAB

designer-chart/src/main/java/com/fr/van/chart/multilayer/data/MultiPiePlotTableDataContentPane.java

@@ -58,6 +58,9 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa
     //将数据列名保存下来，在update时会删除层级名列表，需要用保存的list重新初始化新的层级名列表
     private List columnNameList;
 
+    //汇总方式求和的索引
+    public static final int SUM_INDEX = 2;
+
     public MultiPiePlotTableDataContentPane() {
     }
 
@@ -241,7 +244,8 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa
         for (UIComboBox uiComboBox : levelNameList) {
             clearBoxItems(uiComboBox);
         }
-        clearBoxItems(calculateCombox);
+        //默认选求和
+        calculateCombox.setSelectedIndex(SUM_INDEX);
         refreshCenterPane();
     }
 

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

@@ -10,6 +10,7 @@ import com.fr.design.designer.beans.models.SelectionModel;
 import com.fr.design.designer.creator.XButton;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.designer.creator.XLayoutContainer;
+import com.fr.design.designer.creator.XWAbsoluteLayout;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.gui.ilable.UILabel;
@@ -25,16 +26,27 @@ import com.fr.form.ui.container.WTabTextDirection;
 import com.fr.form.ui.container.cardlayout.WCardTagLayout;
 import com.fr.form.ui.container.cardlayout.WTabFitLayout;
 import com.fr.general.Background;
-import com.fr.general.act.BorderPacker;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRFont;
+import com.fr.general.act.BorderPacker;
 import com.fr.general.act.TitlePacker;
 import com.fr.general.cardtag.TemplateStyle;
 import com.fr.stable.unit.PT;
 
-import javax.swing.*;
+import javax.swing.Action;
+import javax.swing.Icon;
+import javax.swing.JComponent;
+import javax.swing.JOptionPane;
+import javax.swing.JPopupMenu;
+import javax.swing.SwingUtilities;
 import javax.swing.plaf.basic.BasicLabelUI;
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Point;
 import java.awt.event.MouseEvent;
 import java.awt.geom.Rectangle2D;
 import java.util.ArrayList;
@@ -236,52 +248,43 @@ public class XCardSwitchButton extends XButton {
 
 
 	//SwitchButton对应的XWCardLayout和XWCardTagLayout暂未存到xml中,重新打开时根据父子层关系获取
-	private void initRelateLayout(){
+	private void initRelateLayout() {
-		this.tagLayout = (XWCardTagLayout)this.getBackupParent();
+		this.tagLayout = (XWCardTagLayout) this.getBackupParent();
 		XWCardTitleLayout titleLayout = (XWCardTitleLayout) this.tagLayout.getBackupParent();
-		XWCardMainBorderLayout borderLayout = (XWCardMainBorderLayout)titleLayout.getBackupParent();
+		XWCardMainBorderLayout borderLayout = (XWCardMainBorderLayout) titleLayout.getBackupParent();
 		this.cardLayout = borderLayout.getCardPart();
 	}
 
-	//是否进入点击关闭按钮区域
+	/**
-	private boolean isSelectedClose(MouseEvent e, FormDesigner designer){
+	 * <p> 是否进入点击关闭按钮区域
+	 * <p> 计算逻辑：
+	 * <p> 先得到鼠标的绝对坐标 -> tab布局的绝对坐标 -> 得到鼠标相对tab的坐标（有参数面板时要减去参数面板的高度）
+	 * <p> 再计算删除区域位置的相对坐标，通过对比判定鼠标是否在点击关闭按钮区域内，即，鼠标的位置(ex,ey)：
+	 * <li> 当前点击tag删除区域的x坐标 < ex < 当前点击tag删除区域的x坐标 + 偏移量</li>
+	 * <li> 当前点击tag删除区域的y坐标 < ey < 当前点击tag删除区域的y坐标 + 偏移量</li>
+	 *
+	 * @param e        鼠标事件
+	 * @param designer 表单编辑对象
+	 * @return true/false 在内/不在
+	 */
+	private boolean isSelectedClose(MouseEvent e, FormDesigner designer) {
 
 		int diff = designer.getHorizontalScaleValue();
 
 		// mouse position
+		// 这里是鼠标的绝对位置
 		int ex = e.getX() + diff;
 		int ey = e.getY();
-
+		// 获取tab布局的位置,鼠标相对于tab按钮的位置
-		//获取tab布局的位置,鼠标相对于tab按钮的位置
+		double[] tabPositionInBody = getTabAbsolutePositionInBody();
-		Container mainLayout = cardLayout.getBackupParent();
-		Point point = mainLayout.getLocation();
-		int y = 0;
-		int x = 0;
-		//遍历一下，不然是相对位置，嵌套后位置不对
-		while (mainLayout.getParent() != null){
-			if(mainLayout instanceof XWCardLayout){
-				y += mainLayout.getY();
-			}
-
-			mainLayout = mainLayout.getParent();
-
-			if(mainLayout instanceof XWCardMainBorderLayout){
-				x += mainLayout.getX();
-				y += mainLayout.getY();
-			}
-		}
-		double mainX = point.getX() + x;
-		double mainY = point.getY() + y;
-
 		// 参数界面对坐标的影响
 		JForm jform = (JForm) HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
-		if(jform.getFormDesign().getParaComponent() != null){
+		if (jform.getFormDesign().getParaComponent() != null) {
 			ey -= jform.getFormDesign().getParaHeight();
 		}
-
 		//减掉tab布局的相对位置
-		ex -= mainX;
+		ex -= tabPositionInBody[0];
-		ey -= mainY;
+		ey -= tabPositionInBody[1];
 
 		XLayoutContainer titleLayout = tagLayout.getBackupParent();
 		Point titlePoint = titleLayout.getLocation();
@@ -291,10 +294,43 @@ public class XCardSwitchButton extends XButton {
 		int width = button.getWidth();
 
 		// 鼠标进入按钮右侧删除图标区域
-		double recX = position.getX() + titlePoint.getX() +  (width - CLOSE_ICON_RIGHT_OFFSET);
+		double recX = position.getX() + titlePoint.getX() + (width - CLOSE_ICON_RIGHT_OFFSET);
 		double recY = position.getY() + titlePoint.getY() + CLOSE_ICON_TOP_OFFSET;
+		// 比较的是相对位置的偏移量是否在一定距离内
+		// 所以要得到鼠标相对于当前tab块的坐标
+		return (recX < ex && ex < recX + CLOSE_ICON_RIGHT_OFFSET && ey < recY && ey > position.getY());
+	}
+
+	/**
+	 * 获取tab布局在body内的绝对位置
+	 *
+	 * @return
+	 */
+	private double[] getTabAbsolutePositionInBody() {
+		// 获取tab布局的位置,鼠标相对于tab按钮的位置
+		Container mainLayout = cardLayout.getBackupParent();
+		// 这个point是当前tab布局的相对坐标，是相对于父容器的坐标
+		// 比如父级是一个absolute块，放在左上角，现在得到的point就是(0,0)
+		Point point = mainLayout.getLocation();
+		int y = 0;
+		int x = 0;
+		// 遍历一下，不然是相对位置，嵌套后位置不对
+		// 这里是要得到tab布局的绝对位置，所以要加上父组件的位置
+		while (mainLayout.getParent() != null) {
+			if (mainLayout instanceof XWCardLayout) {
+				y += mainLayout.getY();
+			}
+
+			mainLayout = mainLayout.getParent();
 
-		return (recX < ex && ex < recX + CLOSE_ICON_RIGHT_OFFSET &&  ey < recY && ey > position.getY());
+			if ((mainLayout instanceof XWCardMainBorderLayout) || (mainLayout instanceof XWAbsoluteLayout)) {
+				x += mainLayout.getX();
+				y += mainLayout.getY();
+			}
+		}
+		double mainX = point.getX() + x;
+		double mainY = point.getY() + y;
+		return new double[]{mainX, mainY};
 	}
 
 	//将当前switchButton改为选中状态
@@ -306,7 +342,7 @@ public class XCardSwitchButton extends XButton {
 		}
 	}
 
-    @Override
+	@Override
 	public void paintComponent(Graphics g) {
         super.paintComponent(g);
         Graphics2D g2d = (Graphics2D) g;

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

@@ -24,21 +24,25 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.imenu.UIPopupMenu;
 import com.fr.design.mainframe.EditingMouseListener;
 import com.fr.design.mainframe.FormDesigner;
+import com.fr.design.mainframe.FormHierarchyTreePane;
 import com.fr.design.mainframe.WidgetPropertyPane;
+import com.fr.design.utils.gui.LayoutUtils;
 import com.fr.form.ui.CardSwitchButton;
 import com.fr.form.ui.Widget;
 import com.fr.form.ui.container.WCardLayout;
 import com.fr.form.ui.container.WTabDisplayPosition;
 import com.fr.form.ui.container.cardlayout.WCardTagLayout;
 import com.fr.form.ui.container.cardlayout.WTabFitLayout;
-import com.fr.general.act.BorderPacker;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRFont;
+import com.fr.general.act.BorderPacker;
 import com.fr.general.cardtag.DefaultTemplateStyle;
 import com.fr.stable.StringUtils;
 
 import javax.swing.border.Border;
-import java.awt.*;
+import java.awt.Dimension;
+import java.awt.FontMetrics;
+import java.awt.Rectangle;
 import java.awt.event.ContainerEvent;
 import java.awt.event.MouseEvent;
 import java.util.HashMap;
@@ -434,7 +438,7 @@ public class XWCardTagLayout extends XWHorizontalBoxLayout {
 
     }
 
-    private void fixTitleLayout(XLayoutContainer parent){
+    private void fixTitleLayout(XLayoutContainer parent) {
         FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner();
         LayoutAdapter layoutAdapter = AdapterBus.searchLayoutAdapter(formDesigner, parent);
         if (layoutAdapter != null) {
@@ -443,4 +447,31 @@ public class XWCardTagLayout extends XWHorizontalBoxLayout {
         }
     }
 
+    /**
+     * <p> 对于tab组件，WCardMainBorderLayout里面有两个子容器:
+     * <li> WCardTitleLayout，里面包含两个部分，一个是CardAddButton，另一个是WCardTagLayout - tabpane0 </li>
+     * <li> WCardLayout，里面放的是WTabFitLayout - tab00、tab10</li>
+     * <p> 在右侧组件树选择删除WCardTagLayout时（tabpane0），按照现在的产品逻辑，应该删除整个tab组件
+     *
+     * @param creator  组件
+     * @param designer 表单设计器
+     */
+    @Override
+    public void deleteRelatedComponent(XCreator creator, FormDesigner designer) {
+        XWCardTagLayout tagLayout = (XWCardTagLayout) creator;
+        // 先删除所有tab按钮
+        tagLayout.removeAll();
+        //逐层回溯找出最外层的XWCardMainBorderLayout
+        XWCardTitleLayout cardTitleLayout = (XWCardTitleLayout) tagLayout.getBackupParent();
+        XWCardMainBorderLayout mainLayout = (XWCardMainBorderLayout) cardTitleLayout.getBackupParent();
+        // 删除tab布局
+        SelectionModel selectionModel = designer.getSelectionModel();
+        if (mainLayout != null) {
+            selectionModel.setSelectedCreator(mainLayout);
+            selectionModel.deleteSelection();
+        }
+        LayoutUtils.layoutRootContainer(designer.getRootComponent());
+        FormHierarchyTreePane.getInstance().refreshRoot();
+        selectionModel.setSelectedCreator(designer.getRootComponent());
+    }
 }

designer-form/src/main/java/com/fr/design/mainframe/share/util/DownloadUtils.java

@@ -3,6 +3,7 @@ package com.fr.design.mainframe.share.util;
 import com.fr.base.theme.FormTheme;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.extra.PluginConstants;
+import com.fr.design.login.config.DefaultLoginKeys;
 import com.fr.form.share.base.CancelCheck;
 import com.fr.form.share.constants.ShareComponentConstants;
 import com.fr.ftp.util.Base64;
@@ -45,10 +46,7 @@ import java.util.Set;
  * created by Harrison on 2020/05/27
  **/
 public class DownloadUtils {
-    private static final String CERTIFICATE_PUBLIC_KEY = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCtsz62CPSWXZE/IYZRiAuTSZkw\n" +
+    private static final String CERTIFICATE_PUBLIC_KEY = DefaultLoginKeys.getInstance().getKey("Fine-Designer_Reu_Share_CERTIFICATE_PUBLIC_KEY");
-            "1WOwer8+JFktK0uKLAUuQoBr+UjAMFtRA8W7JgKMDwZy/2liEAiXEOSPU/hrdV8D\n" +
-            "tT541LnGi1X/hXiRwuttPWYN3L2GYm/d5blU+FBNwghBIrdAxXTzYBc6P4KL/oYX\n" +
-            "nMdTIrkz8tYkG3QoFQIDAQAB";
 
     private static String getReusesUrl() {
         return StableUtils.pathJoin(OnlineShopUtils.getReuInfoPath(), "file/download");

designer-form/src/main/java/com/fr/design/widget/ui/designer/component/WidgetCardTagBoundPane.java

@@ -29,7 +29,7 @@ public class WidgetCardTagBoundPane extends WidgetBoundPane {
 
     @Override
     public void initBoundPane() {
-        cardTagWidth = new UIBoundSpinner(0, Integer.MAX_VALUE, 1);
+        cardTagWidth = new UIBoundSpinner(0, Integer.MAX_VALUE, 1, 0);
         cardTagWidth.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Coords_And_Size"));
         this.add(WidgetBoundsPaneFactory.createCardTagBoundPane(cardTagWidth));
     }

designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/WCardMainLayoutDefinePane.java

@@ -7,16 +7,13 @@ import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
 import com.fr.design.gui.xpane.CardTagLayoutStylePane;
-import com.fr.design.gui.xpane.LayoutStylePane;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayoutHelper;
-import com.fr.design.mainframe.widget.accessibles.AccessibleCardTagWLayoutBorderStyleEditor;
 import com.fr.design.widget.ui.designer.AbstractDataModify;
 import com.fr.form.ui.LayoutBorderStyle;
 import com.fr.form.ui.container.WCardLayout;
 import com.fr.form.ui.container.cardlayout.WCardMainBorderLayout;
 
-
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import java.awt.BorderLayout;
@@ -72,6 +69,9 @@ public class WCardMainLayoutDefinePane extends AbstractDataModify<WCardMainBorde
     @Override
     public void populateBean(WCardMainBorderLayout ob) {
         WCardLayout cardLayout = ob.getCardPart();
+        if (cardLayout == null) {
+            return;
+        }
         stylePane.populateBean((LayoutBorderStyle) cardLayout.getBorderStyle());
         setCarousel.setSelected(cardLayout.isCarousel());
         IntervalPane.setVisible(cardLayout.isCarousel());

designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/WCardTagLayoutDefinePane.java

@@ -24,7 +24,6 @@ import com.fr.form.ui.container.cardlayout.WCardTagLayout;
 import com.fr.general.Background;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRFont;
-
 import com.fr.general.cardtag.TemplateStyle;
 
 import javax.swing.BorderFactory;
@@ -107,8 +106,11 @@ public class WCardTagLayoutDefinePane extends AbstractDataModify<WCardTagLayout>
     public void populateBean(WCardTagLayout ob) {
         //标题背景和字体属性设置在WCardLayout上做兼容
         XLayoutContainer topLayout = creator.getTopLayout();
+        if (topLayout.getComponentCount() == 0) {
+            // 没有子组件，不用做处理
+            return;
+        }
         LayoutBorderStyle layoutBorderStyle = (LayoutBorderStyle) ((XWCardMainBorderLayout) topLayout).getCardPart().toData().getBorderStyle();
-
         displayPositionGroup.setSelectedIndex(ob.getDisplayPosition().getType());
         textDirectionGroup.setSelectedIndex(ob.getTextDirection().getType());
         backgroundEditor.setValue(layoutBorderStyle.getTitle().getBackground());

designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ElementCaseDefinePane.java

@@ -22,7 +22,6 @@ import com.fr.design.mainframe.WidgetPropertyPane;
 import com.fr.design.mainframe.mobile.ui.MobileCollapsedStyleExpandPane;
 import com.fr.design.mainframe.mobile.ui.MobileComboBoxDialogEditor;
 import com.fr.form.ui.ElementCaseEditor;
-
 import com.fr.form.ui.mobile.MobileCollapsedStyle;
 import com.fr.stable.StringUtils;
 
@@ -30,7 +29,9 @@ import javax.swing.BorderFactory;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Container;
 
 /**
  * 报表块-移动端属性面板
@@ -123,7 +124,6 @@ public class ElementCaseDefinePane extends MobileWidgetDefinePane {
         panelWrapper.add(panel, BorderLayout.NORTH);
         UIExpandablePane folderPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fit"), 280, 20, panelWrapper);
         this.add(folderPane, BorderLayout.NORTH);
-        this.bingListeners2Widgets();
         this.setGlobalNames();
         this.repaint();
     }
@@ -165,7 +165,6 @@ public class ElementCaseDefinePane extends MobileWidgetDefinePane {
     @Override
     public void populate(FormDesigner designer) {
         this.designer = designer;
-        this.addAttributeChangeListener(changeListener);
         ElementCaseEditor elementCaseEditor = (ElementCaseEditor) xCreator.toData();
         this.hComboBox.setSelectedItem(new Item(elementCaseEditor.getHorziontalAttr().description(), elementCaseEditor.getHorziontalAttr()));
         this.vComboBox.setSelectedItem(new Item(elementCaseEditor.getVerticalAttr().description(), elementCaseEditor.getVerticalAttr()));
@@ -178,6 +177,8 @@ public class ElementCaseDefinePane extends MobileWidgetDefinePane {
         this.mobileCollapsedStyleEditor.setStyle(elementCaseEditor.getMobileCollapsedStyle());
         fix(elementCaseEditor.getMobileCollapsedStyle());
         this.mobileCollapsedStyleEditor.setSelected(elementCaseEditor.getMobileCollapsedStyle().isCollapsedWork());
+        this.bingListeners2Widgets();
+        this.addAttributeChangeListener(changeListener);
     }
 
     /**
@@ -191,7 +192,6 @@ public class ElementCaseDefinePane extends MobileWidgetDefinePane {
 
     @Override
     public void update() {
-        DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified(); // 触发设计器保存按钮亮起来
         String globalName = this.getGlobalName();
         switch (globalName) {
             case "hComboBox":
@@ -220,6 +220,7 @@ public class ElementCaseDefinePane extends MobileWidgetDefinePane {
             style.setCollapsedWork(this.mobileCollapsedStyleEditor.isSelectedCustom() && !FormDesignerUtils.isInAbsoluteLayout(xCreator));
             ((ElementCaseEditor) xCreator.toData()).setMobileCollapsedStyle(style);
         }
+        DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified(); // 触发设计器保存按钮亮起来
     }
 
     private void setGlobalNames() {

designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/TextEditorMobileDefinePane.java

@@ -39,17 +39,17 @@ public class TextEditorMobileDefinePane extends BaseTextEditorMobileDefinePane {
 
     @Override
     public void populate(FormDesigner designer) {
-        super.populate(designer);
         TextEditor textEditor = (TextEditor) getxCreator().toData();
         inputSettingPane.populateBean(textEditor.getMobileScanCodeAttr());
+        textSettingPane.populateBean(textEditor.getMobileTextEditAttr());
         this.bindListeners2Widgets();
     }
 
     @Override
     public void update() {
-        super.update();
         TextEditor textEditor = (TextEditor) getxCreator().toData();
         inputSettingPane.updateBean(textEditor.getMobileScanCodeAttr());
+        textSettingPane.updateBean(textEditor.getMobileTextEditAttr());
         DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified();
     }
 

designer-realize/src/main/java/com/fr/grid/GridKeyAction.java

@@ -69,28 +69,26 @@ public class GridKeyAction extends AbstractAction {
 		} else if ("right".equals(actionKey)) {
 			selectionMove(ReportConstants.MOVE_DIRECTION_RIGHT);
 		} else if ("up".equals(actionKey)) {
-			selectionMove(ReportConstants.MOVE_DIRECTION_UP);
+			directKeyPressed(ReportConstants.MOVE_DIRECTION_UP);
 		} else if ("down".equals(actionKey)) {
-			selectionMove(ReportConstants.MOVE_DIRECTION_DOWN);
+			directKeyPressed(ReportConstants.MOVE_DIRECTION_DOWN);
 		} else if ("enter".equals(actionKey)) {
-			enterKeyPressed();
+			directKeyPressed(ReportConstants.MOVE_DIRECTION_DOWN);
 		} else if ("tab".equals(actionKey)) {
-			tabKeyPressed();
+			directKeyPressed(ReportConstants.MOVE_DIRECTION_RIGHT);
 		}
 	}
 
-	private void enterKeyPressed() {
+	/**
-		if (grid.isCellEditing()) {
+	 * 传入方向进行单元格的方向移动
-			grid.stopEditing();
+	 *
-		}
+	 * @param direction 方向
-		selectionMove(ReportConstants.MOVE_DIRECTION_DOWN);
+	 */
-	}
+	private void directKeyPressed(int direction) {
-
-	private void tabKeyPressed() {
 		if (grid.isCellEditing()) {
 			grid.stopEditing();
 		}
-		selectionMove(ReportConstants.MOVE_DIRECTION_RIGHT);
+		selectionMove(direction);
 	}
 
 	/**