Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~zheng/C-design into release/10.0

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

@@ -41,7 +41,7 @@ import javax.swing.event.ChangeListener;
 import java.io.ByteArrayOutputStream;
 import java.text.Collator;
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -123,6 +123,7 @@ public abstract class DesignTableDataManager {
      * @param dsNameChangedMap 改变名字的数据集
      */
     public static void fireDSChanged(Map<String, String> dsNameChangedMap) {
+        clearGlobalDs();
         if (!dsNameChangedMap.isEmpty()) {
             setDsNameChangedMap(dsNameChangedMap);
         }
@@ -334,15 +335,9 @@ public abstract class DesignTableDataManager {
 
     private static void addStoreProcedureData(java.util.Map<String, TableDataWrapper> resMap) {
         ProcedureConfig procedureConfig = ProcedureConfig.getInstance();
-        String[] namearray = new String[0];
+        List<String> names = new ArrayList<>(procedureConfig.getProcedures().keySet());
-        @SuppressWarnings("unchecked")
+        Collections.sort(names, Collator.getInstance(java.util.Locale.CHINA));
-        java.util.Iterator<String> nameIt = procedureConfig.getProcedures().keySet().iterator();
+        for (String name : names) {
-        while (nameIt.hasNext()) {
-            namearray = (String[]) ArrayUtils.add(namearray, nameIt.next());
-        }
-        Arrays.sort(namearray, Collator.getInstance(java.util.Locale.CHINA));
-
-        for (String name : namearray) {
             StoreProcedure storeProcedure = procedureConfig.getProcedure(name);
             if (globalDsCache.containsKey(name)) {
                 resMap.put(name, globalDsCache.get(name));

designer-base/src/main/java/com/fr/design/mainframe/template/info/TemplateInfoCollector.java

@@ -36,6 +36,7 @@ public class TemplateInfoCollector implements XMLReadable, XMLWriter {
     private static final String XML_TEMPLATE_INFO_LIST = "TemplateInfoList";
     private static final String XML_FILE_NAME = "tpl.info";
     private static TemplateInfoCollector instance;
+    private static final int MAX_SIZE = 512 * 1024 * 1024;
     private Map<String, TemplateInfo> templateInfoMap;
     private DesignerOpenHistory designerOpenHistory;
 
@@ -167,7 +168,7 @@ public class TemplateInfoCollector implements XMLReadable, XMLWriter {
     }
 
     private boolean shouldCollectInfo() {
-        return DesignerEnvManager.getEnvManager().isJoinProductImprove() && FRContext.isChineseEnv();
+        return FileUtils.sizeOf(getInfoFile()) <= MAX_SIZE && DesignerEnvManager.getEnvManager().isJoinProductImprove() && FRContext.isChineseEnv();
     }
 
     /**

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

@@ -71,4 +71,9 @@ public class StashedFILE extends AbstractFILE {
     public boolean isEnvFile() {
         return false;
     }
+
+    @Override
+    public String toString() {
+        return FILEFactory.MEM_PREFIX + getName();
+    }
 }

designer-base/src/test/java/com/fr/design/data/DesignTableDataManagerTest.java

@@ -0,0 +1,102 @@
+package com.fr.design.data;
+
+import com.fr.base.TableData;
+import com.fr.data.impl.storeproc.StoreProcedure;
+import com.fr.design.data.tabledata.wrapper.TableDataFactory;
+import com.fr.design.data.tabledata.wrapper.TableDataWrapper;
+import com.fr.file.ProcedureConfig;
+import com.fr.file.TableDataConfig;
+import org.easymock.EasyMock;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.api.easymock.PowerMock;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({TableDataFactory.class, StoreProcedure.class, TableDataConfig.class, ProcedureConfig.class})
+@SuppressStaticInitializationFor({"com.fr.design.data.tabledata.wrapper.TableDataFactory"})
+public class DesignTableDataManagerTest {
+
+    @Test
+    public void testFireDataChange() {
+
+        DesignTableDataManager.envChange();
+
+
+        PowerMock.mockStatic(TableDataConfig.class);
+
+        TableDataConfig config = EasyMock.mock(TableDataConfig.class);
+        TableDataConfig config2 = EasyMock.mock(TableDataConfig.class);
+
+        TableData td1 = EasyMock.mock(TableData.class);
+        TableData td2 = EasyMock.mock(TableData.class);
+        TableData td3 = EasyMock.mock(TableData.class);
+        TableData td4 = EasyMock.mock(TableData.class);
+        EasyMock.expect(config.getTableData("firstData")).andReturn(td1).once();
+        EasyMock.expect(config.getTableData("secondData")).andReturn(td2).once();
+        EasyMock.expect(config2.getTableData("firstData")).andReturn(td3).once();
+        EasyMock.expect(config2.getTableData("secondData")).andReturn(td4).once();
+
+        EasyMock.expect(TableDataConfig.getInstance()).andReturn(config).once().andReturn(config2).once();
+
+        PowerMock.mockStatic(TableDataFactory.class);
+        EasyMock.expect(TableDataFactory.getSortOfChineseNameOfServerData(config))
+                .andReturn(new String[]{"firstData", "secondData"}).once();
+        EasyMock.expect(TableDataFactory.getSortOfChineseNameOfServerData(config2))
+                .andReturn(new String[]{"firstData", "secondData"}).once();
+
+
+        ProcedureConfig proConfig = EasyMock.mock(ProcedureConfig.class);
+        StoreProcedure pc1 = PowerMock.createMock(StoreProcedure.class);
+        StoreProcedure pc2 = PowerMock.createMock(StoreProcedure.class);
+        ProcedureConfig proConfig2 = EasyMock.mock(ProcedureConfig.class);
+        StoreProcedure pc3 = PowerMock.createMock(StoreProcedure.class);
+        StoreProcedure pc4 = PowerMock.createMock(StoreProcedure.class);
+
+        Map<String, StoreProcedure> procedureMap = new HashMap<>();
+        procedureMap.put("firstPRO", pc1);
+        procedureMap.put("secondPRO", pc2);
+        EasyMock.expect(proConfig.getProcedure("firstPRO")).andReturn(pc1).once();
+        EasyMock.expect(proConfig.getProcedure("secondPRO")).andReturn(pc2).once();
+
+        Map<String, StoreProcedure> procedureMap2 = new HashMap<>();
+        procedureMap2.put("firstPRO", pc3);
+        procedureMap2.put("secondPRO", pc4);
+        EasyMock.expect(proConfig2.getProcedure("firstPRO")).andReturn(pc3).once();
+        EasyMock.expect(proConfig2.getProcedure("secondPRO")).andReturn(pc4).once();
+
+        EasyMock.expect(proConfig.getProcedures()).andReturn(procedureMap).once();
+        EasyMock.expect(proConfig2.getProcedures()).andReturn(procedureMap2).once();
+
+        PowerMock.mockStatic(ProcedureConfig.class);
+        EasyMock.expect(ProcedureConfig.getInstance()).andReturn(proConfig).once().andReturn(proConfig2).once();
+
+        EasyMock.replay(proConfig, config, config2, proConfig2);
+        PowerMock.replay(TableDataFactory.class, TableDataConfig.class, ProcedureConfig.class);
+
+
+        Map<String, TableDataWrapper> map = DesignTableDataManager.getAllEditingDataSet(null);
+        Assert.assertEquals(4, map.size());
+        Assert.assertSame(pc1, map.get("firstPRO").getTableData());
+        Assert.assertSame(pc2, map.get("secondPRO").getTableData());
+        Assert.assertSame(td1, map.get("firstData").getTableData());
+        Assert.assertSame(td2, map.get("secondData").getTableData());
+
+        DesignTableDataManager.fireDSChanged(new HashMap<String, String>());
+
+        Map<String, TableDataWrapper> map2 = DesignTableDataManager.getAllEditingDataSet(null);
+        Assert.assertEquals(4, map2.size());
+        Assert.assertSame(pc3, map2.get("firstPRO").getTableData());
+        Assert.assertSame(pc4, map2.get("secondPRO").getTableData());
+        Assert.assertSame(td3, map2.get("firstData").getTableData());
+        Assert.assertSame(td4, map2.get("secondData").getTableData());
+
+
+    }
+}

designer-base/src/test/java/com/fr/file/StashedFILETest.java

@@ -0,0 +1,23 @@
+package com.fr.file;
+
+import org.easymock.EasyMock;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class StashedFILETest {
+
+    /**
+     * 用于测试暂存文件未保存时的提示
+     */
+    @Test
+    public void testToString() {
+        FILE file = EasyMock.mock(FILE.class);
+        String name = "getA.cpt";
+        EasyMock.expect(file.getName()).andReturn(name).once();
+        EasyMock.replay(file);
+        FILE stashedFILE = new StashedFILE(file, new byte[0]);
+        String expectString = FILEFactory.MEM_PREFIX + name;
+        Assert.assertEquals(expectString, stashedFILE + "");
+        EasyMock.verify(file);
+    }
+}

designer-realize/src/main/java/com/fr/design/actions/insert/flot/ImageFloatAction.java

@@ -87,7 +87,7 @@ public class ImageFloatAction extends ElementCaseAction {
 
                 if (selectedFile != null && selectedFile.isFile()) {
                     CellImage cellImage = selectImagePane.update();
-                    Image image = cellImage.getImage();
+                    Image image = cellImage.getBufferImage();
                     JTemplate<?, ?> currentEditingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
                     currentEditingTemplate.setPictureElem(floatElement, cellImage);
 

designer-realize/src/main/java/com/fr/design/headerfooter/ImagePane.java

@@ -78,7 +78,7 @@ public class ImagePane extends BasicPane {
     }
 
     public Image update() {
-        return this.imagePreviewPane.getImage();
+        return this.imagePreviewPane.getImageWithSuffix();
     }
 
     /**

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

@@ -68,7 +68,6 @@ import com.fr.file.FILE;
 import com.fr.file.FileNodeFILE;
 import com.fr.file.filetree.FileNode;
 import com.fr.general.ComparatorUtils;
-import com.fr.general.ImageWithSuffix;
 import com.fr.general.ModuleContext;
 import com.fr.grid.Grid;
 import com.fr.grid.GridUtils;
@@ -90,7 +89,6 @@ import com.fr.report.elementcase.TemplateElementCase;
 import com.fr.report.poly.PolyWorkSheet;
 import com.fr.report.worksheet.WorkSheet;
 import com.fr.stable.ArrayUtils;
-import com.fr.stable.CoreGraphHelper;
 import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 import com.fr.stable.module.Module;
@@ -623,7 +621,7 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
         if (workBook instanceof WorkBookAdapter) {
             elem.setValue(new CellImagePainter(cellImage));
         } else {
-            elem.setValue(ImageWithSuffix.build(cellImage.getImage(),cellImage.getSuffix()));
+            elem.setValue(cellImage.getImage());
         }
     }
 

designer-realize/src/main/java/com/fr/design/webattr/ViewToolBarPane.java

@@ -52,9 +52,10 @@ public class ViewToolBarPane extends AbstractEditToolBarPane {
 				editToolBarButton.setEnabled(isUseToolBarCheckBox.isSelected());
 			}
 		});
-		sortCheckBox.setSelected(true);
+		// 切换BI工程目录 webView未设置 默认false
-		conditonFilterBox.setSelected(true);
+		sortCheckBox.setSelected(false);
-		listFilterBox.setSelected(true);
+		conditonFilterBox.setSelected(false);
+		listFilterBox.setSelected(false);
         northPane.add(GUICoreUtils.createFlowPane(new Component[]{sortCheckBox, conditonFilterBox, listFilterBox}, FlowLayout.LEFT, 6));
 		northPane.add(GUICoreUtils.createFlowPane(new Component[] {isUseToolBarCheckBox, editToolBarButton}, FlowLayout.LEFT));
         northPane.add(GUICoreUtils.createFlowPane(showListenersLabel, FlowLayout.LEFT));

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

@@ -961,7 +961,6 @@ public class Grid extends BaseGridComponent {
             if (!ComparatorUtils.equals_exactly(oldValue, newValue)) {
                 if (newValue instanceof CellImage) {
                     CellImage cellImage = (CellImage) newValue;
-                    newValue = cellImage.getImage();
                     JTemplate<?, ?> currentEditingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
                     currentEditingTemplate.setPictureElem(selectedFloatElement, cellImage);
 

designer-realize/src/test/java/com.fr/design/mainframe/JFileTest.java

@@ -0,0 +1,69 @@
+package com.fr.design.mainframe;
+
+import com.fr.config.dao.DaoContext;
+import com.fr.config.dao.impl.LocalClassHelperDao;
+import com.fr.config.dao.impl.LocalEntityDao;
+import com.fr.config.dao.impl.LocalXmlEntityDao;
+import com.fr.form.main.Form;
+import com.fr.form.ui.ElementCaseEditor;
+import com.fr.general.ImageWithSuffix;
+import com.fr.general.ModuleContext;
+import com.fr.main.impl.WorkBook;
+import com.fr.report.cell.DefaultTemplateCellElement;
+import com.fr.report.cell.TemplateCellElement;
+import com.fr.report.cell.cellattr.CellImage;
+import com.fr.report.restriction.CellCountRestriction;
+import com.fr.report.restriction.ReportRestrictionScene;
+import com.fr.report.worksheet.FormElementCase;
+import com.fr.report.worksheet.WorkSheet;
+import com.fr.restriction.Restrictions;
+import com.fr.stable.module.Module;
+import com.fr.start.Designer;
+import junit.framework.TestCase;
+import org.junit.Assert;
+
+import java.awt.image.BufferedImage;
+
+public class JFileTest extends TestCase {
+    @Override
+    protected void setUp() throws Exception {
+        DaoContext.setEntityDao(new LocalEntityDao());
+        DaoContext.setClassHelperDao(new LocalClassHelperDao());
+        DaoContext.setXmlEntityDao(new LocalXmlEntityDao());
+        Restrictions.register(ReportRestrictionScene.CELL_COUNT, new CellCountRestriction());
+        ModuleContext.startModule(Module.PAGE_MODULE);
+        ModuleContext.startModule(Module.VIEW_MODULE);
+        Designer designer = new Designer(new String[0]);
+    }
+
+    public void testJWorkBookSetPicture() {
+        WorkBook workBook = new WorkBook();
+        WorkSheet workSheet = new WorkSheet();
+        workBook.addReport("sheet1", workSheet);
+        TemplateCellElement cellElement = new DefaultTemplateCellElement();
+        workSheet.addCellElement(cellElement);
+        ImageWithSuffix imageWithSuffix = ImageWithSuffix.build(new BufferedImage(100, 100, BufferedImage.TYPE_INT_ARGB), "jpg");
+        CellImage cellImage = new CellImage();
+        cellImage.setImage(imageWithSuffix);
+        JWorkBook jWorkBook = new JWorkBook(workBook, "text");
+        jWorkBook.setPictureElem(cellElement, cellImage);
+        Assert.assertEquals(imageWithSuffix, cellElement.getValue());
+    }
+
+    public void testJFormSetPicture() {
+        Form form = new Form();
+        ElementCaseEditor editor = new ElementCaseEditor();
+        FormElementCase elementCase = new FormElementCase();
+        TemplateCellElement cellElement = new DefaultTemplateCellElement();
+        elementCase.addCellElement(cellElement);
+        editor.setElementCase(elementCase);
+        form.getContainer().addWidget(editor);
+        ImageWithSuffix imageWithSuffix = ImageWithSuffix.build(new BufferedImage(100, 100, BufferedImage.TYPE_INT_ARGB), "jpg");
+        CellImage cellImage = new CellImage();
+        cellImage.setImage(imageWithSuffix);
+        JForm jForm = new JForm();
+        jForm.setTarget(form);
+        jForm.setPictureElem(cellElement, cellImage);
+        Assert.assertEquals(imageWithSuffix, cellElement.getValue());
+    }
+}