Просмотр исходного кода

Merge branch 'fix/webconfig' into 'wrdp'

Fix/webconfig

See merge request o2oa/o2oa!2268
胡起 5 лет назад
Родитель
Сommit
282dd94173

+ 1 - 1
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",

+ 2 - 2
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;

+ 4 - 4
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;