Browse Source

Merge pull request #34 in PF/design from ~KERRY/design-pf:9.0 to 9.0

* commit '6033f508d26ff259776af8befe096b5f7f1fb59f':
  REPORT-2354 将平台的插件管理和设计器的插件管理统一起来
  REPORT-2354 将平台的插件管理和设计器的插件管理统一起来
master
superman 8 years ago
parent
commit
4664675215
  1. 97
      designer_base/src/com/fr/design/extra/PluginOperateUtils.java
  2. 15
      designer_base/src/com/fr/design/extra/PluginWebBridge.java
  3. 1
      designer_base/src/com/fr/design/extra/exe/callback/DownloadCallback.java
  4. 4
      designer_base/src/com/fr/design/extra/exe/callback/InstallFromDiskCallback.java
  5. 4
      designer_base/src/com/fr/design/extra/exe/callback/InstallOnlineCallback.java
  6. 2
      designer_base/src/com/fr/design/extra/exe/callback/JSCallback.java
  7. 2
      designer_base/src/com/fr/design/extra/exe/callback/ModifyStatusCallback.java
  8. 4
      designer_base/src/com/fr/design/extra/exe/callback/UninstallPluginCallback.java
  9. 2
      designer_base/src/com/fr/design/extra/exe/callback/UpdateFromDiskCallback.java
  10. 2
      designer_base/src/com/fr/design/extra/exe/callback/UpdateOnlineCallback.java
  11. 75
      designer_base/src/com/fr/design/locale/designer.properties
  12. 75
      designer_base/src/com/fr/design/locale/designer_en_US.properties
  13. 75
      designer_base/src/com/fr/design/locale/designer_ja_JP.properties
  14. 75
      designer_base/src/com/fr/design/locale/designer_ko_KR.properties
  15. 77
      designer_base/src/com/fr/design/locale/designer_zh_CN.properties
  16. 75
      designer_base/src/com/fr/design/locale/designer_zh_TW.properties

97
designer_base/src/com/fr/design/extra/PluginOperateUtils.java

