diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f610933 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +.idea/ +*.iml +target/ +lib/report/*.jar \ No newline at end of file diff --git a/README.md b/README.md deleted file mode 100644 index 37c3c04..0000000 --- a/README.md +++ /dev/null @@ -1,18 +0,0 @@ -# 用于FineReport参数界面的下拉表格控件 - -## [插件构建指南](https://github.com/FineDevelop/plugin-build/blob/master/README.md) - -可以用于参数面板上的弹出表格控件，可以比下拉框控件展示更详细的数据 -使用的第三方表格控件easyui的datagrid控件来做表格展示 - -## 添加了插件后，参数面板上会多出一个“下拉表格”的控件 -![s](effect/Snip20150317_11.png) -## 把控件拖拽添加到参数面板上后，在属性表界面，可以选择要使用的数据集 -![ss](effect/Snip20150317_12.png) -## 在参数界面上的效果如图,把控件名设置为c1,并在报表的一个格子中写上公式：=$c1 -![sss](effect/Snip20150317_13.png) -## 预览报表并点击下拉按钮看以看到弹出一个表格 -![ssss](effect/Snip20150317_14.png) -## 选中需要的一行值后，点击查询按钮，可以看到参数值正确的在报表格子中显示了 -![sssss](effect/Snip20150317_15.png) - diff --git a/build.xml b/build.xml index 45dd113..c7d7c0d 100644 --- a/build.xml +++ b/build.xml @@ -1,10 +1,11 @@ - + + @@ -13,7 +14,7 @@ - + @@ -29,6 +30,9 @@ + + + @@ -44,7 +48,7 @@ - + @@ -59,11 +63,15 @@ target="${target_jdk_version}" fork="true" memoryMaximumSize="512m" listfiles="false" srcdir="${basedir}" executable="${compile_jdk_version}/bin/javac"> - + + + + + @@ -93,6 +101,7 @@ + @@ -106,12 +115,16 @@ + + + + + - - + - + \ No newline at end of file diff --git a/demo-paramter-combo-grid.iml b/demo-paramter-combo-grid.iml new file mode 100644 index 0000000..d0cc5e2 --- /dev/null +++ b/demo-paramter-combo-grid.iml @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/effect/Snip20150317_11.png b/effect/Snip20150317_11.png deleted file mode 100644 index 5fdb726..0000000 Binary files a/effect/Snip20150317_11.png and /dev/null differ diff --git a/effect/Snip20150317_12.png b/effect/Snip20150317_12.png deleted file mode 100644 index d577d19..0000000 Binary files a/effect/Snip20150317_12.png and /dev/null differ diff --git a/effect/Snip20150317_13.png b/effect/Snip20150317_13.png deleted file mode 100644 index bce0d50..0000000 Binary files a/effect/Snip20150317_13.png and /dev/null differ diff --git a/effect/Snip20150317_14.png b/effect/Snip20150317_14.png deleted file mode 100644 index 1dc2e7a..0000000 Binary files a/effect/Snip20150317_14.png and /dev/null differ diff --git a/effect/Snip20150317_15.png b/effect/Snip20150317_15.png deleted file mode 100644 index d8b6388..0000000 Binary files a/effect/Snip20150317_15.png and /dev/null differ diff --git a/install/plugin-parameter-grid.zip b/install/plugin-parameter-grid.zip deleted file mode 100644 index 9aab2f0..0000000 Binary files a/install/plugin-parameter-grid.zip and /dev/null differ diff --git a/lib/report/.gitkeep b/lib/report/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/plugin-paragrid.iml b/plugin-paragrid.iml deleted file mode 100644 index fc7c18b..0000000 --- a/plugin-paragrid.iml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugin.xml b/plugin.xml index 1b3d8fa..b12a0cd 100644 --- a/plugin.xml +++ b/plugin.xml @@ -1,23 +1,24 @@ - com.fr.plugin.parameter.widget.grid - com.fr.plugin.widget.grid + com.fr.plugin.demo.parameter.combo.grid + com.fr.plugin.demo.parameter.combo.grid yes 2.0 9.0 - 2015-08-09 - richie + 2018-11-05 + author + + + - - + + - - - + - + \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..6f30a49 --- /dev/null +++ b/pom.xml @@ -0,0 +1,44 @@ + + + 4.0.0 + + + com.fr.maven + finereport-maven + 10.0 + + jar + demo-paramter-combo-grid + + + com.fr.report + fine-report-designer + 10.0 + + + com.fr.report + designer-base + 10.0 + + + com.fr.report + designer-realize + 10.0 + + + + + + ${web-inf-path}/plugins/plugin-com.fr.plugin.demo.parameter.combo.grid-1.0/classes + + \ No newline at end of file diff --git a/src/com/fr/plugin/widget/grid/CellGridImpl.java b/src/com/fr/plugin/widget/grid/CellGridImpl.java deleted file mode 100644 index 0d9fc38..0000000 --- a/src/com/fr/plugin/widget/grid/CellGridImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.fr.plugin.widget.grid; - -import com.fr.design.beans.BasicBeanPane; -import com.fr.design.fun.impl.AbstractCellWidgetOptionProvider; -import com.fr.form.ui.Widget; - -public class CellGridImpl extends AbstractCellWidgetOptionProvider { - - @Override - public Class classForWidget() { - return ComboGrid.class; - } - - @Override - public Class> appearanceForWidget() { - return CellGridDefinePane.class; - } - - @Override - public String iconPathForWidget() { - return "/com/fr/plugin/widget/grid/images/table.png"; - } - - @Override - public String nameForWidget() { - return "Grid"; - } -} \ No newline at end of file diff --git a/src/com/fr/plugin/widget/grid/CssFile.java b/src/com/fr/plugin/widget/grid/CssFile.java deleted file mode 100644 index a465a55..0000000 --- a/src/com/fr/plugin/widget/grid/CssFile.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.fr.plugin.widget.grid; - -import com.fr.stable.fun.impl.AbstractCssFileHandler; - -/** - * @author richie - * @date 2015-03-16 - * @since 8.0 - */ -public class CssFile extends AbstractCssFileHandler { - - @Override - public String[] pathsForFiles() { - return new String[]{ - "/com/fr/plugin/widget/grid/easyui/easyui.css", - "/com/fr/plugin/widget/grid/easyui/icon.css", - }; - } - -} \ No newline at end of file diff --git a/src/com/fr/plugin/widget/grid/JavaScriptFile.java b/src/com/fr/plugin/widget/grid/JavaScriptFile.java deleted file mode 100644 index d99f741..0000000 --- a/src/com/fr/plugin/widget/grid/JavaScriptFile.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.fr.plugin.widget.grid; - -import com.fr.stable.fun.impl.AbstractJavaScriptFileHandler; - -/** - * @author richie - * @date 2015-03-16 - * @since 8.0 - */ -public class JavaScriptFile extends AbstractJavaScriptFileHandler { - - @Override - public String[] pathsForFiles() { - return new String[]{ - "/com/fr/plugin/widget/grid/easyui/jquery.easyui.min.js", - "/com/fr/plugin/widget/grid/web/combogrid.js" - }; - } -} \ No newline at end of file diff --git a/src/com/fr/plugin/widget/grid/GridImpl.java b/src/main/java/com/fr/plugin/demo/parameter/combo/grid/ComboGridBridge.java similarity index 64% rename from src/com/fr/plugin/widget/grid/GridImpl.java rename to src/main/java/com/fr/plugin/demo/parameter/combo/grid/ComboGridBridge.java index f13b548..b109380 100644 --- a/src/com/fr/plugin/widget/grid/GridImpl.java +++ b/src/main/java/com/fr/plugin/demo/parameter/combo/grid/ComboGridBridge.java @@ -1,15 +1,17 @@ -package com.fr.plugin.widget.grid; +package com.fr.plugin.demo.parameter.combo.grid; import com.fr.design.fun.ParameterWidgetOptionProvider; import com.fr.design.fun.impl.AbstractFormWidgetOptionProvider; import com.fr.form.ui.Widget; +import com.fr.plugin.demo.parameter.combo.grid.fun.ComboGrid; +import com.fr.plugin.demo.parameter.combo.grid.ui.XComboGrid; /** * @author richie * @date 2015-03-16 * @since 8.0 */ -public class GridImpl extends AbstractFormWidgetOptionProvider implements ParameterWidgetOptionProvider { +public class ComboGridBridge extends AbstractFormWidgetOptionProvider implements ParameterWidgetOptionProvider { @Override public int currentAPILevel() { @@ -28,7 +30,7 @@ public class GridImpl extends AbstractFormWidgetOptionProvider implements Parame @Override public String iconPathForWidget() { - return "/com/fr/plugin/widget/grid/images/table.png"; + return "/com/fr/plugin/demo/parameter/combo/grid/images/table.png"; } @Override diff --git a/src/main/java/com/fr/plugin/demo/parameter/combo/grid/GridCssFileBridge.java b/src/main/java/com/fr/plugin/demo/parameter/combo/grid/GridCssFileBridge.java new file mode 100644 index 0000000..06380d7 --- /dev/null +++ b/src/main/java/com/fr/plugin/demo/parameter/combo/grid/GridCssFileBridge.java @@ -0,0 +1,20 @@ +package com.fr.plugin.demo.parameter.combo.grid; + +import com.fr.stable.fun.impl.AbstractCssFileHandler; + +/** + * @author richie + * @date 2015-03-16 + * @since 8.0 + */ +public class GridCssFileBridge extends AbstractCssFileHandler { + + @Override + public String[] pathsForFiles() { + return new String[]{ + "/com/fr/plugin/demo/parameter/combo/grid/easyui/easyui.css", + "/com/fr/plugin/demo/parameter/combo/grid/easyui/icon.css", + }; + } + +} \ No newline at end of file diff --git a/src/main/java/com/fr/plugin/demo/parameter/combo/grid/GridJavaScriptFileBridge.java b/src/main/java/com/fr/plugin/demo/parameter/combo/grid/GridJavaScriptFileBridge.java new file mode 100644 index 0000000..9d7af05 --- /dev/null +++ b/src/main/java/com/fr/plugin/demo/parameter/combo/grid/GridJavaScriptFileBridge.java @@ -0,0 +1,19 @@ +package com.fr.plugin.demo.parameter.combo.grid; + +import com.fr.stable.fun.impl.AbstractJavaScriptFileHandler; + +/** + * @author richie + * @date 2015-03-16 + * @since 8.0 + */ +public class GridJavaScriptFileBridge extends AbstractJavaScriptFileHandler { + + @Override + public String[] pathsForFiles() { + return new String[]{ + "/com/fr/plugin/demo/parameter/combo/grid/easyui/jquery.easyui.min.js", + "/com/fr/plugin/demo/parameter/combo/grid/web/combogrid.js" + }; + } +} \ No newline at end of file diff --git a/src/main/java/com/fr/plugin/demo/parameter/combo/grid/GridLocaleFinderBridge.java b/src/main/java/com/fr/plugin/demo/parameter/combo/grid/GridLocaleFinderBridge.java new file mode 100644 index 0000000..8da9d90 --- /dev/null +++ b/src/main/java/com/fr/plugin/demo/parameter/combo/grid/GridLocaleFinderBridge.java @@ -0,0 +1,10 @@ +package com.fr.plugin.demo.parameter.combo.grid; + +import com.fr.stable.fun.impl.AbstractLocaleFinder; + +public class GridLocaleFinderBridge extends AbstractLocaleFinder { + @Override + public String find() { + return "com/fr/plugin/demo/parameter/combo/grid/locale/grid"; + } +} diff --git a/src/com/fr/plugin/widget/grid/ComboGrid.java b/src/main/java/com/fr/plugin/demo/parameter/combo/grid/fun/ComboGrid.java similarity index 80% rename from src/com/fr/plugin/widget/grid/ComboGrid.java rename to src/main/java/com/fr/plugin/demo/parameter/combo/grid/fun/ComboGrid.java index 4d3ee1c..e00735b 100644 --- a/src/com/fr/plugin/widget/grid/ComboGrid.java +++ b/src/main/java/com/fr/plugin/demo/parameter/combo/grid/fun/ComboGrid.java @@ -1,4 +1,4 @@ -package com.fr.plugin.widget.grid; +package com.fr.plugin.demo.parameter.combo.grid.fun; import com.fr.base.TableData; import com.fr.data.impl.NameTableData; @@ -6,14 +6,19 @@ import com.fr.form.ui.DataControl; import com.fr.form.ui.WidgetValue; import com.fr.form.ui.WriteAbleRepeatEditor; import com.fr.general.data.DataModel; +import com.fr.intelli.record.Focus; +import com.fr.intelli.record.Original; +import com.fr.json.JSON; import com.fr.json.JSONArray; +import com.fr.json.JSONFactory; import com.fr.json.JSONObject; import com.fr.plugin.transform.ExecuteFunctionRecord; import com.fr.plugin.transform.FunctionRecorder; +import com.fr.record.analyzer.EnableMetrics; import com.fr.script.Calculator; import com.fr.stable.xml.XMLPrintWriter; import com.fr.stable.xml.XMLableReader; -import com.fr.web.core.SessionIDInfor; +import com.fr.web.core.TemplateSessionIDInfo; import javax.servlet.http.HttpServletRequest; @@ -22,7 +27,7 @@ import javax.servlet.http.HttpServletRequest; * @date 2015-03-16 * @since 8.0 */ -@FunctionRecorder +@EnableMetrics public class ComboGrid extends WriteAbleRepeatEditor implements DataControl { private TableData tableData; @@ -68,17 +73,17 @@ public class ComboGrid extends WriteAbleRepeatEditor implements DataControl { * @return 返回数据对象 * @throws Exception 抛出异常 */ - @ExecuteFunctionRecord - public JSONArray createJSONData(SessionIDInfor sessionIDInfor, Calculator c, HttpServletRequest req) throws Exception { - JSONArray ja = new JSONArray(); + @Focus(id="com.fr.plugin.demo.parameter.combo.grid", text = "", source = Original.PLUGIN) + public JSONArray createJSONData(TemplateSessionIDInfo sessionIDInfor, Calculator c, HttpServletRequest req) throws Exception { + JSONArray ja = JSONFactory.createJSON(JSON.ARRAY); - JSONObject columnInfo = new JSONObject(); + JSONObject columnInfo = JSONFactory.createJSON(JSON.OBJECT); ja.put(columnInfo); - JSONArray columnNames = new JSONArray(); + JSONArray columnNames = JSONFactory.createJSON(JSON.ARRAY); columnInfo.put("columnNames", columnNames); - JSONObject valueInfo = new JSONObject(); + JSONObject valueInfo = JSONFactory.createJSON(JSON.OBJECT); columnInfo.put("valueInfo", valueInfo); @@ -92,10 +97,10 @@ public class ComboGrid extends WriteAbleRepeatEditor implements DataControl { valueInfo.put("textColumnName", columnNames.length() > valueIndex ? columnNames.getString(valueIndex) : columnNames.getString(0)); - JSONArray valueArray = new JSONArray(); + JSONArray valueArray = JSONFactory.createJSON(JSON.ARRAY); ja.put(valueArray); for (int j = 0, row = dataModel.getRowCount(); j < row; j ++) { - JSONObject jo = new JSONObject(); + JSONObject jo = JSONFactory.createJSON(JSON.OBJECT); valueArray.put(jo); for (int i = 0, col = dataModel.getColumnCount(); i < col; i ++) { jo.put(dataModel.getColumnName(i), dataModel.getValueAt(j, i)); @@ -115,6 +120,11 @@ public class ComboGrid extends WriteAbleRepeatEditor implements DataControl { return null; } + @Override + public String getDataBindDefaultValue(Calculator calculator) { + return null; + } + public void readXML(XMLableReader reader) { super.readXML(reader); if (reader.isChildNode()) { diff --git a/src/com/fr/plugin/widget/grid/CellGridDefinePane.java b/src/main/java/com/fr/plugin/demo/parameter/combo/grid/ui/CellGridDefinePane.java similarity index 92% rename from src/com/fr/plugin/widget/grid/CellGridDefinePane.java rename to src/main/java/com/fr/plugin/demo/parameter/combo/grid/ui/CellGridDefinePane.java index 2138366..c93cd83 100644 --- a/src/com/fr/plugin/widget/grid/CellGridDefinePane.java +++ b/src/main/java/com/fr/plugin/demo/parameter/combo/grid/ui/CellGridDefinePane.java @@ -1,22 +1,18 @@ -package com.fr.plugin.widget.grid; +package com.fr.plugin.demo.parameter.combo.grid.ui; import com.fr.base.TableData; import com.fr.data.TableDataSource; import com.fr.data.impl.NameTableData; -import com.fr.design.beans.BasicBeanPane; import com.fr.design.data.DesignTableDataManager; -import com.fr.design.gui.frpane.TreeSettingPane; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombobox.UIComboBoxRenderer; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UINumberField; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.design.present.dict.DictionaryPane; -import com.fr.design.widget.DataModify; import com.fr.design.widget.ui.AbstractDataModify; import com.fr.file.DatasourceManager; -import com.fr.third.org.apache.poi.hssf.record.formula.functions.Abs; +import com.fr.plugin.demo.parameter.combo.grid.fun.ComboGrid; import javax.swing.*; import java.awt.*; diff --git a/src/com/fr/plugin/widget/grid/TableDataEditor.java b/src/main/java/com/fr/plugin/demo/parameter/combo/grid/ui/TableDataEditor.java similarity index 97% rename from src/com/fr/plugin/widget/grid/TableDataEditor.java rename to src/main/java/com/fr/plugin/demo/parameter/combo/grid/ui/TableDataEditor.java index f1cdbd4..1e1083b 100644 --- a/src/com/fr/plugin/widget/grid/TableDataEditor.java +++ b/src/main/java/com/fr/plugin/demo/parameter/combo/grid/ui/TableDataEditor.java @@ -1,4 +1,4 @@ -package com.fr.plugin.widget.grid; +package com.fr.plugin.demo.parameter.combo.grid.ui; import com.fr.base.TableData; import com.fr.data.TableDataSource; diff --git a/src/com/fr/plugin/widget/grid/TableDataRenderer.java b/src/main/java/com/fr/plugin/demo/parameter/combo/grid/ui/TableDataRenderer.java similarity index 83% rename from src/com/fr/plugin/widget/grid/TableDataRenderer.java rename to src/main/java/com/fr/plugin/demo/parameter/combo/grid/ui/TableDataRenderer.java index a663716..06d3b83 100644 --- a/src/com/fr/plugin/widget/grid/TableDataRenderer.java +++ b/src/main/java/com/fr/plugin/demo/parameter/combo/grid/ui/TableDataRenderer.java @@ -1,4 +1,4 @@ -package com.fr.plugin.widget.grid; +package com.fr.plugin.demo.parameter.combo.grid.ui; import com.fr.design.mainframe.widget.renderer.EncoderCellRenderer; diff --git a/src/com/fr/plugin/widget/grid/TableDataWrapper.java b/src/main/java/com/fr/plugin/demo/parameter/combo/grid/ui/TableDataWrapper.java similarity index 93% rename from src/com/fr/plugin/widget/grid/TableDataWrapper.java rename to src/main/java/com/fr/plugin/demo/parameter/combo/grid/ui/TableDataWrapper.java index 1e78302..8f16bde 100644 --- a/src/com/fr/plugin/widget/grid/TableDataWrapper.java +++ b/src/main/java/com/fr/plugin/demo/parameter/combo/grid/ui/TableDataWrapper.java @@ -1,4 +1,4 @@ -package com.fr.plugin.widget.grid; +package com.fr.plugin.demo.parameter.combo.grid.ui; import com.fr.data.impl.NameTableData; import com.fr.stable.StringUtils; diff --git a/src/com/fr/plugin/widget/grid/XComboGrid.java b/src/main/java/com/fr/plugin/demo/parameter/combo/grid/ui/XComboGrid.java similarity index 81% rename from src/com/fr/plugin/widget/grid/XComboGrid.java rename to src/main/java/com/fr/plugin/demo/parameter/combo/grid/ui/XComboGrid.java index ad4a825..ae72d36 100644 --- a/src/com/fr/plugin/widget/grid/XComboGrid.java +++ b/src/main/java/com/fr/plugin/demo/parameter/combo/grid/ui/XComboGrid.java @@ -1,13 +1,15 @@ -package com.fr.plugin.widget.grid; +package com.fr.plugin.demo.parameter.combo.grid.ui; import com.fr.design.designer.creator.CRPropertyDescriptor; import com.fr.design.designer.creator.XLayoutContainer; import com.fr.design.designer.creator.XWScaleLayout; import com.fr.design.designer.creator.XWriteAbleRepeatEditor; import com.fr.design.gui.itextfield.UITextField; +import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.widget.editors.WidgetValueEditor; import com.fr.general.Inter; +import com.fr.plugin.demo.parameter.combo.grid.fun.ComboGrid; import com.fr.stable.ArrayUtils; import javax.swing.*; @@ -21,7 +23,7 @@ import java.beans.IntrospectionException; */ public class XComboGrid extends XWriteAbleRepeatEditor { - LimpidButton btn; + private LimpidButton btn; public XComboGrid(ComboGrid widget, Dimension initSize) { super(widget, initSize); @@ -29,15 +31,15 @@ public class XComboGrid extends XWriteAbleRepeatEditor { public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { - return (CRPropertyDescriptor[]) ArrayUtils.addAll( + return ArrayUtils.addAll( super.supportedDescriptor(), new CRPropertyDescriptor[]{ - new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(Inter.getLocText(new String[]{"Widget", "Value"})).setEditorClass(WidgetValueEditor.class), + new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(Toolkit.i18nText("Plugin-Demo_Widget_Value")).setEditorClass(WidgetValueEditor.class), new CRPropertyDescriptor("tableData", this.data.getClass()) - .setI18NName("数据集") + .setI18NName(Toolkit.i18nText("Plugin-Demo_Table_Data")) .setEditorClass(TableDataEditor.class).setRendererClass(TableDataRenderer.class), - new CRPropertyDescriptor("keyIndex", this.data.getClass()).setI18NName("实际值索引"), - new CRPropertyDescriptor("valueIndex", this.data.getClass()).setI18NName("显示值索引") + new CRPropertyDescriptor("keyIndex", this.data.getClass()).setI18NName(Toolkit.i18nText("Plugin-Demo_Value_Index")), + new CRPropertyDescriptor("valueIndex", this.data.getClass()).setI18NName(Toolkit.i18nText("Plugin-Demo_Text_Index")) }); } @@ -45,8 +47,8 @@ public class XComboGrid extends XWriteAbleRepeatEditor { return (ComboGrid) this.data; } - public String getIconPath() { - return "/com/fr/plugin/widget/grid/images/table.png"; + public String getIconPath() { + return "/com/fr/plugin/demo/parameter/combo/grid/images/table.png"; } @Override diff --git a/src/com/fr/plugin/widget/grid/easyui/easyui.css b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/easyui.css similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/easyui.css rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/easyui.css diff --git a/src/com/fr/plugin/widget/grid/easyui/icon.css b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icon.css similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/icon.css rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icon.css diff --git a/src/com/fr/plugin/widget/grid/easyui/icons/back.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/back.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/icons/back.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/back.png diff --git a/src/com/fr/plugin/widget/grid/easyui/icons/blank.gif b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/blank.gif similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/icons/blank.gif rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/blank.gif diff --git a/src/com/fr/plugin/widget/grid/easyui/icons/cancel.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/cancel.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/icons/cancel.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/cancel.png diff --git a/src/com/fr/plugin/widget/grid/easyui/icons/clear.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/clear.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/icons/clear.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/clear.png diff --git a/src/com/fr/plugin/widget/grid/easyui/icons/cut.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/cut.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/icons/cut.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/cut.png diff --git a/src/com/fr/plugin/widget/grid/easyui/icons/edit_add.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/edit_add.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/icons/edit_add.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/edit_add.png diff --git a/src/com/fr/plugin/widget/grid/easyui/icons/edit_remove.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/edit_remove.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/icons/edit_remove.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/edit_remove.png diff --git a/src/com/fr/plugin/widget/grid/easyui/icons/filesave.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/filesave.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/icons/filesave.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/filesave.png diff --git a/src/com/fr/plugin/widget/grid/easyui/icons/filter.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/filter.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/icons/filter.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/filter.png diff --git a/src/com/fr/plugin/widget/grid/easyui/icons/help.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/help.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/icons/help.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/help.png diff --git a/src/com/fr/plugin/widget/grid/easyui/icons/large_chart.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/large_chart.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/icons/large_chart.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/large_chart.png diff --git a/src/com/fr/plugin/widget/grid/easyui/icons/large_clipart.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/large_clipart.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/icons/large_clipart.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/large_clipart.png diff --git a/src/com/fr/plugin/widget/grid/easyui/icons/large_picture.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/large_picture.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/icons/large_picture.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/large_picture.png diff --git a/src/com/fr/plugin/widget/grid/easyui/icons/large_shapes.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/large_shapes.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/icons/large_shapes.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/large_shapes.png diff --git a/src/com/fr/plugin/widget/grid/easyui/icons/large_smartart.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/large_smartart.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/icons/large_smartart.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/large_smartart.png diff --git a/src/com/fr/plugin/widget/grid/easyui/icons/lock.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/lock.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/icons/lock.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/lock.png diff --git a/src/com/fr/plugin/widget/grid/easyui/icons/man.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/man.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/icons/man.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/man.png diff --git a/src/com/fr/plugin/widget/grid/easyui/icons/mini_add.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/mini_add.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/icons/mini_add.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/mini_add.png diff --git a/src/com/fr/plugin/widget/grid/easyui/icons/mini_edit.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/mini_edit.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/icons/mini_edit.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/mini_edit.png diff --git a/src/com/fr/plugin/widget/grid/easyui/icons/mini_refresh.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/mini_refresh.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/icons/mini_refresh.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/mini_refresh.png diff --git a/src/com/fr/plugin/widget/grid/easyui/icons/more.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/more.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/icons/more.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/more.png diff --git a/src/com/fr/plugin/widget/grid/easyui/icons/no.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/no.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/icons/no.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/no.png diff --git a/src/com/fr/plugin/widget/grid/easyui/icons/ok.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/ok.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/icons/ok.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/ok.png diff --git a/src/com/fr/plugin/widget/grid/easyui/icons/pencil.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/pencil.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/icons/pencil.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/pencil.png diff --git a/src/com/fr/plugin/widget/grid/easyui/icons/print.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/print.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/icons/print.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/print.png diff --git a/src/com/fr/plugin/widget/grid/easyui/icons/redo.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/redo.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/icons/redo.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/redo.png diff --git a/src/com/fr/plugin/widget/grid/easyui/icons/reload.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/reload.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/icons/reload.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/reload.png diff --git a/src/com/fr/plugin/widget/grid/easyui/icons/search.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/search.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/icons/search.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/search.png diff --git a/src/com/fr/plugin/widget/grid/easyui/icons/sum.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/sum.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/icons/sum.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/sum.png diff --git a/src/com/fr/plugin/widget/grid/easyui/icons/tip.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/tip.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/icons/tip.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/tip.png diff --git a/src/com/fr/plugin/widget/grid/easyui/icons/undo.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/undo.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/icons/undo.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/icons/undo.png diff --git a/src/com/fr/plugin/widget/grid/easyui/images/accordion_arrows.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/accordion_arrows.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/images/accordion_arrows.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/accordion_arrows.png diff --git a/src/com/fr/plugin/widget/grid/easyui/images/blank.gif b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/blank.gif similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/images/blank.gif rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/blank.gif diff --git a/src/com/fr/plugin/widget/grid/easyui/images/calendar_arrows.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/calendar_arrows.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/images/calendar_arrows.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/calendar_arrows.png diff --git a/src/com/fr/plugin/widget/grid/easyui/images/combo_arrow.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/combo_arrow.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/images/combo_arrow.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/combo_arrow.png diff --git a/src/com/fr/plugin/widget/grid/easyui/images/datagrid_icons.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/datagrid_icons.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/images/datagrid_icons.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/datagrid_icons.png diff --git a/src/com/fr/plugin/widget/grid/easyui/images/datebox_arrow.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/datebox_arrow.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/images/datebox_arrow.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/datebox_arrow.png diff --git a/src/com/fr/plugin/widget/grid/easyui/images/layout_arrows.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/layout_arrows.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/images/layout_arrows.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/layout_arrows.png diff --git a/src/com/fr/plugin/widget/grid/easyui/images/linkbutton_bg.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/linkbutton_bg.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/images/linkbutton_bg.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/linkbutton_bg.png diff --git a/src/com/fr/plugin/widget/grid/easyui/images/loading.gif b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/loading.gif similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/images/loading.gif rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/loading.gif diff --git a/src/com/fr/plugin/widget/grid/easyui/images/menu_arrows.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/menu_arrows.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/images/menu_arrows.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/menu_arrows.png diff --git a/src/com/fr/plugin/widget/grid/easyui/images/messager_icons.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/messager_icons.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/images/messager_icons.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/messager_icons.png diff --git a/src/com/fr/plugin/widget/grid/easyui/images/pagination_icons.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/pagination_icons.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/images/pagination_icons.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/pagination_icons.png diff --git a/src/com/fr/plugin/widget/grid/easyui/images/panel_tools.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/panel_tools.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/images/panel_tools.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/panel_tools.png diff --git a/src/com/fr/plugin/widget/grid/easyui/images/searchbox_button.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/searchbox_button.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/images/searchbox_button.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/searchbox_button.png diff --git a/src/com/fr/plugin/widget/grid/easyui/images/slider_handle.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/slider_handle.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/images/slider_handle.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/slider_handle.png diff --git a/src/com/fr/plugin/widget/grid/easyui/images/spinner_arrows.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/spinner_arrows.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/images/spinner_arrows.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/spinner_arrows.png diff --git a/src/com/fr/plugin/widget/grid/easyui/images/tabs_icons.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/tabs_icons.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/images/tabs_icons.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/tabs_icons.png diff --git a/src/com/fr/plugin/widget/grid/easyui/images/tree_icons.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/tree_icons.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/images/tree_icons.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/tree_icons.png diff --git a/src/com/fr/plugin/widget/grid/easyui/images/validatebox_warning.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/validatebox_warning.png similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/images/validatebox_warning.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/images/validatebox_warning.png diff --git a/src/com/fr/plugin/widget/grid/easyui/jquery.easyui.min.js b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/jquery.easyui.min.js similarity index 100% rename from src/com/fr/plugin/widget/grid/easyui/jquery.easyui.min.js rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/easyui/jquery.easyui.min.js diff --git a/src/com/fr/plugin/widget/grid/images/table.png b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/images/table.png similarity index 100% rename from src/com/fr/plugin/widget/grid/images/table.png rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/images/table.png diff --git a/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/locale/grid.properties b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/locale/grid.properties new file mode 100644 index 0000000..5f46aa9 --- /dev/null +++ b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/locale/grid.properties @@ -0,0 +1,5 @@ +Plugin-Demo_Combo_Grid=Combo Grid +Plugin-Demo_Table_Data=Table Data +Plugin-Demo_Widget_Value=Widget Value +Plugin-Demo_Value_Index=Value Index +Plugin-Demo_Text_Index=Text Index \ No newline at end of file diff --git a/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/locale/grid_zh_CN.properties b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/locale/grid_zh_CN.properties new file mode 100644 index 0000000..d3f4b78 --- /dev/null +++ b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/locale/grid_zh_CN.properties @@ -0,0 +1,5 @@ +Plugin-Demo_Combo_Grid=\u4E0B\u62C9\u8868\u683C +Plugin-Demo_Table_Data=\u6570\u636E\u96C6 +Plugin-Demo_Widget_Value=\u63A7\u4EF6\u503C +Plugin-Demo_Value_Index=\u5B9E\u9645\u503C\u7D22\u5F15 +Plugin-Demo_Text_Index=\u663E\u793A\u503C\u7D22\u5F15 \ No newline at end of file diff --git a/src/com/fr/plugin/widget/grid/web/combogrid.js b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/web/combogrid.js similarity index 97% rename from src/com/fr/plugin/widget/grid/web/combogrid.js rename to src/main/resources/com/fr/plugin/demo/parameter/combo/grid/web/combogrid.js index cbfcfc5..1000bbd 100644 --- a/src/com/fr/plugin/widget/grid/web/combogrid.js +++ b/src/main/resources/com/fr/plugin/demo/parameter/combo/grid/web/combogrid.js @@ -59,7 +59,7 @@ _refreshGrid: function ($t, columns, data) { var self = this, opt = this.options; FR.showDialog({ - title: "下拉表格", + title: FR.i18nText("Plugin-Demo_Combo_Grid"), width: 500, height: 280, contentHtml: $t