fmui-base 2.0.91 → 2.0.93

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志  
+- 2.0.93：流程组件支持作废，表单组件关联字段支持绑定子表字段bug修复
+- 2.0.92：流程组件支持作废功能
 - 2.0.91：表单组件关联字段支持绑定子表字段，子表change事件回调时增加子表的index
 - 2.0.90：表单组件子表处理
 - 2.0.89：表单组件子表处理

package/lib/db/db.js

@@ -858,6 +858,20 @@ context.create('FlowModuleAPI', {
     method: 'POST',
     postDataFomat: 'FORM',
     willFetch: function willFetch() {}
+  },
+  getAllActivity: {
+    mockUrl: 'query/getAllActivity.json',
+    url: _variables2.default.URLS.getAllActivity,
+    header: {
+      Authorization: 'Bearer ' + getLoginUserInfo().token
+    },
+    method: 'GET',
+    willFetch: function willFetch() {
+      _Toast2.default.show({
+        content: _react2.default.createElement(_loading2.default, null),
+        duration: 800
+      });
+    }
   }
 });
 

package/lib/db/variables.js

@@ -117,8 +117,8 @@ exports.default = {
         getNewHomePageCollectAppInfoList: portalAllUrlPrefix + "getNewHomePageCollectAppInfoList" + '?token=' + getLoginUserInfo().token,
         getNewHomePageRemindCount: portalAllUrlPrefix + "getNewHomePageRemindCount" + '?token=' + getLoginUserInfo().token,
         getComAppInfo: portalAllUrlPrefix + 'getComAppInfo?token=' + getLoginUserInfo().token, //获取首页常用应用
-        saveAppCount: portalAllUrlPrefix + "saveAppCount" + '?token=' + getLoginUserInfo().token //移动应用保存更新点击次数接口 
-
+        saveAppCount: portalAllUrlPrefix + "saveAppCount" + '?token=' + getLoginUserInfo().token, //移动应用保存更新点击次数接口 
+        getAllActivity: approveUrlPrefix + "getAllActivity" + '?token=' + getLoginUserInfo().token //获取所有节点
     },
     nodataIcon: context + "/mobile/fmui/images/noData.png",
     loadingIcon: context + "/mobile/fmui/images/loading.gif",

package/lib/form/form.js

