Merge pull request #15981 in DESIGN/design from fbp/release to fbp/feature

* commit '48f8a9d3fb09ea883e41b2a841c998768e0987f7':
  fix: REPORT-145330 公式显示为英文了
  修改文件注释
  换个换行符
  增加单元格组图标
  无jira 代码质量
  REPORT-144981 fix:预览按钮禁用状态调整
  REPORT-145133 fix:重名校验交互变更
  REPORT-145122 feat:树组件选中状态问题修复

designer-base/src/main/java/com/fr/design/editor/editor/ColumnRowGroupEditor.java

@@ -1 +1,84 @@
-package com.fr.design.editor.editor;

import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.stable.ColumnRowGroup;

import java.awt.*;

/**
 * Author : Shockway
 * Date: 14-1-10
 * Time: 下午1:46
 */
public class ColumnRowGroupEditor extends Editor<ColumnRowGroup> {

	private UITextField crEditor;

	public ColumnRowGroupEditor() {
		this("");
	}

	public ColumnRowGroupEditor(String name) {
		this(null, name);
	}

	public ColumnRowGroupEditor(ColumnRowGroup value) {
		this(value, "");
	}

	public ColumnRowGroupEditor(ColumnRowGroup value, String name) {
		this.setLayout(FRGUIPaneFactory.createBorderLayout());
		crEditor = new UITextField();
		this.add(crEditor, BorderLayout.CENTER);
		this.setValue(value);
		this.setName(name);
	}

	@Override
	public ColumnRowGroup getValue() {
		return new ColumnRowGroup(this.crEditor.getText());
	}

	@Override
	public void setValue(ColumnRowGroup value) {
		if (value == null) {
			this.crEditor.setText("");
		} else {
			this.crEditor.setText(value.toString());
		}
	}

	@Override
	public void setEnabled(boolean enabled) {
		super.setEnabled(enabled);

		this.crEditor.setEnabled(enabled);
	}

	/**
	 * 获取焦点
	 */
	public void requestFocus() {
		this.crEditor.requestFocus();
	}

	public String getIconName() {
		return "cell_group";
	}

	/**
	 * 是否接收/支持这个对象
	 * @param object 检测对象
	 * @return 是否支持
	 */
	public boolean accept(Object object) {
		return object instanceof ColumnRowGroup;
	}
}
+package com.fr.design.editor.editor;
+
+import com.fr.design.gui.itextfield.UITextField;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.stable.ColumnRowGroup;
+
+import java.awt.*;
+
+/**
+ * 单元格组编辑
+ *
+ * @author Shockway
+ * @since 2014-01-10
+ * Created on 2024-01-10
+ */
+public class ColumnRowGroupEditor extends Editor<ColumnRowGroup> {
+
+	private UITextField crEditor;
+
+	public ColumnRowGroupEditor() {
+		this("");
+	}
+
+	public ColumnRowGroupEditor(String name) {
+		this(null, name);
+	}
+
+	public ColumnRowGroupEditor(ColumnRowGroup value) {
+		this(value, "");
+	}
+
+	public ColumnRowGroupEditor(ColumnRowGroup value, String name) {
+		this.setLayout(FRGUIPaneFactory.createBorderLayout());
+		crEditor = new UITextField();
+		this.add(crEditor, BorderLayout.CENTER);
+		this.setValue(value);
+		this.setName(name);
+	}
+
+	@Override
+	public ColumnRowGroup getValue() {
+		return new ColumnRowGroup(this.crEditor.getText());
+	}
+
+	@Override
+	public void setValue(ColumnRowGroup value) {
+		if (value == null) {
+			this.crEditor.setText("");
+		} else {
+			this.crEditor.setText(value.toString());
+		}
+	}
+
+	@Override
+	public void setEnabled(boolean enabled) {
+		super.setEnabled(enabled);
+
+		this.crEditor.setEnabled(enabled);
+	}
+
+	/**
+	 * 获取焦点
+	 */
+	public void requestFocus() {
+		this.crEditor.requestFocus();
+	}
+
+	public String getIconName() {
+		return "cell_group";
+	}
+
+	public String getIconId() {
+		return "cell_group_popup";
+	}
+
+	/**
+	 * 是否接收/支持这个对象
+	 * @param object 检测对象
+	 * @return 是否支持
+	 */
+	public boolean accept(Object object) {
+		return object instanceof ColumnRowGroup;
+	}
+}

designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/RefreshableJTree.java

@@ -316,4 +316,20 @@ public abstract class RefreshableJTree extends CheckBoxTree {
         tip.setOpaque(false);
         return tip;
     }
+
+    @Override
+    public TreePath getPathForLocation(int x, int y) {
+        // NewUI树组件全选行，仅考虑y坐标即可
+        TreePath closestPath = getClosestPathForLocation(x, y);
+
+        if (closestPath != null) {
+            Rectangle pathBounds = getPathBounds(closestPath);
+
+            if(pathBounds != null &&
+                    y >= pathBounds.y && y < (pathBounds.y + pathBounds.height)) {
+                return closestPath;
+            }
+        }
+        return null;
+    }
 }

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