@ -18,6 +18,7 @@ import com.fr.plugin.manage.bbs.BBSUserInfo;
import com.fr.plugin.manage.control.PluginTaskCallback;
import com.fr.plugin.view.PluginView;
import com.fr.stable.StringUtils;
import com.fr.third.v2.org.apache.poi.util.StringUtil;
import java.io.File;
import java.util.List;
@ -113,6 +114,10 @@ public class PluginOperateUtils {
public void run() {
try {
// HttpClient httpClient = new HttpClient(SiteCenter.getInstance().acquireUrlByKind("plugin.plist") + "&keyword=" + keyword);
if(StringUtils.isBlank(keyword)){
getRecommendPlugins(jsCallback);
return;
}
HttpClient httpClient = new HttpClient("http://shop.finereport.com/searchApi?type=all" + "&keyword=" + keyword);
httpClient.asGet();
String result = httpClient.getResponseText();
@ -132,39 +137,81 @@ public class PluginOperateUtils {
@Override
public void run() {
// String plistUrl = SiteCenter.getInstance().acquireUrlByKind("plugin.plist");
String plistUrl = "http://shop.finereport.com/shopServer?pg=plist";
String plistUrl = "http://shop.finereport.com/plugins" + "?";
boolean getRecommend = StringUtils.isEmpty(category) && StringUtils.isEmpty(seller) && StringUtils.isEmpty(fee);
if (getRecommend){
plistUrl = "http://shop.finereport.com/ShopServer?pg=feature";
if (getRecommend) {
getRecommendPlugins(jsCallback);
return;
}
if (StringUtils.isNotBlank(plistUrl)) {
StringBuilder url = new StringBuilder();
url.append(plistUrl);
if (StringUtils.isNotBlank(category)) {
url.append("&cid=").append(category.split("-")[1]);
}
if (StringUtils.isNotBlank(seller)) {
url.append("&seller=").append(seller.split("-")[1]);
}
if (StringUtils.isNotBlank(fee)) {
url.append("&fee=").append(fee.split("-")[1]);
}
try {
HttpClient httpClient = new HttpClient(url.toString());
String result = httpClient.getResponseText();
jsCallback.execute(result);
} catch (Exception e) {
FRLogger.getLogger().error(e.getMessage());
}
} else {
String result = PluginConstants.CONNECTION_404;
jsCallback.execute(result);
if (StringUtils.isNotBlank(plistUrl)) {
StringBuilder url = new StringBuilder();
url.append(plistUrl);
dealParams(url, category, seller, fee);
try {
HttpClient httpClient = new HttpClient(url.toString());
httpClient.asGet();
String result = httpClient.getResponseText();
JSONObject resultJSONObject = new JSONObject(result);
JSONArray resultArr = resultJSONObject.getJSONArray("result");
jsCallback.execute(resultArr.toString());
} catch (Exception e) {
FRLogger.getLogger().error(e.getMessage());
}
} else {
String result = PluginConstants.CONNECTION_404;
jsCallback.execute(result);
}
}
}).start();
}
public static void getRecommendPlugins(JSCallback jsCallback){
String plistUrl = "http://shop.finereport.com/ShopServer?pg=feature";
try {
HttpClient httpClient = new HttpClient(plistUrl.toString());
String result = httpClient.getResponseText();
jsCallback.execute(result);
} catch (Exception e) {
FRLogger.getLogger().error(e.getMessage());
}
}
public static void dealParams(StringBuilder url, String category, String seller, String fee){
if (StringUtils.isNotBlank(category)) {
url.append("cid=").append(category.split("-")[1]);
} else {
url.append("cid=").append("");
}
if (StringUtils.isNotBlank(seller)) {
switch (seller.split("-")[1]) {
case "finereport":
url.append("&seller=").append(1);
break;
case "developer":
url.append("&seller=").append(2);
break;
default:
url.append("&seller=").append("");
}
}
if (StringUtils.isNotBlank(fee)) {
switch (fee.split("-")[1]) {
case "free":
url.append("&fee=").append(1);
break;
case "charge":
url.append("&fee=").append(2);
break;
default:
url.append("&fee=").append("");
}
}
}
public static void getPluginCategories(JSCallback jsCallback) {
new Thread(new Runnable() {
@Override

15
designer_base/src/com/fr/design/extra/PluginWebBridge.java

@ -502,12 +502,25 @@ public class PluginWebBridge {
DesignerEnvManager.getEnvManager().setInShowBBsName(StringUtils.EMPTY);
uiLabel.setText(Inter.getLocText("FR-Base_UnSignIn"));
}
/**
* 初始化设计器部分
*/
public void initExtraDiff(final JSObject callback){
}
public void showLoginContent(){
/**
* 国际化
*/
public void parseI18(final String key, final JSObject callback){
JSCallback jsCallback = new JSCallback(webEngine, callback);
jsCallback.execute(Inter.getLocText("FR-Designer-" + key));
}
/**
* 是否是在设计器中操作
*/
public boolean isDesigner(){
return true;
}

1
designer_base/src/com/fr/design/extra/exe/callback/DownloadCallback.java

@ -29,6 +29,7 @@ public class DownloadCallback extends AbstractPluginTaskCallback {
if (result.isSuccess()) {
extraPluginTask.doExtraPluginTask();
} else {
jsCallback.execute("failed");
JOptionPane.showMessageDialog(null, result.getMessage(), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
}
}

4
designer_base/src/com/fr/design/extra/exe/callback/InstallFromDiskCallback.java

@ -33,12 +33,12 @@ public class InstallFromDiskCallback extends AbstractPluginTaskCallback {
jsCallback.execute("success");
if (result.isSuccess()) {
FRLogger.getLogger().info(Inter.getLocText("FR-Designer-Plugin_Install_Success"));
JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Plugin_Install_Successful"));
JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Plugin_Install_Success"));
} else if (result.errorCode() == PluginErrorCode.NeedInstallInterPluginDependency) {
int rv = JOptionPane.showOptionDialog(
null,
Inter.getLocText(Inter.getLocText("FR-Designer-Plugin_Install_Dependence")),
Inter.getLocText("FR-Designer-Plugin_Install_Success"),
Inter.getLocText("FR-Designer-Plugin_Warning"),
JOptionPane.YES_NO_CANCEL_OPTION,
JOptionPane.INFORMATION_MESSAGE,
null,

4
designer_base/src/com/fr/design/extra/exe/callback/InstallOnlineCallback.java

@ -32,12 +32,12 @@ public class InstallOnlineCallback extends AbstractPluginTaskCallback {
jsCallback.execute("success");
if (result.isSuccess()) {
FRLogger.getLogger().info(Inter.getLocText("FR-Designer-Plugin_Install_Success"));
JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Plugin_Install_Successful"));
JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Plugin_Install_Success"));
} else if (result.errorCode() == PluginErrorCode.NeedInstallInterPluginDependency) {
int rv = JOptionPane.showOptionDialog(
null,
Inter.getLocText(Inter.getLocText("FR-Designer-Plugin_Install_Dependence")),
Inter.getLocText("FR-Designer-Plugin_Install_Success"),
Inter.getLocText("FR-Designer-Plugin_Warning"),
JOptionPane.YES_NO_CANCEL_OPTION,
JOptionPane.INFORMATION_MESSAGE,
null,

2
designer_base/src/com/fr/design/extra/exe/callback/JSCallback.java

@ -80,7 +80,7 @@ public class JSCallback<T> extends Task<T> {
*/
private String filterHtmlTag(String origin, String tag) {
String matter1 = "<" + tag;
String matter2 = "</" + tag + ">";
String matter2 = tag + ">";
int a = origin.indexOf(matter1);
int b = origin.indexOf(matter2);
while (a != -1 && b != -1) {

2
designer_base/src/com/fr/design/extra/exe/callback/ModifyStatusCallback.java

@ -21,7 +21,7 @@ public class ModifyStatusCallback implements PluginTaskCallback{
public void done(PluginTaskResult result) {
if (result.isSuccess()) {
jsCallback.execute("success");
String modifyMessage = isActive ? Inter.getLocText("FR-Designer-Plugin_Has_Been_Actived") : Inter.getLocText("FR-Designer-Plugin_Has_Been_Disabled");
String modifyMessage = isActive ? Inter.getLocText("FR-Designer-Plugin_Actived") : Inter.getLocText("FR-Designer-Plugin_Disabled");
JOptionPane.showMessageDialog(null, modifyMessage);
} else {
JOptionPane.showMessageDialog(null, result.getMessage(), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);

4
designer_base/src/com/fr/design/extra/exe/callback/UninstallPluginCallback.java

@ -25,12 +25,12 @@ public class UninstallPluginCallback extends AbstractPluginTaskCallback {
if (result.isSuccess()) {
jsCallback.execute("success");
FRLogger.getLogger().info(Inter.getLocText("FR-Designer-Plugin_Delete_Success"));
JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Plugin_Install_Successful"));
JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Plugin_Delete_Success"));
}else if (result.errorCode() == PluginErrorCode.NeedInstallInterPluginDependency) {
int rv = JOptionPane.showOptionDialog(
null,
Inter.getLocText(Inter.getLocText("FR-Designer-Plugin_Delete_Dependence")),
Inter.getLocText("FR-Designer-Plugin_Delete_Success"),
Inter.getLocText("FR-Designer-Plugin_Warning"),
JOptionPane.YES_NO_CANCEL_OPTION,
JOptionPane.INFORMATION_MESSAGE,
null,

2
designer_base/src/com/fr/design/extra/exe/callback/UpdateFromDiskCallback.java

@ -38,7 +38,7 @@ public class UpdateFromDiskCallback extends AbstractPluginTaskCallback {
int rv = JOptionPane.showOptionDialog(
null,
Inter.getLocText(Inter.getLocText("FR-Designer-Plugin_Update_Dependence")),
Inter.getLocText("FR-Designer-Plugin_Update_Success"),
Inter.getLocText("FR-Designer-Plugin_Warning"),
JOptionPane.YES_NO_CANCEL_OPTION,
JOptionPane.INFORMATION_MESSAGE,
null,

2
designer_base/src/com/fr/design/extra/exe/callback/UpdateOnlineCallback.java

@ -38,7 +38,7 @@ public class UpdateOnlineCallback extends AbstractPluginTaskCallback {
int rv = JOptionPane.showOptionDialog(
null,
Inter.getLocText(Inter.getLocText("FR-Designer-Plugin_Update_Dependence")),
Inter.getLocText("FR-Designer-Plugin_Update_Success"),
Inter.getLocText("FR-Designer-Plugin_Warning"),
JOptionPane.YES_NO_CANCEL_OPTION,
JOptionPane.INFORMATION_MESSAGE,
null,

75
designer_base/src/com/fr/design/locale/designer.properties

@ -849,7 +849,6 @@ PageSetup-Placement_Center_on_Page=Page Center
sure_to_delete=sure to delete
Already_exists_not_add_repeat=Already exists, do not add repeat
Axis_Title=Axis title
FR-Designer-Plugin_Install_Failed=Install failed
FR-Designer-Widget-Style_Frame=
MainGraduationUnit=MainGraduationUnit
Second_Axis=Second Axis
@ -2006,4 +2005,76 @@ FR-Designer_AlphaFine_ShowAll=show all
FR-Designer_AlphaFine_Latest=Latest
FR-Designer_AlphaFine_ShowLess=show less
FR-Designer_Alphafine=AlphaFine
FR-Designer-Alphafine_No_Remind=
FR-Designer-Alphafine_No_Remind=
FR-Designer-Plugin_Install_Success=
FR-Designer-Plugin_Install_Failed=
FR-Designer-Plugin_Install_Dependence=
FR-Designer-Plugin_Delete_Dependence=
FR-Designer-Plugin_Delete_Success=
FR-Designer-Plugin_Delete_Failed=
FR-Designer-Plugin_Update_Dependence=
FR-Designer-Plugin_Update_Success=
FR-Designer-Plugin_Update_Failed=
FR-Designer-Plugin_Actived=
FR-Designer-Plugin_Disabled=
FR-Designer-Plugin-Store_App=
FR-Designer-Plugin-Store_Businesses=
FR-Designer-Plugin-Store_Official=
FR-Designer-Plugin-Store_Not_Official=
FR-Designer-Plugin-Store_Cost=
FR-Designer-Plugin-Store_Pay=
FR-Designer-Plugin-Store_Free=
FR-Designer-Plugin-Store_Category=
FR-Designer-Plugin-Store_Designer=
FR-Designer-Plugin-Store_Front_End_Display=
FR-Designer-Plugin-Store_Report_Write=
FR-Designer-Plugin-Store_Chart=
FR-Designer-Plugin-Store_BI=
FR-Designer-Plugin-Store_Export_Print=
FR-Designer-Plugin-Store_Mobile_Terminal=
FR-Designer-Plugin-Store_Integrate_Deployment=
FR-Designer-Plugin-Store_Data_Interface=
FR-Designer-Plugin-Store_Form_Components=
FR-Designer-Plugin-Store_Function=
FR-Designer-Plugin-Store_Recommend=
FR-Designer-Plugin-Store_Commodity_Description=
FR-Designer-Plugin-Store_Install=
FR-Designer-Plugin-Store_Install_From_Local=
FR-Designer-Plugin-Store_My_Plugins=
FR-Designer-Plugin-Store_No_Plugins=
FR-Designer-Plugin-Store_Disabled=
FR-Designer-Plugin-Store_Enable=
FR-Designer-Plugin-Store_Delete=
FR-Designer-Plugin-Store_Update=
FR-Designer-Plugin-Store_Update-ALL=
FR-Designer-Plugin-Store_Update_From_Local=
FR-Designer-Plugin-Store_BBS_Account_Login=
FR-Designer-Plugin-Store_Register=
FR-Designer-Plugin-Store_Forgot_Password=
FR-Designer-Plugin-Store_Quick_Login=
FR-Designer-Plugin-Store_Account=
FR-Designer-Plugin-Store_Password=
FR-Designer-Plugin-Store_Not_Login=
FR-Designer-Plugin-Store_Installed=
FR-Designer-Plugin-Store_Plugins_Count=
FR-Designer-Plugin-Store_Key_Word=
FR-Designer-Plugin-Store_Login=
FR-Designer-Plugin-Store_Login_By_QQ=
FR-Designer-Plugin-Store_User_Not_Exist=
FR-Designer-Plugin-Store_User_Password_Error=
FR-Designer-Plugin-Store_Unexpected_Error=
FR-Designer-Plugin-Store_Net_Connect_Failed=
FR-Designer-Plugin-Store_Not_Null=
FR-Designer-Plugin-Store_Switch_Account=
FR-Designer-Plugin-Store_Private_Message=
FR-Designer-Plugin-Store_Jar_Damaged=
FR-Designer-Plugin-Store_Probation=
FR-Designer-Plugin-Store_Authorize=
FR-Designer-Plugin-Store_Permanent=
FR-Designer-Plugin-Store_Expired=
FR-Designer-Plugin-Store_Day=
FR-Designer-Plugin-Store_Finereport=
FR-Designer-Plugin-Store_Version=
FR-Designer-Plugin-Store_Developer=
FR-Designer-Plugin-Store_Jar=
FR-Designer-Plugin-Store_Disconnected=

75
designer_base/src/com/fr/design/locale/designer_en_US.properties

@ -850,7 +850,6 @@ PageSetup-Placement_Center_on_Page=Center on Page
sure_to_delete=sure to delete
Already_exists_not_add_repeat=Already exist, please do not repeat
Axis_Title=Axis title
FR-Designer-Plugin_Install_Failed=Install failed
FR-Designer-Widget-Style_Frame=Frame
MainGraduationUnit=Major Graduation Unit
Second_Axis=Secondary Axis
@ -2004,4 +2003,76 @@ FR-Designer_AlphaFine_ShowAll=show all
FR-Designer_AlphaFine_Latest=Recent
FR-Designer_AlphaFine_ShowLess=show less
FR-Designer_Alphafine=AlphaFine
FR-Designer-Alphafine_No_Remind=don't remind
FR-Designer-Alphafine_No_Remind=don't remind
FR-Designer-Plugin_Install_Success=
FR-Designer-Plugin_Install_Failed=
FR-Designer-Plugin_Install_Dependence=
FR-Designer-Plugin_Delete_Dependence=
FR-Designer-Plugin_Delete_Success=
FR-Designer-Plugin_Delete_Failed=
FR-Designer-Plugin_Update_Dependence=
FR-Designer-Plugin_Update_Success=
FR-Designer-Plugin_Update_Failed=
FR-Designer-Plugin_Actived=
FR-Designer-Plugin_Disabled=
FR-Designer-Plugin-Store_App=
FR-Designer-Plugin-Store_Businesses=
FR-Designer-Plugin-Store_Official=
FR-Designer-Plugin-Store_Not_Official=
FR-Designer-Plugin-Store_Cost=
FR-Designer-Plugin-Store_Pay=
FR-Designer-Plugin-Store_Free=
FR-Designer-Plugin-Store_Category=
FR-Designer-Plugin-Store_Designer=
FR-Designer-Plugin-Store_Front_End_Display=
FR-Designer-Plugin-Store_Report_Write=
FR-Designer-Plugin-Store_Chart=
FR-Designer-Plugin-Store_BI=
FR-Designer-Plugin-Store_Export_Print=
FR-Designer-Plugin-Store_Mobile_Terminal=
FR-Designer-Plugin-Store_Integrate_Deployment=
FR-Designer-Plugin-Store_Data_Interface=
FR-Designer-Plugin-Store_Form_Components=
FR-Designer-Plugin-Store_Function=
FR-Designer-Plugin-Store_Recommend=
FR-Designer-Plugin-Store_Commodity_Description=
FR-Designer-Plugin-Store_Install=
FR-Designer-Plugin-Store_Install_From_Local=
FR-Designer-Plugin-Store_My_Plugins=
FR-Designer-Plugin-Store_No_Plugins=
FR-Designer-Plugin-Store_Disabled=
FR-Designer-Plugin-Store_Enable=
FR-Designer-Plugin-Store_Delete=
FR-Designer-Plugin-Store_Update=
FR-Designer-Plugin-Store_Update-ALL=
FR-Designer-Plugin-Store_Update_From_Local=
FR-Designer-Plugin-Store_BBS_Account_Login=
FR-Designer-Plugin-Store_Register=
FR-Designer-Plugin-Store_Forgot_Password=
FR-Designer-Plugin-Store_Quick_Login=
FR-Designer-Plugin-Store_Account=
FR-Designer-Plugin-Store_Password=
FR-Designer-Plugin-Store_Not_Login=
FR-Designer-Plugin-Store_Installed=
FR-Designer-Plugin-Store_Plugins_Count=
FR-Designer-Plugin-Store_Key_Word=
FR-Designer-Plugin-Store_Login=
FR-Designer-Plugin-Store_Login_By_QQ=
FR-Designer-Plugin-Store_User_Not_Exist=
FR-Designer-Plugin-Store_User_Password_Error=
FR-Designer-Plugin-Store_Unexpected_Error=
FR-Designer-Plugin-Store_Net_Connect_Failed=
FR-Designer-Plugin-Store_Not_Null=
FR-Designer-Plugin-Store_Switch_Account=
FR-Designer-Plugin-Store_Private_Message=
FR-Designer-Plugin-Store_Jar_Damaged=
FR-Designer-Plugin-Store_Probation=
FR-Designer-Plugin-Store_Authorize=
FR-Designer-Plugin-Store_Permanent=
FR-Designer-Plugin-Store_Expired=
FR-Designer-Plugin-Store_Day=
FR-Designer-Plugin-Store_Finereport=
FR-Designer-Plugin-Store_Version=
FR-Designer-Plugin-Store_Developer=
FR-Designer-Plugin-Store_Jar=
FR-Designer-Plugin-Store_Disconnected=

75
designer_base/src/com/fr/design/locale/designer_ja_JP.properties

@ -845,7 +845,6 @@ PageSetup-Placement_Center_on_Page=\u4E2D\u592E\u63C3\u3048
sure_to_delete=\u524A\u9664\u3092\u78BA\u8A8D\u3057\u307E\u3059
Already_exists_not_add_repeat=\u3059\u3067\u306B\u5B58\u5728\u3057\u3066\u3044\u308B\u3001\u30EA\u30D4\u30FC\u30C8\u3092\u8FFD\u52A0\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044
Axis_Title=\u8EF8\u306E\u8868\u984C
FR-Designer-Plugin_Install_Failed=\u30D7\u30E9\u30B0\u30A4\u30F3\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u306B\u5931\u6557\u3057\u307E\u3057\u305F
FR-Designer-Widget-Style_Frame=\u30D5\u30EC\u30FC\u30E0
MainGraduationUnit=\u4E3B\u306A\u76EE\u76DB\u308A\u5358\u4F4D
Second_Axis=\u6B21\u5EA7\u6A19\u8EF8
@ -1982,4 +1981,76 @@ FR-Designer_Edit_String_To_Formula=\u30AD\u30E3\u30E9\u30AF\u30BF\u30FC\u6587\u5
FR-Base_UnSignIn=\ \u672A\u30ED\u30B0\u30A4\u30F3
Every=\u6BCF
CellWrite-Preview_Cell_Content=\u30BB\u30EB\u306E\u5185\u5BB9\u3092\u30D7\u30EC\u30D3\u30E5\u30FC\u3059\u308B
FormulaD-Data_Fields=\u30C7\u30FC\u30BF\u30D5\u30A3\u30FC\u30EB\u30C9
FormulaD-Data_Fields=\u30C7\u30FC\u30BF\u30D5\u30A3\u30FC\u30EB\u30C9
FR-Designer-Plugin_Install_Success=
FR-Designer-Plugin_Install_Failed=
FR-Designer-Plugin_Install_Dependence=
FR-Designer-Plugin_Delete_Dependence=
FR-Designer-Plugin_Delete_Success=
FR-Designer-Plugin_Delete_Failed=
FR-Designer-Plugin_Update_Dependence=
FR-Designer-Plugin_Update_Success=
FR-Designer-Plugin_Update_Failed=
FR-Designer-Plugin_Actived=
FR-Designer-Plugin_Disabled=
FR-Designer-Plugin-Store_App=
FR-Designer-Plugin-Store_Businesses=
FR-Designer-Plugin-Store_Official=
FR-Designer-Plugin-Store_Not_Official=
FR-Designer-Plugin-Store_Cost=
FR-Designer-Plugin-Store_Pay=
FR-Designer-Plugin-Store_Free=
FR-Designer-Plugin-Store_Category=
FR-Designer-Plugin-Store_Designer=
FR-Designer-Plugin-Store_Front_End_Display=
FR-Designer-Plugin-Store_Report_Write=
FR-Designer-Plugin-Store_Chart=
FR-Designer-Plugin-Store_BI=
FR-Designer-Plugin-Store_Export_Print=
FR-Designer-Plugin-Store_Mobile_Terminal=
FR-Designer-Plugin-Store_Integrate_Deployment=
FR-Designer-Plugin-Store_Data_Interface=
FR-Designer-Plugin-Store_Form_Components=
FR-Designer-Plugin-Store_Function=
FR-Designer-Plugin-Store_Recommend=
FR-Designer-Plugin-Store_Commodity_Description=
FR-Designer-Plugin-Store_Install=
FR-Designer-Plugin-Store_Install_From_Local=
FR-Designer-Plugin-Store_My_Plugins=
FR-Designer-Plugin-Store_No_Plugins=
FR-Designer-Plugin-Store_Disabled=
FR-Designer-Plugin-Store_Enable=
FR-Designer-Plugin-Store_Delete=
FR-Designer-Plugin-Store_Update=
FR-Designer-Plugin-Store_Update-ALL=
FR-Designer-Plugin-Store_Update_From_Local=
FR-Designer-Plugin-Store_BBS_Account_Login=
FR-Designer-Plugin-Store_Register=
FR-Designer-Plugin-Store_Forgot_Password=
FR-Designer-Plugin-Store_Quick_Login=
FR-Designer-Plugin-Store_Account=
FR-Designer-Plugin-Store_Password=
FR-Designer-Plugin-Store_Not_Login=
FR-Designer-Plugin-Store_Installed=
FR-Designer-Plugin-Store_Plugins_Count=
FR-Designer-Plugin-Store_Key_Word=
FR-Designer-Plugin-Store_Login=
FR-Designer-Plugin-Store_Login_By_QQ=
FR-Designer-Plugin-Store_User_Not_Exist=
FR-Designer-Plugin-Store_User_Password_Error=
FR-Designer-Plugin-Store_Unexpected_Error=
FR-Designer-Plugin-Store_Net_Connect_Failed=
FR-Designer-Plugin-Store_Not_Null=
FR-Designer-Plugin-Store_Switch_Account=
FR-Designer-Plugin-Store_Private_Message=
FR-Designer-Plugin-Store_Jar_Damaged=
FR-Designer-Plugin-Store_Probation=
FR-Designer-Plugin-Store_Authorize=
FR-Designer-Plugin-Store_Permanent=
FR-Designer-Plugin-Store_Expired=
FR-Designer-Plugin-Store_Day=
FR-Designer-Plugin-Store_Finereport=
FR-Designer-Plugin-Store_Version=
FR-Designer-Plugin-Store_Developer=
FR-Designer-Plugin-Store_Jar=
FR-Designer-Plugin-Store_Disconnected=

75
designer_base/src/com/fr/design/locale/designer_ko_KR.properties

@ -846,7 +846,6 @@ PageSetup-Placement_Center_on_Page=\uAC00\uC6B4\uB370\uC815\uB82C\uBC29\uC2DD
sure_to_delete=\uC0AD\uC81C\uD655\uC778
Already_exists_not_add_repeat=\uC774\uBBF8\uC874\uC7AC\uD569\uB2C8\uB2E4.\uC911\uBCF5\uCD94\uAC00\uD558\uC9C0\uB9C8\uC2ED\uC2DC\uC624.
Axis_Title=\uCD95\uC81C\uBAA9
FR-Designer-Plugin_Install_Failed=\uD50C\uB7EC\uADF8\uC778\uC124\uCE58\uC2E4\uD328
FR-Designer-Widget-Style_Frame=\uD504\uB808\uC784
MainGraduationUnit=\uC8FC\uB208\uAE08\uB2E8\uC704
Second_Axis=\uBCF4\uC870\uC88C\uD45C\uCD95
@ -1983,4 +1982,76 @@ FR-Designer_Edit_String_To_Formula=\uBB38\uC790\uC5F4\uC744\uC218\uC2DD\uC73C\uB
FR-Base_UnSignIn=\uC544\uC9C1 \uB4F1\uB85D
Every=\uAC01
CellWrite-Preview_Cell_Content=\uC140\uB0B4\uC6A9\uBBF8\uB9AC\uBCF4\uAE30
FormulaD-Data_Fields=\uB370\uC774\uD130\uD56D\uBAA9
FormulaD-Data_Fields=\uB370\uC774\uD130\uD56D\uBAA9
FR-Designer-Plugin_Install_Success=
FR-Designer-Plugin_Install_Failed=
FR-Designer-Plugin_Install_Dependence=
FR-Designer-Plugin_Delete_Dependence=
FR-Designer-Plugin_Delete_Success=
FR-Designer-Plugin_Delete_Failed=
FR-Designer-Plugin_Update_Dependence=
FR-Designer-Plugin_Update_Success=
FR-Designer-Plugin_Update_Failed=
FR-Designer-Plugin_Actived=
FR-Designer-Plugin_Disabled=
FR-Designer-Plugin-Store_App=
FR-Designer-Plugin-Store_Businesses=
FR-Designer-Plugin-Store_Official=
FR-Designer-Plugin-Store_Not_Official=
FR-Designer-Plugin-Store_Cost=
FR-Designer-Plugin-Store_Pay=
FR-Designer-Plugin-Store_Free=
FR-Designer-Plugin-Store_Category=
FR-Designer-Plugin-Store_Designer=
FR-Designer-Plugin-Store_Front_End_Display=
FR-Designer-Plugin-Store_Report_Write=
FR-Designer-Plugin-Store_Chart=
FR-Designer-Plugin-Store_BI=
FR-Designer-Plugin-Store_Export_Print=
FR-Designer-Plugin-Store_Mobile_Terminal=
FR-Designer-Plugin-Store_Integrate_Deployment=
FR-Designer-Plugin-Store_Data_Interface=
FR-Designer-Plugin-Store_Form_Components=
FR-Designer-Plugin-Store_Function=
FR-Designer-Plugin-Store_Recommend=
FR-Designer-Plugin-Store_Commodity_Description=
FR-Designer-Plugin-Store_Install=
FR-Designer-Plugin-Store_Install_From_Local=
FR-Designer-Plugin-Store_My_Plugins=
FR-Designer-Plugin-Store_No_Plugins=
FR-Designer-Plugin-Store_Disabled=
FR-Designer-Plugin-Store_Enable=
FR-Designer-Plugin-Store_Delete=
FR-Designer-Plugin-Store_Update=
FR-Designer-Plugin-Store_Update-ALL=
FR-Designer-Plugin-Store_Update_From_Local=
FR-Designer-Plugin-Store_BBS_Account_Login=
FR-Designer-Plugin-Store_Register=
FR-Designer-Plugin-Store_Forgot_Password=
FR-Designer-Plugin-Store_Quick_Login=
FR-Designer-Plugin-Store_Account=
FR-Designer-Plugin-Store_Password=
FR-Designer-Plugin-Store_Not_Login=
FR-Designer-Plugin-Store_Installed=
FR-Designer-Plugin-Store_Plugins_Count=
FR-Designer-Plugin-Store_Key_Word=
FR-Designer-Plugin-Store_Login=
FR-Designer-Plugin-Store_Login_By_QQ=
FR-Designer-Plugin-Store_User_Not_Exist=
FR-Designer-Plugin-Store_User_Password_Error=
FR-Designer-Plugin-Store_Unexpected_Error=
FR-Designer-Plugin-Store_Net_Connect_Failed=
FR-Designer-Plugin-Store_Not_Null=
FR-Designer-Plugin-Store_Switch_Account=
FR-Designer-Plugin-Store_Private_Message=
FR-Designer-Plugin-Store_Jar_Damaged=
FR-Designer-Plugin-Store_Probation=
FR-Designer-Plugin-Store_Authorize=
FR-Designer-Plugin-Store_Permanent=
FR-Designer-Plugin-Store_Expired=
FR-Designer-Plugin-Store_Day=
FR-Designer-Plugin-Store_Finereport=
FR-Designer-Plugin-Store_Version=
FR-Designer-Plugin-Store_Developer=
FR-Designer-Plugin-Store_Jar=
FR-Designer-Plugin-Store_Disconnected=

77
designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@ -845,7 +845,6 @@ PageSetup-Placement_Center_on_Page=\u5C45\u4E2D\u65B9\u5F0F
sure_to_delete=\u786E\u8BA4\u5220\u9664
Already_exists_not_add_repeat=\u5DF2\u7ECF\u5B58\u5728\uFF0C\u8BF7\u4E0D\u8981\u91CD\u590D\u6DFB\u52A0
Axis_Title=\u8F74\u6807\u9898
FR-Designer-Plugin_Install_Failed=\u63D2\u4EF6\u5B89\u88C5\u5931\u8D25
FR-Designer-Widget-Style_Frame=\u6846\u67B6
MainGraduationUnit=\u4E3B\u8981\u523B\u5EA6\u5355\u4F4D
Second_Axis=\u6B21\u5750\u6807\u8F74
@ -1207,7 +1206,6 @@ FS_Start_Date=\u8D77\u59CB\u65E5\u671F
FR-ConditionB_Operator=\u64CD\u4F5C\u7B26
Printer-Alias=\u522B\u540D
DS-Class_Name=\u7C7B\u540D
FR-Designer-Plugin_Has_Been_Disabled=\u63D2\u4EF6\u5DF2\u88AB\u7981\u7528\uFF0C\u91CD\u542F\u8BBE\u8BA1\u5668\u53CA\u670D\u52A1\u5668\u751F\u6548\uFF0C\u670D\u52A1\u5668\u9700\u624B\u52A8\u91CD\u542F
Sort-Original=\u4E0D\u6392\u5E8F
Utils-Top_to_Bottom_a=\u4ECE\u4E0A\u5F80\u4E0B
Parameter-String=\u5B57\u7B26\u4E32
@ -1460,7 +1458,6 @@ DBCP_TEST_ON_BORROW=\u83B7\u53D6\u8FDE\u63A5\u524D\u68C0\u9A8C
FR-Designer_layerIndex=\u4F9D\u8D56\u7684\u5C42\u6570
WEB-Write_Setting=\u586B\u62A5\u9875\u9762\u8BBE\u7F6E
M-New_WorkBook=\u65B0\u5EFA\u5DE5\u4F5C\u7C3F
FR-Designer-Plugin_Has_Been_Actived=\u63D2\u4EF6\u5DF2\u88AB\u542F\u7528\uFF0C\u91CD\u542F\u8BBE\u8BA1\u5668\u53CA\u670D\u52A1\u5668\u751F\u6548\uFF0C\u670D\u52A1\u5668\u9700\u624B\u52A8\u91CD\u542F
Datasource-Maximum_Number_of_Preview_Rows=\u6700\u5927\u7684\u9884\u89C8\u884C\u6570
ExpandD-Cell_Expand_Attributes=\u6269\u5C55\u5C5E\u6027
Select_the_repeated_row_and_column=\u9009\u62E9\u9700\u8981\u91CD\u590D\u7684\u884C\u5217
@ -2002,4 +1999,76 @@ FR-Designer_AlphaFine_Conclude=\u731C\u60A8\u9700\u8981
FR-Designer_AlphaFine_Latest=\u672C\u5730\u5E38\u7528
FR-Designer_AlphaFine_ShowLess=\u6536\u8D77
FR-Designer_Alphafine=AlphaFine\u667A\u80FD\u641C\u7D22
FR-Designer-Alphafine_No_Remind=\u4E0D\u518D\u63D0\u793A
FR-Designer-Alphafine_No_Remind=\u4E0D\u518D\u63D0\u793A
FR-Designer-Plugin_Install_Success=\u63D2\u4EF6\u5B89\u88C5\u6210\u529F
FR-Designer-Plugin_Install_Failed=\u63D2\u4EF6\u5B89\u88C5\u5931\u8D25
FR-Designer-Plugin_Install_Dependence=\u662F\u5426\u5B89\u88C5\u4F9D\u8D56\u73AF\u5883
FR-Designer-Plugin_Delete_Dependence=\u662F\u5426\u5220\u9664\u4F9D\u8D56\u73AF\u5883
FR-Designer-Plugin_Delete_Success=\u63D2\u4EF6\u5220\u9664\u6210\u529F
FR-Designer-Plugin_Delete_Failed=\u63D2\u4EF6\u5220\u9664\u5931\u8D25
FR-Designer-Plugin_Update_Dependence=\u662F\u5426\u66F4\u65B0\u4F9D\u8D56\u73AF\u5883
FR-Designer-Plugin_Update_Success=\u63D2\u4EF6\u66F4\u65B0\u6210\u529F
FR-Designer-Plugin_Update_Failed=\u63D2\u4EF6\u66F4\u65B0\u5931\u8D25
FR-Designer-Plugin_Actived=\u63D2\u4EF6\u5DF2\u88AB\u542F\u7528
FR-Designer-Plugin_Disabled=\u63D2\u4EF6\u5DF2\u88AB\u7981\u7528
FR-Designer-Plugin-Store_App=\u5E94\u7528\u5546\u57CE
FR-Designer-Plugin-Store_Businesses=\u5546\u5BB6
FR-Designer-Plugin-Store_Official=\u5B98\u65B9(\u5E06\u8F6F)
FR-Designer-Plugin-Store_Not_Official=\u975E\u5B98\u65B9
FR-Designer-Plugin-Store_Cost=\u8D39\u7528
FR-Designer-Plugin-Store_Pay=\u4ED8\u8D39
FR-Designer-Plugin-Store_Free=\u514D\u8D39
FR-Designer-Plugin-Store_Category=\u7C7B\u522B
FR-Designer-Plugin-Store_Designer=\u8BBE\u8BA1\u5668
FR-Designer-Plugin-Store_Front_End_Display=\u524D\u7AEF\u5C55\u73B0
FR-Designer-Plugin-Store_Report_Write=\u586B\u62A5
FR-Designer-Plugin-Store_Chart=\u56FE\u8868
FR-Designer-Plugin-Store_BI=\u51B3\u7B56\u5E73\u53F0
FR-Designer-Plugin-Store_Export_Print=\u5BFC\u51FA\u6253\u5370
FR-Designer-Plugin-Store_Mobile_Terminal=\u79FB\u52A8\u7AEF
FR-Designer-Plugin-Store_Integrate_Deployment=\u90E8\u7F72\u96C6\u6210
FR-Designer-Plugin-Store_Data_Interface=\u6570\u636E\u63A5\u53E3
FR-Designer-Plugin-Store_Form_Components=\u8868\u5355\u7EC4\u4EF6
FR-Designer-Plugin-Store_Function=\u51FD\u6570
FR-Designer-Plugin-Store_Recommend=\u63A8\u8350
FR-Designer-Plugin-Store_Commodity_Description=\u5546\u54C1|\u7248\u672C\u53F7|\u8BF4\u660E
FR-Designer-Plugin-Store_Install=\u5B89\u88C5
FR-Designer-Plugin-Store_Install_From_Local=\u4ECE\u672C\u5730\u5B89\u88C5
FR-Designer-Plugin-Store_My_Plugins=\u6211\u7684\u63D2\u4EF6
FR-Designer-Plugin-Store_No_Plugins=\u5DF2\u5B89\u88C5\u4E860\u4E2A\u63D2\u4EF6
FR-Designer-Plugin-Store_Disabled=\u7981\u7528
FR-Designer-Plugin-Store_Enable=\u542F\u7528
FR-Designer-Plugin-Store_Delete=\u5220\u9664
FR-Designer-Plugin-Store_Update=\u66F4\u65B0
FR-Designer-Plugin-Store_Update-ALL=\u5168\u90E8\u66F4\u65B0
FR-Designer-Plugin-Store_Update_From_Local=\u4ECE\u672C\u5730\u66F4\u65B0
FR-Designer-Plugin-Store_BBS_Account_Login=\u8BBA\u575B\u8D26\u53F7\u767B\u5F55
FR-Designer-Plugin-Store_Register=\u6CE8\u518C
FR-Designer-Plugin-Store_Forgot_Password=\u5FD8\u8BB0\u5BC6\u7801
FR-Designer-Plugin-Store_Quick_Login=\u5FEB\u6377\u767B\u5F55:
FR-Designer-Plugin-Store_Account=\u8D26\u53F7
FR-Designer-Plugin-Store_Password=\u5BC6\u7801
FR-Designer-Plugin-Store_Not_Login=\u672A\u767B\u5F55
FR-Designer-Plugin-Store_Installed=\u5DF2\u5B89\u88C5
FR-Designer-Plugin-Store_Plugins_Count=\u4E2A\u63D2\u4EF6
FR-Designer-Plugin-Store_Key_Word=\u5173\u952E\u5B57
FR-Designer-Plugin-Store_Login=\u767B\u5F55
FR-Designer-Plugin-Store_Login_By_QQ=\u7528QQ\u53F7\u767B\u5F55
FR-Designer-Plugin-Store_User_Not_Exist=\u7528\u6237\u540D\u4E0D\u5B58\u5728
FR-Designer-Plugin-Store_User_Password_Error=\u7528\u6237\u540D\u6216\u5BC6\u7801\u9519\u8BEF
FR-Designer-Plugin-Store_Unexpected_Error=\u672A\u77E5\u9519\u8BEF
FR-Designer-Plugin-Store_Net_Connect_Failed=\u7F51\u7EDC\u8FDE\u63A5\u5931\u8D25
FR-Designer-Plugin-Store_Not_Null=\u7528\u6237\u540D\u6216\u5BC6\u7801\u4E0D\u80FD\u4E3A\u7A7A
FR-Designer-Plugin-Store_Switch_Account=\u5207\u6362\u8D26\u6237
FR-Designer-Plugin-Store_Private_Message=\u79C1\u4EBA\u6D88\u606F
FR-Designer-Plugin-Store_Jar_Damaged=Jar\u5305\u635F\u574F
FR-Designer-Plugin-Store_Probation=\u8BD5\u7528:
FR-Designer-Plugin-Store_Authorize=\u6388\u6743:
FR-Designer-Plugin-Store_Permanent=\u6C38\u4E45
FR-Designer-Plugin-Store_Expired=\u8FC7\u671F
FR-Designer-Plugin-Store_Day=\u5929
FR-Designer-Plugin-Store_Finereport=\u5E06\u8F6F
FR-Designer-Plugin-Store_Version=\u7248\u672C
FR-Designer-Plugin-Store_Developer=\u5F00\u53D1\u8005
FR-Designer-Plugin-Store_Jar=jar\u5305
FS-Plugin-Store_Disconnected=\u65E0\u6CD5\u8FDE\u63A5\u5E94\u7528\u4E2D\u5FC3

75
designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@ -845,7 +845,6 @@ PageSetup-Placement_Center_on_Page=\u7F6E\u4E2D\u65B9\u5F0F
sure_to_delete=\u78BA\u8A8D\u522A\u9664
Already_exists_not_add_repeat=\u5DF2\u7D93\u5B58\u5728\uFF0C\u8ACB\u4E0D\u8981\u91CD\u8907\u65B0\u589E
Axis_Title=\u8EF8\u6A19\u984C
FR-Designer-Plugin_Install_Failed=Install failed
FR-Designer-Widget-Style_Frame=\u6846\u67B6
MainGraduationUnit=\u4E3B\u8981\u523B\u5EA6\u55AE\u4F4D
Second_Axis=\u6B21\u5750\u6A19\u8EF8
@ -2000,4 +1999,76 @@ FR-Designer_AlphaFine_Latest=\u6700\u8FD1\u5E38\u7528
FR-Designer_AlphaFine_ShowLess=\u6536\u8D77
FR-Designer_Alphafine=AlphaFine\u667A\u80FD\u641C\u7D22
FR-Designer_AlphaFine_ShowAll=\u986F\u793A\u5168\u90E8
FR-Designer-Alphafine_No_Remind=\u4E0D\u518D\u63D0\u793A
FR-Designer-Alphafine_No_Remind=\u4E0D\u518D\u63D0\u793A
FR-Designer-Plugin_Install_Success=
FR-Designer-Plugin_Install_Failed=
FR-Designer-Plugin_Install_Dependence=
FR-Designer-Plugin_Delete_Dependence=
FR-Designer-Plugin_Delete_Success=
FR-Designer-Plugin_Delete_Failed=
FR-Designer-Plugin_Update_Dependence=
FR-Designer-Plugin_Update_Success=
FR-Designer-Plugin_Update_Failed=
FR-Designer-Plugin_Actived=
FR-Designer-Plugin_Disabled=
FR-Designer-Plugin-Store_App=
FR-Designer-Plugin-Store_Businesses=
FR-Designer-Plugin-Store_Official=
FR-Designer-Plugin-Store_Not_Official=
FR-Designer-Plugin-Store_Cost=
FR-Designer-Plugin-Store_Pay=
FR-Designer-Plugin-Store_Free=
FR-Designer-Plugin-Store_Category=
FR-Designer-Plugin-Store_Designer=
FR-Designer-Plugin-Store_Front_End_Display=
FR-Designer-Plugin-Store_Report_Write=
FR-Designer-Plugin-Store_Chart=
FR-Designer-Plugin-Store_BI=
FR-Designer-Plugin-Store_Export_Print=
FR-Designer-Plugin-Store_Mobile_Terminal=
FR-Designer-Plugin-Store_Integrate_Deployment=
FR-Designer-Plugin-Store_Data_Interface=
FR-Designer-Plugin-Store_Form_Components=
FR-Designer-Plugin-Store_Function=
FR-Designer-Plugin-Store_Recommend=
FR-Designer-Plugin-Store_Commodity_Description=
FR-Designer-Plugin-Store_Install=
FR-Designer-Plugin-Store_Install_From_Local=
FR-Designer-Plugin-Store_My_Plugins=
FR-Designer-Plugin-Store_No_Plugins=
FR-Designer-Plugin-Store_Disabled=
FR-Designer-Plugin-Store_Enable=
FR-Designer-Plugin-Store_Delete=
FR-Designer-Plugin-Store_Update=
FR-Designer-Plugin-Store_Update-ALL=
FR-Designer-Plugin-Store_Update_From_Local=
FR-Designer-Plugin-Store_BBS_Account_Login=
FR-Designer-Plugin-Store_Register=
FR-Designer-Plugin-Store_Forgot_Password=
FR-Designer-Plugin-Store_Quick_Login=
FR-Designer-Plugin-Store_Account=
FR-Designer-Plugin-Store_Password=
FR-Designer-Plugin-Store_Not_Login=
FR-Designer-Plugin-Store_Installed=
FR-Designer-Plugin-Store_Plugins_Count=
FR-Designer-Plugin-Store_Key_Word=
FR-Designer-Plugin-Store_Login=
FR-Designer-Plugin-Store_Login_By_QQ=
FR-Designer-Plugin-Store_User_Not_Exist=
FR-Designer-Plugin-Store_User_Password_Error=
FR-Designer-Plugin-Store_Unexpected_Error=
FR-Designer-Plugin-Store_Net_Connect_Failed=
FR-Designer-Plugin-Store_Not_Null=
FR-Designer-Plugin-Store_Switch_Account=
FR-Designer-Plugin-Store_Private_Message=
FR-Designer-Plugin-Store_Jar_Damaged=
FR-Designer-Plugin-Store_Probation=
FR-Designer-Plugin-Store_Authorize=
FR-Designer-Plugin-Store_Permanent=
FR-Designer-Plugin-Store_Expired=
FR-Designer-Plugin-Store_Day=
FR-Designer-Plugin-Store_Finereport=
FR-Designer-Plugin-Store_Version=
FR-Designer-Plugin-Store_Developer=
FR-Designer-Plugin-Store_Jar=
FR-Designer-Plugin-Store_Disconnected=
Loading…
Cancel
Save