Pull request #3631: 无JIRA任务 解决冲突

Merge in DESIGN/design from ~JU/design--11111:feature/x to feature/x

* commit 'a694af0ccf431c5430795d8b03eac892253786e5':
  恢复代码到删除前一个节点
  merge code

designer-base/src/main/java/com/fr/design/preview/WriteEnhancePreview.java

@@ -0,0 +1,40 @@
+package com.fr.design.preview;
+
+import com.fr.base.io.IOFile;
+import com.fr.design.fun.impl.AbstractPreviewProvider;
+
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by loy on 2017/7/7.
+ */
+public class WriteEnhancePreview extends AbstractPreviewProvider {
+    @Override
+    public String nameForPopupItem() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Enhance_Preview");
+    }
+
+    @Override
+    public String iconPathForPopupItem() {
+        return "com/fr/design/images/buttonicon/writes.png";
+    }
+
+    @Override
+    public String iconPathForLarge() {
+        return "com/fr/design/images/buttonicon/writeb24.png";
+    }
+
+    @Override
+    public int previewTypeCode() {
+        return IOFile.WRITE_ENHANCE_PREVIEW_TYPE;
+    }
+
+    @Override
+    public Map<String, Object> parametersForPreview() {
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("op", "write_plus");
+        return map;
+    }
+}

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

@@ -58,6 +58,7 @@ import com.fr.design.preview.MobilePreview;
 import com.fr.design.preview.PagePlusPreview;
 import com.fr.design.preview.PagePreview;
 import com.fr.design.preview.ViewPreview;
+import com.fr.design.preview.WriteEnhancePreview;
 import com.fr.design.preview.WritePreview;
 import com.fr.design.report.fit.menupane.ReportFitAttrAction;
 import com.fr.design.roleAuthority.ReportAndFSManagePane;
@@ -918,7 +919,7 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
     public PreviewProvider[] supportPreview() {
         PreviewProvider[] templatePreviews = super.supportPreview();
         return ArrayUtils.addAll(new PreviewProvider[]{
-                new PagePreview(), new WritePreview(), new ViewPreview(), new MobilePreview(), new PagePlusPreview()
+                new PagePreview(), new WritePreview(), new ViewPreview(), new WriteEnhancePreview(), new MobilePreview(), new PagePlusPreview()
         }, templatePreviews);
     }