@@ -1926,15 +1926,15 @@ public class FILEChooserPane extends BasicPane {
             nameField.getDocument().addDocumentListener(new DocumentListener() {
 
                 public void changedUpdate(DocumentEvent e) {
-                    validInput();
+                    resetInputChecker();
                 }
 
                 public void insertUpdate(DocumentEvent e) {
-                    validInput();
+                    resetInputChecker();
                 }
 
                 public void removeUpdate(DocumentEvent e) {
-                    validInput();
+                    resetInputChecker();
                 }
             });
             nameField.selectAll();
@@ -1993,7 +1993,9 @@ public class FILEChooserPane extends BasicPane {
         }
 
         private void confirmClose() {
-
+            if (!validInput()) {
+                return;
+            };
             String userInput = nameField.getText().trim();
 
             // 处理不合法的文件夹名称
@@ -2028,12 +2030,13 @@ public class FILEChooserPane extends BasicPane {
         }
 
 
-        private void validInput() {
-
+        private boolean validInput() {
+            boolean valid = true;
             String userInput = nameField.getText().trim();
 
             if (StringUtils.isEmpty(userInput)) {
                 confirmButton.setEnabled(false);
+                valid = false;
             }
 
             boolean duplicate = false;
@@ -2045,7 +2048,7 @@ public class FILEChooserPane extends BasicPane {
                     break;
                 }
             }
-
+            valid = valid && !duplicate;
             if (duplicate) {
                 nameField.selectAll();
                 // 如果文件名已存在，则灰掉确认按钮
@@ -2059,6 +2062,12 @@ public class FILEChooserPane extends BasicPane {
                 warnLabel.setVisible(false);
                 confirmButton.setEnabled(true);
             }
+            return valid;
+        }
+
+        private void resetInputChecker() {
+            warnLabel.setVisible(false);
+            confirmButton.setEnabled(true);
         }
     }
 }

designer-base/src/main/resources/com/fine/theme/icon/editor/cell_group_popup.svg

@@ -0,0 +1,13 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_13814_85902)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1.90625 3.53125C1.90625 2.53023 2.71773 1.71875 3.71875 1.71875H14.5V3.53125H3.71875V13.5H1.90625V3.53125ZM25.2812 23.4688V13.5H27.0938V23.4688C27.0938 24.4698 26.2823 25.2812 25.2812 25.2812H14.5V23.4688H25.2812Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M1.90625 13.5H14.5V25.2812H3.71875C2.71773 25.2812 1.90625 24.4698 1.90625 23.4688V13.5Z" fill="#2576EF"/>
+<path d="M27.0938 13.5H14.5V1.71875H25.2812C26.2823 1.71875 27.0938 2.53023 27.0938 3.53125V13.5Z" fill="#2576EF"/>
+<path d="M24.2851 30C24.0316 30 23.9047 29.6935 24.0839 29.5143L29.5143 24.0839C29.6935 23.9047 30 24.0316 30 24.2851V29.6C30 29.8209 29.8209 30 29.6 30H24.2851Z" fill="#0A1C38" fill-opacity="0.9"/>
+</g>
+<defs>
+<clipPath id="clip0_13814_85902">
+<rect width="32" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/editor/cell_group_popup_disable.svg

@@ -0,0 +1,13 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_13814_85916)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1.90625 3.53125C1.90625 2.53023 2.71773 1.71875 3.71875 1.71875H14.5V3.53125H3.71875V13.5H1.90625V3.53125ZM25.2812 23.4688V13.5H27.0938V23.4688C27.0938 24.4698 26.2823 25.2812 25.2812 25.2812H14.5V23.4688H25.2812Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M1.90625 13.5H14.5V25.2812H3.71875C2.71773 25.2812 1.90625 24.4698 1.90625 23.4688V13.5Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M27.0938 13.5H14.5V1.71875H25.2812C26.2823 1.71875 27.0938 2.53023 27.0938 3.53125V13.5Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M24.2851 30C24.0316 30 23.9047 29.6935 24.0839 29.5143L29.5143 24.0839C29.6935 23.9047 30 24.0316 30 24.2851V29.6C30 29.8209 29.8209 30 29.6 30H24.2851Z" fill="#0A1C38" fill-opacity="0.29"/>
+</g>
+<defs>
+<clipPath id="clip0_13814_85916">
+<rect width="32" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json

@@ -393,6 +393,7 @@
     "date_popup": "editor/date_popup.svg",
     "param_popup": "editor/param_popup.svg",
     "cellelement_popup": "editor/cellelement_popup.svg",
+    "cell_group_popup": "editor/cell_group_popup.svg",
     "bind_column_popup": "editor/bind_column_popup.svg",
     "preview_mobile": "preview/preview_mobile.svg",
     "preview_paging": "preview/preview_paging.svg",

designer-realize/src/main/java/com/fr/start/MainDesigner.java

@@ -337,8 +337,8 @@ public class MainDesigner extends BaseDesigner {
     }
 
     private UICombinationButton createRunButton() {
-        run = new UICombinationButton(new UISaveForbiddenButton(Toolkit.i18nText("Fine-Design_Basic_Preview"), new LazyIcon("run").white()),
-                new UISaveForbiddenButton(new LazyIcon("triangle_down").white()));
+        run = new UICombinationButton(new UIButton(Toolkit.i18nText("Fine-Design_Basic_Preview"), new LazyIcon("run").white()),
+                new UIButton(new LazyIcon("triangle_down").white()));
         run.addLeftClickLister(mouseEvent -> {
             JTemplate<?, ?> jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
             if (jt == null || jt.isSaving()) {