Merge branch 'fix/setting_add_config' into 'develop'

[平台配置]系统设置中增加 平台配置选项，平台配置编辑器修改成json格式

See merge request o2oa/o2oa!1466

o2web/source/x_component_ConfigDesigner/Script.js

@@ -94,10 +94,11 @@ MWF.xApplication.ConfigDesigner.Script = new Class({
             if (this.lisNode) this.lisNode.setStyles(this.designer.css.listScriptItem);
         }.bind(this));
         this.page.tabNode.addEvent("dblclick", this.designer.maxOrReturnEditor.bind(this.designer));
-
-
-
-        this.editor = new MWF.widget.JavascriptEditor(this.areaNode);
+        this.editor = new MWF.widget.JavascriptEditor(this.areaNode,{"option": {
+                value: "",
+                mode: "json",
+                "lineNumbers": true
+            }});
         this.editor.load(function(){
             if (this.data.text){
                 this.editor.setValue(this.data.text);

o2web/source/x_component_Setting/Main.js

@@ -245,9 +245,26 @@ MWF.xApplication.Setting.BaseExplorer = new Class({
                 "text": this.app.lp.tab_sso,
                 "icon": "sso",
                 "action": "loadSystemSSOSetting"
+            },
+            {
+                "text": this.app.lp.tab_config,
+                "icon": "config",
+                "action": "loadSystemConfigSetting"
             }
         ];
     },
+    loadSystemConfigSetting:function(item){
+        if (MWF.AC.isAdministrator()) {
+            var appId = "ConfigDesigner";
+            if (layout.desktop.apps["ConfigDesigner"]){
+                layout.desktop.apps[appId].setCurrent();
+                return;
+            }
+            layout.openApplication(null, "ConfigDesigner",{
+                "appId": appId
+            });
+        }
+    },
     loadSystemNameSetting: function(item){
         if (MWF.AC.isAdministrator()) {
             if (this.collectData && this.personData &&  this.tokenData){

o2web/source/x_component_Setting/lp/zh-cn.js

@@ -10,6 +10,7 @@ MWF.xApplication.Setting.LP = {
     "tab_user": "系统用户配置",
     "tab_login": "系统登录配置",
     "tab_sso": "系统SSO配置",
+    "tab_config": "平台配置",
 
     "tab_mobile_connect": "连接配置",
     "tab_mobile_module": "模块配置",