Merge "Optimized Compnents' Layout"

3 files changed, 100 insertions, 96 deletions

diff --git a/rulemgt-frontend/src/assets/framework/browser/css/open-ostyle.css b/rulemgt-frontend/src/assets/framework/browser/css/open-ostyle.css
index 763797a..14d964d 100644
--- a/rulemgt-frontend/src/assets/framework/browser/css/open-ostyle.css
+++ b/rulemgt-frontend/src/assets/framework/browser/css/open-ostyle.css
@@ -927,7 +927,7 @@ a:hover {
 
 .labelstyle{
     text-align:left;
-    font-size:12px;
+    font-size:14px;
     font-family: "Microsoft Yahei",Arial,Tahoma,Verdana,SimSun;
 }
 
diff --git a/rulemgt-frontend/src/assets/i18n/en.json b/rulemgt-frontend/src/assets/i18n/en.json
index a755c4a..d74c4bb 100644
--- a/rulemgt-frontend/src/assets/i18n/en.json
+++ b/rulemgt-frontend/src/assets/i18n/en.json
@@ -1,50 +1,52 @@
 {
-  "common_status":"Status",
-  "common_keyword":"Keyword",
-  "field_rule_name":"Rule Name",
-  "common_query":"Query",
-  "common_reset":"Reset",
-  "common_add":"Add",
-  "common_total1":"Total ",
-  "common_total2":" Rules",
-  "field_create_time":"Creation Time",
-  "field_creator":"Creator",
-  "field_update_time":"Update Time",
-  "common_operator":"Operations",
-  "common_update":"Update",
-  "common_off":"OFF",
-  "common_on":"ON",
-  "common_delete":"Delete",
-  "message_is_delete":"Are you sure to delete the rule?",
-  "common_cancel":"Cancel",
-  "common_confirm":"Confirm",
-  "option_all":"All",
-  "common_enabled":"Enabled",
-  "common_disabled":"Disabled",
-  "field_description":"Description",
-  "common_check":"Check",
-  "common_save":"Save",
-  "common_file":"File",
-  "import":"Import",
-  "file_import":"Drag & drop files here ...",
-  "common_browse":"Browse",
-  "common_remove":"Remove",
-  "modalTitleDefault":"Add a Rule",
-  "closeBtnTitleDefault":"Close",
-  "modalBodyMessageDefault":"Message Contents",
-  "message_add_rule_success":"The rule is saved successfully.",
-  "exception_content_error":"The contents of the rule are invalid.",
-  "exception_package_error":"The contents of the rule must start with \"package\".",
+  "common_status": "Status",
+  "common_keyword": "Keyword",
+  "field_rule_name": "Rule Name",
+  "common_query": "Query",
+  "common_reset": "Reset",
+  "common_add": "Add",
+  "common_total1": "Total ",
+  "common_total2": " Rules",
+  "field_create_time": "Creation Time",
+  "field_creator": "Creator",
+  "field_update_time": "Update Time",
+  "common_operator": "Operations",
+  "common_update": "Update",
+  "common_off": "OFF",
+  "common_on": "ON",
+  "common_delete": "Delete",
+  "message_is_delete": "Are you sure to delete the rule?",
+  "common_cancel": "Cancel",
+  "common_confirm": "Confirm",
+  "option_all": "All",
+  "common_enabled": "Enabled",
+  "common_disabled": "Disabled",
+  "field_description": "Description",
+  "common_check": "Check",
+  "common_save": "Save",
+  "common_file": "File",
+  "import": "Import",
+  "file_import": "Drag & drop files here ...",
+  "common_browse": "Browse",
+  "common_remove": "Remove",
+  "modalTitleDefault": "Add a Rule",
+  "closeBtnTitleDefault": "Close",
+  "modalBodyMessageDefault": "Message Contents",
+  "message_add_rule_success": "The rule is saved successfully.",
+  "exception_content_error": "The contents of the rule are invalid.",
+  "exception_package_error": "The contents of the rule must start with \"package\".",
   "warn_delete_info": "Only the disabled rules can be deleted.",
-  "message_update_rule_success":"The rule is updated successfully.",
-  "message_engine_error_rule_fail":"Failed to call the interface of the engine management module.",
-  "modalTitleUpdate":"Rule Update",
-  "message_other_exception_rule_fail":"Unknown error. Please contact the administrator.",
-  "message_checkContent_rule_success":"The contents of the rule are valid.",
-  "modalTitleCheck":"Verification",
-  "message_rule_name_repeat_error":"A rule with the same name already exists.",
-  "message_rule_content_repeat_error":"A rule with the same contents already exists.",
-  "message_rule_content":"Rule Contents",
-  "message_rule_update_error":"The rule has not corresponding entity in the engine. Please contact the administrator to remove the rule manually from the database.",
-  "field_rule_name_Add_Page":"Rule Name"
+  "message_update_rule_success": "The rule is updated successfully.",
+  "message_engine_error_rule_fail": "Failed to call the interface of the engine management module.",
+  "modalTitleUpdate": "Rule Update",
+  "message_other_exception_rule_fail": "Unknown error. Please contact the administrator.",
+  "message_checkContent_rule_success": "The contents of the rule are valid.",
+  "modalTitleCheck": "Verification",
+  "message_rule_name_repeat_error": "A rule with the same name already exists.",
+  "message_rule_content_repeat_error": "A rule with the same contents already exists.",
+  "message_rule_content": "Rule Contents",
+  "message_rule_update_error": "The rule has not corresponding entity in the engine. Please contact the administrator to remove the rule manually from the database.",
+  "field_rule_name_Add_Page": "Rule Name",
+  "field_controlLoopName": "Control Loop",
+  "nodata": "No data"
 }
\ No newline at end of file
diff --git a/rulemgt-frontend/src/assets/i18n/zh.json b/rulemgt-frontend/src/assets/i18n/zh.json
index 565c457..0dc1912 100644
--- a/rulemgt-frontend/src/assets/i18n/zh.json
+++ b/rulemgt-frontend/src/assets/i18n/zh.json
@@ -1,50 +1,52 @@
 {
-  "common_status":"状态",
-  "common_keyword":"关键字",
-  "field_rule_name":"规则名称",
-  "common_query":"查询 ",
-  "common_reset":"重置",
-  "common_add":"添加",
-  "common_total1":"共 ",
-  "common_total2":" 条记录",
-  "field_create_time":"创建时间",
-  "field_creator":"创建者",
-  "field_update_time":"修改时间",
-  "common_operator":"操作",
-  "common_update":"修改",
-  "common_off":"禁用",
-  "common_on":"启用",
-  "common_delete":"删除",
-  "message_is_delete":"是否删除",
-  "common_cancel":"取消",
-  "common_confirm":"确认",
-  "option_all":"全部",
-  "common_enabled":"已启用",
-  "common_disabled":"已禁用",
-  "field_description":"描述",
-  "common_check":"校验",
-  "common_save":"保存",
-  "common_file":"文件",
-  "import":"导入",
-  "file_import":"拖放文件到这里 ...",
-  "common_browse":"浏览",
-  "common_remove":"移除",
-  "modalTitleDefault":"规则添加",
-  "closeBtnTitleDefault":"关闭",
-  "modalBodyMessageDefault":"消息体",
-  "message_add_rule_success":"添加成功",
-  "exception_content_error":"规则内容错误",
-  "exception_package_error":"规则必须以package开头",
-  "warn_delete_info":"只能删除处于已停止状态的规则",
-  "message_update_rule_success":"修改成功",
-  "message_exception_rule_fail":"从引擎调用删除规则接口失败",
-  "modalTitleUpdate":"规则修改",
-  "message_other_exception_rule_fail":"发生其他错误",
-  "message_checkContent_rule_success":"规则内容正确",
-  "modalTitleCheck":"验证规则",
-  "message_rule_name_repeat_error":"规则名字重复",
-  "message_rule_content_repeat_error":"规则内容重复",
-  "message_rule_content":"规则内容",
-  "message_rule_update_error":"规则的引擎内容被删了，请联系管理员删除这条规则",
-  "field_rule_name_Add_Page":"规则名称"
+  "common_status": "状态",
+  "common_keyword": "关键字",
+  "field_rule_name": "规则名称",
+  "common_query": "查询 ",
+  "common_reset": "重置",
+  "common_add": "添加",
+  "common_total1": "共 ",
+  "common_total2": " 条记录",
+  "field_create_time": "创建时间",
+  "field_creator": "创建者",
+  "field_update_time": "修改时间",
+  "common_operator": "操作",
+  "common_update": "修改",
+  "common_off": "禁用",
+  "common_on": "启用",
+  "common_delete": "删除",
+  "message_is_delete": "是否删除",
+  "common_cancel": "取消",
+  "common_confirm": "确认",
+  "option_all": "全部",
+  "common_enabled": "已启用",
+  "common_disabled": "已禁用",
+  "field_description": "描述",
+  "common_check": "校验",
+  "common_save": "保存",
+  "common_file": "文件",
+  "import": "导入",
+  "file_import": "拖放文件到这里 ...",
+  "common_browse": "浏览",
+  "common_remove": "移除",
+  "modalTitleDefault": "规则添加",
+  "closeBtnTitleDefault": "关闭",
+  "modalBodyMessageDefault": "消息体",
+  "message_add_rule_success": "添加成功",
+  "exception_content_error": "规则内容错误",
+  "exception_package_error": "规则必须以package开头",
+  "warn_delete_info": "只能删除处于已停止状态的规则",
+  "message_update_rule_success": "修改成功",
+  "message_exception_rule_fail": "从引擎调用删除规则接口失败",
+  "modalTitleUpdate": "规则修改",
+  "message_other_exception_rule_fail": "发生其他错误",
+  "message_checkContent_rule_success": "规则内容正确",
+  "modalTitleCheck": "验证规则",
+  "message_rule_name_repeat_error": "规则名字重复",
+  "message_rule_content_repeat_error": "规则内容重复",
+  "message_rule_content": "规则内容",
+  "message_rule_update_error": "规则的引擎内容被删了，请联系管理员删除这条规则",
+  "field_rule_name_Add_Page": "规则名称",
+  "field_controlLoopName": "控制环",
+  "nodata": "无数据"
 }
\ No newline at end of file