Merge branch 'feature/10.0' of https://code.fineres.com/scm/~bruce.deng/design into feature/10.0

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

@@ -107,6 +107,15 @@ public abstract class UIListGroupControlPane  extends UIControlPane implements L
             contentPane.add(wrapperPane);
             nameEdListMap.put(event, wrapperPane);
         }
+        contentPane.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mousePressed(MouseEvent e) {
+                super.mousePressed(e);
+                if (selectNameEdList != null) {
+                    selectNameEdList.stopEditing();
+                }
+            }
+        });
     }
 
     protected void populateNameObjects(Widget widget) {
@@ -473,7 +482,7 @@ public abstract class UIListGroupControlPane  extends UIControlPane implements L
             UILabel label = new UILabel(labelText + getWrapperLabelText()) {
                 @Override
                 public void paint(Graphics g) {
-                    ((Graphics2D) g).setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.7f));
+                    ((Graphics2D) g).setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.8f));
                     super.paint(g);
                 }
             };
@@ -481,7 +490,7 @@ public abstract class UIListGroupControlPane  extends UIControlPane implements L
             label.setOpaque(true);
             label.setBackground(Color.WHITE);
             label.setForeground(Color.decode("#333334"));
-            label.setFont(label.getFont().deriveFont(10F));
+            label.setFont(label.getFont().deriveFont(11F));
             label.setPreferredSize(new Dimension(224, 26));
             this.nameEdList = nameEdList;
             this.add(label, BorderLayout.NORTH);

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

@@ -52,6 +52,7 @@ import com.fr.file.FILEFactory;
 import com.fr.file.FileFILE;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralContext;
+import com.fr.general.GeneralUtils;
 import com.fr.general.IOUtils;
 import com.fr.invoke.Reflect;
 import com.fr.log.FineLoggerFactory;
@@ -863,7 +864,9 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
 
         JTemplate<?, ?> editingTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
         StringBuilder defaultTitleSB = new StringBuilder();
-        defaultTitleSB.append(ProductConstants.PRODUCT_NAME);
+        defaultTitleSB.append(ProductConstants.APP_NAME);
+        defaultTitleSB.append(" ");
+        defaultTitleSB.append(GeneralUtils.getVersion());
         defaultTitleSB.append(" ");
         defaultTitleSB.append(ProductConstants.BRANCH);
         defaultTitleSB.append(" ");

designer-base/src/main/java/com/fr/design/mod/ContentObjectManager.java

@@ -9,6 +9,8 @@ import com.fr.data.SimpleDSColumn;
 import com.fr.data.condition.FormulaCondition;
 import com.fr.data.impl.FormulaDictionary;
 import com.fr.data.impl.NameTableData;
+import com.fr.design.mod.impl.repalce.JavaScriptContentReplacer;
+import com.fr.design.mod.impl.repalce.VanChartHtmlLabelContentReplacer;
 import com.fr.form.main.FormHyperlink;
 import com.fr.form.ui.CardSwitchButton;
 import com.fr.form.ui.WidgetTitle;
@@ -22,6 +24,7 @@ import com.fr.report.cell.cellattr.core.group.DSColumn;
 import com.fr.report.cell.cellattr.core.group.FunctionGrouper;
 import com.fr.report.cell.cellattr.core.group.SelectCount;
 import com.fr.stable.Filter;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
