fmui-base 2.0.1 → 2.0.3

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志
+- 2.0.3: 增加流程图；表单按钮功能扩展
+- 2.0.2: 时间字段增加“xxxx年xx月xx日”中文显示
 - 2.0.1: 流程表单选人组件联动开发 
 - 2.0.0: 2.0正式版 
 - 2.1.1-beta.1：流程列表样式修改

package/lib/form/form.js

@@ -846,6 +846,7 @@ var PageHome = function (_React$Component) {
           }
         }
         var dateFormat = form.dateFormat;
+        var dateFormatShow = "";
         if (form.dataAttr && typeof form.dataAttr != "undefined") {
           var dateDisplayFormat = form.dataAttr.dateDisplayFormat;
           if (dateDisplayFormat == "STime" || dateFormat == "YMDHM") {
@@ -854,12 +855,13 @@ var PageHome = function (_React$Component) {
             dateFormat = "YM";
           } else if (dateDisplayFormat == "Year") {
             dateFormat = "Y";
+          } else if (dateDisplayFormat == "ODate") {
+            dateFormat = "YMD";
+          } else if (dateDisplayFormat == "zhDate") {
+            dateFormat = "YMD";
+            dateFormatShow = "zhDate";
           } else {
-            if (dateDisplayFormat == "ODate") {
-              dateFormat = "YMD";
-            } else {
-              dateFormat = "YMDHM";
-            }
+            dateFormat = "YMDHM";
           }
           var minDate = form.dataAttr.minDate;
           var maxDate = form.dataAttr.maxDate;
@@ -890,7 +892,7 @@ var PageHome = function (_React$Component) {
           } else {
             value = null;
           }
-          var dateFormt = itemParam.dateFormat;
+          // var dateFormt = itemParam.dateFormat;
 
           var dateStr = this.dateFormat(value, dateFormt);
           var mainTblData = data.mainTblData;
@@ -914,6 +916,11 @@ var PageHome = function (_React$Component) {
           }
           value = null;
         }
+
+        if (readOnly == true) {
+          var dateStr = this.dateFormat(value, dateFormat, dateFormatShow);
+          value = dateStr;
+        }
       } else if (itemType == 'datetimeStep') {
         //时间
         var dateFormat = form.dateFormat;
@@ -1420,6 +1427,14 @@ var PageHome = function (_React$Component) {
       return itemParam;
     }
 
+    // 左边补零
+
+  }, {
+    key: 'addZero',
+    value: function addZero(num) {
+      return '' + (num < 10 ? '0' : '') + num;
+    }
+
     //处理关联字段初始化
 
   }, {
@@ -2120,12 +2135,17 @@ var PageHome = function (_React$Component) {
 
   }, {
     key: 'dateFormat',
-    value: function dateFormat(date, formatStr) {
+    value: function dateFormat(date, formatStr, dateFormatShow) {
       if (date) {
         date = new Date(date);
         var year = date.getFullYear();
         var month = this.dealwithDate(date.getMonth() + 1);
         var dates = this.dealwithDate(date.getDate());
+        if (dateFormatShow) {
+          if (dateFormatShow == "zhDate") {
+            return year + '年' + month + '月' + dates + '日';
+          }
+        }
         if (formatStr == 'YMD') {
           //年月日
           return year + '-' + month + '-' + dates;
@@ -2703,7 +2723,7 @@ var PageHome = function (_React$Component) {
                 required: t.state.itemParam.required,
                 label: t.state.itemParam.title,
                 readOnly: t.state.itemParam.readOnly,
-                minRows: 3,
+                minRows: 1,
                 placeholder: t.state.itemParam.readOnly ? '' : t.state.itemParam.placeholder,
                 value: t.state.itemParam.value,
                 onChange: function onChange(value) {
@@ -2727,7 +2747,7 @@ var PageHome = function (_React$Component) {
                 required: t.state.itemParam.required,
                 label: t.state.itemParam.title,
                 readOnly: t.state.itemParam.readOnly,
-                minRows: 3,
+                minRows: 1,
                 placeholder: t.state.itemParam.readOnly ? '' : t.state.itemParam.placeholder,
                 value: t.state.itemParam.value,
                 onChange: function onChange(value) {
@@ -2819,7 +2839,15 @@ var PageHome = function (_React$Component) {
             _react2.default.createElement(
               'div',
               { id: t.state.prefixName + "_" + t.state.itemParam.key, className: 't-FBH' },
-              _react2.default.createElement(_DatetimeField2.default, {
+              t.state.itemParam.readOnly ? _react2.default.createElement(_TextareaField2.default, {
+                className: 't-W100',
+                required: t.state.itemParam.required,
+                label: t.state.itemParam.title,
+                readOnly: t.state.itemParam.readOnly,
+                minRows: 1,
+                placeholder: t.state.itemParam.readOnly ? '' : t.state.itemParam.placeholder,
+                value: t.state.itemParam.value
+              }) : _react2.default.createElement(_DatetimeField2.default, {
                 className: 't-W100',
                 label: t.state.itemParam.title,
                 required: t.state.itemParam.required,
@@ -3048,7 +3076,7 @@ var PageHome = function (_React$Component) {
                     { id: t.state.prefixName + "_" + t.state.itemParam.key },
                     _react2.default.createElement(_TextareaField2.default, {
                       readOnly: false,
-                      minRows: 3, maxRows: 5,
+                      minRows: 1, maxRows: 5,
                       placeholder: '请输入批示意见',
                       value: t.state.spyj,
                       onChange: this.changeSpyj3.bind(this) })

package/lib/process_info/processInfo.js

@@ -1286,7 +1286,7 @@ var PageHome = function (_React$Component) {
                         formRelaField: formRelaField,
                         dealReminderContent: dealReminderContent
                     });
-                    t.dealWithButtons(content);
+                    t.dealWithButtons(content, formKey);
                 }, function (error) {
                     setTimeout(function () {
                         _Toast2.default.show({
@@ -1313,19 +1313,54 @@ var PageHome = function (_React$Component) {
 
     }, {
         key: 'dealWithButtons',
-        value: function dealWithButtons(content) {
+        value: function dealWithButtons(content, formKey) {
             var t = this;
+            var module = t.state.module;
             //处理特有按钮事件
 
+            if (t.state.listType == "0") {
+                //待办默认提交和保存按钮
+                var buttons = content.buttons;
+
+                if (buttons) {
+                    var lastChar = buttons.substring(buttons.length - 1, buttons.length);
+                    if (lastChar != ",") {
+                        buttons += ",";
+                    }
+                }
+                if (buttons.indexOf('PAGE_SAVE,') == -1) {
+                    buttons += "PAGE_SAVE,";
+                }
+                if (buttons.indexOf('BASE_SUMBIT,') == -1) {
+                    buttons += "BASE_SUMBIT,";
+                }
+                content.buttons = buttons;
+            }
             if (typeof FlowCommon.dealwithCommonButton === "function") {
-                FlowCommon.dealwithCommonButton(this.state, function (extensionButtonList) {
-                    t.dealwithButtonsFunc(content, extensionButtonList);
+                FlowCommon.dealwithCommonButton(t.state, function (extensionButtonList, contentNew) {
+                    //项目开发扩展
+                    if (!contentNew) {
+                        contentNew = content;
+                    }
+                    var mobileExt;
+                    try {
+                        if (formKey) {
+                            mobileExt = typeof eval(module + "_" + formKey + "_mobileExt") !== 'undefined' ? eval(module + "_" + formKey + "_mobileExt") : null;
+                        }
+                    } catch (e) {}
+                    if (typeof mobileExt !== 'undefined' && typeof mobileExt["dealwithCommonButtonExt"] === "function") {
+                        mobileExt["dealwithCommonButtonExt"](t.state, contentNew, extensionButtonList, function (contentNewExt, extensionButtonListExt) {
+                            t.dealwithButtonsFunc(contentNewExt, extensionButtonListExt);
+                        });
+                    } else {
+                        t.dealwithButtonsFunc(contentNew, extensionButtonList);
+                    }
                 }, function (error) {
                     _Toast2.default.show({
                         type: 'error',
                         content: error
                     });
-                });
+                }, content);
             } else {
                 t.dealwithButtonsFunc(content, []);
             }
@@ -1356,39 +1391,27 @@ var PageHome = function (_React$Component) {
             var listType = this.state.listType;
             if (listType == "0") {
                 //待办
-                for (var d = 0; d < extensionButtonList.length; d++) {
-                    buttonArray.push(extensionButtonList[d].name);
-                }
+                // for(var d=0; d<extensionButtonList.length;d++){
+                //     buttonArray.push(extensionButtonList[d].no);
+                // }
                 for (var b = 0; b < buttonArray.length; b++) {
                     var buttonCode = buttonArray[b];
                     //PAGE_SAVE保存按钮只有当新建时才有，HELP_ADDLOTS加签只有在会签和串签才有,RADOM_FINISH随机流程完成按钮去掉
-                    if (buttonCode == 'FLOW_REVOKE' || buttonCode == 'RADOM_FINISH' || buttonCode == 'FLOW_CANCEL' || buttonCode == 'FLOW_RECOVER' || buttonCode == 'PAGE_PRINT' || buttonCode == 'PAGE_URGE' || buttonCode == 'PAGE_REDSET' || buttonCode == 'PAGE_FEEDBACK' || buttonCode == 'RECORD' || buttonCode == 'HELP_ADDLOTS' && (participantMode == '0' || participantMode == '3')) {
+                    if (buttonCode == 'OTHER_RELATION' || buttonCode == 'HELP_CIRCULATE' || buttonCode == 'BASE_INVALID' || buttonCode == 'FLOW_REVOKE' || buttonCode == 'RADOM_FINISH' || buttonCode == 'FLOW_CANCEL' || buttonCode == 'FLOW_RECOVER' || buttonCode == 'PAGE_PRINT' || buttonCode == 'PAGE_URGE' || buttonCode == 'PAGE_REDSET' || buttonCode == 'PAGE_FEEDBACK' || buttonCode == 'RECORD' || buttonCode == 'HELP_ADDLOTS' && (participantMode == '0' || participantMode == '3')) {
                         continue;
                     } else {
                         if (dataId == '' || isStart == true && permissionCode == 'start' || isDraft == '1') {
-                            if (buttonCode == 'PAGE_SAVE' || buttonCode == 'BASE_SUMBIT') {
-                                buttonArrayNew.push(buttonCode);
-                            }
-                            if (buttonCode.indexOf('PAGE_SAVE') == -1) {
-                                buttonArrayNew.push('PAGE_SAVE');
-                            }
-                            if (buttonCode.indexOf('BASE_SUMBIT') == -1) {
-                                buttonArrayNew.push('BASE_SUMBIT');
-                            }
+                            // if(buttonCode == 'PAGE_SAVE' || buttonCode == 'BASE_SUMBIT'){
+                            buttonArrayNew.push(buttonCode);
+                            // }
                         } else {
-                            if (buttonCode.indexOf('PAGE_SAVE') == -1) {
-                                buttonArrayNew.push('PAGE_SAVE');
-                            }
-                            if (buttonCode.indexOf('BASE_SUMBIT') == -1) {
-                                buttonArrayNew.push('BASE_SUMBIT');
-                            }
                             if (buttonCode != '') {
                                 buttonArrayNew.push(buttonCode);
                             }
                         }
                     }
                 }
-                this.getListButtonsByCodes(buttonArrayNew.join(','), dataId, isStart);
+                this.getListButtonsByCodes(buttonArrayNew.join(','), dataId, isStart, extensionButtonList);
             } else if (listType == "2") {
                 //已办
 
@@ -1396,21 +1419,21 @@ var PageHome = function (_React$Component) {
                     if (buttons.indexOf('FLOW_REVOKE') >= 0) {
                         if (this.state.processIsComplete == "0") {
                             //当流程未结束时
-                            buttonList.push({ name: t.state.finalButtons.get("FLOW_REVOKE"), type: 'secondary', display: 'banner', no: 7 });
+                            buttonList.push({ name: t.state.finalButtons.get("FLOW_REVOKE"), type: 'secondary', display: 'inline', no: 7 });
                         }
                     }
                     if (buttons.indexOf('FLOW_RECOVER') >= 0) {
                         if (this.state.processIsComplete == "0") {
                             //当流程未结束时
-                            buttonList.push({ name: t.state.finalButtons.get("FLOW_RECOVER"), type: 'secondary', display: 'banner', no: 14 });
+                            buttonList.push({ name: t.state.finalButtons.get("FLOW_RECOVER"), type: 'secondary', display: 'inline', no: 14 });
                         }
                     }
                     if (t.state.urgeDataList != null && t.state.urgeDataList.length > 0) {
-                        buttonList.push({ name: t.state.finalButtons.get("PAGE_URGE"), type: 'secondary', display: 'banner', no: 12 });
+                        buttonList.push({ name: t.state.finalButtons.get("PAGE_URGE"), type: 'secondary', display: 'inline', no: 12 });
                     }
                 }
                 if (buttons.indexOf('HELP_CIRCULATE') >= 0) {
-                    buttonList.push({ name: t.state.finalButtons.get("HELP_CIRCULATE"), type: 'secondary', display: 'banner', no: 4 });
+                    buttonList.push({ name: t.state.finalButtons.get("HELP_CIRCULATE"), type: 'secondary', display: 'inline', no: 4 });
                 }
                 for (var d = 0; d < extensionButtonList.length; d++) {
                     buttonList.push(extensionButtonList[d]);
@@ -1421,22 +1444,22 @@ var PageHome = function (_React$Component) {
                     //当流程未结束时,
                     if (buttons.indexOf('FLOW_CANCEL') >= 0) {
                         //取消按钮
-                        buttonList.push({ name: t.state.finalButtons.get("FLOW_CANCEL"), type: 'secondary', display: 'banner', no: 11 });
+                        buttonList.push({ name: t.state.finalButtons.get("FLOW_CANCEL"), type: 'secondary', display: 'inline', no: 11 });
                     }
                     if (startButtons) {
                         if (startButtons.indexOf('FLOW_REVOKE') >= 0) {
                             //发起人撤销按钮
-                            buttonList.push({ name: t.state.finalButtons.get("FLOW_REVOKE"), type: 'secondary', display: 'banner', no: 7 });
+                            buttonList.push({ name: t.state.finalButtons.get("FLOW_REVOKE"), type: 'secondary', display: 'inline', no: 7 });
                         }
                     }
                     if (t.state.urgeDataList != null && t.state.urgeDataList.length > 0) {
-                        buttonList.push({ name: t.state.finalButtons.get("PAGE_URGE"), type: 'secondary', display: 'banner', no: 12 });
+                        buttonList.push({ name: t.state.finalButtons.get("PAGE_URGE"), type: 'secondary', display: 'inline', no: 12 });
                     }
                 }
                 if (startButtons) {
                     if (startButtons.indexOf('HELP_CIRCULATE') >= 0) {
                         //传阅
-                        buttonList.push({ name: t.state.finalButtons.get("HELP_CIRCULATE"), type: 'secondary', display: 'banner', no: 4 });
+                        buttonList.push({ name: t.state.finalButtons.get("HELP_CIRCULATE"), type: 'secondary', display: 'inline', no: 4 });
                     }
                 }
                 for (var d = 0; d < extensionButtonList.length; d++) {
@@ -1458,9 +1481,9 @@ var PageHome = function (_React$Component) {
                 for (var c = 0; c < buttonArrayNew.length; c++) {
                     var buttonCode = buttonArrayNew[c];
                     if (buttonCode == 'BASE_SUMBIT') {
-                        buttonList.push({ name: t.state.finalButtons.get("BASE_SUMBIT"), type: 'primary', display: 'banner', no: 1 });
+                        buttonList.push({ name: t.state.finalButtons.get("BASE_SUMBIT"), type: 'primary', display: 'inline', no: 1 });
                     } else if (buttonCode == 'PAGE_SAVE') {
-                        buttonList.push({ name: t.state.finalButtons.get("PAGE_SAVE"), type: 'secondary', display: 'banner', no: 13 });
+                        buttonList.push({ name: t.state.finalButtons.get("PAGE_SAVE"), type: 'secondary', display: 'inline', no: 13 });
                     }
                 }
             }
@@ -2682,17 +2705,58 @@ var PageHome = function (_React$Component) {
             } else {
                 //其他按钮
                 if (typeof FlowCommon[operate] === "function") {
-                    FlowCommon[operate](this.state, function (msg) {
-                        _Toast2.default.show({
-                            type: 'success',
-                            content: msg
-                        });
+                    FlowCommon[operate](t.state, function (msg) {
+                        //项目开发扩展
+                        var mobileExt;
+                        try {
+                            if (t.state.formKey) {
+                                mobileExt = typeof eval(t.state.module + "_" + t.state.formKey + "_mobileExt") !== 'undefined' ? eval(t.state.module + "_" + t.state.formKey + "_mobileExt") : null;
+                            }
+                        } catch (e) {
+                            // alert("exception: "+e.message);
+                        }
+                        if (typeof mobileExt !== 'undefined' && typeof mobileExt[operate] === "function") {
+                            mobileExt[operate](t.state, function (msg) {
+                                _Toast2.default.show({
+                                    type: 'success',
+                                    content: msg
+                                });
+                            }, function (msg) {
+                                _Toast2.default.show({
+                                    type: 'error',
+                                    content: msg
+                                });
+                            });
+                        }
                     }, function (msg) {
                         _Toast2.default.show({
                             type: 'error',
                             content: msg
                         });
                     });
+                } else {
+                    //项目开发扩展
+                    var mobileExt;
+                    try {
+                        if (t.state.formKey) {
+                            mobileExt = typeof eval(t.state.module + "_" + t.state.formKey + "_mobileExt") !== 'undefined' ? eval(t.state.module + "_" + t.state.formKey + "_mobileExt") : null;
+                        }
+                    } catch (e) {
+                        // alert("exception: "+e.message);
+                    }
+                    if (typeof mobileExt !== 'undefined' && typeof mobileExt[operate] === "function") {
+                        mobileExt[operate](t.state, function (msg) {
+                            _Toast2.default.show({
+                                type: 'success',
+                                content: msg
+                            });
+                        }, function (msg) {
+                            _Toast2.default.show({
+                                type: 'error',
+                                content: msg
+                            });
+                        });
+                    }
                 }
             }
         }
@@ -5316,11 +5380,11 @@ var PageHome = function (_React$Component) {
         }
     }, {
         key: 'getListButtonsByCodes',
-        value: function getListButtonsByCodes(buttonCodes, dataId, isStart) {
+        value: function getListButtonsByCodes(buttonCodes, dataId, isStart, extensionButtonList) {
             var _this2 = this;
 
-            buttonCodes = buttonCodes.replace('OTHER_RELATION', '');
-            buttonCodes = buttonCodes.replace('MAILSEND', '');
+            //  buttonCodes=buttonCodes.replace('OTHER_RELATION','');
+            //  buttonCodes=buttonCodes.replace('MAILSEND','');
             if (buttonCodes == null || buttonCodes == '') {
                 var sysWatermark = this.state.sysWatermark;
                 if (null != sysWatermark && sysWatermark != '') {
@@ -5331,11 +5395,11 @@ var PageHome = function (_React$Component) {
                 }
             } else {
                 _db2.default.FlowModuleAPI.getListButtonsByCodes({
-                    buttonCodes: buttonCodes + ',MAILSEND'
+                    buttonCodes: buttonCodes
                 }).then(function (content) {
-                    _this2.setState({
-                        buttonCodeList: content
-                    });
+                    //  this.setState({
+
+                    //  });
                     var buttonCodeList = content;
                     var actionSheetButtonOpt = [];
                     var actionSheetButtonOptName = [];
@@ -5344,42 +5408,45 @@ var PageHome = function (_React$Component) {
                     var sysWatermark = _this2.state.sysWatermark;
                     /* buttonCodeList.push({'buttonCode':'BASE_SUMBIT','buttonName':'通过'});
                      buttonCodeList.push({'buttonCode':'PAGE_SAVE','buttonName':'保存'});*/
-                    if (buttonCodeList.length > 4) {
+                    buttonCodeList = buttonCodeList.concat();
+                    var alllength = buttonCodeList.length + extensionButtonList.length;
+                    if (alllength > 4) {
                         buttonList.push({ name: '更多', type: 'text', display: 'inline', no: -1 });
+                        var buttonCodeListNew = [];
                         for (var c = 0; c < buttonCodeList.length; c++) {
                             var buttonCode = buttonCodeList[c]['buttonCode'];
                             var buttonName = buttonCodeList[c]['buttonName'];
                             if (c < 3) {
                                 if (buttonCode == 'BACK') {
-                                    buttonList.push({ name: buttonName, type: 'danger', display: 'inline', no: 2 });
+                                    buttonCodeListNew.push({ name: buttonName, type: 'danger', display: 'inline', no: 2 });
                                 } else if (buttonCode == 'PAGE_SAVE') {
-                                    buttonList.push({ name: buttonName, type: 'secondary', display: 'inline', no: 13 });
+                                    buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 13 });
                                 } else if (buttonCode == 'BASE_SUMBIT') {
                                     var sumbmitName = buttonName;
                                     if (dataId == '' || isStart == true) {
                                         sumbmitName = '提交';
                                     }
-                                    buttonList.push({ name: sumbmitName, type: 'primary', display: 'inline', no: 1 });
+                                    buttonCodeListNew.push({ name: sumbmitName, type: 'primary', display: 'inline', no: 1 });
                                 } else if (buttonCode == 'BASE_TRANSFER') {
-                                    buttonList.push({ name: buttonName, type: 'secondary', display: 'inline', no: 3 });
+                                    buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 3 });
                                 } else if (buttonCode == 'HELP_CIRCULATE') {
-                                    buttonList.push({ name: buttonName, type: 'secondary', display: 'inline', no: 4 });
+                                    buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 4 });
                                 } else if (buttonCode == 'HELP_FORWARD') {
-                                    buttonList.push({ name: buttonName, type: 'secondary', display: 'inline', no: 20 });
+                                    buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 20 });
                                 } else if (buttonCode == 'BASE_JUMP') {
-                                    buttonList.push({ name: buttonName, type: 'secondary', display: 'inline', no: 5 });
+                                    buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 5 });
                                 } else if (buttonCode == 'HELP_ADDLOTS') {
-                                    buttonList.push({ name: buttonName, type: 'secondary', display: 'inline', no: 6 });
+                                    buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 6 });
                                 } else if (buttonCode == 'BASE_END') {
-                                    buttonList.push({ name: buttonName, type: 'secondary', display: 'inline', no: 8 });
+                                    buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 8 });
                                 } else if (buttonCode == 'BASE_INVALID') {
-                                    buttonList.push({ name: buttonName, type: 'secondary', display: 'inline', no: 9 });
+                                    buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 9 });
                                 } else if (buttonCode == 'HELP_DISTRIBUTE') {
-                                    buttonList.push({ name: buttonName, type: 'secondary', display: 'inline', no: 'distributeFlow' });
+                                    buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 'distributeFlow' });
                                 } else if (buttonCode == 'MAILSEND') {
-                                    buttonList.push({ name: buttonName, type: 'secondary', display: 'inline', no: 18 });
+                                    buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 18 });
                                 } else {
-                                    buttonList.push({ name: buttonName, type: 'secondary', display: 'inline', no: buttonCode });
+                                    buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: buttonCode });
                                 }
                             } else if (c == 3) {
                                 //buttonList.push({name:'更多',type:'secondary',display:'banner',no:-1});
@@ -5390,8 +5457,20 @@ var PageHome = function (_React$Component) {
                                 actionSheetButtonOptName.push(buttonName);
                             }
                         }
+                        var nowNum = buttonCodeList.length;
+                        for (var d = 0; d < extensionButtonList.length; d++) {
+                            if (nowNum < 3) {
+                                buttonList.push(extensionButtonList[d]);
+                            } else {
+                                actionSheetButtonOpt.push(extensionButtonList[d].no);
+                                actionSheetButtonOptName.push(extensionButtonList[d].name);
+                            }
+                            nowNum++;
+                        }
+                        buttonList = buttonList.concat(buttonCodeListNew);
                         buttonIsMore = true;
                     } else {
+                        buttonList = buttonList.concat(extensionButtonList);
                         for (var c = 0; c < buttonCodeList.length; c++) {
                             var buttonCode = buttonCodeList[c]['buttonCode'];
                             var buttonName = buttonCodeList[c]['buttonName'];
@@ -5430,6 +5509,7 @@ var PageHome = function (_React$Component) {
                         }
                     }
                     _this2.setState({
+                        buttonCodeList: content,
                         buttonList: buttonList,
                         actionSheetButtonOpt: actionSheetButtonOpt,
                         actionSheetButtonOptName: actionSheetButtonOptName,
@@ -6459,6 +6539,45 @@ var PageHome = function (_React$Component) {
                                     )
                                 )
                             ),
+                            _react2.default.createElement(
+                                _Tab2.default.Item,
+                                { key: '1', title: '\u6D41\u7A0B\u56FE' },
+                                _react2.default.createElement(
+                                    _Group2.default.List,
+                                    null,
+                                    _react2.default.createElement(
+                                        'div',
+                                        { className: this.state.activeItemIndex == 1 ? 't-BCf' : 't-DN' },
+                                        _react2.default.createElement(
+                                            HBox,
+                                            { vAlign: 'center', className: 't-PL16 t-PR16 t-PT10 t-PB10 t-BCf t-FS14' },
+                                            _react2.default.createElement(Box, { className: 't-BCyellow t-WH10 t-MR4' }),
+                                            _react2.default.createElement(
+                                                Box,
+                                                null,
+                                                '\u5BA1\u6279\u4E2D'
+                                            ),
+                                            _react2.default.createElement(Box, { className: 't-BCd t-WH10 t-MR4 t-ML10' }),
+                                            _react2.default.createElement(
+                                                Box,
+                                                null,
+                                                '\u5DF2\u5BA1\u6279'
+                                            ),
+                                            _react2.default.createElement(Box, { className: 't-BCddblue t-WH10 t-MR4 t-ML10' }),
+                                            _react2.default.createElement(
+                                                Box,
+                                                null,
+                                                '\u672A\u5BA1\u6279'
+                                            )
+                                        ),
+                                        _react2.default.createElement(
+                                            'div',
+                                            { style: { textAlign: 'center', overflowX: 'scroll' } },
+                                            _react2.default.createElement('img', { src: _variables2.default.URLS.getFlowImage + this.state.processInstanceId + '&random=' + this.state.keyNum })
+                                        )
+                                    )
+                                )
+                            ),
                             _react2.default.createElement(
                                 _Tab2.default.Item,
                                 { key: '2', title: '\u6D41\u7A0B\u8BB0\u5F55' },
@@ -6789,12 +6908,12 @@ var PageHome = function (_React$Component) {
                         null,
                         _react2.default.createElement(
                             _Button2.default,
-                            { type: 'secondary', display: 'banner', onClick: t.handleSubmit.bind(t, 4) },
+                            { type: 'secondary', display: 'inline', onClick: t.handleSubmit.bind(t, 4) },
                             this.state.finalButtons.get("HELP_CIRCULATE")
                         ),
                         _react2.default.createElement(
                             _Button2.default,
-                            { type: 'primary', display: 'banner', onClick: t.clickRead.bind(t) },
+                            { type: 'primary', display: 'inline', onClick: t.clickRead.bind(t) },
                             '\u5DF2\u9605'
                         )
                     )

package/package.json

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