Merge branch 'fix/File.rename_execption' into 'develop'

Merge of fix/修复云文件重命名文件夹报错的问题 to develop

See merge request o2oa/o2oa!605

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

@@ -7,7 +7,7 @@ MWF.xAction.RestActions.Action["x_file_assemble_control"] = new Class({
     },
     saveFolder: function(data, success, failure){
         if (data.id){
-            this.updateFolder(data, success, failure);
+            this.updateFolder(data.id, data, success, failure);
         }else{
             this.addFolder(data, success, failure);
         }

o2web/source/x_component_File/AttachmentController.js

@@ -138,6 +138,90 @@ MWF.xApplication.File.AttachmentController = new Class({
 });
 MWF.xApplication.File.AttachmentController.Attachment = new Class({
     Extends: MWF.widget.AttachmentController.Attachment,
+    loadList: function(){
+        this.node.setStyles(this.css.attachmentNode_list);
+        if (this.isSelected) this.node.setStyles(this.css.attachmentNode_list_selected);
+
+        this.iconNode = new Element("div", {"styles": this.css.attachmentIconNode_list}).inject(this.node);
+        this.iconImgAreaNode = new Element("div", {"styles": this.css.attachmentIconImgAreaNode_list}).inject(this.iconNode);
+        this.iconImgNode = new Element("img", {"styles": this.css.attachmentIconImgNode_list}).inject(this.iconImgAreaNode);
+        this.iconImgNode.set({"src": this.getIcon(), "border": 0});
+
+        this.textNode = new Element("div", {"styles": this.css.attachmentTextNode_list}).inject(this.node);
+        this.textTitleNode = new Element("div", {"styles": this.css.attachmentTextTitleNode_list}).inject(this.textNode);
+        this.textTitleNode.set("text", this.data.name);
+
+        var size = "";
+        var k = this.data.length/1204;
+        if (k>1024){
+            var m = k/1024;
+            m = Math.round(m*100)/100;
+            size = m+"M";
+        }else{
+            k = Math.round(k*100)/100;
+            size = k+"K";
+        }
+        this.textSizeNode = new Element("div", {"styles": this.css.attachmentTextSizeNode_list}).inject(this.textNode);
+        this.textSizeNode.set("text", size);
+
+        this.textUploaderNode = new Element("div", {"styles": this.css.attachmentTextUploaderNode_list}).inject(this.textNode);
+        this.textUploaderNode.set("text", o2.name.cn(this.data.person || this.data.creatorUid ));
+
+        this.textTimeNode = new Element("div", {"styles": this.css.attachmentTextTimeNode_list}).inject(this.textNode);
+        this.textTimeNode.set("text", this.data.lastUpdateTime);
+
+        // this.textActivityNode = new Element("div", {"styles": this.css.attachmentTextActivityNode_list}).inject(this.textNode);
+        // this.textActivityNode.set("text", this.data.activityName || o2.LP.widget.unknow);
+
+        this.extensionNode = new Element("div", {"styles": this.css.attachmentTextActivityNode_list}).inject(this.textNode);
+        this.extensionNode.set("text", this.data.extension || o2.LP.widget.unknow);
+
+
+
+        this.custom_List();
+    },
+    loadSequence: function(){
+        this.node.setStyles(this.css.attachmentNode_sequence);
+        if (this.isSelected) this.node.setStyles(this.css.attachmentNode_sequence_selected);
+
+        this.sequenceNode = new Element("div", {"styles": this.css.attachmentSeqNode_sequence, "text": (this.seq || 1)}).inject(this.node);
+
+        this.iconNode = new Element("div", {"styles": this.css.attachmentIconNode_list}).inject(this.node);
+        this.iconImgAreaNode = new Element("div", {"styles": this.css.attachmentIconImgAreaNode_list}).inject(this.iconNode);
+        this.iconImgNode = new Element("img", {"styles": this.css.attachmentIconImgNode_list}).inject(this.iconImgAreaNode);
+        this.iconImgNode.set({"src": this.getIcon(), "border": 0});
+
+        this.textNode = new Element("div", {"styles": this.css.attachmentTextNode_sequence}).inject(this.node);
+        this.textTitleNode = new Element("div", {"styles": this.css.attachmentTextTitleNode_list}).inject(this.textNode);
+        this.textTitleNode.set("text", this.data.name);
+
+        var size = "";
+        var k = this.data.length/1204;
+        if (k>1024){
+            var m = k/1024;
+            m = Math.round(m*100)/100;
+            size = m+"M";
+        }else{
+            k = Math.round(k*100)/100;
+            size = k+"K";
+        }
+        this.textSizeNode = new Element("div", {"styles": this.css.attachmentTextSizeNode_list}).inject(this.textNode);
+        this.textSizeNode.set("text", size);
+
+        this.textUploaderNode = new Element("div", {"styles": this.css.attachmentTextUploaderNode_list}).inject(this.textNode);
+        this.textUploaderNode.set("text", o2.name.cn(this.data.person || this.data.creatorUid));
+
+        this.textTimeNode = new Element("div", {"styles": this.css.attachmentTextTimeNode_list}).inject(this.textNode);
+        this.textTimeNode.set("text", this.data.lastUpdateTime);
+
+        // this.textActivityNode = new Element("div", {"styles": this.css.attachmentTextActivityNode_list}).inject(this.textNode);
+        // this.textActivityNode.set("text", this.data.activityName || o2.LP.widget.unknow);
+
+        this.extensionNode = new Element("div", {"styles": this.css.attachmentTextActivityNode_list}).inject(this.textNode);
+        this.extensionNode.set("text", this.data.extension || o2.LP.widget.unknow);
+
+        this.custom_Sequence();
+    },
     createInforNode: function(callback){
         var size = "";
         var k = this.data.length/1204;

o2web/source/x_component_process_FormDesigner/Module/Form/skin/styles_mobile-blue-flat.json

@@ -324,16 +324,16 @@
       "color": "#000"
     },
     "inputStyles": {
-      "border-radius": "4px",
-      "border-bottom": "1px solid #979797",
-      "border": "1px solid #979797",
+      "border-radius": "0px",
+      "border-bottom": "0px",
+      "border": "0px solid #979797",
       "height": "auto",
       "min-height" : "39px",
       "line-height": "39px",
       "color": "#000",
       "font-size": "15px",
       "float": "none",
-      "text-align": "left"
+      "text-align": "right"
     }
   },
   "combox": {
@@ -343,14 +343,14 @@
       "color": "#000"
     },
     "inputStyles": {
-      "border-radius": "4px",
-      "border-bottom": "1px solid #979797",
-      "border": "1px solid #979797",
+      "border-radius": "0px",
+      "border-bottom": "0px",
+      "border": "0px solid #979797",
       "height": "40px",
       "color": "#000",
       "font-size": "15px",
       "float": "left",
-      "text-align": "left"
+      "text-align": "right"
     }
   },
   "textfield": {
@@ -360,14 +360,14 @@
       "color": "#000"
     },
     "inputStyles": {
-      "border-radius": "4px",
-      "border-bottom": "1px solid #979797",
-      "border": "1px solid #979797",
+      "border-radius": "0px",
+      "border-bottom": "0px",
+      "border": "0px solid #979797",
       "height": "40px",
       "color": "#000",
       "font-size": "15px",
       "float": "left",
-      "text-align": "left"
+      "text-align": "right"
     }
   },
   "opinion": {
@@ -377,13 +377,13 @@
       "color": "#000"
     },
     "inputStyles": {
-      "border-radius": "4px",
-      "border-bottom": "1px solid #979797",
-      "border": "1px solid #979797",
+      "border-radius": "0px",
+      "border-bottom": "0px",
+      "border": "0px solid #979797",
       "color": "#000",
       "font-size": "15px",
       "float": "left",
-      "text-align": "left"
+      "text-align": "right"
     }
   },
   "calendar": {
@@ -393,14 +393,14 @@
       "color": "#000"
     },
     "inputStyles": {
-      "border-radius": "4px",
-      "border-bottom": "1px solid #979797",
-      "border": "1px solid #979797",
+      "border-radius": "0px",
+      "border-bottom": "0px",
+      "border": "0px solid #979797",
       "height": "40px",
       "color": "#000",
       "font-size": "15px",
       "float": "left",
-      "text-align": "left"
+      "text-align": "right"
     }
   },
   "number": {
@@ -410,60 +410,60 @@
       "color": "#000"
     },
     "inputStyles": {
-      "border-radius": "4px",
-      "border-bottom": "1px solid #979797",
-      "border": "1px solid #979797",
+      "border-radius": "0px",
+      "border-bottom": "0px",
+      "border": "0px solid #979797",
       "height": "40px",
       "color": "#000",
       "font-size": "15px",
       "float": "left",
-      "text-align": "left"
+      "text-align": "right"
     }
   },
   "personfield": {
     "styles": {
       "border": "1px solid #979797",
-      "border-radius": "4px",
+      "border-radius": "0px",
       "color": "#000",
       "min-height": "40px",
       "line-height": "normal"
     },
     "inputStyles": {
-      "border-radius": "4px",
-      "border-bottom": "0px solid #979797",
+      "border-radius": "0px",
+      "border-bottom": "0px",
       "border": "0px solid #979797",
       "min-height": "40px",
       "height" : "auto",
       "color": "#000",
       "font-size": "15px",
       "float": "left",
-      "text-align": "left"
+      "text-align": "right"
     }
   },
   "orgfield": {
     "styles": {
       "border": "1px solid #979797",
-      "border-radius": "4px",
+      "border-radius": "0px",
       "color": "#000",
       "min-height": "40px",
       "line-height": "normal"
     },
     "inputStyles": {
-      "border-radius": "4px",
-      "border-bottom": "0px solid #979797",
+      "border-radius": "0px",
+      "border-bottom": "0px",
       "border": "0px solid #979797",
       "min-height": "40px",
       "height" : "auto",
       "color": "#000",
       "font-size": "15px",
       "float": "left",
-      "text-align": "left"
+      "text-align": "right"
     }
   },
   "org": {
     "styles": {
       "border": "1px solid #979797",
-      "border-radius": "4px",
+      "border-radius": "0px",
       "color": "#000",
       "min-height": "30px",
       "padding" : "0px",
@@ -471,7 +471,7 @@
     },
     "inputStyles": {
       "border-radius": "0px",
-      "border-bottom": "0px solid #979797",
+      "border-bottom": "0px",
       "border": "0px solid #979797",
       "min-height": "30px",
       "margin" : "5px 0px",
@@ -479,7 +479,7 @@
       "color": "#000",
       "font-size": "15px",
       "float": "left",
-      "text-align": "left"
+      "text-align": "right"
     }
   },
   "select": {
@@ -506,13 +506,13 @@
       "color": "#000"
     },
     "inputStyles": {
-      "border-radius": "4px",
-      "border-bottom": "1px solid #979797",
-      "border": "1px solid #979797",
+      "border-radius": "0px",
+      "border-bottom": "0px",
+      "border": "0px solid #979797",
       "color": "#000",
       "font-size": "15px",
       "float": "left",
-      "text-align": "left"
+      "text-align": "right"
     }
   },
   "actionbar": {