@@ -49,6 +52,8 @@ public class ContentObjectManager {
 
     private final Set<String> set = new HashSet<>();
 
+    private final Map<String, ContentReplacer> map = new HashMap<>();
+
     private ContentObjectManager() {
         set.add(Formula.class.getName());
         set.add(JavaScriptImpl.class.getName());
@@ -70,6 +75,8 @@ public class ContentObjectManager {
         set.add(SelectCount.class.getName());
         set.add(WidgetTitle.class.getName());
         set.add(FunctionGrouper.class.getName());
+        map.put(JavaScriptImpl.class.getName(), new JavaScriptContentReplacer());
+        map.put(VanChartHtmlLabel.class.getName(), new VanChartHtmlLabelContentReplacer());
     }
 
     public void searchObject(Object ob) {
@@ -84,6 +91,9 @@ public class ContentObjectManager {
         objectMap = ClassHelper.searchObject(ob, set, filter);
     }
     public void clearObject() {
+        if (objectMap != null) {
+            objectMap.clear();
+        }
         objectMap = null;
     }
 
@@ -92,4 +102,22 @@ public class ContentObjectManager {
         return objectMap;
     }
 
+    public boolean needContentTip(Object ob, Set<String> nameSet) {
+        long start = System.currentTimeMillis();
+        objectMap = ClassHelper.searchObject(ob, set, ModClassFilter.getInstance());
+        for (Map.Entry<String, Set<Object>> entry : objectMap.entrySet()) {
+            for (Object o : entry.getValue()) {
+                for (String name : nameSet) {
+                    ContentReplacer contentReplacer = map.get(entry.getKey());
+                    if (contentReplacer!= null && contentReplacer.contain(o, name)) {
+                        clearObject();
+                        return true;
+                    }
+                }
+            }
+        }
+        clearObject();
+        return false;
+    }
+
 }

designer-base/src/main/java/com/fr/design/mod/ContentReplaceUtil.java

@@ -168,5 +168,12 @@ public class ContentReplaceUtil {
         return content;
     }
 
+    public static boolean containsName(String content, String name) {
+        if (StringUtils.isNotEmpty(content)) {
+            return content.contains(name);
+        }
+        return false;
+    }
+
 
 }

designer-base/src/main/java/com/fr/design/mod/ContentReplacer.java

@@ -10,4 +10,9 @@ public interface ContentReplacer<T> {
 
     void replace(T t, String oldName, String newName);
 
+
+    default boolean contain(T t, String name) {
+        return false;
+    }
+
 }

designer-base/src/main/java/com/fr/design/mod/impl/repalce/JavaScriptContentReplacer.java

@@ -19,4 +19,8 @@ public class JavaScriptContentReplacer implements ContentReplacer<JavaScriptImpl
         }
     }
 
+    @Override
+    public boolean contain(JavaScriptImpl javaScript, String name) {
+        return ContentReplaceUtil.containsName(javaScript.getContent(), name);
+    }
 }

designer-base/src/main/java/com/fr/design/mod/impl/repalce/VanChartHtmlLabelContentReplacer.java

@@ -19,4 +19,9 @@ public class VanChartHtmlLabelContentReplacer implements ContentReplacer<VanChar
                     ContentReplaceUtil.replaceContent(vanChartHtmlLabel.getCustomText(), oldName, newName));
         }
     }
+
+    @Override
+    public boolean contain(VanChartHtmlLabel vanChartHtmlLabel, String name) {
+        return ContentReplaceUtil.containsName(vanChartHtmlLabel.getCustomText(), name);
+    }
 }

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

@@ -112,6 +112,21 @@ public class XWTitleLayout extends DedicateLayoutContainer {
 		return null;
 	}
 
