Merge remote-tracking branch 'origin/feature/x' into feature/x

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

@@ -1,5 +1,6 @@
 package com.fr.design.gui;
 
+import com.fr.base.svg.IconUtils;
 import com.fr.design.gui.borders.UIFrameBorder;
 import com.fr.design.gui.borders.UIInternalFrameBorder;
 import com.fr.design.gui.borders.UITableHeaderBorder;
@@ -160,10 +161,10 @@ public class UILookAndFeel extends MetalLookAndFeel {
         table.put("Tree.collapsedIcon", loadIcon("TreePlusIcon.png", this));
         table.put("Tree.openIcon", loadIcon("TreeFolderOpenedIcon.png", this));
         table.put("Tree.closedIcon", loadIcon("TreeFolderClosedIcon.png", this));
-        table.put("Tree.leafIcon", loadIcon("TreeLeafIcon.svg", this));
+        table.put("Tree.leafIcon", loadIcon("TreeLeafIcon.png", this));
         table.put("FileView.directoryIcon", loadIcon("DirectoryIcon.png", this));
         table.put("FileView.computerIcon", loadIcon("ComputerIcon.png", this));
-        table.put("FileView.fileIcon", loadIcon("FileIcon.svg", this));
+        table.put("FileView.fileIcon", IconUtils.readIcon("/com/fr/design/images/lookandfeel/FileIcon.svg"));
         table.put("FileView.floppyDriveIcon", loadIcon("FloppyIcon.png", this));
         table.put("FileView.hardDriveIcon", loadIcon("HarddiskIcon.png", this));
         table.put("FileChooser.detailsViewIcon", loadIcon("FileDetailsIcon.png", this));

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

@@ -113,12 +113,14 @@ public class SaveFailureHandler implements ThrowableHandler {
                                                           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) {
+                if (JTemplate.isValid(template)) {
                     TemplateUtils.createAndOpenTemplate(
                             Toolkit.i18nText("Fine_Design_Template_Backup"),
                             new FileNodeFILE(new FileNode(template.getPath(), false)),
                             true,
-                            false);
+                            true,
+                            // 创建并打开备份模板后，关闭原模板，无需释放原模板锁（因为已经被超管手动清除了）
+                            () -> HistoryTemplateListCache.getInstance().closeSelectedReport(template));
                 }
             }
         }

designer-chart/src/main/java/com/fr/design/locale/impl/EmptyDataMark.java

@@ -13,14 +13,14 @@ import java.util.Map;
  * 根据本地化信息设置服务器图表空数据提示图标
  *
  * @author obo
- * @version 11.0
+ * @since 11.0
- * Created by obo on 2023/3/22
+ * Created on 2023/3/22
  */
 public class EmptyDataMark implements LocaleMark<BufferedImage> {
 
     private Map<Locale, BufferedImage> map = new HashMap<>();
 
-    private static final BufferedImage ZH_EMPTY_DATA = IOUtils.readImage("com/fr/design/images/zh_emptydata.png");
+    private static final BufferedImage ZH_EMPTY_DATA = IOUtils.readImage("/com/fr/design/images/zh_emptydata.png");
     private static final BufferedImage US_EMPTY_DATA = IOUtils.readImage("/com/fr/design/images/us_emptydata.png");
     private static final BufferedImage ZH_TRADITIONAL_EMPTY_DATA = IOUtils.readImage("/com/fr/design/images/zh_traditional_emptydata.png");
 
@@ -34,4 +34,5 @@ public class EmptyDataMark implements LocaleMark<BufferedImage> {
         BufferedImage result = map.get(GeneralContext.getLocale());
         return result == null ? US_EMPTY_DATA : result;
     }
+
 }

designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java

@@ -368,12 +368,11 @@ public class RootDesignDefinePane extends AbstractDataModify<WParameterLayout> {
         wParameterLayout.setParamsFireStopEdit(fireAfterEditor.isSelected());
         JTemplate jTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
         jTemplate.needAddTemplateIdAttr(useParamsTemplate.isSelected());
-        wParameterLayout.setBackground((Background) background.getValue());
         if (extraPaneList.isEmpty()) {
-            background.setValue(wParameterLayout.getBackground());
+            wParameterLayout.setBackground((Background) background.getValue());
         } else {
             for (BasicBeanPane<WParameterLayout> pane : extraPaneList) {
-                pane.populateBean(wParameterLayout);
+                pane.updateBean(wParameterLayout);
             }
         }
         //设置参数模板面板的高度

designer-realize/src/main/java/com/fr/design/sort/celldscolumn/CellDSColumnSortGroupPane.java

@@ -8,6 +8,8 @@ import com.fr.design.sort.common.AbstractSortItemPane;
 import com.fr.report.cell.cellattr.core.group.DSColumn;
 import com.fr.report.core.sort.sortexpression.SortExpression;
 
+import java.util.Map;
+
 public class CellDSColumnSortGroupPane extends AbstractSortGroupPane {
     DSColumn dsColumn;
 
@@ -24,7 +26,8 @@ public class CellDSColumnSortGroupPane extends AbstractSortGroupPane {
         CellDSColumnSortItemPane cellDSColumnSortItemPane = new CellDSColumnSortItemPane(sortItemPaneWidth, sortItemPaneRightWidth);
         java.util.Map<String, TableDataWrapper> tableDataWrapperMap =
                 DesignTableDataManager.getAllEditingDataSet(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getTarget());
-        TableDataWrapper tableDataWrapper = tableDataWrapperMap.get(dsColumn.getDSName());
+        Map<String, TableDataWrapper> allDataSetIncludingProcedure = DesignTableDataManager.getAllDataSetIncludingProcedure(tableDataWrapperMap);
+        TableDataWrapper tableDataWrapper = allDataSetIncludingProcedure.get(dsColumn.getDSName());
         if (tableDataWrapper != null) {
             java.util.List<String> columnNameList = tableDataWrapper.calculateColumnNameList();
             String[] columnNames = new String[columnNameList.size()];