diff --git a/build.xml b/build.xml index d2958d8..45a2039 100644 --- a/build.xml +++ b/build.xml @@ -73,7 +73,7 @@ - + diff --git a/fr-plugin-CharCartnoon-1.0/fr-plugin-CharCartnoon-1.0.jar b/fr-plugin-CharCartnoon-1.0/fr-plugin-CharCartnoon-1.0.jar index dff1090..7ed7d95 100644 Binary files a/fr-plugin-CharCartnoon-1.0/fr-plugin-CharCartnoon-1.0.jar and b/fr-plugin-CharCartnoon-1.0/fr-plugin-CharCartnoon-1.0.jar differ diff --git a/install/fr-plugin-CharCartnoon-1.0.zip b/install/fr-plugin-CharCartnoon-1.0.zip index 4fff014..7033607 100644 Binary files a/install/fr-plugin-CharCartnoon-1.0.zip and b/install/fr-plugin-CharCartnoon-1.0.zip differ diff --git a/src/com/fr/plugin/cool/cartnoon/CartUtils.java b/src/com/fr/plugin/cool/cartnoon/CartUtils.java index 0ab3d89..5d4716a 100644 --- a/src/com/fr/plugin/cool/cartnoon/CartUtils.java +++ b/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;