Browse Source

fix multi sheet view repeat bugs

master
独行之狼 3 years ago
parent
commit
829871660e
  1. 2
      build.xml
  2. BIN
      fr-plugin-CharCartnoon-1.0/fr-plugin-CharCartnoon-1.0.jar
  3. BIN
      install/fr-plugin-CharCartnoon-1.0.zip
  4. 16
      src/com/fr/plugin/cool/cartnoon/CartUtils.java

2
build.xml

@ -73,7 +73,7 @@
<fileset dir="${classes}">
</fileset>
<!--下面加入第三方包-->
<zipfileset excludes="META-INF/*.SF" src="${libs}/finekit-10.0.jar"></zipfileset>
<zipfileset excludes="META-INF/*.SF" src="${libs}/Filters.jar"></zipfileset>
<zipfileset excludes="META-INF/*.SF" src="${libs}/thumbnailator-0.4.8.jar"></zipfileset>

BIN
fr-plugin-CharCartnoon-1.0/fr-plugin-CharCartnoon-1.0.jar

Binary file not shown.

BIN
install/fr-plugin-CharCartnoon-1.0.zip

Binary file not shown.

16
src/com/fr/plugin/cool/cartnoon/CartUtils.java

@ -1,14 +1,19 @@
package com.fr.plugin.cool.cartnoon;
import com.fr.base.BaseUtils;
import com.fr.base.io.BaseBook;
import com.fr.base.operator.common.CommonOperator;
import com.fr.design.mainframe.JTemplate;
import com.fr.general.FArray;
import com.fr.general.GeneralUtils;
import com.fr.locale.InterProviderFactory;
import com.fr.log.FineLoggerFactory;
import com.fr.plugin.cool.cartnoon.utils.AnimatedGifEncoder;
import com.fr.plugin.cool.cartnoon.web.ImageViewer;
import com.fr.script.AbstractFunction;
import com.fr.stable.ColumnRow;
import com.fr.stable.fun.Authorize;
import com.fr.workspace.WorkContext;
import sun.font.FontDesignMetrics;
import javax.imageio.ImageIO;
@ -18,6 +23,7 @@ import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.util.Iterator;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@ -121,7 +127,15 @@ public class CartUtils {
int intCol=currentColumnRow.getColumn();
final String strCol = String.valueOf((char) (intCol + 65));
String id=strCol+intRow;
return id;
final JTemplate<?, ?> currentEditingTemplate = com.fanruan.api.design.DesignKit.getCurrentEditingTemplate();
BaseBook target = currentEditingTemplate.getTarget();
final String templateID = target.getTemplateID();
final String getTemplateName = currentEditingTemplate.getTemplateName();
// FineLoggerFactory.getLogger().info("getTemplateName:{}",getTemplateName);
// FineLoggerFactory.getLogger().info("System.currentTimeMillis():{}",System.currentTimeMillis());
// FineLoggerFactory.getLogger().info("name:{}",nameID);
return templateID+"-"+System.currentTimeMillis()+"-"+id;
}
static BufferedImage readImage(Object file) {
BufferedImage res=null;

Loading…
Cancel
Save