@@ -1685,6 +1685,8 @@ var PageHome = function (_React$Component) {
   }, {
     key: 'reloadItemParam',
     value: function reloadItemParam(itemNew) {
+      var dataType = this.state.dataType;
+
       if (itemNew != null && itemNew != undefined && Array.isArray(itemNew)) {
         var itemParam = this.state.itemParam;
         var selectText = ''; //多选值修改的显示文本
@@ -1741,7 +1743,9 @@ var PageHome = function (_React$Component) {
               selectedText: selectText
             });
           }
-
+          // if(dataType=='sub'){
+          //   this.props.reloadItemParam(itemNew,this.state.itemParam);
+          // } 
           if (itemParam.itemType == 'popuser') {
             this.refs['selectMember_' + itemParam.key].initSelectData();
           }

package/lib/form/table.js

@@ -850,6 +850,7 @@ var PageHome = function (_React$Component) {
 						relaFieldTblNameArray.map(function (relaFieldTblNameArrayItem, index) {
 							var nowValue = "";
 							var mainTblData = data.mainTblData;
+							var subTbl = data.subTbl;
 
 							mainTblData.map(function (item) {
 								if (item.key == itemKey) {
@@ -887,12 +888,23 @@ var PageHome = function (_React$Component) {
 								} else {
 									relaFieldMap["value"] = true;
 								}
-								var relaFieldNameArray = formRelaFieldMapsObjItem.relaFieldName.split(",");
+								var relaFieldNameArray = formRelaFieldMapsObjItem.relaFieldTblName.split(",");
 								mainTblData.map(function (item) {
-									if (item.key == relaFieldNameArray[index]) {
+									if (item.uniqueName == relaFieldNameArray[index]) {
 										item.required = triggerFieldValBoolean;
 									}
 								});
+								for (var i = 0; i < subTbl.length; i++) {
+									var subTblData = subTbl[i].subTblData;
+									for (var a = 0; a < subTblData.length; a++) {
+										var subTblDataItem = subTblData[a];
+										for (var b = 0; b < subTblDataItem.length; b++) {
+											if (subTblDataItem[b].uniqueName == relaFieldNameArray[index]) {
+												subTbl[i].subTblData[a][b].required = triggerFieldValBoolean;
+											}
+										}
+									}
+								}
 							} else if (editType == 'edit') {
 								relaFieldMap["key"] = "readOnly";
 								if (triggerFieldVal == nowValue) {
@@ -918,7 +930,7 @@ var PageHome = function (_React$Component) {
 														if (relaFieldTblNameArrayItem == subTblDataItem[a].uniqueName) {
 															isSubField = true;
 															var subTblNameItem = "sub_" + subTblName;
-															var subItem = relaFieldTblNameArrayItem + '_' + a;
+															var subItem = relaFieldTblNameArrayItem + '_' + b;
 															t.refs[subTblNameItem].refs[subItem].reloadItemParam([relaFieldMap]);
 														}
 													}

package/lib/process_info/processInfo.js

@@ -102,6 +102,10 @@ var _upload = require('../upload/upload');
 
 var _upload2 = _interopRequireDefault(_upload);
 
+var _SelectField = require('saltui/lib/SelectField');
+
+var _SelectField2 = _interopRequireDefault(_SelectField);
+
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -415,6 +419,7 @@ var PageHome = function (_React$Component) {
             jumpShortMessage: '0',
             backShortMessage: '0',
             addlotsShortMessage: '0',
+            handleInvalidShortMessage: '0',
             sysSMSsetting: '0',
             newspyj: {},
             spyj: newComment,
@@ -427,7 +432,11 @@ var PageHome = function (_React$Component) {
             mobileFlowChar: '0', //是否开启流程图  1开启 0禁用
             readScopeId: '',
             readScopeList: [],
-            isRemoveCommentFormHtml: '0' //是否隐藏无数据的批示意见  1隐藏  
+            isRemoveCommentFormHtml: '0', //是否隐藏无数据的批示意见  1隐藏  
+            allActivity: [], //所有环节名称
+            designActivity: '', //选择的提醒环节id
+            processData: '1', //1 保留流程数据，2清除已办数据
+            processDataList: []
         };
         FlowCommon = require('pages/flow_common/' + module).default ? require('pages/flow_common/' + module).default : require('pages/flow_common/' + module);
 
@@ -441,7 +450,10 @@ var PageHome = function (_React$Component) {
         param.nextActivityName = '';
         param.backAttachId = ""; //退回增加附件
         param.backInitList = [];
-        param.dealReminderContent = [];
+        param.allActivity = [];
+        param.designActivity = '';
+        param.processData = '1';
+        param.processDataList = [];
         _this.state = param;
         var t = _this;
         var key = "";
@@ -857,7 +869,8 @@ var PageHome = function (_React$Component) {
                             circulateShortMessage: '1,2',
                             transferShortMessage: '1,2',
                             jumpShortMessage: '1,2',
-                            backShortMessage: '1,2'
+                            backShortMessage: '1,2',
+                            handleInvalidShortMessage: '1,2'
                         });
                     } else if (sysSMSsetting && sysSMSsetting == '2') {
                         t.setState({
@@ -865,7 +878,8 @@ var PageHome = function (_React$Component) {
                             circulateShortMessage: '1',
                             transferShortMessage: '1',
                             jumpShortMessage: '1',
-                            backShortMessage: '1'
+                            backShortMessage: '1',
+                            handleInvalidShortMessage: '1'
                         });
                     } else if (evoRemind && evoRemind == '2') {
                         t.setState({
@@ -873,7 +887,8 @@ var PageHome = function (_React$Component) {
                             circulateShortMessage: '2',
                             transferShortMessage: '2',
                             jumpShortMessage: '2',
-                            backShortMessage: '2'
+                            backShortMessage: '2',
+                            handleInvalidShortMessage: '2'
                         });
                     } else {
                         t.setState({
@@ -881,7 +896,8 @@ var PageHome = function (_React$Component) {
                             circulateShortMessage: '0',
                             transferShortMessage: '0',
                             jumpShortMessage: '0',
-                            backShortMessage: '0'
+                            backShortMessage: '0',
+                            handleInvalidShortMessage: '0'
                         });
                     }
 
@@ -1459,7 +1475,7 @@ var PageHome = function (_React$Component) {
                 for (var b = 0; b < buttonArray.length; b++) {
                     var buttonCode = buttonArray[b];
                     //PAGE_SAVE保存按钮只有当新建时才有，HELP_ADDLOTS加签只有在会签和串签才有,RADOM_FINISH随机流程完成按钮去掉
-                    if (buttonCode == 'OTHER_RELATION' || 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')) {
+                    if (buttonCode == 'OTHER_RELATION' || 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 (isStart == true && permissionCode == 'start' || isDraft == '1') {
@@ -2731,7 +2747,44 @@ var PageHome = function (_React$Component) {
                 this.handleEnd();
             } else if (operate == 9) {
                 //作废
-                this.handleInvalid();
+
+                _db2.default.FlowModuleAPI.getAllActivity({
+                    processInstanceId: t.state.processInstanceId
+                }).then(function (content) {
+                    var allActivity = content;
+                    if (allActivity != null && allActivity != '' && allActivity.length > 0) {
+                        var selectOptions = [];
+                        allActivity.map(function (item, index) {
+                            var option = {};
+                            option.value = item.id;
+                            option.text = item.name;
+                            option.disable = false;
+                            if (index == 0) {
+                                option.checked = true;
+                            } else {
+                                option.checked = false;
+                            }
+                            option.name = item.name;
+
+                            selectOptions.push(option);
+                        });
+
+                        var processDataList = [{ value: '1', name: '保留', disable: false, checked: true, text: '保留' }, { value: '2', name: '清除', disable: false, checked: false, text: '清除(已办人的已办记录)' }];
+                        t.setState({
+                            allActivity: selectOptions, //所有环节名称
+                            designActivity: selectOptions[0].value, //选择的提醒环节id
+                            processDataList: processDataList,
+                            processDataListDefault: processDataList[0],
+                            processData: '1', //1 保留流程数据，2清除已办数据
+                            operate: operate,
+                            pageStatus: '1'
+                        }, function () {
+                            $(window).scrollTop(0);
+                        });
+                    }
+                }).catch(function (error) {
+                    console.error(error);
+                });
             } else if (operate == 10) {
                 //完成
                 this.handleFinish();
@@ -3516,6 +3569,9 @@ var PageHome = function (_React$Component) {
             } else if (operate == 5) {
                 //跳转
                 this.jump();
+            } else if (operate == 9) {
+                //作废
+                this.handleInvalid();
             } else if (operate == 10) {
                 //随机节点结束
                 var editFormData = this.state.editFormData;
@@ -4520,7 +4576,48 @@ var PageHome = function (_React$Component) {
                 t.sendFlow(param);
             }
         }
-
+    }, {
+        key: 'selectProcessDataListChange',
+        value: function selectProcessDataListChange(value) {
+            var processDataList = this.state.processDataList;
+            var processDataListDefault = {};
+            for (var i = 0; i < processDataList.length; i++) {
+                if (processDataList[i].value == value.value) {
+                    processDataListDefault = processDataList[i];
+                }
+            }
+            this.setState({
+                processData: value.value,
+                processDataListDefault: processDataListDefault
+            });
+        }
+    }, {
+        key: 'selectDesignActivityChange',
+        value: function selectDesignActivityChange(data) {
+            var designActivity = '';
+            for (var i = 0; i < data.length; i++) {
+                if (data[i].value != '') {
+                    designActivity += ',' + data[i].value;
+                }
+            }
+            if (designActivity != '') {
+                designActivity = designActivity.substring(1);
+            }
+            this.setState({
+                designActivity: designActivity
+            });
+        }
+    }, {
+        key: 'changHandleInvalidShortMessage',
+        value: function changHandleInvalidShortMessage(data) {
+            var newremindStyle = "";
+            for (var i = 0; i < data.length; i++) {
+                if (i == data.length - 1) newremindStyle += data[i].value;else newremindStyle += data[i].value + ',';
+            }
+            this.setState({
+                handleInvalidShortMessage: newremindStyle
+            });
+        }
         //作废流程
 
     }, {
@@ -4529,21 +4626,16 @@ var PageHome = function (_React$Component) {
             var t = this;
             var isPush = t.state.isPush;
             var db = _db2.default;
-            // Dialog.confirm({
-            //     locale: 'zh_CN',
-            //     title: '提示',
-            //     content: '是否要'+t.state.finalButtons.get("BASE_INVALID")+'审批？',
-            //     onConfirm() {
 
-            //     },
-            //     onCancel() {
-            //       console.log('confirm cancel');
-            //     },
-            //   });
             db.FlowModuleAPI.cancelProcess({
                 taskId: t.state.taskId,
                 processInstanceId: t.state.processInstanceId,
                 module: t.state.module,
+                designActivity: t.state.designActivity,
+                reminders: t.state.handleInvalidShortMessage,
+                dataId: t.state.dataId,
+                formId: t.state.formId,
+                processData: t.state.processData,
                 permissionCode: t.state.permissionCode
             }).then(function (content) {
                 _Toast2.default.show({
@@ -4633,8 +4725,8 @@ var PageHome = function (_React$Component) {
             }
             var shortMessage = '0';
             var transferShortMessage = t.state.transferShortMessage;
-            if (transferShortMessage.length > 0) {
-                shortMessage = transferShortMessage[0].value;
+            if (transferShortMessage) {
+                shortMessage = transferShortMessage;
             }
             var automaticReturn = '0';
             var transferReturn = t.state.transferReturn;
@@ -4794,8 +4886,8 @@ var PageHome = function (_React$Component) {
             }
             var shortMessage = '0';
             var addlotsShortMessage = t.state.addlotsShortMessage;
-            if (addlotsShortMessage.length > 0) {
-                shortMessage = addlotsShortMessage[0].value;
+            if (addlotsShortMessage) {
+                shortMessage = addlotsShortMessage;
             }
             // Dialog.confirm({
             //     locale: 'zh_CN',
@@ -5032,8 +5124,8 @@ var PageHome = function (_React$Component) {
             }
             var shortMessage = '0';
             var circulateShortMessage = t.state.circulateShortMessage;
-            if (circulateShortMessage.length > 0) {
-                shortMessage = circulateShortMessage[0].value;
+            if (circulateShortMessage) {
+                shortMessage = circulateShortMessage;
             }
             // Dialog.confirm({
             //     locale: 'zh_CN',
@@ -5290,8 +5382,8 @@ var PageHome = function (_React$Component) {
             var selectedActivity = '[{"id":"' + selectJumpActivity.value + '","name":"' + selectJumpActivity.content + '","participants":"' + assignId + '","participantNames":"' + assignName + '"}]';
             var shortMessage = '0';
             var jumpShortMessage = t.state.jumpShortMessage;
-            if (jumpShortMessage.length > 0) {
-                shortMessage = jumpShortMessage[0].value;
+            if (jumpShortMessage) {
+                shortMessage = jumpShortMessage;
             }
             var param = {
                 formId: t.state.formId,
@@ -5579,7 +5671,7 @@ var PageHome = function (_React$Component) {
                                 } else if (buttonCode == 'BASE_END') {
                                     buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 8 });
                                 } else if (buttonCode == 'BASE_INVALID') {
-                                    buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 9 });
+                                    buttonCodeListNew.push({ name: buttonName, type: 'danger', display: 'inline', no: 9 });
                                 } else if (buttonCode == 'HELP_DISTRIBUTE') {
                                     buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 'distributeFlow' });
                                 } else if (buttonCode == 'MAILSEND') {
@@ -5635,7 +5727,7 @@ var PageHome = function (_React$Component) {
                             } else if (buttonCode == 'BASE_END') {
                                 buttonList.push({ name: buttonName, type: 'secondary', display: 'inline', no: 8 });
                             } else if (buttonCode == 'BASE_INVALID') {
-                                buttonList.push({ name: buttonName, type: 'secondary', display: 'inline', no: 9 });
+                                buttonList.push({ name: buttonName, type: 'danger', display: 'inline', no: 9 });
                             } else if (buttonCode == 'HELP_DISTRIBUTE') {
                                 buttonList.push({ name: buttonName, type: 'secondary', display: 'inline', no: 'distributeFlow' });
                             } else if (buttonCode == 'HELP_FORWARD') {
@@ -6387,8 +6479,12 @@ var PageHome = function (_React$Component) {
     }, {
         key: 'changeTransferShortMessage',
         value: function changeTransferShortMessage(data) {
+            var newremindStyle = "";
+            for (var i = 0; i < data.length; i++) {
+                if (i == data.length - 1) newremindStyle += data[i].value;else newremindStyle += data[i].value + ',';
+            }
             this.setState({
-                transferShortMessage: data
+                transferShortMessage: newremindStyle
             });
         }
     }, {
@@ -6405,15 +6501,23 @@ var PageHome = function (_React$Component) {
     }, {
         key: 'changeJumpShortMessage',
         value: function changeJumpShortMessage(data) {
+            var newremindStyle = "";
+            for (var i = 0; i < data.length; i++) {
+                if (i == data.length - 1) newremindStyle += data[i].value;else newremindStyle += data[i].value + ',';
+            }
             this.setState({
-                jumpShortMessage: data
+                jumpShortMessage: newremindStyle
             });
         }
     }, {
         key: 'changeBackShortMessage',
         value: function changeBackShortMessage(data) {
+            var newremindStyle = "";
+            for (var i = 0; i < data.length; i++) {
+                if (i == data.length - 1) newremindStyle += data[i].value;else newremindStyle += data[i].value + ',';
+            }
             this.setState({
-                backShortMessage: data
+                backShortMessage: newremindStyle
             });
         }
     }, {
@@ -6430,8 +6534,12 @@ var PageHome = function (_React$Component) {
     }, {
         key: 'changeAddlotsShortMessage',
         value: function changeAddlotsShortMessage(data) {
+            var newremindStyle = "";
+            for (var i = 0; i < data.length; i++) {
+                if (i == data.length - 1) newremindStyle += data[i].value;else newremindStyle += data[i].value + ',';
+            }
             this.setState({
-                addlotsShortMessage: data
+                addlotsShortMessage: newremindStyle
             });
         }
 
@@ -7401,6 +7509,43 @@ var PageHome = function (_React$Component) {
                             value: this.state.sendMailText,
                             onChange: this.changeSendMailText.bind(this) })
                     ),
+                    _react2.default.createElement(
+                        _Group2.default.List,
+                        { className: this.state.operate == 9 ? '' : 't-DN' },
+                        _react2.default.createElement(
+                            'div',
+                            { style: { background: '#f2f3f5', padding: '10px 5px' } },
+                            _react2.default.createElement(
+                                'span',
+                                { className: 'theme-color' },
+                                _react2.default.createElement('i', { className: 'iconfont icon-back t-rotate-180 t-FS14 t-FR' }),
+                                '\u4F5C\u5E9F\u73AF\u8282'
+                            )
+                        ),
+                        _react2.default.createElement(_SelectField2.default, {
+                            className: 't-W100',
+                            required: true,
+                            label: "流程数据",
+                            readOnly: false,
+                            options: this.state.processDataList,
+                            onSelect: this.selectProcessDataListChange.bind(this),
+                            value: this.state.processDataListDefault
+                        }),
+                        _react2.default.createElement(_CheckboxField2.default, {
+                            className: 't-W100',
+                            required: true,
+                            label: "提醒对象",
+                            readOnly: false,
+                            data: this.state.allActivity,
+                            onChange: this.selectDesignActivityChange.bind(this)
+                        }),
+                        _react2.default.createElement(_CheckboxField2.default, {
+                            data: this.state.shortMessageList,
+                            className: '',
+                            mode: 'list',
+                            onChange: this.changHandleInvalidShortMessage.bind(this),
+                            required: false })
+                    ),
                     _react2.default.createElement(
                         'div',
                         { className: 't-P0 t-bottom-fixed' },

package/package.json

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