+
+	/**
+	 * 返回body组件
+	 * @return body组件
+	 */
+	public XCreator getBodyCreator() {
+		for (int i=0; i < getXCreatorCount(); i++) {
+			XCreator creator = getXCreator(i);
+			if (creator.hasTitleStyle()) {
+				return creator;
+			}
+		}
+		return null;
+	}
+
 	/**
 	 *  编辑状态的时候需要重新绘制下边框
 	 *
@@ -196,4 +211,4 @@ public class XWTitleLayout extends DedicateLayoutContainer {
 		super.setShareId(shareId);
 		this.getEditingChildCreator().setShareId(shareId);
 	}
-}
+}

designer-form/src/main/java/com/fr/design/designer/treeview/ComponentTreeCellRenderer.java

@@ -1,13 +1,11 @@
 package com.fr.design.designer.treeview;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.iofile.attr.ExtendSharableAttrMark;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.designer.creator.XCreatorUtils;
-import com.fr.form.ui.AbstractBorderStyleWidget;
+import com.fr.design.mainframe.share.util.ShareComponentUtils;
 import com.fr.log.FineLoggerFactory;
-import com.fr.stable.StringUtils;
 
 import javax.swing.BorderFactory;
 import javax.swing.Icon;
@@ -38,7 +36,7 @@ public class ComponentTreeCellRenderer extends DefaultTreeCellRenderer {
             }
             if (icon != null) {
                 setIcon(icon);
-                this.needAddShareIcon = isShareWidget((XCreator) value);
+                this.needAddShareIcon = ShareComponentUtils.isShareWidgetWithChild((XCreator) value);
             }
 
         }
@@ -47,14 +45,6 @@ public class ComponentTreeCellRenderer extends DefaultTreeCellRenderer {
         return this;
     }
 
-    private boolean isShareWidget(XCreator xCreator) {
-        if (!xCreator.toData().acceptType(AbstractBorderStyleWidget.class)) {
-            return false;
-        }
-        ExtendSharableAttrMark attrMark = ((AbstractBorderStyleWidget) xCreator.toData()).getWidgetAttrMark(ExtendSharableAttrMark.XML_TAG);
-        return attrMark != null && StringUtils.isNotEmpty(attrMark.getShareId());
-
-    }
 
     public void paint(Graphics g) {
         super.paint(g);

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

@@ -5,6 +5,7 @@ import com.fr.base.iofile.attr.ExtendSharableAttrMark;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.designer.creator.XCreatorUtils;
 import com.fr.design.designer.creator.XLayoutContainer;
+import com.fr.design.designer.creator.XWTitleLayout;
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.FormSelection;
@@ -91,6 +92,19 @@ public class ShareComponentUtils {
         return false;
     }
 
+    public static boolean isShareWidgetWithChild(XCreator xCreator) {
+        boolean result = isShareWidget(xCreator);
+        if (result) {
+            return true;
+        }
+        //做下兼容处理，老的组件结构的共享信息存储在子组件上
+        if (xCreator instanceof XWTitleLayout) {
+            XCreator child = ((XWTitleLayout) xCreator).getBodyCreator();
+            return isShareWidget(child);
+        }
+        return false;
+    }
+
 
     public static List<XCreator> getHelpConfigXCreatorList(XCreator root) {
         List<XCreator> helpConfigXCreatorList = new ArrayList<>();

designer-realize/src/main/java/com/fr/design/mainframe/CellWidgetPropertyPane.java

@@ -106,6 +106,9 @@ public class CellWidgetPropertyPane extends BasicPane {
         final CellSelection finalCS = (CellSelection) ePane.getSelection();
         final TemplateElementCase tplEC = ePane.getEditingElementCase();
         final Widget cellWidget = cellEditorDefPane.update();
+        if(cellWidget == null){
+            return;
+        }
         if (finalCS.isSelectedOneCell(ePane)) {
             if (tplEC.getTemplateCellElement(cellElement.getColumn(), cellElement.getRow()) == null) {//cellElement未加入到report中时要添加进去
                 tplEC.addCellElement(cellElement);
@@ -141,6 +144,9 @@ public class CellWidgetPropertyPane extends BasicPane {
         final CellSelection finalCS = (CellSelection) selection;
         final TemplateElementCase tplEC = ePane.getEditingElementCase();
         final Widget cellWidget = cellEditorDefPane.update();
+        if(cellWidget == null){
+            return;
+        }
         if(finalCS.isSelectedOneCell(ePane)){
             if(tplEC.getTemplateCellElement(cellElement.getColumn(), cellElement.getRow())== null){//cellElement未加入到report中时要添加进去
                 tplEC.addCellElement(cellElement);

designer-realize/src/main/java/com/fr/design/share/ui/generate/ShareGeneratePane.java

@@ -1,5 +1,6 @@
 package com.fr.design.share.ui.generate;
 
+import com.fr.design.designer.creator.XCreator;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.DialogActionAdapter;
@@ -11,11 +12,14 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.DesignerFrame;
 import com.fr.design.mainframe.JTemplate;
+import com.fr.design.mainframe.WidgetPropertyPane;
 import com.fr.design.mainframe.share.Bean.ComponentGenerateInfo;
 import com.fr.design.mainframe.share.action.ShareUIAspect;
 import com.fr.design.mainframe.share.collect.ComponentCollector;
 import com.fr.design.mainframe.share.exception.LackOfValueException;
 import com.fr.design.mainframe.share.generate.ComponentGeneratorCenter;
+import com.fr.design.mainframe.share.select.ComponentTransformerFactory;
+import com.fr.design.mod.ContentObjectManager;
 import com.fr.form.share.exception.NetWorkFailedException;
 import com.fr.form.share.group.DefaultShareGroup;
 import com.fr.design.mainframe.share.util.ShareUIUtils;
@@ -31,6 +35,8 @@ import com.fr.form.ui.Widget;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 
+import java.util.HashSet;
+import java.util.Set;
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.SwingWorker;
@@ -100,8 +106,9 @@ public class ShareGeneratePane extends BasicPane {
         JPanel pane = FRGUIPaneFactory.createBorderLayout_S_Pane();
 
         this.mainPane = FRGUIPaneFactory.createCardLayout_S_Pane();
-        this.simplePane = new ShareMainPane(shareCover, rec, false, effectItemGroups);
-        this.uploadPane = new ShareMainPane(shareCover, rec, true, effectItemGroups);
+        boolean needContentTip = needContentTip();
+        this.simplePane = new ShareMainPane(shareCover, rec, false, effectItemGroups, needContentTip);
+        this.uploadPane = new ShareMainPane(shareCover, rec, true, effectItemGroups, needContentTip);
         //暂时换一下，目前不用上传
         this.mainPane.add(simplePane, ShareUIUtils.convertStateChange(ItemEvent.DESELECTED));
         this.mainPane.add(uploadPane, ShareUIUtils.convertStateChange(ItemEvent.SELECTED));
@@ -161,6 +168,21 @@ public class ShareGeneratePane extends BasicPane {
         }
     }
 
+
+    private boolean needContentTip() {
+        long start = System.currentTimeMillis();
+        XCreator xCreator = ComponentTransformerFactory.getInstance().transform(WidgetPropertyPane.getInstance().getEditingFormDesigner().getSelectionModel().getSelection()).getMiddle();
+        Set<XCreator> xCreators = new HashSet<>();
+        xCreator.traversalNameRelatedXCreators(xCreators);
+        Set<String> nameSet = new HashSet<>();
+        for (XCreator creator : xCreators) {
+            nameSet.add(creator.toData().getWidgetName());
+        }
+        boolean result = ContentObjectManager.getInstance().needContentTip(shareWidget, nameSet);
+        FineLoggerFactory.getLogger().debug("needContentTip spend {} ms", (System.currentTimeMillis() - start));
+        return result;
+    }
+
     private JPanel createUploadCheckBox() {
 
         JPanel panel = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();

designer-realize/src/main/java/com/fr/design/share/ui/generate/ShareMainPane.java

@@ -131,13 +131,15 @@ public class ShareMainPane extends JPanel {
     private boolean upload;
 
     private List<EffectItemGroup> effectItemGroups;
+    private final boolean needContentTip;
 
-    public ShareMainPane(Image shareCover, Rectangle rec, boolean upload, List<EffectItemGroup> effectItemGroups) {
+    public ShareMainPane(Image shareCover, Rectangle rec, boolean upload, List<EffectItemGroup> effectItemGroups, boolean needContentTip) {
 
         this.shareCover = shareCover;
         this.rec = rec;
         this.upload = upload;
         this.effectItemGroups = effectItemGroups;
+        this.needContentTip = needContentTip;
 
         initCover(shareCover);
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
@@ -174,7 +176,14 @@ public class ShareMainPane extends JPanel {
     private JPanel createOverviewPane(boolean upload) {
         JPanel componentPane = createComponentOverviewPane(upload);
         String title = Toolkit.i18nText("Fine-Design_Share_Overview");
-        JPanel overviewPane = FRGUIPaneFactory.createTitledBorderPane(title);
+        JPanel overviewPane = FRGUIPaneFactory.createTopVerticalTitledBorderPane(title);
+        if (needContentTip) {
+            UILabel tipsLabel = ShareUIUtils.createTipsLabel(Toolkit.i18nText("Fine-Design_Share_Generate_Content_Tip"));
+            tipsLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));
+            JPanel panel = new JPanel(FRGUIPaneFactory.createBorderLayout());
+            panel.add(tipsLabel);
+            overviewPane.add(panel, BorderLayout.NORTH);
+        }
         overviewPane.add(componentPane, BorderLayout.CENTER);
 
         return overviewPane;