{
protected void done() {
okButton.setEnabled(true);
try {
-
TestConnectionResult result = TestConnectionResult.parse(get(), connection);
- if (result == TestConnectionResult.Fully_Success) {
- message.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Successful"));
- uiLabel.setIcon(UIManager.getIcon("OptionPane.informationIcon"));
- }
-
- if (result == TestConnectionResult.Partly_Sucess) {
- message.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Version_Inconsistence_Test"));
- uiLabel.setIcon(UIManager.getIcon("OptionPane.warningIcon"));
- }
-
- if (result == TestConnectionResult.Fully_Failed) {
- message.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Failed"));
- uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon"));
- }
-
- if (result == TestConnectionResult.Auth_Failed) {
- message.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Auth_Failed"));
- uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon"));
- }
+ message.setText(result.getText());
+ uiLabel.setIcon(result.getIcon());
} catch (InterruptedException | ExecutionException e) {
FineLoggerFactory.getLogger().error(e, e.getMessage());
message.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Failed"));
diff --git a/designer-base/src/main/java/com/fr/env/TestConnectionResult.java b/designer-base/src/main/java/com/fr/env/TestConnectionResult.java
index 357d4f38cb..5362dbbd83 100644
--- a/designer-base/src/main/java/com/fr/env/TestConnectionResult.java
+++ b/designer-base/src/main/java/com/fr/env/TestConnectionResult.java
@@ -1,62 +1,104 @@
package com.fr.env;
+import com.fr.design.i18n.Toolkit;
import com.fr.log.FineLoggerFactory;
import com.fr.stable.AssistUtils;
import com.fr.workspace.WorkContext;
import com.fr.workspace.connect.WorkspaceConnectionInfo;
import com.fr.workspace.engine.channel.http.FunctionalHttpRequest;
+import javax.swing.Icon;
+import javax.swing.UIManager;
+
/**
* 测试连接的结果。
* 不改变原有逻辑的情况下，加入一层转化。
* 根据这里的转化结果，判断需要提示哪些内容。
- *
+ *
* created by Harrison on 2018/12/20
**/
public enum TestConnectionResult {
/**
* 完全成功, 版本匹配，测试连接成功。
*/
- Fully_Success,
+ FULLY_SUCCESS {
+ @Override
+ public Icon getIcon() {
+ return UIManager.getIcon("OptionPane.informationIcon");
+ }
+
+ @Override
+ public String getText() {
+ return Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Successful");
+ }
+ },
/**
* 不完全成功，版本不匹配，但测试连接成功。
*/
- Partly_Sucess,
+ PARTLY_SUCCESS {
+ @Override
+ public Icon getIcon() {
+ return UIManager.getIcon("OptionPane.warningIcon");
+ }
+
+ @Override
+ public String getText() {
+ return Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Version_Inconsistence_Test");
+ }
+ },
/**
* 完全失败，直接没连上
*/
- Fully_Failed,
+ FULLY_FAILED {
+ @Override
+ public Icon getIcon() {
+ return UIManager.getIcon("OptionPane.errorIcon");
+ }
+
+ @Override
+ public String getText() {
+ return Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Failed");
+ }
+ },
/**
* 验证 Token 失败
*/
- Auth_Failed;
+ AUTH_FAILED {
+ @Override
+ public Icon getIcon() {
+ return UIManager.getIcon("OptionPane.errorIcon");
+ }
+
+ @Override
+ public String getText() {
+ return Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Auth_Failed");
+ }
+ };
+
+ public abstract Icon getIcon();
+
+ public abstract String getText();
public static TestConnectionResult parse(Boolean value, WorkspaceConnectionInfo info) {
if (value == null) {
- return Auth_Failed;
+ return AUTH_FAILED;
}
-
if (!value) {
- return Fully_Failed;
+ return FULLY_FAILED;
}
try {
-
String serverVersion = new FunctionalHttpRequest(info).getServerVersion();
if (AssistUtils.equals(serverVersion, WorkContext.getVersion())) {
- return Fully_Success;
+ return FULLY_SUCCESS;
}
-
- return Partly_Sucess;
+ return PARTLY_SUCCESS;
} catch (Exception e) {
-
// 发生异常，说明没连接上。返回完全失败。
FineLoggerFactory.getLogger().error(e.getMessage());
- return Fully_Failed;
+ return FULLY_FAILED;
}
-
-
}
}
diff --git a/designer-base/src/main/java/com/fr/start/OemHandler.java b/designer-base/src/main/java/com/fr/start/OemHandler.java
new file mode 100644
index 0000000000..b127e07f43
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/start/OemHandler.java
@@ -0,0 +1,14 @@
+package com.fr.start;
+
+import com.fr.design.fun.OemProcessor;
+import com.fr.stable.bridge.StableFactory;
+
+/**
+ * OEM处理中心
+ */
+public class OemHandler {
+
+ public static OemProcessor findOem() {
+ return StableFactory.getMarkedInstanceObjectFromClass(OemProcessor.MARK_STRING, OemProcessor.class);
+ }
+}
\ No newline at end of file
diff --git a/designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java b/designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java
index 2d08b286d5..0955c16e57 100644
--- a/designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java
+++ b/designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java
@@ -6,6 +6,7 @@ import com.fr.log.FineLoggerFactory;
import com.fr.module.Activator;
import com.fr.module.ModuleRole;
import com.fr.stable.EncodeConstants;
+import com.fr.stable.ProductConstants;
import com.fr.startup.FineWebApplicationInitializer;
import com.fr.third.springframework.web.SpringServletContainerInitializer;
import com.fr.third.springframework.web.context.support.AnnotationConfigWebApplicationContext;
@@ -62,6 +63,8 @@ public class FineEmbedServerActivator extends Activator {
// 设置解码uri使用的字符编码
tomcat.getConnector().setURIEncoding(EncodeConstants.ENCODING_UTF_8);
String docBase = new File(WorkContext.getCurrent().getPath()).getParent();
+ //内置的上下文是自己定的，这里把WEB_APP_NAME一并设置了，否则下面appName是/null
+ ProductConstants.setWebAppName(ProductConstants.getAppFolderName());
String appName = "/" + FRContext.getCommonOperator().getAppName();
Context context = tomcat.addContext(appName, docBase);
Tomcat.initWebappDefaults(context);
diff --git a/designer-base/src/main/resources/com/fr/aspectj/designerbase/TemplateProcessTracker.aj b/designer-base/src/main/resources/com/fr/aspectj/designerbase/TemplateProcessTracker.aj
deleted file mode 100644
index 1ab23100b1..0000000000
--- a/designer-base/src/main/resources/com/fr/aspectj/designerbase/TemplateProcessTracker.aj
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.fr.aspectj.designerbase;
-
-/**
- * 记录模板过程
- * Created by plough on 2017/3/3.
- */
-
-import org.aspectj.lang.reflect.SourceLocation;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.MouseEvent;
-
-public aspect TemplateProcessTracker {
- //声明一个pointcut，匹配你需要的方法
- pointcut onMouseClicked(MouseEvent e):
- execution(* mouseClicked(MouseEvent)) && args(e);
- pointcut onMousePressed(MouseEvent e):
- execution(* mousePressed(MouseEvent)) && args(e);
- pointcut onMouseReleased(MouseEvent e):
- execution(* mouseReleased(MouseEvent)) && args(e);
- pointcut onActionPerformed(ActionEvent e):
- execution(* actionPerformed(ActionEvent)) && args(e);
- pointcut onSetValueAt(Object v, int r, int c):
- execution(* setValueAt(java.lang.Object, int, int)) && args(v, r, c);
-
- //before表示之前的意思
- //这整个表示在MouseAdapter的public void mouseXXX(MouseEvent)方法调用之前，你想要执行的代码
- before(MouseEvent e): onMouseClicked(e) || onMousePressed(e) || onMouseReleased(e) {
- SourceLocation sl = thisJoinPoint.getSourceLocation();//切面对应的代码位置
-
- //String log = String.format("%s:\n%s\n%s\n%s\n\n", new Date(), sl, e, e.getSource());
- String log = "";
- //TemplateInfoCollector.appendProcess(log);
- }
- //同上
- before(ActionEvent e): onActionPerformed(e) {
- SourceLocation sl = thisJoinPoint.getSourceLocation();
- // !within(LogHandlerBar) 没用, 手动过滤
- if (e != null && e.getSource().toString().contains("javax.swing.Timer")) {
- return;
- }
-
- //String log = String.format("%s:\n%s\n%s\n%s\n\n", new Date(), sl, e, e.getSource());
- String log = "";
- //TemplateInfoCollector.appendProcess(log);
-
- }
- //同上
- before(Object v, int r, int c): onSetValueAt(v, r, c) {
- SourceLocation sl = thisJoinPoint.getSourceLocation();
-
- //String log getSourceLocation= String.format("%s:\n%s\nset value: %s at (%d, %d)\n\n", new Date(), sl, v, r, c);
- String log = "";
- // TemplateInfoCollector.appendProcess(log);
- }
-
-
-}
diff --git a/designer-base/src/main/resources/com/fr/design/dcm/index.js b/designer-base/src/main/resources/com/fr/design/dcm/index.js
new file mode 100644
index 0000000000..5f6220c748
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/dcm/index.js
@@ -0,0 +1,2 @@
+!function(e){var t={};function i(s){if(t[s])return t[s].exports;var o=t[s]={i:s,l:!1,exports:{}};return e[s].call(o.exports,o,o.exports,i),o.l=!0,o.exports}i.m=e,i.c=t,i.d=function(e,t,s){i.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:s})},i.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(e,t){if(1&t&&(e=i(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var s=Object.create(null);if(i.r(s),Object.defineProperty(s,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)i.d(s,o,function(t){return e[t]}.bind(null,o));return s},i.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(t,"a",t),t},i.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},i.p="",i(i.s=0)}([function(e,t,i){BI.DOM.ready(()=>{const e=i(5).default;BI.createWidget({type:e,element:"body"})})},function(e,t,i){},function(e,t){const i=BI.Constants.getConstant("dec.constant.database.conf.connect.form.redis.value"),s=BI.inherit(BI.Widget,{render:()=>({type:"bi.vertical",cls:"bi-plugin-redis",bgap:10,items:[{type:"bi.left",height:30,items:[{type:"bi.label",text:"数据库地址：",height:24,width:115,textAlign:"left"},{type:"bi.label",text:i.url,height:24}]},{type:"bi.left",height:30,items:[{type:"bi.label",text:"端口：",height:24,width:115,textAlign:"left"},{type:"bi.label",text:i.port,height:24}]},{type:"bi.left",height:30,items:[{type:"bi.label",text:"密码：",height:24,width:115,textAlign:"left"},{type:"bi.label",text:"********",height:24}]}]})});BI.shortcut("fr.plugin.redis.preview",s),BI.constant("dec.constant.database.conf.connect.form.redis.preview","fr.plugin.redis.preview")},function(e,t){const i=BI.inherit(BI.Widget,{render(){const{maxActive:e,maxIdle:t,numActive:i,numIdle:s}=this.options;return{type:"bi.left",items:[{type:"bi.left",cls:"right-status-item",items:[{type:"bi.vertical",cls:"right-status-board",items:[{type:"bi.vertical",cls:"right-status-board-item",items:[{type:"bi.label",cls:"right-status-text",extraCls:"card-font1",text:i},{type:"bi.label",cls:"right-status-text",text:"/"},{type:"bi.label",cls:"right-status-text",text:e}]},{type:"bi.label",text:"Redis连接数"}]}]}]}}});BI.shortcut("fr.plugin.redis.pool",i),BI.constant("dec.constant.database.conf.connect.form.redis.pool","fr.plugin.redis.pool")},function(e,t,i){},function(e,t,i){"use strict";i.r(t);const s="bi.icon_label",o="bi.label",r="bi.button",n="bi.editor",l="bi.vtape",a="bi.htape",c="bi.layout",d="bi.vertical",h="bi.left",p=[],m={childContext:["tab","linkList","linkSelected","linkUpdate","moreLinkSelected","statusSelected","connectionNameErr"],state:()=>({tab:"数据连接管理",linkList:p,linkSelected:{},linkUpdate:{},moreLinkSelected:"",statusSelected:"",connectionNameErr:""}),computed:{},actions:{setLinkList(e){this.model.linkList=e}}};BI.model("fr.model.main",BI.inherit(Fix.Model,m));const b=BI.inherit(Fix.Model,{context:["tab"],actions:{setTab(e){this.model.tab=e}}});BI.model("fr.model.title.item",b);function u(e,t){return e===t?{color:"#3685f2","border-bottom":"solid 2px #3685f2"}:{color:"#3d4d66","border-bottom":"none"}}const g=BI.inherit(BI.Widget,{props:{text:""},_store:()=>BI.Models.getModel("fr.model.title.item"),watch:{tab(e){const{text:t}=this.options;this.element.css(u(t,e))}},render(){const{text:e}=this.options;return{type:o,cls:"title-item",text:e}},mounted(){const{text:e}=this.options;this.element.css(u("数据连接管理",e)),this.element.on("click",()=>{this.store.setTab(e)})}});BI.shortcut("fr.title.item",g);const y={data:[{connectionId:"8c1c52f1-3d0a-429e-b35f-ee1e085a8b72",database:"",connectionName:"FRDemo",driver:"org.sqlite.JDBC",url:"jdbc:sqlite://${ENV_HOME}/../help/FRDemo.db",user:"",password:"",queryType:"",newCharsetName:"null",originalCharsetName:"",validationQuery:"",schema:"",testOnBorrow:!0,maxActive:50,options:"null",port:0,authType:"",creator:"designer",principal:"",keyPath:"",databaseType:"designer",privilegeDetailBeanList:"null"}]},f=window.parent.Dec,v=window.PluginHelper;const x=["数据连接管理","连接池状态"],I={render(){return{type:h,cls:"title",items:[...BI.map(x,(e,t)=>({type:"fr.title.item",text:t})),{type:"bi.icon_button",cls:"close-button",handler(){!function(){if(v)return v.closeWindow();console.log("关闭窗口")}()},invisible:!0,ref:e=>{this.CloseButton=e}}]}},mounted(){v&&v.isDesigner()&&this.CloseButton.setVisible(!0)}};BI.shortcut("fr.title",BI.inherit(BI.Widget,I));const k="dec.constant.database.conf.connect.list",B=["APACHE KYLIN","DERBY","HP Vertica","IBM DB2","INFORMIX","Microsoft SQL Server","MySQL","Oracle","Privotal Greenplum Database","Postgresql","GaussDB 200"];BI.constant(k,[]);var E=k;const w=[{text:"APACHE KYLIN",databaseType:"apache-kylin",driver:"org.apache.kylin.jdbc.Driver",url:"jdbc:kylin://:/"},{text:"DERBY",databaseType:"derby",driver:"org.apache.derby.jdbc.ClientDriver",url:"jdbc:derby://localhost:1527/"},{text:"HP Vertica",databaseType:"hp-vertica",driver:"com.vertica.jdbc.Driver",url:"jdbc:vertica://ip:port/databaseName"},{text:"IBM DB2",databaseType:"ibm-db2",driver:"com.ibm.db2.jcc.DB2Driver",url:"jdbc:db2://hostname:port/dbname"},{text:"INFORMIX",databaseType:"informix",driver:"com.informix.jdbc.IfxDriver",url:"jdbc:informix-sqli://{host}:{port}/{database}:INFORMIXSERVER={server}"},{text:"Microsoft SQL Server",databaseType:"sql-server",driver:"com.microsoft.sqlserver.jdbc.SQLServerDriver",url:"jdbc:sqlserver://localhost:1433;databaseName="},{text:"Oracle",databaseType:"oracle",driver:"oracle.jdbc.driver.OracleDriver",url:"jdbc:oracle:thin:@localhost:1521:databaseName"},{text:"Privotal Greenplum Database",databaseType:"pivotal-greenplum-database",driver:"org.postgresql.Driver",url:"jdbc:postgresql://hostname:port/dbname"},{text:"Postgresql",databaseType:"postgresql",driver:"org.postgresql.Driver",url:"jdbc:postgresql://hostname:port/dbname"},{text:"GaussDB 200",databaseType:"hw-libr-a",driver:"org.postgresql.Driver",url:"jdbc:postgresql://hostname:port/dbname"},{text:"MySQL",databaseType:"mysql",driver:"com.mysql.jdbc.Driver",drivers:["com.mysql.jdbc.Driver","org.gjt.mm.mysql.Driver"],url:"jdbc:mysql://localhost/dbname"},{text:"其他",databaseType:"other",driver:"org.h2.Driver",drivers:["org.h2.Driver","com.fr.third.org.hsqldb.jdbcDriver","org.sqlite.JDBC"],url:"jdbc:h2://${ENV_HOME}/../databaseName"},{text:"ADS",databaseType:"ads",driver:"com.mysql.jdbc.Driver",url:"jdbc:mysql://hostname:port/my_ads_db"},{text:"Amazon Redshift",databaseType:"amazon-redshift",driver:"com.amazon.redshift.jdbc4.Driver",drivers:["com.amazon.redshift.jdbc4.Driver","com.amazon.redshift.jdbc41.Driver"],url:"jdbc:redshift://endpoint:port/database"},{text:"APACHE IMPALA",databaseType:"apache-impala",driver:"com.cloudera.impala.jdbc41.Driver",url:"jdbc:impala://hostname:port/_impala_builtins"},{text:"APACHE KYLIN",databaseType:"apache-kylin",driver:"org.apache.kylin.jdbc.Driver",url:"jdbc:kylin://:/"},{text:"APACHE Phoenix",databaseType:"apache-phoenix",driver:"org.apache.phoenix.jdbc.PhoenixDriver",url:"jdbc:phoenix:hostname:port/dbname"},{text:"DERBY",databaseType:"derby",driver:"org.apache.derby.jdbc.ClientDriver",url:"jdbc:derby://localhost:1527/"},{text:"Gbase 8A",databaseType:"gbase-8a",driver:"com.gbase.jdbc.Driver",url:"jdbc:gbase://hostname:port/dbname"},{text:"Gbase 8S",databaseType:"gbase-8s",driver:"com.gbasedbt.jdbc.IfxDriver",url:"jdbc:gbasedbt-sqli://{host}:{port}/{database}"},{text:"Gbase 8T",databaseType:"gbase-8t",driver:"com.informix.jdbc.IfxDriver",url:"jdbc:informix-sqli://{host}:{port}/{database}:INFORMIXSERVER={server}"},{text:"H2",databaseType:"h2",driver:"org.h2.Driver",url:"jdbc:h2://${ENV_HOME}/../databaseName"},{text:"华为云DWS",databaseType:"hw-dws",driver:"org.postgresql.Driver",url:"jdbc:postgresql://hostname:port/dbname"},{text:"FusionInsight elk",databaseType:"hw-elk",driver:"org.postgresql.Driver",url:"jdbc:postgresql://hostname:port/dbname"},{text:"FusionInsight HD",databaseType:"hw-fusioninsight-hd",driver:"org.apache.hive.jdbc.HiveDriver",url:"jdbc:hive2://10.135.0.110:24002,10.135.0.67:24002,10.135.0.66:24002/;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2;sasl.qop=auth-conf;auth=KERBEROS;zk.principal=zookeeper/hadoop;principal=hive/hadoop.hadoop.com@HADOOP.COM;"},{text:"GaussDB 200",databaseType:"hw-libr-a",driver:"org.postgresql.Driver",url:"jdbc:postgresql://hostname:port/dbname"},{text:"Hadoop Hive",databaseType:"hadoop-hive",driver:"org.apache.hive.jdbc.HiveDriver",url:"jdbc:hive2://hostname:port/databasename"},{text:"Hbase",databaseType:"hbase",driver:"org.apache.phoenix.jdbc.PhoenixDriver",url:"jdbc:phoenix:hostname:port/dbname"},{text:"HP Vertica",databaseType:"hp-vertica",driver:"com.vertica.jdbc.Driver",url:"jdbc:vertica://ip:port/databaseName"},{text:"Hsql",databaseType:"hsql",driver:"com.fr.third.org.hsqldb.jdbcDriver",url:"jdbc:hsqldb:file:[PATH_TO_DB_FILES]"},{text:"IBM DB2",databaseType:"ibm-db2",driver:"com.ibm.db2.jcc.DB2Driver",url:"jdbc:db2://hostname:port/dbname"},{text:"INFORMIX",databaseType:"informix",driver:"com.informix.jdbc.IfxDriver",url:"jdbc:informix-sqli://{host}:{port}/{database}:INFORMIXSERVER={server}"},{text:"KINGBASE",databaseType:"kingbase",driver:"com.kingbase.Driver",url:"jdbc:kingbase://hostname:port"},{text:"Microsoft SQL Server",databaseType:"sql-server",driver:"com.microsoft.sqlserver.jdbc.SQLServerDriver",url:"jdbc:sqlserver://localhost:1433;databaseName="},{text:"MySQL",databaseType:"mysql",driver:"com.mysql.jdbc.Driver",drivers:["com.mysql.jdbc.Driver","org.gjt.mm.mysql.Driver"],url:"jdbc:mysql://localhost/dbname"},{text:"Oracle",databaseType:"oracle",driver:"oracle.jdbc.driver.OracleDriver",url:"jdbc:oracle:thin:@localhost:1521:databaseName"},{text:"Pivotal Greenplum Database",databaseType:"pivotal-greenplum-database",driver:"org.postgresql.Driver",url:"jdbc:postgresql://hostname:port/dbname"},{text:"Postgresql",databaseType:"postgresql",driver:"org.postgresql.Driver",url:"jdbc:postgresql://hostname:port/dbname"},{text:"Presto",databaseType:"presto",driver:"com.facebook.presto.jdbc.PrestoDriver",url:"jdbc:presto://host:port/catalog"},{text:"SAP HANA",databaseType:"sap-hana",driver:"com.sap.db.jdbc.Driver",url:"jdbc:sap://hostname:port?reconnect=true"},{text:"SAP Sybase",databaseType:"sap-sybase",driver:"com.sybase.jdbc4.jdbc.SybDriver",url:"jdbc:sybase:Tds:hostname:2638/databasename"},{text:"SPARK",databaseType:"spark",driver:"org.apache.hive.jdbc.HiveDriver",url:"jdbc:hive2://hostname:port/databasename"},{text:"Sqlite",databaseType:"sqlite",driver:"org.sqlite.JDBC",url:"jdbc:sqlite:[PATH_TO_DB_FILES]"},{text:"TeraData",databaseType:"teradata",driver:"com.ncr.teradata.TeraDriver",url:"jdbc:teradata://localhost/CLIENT_CHARSET=EUC_CN,TMODE=TERA,CHARSET=ASCII,LOB_SUPPORT"},{text:"TRANSWARP INCEPTOR",databaseType:"transwarp-inceptor",driver:"org.apache.hive.jdbc.HiveDriver",url:"jdbc:hive2://hostname:port/databasename"}],N=(e,t)=>{const i=BI.Constants.getConstant(E);let s=0;const o=t.replace(/[0-9]/g,""),r=BI.some(i,(e,t)=>t===o)?o:"数据连接";return e.forEach(e=>{if(e.isSelected=!1,e.connectionName.startsWith(r)){const t=e.connectionName.replace(r,"0"),i=parseInt(t,10)+1;i>s&&(s=i)}}),`${r}${s>0?s:""}`};var T=new class{confirm(e,t){const i=BI.UUID();return BI.Popovers.create(i,{type:"bi.bar_popover",size:"normal",header:"提示",width:450,height:220,body:{type:"bi.left",cls:"comfirm-content",items:[{type:"bi.layout",cls:"comfirm-icon",width:50,height:50},{type:"bi.label",text:e}]},listeners:[{eventName:"EVENT_CONFIRM",action(){t&&t(!0)}},{eventName:"EVENT_CANCEL",action(){t&&t(!1)}}]}).open(i),i}loading(e){const t={type:"bi.center_adapt",cls:"show-content",items:[{type:d,items:[{type:"bi.layout",cls:"loading-icon",width:100,height:100},{type:o,text:e}]}]};return this.show(t)}success(e){const t={type:"bi.center_adapt",cls:"show-content",items:[{type:d,items:[{type:"bi.layout",cls:"success-icon",width:100,height:100},{type:o,text:e}]}]};return this.show(t,1e3)}error(e){const t={type:"bi.center_adapt",cls:"show-content",items:[{type:d,items:[{type:"bi.layout",cls:"error-icon",width:100,height:100},{type:o,text:e}]}]};return this.show(t,2e3)}linkFail(e,t,i){let s=null,n=null;const l=BI.UUID(),a=this,p={type:d,items:[{type:"bi.center_adapt",cls:"show-content",tgap:10,items:[{type:d,items:[{type:c,cls:"error-icon",width:100,height:100},{type:o,text:e},{type:h,cls:"buttons",items:[{type:r,text:"详细信息",level:"ignore",handler(){const e="详细信息"===this.getText();s.element.css({height:e?"290":"220"}),n.setVisible(e),this.setText(e?"收起信息":"详细信息")}},{type:r,text:"返回",level:"ignore",handler(){a.close(l)}},{type:r,text:"重新连接",handler(){a.close(l),i&&i()}}]}]}]},{type:o,cls:"show-more",text:t,invisible:!0,ref(e){n=e}}]};return BI.Popovers.create(l,{type:"bi.popover",cls:"popover-notitle",extraCls:"bi-custom-show",size:"normal",width:450,height:220,body:p,ref(e){s=e}}).open(l),l}close(e){BI.Popovers.close(e)}show(e,t=0){const i=BI.UUID();return BI.Popovers.create(i,{type:"bi.popover",cls:"popover-notitle",extraCls:"bi-custom-show",size:"normal",width:450,height:220,body:e}).open(i),t>0&&setTimeout(()=>{this.close(i)},t),i}};function C(e){return e.connectionId?new Promise((t,i)=>{try{!function(e,t){console.log("%cdata: ","color: MidnightBlue; background: Aquamarine;",e),f?f.reqPost("/v10/config/connection",e,e=>{t(e.data)}):t("success")}(e,e=>{t(e)})}catch(e){i(e)}}):new Promise((t,i)=>{try{!function(e,t){console.log("%cdata: ","color: MidnightBlue; background: Aquamarine;",e),f?f.reqPut("/v10/config/connection",e,e=>{t(e.data)}):t("success")}(e,e=>{t(e)})}catch(e){i(e)}})}const S={context:["tab","linkList","linkSelected","linkUpdate","connectionNameErr"],actions:{setLinkSelected(e){this.noSaveConfirm(()=>{this._setLinkSelected(e)})},_setLinkSelected(e){this.model.linkList.forEach(t=>{t.isSelected=t.connectionName===e,t.connectionName===e&&(this.model.linkSelected=Object.assign({},t,{isSelected:!1}))}),this.model.linkList=[...this.model.linkList],this.model.linkUpdate=this.model.linkSelected},onIconClick(e,t){switch(e){case"删除":!function(e,t){console.log("%cid: ","color: MidnightBlue; background: Aquamarine;",e),f?f.reqDeleta(`/v10/config/connection/${e}`,e=>{t(e.data)}):t("success")}(t,()=>{this.model.linkList=[...this.model.linkList.filter(e=>e.connectionId!==t)],this.model.linkSelected={},this.model.linkUpdate={}});break;case"测试连接":this._textLink(t);break;case"复制":this.noSaveConfirm(()=>{this.copyLink(t)})}},_textLink(e){const t=T.loading("正在测试连接，请稍候..."),i=this.model.linkList.find(t=>t.connectionId===e);var s,o;s=i,o=(s=>{T.close(t),s&&s.errorCode?T.linkFail(`${i.connectionName}测试连接失败`,s.errorMsg,()=>{this._textLink(e)}):T.success("连接成功")}),console.log("%cdata: ","color: MidnightBlue; background: Aquamarine;",s),f?f.reqPost("/v10/config/connection/test",s,e=>{o(e)}):setTimeout(()=>{o({errorCode:"500",errorMsg:"createConnectionThread not start!"})},2e3)},copyLink(e){const t=BI.find(this.model.linkList,(t,i)=>i.connectionId===e).connectionName,i=N(this.model.linkList,t);let s={};this.model.linkList.forEach(t=>{t.connectionId===e&&(s=t)});const o=Object.assign({},s,{isSelected:!0,connectionName:i,connectionId:""});this.model.linkList=[o,...this.model.linkList],this.model.linkSelected=Object.assign({},o),this.model.linkUpdate=Object.assign({},o)},setLinkUpdate(e){this.model.linkUpdate=e},setEdit(e){this.model.linkSelected=Object.assign({},this.model.linkSelected,{isSelected:e}),this.model.linkUpdate=this.model.linkSelected},setCancel(){const e=this.model.linkSelected,t=this.model.linkList;e.connectionId?this.setEdit(!1):(this.model.linkList=[...t.filter(e=>!!e.connectionId)],this.model.linkList.length>0?(this.model.linkList[0].isSelected=!0,this.model.linkSelected=Object.assign({},this.model.linkList[0],{isSelected:!1})):this.model.linkSelected={},this.model.linkUpdate=this.model.linkSelected)},setNewLink(e){w.some(t=>t.text===e)||BI.Constants.getConstant(`dec.constant.database.conf.connect.form.${e.toLowerCase()}.edit`)?this.noSaveConfirm(()=>{this._setNewLink(e)}):T.error("找不到该连接的配置信息")},_setNewLink(e){const t=N(this.model.linkList,e);let i={};w.forEach(t=>{t.text===e&&(i=t)}),this.model.linkList=[Object.assign({connectionName:t,isSelected:!0},i,{text:e}),...this.model.linkList],this.model.linkSelected=Object.assign({},i,{connectionName:t,isSelected:!0,text:e}),this.model.linkUpdate=Object.assign({},i,{connectionName:t,text:e})},setConnectionNameErr(e){this.model.connectionNameErr=e},noSaveConfirm(e){this.model.linkSelected&&this.model.linkSelected.isSelected?T.confirm("当前设置尚未保存，是否保存？",t=>{t?this.saveLink():this.setCancel(),e()}):e()},saveLink(){const e=this.model.linkUpdate.text?BI.Constants.getConstant(`dec.constant.database.conf.connect.form.${this.model.linkUpdate.text.toLowerCase()}.value`):{};C(Object.assign({},this.model.linkUpdate,e)).then(()=>{this.setEdit(!1)})}}};BI.model("fr.model.linkset",BI.inherit(Fix.Model,S));var j="fr.model.linkset";const _={_store:()=>BI.Models.getModel(j),render(){const{cls:e,title:t,id:i}=this.options,o=this;let r=null,n=null;return"删除"===t?{type:"bi.bubble_combo",direction:"bottom",ref(){n=this},el:{type:s,cls:e,extraCls:"action-icon",height:24,width:26,title:t,ref(e){r=e}},popup:{type:"bi.text_bubble_bar_popup_view",text:"确定删除该数据连接？",listeners:[{eventName:BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON,action(e){n.hideView(),e&&o.store.onIconClick(t,i)}}]},listeners:[{eventName:BI.BubbleCombo.EVENT_EXPAND,action(){r.element.css({visibility:"visible"})}},{eventName:BI.BubbleCombo.EVENT_AFTER_HIDEVIEW,action(){r.element.css({visibility:"hidden"})}}]}:{type:s,cls:e,extraCls:"action-icon",height:24,width:26,title:t}},mounted(){const{title:e,id:t}=this.options;"删除"!==e?this.element.on("click",i=>{i.stopPropagation(),this.store.onIconClick(e,t)}):this.element.on("click",e=>{e.stopPropagation()})}};BI.shortcut("fr.component.linkSet.left.item.icon",BI.inherit(BI.Widget,_));const L={props:{title:"",id:"",creator:""},_store:()=>BI.Models.getModel(j),render(){const{title:e,extraCls:t,creator:i,text:r,id:n}=this.options;return{type:h,cls:"left-item",extraCls:t,items:[{type:s,cls:"link-font",height:24,width:26,text:"连接",title:e},{type:o,cls:"link-title",textAlign:"left",text:e,title:e},{type:h,cls:"icons",items:[{type:"fr.component.linkSet.left.item.icon",cls:"link-text-font",title:"测试连接",id:n},{type:"fr.component.linkSet.left.item.icon",cls:"copy-font",title:"复制",id:n},{type:"fr.component.linkSet.left.item.icon",cls:"info-font",title:`类型：${"DESIGNER"===r?"其他":r} \r\n创建者：${i}`,id:n},{type:"fr.component.linkSet.left.item.icon",cls:"delete-font",title:"删除",id:n}]}]}},mounted(){const{title:e}=this.options;this.element.on("click",()=>{this.store.setLinkSelected(e)})}};BI.shortcut("fr.component.linkSet.left.item",BI.inherit(BI.Widget,L));let D=null;const A={_store:()=>BI.Models.getModel(j),watch:{linkList(e){D.populate(BI.createItems((e=>{const t=[];return e.forEach(e=>{t.push({type:"fr.component.linkSet.left.item",extraCls:e.isSelected?"left-item-selected":"",title:e.connectionName,id:e.connectionId,creator:e.creator,text:e.text?e.text:"默认"})}),t})(e)))}},render:()=>({type:d,ref(e){D=e}})};BI.shortcut("fr.component.linkset.left",BI.inherit(BI.Widget,A));const M={render(){const{text:e,name:t,selected:i}=this.options;return{type:d,cls:"link-item",width:120,height:117,items:[{type:"bi.img",width:120,height:90,src:`./img/${t}.jpg`},{type:c,cls:"selected",invisible:!i,width:30,height:30},{type:o,cls:"text",text:e}]}},mounted(){const{text:e}=this.options;this.element.on("click",()=>{this.fireEvent("EVENT_SELECT",e)})}};BI.shortcut("fr.component.linkSet.morelink.item",BI.inherit(BI.Widget,M));let O=null;const U={render:()=>({type:l,cls:"more-link",items:[{el:{type:d,items:[{type:"bi.search_editor",width:300,watermark:"搜索"}]},height:30},{type:h,cls:"more-link-item",ref(e){O=e}}]}),mounted(){this._renderItems()},_renderItems(e=""){const t=w.slice(12,45),i=[],s=this;t.forEach(t=>{i.push({type:"fr.component.linkSet.morelink.item",text:t.text,name:t.databaseType,selected:e===t.text,listeners:[{eventName:"EVENT_SELECT",action(e){s._renderItems(e),s.fireEvent("EVENT_SELECT",e)}}]})}),O.populate(BI.createItems(i))}};BI.shortcut("fr.component.linkSet.morelink",BI.inherit(BI.Widget,U));let q=null,V="";const P={_store:()=>BI.Models.getModel(j),render(){let e=null;return{type:"bi.combo",cls:"select",trigger:"click",adjustYOffset:4,el:{type:"bi.button",text:"新建数据连接",height:24},popup:{el:{type:"bi.button_group",cls:"database-link-items",items:[...BI.map([...B,...BI.Constants.getConstant(E)],(e,t)=>({type:"bi.text_item",height:24,width:152,text:t,title:t,value:t})),{type:"bi.text_item",cls:"link-item",height:24,width:152,text:"更多数据连接...",title:"更多数据连接...",value:"more"},{type:"bi.text_item",cls:"link-item",height:24,width:152,text:"其他",title:"其他",value:"其他"}],layouts:[{type:d}]},maxHeight:400},listeners:[{eventName:"EVENT_CHANGE",action:t=>{"more"===t?(e=>{const t=BI.UUID();let i=null;BI.Popovers.create(t,{type:"bi.bar_popover",size:"normal",header:"更多数据连接",width:550,height:500,body:{type:"fr.component.linkSet.morelink",listeners:[{eventName:"EVENT_SELECT",action(e){V=e,q.setEnable(!0)}}]},footer:{type:"bi.right_vertical_adapt",lgap:10,items:[{type:"bi.button",text:"取消",value:1,level:"ignore",handler(e){i.close(e)}},{type:"bi.button",text:"确定",disabled:!0,value:0,ref(e){q=e},handler(t){i.close(t),e&&e(V)}}]},ref(e){i=e}}).open(t)})(e=>{this.store.setNewLink(e)}):this.store.setNewLink(t),e.hideView()}}],ref(){e=this}}}};BI.shortcut("fr.linkset.select",BI.inherit(BI.Widget,P));const H={render:()=>({type:"bi.center_adapt",items:[{type:d,width:260,height:180,items:[{type:c,cls:"data-connection-background",width:260,height:130},{type:o,cls:"bi-tips",height:20,text:"请选择左侧数据连接或点击新建数据连接"},{type:o,cls:"bi-tips",height:20,text:"平台仅支持使用JDBC的数据连接的管理"}]}]})};BI.shortcut("fr.component.right.nothing",BI.inherit(BI.Widget,H));const R={_store:()=>BI.Models.getModel(j),render(){const e=this.model.linkSelected,t=this.model.linkList,i=this,{isEdit:s}=this.options;return{type:h,height:40,cls:"right-title",items:[{type:o,cls:"right-title-text",text:`数据连接(${e.text?e.text:"默认"})`},{type:r,cls:"right-title-button",invisible:s,text:"编辑",handler(){i.store.setEdit(!0)}},{type:r,cls:"right-title-button",invisible:!s,text:"保存",handler(){BI.find(t,(e,t)=>i.model.linkUpdate.connectionName===t.connectionName&&t.connectionId!==i.model.linkUpdate.connectionId)?i.store.setConnectionNameErr("数据连接名已存在"):i.store.saveLink()}},{type:r,cls:"right-title-button",invisible:!s,level:"ignore",text:"取消",handler(){i.store.setCancel()}}]}}};BI.shortcut("fr.component.right.title",BI.inherit(BI.Widget,R));const G="fr.shared.component.both.side",W={render(){const{leftText:e,rightText:t}=this.options;return{type:a,cls:"both-side",height:24,items:[{el:{type:o,cls:"left",textAlign:"left",text:e},width:115},{type:o,textAlign:"left",text:t}]}}};BI.shortcut(G,BI.inherit(BI.Widget,W));var F=G;const $={render(){const{text:e}=this.options;return{type:o,cls:"shared-component-title",textAlign:"left",text:e}}};BI.shortcut("fr.shared.component.title",BI.inherit(BI.Widget,$));const Q={_store:()=>BI.Models.getModel(j),render(){const e=this.model.linkSelected;return{type:d,cls:"right-show",items:[{type:F,leftText:"数据连接名",rightText:e.connectionName},{type:F,leftText:"驱动器",rightText:e.driver},{type:F,leftText:"URL",rightText:e.url},{type:F,leftText:"编码",rightText:""===e.originalCharsetName?"自动":e.originalCharsetName},{type:F,leftText:"用户名",rightText:e.user},{type:F,leftText:"密码",rightText:e.password},{type:"fr.shared.component.title",text:"连接池属性"},{type:F,leftText:"SQL验证查询",rightText:e.validationQuery},{type:F,leftText:"获取连接前校验",rightText:e.testOnBorrow?"是":"否"},{type:F,leftText:"最大连接数量",rightText:e.maxActive}]}}};BI.shortcut("fr.component.right.show",BI.inherit(BI.Widget,Q));BI.constant("bi.constant.database.conf.charset.list",[{text:"自动",value:""},{text:"GBK",value:"GBK"},{text:"BIG5",value:"BIG5"},{text:"ISO-8859-1",value:"ISO-8859-1"},{text:"UTF-8",value:"UTF-8"},{text:"UTF-16",value:"UTF-16"},{text:"EUC_JP",value:"EUC_JP"},{text:"EUC_KR",value:"EUC_KR"},{text:"CP850",value:"CP850"}]);const z={render(){const{text:e,form:t,hint:i,height:s}=this.options;return{type:a,cls:"both-side",height:s||24,items:[{el:{type:o,cls:"left",textAlign:"left",text:e},width:115},t,{type:o,cls:"hint",textAlign:"left",text:i}]}}};BI.shortcut("fr.shared.component.form.item",BI.inherit(BI.Widget,z));var K="fr.shared.component.form.item";function X(e){const t=[];return e.drivers&&e.drivers.length>0?e.drivers.forEach(e=>{t.push({text:e,value:e})}):t.push({text:e.driver,value:e.driver}),t}let Y=null;const J={_store:()=>BI.Models.getModel(j),watch:{connectionNameErr(e){e?BI.Bubbles.show("singleBubble",e,Y,{level:"error"}):BI.Bubbles.hide("singleBubble")}},render(){const e=this.model.linkSelected,t=this;return{type:d,cls:"right-show",items:[{type:K,text:"数据连接名",hint:"*修改数据连接名会影响相关数据表和仪表板",form:{type:n,cls:"bi-border",width:300,value:e.connectionName,ref(e){Y=e},listeners:[{eventName:BI.Editor.EVENT_CHANGE,action(){t.store.setLinkUpdate(Object.assign({},t.model.linkUpdate,{connectionName:this.getValue()}))}},{eventName:BI.Editor.EVENT_FOCUS,action(){t.store.setConnectionNameErr("")}}]}},{type:K,text:"第一步",height:400,form:{type:d,cls:"right-form",items:[{type:K,text:"驱动器",form:{type:"bi.text_value_combo",cls:"bi-border",width:300,text:e.driver,items:X(e),listeners:[{eventName:BI.TextValueCombo.EVENT_CHANGE,action(){t.store.setLinkUpdate(Object.assign({},t.model.linkUpdate,{driver:this.getValue()[0]}))}}]}},{type:K,text:"URL",form:{type:n,cls:"bi-border",watermark:"请输入",width:300,value:e.url,listeners:[{eventName:BI.Editor.EVENT_CHANGE,action(){t.store.setLinkUpdate(Object.assign({},t.model.linkUpdate,{url:this.getValue()}))}}]}},{type:K,text:"编码",form:{type:"bi.text_value_combo",cls:"bi-border",width:300,text:""===e.originalCharsetName?"自动":e.originalCharsetName,items:BI.Constants.getConstant("bi.constant.database.conf.charset.list"),listeners:[{eventName:BI.TextValueCombo.EVENT_CHANGE,action(){t.store.setLinkUpdate(Object.assign({},t.model.linkUpdate,{originalCharsetName:this.getValue()[0]}))}}]}},{type:K,text:"用户名",form:{type:n,cls:"bi-border",allowBlank:!0,watermark:"请输入",width:300,value:e.user,listeners:[{eventName:BI.Editor.EVENT_CHANGE,action(){t.store.setLinkUpdate(Object.assign({},t.model.linkUpdate,{user:this.getValue()}))}}]}},{type:K,text:"密码",form:{type:n,cls:"bi-border",inputType:"password",allowBlank:!0,watermark:"请输入",width:300,value:e.password,listeners:[{eventName:BI.Editor.EVENT_CHANGE,action(){t.store.setLinkUpdate(Object.assign({},t.model.linkUpdate,{password:this.getValue()}))}}]}},{type:"fr.shared.component.title",text:"连接池属性"},{type:K,text:"SQL验证查询",height:100,form:{type:"bi.textarea_editor",cls:"bi-border",allowBlank:!0,watermark:"请输入",width:300,height:100,value:e.validationQuery,listeners:[{eventName:BI.Editor.EVENT_CHANGE,action(){t.store.setLinkUpdate(Object.assign({},t.model.linkUpdate,{validationQuery:this.getValue()}))}}]}},{type:K,text:"获取连接前校验",form:{type:"bi.multi_select_item",text:"是",selected:e.testOnBorrow,width:60,listeners:[{eventName:BI.Editor.EVENT_CHANGE,action(){t.store.setLinkUpdate(Object.assign({},t.model.linkUpdate,{testOnBorrow:this.isSelected()}))}}]}},{type:K,text:"最大活动连接数",form:{type:n,cls:"bi-border",allowBlank:!0,watermark:"请输入",width:60,value:e.maxActive,errorText:"请输入有效的正整数",validationChecker:e=>!!/^\+?[1-9][0-9]*$/.test(e),listeners:[{eventName:BI.Editor.EVENT_CHANGE,action(){t.store.setLinkUpdate(Object.assign({},t.model.linkUpdate,{maxActive:this.getValue()}))}}]}}]}},{type:K,text:"第二步",form:{type:r,text:"测试连接",level:"ignore"}},{type:K,text:"第三步",form:{type:K,text:"模式",form:{type:n,cls:"bi-border",width:300,disabled:!0}}}]}}};BI.shortcut("fr.component.right.edit",BI.inherit(BI.Widget,J));const Z={_store:()=>BI.Models.getModel(j),render(){const e=this.model.linkSelected,t=this;return{type:d,cls:"right-show",items:[{type:K,text:"数据连接名",hint:"*修改数据连接名会影响相关数据表和仪表板",form:{type:n,cls:"bi-border",width:300,value:e.connectionName,listeners:[{eventName:BI.Editor.EVENT_CHANGE,action(){t.store.setLinkUpdate(Object.assign({},t.model.linkUpdate,{connectionName:this.getValue()}))}}]}},{type:K,text:"驱动器",form:{type:"bi.text_value_combo",cls:"bi-border",width:300,text:e.driver,items:X(e),listeners:[{eventName:BI.TextValueCombo.EVENT_CHANGE,action(){t.store.setLinkUpdate(Object.assign({},t.model.linkUpdate,{driver:this.getValue()[0]}))}}]}},{type:K,text:"URL",form:{type:n,cls:"bi-border",watermark:"请输入",width:300,value:e.url,listeners:[{eventName:BI.Editor.EVENT_CHANGE,action(){t.store.setLinkUpdate(Object.assign({},t.model.linkUpdate,{url:this.getValue()}))}}]}},{type:K,text:"编码",form:{type:"bi.text_value_combo",cls:"bi-border",width:300,text:""===e.originalCharsetName?"自动":e.originalCharsetName,items:BI.Constants.getConstant("bi.constant.database.conf.charset.list"),listeners:[{eventName:BI.TextValueCombo.EVENT_CHANGE,action(){t.store.setLinkUpdate(Object.assign({},t.model.linkUpdate,{originalCharsetName:this.getValue()[0]}))}}]}},{type:K,text:"用户名",form:{type:n,cls:"bi-border",allowBlank:!0,watermark:"请输入",width:300,value:e.user,listeners:[{eventName:BI.Editor.EVENT_CHANGE,action(){t.store.setLinkUpdate(Object.assign({},t.model.linkUpdate,{user:this.getValue()}))}}]}},{type:K,text:"密码",form:{type:n,cls:"bi-border",inputType:"password",allowBlank:!0,watermark:"请输入",width:300,value:e.password,listeners:[{eventName:BI.Editor.EVENT_CHANGE,action(){t.store.setLinkUpdate(Object.assign({},t.model.linkUpdate,{password:this.getValue()}))}}]}},{type:"fr.shared.component.title",text:"连接池属性"},{type:K,text:"SQL验证查询",height:100,form:{type:"bi.textarea_editor",cls:"bi-border",allowBlank:!0,watermark:"请输入",width:300,height:100,value:e.validationQuery,listeners:[{eventName:BI.Editor.EVENT_CHANGE,action(){t.store.setLinkUpdate(Object.assign({},t.model.linkUpdate,{validationQuery:this.getValue()}))}}]}},{type:K,text:"获取连接前校验",form:{type:"bi.multi_select_item",text:"是",selected:e.testOnBorrow,width:60,listeners:[{eventName:BI.Editor.EVENT_CHANGE,action(){t.store.setLinkUpdate(Object.assign({},t.model.linkUpdate,{testOnBorrow:this.isSelected()}))}}]}},{type:K,text:"最大活动连接数",form:{type:n,cls:"bi-border",allowBlank:!0,watermark:"请输入",width:60,value:e.maxActive,errorText:"请输入有效的正整数",validationChecker:e=>!!/^\+?[1-9][0-9]*$/.test(e),listeners:[{eventName:BI.Editor.EVENT_CHANGE,action(){t.store.setLinkUpdate(Object.assign({},t.model.linkUpdate,{maxActive:this.getValue()}))}}]}},{type:K,text:"测试连接",form:{type:r,text:"测试连接",level:"ignore"}}]}}};BI.shortcut("fr.component.right.edit.mysql",BI.inherit(BI.Widget,Z));let ee=null;const te=e=>{const t=BI.Constants.getConstant(E),i=BI.some(t,(t,i)=>i===e.text);let s="mysql"===e.databaseType?"fr.component.right.edit.mysql":"fr.component.right.edit";i&&(s=BI.Constants.getConstant(`dec.constant.database.conf.connect.form.${e.text.toLowerCase()}.edit`));const o=i?BI.Constants.getConstant(`dec.constant.database.conf.connect.form.${e.text.toLowerCase()}.preview`):"fr.component.right.show";ee.populate(BI.createItems([{type:"fr.component.right.title",isEdit:e.isSelected,linkSelected:e},{type:e.isSelected?s:o,linkSelected:e}]))},ie={_store:()=>BI.Models.getModel(j),watch:{linkSelected(e){te(e)}},render:()=>({type:d,cls:"right-content",ref(e){ee=e}}),mounted(){const e=this.model.linkSelected;te(e)}};BI.shortcut("fr.component.right.detail",BI.inherit(BI.Widget,ie));let se=null;const oe={_store:()=>BI.Models.getModel(j),watch:{linkSelected(e){se.populate(BI.createItems([{type:e&&e.connectionName?"fr.component.right.detail":"fr.component.right.nothing"}]))}},render:()=>({type:d,cls:"database-right",ref(e){se=e}}),mounted(){se.populate(BI.createItems([{type:"fr.component.right.nothing"}]))}};BI.shortcut("fr.component.right",BI.inherit(BI.Widget,oe));const re={_store:()=>BI.Models.getModel(j),watch:{tab(e){this.setVisible("数据连接管理"===e)}},render:()=>({type:a,cls:"linkset",items:[{el:{type:l,cls:"database-left",items:[{el:{type:h,cls:"select-group",items:[{type:"fr.linkset.select"}]},height:40},{type:"fr.component.linkset.left",cls:"left-list"}]},width:280},{type:"fr.component.right"}]})};BI.shortcut("fr.linkset",BI.inherit(BI.Widget,re));BI.model("fr.model.linkstatus",BI.inherit(Fix.Model,{context:["tab","linkList"],actions:{}}));const ne={context:["tab","linkList","statusSelected"],state:()=>({selected:""}),actions:{setStatusSelected(e){this.model.statusSelected=e}}};BI.model("fr.model.linkstatus.left",BI.inherit(Fix.Model,ne));const le={props:{title:"",id:"",creator:""},_store:()=>BI.Models.getModel("fr.model.linkstatus.left"),render(){const{title:e,extraCls:t,creator:i,text:s,id:r}=this.options;return{type:h,cls:"left-item",extraCls:t,items:[{type:o,cls:"link-title",textAlign:"left",text:e,title:e}]}},mounted(){const{title:e}=this.options;this.element.on("click",()=>{this.store.setStatusSelected(e)})}};BI.shortcut("fr.component.linkStatus.left.item",BI.inherit(BI.Widget,le));let ae=null;const ce={_store:()=>BI.Models.getModel("fr.model.linkstatus.left"),watch:{linkList(e){const t=e.length>0?e[0].connectionName:"";this.store.setStatusSelected(t)},statusSelected(e){const t=this.model.linkList;ae.populate(BI.createItems(((e,t="")=>{const i=[];return e.forEach(e=>{i.push({type:"fr.component.linkStatus.left.item",extraCls:e.connectionName===t?"left-item-selected":"",title:e.connectionName,id:e.connectionId,creator:e.creator,text:e.text?e.text:"默认"})}),i})(t,e)))}},render:()=>({type:d,ref(e){ae=e}})};BI.shortcut("fr.component.linkStatus.left",BI.inherit(BI.Widget,ce));const de={context:["linkList","statusSelected"],state:()=>({selected:""}),actions:{}};BI.model("fr.model.linkstatus.right",BI.inherit(Fix.Model,de));const he={render(){const{maxActive:e,maxIdle:t,numActive:i,numIdle:s}=this.options;return{type:h,items:[{type:h,cls:"right-status-item",items:[{type:d,cls:"right-status-board",items:[{type:d,cls:"right-status-board-item",items:[{type:o,cls:"right-status-text",extraCls:"card-font1",text:i},{type:o,cls:"right-status-text",text:"/"},{type:o,cls:"right-status-text",text:e}]},{type:o,height:20,text:"活动连接数"}]}]},{type:h,cls:"right-status-right",items:[{type:d,cls:"right-status-board",items:[{type:d,cls:"right-status-board-item",items:[{type:o,cls:"right-status-text",extraCls:"card-font2",text:s},{type:o,cls:"right-status-text",text:"/"},{type:o,cls:"right-status-text",text:t}]},{type:o,height:20,text:"空闲连接数"}]}]}]}}};BI.shortcut("fr.component.linkStatus.right.card",BI.inherit(BI.Widget,he));let pe=null,me=null;const be={_store:()=>BI.Models.getModel("fr.model.linkstatus.right"),watch:{statusSelected(e){const t=BI.find(this.model.linkList,(t,i)=>i.connectionName===e),i=BI.Constants.getConstant(E),s=t.text&&BI.some(i,(e,i)=>i===t.text)?BI.Constants.getConstant(`dec.constant.database.conf.connect.form.${t.text.toLowerCase()}.pool`):"fr.component.linkStatus.right.card";!function(e,t){console.log("%cname: ","color: MidnightBlue; background: Aquamarine;",e),f?f.reqDeleta(`/v10/config/connection/pool/info?connectionName=${e}`,e=>{t(e.data)}):t({maxActive:50,maxIdle:10,numActive:0,numIdle:0})}(name,e=>{me.populate(BI.createItems([Object.assign({type:s},e)]))}),pe.setText(`数据连接(${e})`)}},render:()=>({type:d,cls:"database-right",items:[{type:h,height:40,cls:"right-status-title",items:[{type:o,text:"数据连接"}],ref(e){pe=e}},{type:d,cls:"right-status-body",ref(e){me=e}}]}),mounted(){}};BI.shortcut("fr.component.linkStatus.right",BI.inherit(BI.Widget,be));const ue={_store:()=>BI.Models.getModel("fr.model.linkstatus"),watch:{tab(e){this.setVisible("连接池状态"===e)}},render:()=>({type:a,cls:"linkStatus",items:[{el:{type:l,cls:"database-left",items:[{el:{type:h,cls:"select-group",items:[{type:o,cls:"status-title",text:"数据连接"}]},height:40},{type:"fr.component.linkStatus.left",cls:"left-list"}]},width:280},{type:"fr.component.linkStatus.right"}]}),mounted(){this.setVisible(!1)}};BI.shortcut("fr.linkstatus",BI.inherit(BI.Widget,ue));i(1);const ge={url:"192.168.1.22",port:6379,password:"123456"},ye=BI.inherit(BI.Widget,{render:()=>({type:"bi.vertical",cls:"bi-plugin-redis",bgap:10,items:[{type:"bi.left",height:30,items:[{type:"bi.label",text:"数据库地址：",height:24,width:115,textAlign:"left"},{type:"bi.editor",cls:"bi-border",watermark:"数据库地址",value:ge.url,allowBlank:!0,width:300,height:24}]},{type:"bi.left",height:30,items:[{type:"bi.label",text:"端口：",height:24,width:115,textAlign:"left"},{type:"bi.editor",cls:"bi-border",watermark:"端口",allowBlank:!0,width:300,height:24,value:ge.port,errorText:"请输入有效的正整数",validationChecker:e=>!!/^\+?[1-9][0-9]*$/.test(e)}]},{type:"bi.left",height:30,items:[{type:"bi.label",text:"密码：",height:24,width:115,textAlign:"left"},{type:"bi.editor",cls:"bi-border",inputType:"password",value:ge.password,allowBlank:!0,width:300,height:24}]}]})});BI.shortcut("fr.plugin.redis.edit",ye);BI.config("dec.constant.database.conf.connect.list",e=>[...e,"Redis"]),BI.constant("dec.constant.database.conf.connect.form.redis.value",ge),BI.constant("dec.constant.database.conf.connect.form.redis.edit","fr.plugin.redis.edit");i(2),i(3),i(4);const fe=BI.inherit(BI.Widget,{_store:()=>BI.Models.getModel("fr.model.main"),render:()=>({type:l,cls:"database-connection-layout",items:[{el:{type:"fr.title"},height:40},{type:"fr.linkset"},{type:"fr.linkstatus"}]}),mounted(){var e;e=(e=>{this.store.setLinkList(e)}),f?f.reqGet("/v10/config/connection/list","getInstalledPlugins",t=>{e(t.data)}):e(y.data)}});BI.shortcut("fr.main",fe);t.default="fr.main"}]);
+//# sourceMappingURL=index.js.map
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/dcm/style.css b/designer-base/src/main/resources/com/fr/design/dcm/style.css
new file mode 100644
index 0000000000..5208edfa3b
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/dcm/style.css
@@ -0,0 +1,276 @@
+.bi-plugin-redis {
+ padding: 20px; }
+
+.database-connection-layout {
+ width: 100%;
+ height: 100%;
+ background-color: #f7f8fa; }
+ .database-connection-layout .title {
+ background-color: #fff;
+ border-bottom: 1px solid #e8eaed; }
+ .database-connection-layout .title .title-item {
+ height: 39px;
+ line-height: 39px;
+ padding-left: 15px;
+ padding-right: 15px;
+ text-align: center;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ position: relative;
+ flex-shrink: 0;
+ font-weight: 700;
+ cursor: pointer; }
+ .database-connection-layout .title .close-button {
+ position: absolute !important;
+ right: 5px;
+ top: 5px;
+ width: 30px;
+ height: 30px;
+ cursor: pointer;
+ background-image: url(./img/icon_close9x9_normal.png);
+ background-repeat: no-repeat;
+ background-position: center; }
+ .database-connection-layout .linkset {
+ margin: 10px;
+ bottom: 0px;
+ background-color: #ffffff; }
+ .database-connection-layout .linkStatus {
+ margin: 10px;
+ top: 40px;
+ background-color: #ffffff; }
+
+.database-left {
+ border-right: 1px solid #e8eaed; }
+ .database-left .select-group {
+ border-bottom: 1px solid #e8eaed; }
+ .database-left .select-group .select {
+ margin: 10px; }
+ .database-left .select-group .select .database-link-items {
+ padding-left: 10px; }
+ .database-left .select-group .select .database-link-items .link-item {
+ border-top: 1px solid #e8eaed; }
+ .database-left .select-group .status-title {
+ font-weight: 700;
+ margin-left: 12px;
+ margin-top: 12px; }
+ .database-left .left-list {
+ margin: 10px; }
+ .database-left .left-list .left-item {
+ height: 24px;
+ line-height: 24px;
+ cursor: pointer; }
+ .database-left .left-list .left-item:hover {
+ background-color: rgba(54, 133, 242, 0.05); }
+ .database-left .left-list .left-item:hover .icons .action-icon {
+ visibility: visible !important; }
+ .database-left .left-list .left-item .icons {
+ float: right !important; }
+ .database-left .left-list .left-item .icons .action-icon {
+ visibility: hidden; }
+ .database-left .left-list .left-item .icons .b-font {
+ font-size: 16px; }
+ .database-left .left-list .left-item-selected {
+ background-color: rgba(54, 133, 242, 0.05); }
+ .database-left .left-list .left-item-selected .link-title {
+ color: #3685f2; }
+
+.database-right {
+ min-width: 400px;
+ overflow: auto; }
+ .database-right .bi-flex-center-adapt-layout {
+ height: 100%; }
+ .database-right .bi-flex-center-adapt-layout .data-connection-background {
+ background: url(./img/resources.png) center center no-repeat;
+ background-size: contain; }
+ .database-right .right-status-title {
+ border-bottom: 1px solid #e8eaed;
+ color: #3d4d66;
+ line-height: 40px;
+ padding-left: 10px;
+ font-weight: 700; }
+ .database-right .right-status-body {
+ margin: 10px 30px 0px 30px;
+ height: 50%; }
+ .database-right .right-status-body .right-status-item {
+ height: 150px;
+ width: 50%;
+ top: 0;
+ left: 0;
+ position: absolute !important; }
+ .database-right .right-status-body .right-status-item .right-status-board {
+ margin-left: 25px;
+ position: relative !important;
+ left: -25px; }
+ .database-right .right-status-body .right-status-right {
+ height: 150px;
+ width: 50%;
+ top: 0;
+ right: 0;
+ position: absolute !important; }
+ .database-right .right-status-body .right-status-right .right-status-board {
+ margin-right: 25px;
+ position: relative !important;
+ left: 25px; }
+ .database-right .right-status-body .right-status-board {
+ background-color: #f7f8fa;
+ color: #3d4d66;
+ width: 100%;
+ height: 100%; }
+ .database-right .right-status-body .right-status-board .right-status-board-item {
+ text-align: center;
+ margin-top: 38px; }
+ .database-right .right-status-body .right-status-board .right-status-board-item .right-status-text {
+ display: inline-block; }
+ .database-right .right-status-body .right-status-board .right-status-board-item .card-font1 {
+ color: #13CD66;
+ font-size: 32px; }
+ .database-right .right-status-body .right-status-board .right-status-board-item .card-font2 {
+ color: #3685F2;
+ font-size: 32px; }
+ .database-right .right-content {
+ height: 100%; }
+ .database-right .right-content .right-title {
+ border-bottom: 1px solid #e8eaed;
+ color: #3d4d66;
+ line-height: 40px;
+ padding-left: 10px; }
+ .database-right .right-content .right-title .right-title-text {
+ font-weight: 700; }
+ .database-right .right-content .right-title .right-title-button {
+ float: right !important;
+ margin-right: 10px;
+ margin-top: 8px; }
+ .database-right .right-content .right-show {
+ margin: 10px; }
+ .database-right .right-content .right-show .right-form {
+ width: 100%; }
+
+.both-side {
+ line-height: 24px;
+ margin-bottom: 10px; }
+ .both-side .left {
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ position: relative;
+ flex-shrink: 0;
+ font-weight: 700; }
+ .both-side .hint {
+ padding-left: 5px;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ position: relative;
+ flex-shrink: 0;
+ margin-left: 5px;
+ color: #9ea6b2; }
+
+.shared-component-title {
+ height: 24px;
+ line-height: 24px;
+ margin-bottom: 10px;
+ color: #9ea6b2;
+ border-bottom: 1px solid #e8eaed; }
+
+.comfirm-content {
+ margin-top: 40px;
+ margin-left: 20px; }
+ .comfirm-content .comfirm-icon {
+ background-image: url(./img/warning.png);
+ background-size: contain;
+ margin-right: 12px; }
+ .comfirm-content .bi-text {
+ height: 50px;
+ line-height: 50px;
+ margin-left: 12px; }
+
+.more-link .more-link-item {
+ width: 538px;
+ overflow: hidden auto;
+ left: -10px !important;
+ right: 0px;
+ top: 10px;
+ bottom: 0px;
+ position: absolute;
+ height: 380px; }
+ .more-link .more-link-item .link-item {
+ margin-left: 10px;
+ margin-bottom: 10px;
+ cursor: pointer;
+ border: solid 1px #fff; }
+ .more-link .more-link-item .link-item:hover {
+ border: solid 1px #3480f2; }
+ .more-link .more-link-item .link-item .selected {
+ position: absolute !important;
+ right: -1px;
+ top: -1px;
+ height: 30px;
+ width: 30px;
+ background: url(./img/database-selected.png) center center no-repeat;
+ background-size: contain; }
+ .more-link .more-link-item .link-item .text {
+ height: 27px;
+ line-height: 27px;
+ padding-left: 2px;
+ padding-right: 2px;
+ text-align: center;
+ white-space: nowrap;
+ background: #F0F3F7; }
+
+.popover-notitle .bi-header-background {
+ display: none; }
+
+.popover-notitle .bi-absolute-layout {
+ top: 0px !important; }
+
+.bi-custom-show .show-content {
+ text-align: center; }
+ .bi-custom-show .show-content .loading-icon {
+ display: block;
+ background: url(./img/loading.gif) center center no-repeat;
+ background-size: contain;
+ margin: 0 auto;
+ margin-bottom: 18px; }
+ .bi-custom-show .show-content .success-icon {
+ display: block;
+ background: url(./img/success.png) center center no-repeat;
+ background-size: contain;
+ margin: 0 auto;
+ margin-bottom: 18px; }
+ .bi-custom-show .show-content .error-icon {
+ display: block;
+ background: url(./img/error.png) center center no-repeat;
+ background-size: contain;
+ margin: 0 auto;
+ margin-bottom: 18px; }
+ .bi-custom-show .show-content .buttons {
+ margin-top: 18px; }
+ .bi-custom-show .show-content .buttons div {
+ margin: 0 4px; }
+
+.bi-custom-show .show-more {
+ text-align: left !important;
+ height: 73px;
+ background: #F2F4F7;
+ margin-bottom: 10px;
+ padding: 5px;
+ margin-top: 10px; }
+
+.link-font .b-font:before {
+ content: "\e759";
+ color: inherit; }
+
+.link-text-font .b-font:before {
+ content: "\e763";
+ color: inherit; }
+
+.info-font .b-font:before {
+ content: "\e63c";
+ color: inherit; }
+
+.delete-font .b-font:before {
+ content: "\e6c4";
+ color: inherit; }
+
+
+/*# sourceMappingURL=style.css.map*/
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/facebook.png b/designer-base/src/main/resources/com/fr/design/images/bbs/facebook.png
new file mode 100644
index 0000000000..9e5dc8af2c
Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/bbs/facebook.png differ
diff --git a/designer-base/src/main/resources/com/fr/design/images/vcs/icon_back_normal@2x.png b/designer-base/src/main/resources/com/fr/design/images/vcs/icon_back_normal@2x.png
new file mode 100644
index 0000000000..bb3fd50cdc
Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/vcs/icon_back_normal@2x.png differ
diff --git a/designer-base/src/main/resources/com/fr/design/images/vcs/icon_delete.png b/designer-base/src/main/resources/com/fr/design/images/vcs/icon_delete.png
new file mode 100755
index 0000000000..6fb2baac51
Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/vcs/icon_delete.png differ
diff --git a/designer-base/src/main/resources/com/fr/design/images/vcs/icon_delete@2x.png b/designer-base/src/main/resources/com/fr/design/images/vcs/icon_delete@2x.png
new file mode 100755
index 0000000000..b98c9f4cd2
Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/vcs/icon_delete@2x.png differ
diff --git a/designer-base/src/main/resources/com/fr/design/images/vcs/icon_edit.png b/designer-base/src/main/resources/com/fr/design/images/vcs/icon_edit.png
new file mode 100755
index 0000000000..7206039bf6
Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/vcs/icon_edit.png differ
diff --git a/designer-base/src/main/resources/com/fr/design/images/vcs/icon_edit@2x.png b/designer-base/src/main/resources/com/fr/design/images/vcs/icon_edit@2x.png
new file mode 100755
index 0000000000..5993e43897
Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/vcs/icon_edit@2x.png differ
diff --git a/designer-base/src/main/resources/com/fr/design/images/vcs/icon_filter@1x.png b/designer-base/src/main/resources/com/fr/design/images/vcs/icon_filter@1x.png
new file mode 100755
index 0000000000..7a8ec6287b
Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/vcs/icon_filter@1x.png differ
diff --git a/designer-base/src/main/resources/com/fr/design/images/vcs/icon_filter@2x.png b/designer-base/src/main/resources/com/fr/design/images/vcs/icon_filter@2x.png
new file mode 100755
index 0000000000..9b3a132a77
Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/vcs/icon_filter@2x.png differ
diff --git a/designer-base/src/main/resources/com/fr/design/images/vcs/icon_list_disabled.png b/designer-base/src/main/resources/com/fr/design/images/vcs/icon_list_disabled.png
new file mode 100644
index 0000000000..5325682ff8
Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/vcs/icon_list_disabled.png differ
diff --git a/designer-base/src/main/resources/com/fr/design/images/vcs/icon_list_disabled@2x.png b/designer-base/src/main/resources/com/fr/design/images/vcs/icon_list_disabled@2x.png
new file mode 100644
index 0000000000..619551cc86
Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/vcs/icon_list_disabled@2x.png differ
diff --git a/designer-base/src/main/resources/com/fr/design/images/vcs/icon_list_normal@2x.png b/designer-base/src/main/resources/com/fr/design/images/vcs/icon_list_normal@2x.png
new file mode 100644
index 0000000000..a400bffeca
Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/vcs/icon_list_normal@2x.png differ
diff --git a/designer-base/src/main/resources/com/fr/design/images/vcs/icon_revert.png b/designer-base/src/main/resources/com/fr/design/images/vcs/icon_revert.png
new file mode 100755
index 0000000000..993ba3c21b
Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/vcs/icon_revert.png differ
diff --git a/designer-base/src/main/resources/com/fr/design/images/vcs/icon_revert@2x.png b/designer-base/src/main/resources/com/fr/design/images/vcs/icon_revert@2x.png
new file mode 100755
index 0000000000..5f26df54c0
Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/vcs/icon_revert@2x.png differ
diff --git a/designer-base/src/main/resources/com/fr/design/images/vcs/icon_save_disabled.png b/designer-base/src/main/resources/com/fr/design/images/vcs/icon_save_disabled.png
new file mode 100644
index 0000000000..3e164a0ebf
Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/vcs/icon_save_disabled.png differ
diff --git a/designer-base/src/main/resources/com/fr/design/images/vcs/icon_save_disabled@2x.png b/designer-base/src/main/resources/com/fr/design/images/vcs/icon_save_disabled@2x.png
new file mode 100644
index 0000000000..70db7bcc49
Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/vcs/icon_save_disabled@2x.png differ
diff --git a/designer-base/src/main/resources/com/fr/design/images/vcs/icon_save_normal@2x.png b/designer-base/src/main/resources/com/fr/design/images/vcs/icon_save_normal@2x.png
new file mode 100644
index 0000000000..34e94cb270
Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/vcs/icon_save_normal@2x.png differ
diff --git a/designer-base/src/main/resources/com/fr/design/images/vcs/icon_user@1x.png b/designer-base/src/main/resources/com/fr/design/images/vcs/icon_user@1x.png
new file mode 100755
index 0000000000..7af8db5727
Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/vcs/icon_user@1x.png differ
diff --git a/designer-base/src/main/resources/com/fr/design/images/vcs/icon_user@2x.png b/designer-base/src/main/resources/com/fr/design/images/vcs/icon_user@2x.png
new file mode 100755
index 0000000000..872351544a
Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/vcs/icon_user@2x.png differ
diff --git a/designer-base/src/main/resources/com/fr/design/images/vcs/vcs_back.png b/designer-base/src/main/resources/com/fr/design/images/vcs/vcs_back.png
new file mode 100644
index 0000000000..6b3a61b894
Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/vcs/vcs_back.png differ
diff --git a/designer-base/src/main/resources/com/fr/design/images/vcs/vcs_list.png b/designer-base/src/main/resources/com/fr/design/images/vcs/vcs_list.png
new file mode 100644
index 0000000000..df6cd02de6
Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/vcs/vcs_list.png differ
diff --git a/designer-base/src/main/resources/com/fr/design/images/vcs/vcs_save.png b/designer-base/src/main/resources/com/fr/design/images/vcs/vcs_save.png
new file mode 100644
index 0000000000..6783204cf8
Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/vcs/vcs_save.png differ
diff --git a/designer-base/src/main/resources/com/fr/design/ui/InitNameSpace.js b/designer-base/src/main/resources/com/fr/design/ui/InitNameSpace.js
index 0274d5fa50..03b2bb32ae 100644
--- a/designer-base/src/main/resources/com/fr/design/ui/InitNameSpace.js
+++ b/designer-base/src/main/resources/com/fr/design/ui/InitNameSpace.js
@@ -1,6 +1,6 @@
-var arr ="%s".split(".").reverse();
-var create = function (obj, names) {
- var name = names.pop();
+let arr ="%s".split(".").reverse();
+let create = function (obj, names) {
+ let name = names.pop();
if (!name) {
return;
}
diff --git a/designer-base/src/main/resources/com/fr/design/ui/update/push/pushUpdate.css b/designer-base/src/main/resources/com/fr/design/ui/update/push/pushUpdate.css
new file mode 100644
index 0000000000..58c03ecba5
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/ui/update/push/pushUpdate.css
@@ -0,0 +1,88 @@
+body {
+ padding-left: 30px;
+ padding-top: 30px;
+ color: white;
+ background-size: 100% 100% !important;
+ -moz-background-size: 100% 100% !important;
+
+ font-family: "PingFang SC", "Microsoft YaHei", "Myriad Pro", "OpenSans", Verdana, SimSun, sans-serif !important;
+}
+
+.close-btn {
+ position: fixed !important;
+ font-size: 15px !important;
+ color: white !important;
+ top: 8px;
+ right: 10px;
+ width: 19px;
+}
+
+.close-btn .b-font {
+ height: 19px !important;
+ line-height: 19px !important;
+}
+
+.close-btn .b-font:before {
+ color: white !important;
+}
+
+.font-bold {
+ font-weight: 500;
+}
+
+.title {
+ font-size: 24px;
+ letter-spacing: 1.5px;
+ line-height: 24px;
+}
+
+.version {
+ font-size: 12px;
+ line-height: 14px;
+ margin-top: 6px;
+}
+
+.desc {
+ margin-top: 40px;
+ font-size: 13px;
+ width: 82%;
+ margin-left: 19px;
+ text-indent: -19px;
+ overflow: visible !important;
+}
+
+.desc .bi-label {
+ overflow: visible !important;
+}
+
+.moreInfo {
+ margin-top: 20px;
+ font-size: 13px;
+ text-decoration: underline;
+}
+
+.buttonGroup {
+ position: absolute !important;
+ bottom: 60px;
+}
+
+.buttonGroup .bi-button {
+ font-weight: 600;
+ font-size: 11px;
+ text-align: center;
+ line-height: 12px;
+ box-shadow: 0 2px 4px 0 rgba(0,82,169,0.20);
+ border-radius: 12px;
+}
+
+.buttonGroup .button-ignore {
+ background-color: white !important;
+ border: 1px solid white !important;
+ color: #51A6FF;
+}
+
+.buttonGroup .button-common {
+ background-color: #51A6FF !important;
+ border: 1px solid #51A6FF !important;
+}
+
diff --git a/designer-base/src/main/resources/com/fr/design/ui/update/push/pushUpdate.js b/designer-base/src/main/resources/com/fr/design/ui/update/push/pushUpdate.js
new file mode 100644
index 0000000000..f42fb1ac7b
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/ui/update/push/pushUpdate.js
@@ -0,0 +1,143 @@
+var MAX_DESC_NUM = 5; // 最多显示5条信息
+
+function i18nText(key) {
+ return Pool.data.i18nText(key);
+}
+
+function getDescArea(descList) {
+ var descItems = [];
+ for (var i in descList) {
+ var num = parseInt(i) + 1;
+ if (num > MAX_DESC_NUM) {
+ break;
+ }
+ descItems.push({
+ type: "bi.label",
+ text: num + "）" + descList[i],
+ whiteSpace: "pre-wrap",
+ textAlign: "left"
+ })
+ }
+
+ return BI.createWidget({
+ type: "bi.vertical",
+ cls: "desc",
+ items: descItems
+ });
+}
+
+function getTitleArea() {
+ return BI.createWidget({
+ type: "bi.vertical",
+ items: [
+ {
+ type: "bi.label",
+ text: i18nText("Fine-Design_Find_New_Version"),
+ cls: "title font-bold",
+ textAlign: "left"
+ },
+ {
+ type: "bi.label",
+ text: Pool.data.getVersion(),
+ cls: "version font-bold",
+ textAlign: "left"
+ }
+ ]
+ });
+}
+
+function getButtonGroup() {
+ return BI.createWidget({
+ type: 'bi.left',
+ cls: "buttonGroup",
+ items: [
+ {
+ type: 'bi.button',
+ text: i18nText("Fine-Design_Update_Now"),
+ level: 'common',
+ height: 24,
+ handler: function () {
+ Pool.data.updateNow();
+ }
+ },
+ {
+ el: {
+ type: 'bi.button',
+ text: i18nText("Fine-Design_Remind_Me_Next_Time"),
+ level: 'ignore',
+ height: 24,
+ handler: function () {
+ Pool.data.remindNextTime();
+ }
+ },
+ lgap: 10
+ },
+ {
+ el: {
+ type: 'bi.button',
+ text: i18nText("Fine-Design_Skip_This_Version"),
+ level: 'ignore',
+ height: 24,
+ handler: function () {
+ Pool.data.skipThisVersion();
+ }
+ },
+ lgap: 10
+ }
+ ]
+ });
+}
+
+function getMoreInfo() {
+ return BI.createWidget({
+ type: "bi.text_button",
+ text: i18nText("Fine-Design_See_More_New_Features"),
+ cls: "moreInfo",
+ textAlign: "left",
+ handler: function () {
+ // 为了使用系统的浏览器，只能从 Java 那边打开网页
+ Pool.data.browseMoreInfoUrl();
+ }
+ });
+}
+
+function getCloseButton() {
+ return BI.createWidget({
+ type: "bi.button",
+ text: "",
+ iconCls: "close-font",
+ cls: "close-btn",
+ clear: true,
+ handler: function () {
+ Pool.data.closeWindow();
+ }
+ });
+}
+
+function getShowItems() {
+ var title = getTitleArea();
+
+ var closeButton = getCloseButton();
+
+ var descList = Pool.data.getContent().split("\n");
+ var descArea = getDescArea(descList);
+
+ var moreInfo = getMoreInfo();
+
+ var buttonGroup = getButtonGroup();
+
+ return [title, closeButton, descArea, moreInfo, buttonGroup];
+}
+
+window.addEventListener("load", function (ev) {
+ var showItems = getShowItems();
+
+ var container = BI.createWidget({
+ type:"bi.vertical",
+ element: "body",
+ cls: "container",
+ items: showItems
+ });
+
+ container.element.css("background", "url(" + Pool.data.getBackgroundUrl() + ")");
+});
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/upm/warn.js b/designer-base/src/main/resources/com/fr/design/upm/warn.js
new file mode 100644
index 0000000000..be4b069097
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/upm/warn.js
@@ -0,0 +1,61 @@
+window.onload = function () {
+ let label = BI.createWidget({
+ type: "bi.label",
+ text: PluginHelper.i18nText("Fine-Design_Basic_Update_Plugin_Manager_Resource_Warn"),
+ height: 30
+ });
+ let callback = function(status, text) {
+ download.setValue(text);
+ };
+ let buttonOK = BI.createWidget({
+ type: "bi.button",
+ text: PluginHelper.i18nText("Fine-Design_Basic_Update_Plugin_Manager_Download"),
+ level: 'common',
+ height: 30,
+ handler: function () {
+ PluginHelper.startDownload(callback);
+ }
+ });
+ let buttonClose = BI.createWidget({
+ type: "bi.button",
+ text: PluginHelper.i18nText("Fine-Design_Basic_Update_Plugin_Manager_Close"),
+ level: 'warning',
+ height: 30,
+ handler: function () {
+ PluginHelper.closeWindow();
+ }
+ });
+
+ let download = BI.createWidget({
+ type: "bi.label",
+ height: 30
+ });
+ let left = 300;
+ let top = 200;
+ BI.createWidget({
+ type: "bi.absolute",
+ element: "body",
+ items: [
+ {
+ el: label,
+ left: left,
+ top: top
+ },
+ {
+ el : buttonOK,
+ left : left,
+ top : top + 40
+ },
+ {
+ el : buttonClose,
+ left : left + 100,
+ top : top + 40
+ },
+ {
+ el : download,
+ left : left,
+ top : top + 80
+ }
+ ]
+ });
+};
\ No newline at end of file
diff --git a/designer-base/src/test/java/com/fr/design/mainframe/template/info/DesignerOpenHistoryTest.java b/designer-base/src/test/java/com/fr/design/mainframe/template/info/DesignerOpenHistoryTest.java
new file mode 100644
index 0000000000..3e95cfec77
--- /dev/null
+++ b/designer-base/src/test/java/com/fr/design/mainframe/template/info/DesignerOpenHistoryTest.java
@@ -0,0 +1,120 @@
+package com.fr.design.mainframe.template.info;
+
+import com.fr.invoke.Reflect;
+import com.fr.stable.StringUtils;
+import com.fr.stable.xml.XMLPrintWriter;
+import com.fr.stable.xml.XMLableReader;
+import com.fr.third.javax.xml.stream.XMLStreamException;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.PrintWriter;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+/**
+ * Created by plough on 2019/4/21.
+ */
+public class DesignerOpenHistoryTest {
+ private DesignerOpenHistory openHistory;
+ private String[] mockHistory = new String[] {
+ "2019-04-08", "2019-04-03", "2019-03-29"
+ };
+
+ @Before
+ public void setUp() {
+ openHistory = DesignerOpenHistory.getInstance();
+ Reflect.on(openHistory).set("history", mockHistory);
+ }
+
+ @Test
+ public void testReadAndWrite() throws XMLStreamException {
+ // 写入 xml
+ StringWriter sw = new StringWriter();
+ XMLPrintWriter writer = XMLPrintWriter.create(new PrintWriter(sw));
+ openHistory.writeXML(writer);
+ writer.flush();
+ writer.close();
+
+ String xmlText = sw.getBuffer().toString();
+
+ // 临时修改配置
+ Reflect.on(openHistory).set("history", new String[] {"", "", ""});
+
+ // 从 xml 中读取
+ StringReader sr = new StringReader(xmlText);
+ XMLableReader xmlReader = XMLableReader.createXMLableReader(sr);
+ xmlReader.readXMLObject(openHistory);
+
+ // 验证：与写入时的配置一致
+ assertArrayEquals(mockHistory, (String[])Reflect.on(openHistory).field("history").get());
+ }
+
+ @Test
+ public void testToString() {
+ assertEquals("2019-04-08,2019-04-03,2019-03-29", openHistory.toString());
+ }
+
+ @Test
+ public void testParseString() {
+ String[] mockDates = {"2020-04-08", "2019-04-03", "2016-03-29"};
+ Reflect.on(openHistory).call("parseString", StringUtils.join(",", mockDates));
+ assertArrayEquals(mockDates, (String[])Reflect.on(openHistory).field("history").get());
+ }
+
+ @Test
+ public void testGetHistorySpanDayCount() {
+ assertEquals(11, openHistory.getHistorySpanDayCount());
+
+ Reflect.on(openHistory).set("history", new String[] {"2019-05-03", "2019-05-02", ""});
+ assertEquals(2, openHistory.getHistorySpanDayCount());
+
+ Reflect.on(openHistory).set("history", new String[] {"2019-05-03", "", ""});
+ assertEquals(1, openHistory.getHistorySpanDayCount());
+
+ try {
+ Reflect.on(openHistory).set("history", new String[] {"", "", ""});
+ fail("should not be here");
+ } catch (AssertionError ignore) {
+ }
+ }
+
+ @Test
+ public void testOpenEnoughTimesInPeriod() {
+ assertTrue(openHistory.isOpenEnoughTimesInPeriod(15));
+ assertFalse(openHistory.isOpenEnoughTimesInPeriod(3));
+
+ Reflect.on(openHistory).set("history", new String[] {"2019-05-03", "2019-05-02", ""});
+ assertFalse(openHistory.isOpenEnoughTimesInPeriod(15));
+
+ Reflect.on(openHistory).set("history", new String[] {"2019-05-03", "", ""});
+ assertFalse(openHistory.isOpenEnoughTimesInPeriod(15));
+ }
+
+ @Test
+ public void testHasOpenedToday() {
+ assertFalse(openHistory.hasOpenedToday());
+
+ Reflect.on(openHistory).set("history", new String[] {getToday(), "2019-02-02", ""});
+ assertTrue(openHistory.hasOpenedToday());
+ }
+
+ @Test
+ public void testUpdate() {
+ openHistory.update();
+ String[] arr = { getToday(), "2019-04-08", "2019-04-03" };
+ assertArrayEquals(arr, (String[])Reflect.on(openHistory).field("history").get());
+ }
+
+ private String getToday() {
+ return new SimpleDateFormat("yyyy-MM-dd").format(Calendar.getInstance().getTime());
+ }
+}
diff --git a/designer-base/src/test/java/com/fr/design/mainframe/template/info/SendHelperTest.java b/designer-base/src/test/java/com/fr/design/mainframe/template/info/SendHelperTest.java
new file mode 100644
index 0000000000..fb89143d8d
--- /dev/null
+++ b/designer-base/src/test/java/com/fr/design/mainframe/template/info/SendHelperTest.java
@@ -0,0 +1,35 @@
+package com.fr.design.mainframe.template.info;
+
+import com.fr.invoke.Reflect;
+import com.fr.stable.xml.XMLableReader;
+import com.fr.third.javax.xml.stream.XMLStreamException;
+
+import java.io.StringReader;
+
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Created by plough on 2019/4/25.
+ */
+public class SendHelperTest {
+ private static final String CONSUMING_URL = "http://cloud.fanruan.com/api/monitor/record_of_reports_consuming/single";
+ private static final String PROCESS_URL = "http://cloud.fanruan.com/api/monitor/record_of_reports_process/single";
+
+ private static final String NORMAL_INFO = "\n" +
+ "\n" +
+ "\n" +
+ "";
+
+ // 只在调试的时候运行，不需要每次都自动运行
+ public static void main(String[] args) throws XMLStreamException {
+ StringReader sr = new StringReader(NORMAL_INFO);
+ XMLableReader xmlReader = XMLableReader.createXMLableReader(sr);
+ TemplateInfo templateInfo = TemplateInfo.newInstanceByRead(xmlReader);
+
+ boolean res = Reflect.on(SendHelper.class).call("sendSingleTemplateInfo", CONSUMING_URL, templateInfo.getConsumingMapJsonString()).get();
+ assertTrue(res);
+
+ boolean res2 = Reflect.on(SendHelper.class).call("sendSingleTemplateInfo", PROCESS_URL, templateInfo.getProcessMapJsonString()).get();
+ assertTrue(res2);
+ }
+}
diff --git a/designer-base/src/test/java/com/fr/design/mainframe/template/info/TemplateInfoCollectorTest.java b/designer-base/src/test/java/com/fr/design/mainframe/template/info/TemplateInfoCollectorTest.java
new file mode 100644
index 0000000000..e83a523fc4
--- /dev/null
+++ b/designer-base/src/test/java/com/fr/design/mainframe/template/info/TemplateInfoCollectorTest.java
@@ -0,0 +1,195 @@
+package com.fr.design.mainframe.template.info;
+
+import com.fr.config.MarketConfig;
+import com.fr.general.GeneralUtils;
+import com.fr.invoke.Reflect;
+import com.fr.stable.ProductConstants;
+import com.fr.stable.StringUtils;
+import com.fr.third.org.apache.commons.io.FileUtils;
+import org.easymock.EasyMock;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.api.easymock.PowerMock;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Map;
+
+import static com.fr.design.mainframe.template.info.TemplateInfoTestHelper.assertJsonStringEquals;
+import static com.fr.design.mainframe.template.info.TemplateInfoTestHelper.setUpMockForNewInstance;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Created by plough on 2019/4/18.
+ */
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({ProductConstants.class, MarketConfig.class, ProductConstants.class, GeneralUtils.class})
+public class TemplateInfoCollectorTest {
+ private String filePath;
+ private String initialFileContent;
+ private TemplateProcessInfo mockProcessInfo;
+
+ @Before
+ public void setUp() throws IOException {
+ PowerMock.mockStatic(ProductConstants.class);
+
+ filePath = getClass().getResource("tpl.info").getPath();
+ String dirPath = filePath.substring(0, filePath.indexOf("tpl.info"));
+ EasyMock.expect(ProductConstants.getEnvHome()).andReturn(dirPath).anyTimes();
+ EasyMock.replay();
+ PowerMock.replayAll();
+
+ mockProcessInfo = EasyMock.mock(TemplateProcessInfo.class);
+ EasyMock.expect(mockProcessInfo.getBlockCount()).andReturn(3).anyTimes();
+ EasyMock.expect(mockProcessInfo.getCellCount()).andReturn(13).anyTimes();
+ EasyMock.expect(mockProcessInfo.getFloatCount()).andReturn(1).anyTimes();
+ EasyMock.expect(mockProcessInfo.getReportType()).andReturn(0).anyTimes();
+ EasyMock.expect(mockProcessInfo.getWidgetCount()).andReturn(0).anyTimes();
+ EasyMock.replay(mockProcessInfo);
+
+ // 缓存 tpl.info
+ initialFileContent = FileUtils.readFileToString(new File(filePath), "utf-8");
+
+ Reflect.on(TemplateInfoCollector.class).set("instance", null);
+ }
+
+ @After
+ public void tearDown() throws IOException {
+ // 恢复 tpl.info
+ FileUtils.writeStringToFile(new File(filePath), initialFileContent, "utf-8");
+ }
+
+ @Test
+ public void testReadXML() {
+ assertEquals(",,", DesignerOpenHistory.getInstance().toString());
+
+ TemplateInfoCollector collector = TemplateInfoCollector.getInstance();
+ assertEquals(7, ((Map) Reflect.on(collector).field("templateInfoMap").get()).size());
+
+ assertEquals("2019-04-08,2019-04-03,2019-03-29", DesignerOpenHistory.getInstance().toString());
+ }
+
+ @Test
+ public void testCollectInfo() {
+ TemplateInfoCollector collector = TemplateInfoCollector.getInstance();
+
+ String templateID = "16a988ce-8529-42f5-b17c-2ee849355071";
+ int timeConsume = 200;
+
+ collector.collectInfo(templateID, StringUtils.EMPTY, mockProcessInfo, timeConsume);
+
+ // 检查是否写入成功
+ collector.loadFromFile();
+ TemplateInfo templateInfo = collector.getOrCreateTemplateInfoByID(templateID);
+
+ assertJsonStringEquals("{\"process\":\"\",\"float_count\":1,\"widget_count\":0," +
+ "\"cell_count\":13,\"block_count\":3,\"report_type\":0," +
+ "\"templateID\":\"16a988ce-8529-42f5-b17c-2ee849355071\"}",templateInfo.getProcessMapJsonString());
+
+ assertJsonStringEquals("{\"activitykey\":\"2e0ea413-fa9c241e0-9723-4354fce51e81\"," +
+ "\"jar_time\":\"不是安装版本\",\"create_time\":\"2019-03-26 16:13\"," +
+ "\"templateID\":\"16a988ce-8529-42f5-b17c-2ee849355071\",\"originID\":\"\"," +
+ "\"uuid\":\"476ca2cc-f789-4c5d-8e89-ef146580775c\",\"time_consume\":329,\"originTime\":0," +
+ "\"version\":\"10.0\",\"username\":\"plough\"}", templateInfo.getConsumingMapJsonString());
+ }
+
+ @Test
+ public void testCollectInfoForNewTemplate() throws Exception {
+ setUpMockForNewInstance();
+
+ TemplateInfoCollector collector = TemplateInfoCollector.getInstance();
+
+ String templateID = "73a97777-8jnk-47cd-b57c-2ee89991279796";
+ int timeConsume = 200;
+
+ collector.collectInfo(templateID, StringUtils.EMPTY, mockProcessInfo, timeConsume);
+
+ // 检查是否写入成功
+ collector.loadFromFile();
+ assertTrue(collector.contains(templateID));
+
+ TemplateInfo templateInfo = collector.getOrCreateTemplateInfoByID(templateID);
+ assertEquals(templateID, templateInfo.getTemplateID());
+
+ assertJsonStringEquals("{\"process\":\"\",\"float_count\":1,\"widget_count\":0," +
+ "\"cell_count\":13,\"block_count\":3,\"report_type\":0," +
+ "\"templateID\":\"73a97777-8jnk-47cd-b57c-2ee89991279796\"}",templateInfo.getProcessMapJsonString());
+
+ Map consumingMap = Reflect.on(templateInfo).field("consumingMap").get();
+ assertEquals(templateID, consumingMap.get("templateID"));
+ assertEquals(StringUtils.EMPTY, consumingMap.get("originID"));
+ assertEquals(200, consumingMap.get("time_consume"));
+ assertEquals(0, consumingMap.get("originTime"));
+ }
+
+ @Test
+ public void testCollectInfoWhenSaveAs() throws Exception {
+ setUpMockForNewInstance();
+
+ TemplateInfoCollector collector = TemplateInfoCollector.getInstance();
+
+ String templateID = "423238d4-5223-22vj-vlsj-42jc49245iw3";
+ String originID = "16a988ce-8529-42f5-b17c-2ee849355071";
+ int timeConsume = 200;
+
+ collector.collectInfo(templateID, originID, mockProcessInfo, timeConsume);
+
+ // 检查是否写入成功
+ collector.loadFromFile();
+ TemplateInfo templateInfo = collector.getOrCreateTemplateInfoByID(templateID);
+
+ assertJsonStringEquals("{\"process\":\"\",\"float_count\":1,\"widget_count\":0," +
+ "\"cell_count\":13,\"block_count\":3,\"report_type\":0," +
+ "\"templateID\":\"423238d4-5223-22vj-vlsj-42jc49245iw3\"}", templateInfo.getProcessMapJsonString());
+
+ Map consumingMap = Reflect.on(templateInfo).field("consumingMap").get();
+ assertEquals(templateID, consumingMap.get("templateID"));
+ assertEquals(originID, consumingMap.get("originID"));
+ assertEquals(329, consumingMap.get("time_consume"));
+ assertEquals(129, consumingMap.get("originTime"));
+ }
+
+ @Test
+ public void testCollectInfoWhenSaveAsWithNoTrackOriginID() throws Exception {
+ setUpMockForNewInstance();
+
+ TemplateInfoCollector collector = TemplateInfoCollector.getInstance();
+
+ String templateID = "423238d4-5223-22vj-vlsj-42jc49245iw3";
+ String originID = "3kha8jcs-31xw-42f5-h2ww-2ee84935312z";
+ int timeConsume = 200;
+
+ collector.collectInfo(templateID, originID, mockProcessInfo, timeConsume);
+
+ TemplateInfo templateInfo = collector.getOrCreateTemplateInfoByID(templateID);
+ assertEquals(templateID, templateInfo.getTemplateID());
+ assertEquals(originID, templateInfo.getOriginID());
+
+ Map consumingMap = Reflect.on(templateInfo).field("consumingMap").get();
+ assertEquals(templateID, consumingMap.get("templateID"));
+ assertEquals(originID, consumingMap.get("originID"));
+ assertEquals(200, consumingMap.get("time_consume"));
+ assertEquals(0, consumingMap.get("originTime"));
+ }
+
+ @Test
+ public void testAddIdleDateCount() {
+ String templateID = "16a988ce-8529-42f5-b17c-2ee849355071";
+ TemplateInfoCollector collecter = TemplateInfoCollector.getInstance();
+ TemplateInfo templateInfo = collecter.getOrCreateTemplateInfoByID(templateID);
+
+ assertEquals(9, templateInfo.getIdleDayCount());
+
+ Reflect.on(collecter).call("addIdleDayCount");
+ assertEquals(10, templateInfo.getIdleDayCount());
+
+ // 同一天内多次调用无效
+ Reflect.on(collecter).call("addIdleDayCount");
+ assertEquals(10, templateInfo.getIdleDayCount());
+ }
+}
diff --git a/designer-base/src/test/java/com/fr/design/mainframe/template/info/TemplateInfoTest.java b/designer-base/src/test/java/com/fr/design/mainframe/template/info/TemplateInfoTest.java
new file mode 100644
index 0000000000..19f6066ff8
--- /dev/null
+++ b/designer-base/src/test/java/com/fr/design/mainframe/template/info/TemplateInfoTest.java
@@ -0,0 +1,125 @@
+package com.fr.design.mainframe.template.info;
+
+import com.fr.config.MarketConfig;
+import com.fr.general.GeneralUtils;
+import com.fr.invoke.Reflect;
+import com.fr.stable.ProductConstants;
+import com.fr.stable.StringUtils;
+import com.fr.stable.xml.XMLableReader;
+import com.fr.third.javax.xml.stream.XMLStreamException;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import java.io.StringReader;
+import java.util.Map;
+
+import static com.fr.design.mainframe.template.info.TemplateInfoTestHelper.assertJsonStringEquals;
+import static com.fr.design.mainframe.template.info.TemplateInfoTestHelper.setUpMockForNewInstance;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Created by plough on 2019/4/19.
+ */
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({MarketConfig.class, ProductConstants.class, GeneralUtils.class})
+public class TemplateInfoTest {
+
+ private static final String NORMAL_INFO = "\n" +
+ "\n" +
+ "\n" +
+ "";
+
+ private static final String SAVE_AS_INFO = "\n" +
+ "\n" +
+ "\n" +
+ "";
+
+ private TemplateInfo templateInfo;
+ private TemplateInfo templateInfoSaveAs; // 另存为的模版记录
+
+ @Before
+ public void setUp() throws XMLStreamException {
+ templateInfo = createTemplateInfo(NORMAL_INFO);
+ templateInfoSaveAs = createTemplateInfo(SAVE_AS_INFO);
+ }
+
+ @Test
+ public void testNewInstance() throws Exception {
+ setUpMockForNewInstance();
+
+ String templateID = "24avc8n2-1iq8-iuj2-wx24-8yy0i8132302";
+ TemplateInfo templateInfo = TemplateInfo.newInstance(templateID);
+ assertEquals(templateID, templateInfo.getTemplateID());
+ assertEquals(StringUtils.EMPTY, Reflect.on(templateInfo).field("originID").get());
+ assertEquals(0, Reflect.on(templateInfo).field("idleDayCount").get());
+ assertEquals("{}", templateInfo.getProcessMapJsonString());
+
+ Map consumingMap = Reflect.on(templateInfo).field("consumingMap").get();
+ assertEquals(templateID, consumingMap.get("templateID"));
+ assertEquals(0, consumingMap.get("originTime"));
+ assertEquals(StringUtils.EMPTY, consumingMap.get("originID"));
+ assertEquals(0, consumingMap.get("time_consume"));
+ assertEquals("不是安装版本", consumingMap.get("jar_time"));
+ assertEquals("plough", consumingMap.get("username"));
+ assertEquals("10.0", consumingMap.get("version"));
+ }
+
+ @Test
+ public void testNewInstanceWithMoreArgs() throws Exception {
+ setUpMockForNewInstance();
+
+ String templateID = "24121212-u2c8-ncd2-82nx-8ud0i8138888";
+ String originID = "24avc8n2-1iq8-iuj2-wx24-8yy0i8132302";
+ int originTime = 100;
+ TemplateInfo templateInfo = TemplateInfo.newInstance(templateID, originID, originTime);
+ assertEquals(templateID, templateInfo.getTemplateID());
+ assertEquals(originID, Reflect.on(templateInfo).field("originID").get());
+ assertEquals(0, Reflect.on(templateInfo).field("idleDayCount").get());
+ assertEquals("{}", templateInfo.getProcessMapJsonString());
+
+ Map consumingMap = Reflect.on(templateInfo).field("consumingMap").get();
+ assertEquals(templateID, consumingMap.get("templateID"));
+ assertEquals(originTime, consumingMap.get("originTime"));
+ assertEquals(originID, consumingMap.get("originID"));
+ assertEquals(originTime, consumingMap.get("time_consume"));
+ assertEquals("不是安装版本", consumingMap.get("jar_time"));
+ assertEquals("plough", consumingMap.get("username"));
+ assertEquals("10.0", consumingMap.get("version"));
+ }
+
+ @Test
+ public void testGetTemplateID() {
+ assertEquals("16a988ce-8529-42f5-b17c-2ee849355071", templateInfo.getTemplateID());
+ assertEquals("49avd2c4-1104-92j2-wx24-3dd0k2136080", templateInfoSaveAs.getTemplateID());
+ }
+
+ @Test
+ public void testGetConsumingMapJsonString() {
+ assertJsonStringEquals("{\"activitykey\":\"2e0ea413-fa9c241e0-9723-4354fce51e81\",\"jar_time\":\"不是安装版本\"," +
+ "\"create_time\":\"2019-03-26 16:13\",\"templateID\":\"16a988ce-8529-42f5-b17c-2ee849355071\",\"originID\":\"\"," +
+ "\"uuid\":\"476ca2cc-f789-4c5d-8e89-ef146580775c\",\"time_consume\":129,\"originTime\":0,\"version\":\"10.0\"," +
+ "\"username\":\"plough\"}", templateInfo.getConsumingMapJsonString());
+
+ assertJsonStringEquals("{\"activitykey\":\"2e0ea413-fa9c241e0-9723-4354fce51e81\",\"jar_time\":\"不是安装版本\"," +
+ "\"create_time\":\"2019-03-26 16:13\",\"templateID\":\"49avd2c4-1104-92j2-wx24-3dd0k2136080\",\"originID\":\"16a988ce-8529-42f5-b17c-2ee849355071\"," +
+ "\"uuid\":\"476ca2cc-f789-4c5d-8e89-ef146580775c\",\"time_consume\":429,\"originTime\":129,\"version\":\"10.0\"," +
+ "\"username\":\"plough\"}", templateInfoSaveAs.getConsumingMapJsonString());
+ }
+
+ @Test
+ public void testGetProcessMapJsonString() {
+ assertJsonStringEquals("{\"process\":\"\",\"float_count\":0,\"widget_count\":0,\"cell_count\":1," +
+ "\"block_count\":0,\"report_type\":0,\"templateID\":\"16a988ce-8529-42f5-b17c-2ee849355071\"}", templateInfo.getProcessMapJsonString());
+ assertJsonStringEquals("{\"process\":\"\",\"float_count\":0,\"widget_count\":0,\"cell_count\":1," +
+ "\"block_count\":0,\"report_type\":0,\"templateID\":\"49avd2c4-1104-92j2-wx24-3dd0k2136080\"}", templateInfoSaveAs.getProcessMapJsonString());
+ }
+
+ private TemplateInfo createTemplateInfo(String xmlContent) throws XMLStreamException {
+ StringReader sr = new StringReader(xmlContent);
+ XMLableReader xmlReader = XMLableReader.createXMLableReader(sr);
+ return TemplateInfo.newInstanceByRead(xmlReader);
+ }
+}
diff --git a/designer-base/src/test/java/com/fr/design/mainframe/template/info/TemplateInfoTestHelper.java b/designer-base/src/test/java/com/fr/design/mainframe/template/info/TemplateInfoTestHelper.java
new file mode 100644
index 0000000000..be2b589892
--- /dev/null
+++ b/designer-base/src/test/java/com/fr/design/mainframe/template/info/TemplateInfoTestHelper.java
@@ -0,0 +1,49 @@
+package com.fr.design.mainframe.template.info;
+
+import com.fr.config.MarketConfig;
+import com.fr.general.ComparatorUtils;
+import com.fr.general.GeneralUtils;
+import com.fr.json.JSONObject;
+import com.fr.stable.ProductConstants;
+import org.easymock.EasyMock;
+import org.powermock.api.easymock.PowerMock;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Created by plough on 2019/4/19.
+ */
+class TemplateInfoTestHelper {
+ static void assertJsonStringEquals(String jo1, String jo2) {
+ // HashMap 是无序的，所以不能直接比较它生成的 json 字符串
+ assertTrue(ComparatorUtils.equals(new JSONObject(jo1), new JSONObject(jo2)));
+ }
+
+ private static void setFinalStatic(Field field, Object newValue) throws Exception {
+ field.setAccessible(true);
+ // remove final modifier from field
+ Field modifiersField = Field.class.getDeclaredField("modifiers");
+ modifiersField.setAccessible(true);
+ modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
+ field.set(null, newValue);
+ }
+
+ static void setUpMockForNewInstance() throws Exception {
+ MarketConfig mockMarketConfig = EasyMock.mock(MarketConfig.class);
+ EasyMock.expect(mockMarketConfig.getBbsUsername()).andReturn("plough").anyTimes();
+
+ PowerMock.mockStatic(MarketConfig.class);
+ EasyMock.expect(MarketConfig.getInstance()).andReturn(mockMarketConfig).anyTimes();
+
+ PowerMock.mockStatic(GeneralUtils.class);
+ EasyMock.expect(GeneralUtils.readBuildNO()).andReturn("不是安装版本").anyTimes();
+
+ setFinalStatic(ProductConstants.class.getDeclaredField("VERSION"), "10.0");
+
+ EasyMock.replay(mockMarketConfig);
+ PowerMock.replayAll();
+ }
+}
diff --git a/designer-base/src/test/java/com/fr/design/mainframe/template/info/TimeConsumeTimerTest.java b/designer-base/src/test/java/com/fr/design/mainframe/template/info/TimeConsumeTimerTest.java
new file mode 100644
index 0000000000..5dcf60e7f6
--- /dev/null
+++ b/designer-base/src/test/java/com/fr/design/mainframe/template/info/TimeConsumeTimerTest.java
@@ -0,0 +1,62 @@
+package com.fr.design.mainframe.template.info;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Created by plough on 2019/4/19.
+ */
+public class TimeConsumeTimerTest {
+
+ @Test
+ public void testNotEnabled() throws InterruptedException {
+ TimeConsumeTimer consumeTimer = new TimeConsumeTimer();
+ consumeTimer.start();
+ Thread.sleep(1100);
+ consumeTimer.stop();
+ assertEquals(0, consumeTimer.popTime());
+ }
+
+ @Test
+ public void testEnabled() throws InterruptedException {
+ TimeConsumeTimer consumeTimer = new TimeConsumeTimer();
+ consumeTimer.setEnabled(true);
+ consumeTimer.start();
+ Thread.sleep(1100);
+ consumeTimer.stop();
+ assertEquals(1, consumeTimer.popTime());
+ assertEquals(0, consumeTimer.popTime());
+ }
+
+ @Test
+ public void testMultiTimes() throws InterruptedException {
+ TimeConsumeTimer consumeTimer = new TimeConsumeTimer();
+ consumeTimer.setEnabled(true);
+
+ consumeTimer.start();
+ Thread.sleep(1010);
+ consumeTimer.stop();
+
+ Thread.sleep(2000);
+
+ consumeTimer.start();
+ Thread.sleep(1010);
+ assertEquals(2, consumeTimer.popTime());
+ }
+
+ @Test
+ public void testStartMultiTime() throws InterruptedException {
+ TimeConsumeTimer consumeTimer = new TimeConsumeTimer();
+ consumeTimer.setEnabled(true);
+
+ consumeTimer.start();
+ Thread.sleep(1010);
+ consumeTimer.start();
+ Thread.sleep(1010);
+ consumeTimer.start();
+ Thread.sleep(1010);
+
+ assertEquals(3, consumeTimer.popTime());
+ }
+}
diff --git a/designer-base/src/test/java/com/fr/design/update/push/DesignerPushUpdateConfigManagerTest.java b/designer-base/src/test/java/com/fr/design/update/push/DesignerPushUpdateConfigManagerTest.java
new file mode 100644
index 0000000000..17831b0b74
--- /dev/null
+++ b/designer-base/src/test/java/com/fr/design/update/push/DesignerPushUpdateConfigManagerTest.java
@@ -0,0 +1,72 @@
+package com.fr.design.update.push;
+
+import com.fr.stable.StringUtils;
+import com.fr.stable.xml.XMLPrintWriter;
+import com.fr.stable.xml.XMLableReader;
+import com.fr.third.javax.xml.stream.XMLStreamException;
+import org.junit.Test;
+
+import java.io.PrintWriter;
+import java.io.StringReader;
+import java.io.StringWriter;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
+
+/**
+ * Created by plough on 2019/4/8.
+ */
+public class DesignerPushUpdateConfigManagerTest {
+
+ @Test
+ public void testSingleton() {
+ DesignerPushUpdateConfigManager m1 = DesignerPushUpdateConfigManager.getInstance();
+ DesignerPushUpdateConfigManager m2 = DesignerPushUpdateConfigManager.getInstance();
+ assertSame(m1, m2);
+ }
+
+ @Test
+ public void testDefaultValue() throws XMLStreamException {
+ DesignerPushUpdateConfigManager configManager = DesignerPushUpdateConfigManager.getInstance();
+ XMLableReader xmlReader = XMLableReader.createXMLableReader(new StringReader(""));
+ xmlReader.readXMLObject(configManager);
+
+ assertEquals(StringUtils.EMPTY, configManager.getLastIgnoredVersion());
+ assertTrue(configManager.isAutoPushUpdateEnabled());
+ }
+
+ @Test
+ public void testReadAndWrite() throws XMLStreamException {
+ final String initLastIngnoredVersion = "1.1.2";
+ final boolean initAutoPushEnabled = false;
+
+ DesignerPushUpdateConfigManager configManager = DesignerPushUpdateConfigManager.getInstance();
+
+ configManager.setLastIgnoredVersion(initLastIngnoredVersion);
+ configManager.setAutoPushUpdateEnabled(initAutoPushEnabled);
+
+ // 写入 xml
+ StringWriter sw = new StringWriter();
+ XMLPrintWriter writer = XMLPrintWriter.create(new PrintWriter(sw));
+ configManager.writeXML(writer);
+ writer.flush();
+ writer.close();
+
+ String xml_str = sw.getBuffer().toString();
+
+ // 临时修改配置
+ configManager.setAutoPushUpdateEnabled(true);
+ configManager.setLastIgnoredVersion("0.20.1");
+
+ // 从 xml 中读取
+ StringReader sr = new StringReader(xml_str);
+ XMLableReader xmlReader = XMLableReader.createXMLableReader(sr);
+ xmlReader.readXMLObject(configManager);
+
+ // 验证：与写入时的配置一致
+ assertEquals(initLastIngnoredVersion, configManager.getLastIgnoredVersion());
+ assertEquals(initAutoPushEnabled, configManager.isAutoPushUpdateEnabled());
+ }
+}
diff --git a/designer-base/src/test/java/com/fr/design/update/push/DesignerPushUpdateDialogTest.java b/designer-base/src/test/java/com/fr/design/update/push/DesignerPushUpdateDialogTest.java
new file mode 100644
index 0000000000..bc194fe063
--- /dev/null
+++ b/designer-base/src/test/java/com/fr/design/update/push/DesignerPushUpdateDialogTest.java
@@ -0,0 +1,23 @@
+package com.fr.design.update.push;
+
+import com.fr.design.DesignerEnvManager;
+import com.fr.json.JSONObject;
+
+/**
+ * Created by plough on 2019/4/10.
+ */
+public class DesignerPushUpdateDialogTest {
+
+ public static void main(String[] args) {
+ DesignerEnvManager.getEnvManager().setOpenDebug(true);
+
+ JSONObject jo = JSONObject.create();
+ jo.put("version", "2019.03.06.04.02.43.6");
+ jo.put("content", "设计器改进：去除右击弹框，让操作过程更流畅；增加报表块缩放功能，利于从全局角度整体设计报表\n插件重构：插件支持热部署，即装即用，不再需要重启服务器；\nsapbw：可用于bwcube和bwquery；\n私有云认证：可在客户本地部署私有云认证服务器，业务服务器可到此服务器进行认证；\n开放：打通简道云，可以在简道云里创建项目，并将数据同步到客户的私有库\nshould not display");
+ jo.put("more", "http://baidu.com");
+ jo.put("background", "http://updateten.finereport.com/fr.png");
+ DesignerUpdateInfo mockUpdateInfo = new DesignerUpdateInfo("111.22.11", "2211.231.1", "11.23.1", jo);
+
+ DesignerPushUpdateDialog.createAndShow(null, mockUpdateInfo);
+ }
+}
diff --git a/designer-base/src/test/java/com/fr/design/update/push/DesignerPushUpdateManagerTest.java b/designer-base/src/test/java/com/fr/design/update/push/DesignerPushUpdateManagerTest.java
new file mode 100644
index 0000000000..333580f1a6
--- /dev/null
+++ b/designer-base/src/test/java/com/fr/design/update/push/DesignerPushUpdateManagerTest.java
@@ -0,0 +1,76 @@
+package com.fr.design.update.push;
+
+import com.fr.design.event.DesignerOpenedListener;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.DesignerFrame;
+import com.fr.invoke.Reflect;
+import com.fr.stable.StringUtils;
+import org.easymock.EasyMock;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.api.easymock.PowerMock;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+
+/**
+ * Created by plough on 2019/4/8.
+ */
+@RunWith(value = PowerMockRunner.class)
+@PrepareForTest(DesignerContext.class)
+public class DesignerPushUpdateManagerTest {
+
+ @BeforeClass
+ public static void setUp() {
+ DesignerFrame mockFrame = EasyMock.mock(DesignerFrame.class);
+ mockFrame.addDesignerOpenedListener(EasyMock.anyObject(DesignerOpenedListener.class));
+ EasyMock.replay(mockFrame);
+
+ PowerMock.mockStatic(DesignerContext.class);
+ EasyMock.expect(DesignerContext.getDesignerFrame()).andReturn(mockFrame).anyTimes();
+ PowerMock.replayAll();
+ }
+
+ @Test
+ public void testSingleton() {
+ DesignerPushUpdateManager m1 = DesignerPushUpdateManager.getInstance();
+ DesignerPushUpdateManager m2 = DesignerPushUpdateManager.getInstance();
+ assertSame(m1, m2);
+ }
+
+ @Test
+ public void testIsAutoPushUpdateSupported() {
+ // 中文环境 + 本地设计 -> true
+ DesignerPushUpdateManager pushUpdateManager = DesignerPushUpdateManager.getInstance();
+ assertEquals(true, Reflect.on(pushUpdateManager).call("isAutoPushUpdateSupported", true, true).get());
+
+ // 非中文环境 || 远程设计 -> false
+ assertEquals(false, Reflect.on(pushUpdateManager).call("isAutoPushUpdateSupported", false, true).get());
+ assertEquals(false, Reflect.on(pushUpdateManager).call("isAutoPushUpdateSupported", true, false).get());
+ assertEquals(false, Reflect.on(pushUpdateManager).call("isAutoPushUpdateSupported", false, false).get());
+ }
+
+ @Test
+ public void testSkipCurrentPushVersion() {
+ DesignerPushUpdateManager pushUpdateManager = DesignerPushUpdateManager.getInstance();
+
+ // 1. updateInfo 为 null 的情况
+ pushUpdateManager.skipCurrentPushVersion();
+ assertEquals(StringUtils.EMPTY, DesignerPushUpdateConfigManager.getInstance().getLastIgnoredVersion());
+
+
+ // 2. updateInfo 有值的情况
+ final String PUSH_VERSION = "stable-2019.02.03.12.44.22";
+ DesignerUpdateInfo mockInfo = EasyMock.mock(DesignerUpdateInfo.class);
+ EasyMock.expect(mockInfo.getPushVersion()).andReturn(PUSH_VERSION).anyTimes();
+ Reflect.on(pushUpdateManager).set("updateInfo", mockInfo);
+ EasyMock.replay(mockInfo);
+
+ pushUpdateManager.skipCurrentPushVersion();
+ assertEquals(PUSH_VERSION, DesignerPushUpdateConfigManager.getInstance().getLastIgnoredVersion());
+ }
+
+}
diff --git a/designer-base/src/test/java/com/fr/design/update/push/DesignerUpdateInfoTest.java b/designer-base/src/test/java/com/fr/design/update/push/DesignerUpdateInfoTest.java
new file mode 100644
index 0000000000..14f986e8e5
--- /dev/null
+++ b/designer-base/src/test/java/com/fr/design/update/push/DesignerUpdateInfoTest.java
@@ -0,0 +1,97 @@
+package com.fr.design.update.push;
+
+import com.fr.json.JSONObject;
+import com.fr.stable.StringUtils;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.security.InvalidParameterException;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Created by plough on 2019/4/9.
+ */
+public class DesignerUpdateInfoTest {
+ private static final String CURRENT_VERSION = "2018.09.03.xx";
+ private static final String LATEST_VERSION = "2019.04.03.yy";
+ private static final String LAST_IGNORED_VERSION = "2019.02.03.yy";
+ private static final String PUSH_VERSION = "2019.01.03.21.11";
+ private static final String PUSH_CONTENT = "the update desc content";
+ private static final String PUSH_BACKGROUND = "http://image.fr.com/123.jpg";
+ private static final String PUSH_MORE = "http://help.finereport.com/xxx";
+ private DesignerUpdateInfo updateInfo;
+
+ @Before
+ public void setUp() {
+ JSONObject pushData = JSONObject.create();
+
+ pushData.put("version", PUSH_VERSION);
+ pushData.put("content", PUSH_CONTENT);
+ pushData.put("background", PUSH_BACKGROUND);
+ pushData.put("more", PUSH_MORE);
+
+ updateInfo = new DesignerUpdateInfo(CURRENT_VERSION, LATEST_VERSION, LAST_IGNORED_VERSION, pushData);
+ }
+
+ @Test
+ public void testGetters() {
+ assertEquals(CURRENT_VERSION, updateInfo.getCurrentVersion());
+ assertEquals(LATEST_VERSION, updateInfo.getLatestVersion());
+ assertEquals(LAST_IGNORED_VERSION, updateInfo.getLastIgnoredVersion());
+ assertEquals(PUSH_VERSION, updateInfo.getPushVersion());
+ assertEquals(PUSH_CONTENT, updateInfo.getPushContent());
+ assertEquals(PUSH_BACKGROUND, updateInfo.getBackgroundUrl());
+ assertEquals(PUSH_MORE, updateInfo.getMoreInfoUrl());
+ }
+
+ @Test
+ public void testHasNewPushVersion() {
+ // （1）最近被跳过的维护版本号 X0；
+ // （2）本地版本号 Y；
+ // （3）最新的推送版本号 X；
+ // （4）最新的版本号 Z
+ // 必须满足：Y < X <= Z && X > X0，才返回 true
+
+ // 1 true
+ assertTrue(hasNewVersion("2019.01.03.xx", "2018.05.03.xx", "2019.04.03.yy", "2018.05.03.xx"));
+ assertTrue(hasNewVersion("2019.01.03.xx", "2018.05.03.xx", "2019.04.03.yy", null));
+ assertTrue(hasNewVersion("2019.01.03.xx", "2018.05.03.xx", "2019.04.03.yy", StringUtils.EMPTY));
+
+ // 2 false
+ // 2.1 X <= Y && X > X0
+ assertFalse(hasNewVersion("2019.01.03.xx", "2019.03.03.xx", "2019.04.03.yy", "2018.05.03.xx"));
+ assertFalse(hasNewVersion("2019.03.03.xx", "2019.03.03.xx", "2019.04.03.yy", "2018.05.03.xx"));
+
+ // 2.2 X > Z && X > X0
+ assertFalse(hasNewVersion("2020.01.03.xx", "2019.03.03.xx", "2019.04.03.yy", "2018.05.03.xx"));
+
+ // 2.3 Y < X <= Z && X <= X0
+ assertFalse(hasNewVersion("2019.01.03.xx", "2018.05.03.xx", "2019.04.03.yy", "2019.02.03.xx"));
+ assertFalse(hasNewVersion("2019.01.03.xx", "2018.05.03.xx", "2019.04.03.yy", "2019.01.03.xx"));
+ }
+
+
+ private boolean hasNewVersion(String X, String Y, String Z, String X0) {
+ JSONObject pushData = JSONObject.create();
+ pushData.put("version", X);
+ pushData.put("content", PUSH_CONTENT);
+ pushData.put("background", PUSH_BACKGROUND);
+ pushData.put("more", PUSH_MORE);
+ DesignerUpdateInfo updateInfo = new DesignerUpdateInfo(Y, Z, X0, pushData);
+ return updateInfo.hasNewPushVersion();
+ }
+
+ @Test
+ public void testParameterValidation() {
+ try {
+ DesignerUpdateInfo updateInfo = new DesignerUpdateInfo(null, null, null, new JSONObject());
+ Assert.fail("should not reach here!");
+ } catch (InvalidParameterException e) {
+ // do nothing
+ }
+ }
+}
diff --git a/designer-base/src/test/resources/com/fr/design/mainframe/template/info/tpl.info b/designer-base/src/test/resources/com/fr/design/mainframe/template/info/tpl.info
new file mode 100644
index 0000000000..eae77630fa
--- /dev/null
+++ b/designer-base/src/test/resources/com/fr/design/mainframe/template/info/tpl.info
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/designer-base/src/test/resources/com/fr/design/ui/demo.html b/designer-base/src/test/resources/com/fr/design/ui/demo.html
index 2beae25a78..9e5211c89e 100644
--- a/designer-base/src/test/resources/com/fr/design/ui/demo.html
+++ b/designer-base/src/test/resources/com/fr/design/ui/demo.html
@@ -10,6 +10,12 @@
return Pool.data;
};
+
测试页面，请点击最下面的按钮
diff --git a/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java b/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java
index 3a8abb56e5..1255d87d5a 100644
--- a/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java
+++ b/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java
@@ -41,6 +41,7 @@ import com.fr.design.module.DesignModuleFactory;
import com.fr.form.ui.ChartEditor;
import com.fr.general.GeneralContext;
import com.fr.general.IOUtils;
+import com.fr.locale.InterProviderFactory;
import com.fr.plugin.chart.PiePlot4VanChart;
import com.fr.plugin.chart.area.VanChartAreaPlot;
import com.fr.plugin.chart.bubble.VanChartBubblePlot;
@@ -99,7 +100,8 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import static com.fr.chart.charttypes.ChartTypeManager.CHART_PRIORITY;
+import static com.fr.chart.charttypes.ChartTypeManager.DEFAULT_PRIORITY;
+import static com.fr.chart.charttypes.ChartTypeManager.DEPRECATED_CHART_PRIORITY;
import static com.fr.chart.charttypes.ChartTypeManager.VAN_CHART_PRIORITY;
/**
@@ -165,7 +167,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
}
String iconPath = ChartTypeInterfaceManager.getInstance().getIconPath(plotID);
Icon icon = IOUtils.readIcon(iconPath);
- child[index] = new ChartWidgetOption(com.fr.design.i18n.Toolkit.i18nText(bean.getName()), icon, ChartEditor.class, plotID);
+ child[index] = new ChartWidgetOption(InterProviderFactory.getProvider().getLocText(bean.getName()), icon, ChartEditor.class, plotID);
index++;
}
@@ -198,23 +200,23 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
private static void readDefault() {
- addChartTypeInterface(CHART_PRIORITY, ChartConstants.COLUMN_CHART, new ColumnIndependentChartInterface());
- addChartTypeInterface(CHART_PRIORITY, ChartConstants.LINE_CHART, new LineIndependentChartInterface());
- addChartTypeInterface(CHART_PRIORITY, ChartConstants.BAR_CHART, new BarIndependentChartInterface());
- addChartTypeInterface(CHART_PRIORITY, ChartConstants.PIE_CHART, new PieIndependentChartInterface());
- addChartTypeInterface(CHART_PRIORITY, ChartConstants.AREA_CHART, new AreaIndependentChartInterface());
- addChartTypeInterface(CHART_PRIORITY, ChartConstants.SCATTER_CHART, new XYScatterIndependentChartInterface());
- addChartTypeInterface(CHART_PRIORITY, ChartConstants.BUBBLE_CHART, new BubbleIndependentChartInterface());
- addChartTypeInterface(CHART_PRIORITY, ChartConstants.RADAR_CHART, new RadarIndependentChartInterface());
- addChartTypeInterface(CHART_PRIORITY, ChartConstants.STOCK_CHART, new StockIndependentChartInterface());
- addChartTypeInterface(CHART_PRIORITY, ChartConstants.METER_CHART, new MeterIndependentChartInterface());
- addChartTypeInterface(CHART_PRIORITY, ChartConstants.RANGE_CHART, new RangeIndependentChartInterface());
- addChartTypeInterface(CHART_PRIORITY, ChartConstants.CUSTOM_CHART, new CustomIndependentChartInterface());
- addChartTypeInterface(CHART_PRIORITY, ChartConstants.GANTT_CHART, new GanttIndependentChartInterface());
- addChartTypeInterface(CHART_PRIORITY, ChartConstants.DONUT_CHART, new DonutIndependentChartInterface());
- addChartTypeInterface(CHART_PRIORITY, ChartConstants.MAP_CHART, new MapIndependentChartInterface());
- addChartTypeInterface(CHART_PRIORITY, ChartConstants.GIS_CHAER, new GisMapIndependentChartInterface());
- addChartTypeInterface(CHART_PRIORITY, ChartConstants.FUNNEL_CHART, new FunnelIndependentChartInterface());
+ addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.COLUMN_CHART, new ColumnIndependentChartInterface());
+ addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.LINE_CHART, new LineIndependentChartInterface());
+ addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.BAR_CHART, new BarIndependentChartInterface());
+ addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.PIE_CHART, new PieIndependentChartInterface());
+ addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.AREA_CHART, new AreaIndependentChartInterface());
+ addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.SCATTER_CHART, new XYScatterIndependentChartInterface());
+ addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.BUBBLE_CHART, new BubbleIndependentChartInterface());
+ addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.RADAR_CHART, new RadarIndependentChartInterface());
+ addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.STOCK_CHART, new StockIndependentChartInterface());
+ addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.METER_CHART, new MeterIndependentChartInterface());
+ addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.RANGE_CHART, new RangeIndependentChartInterface());
+ addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.CUSTOM_CHART, new CustomIndependentChartInterface());
+ addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.GANTT_CHART, new GanttIndependentChartInterface());
+ addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.DONUT_CHART, new DonutIndependentChartInterface());
+ addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.MAP_CHART, new MapIndependentChartInterface());
+ addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.GIS_CHAER, new GisMapIndependentChartInterface());
+ addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.FUNNEL_CHART, new FunnelIndependentChartInterface());
}
private static void addChartTypeInterface(String priority, String plotID, IndependentChartUIProvider provider) {
@@ -462,7 +464,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
public void mount(PluginSingleInjection injection) {
if (isIndependentChartUIProvider(injection)) {
- String priority = injection.getAttribute("priority", CHART_PRIORITY);
+ String priority = injection.getAttribute("priority", DEFAULT_PRIORITY);
String plotID = injection.getAttribute("plotID");
IndependentChartUIProvider instance = (IndependentChartUIProvider) injection.getObject();
addChartTypeInterface(priority, plotID, instance);
@@ -474,7 +476,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
public void demount(PluginSingleInjection injection) {
if (isIndependentChartUIProvider(injection)) {
- String priority = injection.getAttribute("priority", CHART_PRIORITY);
+ String priority = injection.getAttribute("priority", DEFAULT_PRIORITY);
String plotID = injection.getAttribute("plotID");
removeChartTypeInterface(priority, plotID);
}
diff --git a/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java b/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java
index de7d08a2b0..d914a81e8b 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java
@@ -16,6 +16,7 @@ import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.license.exception.RegistEditionException;
import com.fr.license.function.VT4FR;
+import com.fr.locale.InterProviderFactory;
import com.fr.log.FineLoggerFactory;
import javax.swing.BorderFactory;
@@ -67,7 +68,7 @@ public class ChartTypePane extends ChartCommonWizardPane {
mainTypeList = new JList(defaultListModel);
for (int i = 0; i < typeName.length; i++) {
- defaultListModel.insertElementAt(com.fr.design.i18n.Toolkit.i18nText(typeName[i].getName()), i);
+ defaultListModel.insertElementAt(InterProviderFactory.getProvider().getLocText(typeName[i].getName()), i);
}
mainTypeList.addListSelectionListener(listSelectionListener);
diff --git a/designer-chart/src/main/java/com/fr/design/chart/axis/MinMaxValuePane.java b/designer-chart/src/main/java/com/fr/design/chart/axis/MinMaxValuePane.java
index a84cfd693e..79323d73de 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/axis/MinMaxValuePane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/axis/MinMaxValuePane.java
@@ -35,9 +35,9 @@ public class MinMaxValuePane extends JPanel {
minValueField = new UITextField(6);
maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Max_Value"));
maxValueField = new UITextField(6);
- isCustomMainUnitBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Main_Graduation_Unit"));
+ isCustomMainUnitBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Main_Type"));
mainUnitField = new UITextField(6);
- isCustomSecUnitBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Second_Graduation_Unit"));
+ isCustomSecUnitBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Second_Type"));
secUnitField = new UITextField(6);
double p = TableLayout.PREFERRED;
diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AreaPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AreaPlotPane.java
index 42667ee9d9..425f508070 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AreaPlotPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AreaPlotPane.java
@@ -8,6 +8,8 @@ import com.fr.chart.chartattr.Chart;
import com.fr.chart.chartattr.Plot;
import com.fr.chart.chartglyph.ConditionCollection;
import com.fr.chart.charttypes.AreaIndependentChart;
+import com.fr.design.i18n.Toolkit;
+import com.fr.locale.InterProviderFactory;
/**
@@ -33,10 +35,10 @@ public class AreaPlotPane extends AbstractChartTypePane{
@Override
protected String[] getTypeTipName() {
- String area = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Area");
- String stack = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stacked");
- String percent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent");
- String td = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_3D");
+ String area = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Area");
+ String stack = Toolkit.i18nText("Fine-Design_Chart_Stacked");
+ String percent = Toolkit.i18nText("Fine-Design_Chart_Use_Percent");
+ String td = Toolkit.i18nText("Fine-Design_Chart_3D");
return new String[]{
stack + area,
percent + stack + area,
@@ -139,7 +141,7 @@ public class AreaPlotPane extends AbstractChartTypePane{
* @return 界面标题
*/
public String title4PopupWindow() {
- return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Area");
+ return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Area");
}
public Chart getDefaultChart() {
diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BarPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BarPlotPane.java
index 280fca724c..cd5e1b4d66 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BarPlotPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BarPlotPane.java
@@ -6,6 +6,8 @@ import com.fr.chart.chartattr.BarPlot;
import com.fr.chart.chartattr.Chart;
import com.fr.chart.chartattr.Plot;
import com.fr.chart.charttypes.BarIndependentChart;
+import com.fr.design.i18n.Toolkit;
+import com.fr.locale.InterProviderFactory;
import com.fr.log.FineLoggerFactory;
@@ -31,16 +33,16 @@ public class BarPlotPane extends AbstractBarPane{
@Override
protected String[] getTypeTipName() {
- String bar = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Bar");
- String stack = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stacked");
- String percent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent");
- String td = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_3D");
+ String bar = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Bar");
+ String stack = Toolkit.i18nText("Fine-Design_Chart_Stacked");
+ String percent = Toolkit.i18nText("Fine-Design_Chart_Use_Percent");
+ String td = Toolkit.i18nText("Fine-Design_Chart_3D");
return new String[]{
bar,
stack + bar,
percent + stack + bar,
td + bar,
- td + bar + "(" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Direction_Horizontal") + ")",
+ td + bar + "(" + Toolkit.i18nText("Fine-Design_Chart_Direction_Horizontal") + ")",
td + stack + bar,
td + percent + stack + bar
};
@@ -65,8 +67,8 @@ public class BarPlotPane extends AbstractBarPane{
* @return 界面标题
*/
public String title4PopupWindow() {
- return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Bar");
- }
+ return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Bar");
+ }
protected Plot getSelectedClonedPlot(){
Chart[] barChart = BarIndependentChart.barChartTypes;
diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BubblePlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BubblePlotPane.java
index 103dbd1940..b3e7cd34ae 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BubblePlotPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BubblePlotPane.java
@@ -4,6 +4,7 @@ import com.fr.chart.base.ChartConstants;
import com.fr.chart.chartattr.BubblePlot;
import com.fr.chart.chartattr.Chart;
import com.fr.chart.charttypes.BubbleIndependentChart;
+import com.fr.locale.InterProviderFactory;
/**
@@ -25,9 +26,9 @@ public class BubblePlotPane extends AbstractChartTypePane {
@Override
protected String[] getTypeTipName() {
return new String[]{
- com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble_Chart")
+ InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Bubble_Chart")
};
- }
+ }
@Override
protected String[] getTypeLayoutPath() {
@@ -44,7 +45,7 @@ public class BubblePlotPane extends AbstractChartTypePane {
* @return 界面标题
*/
public String title4PopupWindow() {
- return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble_Chart");
+ return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Bubble_Chart");
}
/**
diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ColumnPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ColumnPlotPane.java
index 5f290d5926..55de24714b 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ColumnPlotPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ColumnPlotPane.java
@@ -5,6 +5,8 @@ import com.fr.chart.chartattr.BarPlot;
import com.fr.chart.chartattr.Chart;
import com.fr.chart.chartattr.Plot;
import com.fr.chart.charttypes.ColumnIndependentChart;
+import com.fr.design.i18n.Toolkit;
+import com.fr.locale.InterProviderFactory;
import com.fr.log.FineLoggerFactory;
@@ -30,16 +32,16 @@ public class ColumnPlotPane extends AbstractBarPane{
@Override
protected String[] getTypeTipName() {
- String column = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Column");
- String stack = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stacked");
- String percent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent");
- String td = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_3D");
+ String column = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Column");
+ String stack = Toolkit.i18nText("Fine-Design_Chart_Stacked");
+ String percent = Toolkit.i18nText("Fine-Design_Chart_Use_Percent");
+ String td = Toolkit.i18nText("Fine-Design_Chart_3D");
return new String[]{
column,
stack + column,
percent + stack + column,
td + column,
- td + column + "(" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Direction_Horizontal") + ")",
+ td + column + "(" + Toolkit.i18nText("Fine-Design_Chart_Direction_Horizontal") + ")",
td + stack + column,
td + percent + stack + column
};
@@ -63,8 +65,8 @@ public class ColumnPlotPane extends AbstractBarPane{
* @return 界面标题
*/
public String title4PopupWindow() {
- return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Column");
- }
+ return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Column");
+ }
protected Plot getSelectedClonedPlot(){
Chart[] barChart = ColumnIndependentChart.columnChartTypes;
diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/CustomPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/CustomPlotPane.java
index d6a46df458..8e367444f3 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/CustomPlotPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/CustomPlotPane.java
@@ -3,6 +3,7 @@ package com.fr.design.mainframe.chart.gui.type;
import com.fr.chart.base.ChartConstants;
import com.fr.chart.chartattr.Chart;
import com.fr.chart.charttypes.CustomIndependentChart;
+import com.fr.locale.InterProviderFactory;
/**
@@ -26,9 +27,9 @@ public class CustomPlotPane extends AbstractChartTypePane {
@Override
protected String[] getTypeTipName() {
return new String[]{
- com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Combine_Chart")
+ InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Combine")
};
- }
+ }
@Override
protected String[] getTypeLayoutPath() {
@@ -45,7 +46,7 @@ public class CustomPlotPane extends AbstractChartTypePane {
* @return 界面标题
*/
public String title4PopupWindow() {
- return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Combine_Chart");
+ return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Combine");
}
/**
diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/DonutPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/DonutPlotPane.java
index e8643c34ff..c1cd47d78f 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/DonutPlotPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/DonutPlotPane.java
@@ -10,10 +10,11 @@ import com.fr.chart.chartattr.Donut3DPlot;
import com.fr.chart.chartattr.Plot;
import com.fr.chart.chartglyph.ConditionCollection;
import com.fr.chart.charttypes.DonutIndependentChart;
-
+import com.fr.design.i18n.Toolkit;
+import com.fr.locale.InterProviderFactory;
import com.fr.stable.Constants;
-import java.awt.*;
+import java.awt.Color;
import java.text.DecimalFormat;
/**
@@ -35,10 +36,10 @@ public class DonutPlotPane extends AbstractChartTypePane{
@Override
protected String[] getTypeTipName() {
- String donut = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Donut_Chart");
+ String donut = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Donut");
return new String[]{
donut,
- com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_3D") + donut
+ Toolkit.i18nText("Fine-Design_Chart_3D") + donut
};
}
@@ -103,8 +104,8 @@ public class DonutPlotPane extends AbstractChartTypePane{
* @return 标题
*/
public String title4PopupWindow() {
- return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Donut_Chart");
- }
+ return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Donut");
+ }
/**
* 是否有坐标轴
diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/FunnelPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/FunnelPlotPane.java
index 8f31c8c555..2de685cb82 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/FunnelPlotPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/FunnelPlotPane.java
@@ -7,7 +7,7 @@ import com.fr.chart.chartattr.Chart;
import com.fr.chart.chartattr.FunnelPlot;
import com.fr.chart.chartattr.Plot;
import com.fr.chart.charttypes.FunnelIndependentChart;
-
+import com.fr.locale.InterProviderFactory;
import java.text.DecimalFormat;
@@ -31,7 +31,7 @@ public class FunnelPlotPane extends AbstractChartTypePane{
@Override
protected String[] getTypeTipName() {
return new String[]{
- com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Funnel")
+ InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Funnel")
};
}
@@ -50,7 +50,7 @@ public class FunnelPlotPane extends AbstractChartTypePane{
* @return 界面标题
*/
public String title4PopupWindow() {
- return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Funnel");
+ return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Funnel");
}
/**
diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GanttPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GanttPlotPane.java
index 537fa46289..b1845bfe4c 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GanttPlotPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GanttPlotPane.java
@@ -3,6 +3,7 @@ package com.fr.design.mainframe.chart.gui.type;
import com.fr.chart.base.ChartConstants;
import com.fr.chart.chartattr.Chart;
import com.fr.chart.charttypes.GanttIndependentChart;
+import com.fr.locale.InterProviderFactory;
/**
@@ -24,9 +25,9 @@ public class GanttPlotPane extends AbstractChartTypePane{
@Override
protected String[] getTypeTipName() {
return new String[]{
- com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gantt_Chart")
+ InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Gantt")
};
- }
+ }
@Override
protected String getPlotTypeID() {
@@ -47,7 +48,7 @@ public class GanttPlotPane extends AbstractChartTypePane{
* @return 界面标题
*/
public String title4PopupWindow() {
- return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gantt_Chart");
+ return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Gantt");
}
/**
diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GisMapPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GisMapPlotPane.java
index 25d2fa48f2..9911ce4fbf 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GisMapPlotPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GisMapPlotPane.java
@@ -11,11 +11,12 @@ import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
+import com.fr.locale.InterProviderFactory;
import com.fr.log.FineLoggerFactory;
-
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Component;
public class GisMapPlotPane extends AbstractChartTypePane{
@@ -72,9 +73,9 @@ public class GisMapPlotPane extends AbstractChartTypePane{
@Override
protected String[] getTypeTipName() {
return new String[]{
- "gis"+com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Map")
+ InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_GIS_Map")
};
- }
+ }
@Override
protected String getPlotTypeID() {
@@ -172,7 +173,7 @@ public class GisMapPlotPane extends AbstractChartTypePane{
* @return 标题
*/
public String title4PopupWindow() {
- return "gis"+com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Map");
+ return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_GIS_Map");
}
/**
diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/LinePlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/LinePlotPane.java
index 5afd3e2177..0f93938bb0 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/LinePlotPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/LinePlotPane.java
@@ -5,6 +5,7 @@ import com.fr.chart.chartattr.Chart;
import com.fr.chart.chartattr.LinePlot;
import com.fr.chart.chartattr.Plot;
import com.fr.chart.charttypes.LineIndependentChart;
+import com.fr.locale.InterProviderFactory;
import com.fr.log.FineLoggerFactory;
@@ -21,9 +22,9 @@ public class LinePlotPane extends AbstractChartTypePane{
@Override
protected String[] getTypeTipName() {
return new String[]{
- com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Chart")
+ InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Line")
};
- }
+ }
@Override
protected String[] getTypeLayoutPath() {
@@ -83,7 +84,7 @@ public class LinePlotPane extends AbstractChartTypePane{
}
public String title4PopupWindow() {
- return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Chart");
+ return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Line");
}
public Chart getDefaultChart() {
diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MapPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MapPlotPane.java
index 6f9a55ab56..d761be3712 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MapPlotPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MapPlotPane.java
@@ -10,6 +10,7 @@ import com.fr.chart.charttypes.MapIndependentChart;
import com.fr.design.chart.series.PlotSeries.MapGroupExtensionPane;
import com.fr.design.chart.series.PlotStyle.ChartSelectDemoPane;
import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.locale.InterProviderFactory;
import com.fr.log.FineLoggerFactory;
import javax.swing.JPanel;
@@ -71,7 +72,7 @@ public class MapPlotPane extends AbstractChartTypePane {
* @return 界面标题
*/
public String title4PopupWindow() {
- return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Map");
+ return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_SVG_MAP");
}
/**
diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MeterPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MeterPlotPane.java
index 811053641a..10293b68c7 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MeterPlotPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MeterPlotPane.java
@@ -6,6 +6,8 @@ import com.fr.chart.chartattr.MeterPlot;
import com.fr.chart.chartattr.Plot;
import com.fr.chart.chartglyph.MeterStyle;
import com.fr.chart.charttypes.MeterIndependentChart;
+import com.fr.design.i18n.Toolkit;
+import com.fr.locale.InterProviderFactory;
import com.fr.log.FineLoggerFactory;
@@ -31,9 +33,9 @@ public class MeterPlotPane extends AbstractChartTypePane {
@Override
protected String[] getTypeTipName() {
- String meter = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Gauge");
+ String meter = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Meter");
return new String[]{
- com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Mode_Custom") + meter,
+ Toolkit.i18nText("Fine-Design_Chart_Mode_Custom") + meter,
meter + "1",
meter + "2"
};
@@ -77,13 +79,13 @@ public class MeterPlotPane extends AbstractChartTypePane {
* @return 界面标题
*/
public String title4PopupWindow() {
- return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Gauge");
- }
-
- /**
- * 保存界面属性
- */
- public void updateBean(Chart chart) {
+ return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Meter");
+ }
+
+ /**
+ * 保存界面属性
+ */
+ public void updateBean(Chart chart) {
if(needsResetChart(chart)){
resetChart(chart);
}
diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/PiePlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/PiePlotPane.java
index 98ccb0e533..eeccd2246e 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/PiePlotPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/PiePlotPane.java
@@ -10,10 +10,10 @@ import com.fr.chart.chartattr.PiePlot;
import com.fr.chart.chartattr.Plot;
import com.fr.chart.chartglyph.ConditionCollection;
import com.fr.chart.charttypes.PieIndependentChart;
-
+import com.fr.locale.InterProviderFactory;
import com.fr.stable.Constants;
-import java.awt.*;
+import java.awt.Color;
import java.text.DecimalFormat;
/**
@@ -36,11 +36,11 @@ public class PiePlotPane extends AbstractChartTypePane{
@Override
protected String[] getTypeTipName() {
- String pie = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Pie");
+ String pie = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Pie");
return new String[]{
- pie,
- com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_3D") + pie
- };
+ pie,
+ com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_3D") + pie
+ };
}
@Override
@@ -63,7 +63,7 @@ public class PiePlotPane extends AbstractChartTypePane{
* @return 界面标题
*/
public String title4PopupWindow() {
- return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Pie");
+ return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Pie");
}
private void createPieCondition(Plot plot) {
diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RadarPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RadarPlotPane.java
index 631a4d9d46..50e4a756eb 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RadarPlotPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RadarPlotPane.java
@@ -3,6 +3,7 @@ package com.fr.design.mainframe.chart.gui.type;
import com.fr.chart.base.ChartConstants;
import com.fr.chart.chartattr.Chart;
import com.fr.chart.charttypes.RadarIndependentChart;
+import com.fr.locale.InterProviderFactory;
/**
@@ -24,9 +25,9 @@ public class RadarPlotPane extends AbstractChartTypePane{
@Override
protected String[] getTypeTipName() {
return new String[]{
- com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Radar_Chart")
+ InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Radar")
};
- }
+ }
@Override
protected String getPlotTypeID() {
@@ -48,7 +49,7 @@ public class RadarPlotPane extends AbstractChartTypePane{
* @return 界面标题
*/
public String title4PopupWindow() {
- return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Radar_Chart");
+ return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Radar");
}
/**
diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RangePlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RangePlotPane.java
index 405f9aa4fc..f87c6074d4 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RangePlotPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RangePlotPane.java
@@ -4,6 +4,7 @@ import com.fr.chart.base.ChartConstants;
import com.fr.chart.chartattr.Chart;
import com.fr.chart.chartattr.RangePlot;
import com.fr.chart.charttypes.RangeIndependentChart;
+import com.fr.locale.InterProviderFactory;
/**
@@ -25,9 +26,9 @@ public class RangePlotPane extends AbstractChartTypePane{
@Override
protected String[] getTypeTipName() {
return new String[]{
- com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Range_Chart")
+ InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Range")
};
- }
+ }
@Override
protected String getPlotTypeID() {
@@ -49,7 +50,7 @@ public class RangePlotPane extends AbstractChartTypePane{
* @return 界面标题
*/
public String title4PopupWindow() {
- return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Range_Chart");
+ return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Range");
}
/**
diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/StockPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/StockPlotPane.java
index 567595703c..63f4ead335 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/StockPlotPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/StockPlotPane.java
@@ -3,6 +3,7 @@ package com.fr.design.mainframe.chart.gui.type;
import com.fr.chart.base.ChartConstants;
import com.fr.chart.chartattr.Chart;
import com.fr.chart.charttypes.StockIndependentChart;
+import com.fr.locale.InterProviderFactory;
/**
@@ -24,9 +25,9 @@ public class StockPlotPane extends AbstractChartTypePane {
@Override
protected String[] getTypeTipName() {
return new String[]{
- com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stock_Chart")
+ InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Stock")
};
- }
+ }
@Override
protected String getPlotTypeID() {
@@ -48,7 +49,7 @@ public class StockPlotPane extends AbstractChartTypePane {
* @return 界面标题
*/
public String title4PopupWindow() {
- return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stock_Chart");
+ return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Stock");
}
/**
diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/XYScatterPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/XYScatterPlotPane.java
index 0effae28e1..46a5b13c07 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/XYScatterPlotPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/XYScatterPlotPane.java
@@ -6,7 +6,7 @@ import com.fr.chart.chartattr.Chart;
import com.fr.chart.chartattr.XYScatterPlot;
import com.fr.chart.chartglyph.ConditionAttr;
import com.fr.chart.charttypes.XYScatterIndependentChart;
-
+import com.fr.locale.InterProviderFactory;
import com.fr.stable.Constants;
/**
@@ -28,9 +28,9 @@ public class XYScatterPlotPane extends AbstractChartTypePane{
@Override
protected String[] getTypeTipName() {
return new String[]{
- com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_I_XYScatterStyle_Marker")
+ InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_XYScatter")
};
- }
+ }
@Override
protected String[] getTypeLayoutPath() {
@@ -47,7 +47,7 @@ public class XYScatterPlotPane extends AbstractChartTypePane{
* @return 界面标题
*/
public String title4PopupWindow() {
- return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_I_XYScatterStyle_Marker");
+ return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_XYScatter");
}
/**
diff --git a/designer-chart/src/main/java/com/fr/extended/chart/ExtendedOtherPane.java b/designer-chart/src/main/java/com/fr/extended/chart/ExtendedOtherPane.java
index 31aa2d0033..6fba552b76 100644
--- a/designer-chart/src/main/java/com/fr/extended/chart/ExtendedOtherPane.java
+++ b/designer-chart/src/main/java/com/fr/extended/chart/ExtendedOtherPane.java
@@ -11,6 +11,7 @@ import com.fr.design.mainframe.chart.AbstractChartAttrPane;
import com.fr.design.mainframe.chart.PaneTitleConstants;
import com.fr.van.chart.designer.TableLayout4VanChartHelper;
+import javax.swing.BorderFactory;
import javax.swing.JPanel;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
@@ -138,4 +139,10 @@ public class ExtendedOtherPane extends AbstractChartAtt
return PaneTitleConstants.CHART_OTHER_TITLE;
}
+ @Override
+ protected void initContentPane() {
+ leftContentPane = createContentPane();
+ leftContentPane.setBorder(BorderFactory.createMatteBorder(10, 3, 0, 10, original));
+ this.add(leftContentPane, BorderLayout.CENTER);
+ }
}
diff --git a/designer-chart/src/main/resources/com/fr/aspectj/designerchart/TemplateProcessTracker.aj b/designer-chart/src/main/resources/com/fr/aspectj/designerchart/TemplateProcessTracker.aj
index 89ed91033f..a2d2fb7b48 100644
--- a/designer-chart/src/main/resources/com/fr/aspectj/designerchart/TemplateProcessTracker.aj
+++ b/designer-chart/src/main/resources/com/fr/aspectj/designerchart/TemplateProcessTracker.aj
@@ -4,13 +4,10 @@ package com.fr.aspectj.designerchart;
* Created by plough on 2017/3/3.
*/
import com.fr.chart.chartattr.Chart;
-import com.fr.design.mainframe.templateinfo.TemplateInfoCollector;
import org.aspectj.lang.reflect.SourceLocation;
-import javax.swing.event.ListSelectionEvent;
import java.awt.event.ActionEvent;
import java.awt.event.MouseEvent;
-import java.util.Date;
public aspect TemplateProcessTracker {
//声明一个pointcut，匹配你需要的方法
diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XTreeEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XTreeEditor.java
index c5672b389f..bde83a176b 100644
--- a/designer-form/src/main/java/com/fr/design/designer/creator/XTreeEditor.java
+++ b/designer-form/src/main/java/com/fr/design/designer/creator/XTreeEditor.java
@@ -73,7 +73,7 @@ public class XTreeEditor extends XWidgetCreator {
crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("ajax", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Load_By_Async")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
- "Advanced"));
+ "Fine-Design_Basic_Advanced"));
crp = this.addAllowEdit(crp);
crp = this.addCustomData(crp);
diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XWFitLayout.java b/designer-form/src/main/java/com/fr/design/designer/creator/XWFitLayout.java
index c9b55b298f..8d3d75a358 100644
--- a/designer-form/src/main/java/com/fr/design/designer/creator/XWFitLayout.java
+++ b/designer-form/src/main/java/com/fr/design/designer/creator/XWFitLayout.java
@@ -1,15 +1,5 @@
package com.fr.design.designer.creator;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Rectangle;
-import java.awt.Toolkit;
-import java.awt.event.ContainerEvent;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
import com.fr.design.designer.beans.LayoutAdapter;
import com.fr.design.designer.beans.adapters.layout.FRFitLayoutAdapter;
import com.fr.design.designer.beans.location.Direction;
@@ -24,17 +14,25 @@ import com.fr.design.mainframe.WidgetPropertyPane;
import com.fr.design.utils.gui.LayoutUtils;
import com.fr.form.ui.PaddingMargin;
import com.fr.form.ui.Widget;
+import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
import com.fr.form.ui.container.WBodyLayoutType;
import com.fr.form.ui.container.WFitLayout;
import com.fr.form.ui.container.WLayout;
import com.fr.general.FRLogger;
import com.fr.general.FRScreen;
-import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
-
import com.fr.stable.ArrayUtils;
import edu.emory.mathcs.backport.java.util.Arrays;
import javax.swing.JOptionPane;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Rectangle;
+import java.awt.Toolkit;
+import java.awt.event.ContainerEvent;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
/**
diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/BodyMobilePropertyUI.java b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/BodyMobilePropertyUI.java
index 5175b30dce..401f7d2f2d 100644
--- a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/BodyMobilePropertyUI.java
+++ b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/BodyMobilePropertyUI.java
@@ -1,8 +1,7 @@
package com.fr.design.designer.properties.mobile;
import com.fr.design.designer.creator.XCreator;
-import com.fr.design.designer.creator.XWAbsoluteBodyLayout;
-import com.fr.design.designer.creator.XWFitLayout;
+import com.fr.design.designer.creator.XLayoutContainer;
import com.fr.design.dialog.BasicPane;
import com.fr.design.fun.impl.AbstractWidgetPropertyUIProvider;
import com.fr.design.gui.itable.AbstractPropertyTable;
@@ -16,19 +15,19 @@ public class BodyMobilePropertyUI extends AbstractWidgetPropertyUIProvider {
private XCreator xCreator;
- public BodyMobilePropertyUI(XWFitLayout xwFitLayout) {
+ public BodyMobilePropertyUI(XLayoutContainer xwFitLayout) {
this.xCreator = xwFitLayout;
}
- public BodyMobilePropertyUI(XWAbsoluteBodyLayout xwAbsoluteBodyLayout) {
- this.xCreator = xwAbsoluteBodyLayout;
- }
-
@Override
public AbstractPropertyTable createWidgetAttrTable() {
return null;
}
+ public XCreator getxCreator() {
+ return xCreator;
+ }
+
@Override
public BasicPane createWidgetAttrPane() {
return new BodyMobileDefinePane(xCreator);
diff --git a/designer-form/src/main/java/com/fr/design/form/util/FormDesignerUtils.java b/designer-form/src/main/java/com/fr/design/form/util/FormDesignerUtils.java
new file mode 100644
index 0000000000..d976816f56
--- /dev/null
+++ b/designer-form/src/main/java/com/fr/design/form/util/FormDesignerUtils.java
@@ -0,0 +1,28 @@
+package com.fr.design.form.util;
+
+import com.fr.design.mainframe.FormDesigner;
+import com.fr.form.ui.container.WFitLayout;
+
+public class FormDesignerUtils {
+ /**
+ * body布局是否设置了手机重布局
+ *
+ * @param designer
+ * @return
+ */
+ public static boolean isAppRelayout(FormDesigner designer) {
+ return ((WFitLayout) designer.getRootComponent().toData()).isAppRelayout();
+ }
+
+ /**
+ * body布局是否设置了绝对布局
+ *
+ * @param designer
+ * @return
+ */
+ public static boolean isBodyAbsolute(FormDesigner designer) {
+ WFitLayout root = ((WFitLayout) designer.getRootComponent().toData());
+ return root.getBodyLayoutType() == com.fr.form.ui.container.WBodyLayoutType.ABSOLUTE;
+ }
+
+}
\ No newline at end of file
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormModelAdapter.java b/designer-form/src/main/java/com/fr/design/mainframe/FormModelAdapter.java
index 670c2fa489..090969d348 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/FormModelAdapter.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/FormModelAdapter.java
@@ -78,6 +78,10 @@ public class FormModelAdapter extends DesignModelAdapter>
list.add(new WidgetName(widget.getWidgetName()));
}
}
+ @Override
+ public boolean dealWithAllCards() {
+ return true;
+ }
});
return list;
}
@@ -135,4 +139,4 @@ public class FormModelAdapter extends DesignModelAdapter>
protected Parameter[] getLatestParameters() {
return this.getBook().getParameters();
}
-}
\ No newline at end of file
+}
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java
index d25ba6feee..bcf761fac5 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java
@@ -37,8 +37,8 @@ import com.fr.design.gui.xpane.FormHyperlinkGroupPaneNoPop;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.mainframe.form.FormECCompositeProvider;
import com.fr.design.mainframe.form.FormECDesignerProvider;
-import com.fr.design.mainframe.templateinfo.JFormProcessInfo;
-import com.fr.design.mainframe.templateinfo.TemplateProcessInfo;
+import com.fr.design.mainframe.template.info.JFormProcessInfo;
+import com.fr.design.mainframe.template.info.TemplateProcessInfo;
import com.fr.design.mainframe.toolbar.ToolBarMenuDock;
import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;
import com.fr.design.menu.KeySetUtils;
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/templateinfo/JFormProcessInfo.java b/designer-form/src/main/java/com/fr/design/mainframe/template/info/JFormProcessInfo.java
similarity index 95%
rename from designer-form/src/main/java/com/fr/design/mainframe/templateinfo/JFormProcessInfo.java
rename to designer-form/src/main/java/com/fr/design/mainframe/template/info/JFormProcessInfo.java
index 15f501b138..fce5ab8090 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/templateinfo/JFormProcessInfo.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/template/info/JFormProcessInfo.java
@@ -1,4 +1,4 @@
-package com.fr.design.mainframe.templateinfo;
+package com.fr.design.mainframe.template.info;
import com.fr.form.main.Form;
import com.fr.form.ui.container.WLayout;
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java
index 65e2f66598..3e70f7d0f6 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java
@@ -28,6 +28,7 @@ import com.fr.design.widget.Operator;
import com.fr.design.widget.ui.designer.component.WidgetAbsoluteBoundPane;
import com.fr.design.widget.ui.designer.component.WidgetBoundPane;
import com.fr.design.widget.ui.designer.component.WidgetCardTagBoundPane;
+import com.fr.form.ui.FormWidgetHelper;
import com.fr.form.ui.Widget;
import com.fr.form.ui.container.WScaleLayout;
import com.fr.form.ui.container.WTitleLayout;
@@ -102,6 +103,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
/**
* 后台初始化所有事件.
*/
+ @Override
public void initAllListeners() {
}
@@ -113,7 +115,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
initListener(this);
}
-
+ @Override
protected void initContentPane() {
}
@@ -214,13 +216,23 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
Widget widget = currentEditorDefinePane.updateBean();
if (ComparatorUtils.equals(getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Basic")) && widgetPropertyPane != null) {
UITextField widgetNameField = widgetPropertyPane.getWidgetNameField();
- if (designer.getTarget().isNameExist(widgetNameField.getText()) && !ComparatorUtils.equals(widgetNameField.getText(), widget.getWidgetName())) {
- widgetNameField.setText(widget.getWidgetName());
+ String toSetWidgetName = widgetNameField.getText();
+ String currentWidgetName = widget.getWidgetName();
+ // 设置的组件名和当前组件名相同 直接返回
+ if (ComparatorUtils.equals(toSetWidgetName, currentWidgetName)) {
+ return;
+ }
+ String containerName = designer.getTarget().getContainer().getWidgetName();
+ Widget existWidget = FormWidgetHelper.findWidgetByName(widget, widgetNameField.getText());
+ // 判断设置的组件名是否和容器同名以及组件是否在容器在存在 满足任何其一 抛出提示
+ boolean exist = ComparatorUtils.equals(containerName, toSetWidgetName) || existWidget != null;
+ if (exist) {
+ widgetNameField.setText(currentWidgetName);
JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Rename_Failure"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Joption_News"), JOptionPane.ERROR_MESSAGE, BaseUtils.readIcon("com/fr/design/form/images/joption_failure.png"));
return;
}
widgetPropertyPane.update(widget);
- xCreator.resetCreatorName(widget.getWidgetName());
+ xCreator.resetCreatorName(toSetWidgetName);
xCreator.resetVisible(widget.isVisible());
designer.getEditListenerTable().fireCreatorModified(xCreator, DesignerEvent.CREATOR_RENAMED);
return;
diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/XmlRelationedBasicPane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/XmlRelationedBasicPane.java
new file mode 100644
index 0000000000..1f9b13693f
--- /dev/null
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/XmlRelationedBasicPane.java
@@ -0,0 +1,18 @@
+package com.fr.design.widget.ui.designer;
+
+import com.fr.design.dialog.BasicPane;
+
+/**
+ * 有些控件在不同终端需要对相同的属性分别进行设置,基础设置面板是一样的但是映射到控件上的属性又是不一样的,为了重用面板,这边加上xmltag做区分
+ */
+public abstract class XmlRelationedBasicPane extends BasicPane{
+ private String xmlTag;
+
+ public XmlRelationedBasicPane(String xmlTag) {
+ this.xmlTag = xmlTag;
+ }
+
+ public String getXmlTag() {
+ return xmlTag;
+ }
+}
\ No newline at end of file
diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/PaddingBoundPane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/PaddingBoundPane.java
index 9b4a432a22..856ff6a0c8 100644
--- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/PaddingBoundPane.java
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/PaddingBoundPane.java
@@ -21,22 +21,26 @@ import java.awt.Component;
/**
* Created by ibm on 2017/8/3.
*/
-public class PaddingBoundPane extends BasicPane{
+public class PaddingBoundPane extends BasicPane {
protected UISpinner top;
protected UISpinner bottom;
protected UISpinner left;
protected UISpinner right;
public PaddingBoundPane() {
- initBoundPane();
+ initBoundPane(0, 0, 0, 0);
}
- public void initBoundPane() {
+ public PaddingBoundPane(int top, int bottom, int left, int right) {
+ initBoundPane(top, bottom, left, right);
+ }
+
+ public void initBoundPane(int t, int b, int l, int r) {
this.setLayout(FRGUIPaneFactory.createBorderLayout());
- top = new UISpinner(0, Integer.MAX_VALUE, 1, 0);
- bottom = new UISpinner(0, Integer.MAX_VALUE, 1, 0);
- left = new UISpinner(0, Integer.MAX_VALUE, 1, 0);
- right = new UISpinner(0, Integer.MAX_VALUE, 1, 0);
+ top = new UISpinner(0, Integer.MAX_VALUE, 1, t);
+ bottom = new UISpinner(0, Integer.MAX_VALUE, 1, b);
+ left = new UISpinner(0, Integer.MAX_VALUE, 1, l);
+ right = new UISpinner(0, Integer.MAX_VALUE, 1, r);
top.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Padding_Duplicate"));
bottom.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Padding_Duplicate"));
left.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Padding_Duplicate"));
@@ -45,12 +49,12 @@ public class PaddingBoundPane extends BasicPane{
label.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, 0, 0));
label.setVerticalAlignment(SwingConstants.TOP);
JPanel panel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
- new Component[]{label, createRightPane()}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W2, IntervalConstants.INTERVAL_L1 );
+ new Component[]{label, createRightPane()}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W2, IntervalConstants.INTERVAL_L1);
this.add(panel);
}
- public JPanel createRightPane(){
+ public JPanel createRightPane() {
double f = TableLayout.FILL;
double p = TableLayout.PREFERRED;
double[] rowSize = {p, p};
@@ -67,7 +71,7 @@ public class PaddingBoundPane extends BasicPane{
JPanel northPanel = TableLayoutHelper.createGapTableLayoutPane(components1, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L6);
northPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, IntervalConstants.INTERVAL_L1, 0));
JPanel centerPanel = TableLayoutHelper.createGapTableLayoutPane(components2, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L6);
- JPanel panel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+ JPanel panel = FRGUIPaneFactory.createBorderLayout_S_Pane();
panel.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, IntervalConstants.INTERVAL_L1, 0));
panel.add(northPanel, BorderLayout.NORTH);
panel.add(centerPanel, BorderLayout.CENTER);
@@ -75,20 +79,26 @@ public class PaddingBoundPane extends BasicPane{
}
public void update(RichStyleWidgetProvider marginWidget) {
- marginWidget.setMargin(new PaddingMargin((int)top.getValue(), (int)left.getValue(), (int)bottom.getValue(), (int)right.getValue() ));
+ marginWidget.setMargin(updateBean());
+ }
+
+ public PaddingMargin updateBean() {
+ return new PaddingMargin((int) top.getValue(), (int) left.getValue(), (int) bottom.getValue(), (int) right.getValue());
}
+ @Override
protected String title4PopupWindow() {
return "PaddingBoundPane";
}
public void populate(RichStyleWidgetProvider marginWidget) {
- PaddingMargin paddingMargin = marginWidget.getMargin();
- top.setValue(paddingMargin.getTop());
- bottom.setValue(paddingMargin.getBottom());
- left.setValue(paddingMargin.getLeft());
- right.setValue(paddingMargin.getRight());
+ populateBean(marginWidget.getMargin());
}
-
+ public void populateBean(PaddingMargin paddingMargin) {
+ top.setValueWithoutEvent(paddingMargin.getTop());
+ bottom.setValueWithoutEvent(paddingMargin.getBottom());
+ left.setValueWithoutEvent(paddingMargin.getLeft());
+ right.setValueWithoutEvent(paddingMargin.getRight());
+ }
}
diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/BodyMobileDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/BodyMobileDefinePane.java
index 11c5023ef1..b91e1d7b68 100644
--- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/BodyMobileDefinePane.java
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/BodyMobileDefinePane.java
@@ -1,21 +1,25 @@
package com.fr.design.widget.ui.designer.mobile;
+import com.fr.base.iofile.attr.FormBodyPaddingAttrMark;
import com.fr.design.designer.beans.events.DesignerEvent;
import com.fr.design.designer.creator.XCreator;
import com.fr.design.foldablepane.UIExpandablePane;
+import com.fr.design.form.util.FormDesignerUtils;
import com.fr.design.gui.frpane.AttributeChangeListener;
import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.mainframe.FormDesigner;
import com.fr.design.mainframe.MobileWidgetListPane;
import com.fr.design.mainframe.WidgetPropertyPane;
+import com.fr.design.widget.ui.designer.mobile.component.MobileComponentAdvancePane;
+import com.fr.design.widget.ui.designer.mobile.component.MobileComponentLayoutIntervalPane;
+import com.fr.form.ui.RichStyleWidgetProvider;
+import com.fr.form.ui.container.WFitLayout;
import com.fr.form.ui.container.WSortLayout;
-
import javax.swing.BorderFactory;
import javax.swing.JPanel;
import java.awt.BorderLayout;
-import java.lang.reflect.Method;
/**
* Created by plough on 2018/2/1.
@@ -26,22 +30,40 @@ public class BodyMobileDefinePane extends MobileWidgetDefinePane {
private AttributeChangeListener changeListener;
private UICheckBox appRelayoutCheck;
private MobileWidgetListPane mobileWidgetListPane;
+ private MobileComponentAdvancePane advancePane;
+ private MobileComponentLayoutIntervalPane intervalPane;
public BodyMobileDefinePane(XCreator xCreator) {
this.bodyCreator = xCreator;
}
+ public XCreator getBodyCreator() {
+ return bodyCreator;
+ }
+
+ public void setBodyCreator(XCreator bodyCreator) {
+ this.bodyCreator = bodyCreator;
+ }
+
+ public FormDesigner getDesigner() {
+ return designer;
+ }
+
+ public void setDesigner(FormDesigner designer) {
+ this.designer = designer;
+ }
+
@Override
public void initPropertyGroups(Object source) {
this.setLayout(FRGUIPaneFactory.createBorderLayout());
this.designer = WidgetPropertyPane.getInstance().getEditingFormDesigner();
- this.add(getMobilePropertyPane(), BorderLayout.NORTH);
+ this.add(createNorthPane(), BorderLayout.NORTH);
this.add(getMobileWidgetListPane(), BorderLayout.CENTER);
this.repaint();
}
// 手机属性
- private UIExpandablePane getMobilePropertyPane() {
+ public UIExpandablePane getMobilePropertyPane() {
JPanel panel = FRGUIPaneFactory.createBorderLayout_S_Pane();
appRelayoutCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_App_ReLayout"), true);
appRelayoutCheck.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));
@@ -55,7 +77,7 @@ public class BodyMobileDefinePane extends MobileWidgetDefinePane {
}
// 控件顺序
- private UIExpandablePane getMobileWidgetListPane() {
+ public UIExpandablePane getMobileWidgetListPane() {
mobileWidgetListPane = new MobileWidgetListPane(designer, (WSortLayout) bodyCreator.toData());
mobileWidgetListPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 5, 0));
JPanel panelWrapper = FRGUIPaneFactory.createBorderLayout_S_Pane();
@@ -64,6 +86,24 @@ public class BodyMobileDefinePane extends MobileWidgetDefinePane {
return new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Order"), 280, 20, panelWrapper);
}
+ private JPanel createNorthPane() {
+ JPanel holder = FRGUIPaneFactory.createBorderLayout_S_Pane();
+ holder.add(getMobilePropertyPane(), BorderLayout.NORTH);
+
+ advancePane = new MobileComponentAdvancePane(FormBodyPaddingAttrMark.XML_TAG);
+ intervalPane = new MobileComponentLayoutIntervalPane(FormBodyPaddingAttrMark.XML_TAG);
+ //高级
+ holder.add(advancePane, BorderLayout.CENTER);
+ //布局
+ holder.add(intervalPane, BorderLayout.SOUTH);
+
+ advancePane.setVisible(!shouldHidePadding(designer));
+ intervalPane.setVisible(!shouldHidePadding(designer));
+
+ return holder;
+ }
+
+
private void bindListeners2Widgets() {
reInitAllListeners();
this.changeListener = new AttributeChangeListener() {
@@ -81,25 +121,13 @@ public class BodyMobileDefinePane extends MobileWidgetDefinePane {
initListener(this);
}
- // body是否开启手机重布局
- private boolean isAppRelayout() {
- boolean result = false;
- try {
- Method m = bodyCreator.toData().getClass().getMethod("isAppRelayout");
- result = (boolean)m.invoke(bodyCreator.toData());
- } catch (Exception e) {
- // do nothing
- }
- return result;
- }
private void setAppRelayout(boolean appRelayoutSeleted) {
- if (appRelayoutSeleted == isAppRelayout()) {
+ if (appRelayoutSeleted == FormDesignerUtils.isAppRelayout(designer)) {
return;
}
try {
- Method m = bodyCreator.toData().getClass().getMethod("setAppRelayout", boolean.class);
- m.invoke(bodyCreator.toData(), appRelayoutSeleted);
+ ((WFitLayout) designer.getRootComponent().toData()).setAppRelayout(appRelayoutSeleted);
} catch (Exception e) {
// do nothing
}
@@ -108,17 +136,31 @@ public class BodyMobileDefinePane extends MobileWidgetDefinePane {
@Override
public void populate(FormDesigner designer) {
this.designer = designer;
- appRelayoutCheck.setSelected(isAppRelayout());
+ appRelayoutCheck.setSelected(FormDesignerUtils.isAppRelayout(designer));
// 数据 populate 完成后，再设置监听
this.bindListeners2Widgets();
this.addAttributeChangeListener(changeListener);
+
+ advancePane.populate((RichStyleWidgetProvider) getBodyCreator().toData());
+ intervalPane.populate((RichStyleWidgetProvider) getBodyCreator().toData());
}
@Override
public void update() {
+ boolean appRelayout = appRelayoutCheck.isSelected();
setAppRelayout(appRelayoutCheck.isSelected());
+ boolean appPaddingVisible = appRelayout || !FormDesignerUtils.isBodyAbsolute(designer);
+ advancePane.setVisible(appPaddingVisible);
+ intervalPane.setVisible(appPaddingVisible);
mobileWidgetListPane.updateToDesigner();
designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_EDITED);
+
+ if (advancePane.isVisible()) {
+ advancePane.update((RichStyleWidgetProvider) getBodyCreator().toData());
+ }
+ if (intervalPane.isVisible()) {
+ intervalPane.update((RichStyleWidgetProvider) getBodyCreator().toData());
+ }
}
}
diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java
index 86df38abcf..b9ae12e208 100644
--- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java
@@ -9,6 +9,7 @@ import com.fr.design.designer.creator.XWAbsoluteBodyLayout;
import com.fr.design.designer.creator.XWAbsoluteLayout;
import com.fr.design.designer.properties.items.Item;
import com.fr.design.foldablepane.UIExpandablePane;
+import com.fr.design.form.util.FormDesignerUtils;
import com.fr.design.gui.frpane.AttributeChangeListener;
import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.icombobox.UIComboBox;
@@ -20,11 +21,14 @@ import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.FormDesigner;
import com.fr.design.mainframe.WidgetPropertyPane;
import com.fr.form.ui.BaseChartEditor;
-import com.fr.form.ui.container.WFitLayout;
-
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Container;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
@@ -56,7 +60,7 @@ public class ChartEditorDefinePane extends MobileWidgetDefinePane {
JPanel mobileSettingsPane;
if (isInAbsoluteLayout()) {
mobileSettingsPane = getUnavailableTipPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Tip_Chart_Adaptivity_Unavailable_In_Absolute_Layout"));
- } else if (!isAppRelayout()) {
+ } else if (!FormDesignerUtils.isAppRelayout(designer)) {
mobileSettingsPane = getUnavailableTipPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Tip_Chart_Adaptivity_Unavailable"));
} else {
mobileSettingsPane = getMobileSettingsPane();
@@ -76,11 +80,6 @@ public class ChartEditorDefinePane extends MobileWidgetDefinePane {
return false;
}
- // body是否开启手机重布局
- private boolean isAppRelayout() {
- return ((WFitLayout)designer.getRootComponent().toData()).isAppRelayout();
- }
-
private JPanel getUnavailableTipPane(String tipText) {
JPanel panel = new JPanel(new BorderLayout());
UILabel unavailableTipLabel = new UILabel();
@@ -158,7 +157,7 @@ public class ChartEditorDefinePane extends MobileWidgetDefinePane {
this.bindListeners2Widgets();
this.addAttributeChangeListener(changeListener);
- if (!isAppRelayout() || isInAbsoluteLayout()) {
+ if (!FormDesignerUtils.isAppRelayout(designer) || isInAbsoluteLayout()) {
return;
}
diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/MobileWidgetDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/MobileWidgetDefinePane.java
index ac4de096a6..d44707181b 100644
--- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/MobileWidgetDefinePane.java
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/MobileWidgetDefinePane.java
@@ -1,5 +1,6 @@
package com.fr.design.widget.ui.designer.mobile;
+import com.fr.design.form.util.FormDesignerUtils;
import com.fr.design.gui.frpane.AbstractAttrNoScrollPane;
import com.fr.design.mainframe.FormDesigner;
@@ -7,10 +8,10 @@ import javax.swing.*;
/**
* 所有移动端需要拓展的属性面板均继承此类
- *
+ *
* Created by fanglei on 2017/8/8.
*/
-public abstract class MobileWidgetDefinePane extends AbstractAttrNoScrollPane{
+public abstract class MobileWidgetDefinePane extends AbstractAttrNoScrollPane {
//初始化panel数据再repaint
public abstract void initPropertyGroups(Object source);
@@ -28,11 +29,21 @@ public abstract class MobileWidgetDefinePane extends AbstractAttrNoScrollPane{
// 暂不需要此方法
@Override
- protected void initContentPane() {}
+ protected void initContentPane() {
+ }
// 暂不需要此方法
@Override
protected JPanel createContentPane() {
return new JPanel();
}
+
+ /**
+ * 绝对布局且不勾选手机重布局 的时候不支持边距设置
+ *
+ * @return
+ */
+ public boolean shouldHidePadding(FormDesigner designer) {
+ return !FormDesignerUtils.isAppRelayout(designer) && FormDesignerUtils.isBodyAbsolute(designer);
+ }
}
diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/TabMobileWidgetDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/TabMobileWidgetDefinePane.java
index f6d94da06c..8a795b8873 100644
--- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/TabMobileWidgetDefinePane.java
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/TabMobileWidgetDefinePane.java
@@ -1,5 +1,6 @@
package com.fr.design.widget.ui.designer.mobile;
+import com.fr.base.iofile.attr.FormTabPaddingAttrMark;
import com.fr.design.constants.LayoutConstants;
import com.fr.design.designer.IntervalConstants;
import com.fr.design.designer.creator.XCreator;
@@ -9,8 +10,11 @@ import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.FormDesigner;
+import com.fr.design.mainframe.WidgetPropertyPane;
import com.fr.design.mainframe.widget.accessibles.AccessibleTemplateStyleEditor;
import com.fr.design.mainframe.widget.accessibles.MobileTemplateStylePane;
+import com.fr.design.widget.ui.designer.mobile.component.MobileComponentAdvancePane;
+import com.fr.design.widget.ui.designer.mobile.component.MobileComponentLayoutIntervalPane;
import com.fr.form.ui.container.cardlayout.WCardTagLayout;
import com.fr.general.cardtag.mobile.MobileTemplateStyle;
@@ -20,8 +24,11 @@ import java.awt.Component;
public class TabMobileWidgetDefinePane extends MobileWidgetDefinePane {
private XCreator xCreator;
+ private FormDesigner designer; // 当前设计器
private AccessibleTemplateStyleEditor templateStyleEditor;
private AttributeChangeListener changeListener;
+ private MobileComponentAdvancePane advancePane;
+ private MobileComponentLayoutIntervalPane intervalPane;
public TabMobileWidgetDefinePane(XCreator xCreator) {
this.xCreator = xCreator;
@@ -36,6 +43,7 @@ public class TabMobileWidgetDefinePane extends MobileWidgetDefinePane {
}
};
}
+
/**
* 后台初始化所有事件.
*/
@@ -46,24 +54,47 @@ public class TabMobileWidgetDefinePane extends MobileWidgetDefinePane {
@Override
public void initPropertyGroups(Object source) {
this.setLayout(FRGUIPaneFactory.createBorderLayout());
+ this.designer = WidgetPropertyPane.getInstance().getEditingFormDesigner();
UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Tab_Style_Template"));
templateStyleEditor = new AccessibleTemplateStyleEditor(new MobileTemplateStylePane((WCardTagLayout) xCreator.toData()));
- JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{label, templateStyleEditor}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_MEDIUM);
- this.add(jPanel, BorderLayout.CENTER);
+ JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{label, templateStyleEditor}, {new UILabel()}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_LARGE);
+ JPanel holder = FRGUIPaneFactory.createBorderLayout_S_Pane();
+ holder.add(jPanel, BorderLayout.NORTH);
+ if (!shouldHidePadding(designer)) {
+ advancePane = new MobileComponentAdvancePane(FormTabPaddingAttrMark.XML_TAG);
+ intervalPane = new MobileComponentLayoutIntervalPane(FormTabPaddingAttrMark.XML_TAG);
+ //高级
+ holder.add(advancePane, BorderLayout.CENTER);
+ //布局
+ holder.add(intervalPane, BorderLayout.SOUTH);
+ }
+
+ this.add(holder, BorderLayout.NORTH);
}
@Override
public void populate(FormDesigner designer) {
- templateStyleEditor.setValue(((WCardTagLayout)xCreator.toData()).getMobileTemplateStyle());
+ templateStyleEditor.setValue(((WCardTagLayout) xCreator.toData()).getMobileTemplateStyle());
// 数据 populate 完成后，再设置监听
this.bindListeners2Widgets();
this.addAttributeChangeListener(changeListener);
+ if (advancePane != null) {//业务层面可以写成shouldHidePadding但是这样写应该性能差点
+ advancePane.populate((WCardTagLayout) xCreator.toData());
+ }
+ if (intervalPane != null) {
+ intervalPane.populate((WCardTagLayout) xCreator.toData());
+ }
}
@Override
public void update() {
- ((WCardTagLayout)xCreator.toData()).setMobileTemplateStyle((MobileTemplateStyle) templateStyleEditor.getValue());
+ ((WCardTagLayout) xCreator.toData()).setMobileTemplateStyle((MobileTemplateStyle) templateStyleEditor.getValue());
DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified(); // 触发设计器保存按钮亮起来
-
+ if (advancePane != null) {
+ advancePane.update((WCardTagLayout) xCreator.toData());
+ }
+ if (intervalPane != null) {
+ intervalPane.update((WCardTagLayout) xCreator.toData());
+ }
}
}
diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobileComponentAdvancePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobileComponentAdvancePane.java
new file mode 100644
index 0000000000..f94d579079
--- /dev/null
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobileComponentAdvancePane.java
@@ -0,0 +1,45 @@
+package com.fr.design.widget.ui.designer.mobile.component;
+
+import com.fr.base.iofile.attr.AttrMarkFactory;
+import com.fr.base.iofile.attr.FormBodyPaddingAttrMark;
+import com.fr.design.foldablepane.UIExpandablePane;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.widget.ui.designer.XmlRelationedBasicPane;
+import com.fr.design.widget.ui.designer.component.PaddingBoundPane;
+import com.fr.form.ui.RichStyleWidgetProvider;
+
+import java.awt.BorderLayout;
+
+/**
+ * 只有内边距设置的高级设置
+ */
+public class MobileComponentAdvancePane extends XmlRelationedBasicPane {
+ private PaddingBoundPane paddingBound;
+
+ public MobileComponentAdvancePane(String xmlTag) {
+ super(xmlTag);
+ this.setLayout(FRGUIPaneFactory.createBorderLayout());
+ paddingBound = new PaddingBoundPane(FormBodyPaddingAttrMark.DEFAULT_SIZE, FormBodyPaddingAttrMark.DEFAULT_SIZE, FormBodyPaddingAttrMark.DEFAULT_SIZE, FormBodyPaddingAttrMark.DEFAULT_SIZE);
+ UIExpandablePane advanceExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, paddingBound);
+ this.add(advanceExpandablePane, BorderLayout.NORTH);
+ }
+
+ @Override
+ protected String title4PopupWindow() {
+ return "ComponentAdvancePane";
+ }
+
+ public void update(RichStyleWidgetProvider marginWidget) {
+ FormBodyPaddingAttrMark attrMark = marginWidget.getWidgetAttrMark(getXmlTag());
+ attrMark = attrMark == null ? (FormBodyPaddingAttrMark) AttrMarkFactory.createAttrMark(getXmlTag()) : attrMark;
+ attrMark.setPaddingMargin(paddingBound.updateBean());
+ marginWidget.addWidgetAttrMark(attrMark);
+ }
+
+ public void populate(RichStyleWidgetProvider marginWidget) {
+ FormBodyPaddingAttrMark attrMark = marginWidget.getWidgetAttrMark(getXmlTag());
+ if (attrMark != null) {
+ paddingBound.populateBean(attrMark.getPaddingMargin());
+ }
+ }
+}
\ No newline at end of file
diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobileComponentLayoutIntervalPane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobileComponentLayoutIntervalPane.java
new file mode 100644
index 0000000000..5a565373d9
--- /dev/null
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobileComponentLayoutIntervalPane.java
@@ -0,0 +1,71 @@
+package com.fr.design.widget.ui.designer.mobile.component;
+
+import com.fr.base.iofile.attr.AttrMarkFactory;
+import com.fr.base.iofile.attr.FormBodyPaddingAttrMark;
+import com.fr.design.designer.IntervalConstants;
+import com.fr.design.foldablepane.UIExpandablePane;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.ispinner.UISpinner;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.utils.gui.UIComponentUtils;
+import com.fr.design.widget.FRWidgetFactory;
+import com.fr.design.widget.ui.designer.XmlRelationedBasicPane;
+import com.fr.form.ui.RichStyleWidgetProvider;
+
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Component;
+
+/**
+ * 只有组件间隔的布局设置
+ */
+public class MobileComponentLayoutIntervalPane extends XmlRelationedBasicPane {
+ private UISpinner componentIntervel;
+
+ public MobileComponentLayoutIntervalPane(String xmlTag) {
+ super(xmlTag);
+ this.setLayout(FRGUIPaneFactory.createBorderLayout());
+ UILabel intervalLabel = FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Component_Interval"));
+
+ double f = TableLayout.FILL;
+ double p = TableLayout.PREFERRED;
+ double[] rowSize = {p, p};
+ double[] columnSize = {p, f};
+ int[][] rowCount = {{1, 1}, {1, 1}};
+ componentIntervel = new UISpinner(0, Integer.MAX_VALUE, 1, FormBodyPaddingAttrMark.DEFAULT_SIZE);
+ JPanel componentIntervelPane = UIComponentUtils.wrapWithBorderLayoutPane(componentIntervel);
+
+ Component[][] components = new Component[][]{
+ new Component[]{intervalLabel, componentIntervelPane}
+ };
+ JPanel centerPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
+ centerPane.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, IntervalConstants.INTERVAL_L5, 0, 0));
+ JPanel holder = FRGUIPaneFactory.createBorderLayout_S_Pane();
+ holder.add(centerPane, BorderLayout.NORTH);
+ UIExpandablePane layoutExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout"), 280, 20, holder);
+ this.add(layoutExpandablePane, BorderLayout.NORTH);
+ }
+
+ @Override
+ protected String title4PopupWindow() {
+ return "ComponentIntervelPane";
+ }
+
+ public void update(RichStyleWidgetProvider marginWidget) {
+
+ FormBodyPaddingAttrMark attrMark = marginWidget.getWidgetAttrMark(getXmlTag());
+ attrMark = attrMark == null ? (FormBodyPaddingAttrMark) AttrMarkFactory.createAttrMark(getXmlTag()) : attrMark;
+ attrMark.setInterval((int) componentIntervel.getValue());
+ marginWidget.addWidgetAttrMark(attrMark);
+ }
+
+ public void populate(RichStyleWidgetProvider marginWidget) {
+ FormBodyPaddingAttrMark attrMark = marginWidget.getWidgetAttrMark(getXmlTag());
+ if (attrMark != null) {
+ componentIntervel.setValueWithoutEvent(attrMark.getInterval());
+ }
+ }
+}
\ No newline at end of file
diff --git a/designer-form/src/main/resources/com/fr/aspectj/designerform/TemplateProcessTracker.aj b/designer-form/src/main/resources/com/fr/aspectj/designerform/TemplateProcessTracker.aj
index 3be1a77fa7..9daec50091 100644
--- a/designer-form/src/main/resources/com/fr/aspectj/designerform/TemplateProcessTracker.aj
+++ b/designer-form/src/main/resources/com/fr/aspectj/designerform/TemplateProcessTracker.aj
@@ -3,12 +3,10 @@ package com.fr.aspectj.designerform;
/**
* Created by plough on 2017/3/3.
*/
-import com.fr.design.mainframe.templateinfo.TemplateInfoCollector;
import org.aspectj.lang.reflect.SourceLocation;
import java.awt.event.ActionEvent;
import java.awt.event.MouseEvent;
-import java.util.Date;
public aspect TemplateProcessTracker {
//声明一个pointcut，匹配你需要的方法
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java b/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java
index db91d0a39e..b16aa1b420 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java
@@ -174,6 +174,7 @@ public abstract class ElementCasePane extends Tar
private CellSelection cellNeedTOFormat = null;
private FormatBrushAction formatBrushAction;
private ActionListener keyListener = new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
if (!formatBrush.isSelected()) {
DesignerContext.setFormatState(DesignerContext.FORMAT_STATE_ONCE);
@@ -188,6 +189,7 @@ public abstract class ElementCasePane extends Tar
}
};
private ActionListener escKey = new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
cancelFormatBrush();
}
@@ -212,6 +214,7 @@ public abstract class ElementCasePane extends Tar
/**
* 取消格式化
*/
+ @Override
public void cancelFormat() {
return;
}
@@ -240,7 +243,6 @@ public abstract class ElementCasePane extends Tar
verScrollBar = new DynamicScrollBar(Adjustable.VERTICAL, this, this.resolution);
horScrollBar = new DynamicScrollBar(Adjustable.HORIZONTAL, this, this.resolution);
this.add(RGridLayout.VerticalBar, this.verScrollBar);
-// this.add(RGridLayout.HorizontalBar, this.horScrollBar);
// Init input/action map defaultly.
initInputActionMap();
@@ -253,7 +255,7 @@ public abstract class ElementCasePane extends Tar
initFormatBrush();
}
-
+ @Override
public int getMenuState() {
return DesignState.WORK_SHEET;
}
@@ -265,6 +267,7 @@ public abstract class ElementCasePane extends Tar
formatBrush.setSelected(DesignerContext.getFormatState() != DesignerContext.FORMAT_STATE_NULL);
formatBrush.removeActionListener(formatBrushAction);
formatBrush.addMouseListener(new MouseAdapter() {
+ @Override
public void mouseClicked(MouseEvent e) {
//如果没有格式刷，点击时就是想使用格式刷
if (e.getClickCount() == 1) {
@@ -528,8 +531,8 @@ public abstract class ElementCasePane extends Tar
FineLoggerFactory.getLogger().info("Nothing to release");
}
this.selection = selection;
- fireSelectionChanged();
}
+ fireSelectionChanged();
}
@@ -1210,6 +1213,7 @@ public abstract class ElementCasePane extends Tar
/**
* 请求焦点
*/
+ @Override
public void requestFocus() {
super.requestFocus();
this.getGrid().requestFocus();
@@ -1338,6 +1342,7 @@ public abstract class ElementCasePane extends Tar
*
* @return 返回正在编辑的状态.
*/
+ @Override
public EditingState createEditingState() {
return new ElementCaseEditingState(this.selection, this.verScrollBar.getValue(), this.horScrollBar.getValue(), this.resolution);
}
@@ -1380,7 +1385,6 @@ public abstract class ElementCasePane extends Tar
ElementCasePane.this.getVerticalScrollBar().setValue(this.verticalValue);
ElementCasePane.this.getHorizontalScrollBar().setValue(this.horizontalValue);
-// ElementCasePane.this.setResolution(this.resolution);
HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().setScale(this.resolution);
// 重绘.
ElementCasePane.this.repaint();
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/InformationCollector.java b/designer-realize/src/main/java/com/fr/design/mainframe/InformationCollector.java
index 8a3f4bb25d..83cb7dd335 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/InformationCollector.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/InformationCollector.java
@@ -7,7 +7,8 @@ import com.fr.base.FRContext;
import com.fr.config.MarketConfig;
import com.fr.design.DesignerEnvManager;
import com.fr.design.mainframe.errorinfo.ErrorInfoUploader;
-import com.fr.design.mainframe.templateinfo.TemplateInfoCollector;
+import com.fr.design.mainframe.messagecollect.impl.FocusPointMessageUploader;
+import com.fr.design.mainframe.template.info.TemplateInfoCollector;
import com.fr.general.CloudCenter;
import com.fr.general.ComparatorUtils;
import com.fr.general.DateUtils;
@@ -15,20 +16,13 @@ import com.fr.general.DesUtils;
import com.fr.general.GeneralUtils;
import com.fr.general.IOUtils;
import com.fr.general.http.HttpToolbox;
-import com.fr.intelli.record.FocusPoint;
-import com.fr.intelli.record.MetricRegistry;
import com.fr.json.JSONArray;
-import com.fr.json.JSONException;
import com.fr.json.JSONObject;
import com.fr.log.FineLoggerFactory;
import com.fr.stable.EncodeConstants;
import com.fr.stable.ProductConstants;
import com.fr.stable.StableUtils;
import com.fr.stable.StringUtils;
-import com.fr.stable.query.QueryFactory;
-import com.fr.stable.query.condition.QueryCondition;
-import com.fr.stable.query.data.DataList;
-import com.fr.stable.query.restriction.RestrictionFactory;
import com.fr.stable.xml.XMLPrintWriter;
import com.fr.stable.xml.XMLReadable;
import com.fr.stable.xml.XMLTools;
@@ -53,7 +47,6 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
@@ -81,24 +74,6 @@ public class InformationCollector implements XMLReadable, XMLWriter {
private static final String XML_KEY = "ActiveKey";
private static final String XML_OS = "OS";
- public static final String TABLE_NAME = "fr_functionrecord";
- public static final String FUNC_COLUMNNAME = "func";
- public static final String COLUMN_TIME = "time";
- public static final String TABLE_FUNCTION_RECORD = "function.record";
- private static final String ATTR_ID = "id";
- private static final String ATTR_TEXT = "text";
- private static final String ATTR_SOURCE = "source";
- private static final String ATTR_TIME = "time";
- private static final String ATTR_TIMES = "times";
- private static final String ATTR_TITLE = "title";
- private static final String ATTR_USER_NAME = "username";
- private static final String ATTR_UUID = "uuid";
- private static final String ATTR_ITEMS = "items";
- private static final String ATTR_FUNCTION_ARRAY = "functionArray";
- private static final int MAX_EACH_REQUEST_RECORD_COUNT = 200;
- private static final int PAGE_SIZE = 200;
- private long totalCount = -1;
-
private static InformationCollector collector;
//启动时间与关闭时间列表
@@ -184,6 +159,12 @@ public class InformationCollector implements XMLReadable, XMLWriter {
}
private void sendUserInfo(){
+ long currentTime = new Date().getTime();
+ long lastTime = getLastTimeMillis();
+
+ if (currentTime - lastTime <= DELTA) {
+ return;
+ }
JSONObject content = getJSONContentAsByte();
String url = CloudCenter.getInstance().acquireUrlByKind("user.info.v10");
boolean success = false;
@@ -201,135 +182,9 @@ public class InformationCollector implements XMLReadable, XMLWriter {
}
}
- private void sendFunctionsInfo(long currentTime, long lastTime){
- FineLoggerFactory.getLogger().info("Start sent function records to the cloud center...");
- queryAndSendOnePageFunctionContent(currentTime, lastTime, 0);
- long page = (totalCount/PAGE_SIZE) + 1;
- for(int i=1; i focusPoints = MetricRegistry.getMetric().find(FocusPoint.class,condition);
- //第一次查询获取总记录数
- if(page == 0){
- totalCount = focusPoints.getTotalCount();
- }
- sendThisPageFunctionContent(focusPoints);
- } catch (Exception e) {
- FineLoggerFactory.getLogger().error(e.getMessage(), e);
- }
- }
-
- private void sendThisPageFunctionContent(DataList focusPoints) {
- String url = CloudCenter.getInstance().acquireUrlByKind(TABLE_FUNCTION_RECORD);
- try {
- JSONObject jsonObject = dealWithSendFunctionContent(focusPoints);
- sendFunctionRecord(url, jsonObject);
- } catch (JSONException e) {
- FineLoggerFactory.getLogger().error(e.getMessage(), e);
- }
- }
-
- private JSONObject dealWithSendFunctionContent(DataList focusPoints) throws JSONException {
- JSONObject jsonObject = new JSONObject();
- Map map = new HashMap<>();
- if(!focusPoints.isEmpty()){
- DesignerEnvManager envManager = DesignerEnvManager.getEnvManager();
- String bbsUserName = MarketConfig.getInstance().getBbsUsername();
- String uuid = envManager.getUUID();
- jsonObject.put(ATTR_UUID, uuid);
- jsonObject.put(ATTR_USER_NAME, bbsUserName);
- for(FocusPoint focusPoint : focusPoints.getList()) {
- FunctionRecord functionRecord = getOneRecord(focusPoint);
- if (map.containsKey(focusPoint.getId())) {
- int times = ((FunctionRecord)map.get(focusPoint.getId())).getTimes() + 1;
- functionRecord.setTimes(times);
- map.put(focusPoint.getId(), functionRecord);
- } else {
- map.put(focusPoint.getId(), functionRecord);
- }
- }
- jsonObject.put(ATTR_ITEMS, mapToJSONArray(map));
- }
- return jsonObject;
- }
-
- private JSONArray mapToJSONArray(Map map) throws JSONException {
- JSONArray jsonArray = new JSONArray();
- for(String keys : map.keySet()){
- FunctionRecord functionRecord = (FunctionRecord)map.get(keys);
- JSONObject jo = new JSONObject();
- jo.put(ATTR_ID, functionRecord.getId());
- jo.put(ATTR_TEXT, functionRecord.getText());
- jo.put(ATTR_SOURCE, functionRecord.getSource());
- jo.put(ATTR_TIME, functionRecord.getTime());
- jo.put(ATTR_TITLE, functionRecord.getTitle());
- jo.put(ATTR_TIMES, functionRecord.getTimes());
- jsonArray.put(jo);
- }
- return jsonArray;
- }
-
- private void sendFunctionRecord(String url, JSONObject record) {
- boolean success = false;
- try {
- HashMap para = new HashMap<>();
- para.put("token", SiteCenterToken.generateToken());
- para.put("content", record);
- String res = HttpToolbox.post(url, para);
- success = ComparatorUtils.equals(new JSONObject(res).get("status"), "success");
- if (success) {
- this.lastTime = dateToString();
- } else {
- FineLoggerFactory.getLogger().error("Error occured when sent function records to the cloud center.");
- }
- } catch (Exception e) {
- FineLoggerFactory.getLogger().error(e.getMessage(), e);
- }
- }
-
- private FunctionRecord getOneRecord(FocusPoint focusPoint) {
- FunctionRecord functionRecord = new FunctionRecord();
- functionRecord.setId(focusPoint.getId() == null?StringUtils.EMPTY : focusPoint.getId());
- functionRecord.setText(focusPoint.getText() == null?StringUtils.EMPTY : focusPoint.getText());
- functionRecord.setSource(focusPoint.getSource());
- functionRecord.setTime(focusPoint.getTime().getTime());
- functionRecord.setTitle(focusPoint.getTitle() == null?StringUtils.EMPTY : focusPoint.getTitle());
- functionRecord.setUsername(MarketConfig.getInstance().getBbsUsername() == null?StringUtils.EMPTY : MarketConfig.getInstance().getBbsUsername());
- functionRecord.setUuid(DesignerEnvManager.getEnvManager().getUUID() == null?StringUtils.EMPTY : DesignerEnvManager.getEnvManager().getUUID());
- return functionRecord;
- }
-
- /**
- * 收集开始使用时间，发送信息
- */
+ /**
+ * 收集开始使用时间，发送信息
+ */
public void collectStartTime(){
this.current.setStartDate(dateToString());
@@ -345,18 +200,12 @@ public class InformationCollector implements XMLReadable, XMLWriter {
service.schedule(new Runnable() {
@Override
public void run() {
- long currentTime = new Date().getTime();
- long lastTime = getLastTimeMillis();
- if (currentTime - lastTime > DELTA) {
- sendUserInfo();
- sendFunctionsInfo(currentTime, lastTime);
- }
-
+ sendUserInfo();
+ FocusPointMessageUploader.getInstance().sendToCloudCenter();
TemplateInfoCollector.getInstance().sendTemplateInfo();
ErrorInfoUploader.getInstance().sendErrorInfo();
}
- }, SEND_DELAY, TimeUnit.SECONDS);
-
+ }, SEND_DELAY, TimeUnit.MILLISECONDS);
}
/**
@@ -524,94 +373,4 @@ public class InformationCollector implements XMLReadable, XMLWriter {
}
}
-
- private class FunctionRecord implements Comparable{
- private String id;
- private String text;
- private int source;
- private long time;
- private int times = 1;
- private String title;
- private String username;
- private String uuid;
-
- public FunctionRecord(){
-
- }
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public int getTimes() {
- return times;
- }
-
- public void setTimes(int times) {
- this.times = times;
- }
-
- public String getText() {
- return text;
- }
-
- public void setText(String text) {
- this.text = text;
- }
-
- public int getSource() {
- return source;
- }
-
- public void setSource(int source) {
- this.source = source;
- }
-
- public long getTime() {
- return time;
- }
-
- public void setTime(long time) {
- this.time = time;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public String getUsername() {
- return username;
- }
-
- public void setUsername(String username) {
- this.username = username;
- }
-
- public String getUuid() {
- return uuid;
- }
-
- public void setUuid(String uuid) {
- this.uuid = uuid;
- }
-
- @Override
- public int compareTo(Object o) {
- FunctionRecord functionRecord = (FunctionRecord) o;
- if(this.getId().equals((functionRecord.getId())) && this.getText().equals(functionRecord.getText())
- && this.getSource() == functionRecord.getSource() && this.getTime() == functionRecord.getTime()
- && this.getTitle().equals(functionRecord.getTitle()) && this.getUsername().equals(functionRecord.getUsername())
- && this.getUuid().equals(functionRecord.getUuid())){
- return 0;
- }
- return 1;
- }
- }
}
\ No newline at end of file
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java b/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java
index 44becbd9cc..07136bc1ef 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java
@@ -41,8 +41,8 @@ import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.icontainer.UIModeControlContainer;
import com.fr.design.gui.imenu.UIMenuItem;
import com.fr.design.mainframe.cell.QuickEditorRegion;
-import com.fr.design.mainframe.templateinfo.JWorkBookProcessInfo;
-import com.fr.design.mainframe.templateinfo.TemplateProcessInfo;
+import com.fr.design.mainframe.template.info.JWorkBookProcessInfo;
+import com.fr.design.mainframe.template.info.TemplateProcessInfo;
import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;
import com.fr.design.menu.KeySetUtils;
import com.fr.design.menu.MenuDef;
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java
index 09f1ff9e1b..9fdc9d5a8c 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java
@@ -3,6 +3,8 @@ package com.fr.design.mainframe;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.awt.event.MouseMotionListener;
@@ -24,7 +26,7 @@ import com.fr.base.GraphHelper;
import com.fr.base.vcs.DesignerMode;
import com.fr.design.actions.UpdateAction;
import com.fr.design.constants.UIConstants;
-import com.fr.design.file.HistoryTemplateListPane;
+import com.fr.design.file.HistoryTemplateListCache;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.ibutton.UIButtonUI;
import com.fr.design.menu.MenuDef;
@@ -35,6 +37,7 @@ import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.design.utils.gui.GUIPaintUtils;
import com.fr.general.ComparatorUtils;
+import com.fr.general.IOUtils;
import com.fr.main.impl.WorkBook;
import com.fr.poly.PolyDesigner;
import com.fr.report.poly.PolyWorkSheet;
@@ -52,15 +55,15 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
private static final Color LINE_COLOR = new Color(0xababab);
- private static final Icon ADD_WORK_SHEET = BaseUtils.readIcon("com/fr/base/images/oem/addworksheet.png");
- protected static final Icon ADD_POLY_SHEET = BaseUtils.readIcon("com/fr/design/images/sheet/addpolysheet.png");
- private static final Icon WORK_SHEET_ICON = BaseUtils.readIcon("com/fr/base/images/oem/worksheet.png");
- private static final Icon POLY_SHEET_ICON = BaseUtils.readIcon("com/fr/design/images/sheet/polysheet.png");
- private static final Image DESIGN_IMAGE = BaseUtils.readImage("com/fr/design/images/sheet/left_right_btn.png");
- private static final Icon LEFT_ICON = BaseUtils.readIcon("com/fr/design/images/sheet/left_normal@1x.png");
- private static final Icon RIGHT_ICON = BaseUtils.readIcon("com/fr/design/images/sheet/right_normal@1x.png");
- private static final Icon DISABLED_LEFT_ICON = BaseUtils.readIcon("com/fr/design/images/sheet/left_hover@1x.png");
- private static final Icon DISABLED_RIGHT_ICON = BaseUtils.readIcon("com/fr/design/images/sheet/right_hover@1x.png");
+ private static final Icon ADD_WORK_SHEET = IOUtils.readIcon("com/fr/base/images/oem/addworksheet.png");
+ protected static final Icon ADD_POLY_SHEET = IOUtils.readIcon("com/fr/design/images/sheet/addpolysheet.png");
+ private static final Icon WORK_SHEET_ICON = IOUtils.readIcon("com/fr/base/images/oem/worksheet.png");
+ private static final Icon POLY_SHEET_ICON = IOUtils.readIcon("com/fr/design/images/sheet/polysheet.png");
+ private static final Icon LEFT_ICON = IOUtils.readIcon("com/fr/design/images/sheet/left_normal@1x.png");
+ private static final Icon RIGHT_ICON = IOUtils.readIcon("com/fr/design/images/sheet/right_normal@1x.png");
+ private static final Icon DISABLED_LEFT_ICON = IOUtils.readIcon("com/fr/design/images/sheet/left_hover@1x.png");
+ private static final Icon DISABLED_RIGHT_ICON = IOUtils.readIcon("com/fr/design/images/sheet/right_hover@1x.png");
+ private static final int NUM = 10;
private static final int ICON_SEP_DISTANCE = 8;
private static final int TOOLBAR_HEIGHT = 16;
@@ -144,6 +147,7 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
this.setBorder(null);
this.setForeground(new Color(99, 99, 99));
leftButton = new UIButton(LEFT_ICON) {
+ @Override
public Dimension getPreferredSize() {
return new Dimension(super.getPreferredSize().width, TOOLBAR_HEIGHT);
}
@@ -163,6 +167,7 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
leftButton.set4ToolbarButton();
leftButton.setDisabledIcon(DISABLED_LEFT_ICON);
rightButton = new UIButton(RIGHT_ICON) {
+ @Override
public Dimension getPreferredSize() {
return new Dimension(super.getPreferredSize().width, TOOLBAR_HEIGHT);
}
@@ -197,7 +202,14 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
}
}
});
-
+
+ DesignerContext.getDesignerFrame().addComponentListener(new ComponentAdapter(){
+ @Override public void componentResized(ComponentEvent e) {
+ for (int i = 0; i < lastOneIndex * NUM; i++) {
+ moveLeft();
+ }
+ }
+ });
}
private ActionListener createLeftButtonActionListener() {
@@ -205,27 +217,31 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
@Override
public void actionPerformed(ActionEvent e) {
- int s = scrollIndex;
- if (s == lastOneIndex && s != 0) {
- scrollIndex--;
- lastOneIndex--;
- repaint();
- } else {
- while (s > lastOneIndex && showCount != 0) {
- scrollIndex++;
- lastOneIndex++;
- repaint();
- }
- while (s < lastOneIndex && scrollIndex > 0) {
- scrollIndex--;
- lastOneIndex--;
- repaint();
- }
- }
+ moveLeft();
}
};
}
+ private void moveLeft() {
+ int s = scrollIndex;
+ if (s == lastOneIndex && s != 0) {
+ scrollIndex--;
+ lastOneIndex--;
+ repaint();
+ } else {
+ while (s > lastOneIndex && showCount != 0) {
+ scrollIndex++;
+ lastOneIndex++;
+ repaint();
+ }
+ while (s < lastOneIndex && scrollIndex > 0) {
+ scrollIndex--;
+ lastOneIndex--;
+ repaint();
+ }
+ }
+ }
+
/**
* 设置选择index
*
@@ -282,6 +298,7 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
*
* @param e 鼠标事件
*/
+ @Override
public void mouseDragged(MouseEvent e) {
if (isAuthorityEditing) {
return;
@@ -295,6 +312,7 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
*
* @param e 鼠标事件
*/
+ @Override
public void mouseMoved(MouseEvent e) {
}
@@ -423,15 +441,6 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
}
generalPath.closePath();
g2d.fill(generalPath);
-// g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-// g2d.setPaint(UIConstants.LINE_COLOR);
-// if (selectedIndex == scrollIndex) {
-// g2d.draw(new Line2D.Double(x[0], y[0], x[1], y[1]));
-// }
-// g2d.draw(new Line2D.Double(x[1], y[1], x[2], y[2]));
-// g2d.draw(new Line2D.Double(x[2], y[2], x[3], y[3]));
-// g2d.draw(new Line2D.Double(x[3], y[3], x[4], y[4]));
-// g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
sheeticon.paintIcon(this, g2d, (int) textX + charWidth, 2);
// peter:画字符
g2d.setPaint(getForeground());
@@ -470,13 +479,6 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
g2d.fill(generalPath);
g2d.setPaint(LINE_COLOR);
-// if (i == scrollIndex) {
-// g2d.draw(new Line2D.Double(x[0], y[0], x[1], y[1]));
-// }
-// g2d.draw(new Line2D.Double(x[1], y[1], x[2], y[2]));
-// g2d.draw(new Line2D.Double(x[2], y[2], x[3], y[3]));
-// g2d.draw(new Line2D.Double(x[3], y[3], x[4], y[4]));
-// g2d.draw(new Line2D.Double(x[4], y[4], x[5], y[5]));
double startX = textX > 0 ? textX - 1 : textX;
g2d.drawRect((int)startX, 0, width, (int)textHeight);
@@ -560,6 +562,7 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
*
* @param e 鼠标事件
*/
+ @Override
public void mouseClicked(MouseEvent e) {
}
@@ -568,6 +571,7 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
*
* @param evt 鼠标事件
*/
+ @Override
public void mousePressed(MouseEvent evt) {
isReleased = false;
int reportcount = reportComposite.getEditingWorkBook().getReportCount();
@@ -586,7 +590,7 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
boolean needRefreshPropertiesPane = getSelectedIndex() != i;
setSelectedIndex(i);
if (needRefreshPropertiesPane) {
- HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().refreshEastPropertiesPane();
+ HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().refreshEastPropertiesPane();
}
isBlank = false;
@@ -629,11 +633,11 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
}
}
-
+
protected void addInsertGridShortCut(MenuDef def){
def.addShortCut(new GridReportInsertAction());
}
-
+
protected void firstInsertActionPerformed(){
new GridReportInsertAction().actionPerformed(null);
}
@@ -644,6 +648,7 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
*
* @param e 鼠标事件
*/
+ @Override
public void mouseReleased(MouseEvent e) {
this.isReleased = true;
this.setReleasedXY(e.getX(), e.getY());
@@ -737,6 +742,7 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
*
* @param e 鼠标事件
*/
+ @Override
public void mouseEntered(MouseEvent e) {
}
@@ -745,6 +751,7 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
*
* @param e 鼠标事件
*/
+ @Override
public void mouseExited(MouseEvent e) {
}
@@ -772,7 +779,7 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
protected abstract class SheetInsertAction extends UpdateAction {
SheetInsertAction() {
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Insert") + getTemplateReportType());
- this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/add.png"));
+ this.setSmallIcon(IOUtils.readIcon("/com/fr/base/images/cell/control/add.png"));
}
@Override
@@ -945,7 +952,7 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
private class CopySheetAction extends UpdateAction {
CopySheetAction() {
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Copy"));
- this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/copy.png"));
+ this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/m_edit/copy.png"));
}
@Override
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java
index c8ecd93036..044a484b16 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java
@@ -33,15 +33,12 @@ import com.fr.design.mainframe.alphafine.search.manager.impl.RecentSearchManager
import com.fr.design.mainframe.alphafine.search.manager.impl.RecommendSearchManager;
import com.fr.design.mainframe.alphafine.search.manager.impl.SegmentationManager;
import com.fr.design.mainframe.alphafine.search.manager.impl.SimilarSearchManager;
-import com.fr.design.mainframe.errorinfo.ErrorInfoUploader;
-import com.fr.design.mainframe.templateinfo.TemplateInfoCollector;
import com.fr.form.main.Form;
import com.fr.form.main.FormIO;
import com.fr.general.ComparatorUtils;
import com.fr.general.http.HttpClient;
import com.fr.io.TemplateWorkBookIO;
import com.fr.io.exporter.ImageExporter;
-import com.fr.json.JSONException;
import com.fr.json.JSONObject;
import com.fr.log.FineLoggerFactory;
import com.fr.main.impl.WorkBook;
@@ -958,8 +955,6 @@ public class AlphaFineDialog extends UIDialog {
RecentSearchManager searchManager = RecentSearchManager.getInstance();
searchManager.addModel(storeText, cellModel);
sendDataToServer(storeText, cellModel);
- TemplateInfoCollector.getInstance().sendTemplateInfo();
- ErrorInfoUploader.getInstance().sendErrorInfo();
}
}
});
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/bbs/UserInfoLabel.java b/designer-realize/src/main/java/com/fr/design/mainframe/bbs/UserInfoLabel.java
index 6f329c39d2..7fe8b8ff87 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/bbs/UserInfoLabel.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/bbs/UserInfoLabel.java
@@ -16,8 +16,12 @@ import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.imenu.UIMenuItem;
import com.fr.design.gui.imenu.UIPopupMenu;
import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.upm.event.CertificateEvent;
import com.fr.design.utils.concurrent.ThreadFactoryBuilder;
import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.event.Event;
+import com.fr.event.EventDispatcher;
+import com.fr.event.Listener;
import com.fr.general.CloudCenter;
import com.fr.general.ComparatorUtils;
import com.fr.general.DateUtils;
@@ -208,6 +212,18 @@ public class UserInfoLabel extends UILabel {
updateInfoPane();
}
});
+ EventDispatcher.listen(CertificateEvent.LOGIN, new Listener() {
+ @Override
+ public void on(Event event, String text) {
+ setText(text);
+ }
+ });
+ EventDispatcher.listen(CertificateEvent.LOGOUT, new Listener() {
+ @Override
+ public void on(Event event, String text) {
+ setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_UnSignIn"));
+ }
+ });
}
private void clearLoginInformation() {
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/errorinfo/ErrorInfo.java b/designer-realize/src/main/java/com/fr/design/mainframe/errorinfo/ErrorInfo.java
index 052aaef9fe..d22bcf75b9 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/errorinfo/ErrorInfo.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/errorinfo/ErrorInfo.java
@@ -25,6 +25,7 @@ public class ErrorInfo {
private String templateid;
private String logid;
private String log;
+ private String stackTrace;
public ErrorInfo(String username, String uuid, String activekey) {
this.username = username;
@@ -89,6 +90,14 @@ public class ErrorInfo {
this.log = log;
}
+ public String getStackTrace() {
+ return stackTrace;
+ }
+
+ public void setStackTrace(String stackTrace) {
+ this.stackTrace = stackTrace;
+ }
+
private String dateToString(){
DateFormat df = FRContext.getDefaultValues().getDateTimeFormat();
return df.format(new Date());
@@ -107,6 +116,7 @@ public class ErrorInfo {
jo.put("uploadtime", uploadtime);
jo.put("logid", logid);
jo.put("log", log);
+ jo.put("stacktrace", stackTrace);
saveFileToCache(jo);
}
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/errorinfo/ErrorInfoLogAppender.java b/designer-realize/src/main/java/com/fr/design/mainframe/errorinfo/ErrorInfoLogAppender.java
index 8d4970a866..bcdea3e5a1 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/errorinfo/ErrorInfoLogAppender.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/errorinfo/ErrorInfoLogAppender.java
@@ -30,6 +30,7 @@ import java.io.InputStream;
public class ErrorInfoLogAppender extends AppenderSkeleton {
private static final int ERROR_LEN = 8;
+ private static final int ERROR_STACK_TRACE = 15;
// 缓存下不变的, 没必要频繁取.
private String username;
@@ -73,10 +74,23 @@ public class ErrorInfoLogAppender extends AppenderSkeleton {
errorInfo.setTemplateid(templateid);
errorInfo.setLog(msg);
errorInfo.setLogid(logid);
+ errorInfo.setStackTrace(readStackTrace(event));
errorInfo.saveAsJSON();
}
}
+ private String readStackTrace(LoggingEvent event) {
+ String[] s = event.getThrowableStrRep();
+ StringBuilder sb = new StringBuilder();
+ if (s != null) {
+ int len = Math.min(s.length, ERROR_STACK_TRACE);
+ for (int i = 0; i < len; i++) {
+ sb.append(s[i]).append("\n");
+ }
+ }
+ return sb.toString();
+ }
+
private String readLogID(String log) {
String errorCode = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_ErrorCode_Prefix");
// 报错信息国际化不规范, 有些是中文分号, 有些是英文
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/messagecollect/entity/FileEntityBuilder.java b/designer-realize/src/main/java/com/fr/design/mainframe/messagecollect/entity/FileEntityBuilder.java
new file mode 100644
index 0000000000..c8ac3b32c0
--- /dev/null
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/messagecollect/entity/FileEntityBuilder.java
@@ -0,0 +1,137 @@
+package com.fr.design.mainframe.messagecollect.entity;
+
+import com.fr.config.MarketConfig;
+import com.fr.design.DesignerEnvManager;
+import com.fr.general.CloudCenter;
+import com.fr.general.CloudClient;
+import com.fr.general.IOUtils;
+import com.fr.general.http.HttpToolbox;
+import com.fr.json.JSONArray;
+import com.fr.json.JSONObject;
+import com.fr.log.FineLoggerFactory;
+import com.fr.stable.CommonUtils;
+import com.fr.stable.CoreConstants;
+import com.fr.stable.EncodeConstants;
+import com.fr.stable.StableUtils;
+import com.fr.stable.StringUtils;
+import com.fr.third.jodd.datetime.JDateTime;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URLEncoder;
+import java.util.HashMap;
+import java.util.UUID;
+
+/**
+ * @author alex sung
+ * @date 2019/4/8
+ */
+public class FileEntityBuilder {
+
+ private static final String FOCUS_POINT_FILE_ROOT_PATH = "FocusPoint";
+ private static final String FOCUS_POINT_FILE_UPLOAD_TOPIC = "__fine_intelli_file_upload__";
+ private static final String FILE_FROM = "design";
+ private static final String FOCUS_POINT_FILE_UPLOAD_TYPE = "FocusPoint";
+ private static final String FOCUS_POINT_FILE_UPLOAD_URL = CloudCenter.getInstance().acquireUrlByKind("design.feedback");
+ private static final String FOCUS_POINT_URL_KEY = "focuspoint";
+
+ /**
+ * 文件夹路径
+ */
+ private String folderName;
+
+ public FileEntityBuilder(String folderName) {
+ this.folderName = folderName;
+ }
+
+ public String getFolderName() {
+ return folderName;
+ }
+
+ public void setFolderName(String folderName) {
+ this.folderName = folderName;
+ }
+
+ public File generateZipFile(String pathName) {
+ if (pathName == null) {
+ return null;
+ }
+ File zipFile = null;
+ try {
+ zipFile = new File(pathName + ".zip");
+ java.util.zip.ZipOutputStream zipOut = new java.util.zip.ZipOutputStream(new FileOutputStream(zipFile));
+ IOUtils.zip(zipOut, new File(pathName));
+ zipOut.close();
+ } catch (Exception e) {
+ FineLoggerFactory.getLogger().error(e.getMessage(), e);
+ }
+ return zipFile;
+ }
+
+ public void generateFile(JSONArray jsonArray, String folderName) {
+ if (jsonArray.size() == 0) {
+ return;
+ }
+ try {
+ String content = jsonArray.toString();
+ String fileName = String.valueOf(UUID.randomUUID());
+ File file = new File(folderName + File.separator + fileName + ".json");
+ StableUtils.makesureFileExist(file);
+ FileOutputStream out = new FileOutputStream(file);
+ InputStream in = new ByteArrayInputStream(content.getBytes(EncodeConstants.ENCODING_UTF_8));
+ IOUtils.copyBinaryTo(in, out);
+ in.close();
+ out.close();
+ } catch (Exception e) {
+ FineLoggerFactory.getLogger().error(e.getMessage(), e);
+ }
+ }
+
+ public void deleteFileAndZipFile(File zipFile, String pathName) {
+ File file = new File(pathName);
+ CommonUtils.deleteFile(file);
+ CommonUtils.deleteFile(zipFile);
+ }
+
+ /**
+ * 上传文件到云中心
+ *
+ * @param file 待上传文件
+ * @param keyFileName 目标文件
+ * @throws IOException
+ */
+ public static void uploadFile(File file, String keyFileName) throws IOException {
+ CloudClient client = CloudClient.getInstance();
+ String today = new JDateTime().toString("YYYY-MM-DD");
+ String filePath = FOCUS_POINT_FILE_ROOT_PATH + CoreConstants.SEPARATOR + today + CoreConstants.SEPARATOR + keyFileName;
+ String bbsUserName = MarketConfig.getInstance().getBbsUsername();
+ String uuid = DesignerEnvManager.getEnvManager().getUUID();
+ String name = bbsUserName == null ? uuid : bbsUserName;
+
+ client.uploadFile(file, filePath, name, FILE_FROM);
+ addMessageQueue(filePath, bbsUserName, uuid);
+ }
+
+ private static void addMessageQueue(String filePath, String userName, String uuid) {
+ JSONObject uploadInfo = new JSONObject(FOCUS_POINT_FILE_UPLOAD_URL);
+ String focusPointUrl = uploadInfo.optString(FOCUS_POINT_URL_KEY);
+ try {
+ HashMap params = new HashMap<>();
+ params.put("topic", FOCUS_POINT_FILE_UPLOAD_TOPIC);
+ params.put("username", URLEncoder.encode(userName, EncodeConstants.ENCODING_UTF_8));
+ params.put("uuid", uuid);
+ params.put("filepath", filePath);
+ params.put("timestamp", String.valueOf(System.currentTimeMillis()));
+ params.put("signature", String.valueOf(CommonUtils.signature()));
+ params.put("type", FOCUS_POINT_FILE_UPLOAD_TYPE);
+ if(StringUtils.isNotEmpty(focusPointUrl)){
+ HttpToolbox.post(focusPointUrl, params);
+ }
+ } catch (Exception e) {
+ FineLoggerFactory.getLogger().error(e.getMessage(), e);
+ }
+ }
+}
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/messagecollect/impl/AbstractSendDataToCloud.java b/designer-realize/src/main/java/com/fr/design/mainframe/messagecollect/impl/AbstractSendDataToCloud.java
new file mode 100644
index 0000000000..77f370d9d0
--- /dev/null
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/messagecollect/impl/AbstractSendDataToCloud.java
@@ -0,0 +1,135 @@
+package com.fr.design.mainframe.messagecollect.impl;
+
+import com.fr.design.mainframe.messagecollect.entity.FileEntityBuilder;
+import com.fr.design.mainframe.messagecollect.utils.MessageCollectUtils;
+import com.fr.intelli.record.MetricRegistry;
+import com.fr.json.JSONArray;
+import com.fr.log.FineLoggerFactory;
+import com.fr.stable.ProductConstants;
+import com.fr.stable.StableUtils;
+import com.fr.stable.query.QueryFactory;
+import com.fr.stable.query.condition.QueryCondition;
+import com.fr.stable.query.data.DataList;
+import com.fr.stable.query.restriction.RestrictionFactory;
+import com.fr.stable.xml.XMLTools;
+import com.fr.stable.xml.XMLable;
+
+import java.io.File;
+import java.io.FileOutputStream;
+
+/**
+ * @author alex sung
+ * @date 2019/3/22
+ */
+public abstract class AbstractSendDataToCloud implements XMLable {
+ private static final String FILE_NAME = "messagecollect.info";
+ private static final String COLUMN_TIME = "time";
+
+ protected String lastTime;
+ private static final int PAGE_SIZE = 10000;
+ private long totalCount = -1;
+ private FileEntityBuilder fileEntityBuilder;
+
+ public FileEntityBuilder getFileEntityBuilder() {
+ return fileEntityBuilder;
+ }
+
+ public void setFileEntityBuilder(FileEntityBuilder fileEntityBuilder) {
+ this.fileEntityBuilder = fileEntityBuilder;
+ }
+
+ public String getLastTime() {
+ return lastTime;
+ }
+
+ public void setLastTime(String lastTime) {
+ this.lastTime = lastTime;
+ }
+
+ public void saveLastTime() {
+ setLastTime(MessageCollectUtils.dateToString());
+ try {
+ FileOutputStream out = new FileOutputStream(getLastTimeFile());
+ XMLTools.writeOutputStreamXML(this, out);
+ } catch (Exception ex) {
+ FineLoggerFactory.getLogger().error(ex.getMessage());
+ }
+ }
+
+ public static File getLastTimeFile() {
+ return new File(StableUtils.pathJoin(ProductConstants.getEnvHome(), FILE_NAME));
+ }
+
+ public void queryData(long currentTime, long lastTime, Class tClass) {
+ queryAndSendOnePageFunctionContent(currentTime, lastTime, 0, tClass);
+ long page = (totalCount / PAGE_SIZE) + 1;
+ for (int i = 1; i < page; i++) {
+ queryAndSendOnePageFunctionContent(currentTime, lastTime, i, tClass);
+ }
+ }
+
+ @Override
+ public Object clone() throws CloneNotSupportedException {
+ return super.clone();
+ }
+
+ private void queryAndSendOnePageFunctionContent(long current, long last, int page, Class tClass) {
+ QueryCondition condition = QueryFactory.create()
+ .skip(page * PAGE_SIZE)
+ .count(PAGE_SIZE)
+ .addSort(COLUMN_TIME, true)
+ .addRestriction(RestrictionFactory.lte(COLUMN_TIME, current))
+ .addRestriction(RestrictionFactory.gte(COLUMN_TIME, last));
+ try {
+ DataList points = MetricRegistry.getMetric().find(tClass, condition);
+ //第一次查询获取总记录数
+ if (page == 0) {
+ totalCount = points.getTotalCount();
+ }
+ dealWithData(points);
+
+ } catch (Exception e) {
+ FineLoggerFactory.getLogger().error(e.getMessage(), e);
+ }
+ }
+
+ public void dealWithData(DataList tDataList) throws Exception {
+ generateThisPageFile(tDataList);
+ }
+
+ private void generateThisPageFile(DataList points) {
+ try {
+ JSONArray jsonArray = dealWithSendFunctionContent(points);
+ if (jsonArray == null) {
+ return;
+ }
+ //生成json文件
+ fileEntityBuilder.generateFile(jsonArray, getFileEntityBuilder().getFolderName());
+ } catch (Exception e) {
+ FineLoggerFactory.getLogger().error(e.getMessage(), e);
+ }
+ }
+
+ public abstract JSONArray dealWithSendFunctionContent(DataList focusPoints);
+
+ /**
+ * 生成zip并发送zip文件
+ * @param pathName zip文件路径
+ */
+ protected void sendZipFile(String pathName) {
+
+ File file = null;
+ try {
+ file = fileEntityBuilder.generateZipFile(pathName);
+ if (file != null) {
+ fileEntityBuilder.uploadFile(file, file.getName());
+ }
+ } catch (Exception e) {
+ FineLoggerFactory.getLogger().error(e.getMessage(), e);
+ return;
+ }
+ fileEntityBuilder.deleteFileAndZipFile(file, pathName);
+ }
+
+
+}
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/messagecollect/impl/FocusPointMessageUploader.java b/designer-realize/src/main/java/com/fr/design/mainframe/messagecollect/impl/FocusPointMessageUploader.java
new file mode 100644
index 0000000000..62f822af58
--- /dev/null
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/messagecollect/impl/FocusPointMessageUploader.java
@@ -0,0 +1,97 @@
+package com.fr.design.mainframe.messagecollect.impl;
+
+import com.fr.design.mainframe.messagecollect.entity.FileEntityBuilder;
+import com.fr.design.mainframe.messagecollect.utils.MessageCollectUtils;
+import com.fr.intelli.record.FocusPoint;
+import com.fr.json.JSONArray;
+import com.fr.json.JSONObject;
+import com.fr.log.FineLoggerFactory;
+import com.fr.stable.ProductConstants;
+import com.fr.stable.StableUtils;
+import com.fr.stable.query.data.DataList;
+import com.fr.stable.xml.XMLPrintWriter;
+import com.fr.stable.xml.XMLableReader;
+
+import java.util.Date;
+import java.util.UUID;
+
+/**
+ * @author alex sung
+ * @date 2019/3/22
+ */
+public class FocusPointMessageUploader extends AbstractSendDataToCloud {
+
+ private static final String TAG = "FocusPointMessageTag";
+ private static final long DELTA = 24 * 3600 * 1000L;
+ private static volatile FocusPointMessageUploader instance;
+
+ public static FocusPointMessageUploader getInstance() {
+ if (instance == null) {
+ synchronized (FocusPointMessageUploader.class) {
+ if (instance == null) {
+ instance = new FocusPointMessageUploader();
+ }
+ }
+ }
+ return instance;
+ }
+
+ @Override
+ public JSONArray dealWithSendFunctionContent(DataList focusPoints) {
+ if (focusPoints == null) {
+ return null;
+ }
+ JSONArray ja = new JSONArray();
+ for(T t:focusPoints.getList()){
+ FocusPoint focusPoint = (FocusPoint)t;
+ JSONObject jo = new JSONObject();
+ jo.put("id",focusPoint.getId());
+ jo.put("text",focusPoint.getText());
+ jo.put("source",focusPoint.getSource());
+ jo.put("time",focusPoint.getTime());
+ jo.put("username",focusPoint.getUsername());
+ jo.put("ip",focusPoint.getIp());
+ jo.put("title",focusPoint.getTitle());
+ jo.put("body",focusPoint.getBody());
+ ja.put(jo);
+ }
+ return ja;
+ }
+
+ public void sendToCloudCenter() {
+ MessageCollectUtils.readXMLFile(instance, getLastTimeFile());
+ long currentTime = new Date().getTime();
+ long lastTime = MessageCollectUtils.getLastTimeMillis(this.lastTime);
+ if (currentTime - lastTime <= DELTA) {
+ return;
+ }
+ try {
+ generatePath();
+ queryData(currentTime, lastTime, FocusPoint.class);
+ } catch (Exception e) {
+ FineLoggerFactory.getLogger().error(e.getMessage());
+ }
+ sendZipFile(getFileEntityBuilder().getFolderName());
+ saveLastTime();
+ }
+
+ @Override
+ public void readXML(XMLableReader reader) {
+ if (reader.isAttr()) {
+ this.setLastTime(reader.getAttrAsString("focusPointLastTime", null));
+ }
+ }
+
+ @Override
+ public void writeXML(XMLPrintWriter writer) {
+ writer.startTAG(TAG);
+ writer.attr("focusPointLastTime", lastTime);
+ writer.end();
+ }
+
+ private void generatePath() {
+ //文件夹名称是uuid.zip，版本信息已经在edition中体现了
+ String folderName = StableUtils.pathJoin(ProductConstants.getEnvHome(), String.valueOf(UUID.randomUUID()));
+ setFileEntityBuilder(new FileEntityBuilder(folderName));
+ }
+}
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/messagecollect/utils/MessageCollectUtils.java b/designer-realize/src/main/java/com/fr/design/mainframe/messagecollect/utils/MessageCollectUtils.java
new file mode 100644
index 0000000000..7389422087
--- /dev/null
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/messagecollect/utils/MessageCollectUtils.java
@@ -0,0 +1,63 @@
+package com.fr.design.mainframe.messagecollect.utils;
+
+import com.fr.base.FRContext;
+import com.fr.general.DateUtils;
+import com.fr.general.IOUtils;
+import com.fr.log.FineLoggerFactory;
+import com.fr.stable.EncodeConstants;
+import com.fr.stable.StringUtils;
+import com.fr.stable.xml.XMLReadable;
+import com.fr.stable.xml.XMLableReader;
+import com.fr.third.javax.xml.stream.XMLStreamException;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.text.DateFormat;
+import java.util.Date;
+
+/**
+ * @author alex sung
+ * @date 2019/3/26
+ */
+public class MessageCollectUtils {
+
+ public static void readXMLFile(XMLReadable xmlReadable, File xmlFile) {
+ if (xmlFile == null || !xmlFile.exists()) {
+ return;
+ }
+ String charset = EncodeConstants.ENCODING_UTF_8;
+ try {
+ InputStream is = new FileInputStream(xmlFile);
+ String fileContent = IOUtils.inputStream2String(is);
+ InputStream xmlInputStream = new ByteArrayInputStream(fileContent.getBytes(charset));
+ InputStreamReader inputStreamReader = new InputStreamReader(xmlInputStream, charset);
+ XMLableReader xmlReader = XMLableReader.createXMLableReader(inputStreamReader);
+ if (xmlReader != null) {
+ xmlReader.readXMLObject(xmlReadable);
+ }
+ xmlInputStream.close();
+ } catch (IOException | XMLStreamException e) {
+ FineLoggerFactory.getLogger().error(e.getMessage(), e);
+ }
+ }
+
+ public static long getLastTimeMillis(String lastTime) {
+ if (StringUtils.isEmpty(lastTime)) {
+ return 0;
+ }
+ try {
+ return DateUtils.string2Date(lastTime, true).getTime();
+ } catch (Exception e) {
+ return -1;
+ }
+ }
+
+ public static String dateToString(){
+ DateFormat df = FRContext.getDefaultValues().getDateTimeFormat();
+ return df.format(new Date());
+ }
+}
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java b/designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java
index dac28a627a..10a1ee0bdf 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java
@@ -5,7 +5,7 @@ import com.fr.decision.webservice.utils.DecisionServiceConstants;
import com.fr.design.EnvChangeEntrance;
import com.fr.design.i18n.Toolkit;
import com.fr.design.mainframe.DesignerContext;
-import com.fr.design.mainframe.loghandler.DesignerLogHandler;
+import com.fr.design.mainframe.loghandler.DesignerLogger;
import com.fr.event.EventDispatcher;
import com.fr.log.FineLoggerFactory;
import com.fr.report.RemoteDesignConstants;
@@ -46,7 +46,7 @@ public class DesignerSocketIO {
if (ArrayUtils.isNotEmpty(objects)) {
try {
LoggingEvent event = SerializerHelper.deserialize((byte[]) objects[0]);
- DesignerLogHandler.getInstance().printLoggingEvent(event);
+ DesignerLogger.log(event);
} catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
}
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/templateinfo/JWorkBookProcessInfo.java b/designer-realize/src/main/java/com/fr/design/mainframe/template/info/JWorkBookProcessInfo.java
similarity index 98%
rename from designer-realize/src/main/java/com/fr/design/mainframe/templateinfo/JWorkBookProcessInfo.java
rename to designer-realize/src/main/java/com/fr/design/mainframe/template/info/JWorkBookProcessInfo.java
index 306c6b0d11..eec7773282 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/templateinfo/JWorkBookProcessInfo.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/template/info/JWorkBookProcessInfo.java
@@ -1,4 +1,4 @@
-package com.fr.design.mainframe.templateinfo;
+package com.fr.design.mainframe.template.info;
import com.fr.base.parameter.ParameterUI;
import com.fr.main.impl.WorkBook;
diff --git a/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatColPane.java b/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatColPane.java
index 100b306d8e..b4ff4f9efd 100644
--- a/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatColPane.java
+++ b/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatColPane.java
@@ -21,8 +21,10 @@ public class RepeatColPane extends FreezeAndRepeatPane {
@Override
public void populateBean(FT ob) {
- ((ColSpinner)start).setValue((ob.getFrom() + 1));
- ((ColSpinner)end).setValue((ob.getTo() + 1));
+ if (ob.getFrom() <= ob.getTo()) {
+ ((ColSpinner)start).setValue((ob.getFrom() + 1));
+ ((ColSpinner)end).setValue((ob.getTo() + 1));
+ }
}
@Override
diff --git a/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatRowPane.java b/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatRowPane.java
index e46a59a6e9..5ae39ec25c 100644
--- a/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatRowPane.java
+++ b/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatRowPane.java
@@ -21,8 +21,10 @@ public class RepeatRowPane extends FreezeAndRepeatPane {
@Override
public void populateBean(FT ob) {
- ((RowSpinner)start).setValue((ob.getFrom() + 1));
- ((RowSpinner)end).setValue((ob.getTo() + 1));
+ if (ob.getFrom() <= ob.getTo()) {
+ ((RowSpinner)start).setValue((ob.getFrom() + 1));
+ ((RowSpinner)end).setValue((ob.getTo() + 1));
+ }
}
@Override
diff --git a/designer-realize/src/main/java/com/fr/grid/GridUtils.java b/designer-realize/src/main/java/com/fr/grid/GridUtils.java
index dfe7a5f2d2..11e907fc64 100644
--- a/designer-realize/src/main/java/com/fr/grid/GridUtils.java
+++ b/designer-realize/src/main/java/com/fr/grid/GridUtils.java
@@ -12,6 +12,7 @@ import com.fr.general.ComparatorUtils;
import com.fr.grid.selection.CellSelection;
import com.fr.grid.selection.FloatSelection;
import com.fr.grid.selection.Selection;
+import com.fr.poly.creator.ECBlockPane;
import com.fr.report.ReportHelper;
import com.fr.report.cell.CellElement;
import com.fr.report.cell.FloatElement;
@@ -48,8 +49,7 @@ public class GridUtils {
//peter:下面这几个量是在Drag列的时候用.
public final static int DRAG_CELL_SIZE = 1; //peter:drag的时候改变格子的宽度.
- public final static int DRAG_SELECT_UNITS = 2; //peter:drag的时候,选中单元格.
-// public static int resolution = (int) (ScreenResolution.getScreenResolution()* JSliderPane.getInstance().resolutionTimes);
+ public final static int DRAG_SELECT_UNITS = 2; //peter:drag的时候,选中单元格.// public static int resolution = (int) (ScreenResolution.getScreenResolution()* JSliderPane.getInstance().resolutionTimes);
/**
* Is above float element.(the return may be null).
@@ -125,7 +125,6 @@ public class GridUtils {
*/
public static double[] caculateFloatElementLocations(FloatElement floatElement, DynamicUnitList columnWidthList, DynamicUnitList rowHeightList,
int verticalValue, int horizentalValue) {
-// int resolution = ScreenResolution.getScreenResolution();
int resolution = (int) (ScreenResolution.getScreenResolution() * JSliderPane.getInstance().resolutionTimes);
double floatX = columnWidthList.getRangeValue(horizentalValue, 0).toPixD(resolution) + floatElement.getLeftDistance().toPixD(resolution);
@@ -180,7 +179,6 @@ public class GridUtils {
private static int cc_selected_column_or_row(double mouseEvtPosition, int beginValue, int value, DynamicUnitList sizeList) {
double tmpIntIndex = 0;
int selectedCellIndex = 0;
-// int resolution = ScreenResolution.getScreenResolution();
int resolution = (int) (ScreenResolution.getScreenResolution() * JSliderPane.getInstance().resolutionTimes);
if (mouseEvtPosition < 0) {
selectedCellIndex = value;
@@ -239,7 +237,6 @@ public class GridUtils {
private static int cc_selected_column_or_row_withresolution(double mouseEvtPosition, int beginValue, int value, DynamicUnitList sizeList, int resolution) {
double tmpIntIndex = 0;
int selectedCellIndex = 0;
-// int resolution = ScreenResolution.getScreenResolution();
if (mouseEvtPosition < 0) {
selectedCellIndex = value;
for (; true; selectedCellIndex--) {
@@ -311,6 +308,7 @@ public class GridUtils {
public static boolean canMove(ElementCasePane reportPane, int cellColumn, int cellRow) {
if (reportPane.mustInVisibleRange()) {
Grid grid = reportPane.getGrid();
+ checkGridCount(reportPane);
int verticalEndValue = grid.getVerticalValue() + grid.getVerticalExtent() - 1;
int horizontalEndValue = grid.getHorizontalValue() + grid.getHorizontalExtent() - 1;
if (cellColumn > horizontalEndValue) {
@@ -323,6 +321,16 @@ public class GridUtils {
return true;
}
+ /**
+ *聚合报表的报表块增加单元格的数量时 当单元格拉动一半会自动扩展成完整的单元格
+ * 该单元格不被记录 check下重新计算下单元格数量
+ */
+ private static void checkGridCount(Object obj) {
+ if (obj instanceof ECBlockPane) {
+ ((ECBlockPane) obj).getTarget().firePropertyChange();
+ }
+ }
+
/**
* 选择一个Cell, 支持Merge.
*/
diff --git a/designer-realize/src/main/java/com/fr/poly/PolyComponentsBar.java b/designer-realize/src/main/java/com/fr/poly/PolyComponentsBar.java
index 3130a4b864..564a3ae6a2 100644
--- a/designer-realize/src/main/java/com/fr/poly/PolyComponentsBar.java
+++ b/designer-realize/src/main/java/com/fr/poly/PolyComponentsBar.java
@@ -12,6 +12,7 @@ import com.fr.design.gui.itooltip.MultiLineToolTip;
import com.fr.design.i18n.Toolkit;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.mainframe.dnd.SerializableTransferable;
+import com.fr.locale.InterProviderFactory;
import com.fr.log.FineLoggerFactory;
import com.fr.report.poly.PolyECBlock;
import com.sun.java.swing.plaf.windows.WindowsLookAndFeel;
@@ -65,7 +66,7 @@ public class PolyComponentsBar extends JToolBar {
for (int i = 0; i < typeLen; i++) {
BaseChart[] rowChart = BaseChartGetter.getStaticChartTypes(typeName[i].getPlotID());
String iconPath = ChartTypeInterfaceManager.getInstance().getIconPath(typeName[i].getPlotID());
- serIcons[i + 1] = new SerIcon(rowChart[0], Toolkit.i18nText(typeName[i].getName()), iconPath);
+ serIcons[i + 1] = new SerIcon(rowChart[0], InterProviderFactory.getProvider().getLocText(typeName[i].getName()), iconPath);
this.add(serIcons[i + 1]);
}
diff --git a/designer-realize/src/main/java/com/fr/start/Designer.java b/designer-realize/src/main/java/com/fr/start/Designer.java
index bd872e41ac..2c8e030e31 100644
--- a/designer-realize/src/main/java/com/fr/start/Designer.java
+++ b/designer-realize/src/main/java/com/fr/start/Designer.java
@@ -10,7 +10,9 @@ import com.fr.design.actions.file.newReport.NewWorkBookAction;
import com.fr.design.actions.server.ServerConfigManagerAction;
import com.fr.design.actions.server.StyleListAction;
import com.fr.design.actions.server.WidgetManagerAction;
+import com.fr.design.base.mode.DesignModeContext;
import com.fr.design.constants.UIConstants;
+import com.fr.design.file.HistoryTemplateListCache;
import com.fr.design.file.HistoryTemplateListPane;
import com.fr.design.file.MutilTempalteTabPane;
import com.fr.design.fun.MenuHandler;
@@ -80,6 +82,10 @@ public class Designer extends BaseDesigner {
private UIButton redo;
private UIPreviewButton run;
+ public Designer(String[] args) {
+ super(args);
+ }
+
/**
* 设计器启动的Main方法
*
@@ -108,11 +114,6 @@ public class Designer extends BaseDesigner {
}
- public Designer(String[] args) {
- super(args);
- }
-
-
/**
* 创建新建文件的快捷方式数组。
*
@@ -215,7 +216,7 @@ public class Designer extends BaseDesigner {
saveButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
- JTemplate jt = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
+ JTemplate jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
jt.stopEditing();
jt.saveTemplate();
jt.requestFocus();
@@ -224,6 +225,7 @@ public class Designer extends BaseDesigner {
return saveButton;
}
+
private UIButton createUndoButton() {
undo = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/undo.png"));
undo.setToolTipText(KeySetUtils.UNDO.getMenuKeySetName());
@@ -271,7 +273,7 @@ public class Designer extends BaseDesigner {
) {
@Override
protected void upButtonClickEvent() {
- JTemplate jt = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
+ JTemplate jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
if (jt == null) {
return;
}
@@ -280,7 +282,7 @@ public class Designer extends BaseDesigner {
@Override
protected void downButtonClickEvent() {
- final JTemplate jt = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
+ final JTemplate jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
if (jt == null) {
return;
}
@@ -308,12 +310,12 @@ public class Designer extends BaseDesigner {
@Override
protected void refreshLargeToolbarState() {
- JTemplate jt = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
+ JTemplate jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
if (jt == null) {
return;
}
- saveButton.setEnabled(!jt.isSaved() && !DesignerMode.isVcsMode());
- MutilTempalteTabPane.getInstance().refreshOpenedTemplate(HistoryTemplateListPane.getInstance().getHistoryList());
+ saveButton.setEnabled(!jt.isSaved() && !DesignModeContext.isVcsMode());
+ MutilTempalteTabPane.getInstance().refreshOpenedTemplate(HistoryTemplateListCache.getInstance().getHistoryList());
MutilTempalteTabPane.getInstance().repaint();
if (DesignerEnvManager.getEnvManager().isSupportUndo()) {
undo.setEnabled(jt.canUndo());
diff --git a/designer-realize/src/main/java/com/fr/start/SplashContext.java b/designer-realize/src/main/java/com/fr/start/SplashContext.java
index cea537592e..17eff62baf 100644
--- a/designer-realize/src/main/java/com/fr/start/SplashContext.java
+++ b/designer-realize/src/main/java/com/fr/start/SplashContext.java
@@ -167,7 +167,7 @@ public class SplashContext {
private static String getSplashPath() {
Locale locale = DesignerEnvManager.getEnvManager().getLanguage();
- if (Locale.US.equals(locale) || Locale.KOREA.equals(locale)) {
+ if (Locale.US.equals(locale) || Locale.KOREA.equals(locale) || Locale.TAIWAN.equals(locale)) {
return "/com/fr/design/images/splash_10_en.gif";
} else if (Locale.JAPAN.equals(locale)) {
return "/com/fr/design/images/splash_10_jp.gif";
diff --git a/designer-realize/src/main/java/com/fr/start/module/PreStartActivator.java b/designer-realize/src/main/java/com/fr/start/module/PreStartActivator.java
index 073d24cb0d..72d3217be2 100644
--- a/designer-realize/src/main/java/com/fr/start/module/PreStartActivator.java
+++ b/designer-realize/src/main/java/com/fr/start/module/PreStartActivator.java
@@ -2,7 +2,8 @@ package com.fr.start.module;
import com.fr.design.DesignerEnvManager;
import com.fr.design.RestartHelper;
-import com.fr.design.mainframe.templateinfo.TemplateInfoCollector;
+import com.fr.design.fun.OemProcessor;
+import com.fr.design.mainframe.template.info.TemplateInfoCollector;
import com.fr.design.utils.DesignUtils;
import com.fr.design.utils.DesignerPort;
import com.fr.general.CloudCenter;
@@ -14,6 +15,7 @@ import com.fr.stable.BuildContext;
import com.fr.stable.OperatingSystem;
import com.fr.stable.ProductConstants;
import com.fr.stable.StableUtils;
+import com.fr.start.OemHandler;
import com.fr.start.SplashContext;
import com.fr.start.SplashStrategy;
import com.fr.start.fx.SplashFx;
@@ -70,8 +72,6 @@ public class PreStartActivator extends Activator {
private void checkDebugStart() {
if (isDebug()) {
setDebugEnv();
- } else {
- DesignUtils.setPort(DesignUtils.getPort());
}
}
@@ -125,7 +125,19 @@ public class PreStartActivator extends Activator {
service.shutdown();
}
- private static SplashStrategy createSplash() {
+ private SplashStrategy createSplash() {
+ OemProcessor oemProcessor = OemHandler.findOem();
+ if (oemProcessor != null) {
+ SplashStrategy splashStrategy = null;
+ try {
+ splashStrategy = oemProcessor.createSplashStrategy();
+ } catch (Throwable e) {
+ FineLoggerFactory.getLogger().error(e.getMessage(), e);
+ }
+ if (splashStrategy != null) {
+ return splashStrategy;
+ }
+ }
// 这里可以开接口加载自定义启动画面
if (OperatingSystem.isWindows()) {
return new SplashFx();
diff --git a/designer-realize/src/main/resources/com/fr/aspectj/designer/TemplateProcessTracker.aj b/designer-realize/src/main/resources/com/fr/aspectj/designer/TemplateProcessTracker.aj
index 8e4eeb7164..2c54338186 100644
--- a/designer-realize/src/main/resources/com/fr/aspectj/designer/TemplateProcessTracker.aj
+++ b/designer-realize/src/main/resources/com/fr/aspectj/designer/TemplateProcessTracker.aj
@@ -5,13 +5,11 @@ package com.fr.aspectj.designer;
* Created by plough on 2017/3/3.
*/
-import com.fr.design.mainframe.templateinfo.TemplateInfoCollector;
import com.fr.grid.Grid;
import org.aspectj.lang.reflect.SourceLocation;
import java.awt.event.ActionEvent;
import java.awt.event.MouseEvent;
-import java.util.Date;
public aspect TemplateProcessTracker {
//声明一个pointcut，匹配你需要的方法