fmui-base 2.1.51 → 2.1.53

package/README.md

@@ -2,7 +2,9 @@
 
 ---npm publish
 
-## 更新日志 
+## 更新日志
+- 2.1.53：上传组件根据文件大小显示单位不同
+- 2.1.52：流程提交到最后结束节点保存批示意见
 - 2.1.51：关联字段触发字段支持子表字段
 - 2.1.50：流程普通退回增加回调
 - 2.1.49：流程提交到最后结束节点可以直接结束，跳过确认环节

package/lib/process_info/processInfo.js

@@ -2327,7 +2327,12 @@ var PageHome = function (_React$Component) {
                                 urgentList: [],
                                 isEnd: isEnd
                             }, function () {
+                                console.log("sendFlow直接结束");
                                 param.selectedActivity = '[{"id":"end_node","name":"结束","level":""}]';
+                                param.comment = newComment;
+                                param.hasCommentField = t.state.hasCommentField;
+                                param.attachId = t.state.commentAttachId;
+                                param.commentId = t.state.commentId;
                                 t.sendFlow(param);
                             });
                             return false;

package/lib/upload/upload.js

@@ -640,7 +640,11 @@ var PageHome = function (_React$Component) {
                             if (b < 1) {
                                 return Math.round(a * 100) / 100 + 'KB';
                             }
-                            return Math.round(b * 100) / 100 + 'MB';
+                            var c = b / 1024;
+                            if (c < 1) {
+                                return Math.round(b * 100) / 100 + 'MB';
+                            }
+                            return Math.round(c * 100) / 100 + 'GB';
                         }
                         return t.state.uploadType == 'image' ? _react2.default.createElement(
                             'div',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fmui-base",
-  "version": "2.1.51",
+  "version": "2.1.53",
   "title": "fmui-base",
   "description": "fmui移动端组件",
   "main": "lib/index.js",