Merge branch 'wrdp' into 'develop'

Wrdp

See merge request o2oa/o2oa!2275

o2web/source/o2_core/o2/xAction/services/x_cms_assemble_control.js

@@ -121,6 +121,10 @@ MWF.xAction.RestActions.Action["x_cms_assemble_control"] = new Class({
                 formData.json.id = id;
 
                 if (formData) data = MWF.encodeJsonString(JSON.encode(formData));
+
+                if ( mobileData && !mobileData.json.id ){
+                    mobileData.json.id = id;
+                }
                 if (mobileData) mobileData = MWF.encodeJsonString(JSON.encode(mobileData));
 
                 var json = {
@@ -137,6 +141,10 @@ MWF.xAction.RestActions.Action["x_cms_assemble_control"] = new Class({
             }.bind(this));
         }else{
             if (formData) data = MWF.encodeJsonString(JSON.encode(formData));
+
+            if ( mobileData && !mobileData.json.id ){
+                mobileData.json.id = formData.json.id;
+            }
             if (mobileData) mobileData = MWF.encodeJsonString(JSON.encode(mobileData));
 
             var json = {

o2web/source/o2_core/o2/xAction/services/x_portal_assemble_designer.js

@@ -97,6 +97,11 @@ MWF.xAction.RestActions.Action["x_portal_assemble_designer"] = new Class({
                 pageData.json.id = id;
 
                 if (pageData) data = MWF.encodeJsonString(JSON.encode(pageData));
+
+
+                if ( mobileData && !mobileData.json.id ){
+                    mobileData.json.id = id;
+                }
                 if (mobileData) mobileDataStr = MWF.encodeJsonString(JSON.encode(mobileData));
 
                 var relatedScriptMap = null;
@@ -143,6 +148,9 @@ MWF.xAction.RestActions.Action["x_portal_assemble_designer"] = new Class({
             }.bind(this));
         }else{
             if (pageData) data = MWF.encodeJsonString(JSON.encode(pageData));
+            if ( mobileData && !mobileData.json.id ){
+                mobileData.json.id = pageData.json.id;
+            }
             if (mobileData) mobileDataStr = MWF.encodeJsonString(JSON.encode(mobileData));
 
             var json = {

o2web/source/o2_core/o2/xAction/services/x_processplatform_assemble_designer.js

@@ -258,6 +258,10 @@ MWF.xAction.RestActions.Action["x_processplatform_assemble_designer"] = new Clas
                 //if (mobileData) mobileData.isNewForm = false;
 
                 if (formData) data = MWF.encodeJsonString(JSON.encode(formData));
+
+                if (mobileData && !mobileData.json.id){
+                    mobileData.json.id = id;
+                }
                 if (mobileData) mobileDataStr = MWF.encodeJsonString(JSON.encode(mobileData));
 
                 var relatedScriptMap = null;
@@ -309,6 +313,10 @@ MWF.xAction.RestActions.Action["x_processplatform_assemble_designer"] = new Clas
             //if (formData) formData.isNewForm = false;
             //if (mobileData) mobileData.isNewForm = false;
             if (formData) data = MWF.encodeJsonString(JSON.encode(formData));
+
+            if ( mobileData && !mobileData.json.id ){
+                mobileData.json.id = formData.json.id;
+            }
             if (mobileData) mobileDataStr = MWF.encodeJsonString(JSON.encode(mobileData));
 
             var json = {

o2web/source/x_component_ConfigDesigner/$Main/default/css.wcss

@@ -34,7 +34,7 @@
     "scriptListAreaSccrollNode": {
         "margin": "4px",
         "margin-right": "8px",
-        "overflow": "auto",
+        "overflow": "hidden",
         "background-color": "#FFF",
         "border-top": "1px solid #999",
         "border-left": "1px solid #999",

o2web/source/x_component_ConfigDesigner/Main.js

@@ -144,7 +144,7 @@ o2.xApplication.ConfigDesigner.Main = new Class({
     },
 
     loadScriptList: function() {
-        this.actions.EditConfigAction.getList(function( json ){
+        this.actions.ConfigAction.getList(function( json ){
             data = json.data;
             var config = JSON.parse(data.config);
             this.config = config;
@@ -727,7 +727,7 @@ o2.xApplication.ConfigDesigner.Main = new Class({
         this.loadScriptData(id, callback);
     },
     loadScriptData: function(id, callback, notSetTile){
-        this.actions.EditConfigAction.open({fileName:id}, function(json){
+        this.actions.ConfigAction.open({fileName:id}, function(json){
             if (json){
                 var data = json.data;
                 data.id = id;

o2web/source/x_component_ConfigDesigner/Script.js

@@ -36,7 +36,7 @@ MWF.xApplication.ConfigDesigner.Script = new Class({
         if(this.designer.application) this.data.application = this.designer.application.id;
 
         this.isNewScript = (this.data.id) ? false : true;
-    //    this.createProperty();
+        //    this.createProperty();
 
         this.autoSave();
         this.designer.addEvent("queryClose", function(){
@@ -135,7 +135,7 @@ MWF.xApplication.ConfigDesigner.Script = new Class({
 
             var options = this.designer.styleSelectNode.options;
             for (var i=0; i<options.length; i++){
-                    var option = options[i];
+                var option = options[i];
                 if (option.value==this.editor.theme){
                     option.set("selected", true);
                     break;
@@ -220,7 +220,7 @@ MWF.xApplication.ConfigDesigner.Script = new Class({
             this.data.nodePort = this.designer.propertyServerNode.getElement("option:selected").get("value");
 
             this.isSave = true;
-            this.designer.actions.EditConfigAction.save(this.data, function(json){
+            this.designer.actions.ConfigAction.save(this.data, function(json){
                 this.isSave = false;
                 this.data.isNewScript = false;
                 this.isChanged = false;
@@ -229,7 +229,7 @@ MWF.xApplication.ConfigDesigner.Script = new Class({
                     this.lisNode.getLast().set("text", this.data.name);
                 }
                 this.designer.notice(this.designer.lp.notice.save_success, "success", this.node, {"x": "left", "y": "bottom"});
-                this.data.id = json.data.id;
+                //this.data.id = json.data.id;
                 if (callback) callback();
             }.bind(this), function(xhr, text, error){
                 this.isSave = false;

o2web/source/x_desktop/js/base.js

@@ -562,7 +562,7 @@ o2.addReady(function () {
         }, function(){
             //允许匿名访问
             if (layout.anonymous) {
-                var data = { user: "anonymous", session: { user: { name: "anonymous", roleList: [] } } };
+                var data = { name: "anonymous", roleList: [] };
                 layout.user = data;
                 layout.session = layout.session || {};
                 layout.session.user = data;

o2web/source/x_desktop/js/base_simple.js

@@ -158,12 +158,9 @@ o2.addReady(function () {
             if (layout.anonymous) {
                 _loadProgressBar(true);
                 _loadApp({
-                    user: "anonymous",
-                    session: {
-                        user: {
-                            name: "anonymous",
-                            roleList: []
-                        }
+                    data: {
+                        name: "anonymous",
+                        roleList: []
                     }
                 });
             } else {

o2web/source/x_desktop/js/xbase.js

@@ -399,12 +399,9 @@ o2.addReady(function () {
             if (layout.anonymous) {
                 _loadProgressBar(true);
                 _loadApp({
-                    user: "anonymous",
-                    session: {
-                        user: {
-                            name: "anonymous",
-                            roleList: []
-                        }
+                    data: {
+                        name: "anonymous",
+                        roleList: []
                     }
                 });
             } else {