From de1a0e2dcc6188beb460ffed1b1ca4eb31953599 Mon Sep 17 00:00:00 2001
From: felix xia <125861688@qq.com>
Date: Thu, 2 Jan 2020 16:51:39 +0800
Subject: [PATCH] release1.0
---
.gitee/ISSUE_TEMPLATE.zh-CN.md | 13 -
.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md | 15 -
build.xml | 22 +-
document/digitroll.png | Bin 0 -> 5515 bytes
document/使用手册.txt | 15 +
plugin-widget-digitroll.iml | 18 -
plugin-widget-digitroll10.iml | 52 +++
plugin.xml | 12 +-
pom.xml | 14 +
.../widget/digitroll/DigitRollWidget.java | 319 +++++++++++++++++
.../digitroll/JavaScriptFileLoader.java | 19 +-
.../widget/digitroll/OptionProvider.java | 32 +-
src/com/fr/plugin/widget/digitroll/Util.java | 20 ++
.../fr/plugin/widget/digitroll/Widget.java | 321 ------------------
.../fr/plugin/widget/digitroll/WidgetUI.java | 84 -----
.../digitroll/editor/DigitRollAlign.java | 28 --
.../digitroll/images/digitroll_display.png | Bin 5885 -> 9645 bytes
.../digitroll/images/digitroll_icon.png | Bin 744 -> 3234 bytes
.../{local => locale}/digitroll.properties | 7 +-
.../digitroll_zh_CN.properties | 7 +-
.../digitroll/ui/DecimalPlacesEditor.java | 21 ++
.../DigitRollDataSourceEditor.java | 23 +-
.../digitroll/ui/DigitRollWidgetUI.java | 88 +++++
.../fr/plugin/widget/digitroll/web/countUp.js | 12 +-
.../widget/digitroll/web/widget.digitRoll.js | 41 ++-
25 files changed, 631 insertions(+), 552 deletions(-)
delete mode 100644 .gitee/ISSUE_TEMPLATE.zh-CN.md
delete mode 100644 .gitee/PULL_REQUEST_TEMPLATE.zh-CN.md
create mode 100644 document/digitroll.png
create mode 100644 document/使用手册.txt
delete mode 100644 plugin-widget-digitroll.iml
create mode 100644 plugin-widget-digitroll10.iml
create mode 100644 pom.xml
create mode 100644 src/com/fr/plugin/widget/digitroll/DigitRollWidget.java
delete mode 100644 src/com/fr/plugin/widget/digitroll/Widget.java
delete mode 100644 src/com/fr/plugin/widget/digitroll/WidgetUI.java
delete mode 100644 src/com/fr/plugin/widget/digitroll/editor/DigitRollAlign.java
rename src/com/fr/plugin/widget/digitroll/{local => locale}/digitroll.properties (69%)
rename src/com/fr/plugin/widget/digitroll/{local => locale}/digitroll_zh_CN.properties (73%)
create mode 100644 src/com/fr/plugin/widget/digitroll/ui/DecimalPlacesEditor.java
rename src/com/fr/plugin/widget/digitroll/{editor => ui}/DigitRollDataSourceEditor.java (78%)
create mode 100644 src/com/fr/plugin/widget/digitroll/ui/DigitRollWidgetUI.java
diff --git a/.gitee/ISSUE_TEMPLATE.zh-CN.md b/.gitee/ISSUE_TEMPLATE.zh-CN.md
deleted file mode 100644
index f09d98d..0000000
--- a/.gitee/ISSUE_TEMPLATE.zh-CN.md
+++ /dev/null
@@ -1,13 +0,0 @@
-### 该问题是怎么引起的？
-
-
-
-### 重现步骤
-
-
-
-### 报错信息
-
-
-
-
diff --git a/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md b/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md
deleted file mode 100644
index 534be43..0000000
--- a/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md
+++ /dev/null
@@ -1,15 +0,0 @@
-### 该Pull Request关联的Issue
-
-
-### 修改描述
-
-
-
-### 测试用例
-
-
-
-### 修复效果的截屏
-
-
-
diff --git a/build.xml b/build.xml
index ea5647b..0c13001 100644
--- a/build.xml
+++ b/build.xml
@@ -1,14 +1,11 @@
-
+
-
-
-
-
+
@@ -17,7 +14,7 @@
-
+
@@ -27,19 +24,10 @@
-
-
-
-
-
-
-
-
+
@@ -125,5 +113,7 @@
+
+
diff --git a/document/digitroll.png b/document/digitroll.png
new file mode 100644
index 0000000000000000000000000000000000000000..a10fef4ab24142031e540b41e8011a5b6f916c63
GIT binary patch
literal 5515
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
VKOYR$0>CNANZ;gYsh)Gxe*irgjQ0Ql
literal 0
HcmV?d00001
diff --git a/document/使用手册.txt b/document/使用手册.txt
new file mode 100644
index 0000000..df663c0
--- /dev/null
+++ b/document/使用手册.txt
@@ -0,0 +1,15 @@
+数字滚动控件使用手册
+
+ 数字滚动控件，用于决策报表中以滚动的方式显示数据源中的数字。
+
+一、设置数据源
+ 数据源有两种：1、通过公式生成随机数；2、从数据集读取数据。数据可以是整数，小数。
+
+二、属性设置
+ 1、持续时间：设置数据滚动动画的持续时间。
+ 2、前/后缀：设置显示在数字前/后的字符。
+ 3、文字大小：调整数字的大小。
+ 3、文字颜色。
+ 4、背景颜色。
+ 5、分组：勾选分组后，10000显示为10，000
+ 6、小数位数：设置小数点后显示的位数。
\ No newline at end of file
diff --git a/plugin-widget-digitroll.iml b/plugin-widget-digitroll.iml
deleted file mode 100644
index 20fe623..0000000
--- a/plugin-widget-digitroll.iml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/plugin-widget-digitroll10.iml b/plugin-widget-digitroll10.iml
new file mode 100644
index 0000000..ac8c778
--- /dev/null
+++ b/plugin-widget-digitroll10.iml
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/plugin.xml b/plugin.xml
index fbbb73d..537ea40 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,15 +1,15 @@
- com.fr.plugin.widget.digitroll
-
+ com.fr.plugin.widget.digitroll.v10
+
yes
1.0
- 8.0
- 2017-8-05
+ 10.0
+ 2019-12-01
Felix
[2018-07-13]Felix:首发
+ [2019-12-30]Felix:首发
]]>
@@ -23,7 +23,7 @@
-
+
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..3842156
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,14 @@
+
+
+ 4.0.0
+
+
+ com.fr.plugin
+ starter
+ 10.0
+
+ jar
+ plugin-widget-digitroll10
+
\ No newline at end of file
diff --git a/src/com/fr/plugin/widget/digitroll/DigitRollWidget.java b/src/com/fr/plugin/widget/digitroll/DigitRollWidget.java
new file mode 100644
index 0000000..08c37bc
--- /dev/null
+++ b/src/com/fr/plugin/widget/digitroll/DigitRollWidget.java
@@ -0,0 +1,319 @@
+package com.fr.plugin.widget.digitroll;
+
+import com.fr.base.Formula;
+import com.fr.base.ParameterMapNameSpace;
+import com.fr.form.data.DataBinding;
+import com.fr.form.ui.DataControl;
+import com.fr.form.ui.DirectWriteEditor;
+import com.fr.form.ui.Widget;
+import com.fr.form.ui.WidgetValue;
+import com.fr.form.ui.concept.data.ValueInitializer;
+import com.fr.json.JSONArray;
+import com.fr.json.JSONException;
+import com.fr.json.JSONObject;
+import com.fr.log.FineLoggerFactory;
+import com.fr.script.Calculator;
+import com.fr.stable.ArrayUtils;
+import com.fr.stable.CodeUtils;
+import com.fr.stable.core.NodeVisitor;
+import com.fr.stable.script.CalculatorProvider;
+import com.fr.stable.web.Repository;
+import com.fr.stable.xml.XMLPrintWriter;
+import com.fr.stable.xml.XMLableReader;
+import com.fr.web.core.TemplateSessionIDInfo;
+import com.fr.web.utils.WebUtils;
+
+import javax.servlet.http.HttpServletRequest;
+import java.awt.*;
+
+
+public class DigitRollWidget extends DirectWriteEditor implements DataControl {
+
+ public static final String XTYPE = "digitroll";
+ public static final String DURATION = "duration";
+ public static final String FONT_SIZE = "fontSize";
+ public static final String FONT_COLOR = "fontColor";
+ public static final String BACKGROUND_COLOR = "backgroundColor";
+ public static final String PREFIX = "prefix";
+ public static final String SUFFIX = "suffix";
+ public static final String GROUP = "group";
+ public static final String DECIMAL_PALACES = "decimalPlaces";
+ public static final String DECIMAL = "decimal";
+
+ private ValueInitializer widgetValue;
+ private int duration;
+ private int fontSize;
+ private Object fontColor;
+ private Object backgroundColor;
+ private String prefix;
+ private String suffix;
+ private boolean group;
+ private int decimalPlaces;
+
+ public DigitRollWidget() {
+ widgetValue = new WidgetValue();
+ duration = 0;
+ fontSize = 70;
+ fontColor = new Color(204, 204, 204);
+ backgroundColor = new Color(51, 51, 51);
+ prefix = "";
+ suffix = "";
+ setGroup(true);
+ setDecimalPlaces(0);
+ }
+
+ public boolean isGroup() {
+ return group;
+ }
+
+ public void setGroup(boolean group) {
+ this.group = group;
+ }
+
+ public int getDecimalPlaces() {
+ return decimalPlaces;
+ }
+
+ public void setDecimalPlaces(int decimalPlaces) {
+ this.decimalPlaces = decimalPlaces;
+ }
+
+ public int getDuration() {
+ return this.duration;
+ }
+
+ public void setDuration(int duration) {
+ this.duration = duration;
+ }
+
+ public ValueInitializer getWidgetValue() {
+ return this.widgetValue;
+ }
+
+ public void setWidgetValue(ValueInitializer widgetValue) {
+ this.widgetValue = widgetValue;
+ }
+
+ public int getFontSize() {
+ return fontSize;
+ }
+
+ public void setFontSize(int fontSize) {
+ this.fontSize = fontSize;
+ }
+
+ public Object getFontColor() {
+ return fontColor;
+ }
+
+ public void setFontColor(Object fontColor) {
+ this.fontColor = fontColor;
+ }
+
+ public Object getBackgroundColor() {
+ return backgroundColor;
+ }
+
+ public void setBackgroundColor(Object backgroundColor) {
+ this.backgroundColor = backgroundColor;
+ }
+
+ public String getPrefix() {
+ return prefix;
+ }
+
+ public void setPrefix(String prefix) {
+ this.prefix = prefix;
+ }
+
+ public String getSuffix() {
+ return suffix;
+ }
+
+ public void setSuffix(String suffix) {
+ this.suffix = suffix;
+ }
+
+ @Override
+ public String getXType() {//控件类型，参考其他的案例，返回的是文本框
+ return XTYPE;
+ }
+
+ @Override
+ public int[] getValueType() {
+ return new int[]{TYPE_FORMULA, TYPE_DATABINDING};
+ }
+
+ @Override
+ public String[] dependence(CalculatorProvider calculatorProvider) {
+ return super.dependence(calculatorProvider);
+ }
+
+ @Override
+ public String getDataBindDefaultValue(CalculatorProvider calculatorProvider) {
+ return null;
+ }
+
+ /**
+ * 读取插件的值
+ */
+ private int dataSetCursor = 0;
+
+ private double getWidgetValue(Calculator calculator) throws Exception {
+ double value = 0;
+ if (this.widgetValue.getValue() == null) {
+ value = 0;
+ } else if (this.widgetValue.getValue() instanceof Formula) {
+ Object v = calculator.eval((Formula) this.widgetValue.getValue());
+ value = Util.valueChangeToDouble(v);
+ } else if (this.widgetValue.getValue() instanceof DataBinding) {
+ calculator.setAttribute(Widget.NAME, this.getWidgetName().toUpperCase());
+ calculator.setAttribute(ValueInitializer.RETURN_ARRAY, true);
+ calculator.setAttribute(ValueInitializer.VALUE_REPEAT, true);
+ Object r = getWidgetValue().executeResult(calculator);
+ if (r instanceof Object[]) {
+ Object[] ra = (Object[]) r;
+ dataSetCursor %= ra.length;
+ Object val = ra[dataSetCursor++];
+ return Util.valueChangeToDouble(val);
+ } else {
+ return (Util.valueChangeToDouble(r));
+ }
+ }
+ return value;
+ }
+
+ @Override
+ public void createValueResult(CalculatorProvider calculatorProvider, JSONObject jsonObject) {
+ Object result = null;
+ try {
+ if (widgetValue.getValue() instanceof Formula) {
+ result = calculatorProvider.eval((Formula) widgetValue.getValue());
+ } else if (widgetValue.getValue() instanceof DataBinding) {
+ calculatorProvider.setAttribute(Widget.NAME, this.getWidgetName().toUpperCase());
+ calculatorProvider.setAttribute(ValueInitializer.RETURN_ARRAY, true);
+ calculatorProvider.setAttribute(ValueInitializer.VALUE_REPEAT, true);
+ result = getWidgetValue().executeResult(calculatorProvider);
+ }
+ jsonObject.put(this.widgetName.toUpperCase(), result == null ? 0 : result);
+ } catch (Exception e) {
+ FineLoggerFactory.getLogger().error(e.getMessage(), e);
+ }
+ }
+
+ @Override
+ public String getFormatText() {
+ return "";
+ }
+
+ @Override
+ public JSONObject createJSONConfig(Repository repository,
+ Calculator calculator,
+ NodeVisitor visitor) throws JSONException {
+ JSONObject jsonConfig = super.createJSONConfig(repository, calculator, visitor);
+ Object value = jsonConfig.get("value");
+ if (value != null) {
+ Double v = 0d;
+ try {
+ JSONArray jsonArray = (JSONArray) value;
+ v = jsonArray.getDouble(0);
+ } catch (Exception e) {
+ FineLoggerFactory.getLogger().error(e.getMessage(), e);
+ }
+ jsonConfig.put("value", v);
+ }
+
+ jsonConfig.put(DURATION, this.value2Config(this.duration, calculator));
+ jsonConfig.put(PREFIX, getPrefix());
+ jsonConfig.put(SUFFIX, getSuffix());
+ jsonConfig.put(FONT_COLOR, Util.colorValueToHexString(((Color) getFontColor()).getRGB()));
+ jsonConfig.put(BACKGROUND_COLOR, Util.colorValueToHexString(((Color) getBackgroundColor()).getRGB()));
+ jsonConfig.put(FONT_SIZE, getFontSize());
+ jsonConfig.put(GROUP, isGroup());
+ //jsonConfig.put(DECIMAL, (getDecimalPlaces() <= 0 ? false : true));
+ jsonConfig.put(DECIMAL_PALACES, getDecimalPlaces());
+
+ String[] dependence = this.dependence(calculator);
+ if (!ArrayUtils.isEmpty(dependence)) {
+ jsonConfig.put("dependence", dependence);
+ }
+ return jsonConfig;
+ }
+
+ @Override
+ public JSONArray createJSONData(TemplateSessionIDInfo sessionIDInfor,
+ Calculator calculator, HttpServletRequest request) throws Exception {
+ JSONArray jsonArray;
+ jsonArray = super.createJSONData(sessionIDInfor, calculator, request);
+ ParameterMapNameSpace parameterMapNameSpace = ParameterMapNameSpace.create(sessionIDInfor.getParameterMap4Execute());
+ DependenceNameSpace dependenceNameSpace = new DependenceNameSpace(CodeUtils.cjkDecode(WebUtils.getHTTPRequestParameter(request, "dependence")));
+ calculator.pushNameSpace(parameterMapNameSpace);
+ calculator.pushNameSpace(dependenceNameSpace);
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("value", this.getWidgetValue(calculator));
+ jsonArray.put(jsonObject);
+ calculator.removeNameSpace(parameterMapNameSpace);
+ calculator.removeNameSpace(dependenceNameSpace);
+ return jsonArray;
+ }
+
+ @Override
+ public String[] supportedEvents() {
+ return new String[0];
+ }
+
+ @Override
+ public void readXML(XMLableReader reader) {
+ super.readXML(reader);
+ if (reader.isChildNode()) {
+ String tagName = reader.getTagName();
+ if (tagName.equals("DigitRollAttr")) {
+ String s = null;
+ if ((s = reader.getAttrAsString(DURATION, null)) != null) {
+ this.setDuration(Integer.parseInt(s));
+ }
+ if ((s = reader.getAttrAsString(FONT_SIZE, null)) != null) {
+ setFontSize(Integer.parseInt(s));
+ }
+
+ int color;
+ if ((color = reader.getAttrAsInt(FONT_COLOR, -1)) != -1) {
+ setFontColor(new Color(color));
+ }
+ if ((color = reader.getAttrAsInt(BACKGROUND_COLOR, -1)) != -1) {
+ setBackgroundColor(new Color(color));
+ }
+ setPrefix(reader.getAttrAsString(PREFIX, ""));
+ setSuffix(reader.getAttrAsString(SUFFIX, ""));
+ setDecimalPlaces(reader.getAttrAsInt(DECIMAL_PALACES, 0));
+ setGroup(reader.getAttrAsBoolean(GROUP, true));
+
+ } else if ("widgetValue".equals(tagName)) {
+ this.widgetValue = new WidgetValue();
+ reader.readXMLObject(this.widgetValue);
+ }
+ }
+ }
+
+ @Override
+ public void writeXML(XMLPrintWriter writer) {
+ super.writeXML(writer);
+ writer.startTAG("DigitRollAttr");
+ if (this.duration != 0) {
+ writer.attr(DURATION, this.getDuration());
+ }
+
+ writer.attr(FONT_SIZE, getFontSize());
+ writer.attr(FONT_COLOR, ((Color) getFontColor()).getRGB());
+ writer.attr(BACKGROUND_COLOR, ((Color) getBackgroundColor()).getRGB());
+ writer.attr(PREFIX, getPrefix());
+ writer.attr(SUFFIX, getSuffix());
+ writer.attr(GROUP, isGroup());
+ writer.attr(DECIMAL_PALACES, getDecimalPlaces());
+ writer.end();
+
+ if (this.widgetValue != null) {
+ this.widgetValue.writeXML(writer);
+ }
+ }
+}
diff --git a/src/com/fr/plugin/widget/digitroll/JavaScriptFileLoader.java b/src/com/fr/plugin/widget/digitroll/JavaScriptFileLoader.java
index 38f375d..e33107e 100644
--- a/src/com/fr/plugin/widget/digitroll/JavaScriptFileLoader.java
+++ b/src/com/fr/plugin/widget/digitroll/JavaScriptFileLoader.java
@@ -1,15 +1,30 @@
package com.fr.plugin.widget.digitroll;
+import com.fr.general.Inter;
+import com.fr.plugin.PluginLicense;
+import com.fr.plugin.PluginLicenseManager;
import com.fr.stable.fun.Authorize;
import com.fr.stable.fun.impl.AbstractJavaScriptFileHandler;
+import javax.swing.*;
+
@Authorize(
callSignKey = Constants.PLUGIN_ID
)
public class JavaScriptFileLoader extends AbstractJavaScriptFileHandler {
+ private PluginLicense license = PluginLicenseManager.getInstance().getPluginLicenseByID(Constants.PLUGIN_ID);
+
@Override
public String[] pathsForFiles() {
- return new String[]{
- "/com/fr/plugin/widget/digitroll/web/widget.digitRoll.js"};
+ if (license.isAvailable()) {
+ return new String[]{
+ "/com/fr/plugin/widget/digitroll/web/widget.digitRoll.js"};
+ } else {
+ JOptionPane.showMessageDialog(null
+ , Inter.getLocText("Plugin-DigitRoll_License_Expired")
+ , Inter.getLocText("Plugin-DigitRoll_License_Title")
+ , JOptionPane.PLAIN_MESSAGE);
+ return null;
+ }
}
}
diff --git a/src/com/fr/plugin/widget/digitroll/OptionProvider.java b/src/com/fr/plugin/widget/digitroll/OptionProvider.java
index e48355a..1e08405 100644
--- a/src/com/fr/plugin/widget/digitroll/OptionProvider.java
+++ b/src/com/fr/plugin/widget/digitroll/OptionProvider.java
@@ -1,39 +1,23 @@
package com.fr.plugin.widget.digitroll;
import com.fr.design.fun.impl.AbstractFormWidgetOptionProvider;
-import com.fr.form.ui.Widget;
import com.fr.general.Inter;
-import com.fr.plugin.ExtraClassManager;
-import com.fr.stable.fun.FunctionHelper;
-import com.fr.stable.fun.FunctionProcessor;
-import com.fr.stable.fun.impl.AbstractFunctionProcessor;
-
+import com.fr.plugin.transform.ExecuteFunctionRecord;
+import com.fr.plugin.transform.FunctionRecorder;
+import com.fr.plugin.widget.digitroll.ui.DigitRollWidgetUI;
+@FunctionRecorder
public class OptionProvider extends AbstractFormWidgetOptionProvider {
- private static FunctionProcessor ONEFUNCTION = new AbstractFunctionProcessor() {
- public int getId() {
- return FunctionHelper.generateFunctionID(Constants.PLUGIN_ID);
- }
-
- public String toString() {
- return Inter.getLocText("Plugin-DigitRoll_Widget");
- }
- };
-
+ @ExecuteFunctionRecord
@Override
- public Class classForWidget() {
- FunctionProcessor processor = ExtraClassManager.getInstance().getFunctionProcessor();
- if (processor != null) {
- processor.recordFunction(ONEFUNCTION);
- }
-
- return Widget.class;
+ public Class classForWidget() {
+ return DigitRollWidget.class;
}
@Override
public Class appearanceForWidget() {
//界面类
- return WidgetUI.class;
+ return DigitRollWidgetUI.class;
}
@Override
diff --git a/src/com/fr/plugin/widget/digitroll/Util.java b/src/com/fr/plugin/widget/digitroll/Util.java
index 673fe73..c345d03 100644
--- a/src/com/fr/plugin/widget/digitroll/Util.java
+++ b/src/com/fr/plugin/widget/digitroll/Util.java
@@ -1,6 +1,7 @@
package com.fr.plugin.widget.digitroll;
import com.fr.base.FRContext;
+import com.fr.log.FineLoggerFactory;
import java.math.BigDecimal;
@@ -30,4 +31,23 @@ public class Util {
return value;
}
+
+ public static double valueChangeToDouble(Object o) {
+ double value = 0;
+ if (o instanceof Integer) {
+ value = ((Integer) o).doubleValue();
+ } else if (o instanceof BigDecimal) {
+ value = ((BigDecimal) o).doubleValue();
+ } else if (o instanceof Double) {
+ value = ((Double) o).doubleValue();
+ } else if (o instanceof String) {
+ try {
+ value = Double.parseDouble(o.toString());
+ } catch (Exception e) {
+ FineLoggerFactory.getLogger().error(e.getMessage());
+ }
+ }
+
+ return value;
+ }
}
diff --git a/src/com/fr/plugin/widget/digitroll/Widget.java b/src/com/fr/plugin/widget/digitroll/Widget.java
deleted file mode 100644
index 48628fc..0000000
--- a/src/com/fr/plugin/widget/digitroll/Widget.java
+++ /dev/null
@@ -1,321 +0,0 @@
-package com.fr.plugin.widget.digitroll;
-
-import com.fr.base.FRContext;
-import com.fr.base.Formula;
-import com.fr.base.ParameterMapNameSpace;
-import com.fr.form.data.DataBinding;
-import com.fr.form.ui.DataControl;
-import com.fr.form.ui.DirectWriteEditor;
-import com.fr.form.ui.WidgetValue;
-import com.fr.general.Inter;
-import com.fr.general.ModuleContext;
-import com.fr.json.JSONArray;
-import com.fr.json.JSONException;
-import com.fr.json.JSONObject;
-import com.fr.plugin.PluginLicense;
-import com.fr.plugin.PluginLicenseManager;
-import com.fr.script.Calculator;
-import com.fr.stable.ArrayUtils;
-import com.fr.stable.CodeUtils;
-import com.fr.stable.core.NodeVisitor;
-import com.fr.stable.script.CalculatorProvider;
-import com.fr.stable.web.Repository;
-import com.fr.stable.xml.XMLPrintWriter;
-import com.fr.stable.xml.XMLableReader;
-import com.fr.web.core.SessionIDInfor;
-import com.fr.web.utils.WebUtils;
-
-import javax.servlet.http.HttpServletRequest;
-import java.awt.*;
-
-
-public class Widget extends DirectWriteEditor implements DataControl {
- public static final int TYPE_YEAR_NONE = 8;
- public static final String ALIGN = "align";
- public static final String DURATION = "duration";
- public static final String FONT_SIZE = "fontSize";
- public static final String FONT_COLOR = "fontColor";
- public static final String BACKGROUND_COLOR = "backgroundColor";
- public static final String PREFIX = "prefix";
- public static final String SUFFIX = "suffix";
- public static final String CSS = "css";
-
- private WidgetValue widgetValue = new WidgetValue();
- private String align = new String();
- private int duration = 0;
- private int fontSize = 70;
- private Object fontColor = new Color(204, 204, 204);
- private Object backgroundColor = new Color(51, 51, 51);
- private String prefix;
- private String suffix;
-
- public Widget() {
- }
-
- public String getAlign() {
- return this.align;
- }
-
- public void setAlign(String align) {
- this.align = align;
- }
-
- public int getDuration() {
- return this.duration;
- }
-
- public void setDuration(int duration) {
- this.duration = duration;
- }
-
- public WidgetValue getWidgetValue() {
- return this.widgetValue;
- }
-
- public void setWidgetValue(WidgetValue widgetValue) {
- this.widgetValue = widgetValue;
- }
-
- public int getFontSize() {
- return fontSize;
- }
-
- public void setFontSize(int fontSize) {
- this.fontSize = fontSize;
- }
-
- public Object getFontColor() {
- return fontColor;
- }
-
- public void setFontColor(Object fontColor) {
- this.fontColor = fontColor;
- }
-
- public Object getBackgroundColor() {
- return backgroundColor;
- }
-
- public void setBackgroundColor(Object backgroundColor) {
- this.backgroundColor = backgroundColor;
- }
-
- public String getPrefix() {
- return prefix;
- }
-
- public void setPrefix(String prefix) {
- this.prefix = prefix;
- }
-
- public String getSuffix() {
- return suffix;
- }
-
- public void setSuffix(String suffix) {
- this.suffix = suffix;
- }
-
- @Override
- public String getXType() {//控件类型，参考其他的案例，返回的是文本框
- return "digitroll";
- }
-
- @Override
- // 数据源类型：空置，公式，字段
- public int[] getValueType() {
- return new int[]{TYPE_YEAR_NONE, TYPE_FORMULA, TYPE_DATABINDING};
- }
-
- @Override
- public String[] dependence(CalculatorProvider calculatorProvider) {
- return super.dependence(calculatorProvider);
- }
-
- private int getWidgetValueFM(Calculator calculator) throws Exception {
- int value = 0;
- if (this.widgetValue.getValue() == null) {
- value = 0;
- } else if (this.widgetValue.getValue() instanceof Formula) {
- Object v = calculator.eval((Formula) this.widgetValue.getValue());
- value = Util.valueChangeToInt(v);
- } else if (this.widgetValue.getValue() instanceof DataBinding) {
- value = this.getWidgetValueByBinding(calculator);
- }
-
- return value;
- }
-
- private int getWidgetValueByBinding(Calculator calculator) {
- int value = 0;
- WidgetValue.WidgetValueInfo valueInfo = new WidgetValue.WidgetValueInfo(this.getWidgetName());
- Object result = this.getWidgetValue().createAttrResult(valueInfo, calculator, new JSONObject());
- value = Util.valueChangeToInt(result);
- return value;
- }
-
- @Override
- public void createValueResult(DataControl dataControl, Calculator calculator,
- JSONObject jsonObject, JSONObject jsonObject1) {
- if (this.getWidgetValue() != null) {
- WidgetValue.WidgetValueInfo valueInfo = new WidgetValue.WidgetValueInfo(this.getWidgetName());
- Object result = this.getWidgetValue().createAttrResult(valueInfo, calculator, jsonObject1);
-
- try {
- jsonObject.put(this.widgetName.toUpperCase(), result == null ? "" : result);
- } catch (JSONException e) {
- FRContext.getLogger().error(e.getMessage(), e);
- }
- }
- }
-
- @Override
- public String getFormatText() {
- return "";
- }
-
- @Override
- public JSONObject createJSONConfig(Repository repository,
- Calculator calculator,
- NodeVisitor visitor) throws JSONException {
- // 许可证
- PluginLicense pluginLicense = PluginLicenseManager.getInstance().getPluginLicenseByID(Constants.PLUGIN_ID);
- if (pluginLicense.isAvailable()) {
- JSONObject jsonConfig = super.createJSONConfig(repository, calculator, visitor);
- try {
- Object value = jsonConfig.get("value");
- int v = Util.valueChangeToInt(value);
- if (value == null) {
- jsonConfig.remove("value");
- } else if (value instanceof String) {
- jsonConfig.put("value", (new JSONObject()).put("digitroll", v));
- } else {
- jsonConfig.put("value", v);
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- if (this.align != null) {
- jsonConfig.put(ALIGN, this.value2Config(this.align, calculator));
- }
-
- jsonConfig.put(DURATION, this.value2Config(this.duration, calculator));
- jsonConfig.put(PREFIX, getPrefix());
- jsonConfig.put(SUFFIX, getSuffix());
- jsonConfig.put(CSS, buildCss());
-
- String[] dependence = this.dependence(calculator);
- if (!ArrayUtils.isEmpty(dependence)) {
- jsonConfig.put("dependence", dependence);
- }
- return jsonConfig;
- } else {
- return licenseErr();
- }
- }
-
- private String buildCss() {
- StringBuilder css = new StringBuilder();
- String fontClr = Util.colorValueToHexString(((Color) getFontColor()).getRGB());
- String bgClr = Util.colorValueToHexString(((Color) getBackgroundColor()).getRGB());
- css.append("color:" + fontClr + ';');
- css.append("font-size:" + getFontSize() + ';');
- css.append("background:" + bgClr + ";");
- css.append("position:absolute;");
- css.append("left:0px;");
- css.append("top:0px;");
- return css.toString();
- }
-
- @Override
- public JSONArray createJSONData(SessionIDInfor sessionIDInfor,
- Calculator calculator, HttpServletRequest request) throws Exception {
- PluginLicense pluginLicense = PluginLicenseManager.getInstance().getPluginLicenseByID(Constants.PLUGIN_ID);
- JSONArray errorMsg;
- if (pluginLicense.isAvailable()) {
- errorMsg = super.createJSONData(sessionIDInfor, calculator, request);
- ParameterMapNameSpace parameterMapNameSpace = ParameterMapNameSpace.create(sessionIDInfor.getParameterMap4Execute());
- DependenceNameSpace dependenceNameSpace = new DependenceNameSpace(CodeUtils.cjkDecode(WebUtils.getHTTPRequestParameter(request, "dependence")));
- calculator.pushNameSpace(parameterMapNameSpace);
- calculator.pushNameSpace(dependenceNameSpace);
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("value", this.getWidgetValueFM(calculator));
- errorMsg.put(jsonObject);
- calculator.removeNameSpace(parameterMapNameSpace);
- calculator.removeNameSpace(dependenceNameSpace);
- return errorMsg;
- } else {
- errorMsg = new JSONArray();
- errorMsg.put(licenseErr());
- return errorMsg;
- }
- }
-
- private JSONObject licenseErr() throws JSONException {
- return (new JSONObject()).put("text", Inter.getLocText("Plugin-Flip_License_Expired"))
- .put("value", Inter.getLocText("Plugin-Flip_License_Expired"));
- }
-
- private boolean isDesign() {
- return ModuleContext.isModuleStarted("com.fr.design.module.DesignerModule");
- }
-
- @Override
- public String[] supportedEvents() {
- return new String[0];
- }
-
- @Override
- public void readXML(XMLableReader reader) {
- super.readXML(reader);
- if (reader.isChildNode()) {
- String tagName = reader.getTagName();
- if (tagName.equals("DigitRollAttr")) {
- String s = null;
- if ((s = reader.getAttrAsString(ALIGN, null)) != null) {
- this.setAlign(s);
- }
- if ((s = reader.getAttrAsString(DURATION, null)) != null) {
- this.setDuration(Integer.parseInt(s));
- }
- if ((s = reader.getAttrAsString(FONT_SIZE, null)) != null) {
- setFontSize(Integer.parseInt(s));
- }
-
- int color;
- if ((color = reader.getAttrAsInt(FONT_COLOR, -1)) != -1) {
- setFontColor(new Color(color));
- }
- if ((color = reader.getAttrAsInt(BACKGROUND_COLOR, -1)) != -1) {
- setBackgroundColor(new Color(color));
- }
- } else if ("widgetValue".equals(tagName)) {
- this.widgetValue = new WidgetValue();
- reader.readXMLObject(this.widgetValue);
- }
- }
- }
-
- @Override
- public void writeXML(XMLPrintWriter writer) {
- super.writeXML(writer);
- writer.startTAG("DigitRollAttr");
- if (this.align != null) {
- writer.attr(ALIGN, this.getAlign().toString());
- }
-
- if (this.duration != 0) {
- writer.attr(DURATION, this.getDuration());
- }
-
- writer.attr(FONT_SIZE, getFontSize());
- writer.attr(FONT_COLOR, ((Color) getFontColor()).getRGB());
- writer.attr(BACKGROUND_COLOR, ((Color) getBackgroundColor()).getRGB());
- writer.end();
-
- if (this.widgetValue != null) {
- this.widgetValue.writeXML(writer);
- }
- }
-}
diff --git a/src/com/fr/plugin/widget/digitroll/WidgetUI.java b/src/com/fr/plugin/widget/digitroll/WidgetUI.java
deleted file mode 100644
index c372950..0000000
--- a/src/com/fr/plugin/widget/digitroll/WidgetUI.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.fr.plugin.widget.digitroll;
-
-import com.fr.design.designer.creator.CRPropertyDescriptor;
-import com.fr.design.designer.creator.XWidgetCreator;
-import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.gui.itextfield.UITextField;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.mainframe.widget.editors.ColorEditor;
-import com.fr.form.ui.Widget;
-import com.fr.general.IOUtils;
-import com.fr.general.Inter;
-import com.fr.plugin.widget.digitroll.editor.DigitRollAlign;
-import com.fr.plugin.widget.digitroll.editor.DigitRollDataSourceEditor;
-import com.fr.stable.ArrayUtils;
-
-import javax.swing.*;
-import java.awt.*;
-import java.beans.IntrospectionException;
-
-public class WidgetUI extends XWidgetCreator {
- private UITextField textField;
-
- public WidgetUI(Widget widget, Dimension dimension) {
- super(widget, dimension);
- }
-
- @Override
- protected JComponent initEditor() {
- //界面，就是在拖动到主面板上的时候，添加了一个LABLE控件，然后显示图标，并居中对齐
- if (this.editor == null) {
- this.editor = FRGUIPaneFactory.createBorderLayout_S_Pane();
- UILabel label = new UILabel();
- label.setIcon(IOUtils.readIcon("/com/fr/plugin/widget/digitroll/images/digitroll_display.png"));
- label.setHorizontalAlignment(0);
- label.setVerticalAlignment(0);
- this.editor.add(label, "Center");
- this.textField = new UITextField(5);
- this.textField.setOpaque(false);
- this.editor.add(this.textField, "South");
- this.editor.setBackground(Color.WHITE);
- }
-
- return this.editor;
- }
-
- public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
- return ArrayUtils.addAll(super.supportedDescriptor()
- , new CRPropertyDescriptor[]{
- (new CRPropertyDescriptor("widgetValue", this.data.getClass()))
- .setI18NName(Inter.getLocText("Plugin-DigitRoll_DataSource"))
- .setEditorClass(DigitRollDataSourceEditor.class)
- .putKeyValue("category", "Advanced"),
- (new CRPropertyDescriptor("align", this.data.getClass()))
- .setI18NName(Inter.getLocText("Plugin-DigitRoll_AlignType"))
- .setEditorClass(DigitRollAlign.class)
- .putKeyValue("category", "Advanced"),
- (new CRPropertyDescriptor("duration", this.data.getClass()))
- .setI18NName(Inter.getLocText("Plugin-DigitRoll_Duration"))
- .putKeyValue("category", "Advanced"),
- (new CRPropertyDescriptor("prefix", this.data.getClass()))
- .setI18NName(Inter.getLocText("Plugin-DigitRoll_Prefix"))
- .putKeyValue("category", "Advanced"),
- (new CRPropertyDescriptor("suffix", this.data.getClass()))
- .setI18NName(Inter.getLocText("Plugin-DigitRoll_Suffix"))
- .putKeyValue("category", "Advanced"),
- (new CRPropertyDescriptor("fontSize", this.data.getClass()))
- .setI18NName(Inter.getLocText("Plugin-DigitRoll_FontSize"))
- .putKeyValue("category", "Advanced"),
- (new CRPropertyDescriptor("fontColor", this.data.getClass()))
- .setI18NName(Inter.getLocText("Plugin-DigitRoll_ColorFont"))
- .setEditorClass(ColorEditor.class)
- .putKeyValue("category", "Advanced"),
- (new CRPropertyDescriptor("backgroundColor", this.data.getClass()))
- .setI18NName(Inter.getLocText("Plugin-DigitRoll_ColorBackground"))
- .setEditorClass(ColorEditor.class)
- .putKeyValue("category", "Advanced")
- }
- );
- }
-
- public String getIconPath() {
- return "com/fr/plugin/widget/digitroll/images/digitroll_icon.png";
- }
-}
diff --git a/src/com/fr/plugin/widget/digitroll/editor/DigitRollAlign.java b/src/com/fr/plugin/widget/digitroll/editor/DigitRollAlign.java
deleted file mode 100644
index 3944c31..0000000
--- a/src/com/fr/plugin/widget/digitroll/editor/DigitRollAlign.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.fr.plugin.widget.digitroll.editor;
-
-import com.fr.design.mainframe.widget.editors.ComboEditor;
-import com.fr.general.Inter;
-
-import javax.swing.*;
-import java.util.Vector;
-
-public class DigitRollAlign extends ComboEditor {
- public DigitRollAlign() {
- }
-
- public ComboBoxModel model() {
- Vector vector = new Vector();
- vector.add(Inter.getLocText("Plugin-DigitRoll_AlignLeft"));
- vector.add(Inter.getLocText("Plugin-DigitRoll_AlignCenter"));
- vector.add(Inter.getLocText("Plugin-DigitRoll_AlignRight"));
- return new DefaultComboBoxModel(vector);
- }
-
- /*public void setValue(Object o) {
- this.comboBox.setSelectedItem(o);
- }*/
-
- /*public Object getValue() {
- return this.comboBox.getSelectedItem();
- }*/
-}
diff --git a/src/com/fr/plugin/widget/digitroll/images/digitroll_display.png b/src/com/fr/plugin/widget/digitroll/images/digitroll_display.png
index da530a2553d97e5fe9e51aa1b0c1ce4943a51ce5..a064861b077c90c38ee2e81b7bd26ae40f12506a 100644
GIT binary patch
literal 9645
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
literal 5885
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
Vwtlht9p+yH7iSNrGDj}|zW_U&oo@gD
diff --git a/src/com/fr/plugin/widget/digitroll/images/digitroll_icon.png b/src/com/fr/plugin/widget/digitroll/images/digitroll_icon.png
index 3ca516a303fbd07105864a3f3127159b51b0da3e..d0231cdd3c879b79df6d5cfae1c9f2bf2ba4013a 100644
GIT binary patch
delta 3223
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
JPDHLkV1jOVAEp2R
delta 713
zcmV;)0yh1k8R!L&D}S%ZHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oe
zd2z{QJOBU!dPzhUVy#N8k1oq3XUkoNDCJataP7D$f5)7fC
zp@?t*8p6ZF!w?r2$MEy#PX>2)cd**uKs_L@00a=zf2g0-)zulUU%$?Es?%ZKGdh{qbOhDlQ5I{_zU;>5ir%#`N0V4x;3CtiyMkcTstgNgId3kvZ
zii(P0SBi>?!eavo^53l2aa1_&S)Q2bX{Rsd7t3kGHu
zs3J(%F<4ny!qWl7dZ+<^{sL2?1UT&g1P~)IH$r}9osYIvy6I00000NkvXXu0mjfeyc1U
diff --git a/src/com/fr/plugin/widget/digitroll/local/digitroll.properties b/src/com/fr/plugin/widget/digitroll/locale/digitroll.properties
similarity index 69%
rename from src/com/fr/plugin/widget/digitroll/local/digitroll.properties
rename to src/com/fr/plugin/widget/digitroll/locale/digitroll.properties
index c8daf03..01f1d40 100644
--- a/src/com/fr/plugin/widget/digitroll/local/digitroll.properties
+++ b/src/com/fr/plugin/widget/digitroll/locale/digitroll.properties
@@ -1,14 +1,17 @@
Plugin-DigitRoll_Widget=DigitRoll
+Plugin-DigitRoll_Advanced=Advanced
Plugin-DigitRoll_License_Expired=Expired
+Plugin-DigitRoll_License_Title=License
Plugin-DigitRoll_DataSource=DataSource
-Plugin-DigitRoll_AlignType=AlignType
Plugin-DigitRoll_Duration=Duration
Plugin-DigitRoll_Prefix=Prefix
Plugin-DigitRoll_Suffix=Suffix
-Plugin-DigitRoll_None=NoneValue
+Plugin-DigitRoll_Formula=Formula
Plugin-DigitRoll_AlignLeft=Left
Plugin-DigitRoll_AlignCenter=Center
Plugin-DigitRoll_AlignRight=Right
Plugin-DigitRoll_FontSize = FontSize
Plugin-DigitRoll_ColorFont=FontColor
Plugin-DigitRoll_ColorBackground=BackgroundColor
+Plugin-DigitRoll_Group=Use Grouping
+Plugin-DigitRoll_DecimalPlaces=Decimal Places
\ No newline at end of file
diff --git a/src/com/fr/plugin/widget/digitroll/local/digitroll_zh_CN.properties b/src/com/fr/plugin/widget/digitroll/locale/digitroll_zh_CN.properties
similarity index 73%
rename from src/com/fr/plugin/widget/digitroll/local/digitroll_zh_CN.properties
rename to src/com/fr/plugin/widget/digitroll/locale/digitroll_zh_CN.properties
index d898e50..4d8e90a 100644
--- a/src/com/fr/plugin/widget/digitroll/local/digitroll_zh_CN.properties
+++ b/src/com/fr/plugin/widget/digitroll/locale/digitroll_zh_CN.properties
@@ -1,14 +1,17 @@
Plugin-DigitRoll_Widget=\u6EDA\u52A8\u6570\u5B57
+Plugin-DigitRoll_Advanced=\u9AD8\u7EA7
Plugin-DigitRoll_License_Expired=\u8BB8\u53EF\u8BC1\u5DF2\u8FC7\u671F
+Plugin-DigitRoll_License_Title=\u8BB8\u53EF\u8BC1
Plugin-DigitRoll_DataSource=\u6570\u636E\u6E90
-Plugin-DigitRoll_AlignType=\u5BF9\u9F50\u65B9\u5F0F
Plugin-DigitRoll_Duration=\u6301\u7EED\u65F6\u95F4\uFF08\u79D2\uFF09
Plugin-DigitRoll_Prefix=\u524D\u7F00
Plugin-DigitRoll_Suffix=\u540E\u7F00
-Plugin-DigitRoll_None=\u7A7A\u503C
+Plugin-DigitRoll_Formula=\u516C\u5F0F
Plugin-DigitRoll_AlignLeft=\u5DE6\u5BF9\u9F50
Plugin-DigitRoll_AlignCenter=\u5C45\u4E2D\u5BF9\u9F50
Plugin-DigitRoll_AlignRight=\u53F3\u5BF9\u9F50
Plugin-DigitRoll_FontSize = \u6587\u5B57\u5927\u5C0F
Plugin-DigitRoll_ColorFont=\u6587\u5B57\u989C\u8272
Plugin-DigitRoll_ColorBackground=\u80CC\u666F\u989C\u8272
+Plugin-DigitRoll_Group=\u5206\u7EC4
+Plugin-DigitRoll_DecimalPlaces=\u5C0F\u6570\u4F4D\u6570
diff --git a/src/com/fr/plugin/widget/digitroll/ui/DecimalPlacesEditor.java b/src/com/fr/plugin/widget/digitroll/ui/DecimalPlacesEditor.java
new file mode 100644
index 0000000..076b8d1
--- /dev/null
+++ b/src/com/fr/plugin/widget/digitroll/ui/DecimalPlacesEditor.java
@@ -0,0 +1,21 @@
+package com.fr.plugin.widget.digitroll.ui;
+
+import com.fr.design.mainframe.widget.editors.ComboEditor;
+
+import javax.swing.*;
+import java.util.Vector;
+
+public class DecimalPlacesEditor extends ComboEditor {
+
+ public DecimalPlacesEditor() {
+ }
+
+ @Override
+ public ComboBoxModel model() {
+ Vector vector = new Vector();
+ for (int i = 0; i < 11; i++) {
+ vector.add(i);
+ }
+ return new DefaultComboBoxModel(vector);
+ }
+}
diff --git a/src/com/fr/plugin/widget/digitroll/editor/DigitRollDataSourceEditor.java b/src/com/fr/plugin/widget/digitroll/ui/DigitRollDataSourceEditor.java
similarity index 78%
rename from src/com/fr/plugin/widget/digitroll/editor/DigitRollDataSourceEditor.java
rename to src/com/fr/plugin/widget/digitroll/ui/DigitRollDataSourceEditor.java
index 955852b..42f23f2 100644
--- a/src/com/fr/plugin/widget/digitroll/editor/DigitRollDataSourceEditor.java
+++ b/src/com/fr/plugin/widget/digitroll/ui/DigitRollDataSourceEditor.java
@@ -1,10 +1,9 @@
-package com.fr.plugin.widget.digitroll.editor;
+package com.fr.plugin.widget.digitroll.ui;
import com.fr.design.Exception.ValidationException;
import com.fr.design.editor.ValueEditorPane;
import com.fr.design.editor.editor.Editor;
import com.fr.design.editor.editor.FormulaEditor;
-import com.fr.design.editor.editor.NoneEditor;
import com.fr.design.mainframe.widget.editors.AbstractPropertyEditor;
import com.fr.design.mainframe.widget.editors.DataBindingEditor;
import com.fr.design.mainframe.widget.editors.ServerDataBindingEditor;
@@ -20,7 +19,7 @@ import java.beans.PropertyChangeListener;
public class DigitRollDataSourceEditor extends AbstractPropertyEditor {
private DataControl widget;
- private ValueEditorPane wep;
+ private ValueEditorPane pane;
public DigitRollDataSourceEditor(Object o) {
this.widget = (DataControl) o;
@@ -37,8 +36,8 @@ public class DigitRollDataSourceEditor extends AbstractPropertyEditor {
});
}
- this.wep = new ValueEditorPane(editors);
- this.wep.addPropertyChangeListener("value", new PropertyChangeListener() {
+ this.pane = new ValueEditorPane(editors);
+ this.pane.addPropertyChangeListener("value", new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
DigitRollDataSourceEditor.this.firePropertyChanged();
}
@@ -58,12 +57,10 @@ public class DigitRollDataSourceEditor extends AbstractPropertyEditor {
public static Editor createWidgetValueEditorByType(int type, boolean onlyServer) {
switch (type) {
- case 2:
+ case DataControl.TYPE_DATABINDING:
return (Editor) (onlyServer ? new ServerDataBindingEditor() : new DataBindingEditor());
- case 3:
- return new FormulaEditor(Inter.getLocText("Parameter-Formula"));
- case 8:
- return new NoneEditor((String) null, Inter.getLocText("Plugin-DigitRoll_None"));
+ case DataControl.TYPE_FORMULA:
+ return new FormulaEditor(Inter.getLocText("Plugin-DigitRoll_Formula"));
default:
return null;
}
@@ -73,16 +70,16 @@ public class DigitRollDataSourceEditor extends AbstractPropertyEditor {
}
public Component getCustomEditor() {
- return this.wep;
+ return this.pane;
}
public Object getValue() {
- return new WidgetValue(this.wep.update());
+ return new WidgetValue(this.pane.update());
}
public void setValue(Object value) {
if (value != null) {
- this.wep.populate(((WidgetValue) value).getValue());
+ this.pane.populate(((WidgetValue) value).getValue());
}
}
}
diff --git a/src/com/fr/plugin/widget/digitroll/ui/DigitRollWidgetUI.java b/src/com/fr/plugin/widget/digitroll/ui/DigitRollWidgetUI.java
new file mode 100644
index 0000000..07e0615
--- /dev/null
+++ b/src/com/fr/plugin/widget/digitroll/ui/DigitRollWidgetUI.java
@@ -0,0 +1,88 @@
+package com.fr.plugin.widget.digitroll.ui;
+
+import com.fr.design.designer.creator.CRPropertyDescriptor;
+import com.fr.design.designer.creator.XWidgetCreator;
+import com.fr.design.editor.editor.SpinnerIntegerEditor;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.itextfield.UITextField;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.mainframe.widget.editors.BooleanEditor;
+import com.fr.design.mainframe.widget.editors.ColorEditor;
+import com.fr.form.ui.Widget;
+import com.fr.general.IOUtils;
+import com.fr.general.Inter;
+import com.fr.stable.ArrayUtils;
+
+import javax.swing.*;
+import java.awt.*;
+import java.beans.IntrospectionException;
+
+import static com.fr.plugin.widget.digitroll.DigitRollWidget.*;
+
+public class DigitRollWidgetUI extends XWidgetCreator {
+ private UITextField textField;
+
+ public DigitRollWidgetUI(Widget widget, Dimension dimension) {
+ super(widget, dimension);
+ }
+
+ @Override
+ protected JComponent initEditor() {
+ if (this.editor == null) {
+ this.editor = FRGUIPaneFactory.createBorderLayout_S_Pane();
+ UILabel label = new UILabel();
+ label.setIcon(IOUtils.readIcon("/com/fr/plugin/widget/digitroll/images/digitroll_display.png"));
+ label.setHorizontalAlignment(0);
+ label.setVerticalAlignment(0);
+ this.editor.add(label, "Center");
+ this.textField = new UITextField(5);
+ this.textField.setOpaque(false);
+ this.editor.add(this.textField, "South");
+ this.editor.setBackground(Color.WHITE);
+ }
+
+ return this.editor;
+ }
+
+ public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
+ String advanced = Inter.getLocText("Plugin-DigitRoll_Advanced");
+ return ArrayUtils.addAll(super.supportedDescriptor(),
+ (new CRPropertyDescriptor("widgetValue", this.data.getClass()))
+ .setI18NName(Inter.getLocText("Plugin-DigitRoll_DataSource"))
+ .setEditorClass(DigitRollDataSourceEditor.class)
+ .putKeyValue("category", advanced),
+ (new CRPropertyDescriptor(DURATION, this.data.getClass()))
+ .setI18NName(Inter.getLocText("Plugin-DigitRoll_Duration"))
+ .putKeyValue("category", advanced),
+ (new CRPropertyDescriptor(PREFIX, this.data.getClass()))
+ .setI18NName(Inter.getLocText("Plugin-DigitRoll_Prefix"))
+ .putKeyValue("category", advanced),
+ (new CRPropertyDescriptor(SUFFIX, this.data.getClass()))
+ .setI18NName(Inter.getLocText("Plugin-DigitRoll_Suffix"))
+ .putKeyValue("category", advanced),
+ (new CRPropertyDescriptor(FONT_SIZE, this.data.getClass()))
+ .setI18NName(Inter.getLocText("Plugin-DigitRoll_FontSize"))
+ .putKeyValue("category", advanced),
+ (new CRPropertyDescriptor(FONT_COLOR, this.data.getClass()))
+ .setI18NName(Inter.getLocText("Plugin-DigitRoll_ColorFont"))
+ .setEditorClass(ColorEditor.class)
+ .putKeyValue("category", advanced),
+ (new CRPropertyDescriptor(BACKGROUND_COLOR, this.data.getClass()))
+ .setI18NName(Inter.getLocText("Plugin-DigitRoll_ColorBackground"))
+ .setEditorClass(ColorEditor.class)
+ .putKeyValue("category", advanced),
+ (new CRPropertyDescriptor(GROUP, this.data.getClass()))
+ .setI18NName(Inter.getLocText("Plugin-DigitRoll_Group"))
+ .setEditorClass(BooleanEditor.class)
+ .putKeyValue("category", advanced),
+ (new CRPropertyDescriptor(DECIMAL_PALACES, this.data.getClass()))
+ .setI18NName(Inter.getLocText("Plugin-DigitRoll_DecimalPlaces"))
+ .setEditorClass(DecimalPlacesEditor.class)
+ .putKeyValue("category", advanced)
+ );
+ }
+
+ public String getIconPath() {
+ return "com/fr/plugin/widget/digitroll/images/digitroll_icon.png";
+ }
+}
diff --git a/src/com/fr/plugin/widget/digitroll/web/countUp.js b/src/com/fr/plugin/widget/digitroll/web/countUp.js
index cf7523e..893780e 100644
--- a/src/com/fr/plugin/widget/digitroll/web/countUp.js
+++ b/src/com/fr/plugin/widget/digitroll/web/countUp.js
@@ -3,6 +3,13 @@
countUp.js
by @inorganik
+The MIT License (MIT)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
// target = id of html element or var of previously selected html element where counting occurs
@@ -239,7 +246,10 @@ var CountUp = function (target, startVal, endVal, decimals, duration, options) {
return;
}
self.error = '';
- if (newEndVal === self.frameVal) return;
+ if (newEndVal === self.frameVal) {
+ if (self.callback) self.callback();
+ return;
+ }
cancelAnimationFrame(self.rAF);
self.paused = false;
delete self.startTime;
diff --git a/src/com/fr/plugin/widget/digitroll/web/widget.digitRoll.js b/src/com/fr/plugin/widget/digitroll/web/widget.digitRoll.js
index d337dcd..6a5a8ca 100644
--- a/src/com/fr/plugin/widget/digitroll/web/widget.digitRoll.js
+++ b/src/com/fr/plugin/widget/digitroll/web/widget.digitRoll.js
@@ -13,11 +13,38 @@
FR.$defaultImport('/com/fr/plugin/widget/digitroll/web/countUp.js', 'js');
var o = this.options;
var element = this.element;
- var widget = '';
- var widgetId = $(widget).appendTo(element);
- o.options.prefix = o.prefix;
- o.options.suffix = o.suffix;
- var digitRoll = new CountUp(widgetId, 0, o.value, 0/*o.decimals*/, o.duration, o.options);
+ var widget = element[0];
+
+ var $widget = $('');
+ var widgetId = $widget.appendTo(element);
+ $widget.css({
+ 'position': 'absolute',
+ 'left': '50%',
+ 'top': '50%',
+ '-webkit-transform': 'translate(-50%, -50%)',
+ '-moz-transform': 'translate(-50%, -50%)',
+ '-ms-transform': 'translate(-50%, -50%)',
+ '-o-transform': 'translate(-50%, -50%)',
+ 'transform': 'translate(-50%, -50%)'
+ });
+
+ this.element.css({
+ 'font-size': o.fontSize + 'px',
+ 'background-color': o.backgroundColor,
+ 'color': o.fontColor,
+ 'text-align': "center"
+ });
+ var options = {
+ useEasing: true, // 过渡动画效果，默认ture
+ useGrouping: o.group, // 千分位效果，例：1000->1,000。默认true
+ separator: ',', // 使用千分位时分割符号
+ decimal: '.', // 小数位分割符号
+ prefix: o.prefix, // 前置符号
+ suffix: o.suffix // 后置符号，可汉字
+ };
+
+ //debugger;
+ var digitRoll = new CountUp(widgetId[0], o.value, o.value, o.decimalPlaces, o.duration, options);
var callback = function () {
$.ajax({
@@ -31,7 +58,7 @@
}
});
};
- if (!digitRoll.error) {
+ if (!digitRoll.error) {
digitRoll.start(callback);
} else {
console.error(digitRoll.error);
@@ -39,5 +66,5 @@
}
});
- $.shortcut("digitRoll", FR.DigitRoll);
+ $.shortcut("digitroll", FR.DigitRoll);
})(jQuery);
\ No newline at end of file