fmui-base 2.2.28 → 2.2.30

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.2.30: 加签自动返回
+- 2.2.29: 关联表批示意见渲染
 - 2.2.28: 表单组件支持单独渲染
 - 2.2.27: 批示意见落款被加签的用户增加标识
 - 2.2.26: 表单组件支持查看发票

package/lib/form/form.js

@@ -1081,7 +1081,7 @@ var PageHome = function (_React$Component) {
         var commentFieldList = [];
         for (var _i = 0; _i < commentList.length; _i++) {
           var commentItem = commentList[_i];
-          if (commentItem.field == tableName + '_' + key) {
+          if (commentItem.field == itemParam.uniqueName) {
             //评论id和code
             commentFieldList.push(commentItem);
           }

package/lib/process_info/processInfo.js

@@ -464,7 +464,7 @@ var PageHome = function (_React$Component) {
             selectProcessCode: '', //选中的子流程
             subProcessType: '', //子流程类型 0串行  1并行
             urgencyList: [], //紧急程度列表
-            urgency: '' }, _defineProperty(_param, 'urgent', ''), _defineProperty(_param, 'backInitiatorEndFlow', '0'), _defineProperty(_param, 'oauthWindowURL', ''), _defineProperty(_param, 'isCaUser', '0'), _param);
+            urgency: '' }, _defineProperty(_param, 'urgent', ''), _defineProperty(_param, 'backInitiatorEndFlow', '0'), _defineProperty(_param, 'oauthWindowURL', ''), _defineProperty(_param, 'isCaUser', '0'), _defineProperty(_param, 'addlotsReturn', ''), _param);
         FlowCommon = require('pages/flow_common/' + module).default ? require('pages/flow_common/' + module).default : require('pages/flow_common/' + module);
 
         //处理特有参数
@@ -813,9 +813,13 @@ var PageHome = function (_React$Component) {
                     var urgency = '50';
                     var urgentSelectList = {};
                     var backInitiatorEndFlow = '0';
+                    var addlotsReturn = ''; //加签自动返回 串签时生效，0否，1是
                     if (content.readScopeId && typeof content.readScopeId != "undefined") {
                         readScopeId = content.readScopeId;
                     }
+                    if (content.addlotsReturn && typeof content.addlotsReturn != "undefined") {
+                        addlotsReturn = content.addlotsReturn;
+                    }
                     if (content.isRemoveCommentFormHtml && typeof content.isRemoveCommentFormHtml != "undefined") {
                         isRemoveCommentFormHtml = content.isRemoveCommentFormHtml;
                     }
@@ -1451,7 +1455,8 @@ var PageHome = function (_React$Component) {
                         urgentSelectList: urgentSelectList,
                         backInitiatorEndFlow: backInitiatorEndFlow,
                         oauthWindowURL: oauthWindowURL,
-                        isCaUser: isCaUser
+                        isCaUser: isCaUser,
+                        addlotsReturn: addlotsReturn
                     }, function () {
                         t.refs["selectMember_circulate"].initSelectData();
                         t.refs["selectMember_circulate1"].initSelectData();
@@ -5546,17 +5551,16 @@ var PageHome = function (_React$Component) {
             if (addlotsShortMessage) {
                 shortMessage = addlotsShortMessage;
             }
-            // Dialog.confirm({
-            //     locale: 'zh_CN',
-            //     title: '提示',
-            //     content: '是否要'+t.state.finalButtons.get("HELP_ADDLOTS")+'审批？',
-            //     onConfirm() {
-
-            //     },
-            //     onCancel() {
-            //       console.log('confirm cancel');
-            //     },
-            //   });
+            var addlotsAutomaticReturn = '0';
+            var addlotsReturn = t.state.addlotsReturn;
+            if (addlotsReturn == '1') {
+                addlotsAutomaticReturn = '1';
+                if (t.state.addlotsAutomaticReturn == true) {
+                    addlotsAutomaticReturn = '1';
+                } else if (t.state.addlotsAutomaticReturn == false) {
+                    addlotsAutomaticReturn = '0';
+                }
+            }
             db.FlowModuleAPI.addSign({
                 dataId: t.state.dataId,
                 taskId: t.state.taskId,
@@ -5567,7 +5571,8 @@ var PageHome = function (_React$Component) {
                 permissionCode: t.state.permissionCode,
                 formId: t.state.formId,
                 processInstanceId: t.state.processInstanceId,
-                shortMessage: shortMessage
+                shortMessage: shortMessage,
+                automaticReturn: addlotsAutomaticReturn
             }).then(function (content) {
                 _Toast2.default.show({
                     type: 'success',
@@ -6659,6 +6664,16 @@ var PageHome = function (_React$Component) {
             });
         }
 
+        /** 加签自动返回 **/
+
+    }, {
+        key: 'handleAddlotsAutomaticReturnChange',
+        value: function handleAddlotsAutomaticReturnChange(value) {
+            this.setState({
+                addlotsAutomaticReturn: value
+            });
+        }
+
         //选择传阅用户
 
     }, {
@@ -7922,8 +7937,8 @@ var PageHome = function (_React$Component) {
                         'div',
                         { className: this.state.transferReturn == '1' ? "t-field-box t-FBH t-FBAC t-FBJ" : "t-DN" },
                         _react2.default.createElement(
-                            'label',
-                            { className: 'label-txt' },
+                            'div',
+                            { className: 't-field-layout-h-label' },
                             '\u81EA\u52A8\u8FD4\u56DE'
                         ),
                         _react2.default.createElement(_Switch2.default, { on: this.state.automaticReturn, onChange: this.handleAutomaticReturnChange.bind(this) })
@@ -8094,6 +8109,16 @@ var PageHome = function (_React$Component) {
                             isDelete: true,
                             onChange: this.addSignCallback.bind(this)
                         }),
+                        _react2.default.createElement(
+                            'div',
+                            { className: this.state.addlotsReturn == '1' && this.state.participantMode == '2' ? "t-field-box t-FBH t-FBAC t-FBJ" : "t-DN" },
+                            _react2.default.createElement(
+                                'div',
+                                { className: 't-field-layout-h-label' },
+                                '\u81EA\u52A8\u8FD4\u56DE'
+                            ),
+                            _react2.default.createElement(_Switch2.default, { on: this.state.addlotsAutomaticReturn, onChange: this.handleAddlotsAutomaticReturnChange.bind(this) })
+                        ),
                         _react2.default.createElement(_CheckboxField2.default, {
                             data: this.state.shortMessageList,
                             className: '',

package/package.json

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