fmui-base 2.2.30 → 2.2.31

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish
 
 ## 更新日志 
+- 2.2.31: 移动端结束流程修改，下拉字段支持计算，下拉多选支持联动
 - 2.2.30: 加签自动返回
 - 2.2.29: 关联表批示意见渲染
 - 2.2.28: 表单组件支持单独渲染

package/lib/form/form.js

@@ -1413,6 +1413,7 @@ var PageHome = function (_React$Component) {
       }
       itemParam = t.dealwithLinkField(itemParam, data, status);
       itemParam = t.dealwithRelaField(itemParam, allForm);
+
       if (itemType != 'weboffice') {
         itemParam.value = value;
         //处理特有按钮事件
@@ -1704,11 +1705,20 @@ var PageHome = function (_React$Component) {
             if (item.triggerTblName == mainTblName) {
               mainTblData.map(function (mainTblDataItem) {
                 if (item.triggerFieldName == mainTblDataItem.key) {
+                  var nowValue = mainTblDataItem.value;
+                  if (nowValue && nowValue.indexOf("[") >= 0 && nowValue.indexOf("]") >= 0) {
+                    var nowValueArray = JSON.parse(nowValue);
+                    if (nowValueArray.length == 1) {
+                      nowValue = nowValueArray[0];
+                    } else {
+                      nowValue = nowValueArray.join(",");
+                    }
+                  }
                   // if(item.triggerFieldVal == mainTblDataItem.value){
                   var editType = item.editType;
                   if (editType == 'hide' || editType == 'rowhide') {
                     // relaFieldMap["key"]="isHidden";
-                    if (item.triggerFieldVal == mainTblDataItem.value) {
+                    if (item.triggerFieldVal == nowValue || nowValue.split(',').indexOf(item.triggerFieldVal) != -1) {
                       itemParam.isHidden = true;
                       defaulthideFields.push(itemParam.uniqueName);
                       console.log("true====" + itemParam.uniqueName);
@@ -1721,7 +1731,7 @@ var PageHome = function (_React$Component) {
                   } else if (editType == 'must') {
                     // relaFieldMap["key"]="required";
                     var triggerFieldValBoolean = false;
-                    if (item.triggerFieldVal == mainTblDataItem.value) {
+                    if (item.triggerFieldVal == nowValue || nowValue.split(',').indexOf(item.triggerFieldVal) != -1) {
                       itemParam.required = true;
                       triggerFieldValBoolean = true;
                     } else {
@@ -1738,7 +1748,7 @@ var PageHome = function (_React$Component) {
                       mainTblDataItem.required = triggerFieldValBoolean;
                     }
                   } else if (editType == 'edit') {
-                    if (item.triggerFieldVal == mainTblDataItem.value) {
+                    if (item.triggerFieldVal == nowValue || nowValue.split(',').indexOf(item.triggerFieldVal) != -1) {
                       itemParam.readOnly = false;
                     } else {
                       itemParam.readOnly = true;
@@ -1755,10 +1765,20 @@ var PageHome = function (_React$Component) {
                   subTblData.map(function (mainTblDataItem) {
                     if (item.triggerFieldName == mainTblDataItem.itemCode) {
                       // if(item.triggerFieldVal == mainTblDataItem.value){
+                      var nowValue = mainTblDataItem.value;
+                      if (nowValue && nowValue.indexOf("[") >= 0 && nowValue.indexOf("]") >= 0) {
+                        var nowValueArray = JSON.parse(nowValue);
+                        if (nowValueArray.length == 1) {
+                          nowValue = nowValueArray[0];
+                        } else {
+                          nowValue = nowValueArray.join(",");
+                        }
+                      }
+
                       var editType = item.editType;
                       if (editType == 'hide' || editType == 'rowhide') {
                         // relaFieldMap["key"]="isHidden";
-                        if (item.triggerFieldVal == mainTblDataItem.value) {
+                        if (item.triggerFieldVal == nowValue || nowValue.split(',').indexOf(item.triggerFieldVal) != -1) {
                           itemParam.isHidden = true;
                         } else {
                           itemParam.isHidden = false;
@@ -1766,7 +1786,7 @@ var PageHome = function (_React$Component) {
                       } else if (editType == 'must') {
                         // relaFieldMap["key"]="required";
                         var triggerFieldValBoolean = false;
-                        if (item.triggerFieldVal == mainTblDataItem.value) {
+                        if (item.triggerFieldVal == nowValue || nowValue.split(',').indexOf(item.triggerFieldVal) != -1) {
                           itemParam.required = true;
                           triggerFieldValBoolean = true;
                         } else {
@@ -1783,7 +1803,7 @@ var PageHome = function (_React$Component) {
                           mainTblDataItem.required = triggerFieldValBoolean;
                         }
                       } else if (editType == 'edit') {
-                        if (item.triggerFieldVal == mainTblDataItem.value) {
+                        if (item.triggerFieldVal == nowValue || nowValue.split(',').indexOf(item.triggerFieldVal) != -1) {
                           itemParam.readOnly = false;
                         } else {
                           itemParam.readOnly = true;
@@ -1878,6 +1898,10 @@ var PageHome = function (_React$Component) {
             }
           } else {
             itemParam[key] = itemNew[i].value;
+            //隐藏时取消必填
+            if (key == 'isHidden' && itemNew[i].value) {
+              itemParam.required = false;
+            }
           }
         }
         this.setState({

package/lib/form/table.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = undefined;
 
+var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
 var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
 
 var _react = require('react');
@@ -445,7 +447,7 @@ var PageHome = function (_React$Component) {
 					});
 				}
 				var uniqueName = itemParam.uniqueName;
-				if (itemParam.itemType == 'text' || itemParam.itemType == 'datetime' || itemParam.itemType == 'detail') {
+				if (itemParam.itemType == 'text' || itemParam.itemType == 'datetime' || itemParam.itemType == 'detail' || itemParam.itemType == 'select' || itemParam.itemType == 'radio') {
 					//当等于单行文本或者时间时
 					this.forCalculateExpList(data, itemParam, uniqueName);
 					if (data.subCalculateExpList) {
@@ -943,12 +945,14 @@ var PageHome = function (_React$Component) {
 								var nowValueArray = JSON.parse(nowValue);
 								if (nowValueArray.length == 1) {
 									nowValue = nowValueArray[0];
+								} else {
+									nowValue = nowValueArray.join(",");
 								}
 							}
 							var relaFieldMap = {};
 							if (editType == 'hide' || editType == 'rowhide') {
 								relaFieldMap["key"] = "isHidden";
-								if (triggerFieldVal == nowValue) {
+								if (triggerFieldVal == nowValue || nowValue.split(',').indexOf(triggerFieldVal) != -1) {
 									relaFieldMap["value"] = true;
 									hideFlag = true;
 									hideFields.push(relaFieldTblNameArrayItem);
@@ -961,10 +965,41 @@ var PageHome = function (_React$Component) {
 								} else {
 									relaFieldMap["value"] = false;
 								}
+
+								if (relaFieldMap["value"]) {
+									//如果隐藏 则不必填
+									var relaFieldNameArray = formRelaFieldMapsObjItem.relaFieldTblName.split(",");
+									for (var i = 0; i < mainTblData.length; i++) {
+										var item = mainTblData[i];
+										if (mainTblName + "_" + item.key == relaFieldNameArray[index]) {
+											item.required = false;
+										}
+									}
+									for (var i = 0; i < subTbl.length; i++) {
+										var subTblData = subTbl[i].subTblData;
+										if (isNowSub) {
+											var subTblDataItem = subTblData[thisSubTblNo];
+											for (var b = 0; b < subTblDataItem.length; b++) {
+												if (subTblDataItem[b].uniqueName == relaFieldNameArray[index]) {
+													subTbl[i].subTblData[thisSubTblNo][b].required = false;
+												}
+											}
+										} else {
+											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 = false;
+													}
+												}
+											}
+										}
+									}
+								}
 							} else if (editType == 'must') {
 								relaFieldMap["key"] = "required";
 								var triggerFieldValBoolean = mustFlag;
-								if (triggerFieldVal == nowValue) {
+								if (triggerFieldVal == nowValue || nowValue.split(',').indexOf(triggerFieldVal) != -1) {
 									relaFieldMap["value"] = true;
 									triggerFieldValBoolean = true;
 									mustFlag = true;
@@ -976,6 +1011,9 @@ var PageHome = function (_React$Component) {
 								} else {
 									relaFieldMap["value"] = true;
 								}
+								if (hideFlag) {
+									relaFieldMap["value"] = false;
+								}
 								var relaFieldNameArray = formRelaFieldMapsObjItem.relaFieldTblName.split(",");
 								for (var i = 0; i < mainTblData.length; i++) {
 									var item = mainTblData[i];
@@ -1005,7 +1043,7 @@ var PageHome = function (_React$Component) {
 								}
 							} else if (editType == 'edit') {
 								relaFieldMap["key"] = "readOnly";
-								if (triggerFieldVal == nowValue && defaultshowFields.indexOf(relaFieldTblNameArrayItem) != -1) {
+								if ((triggerFieldVal == nowValue || nowValue.split(',').indexOf(triggerFieldVal) != -1) && defaultshowFields.indexOf(relaFieldTblNameArrayItem) != -1) {
 									relaFieldMap["value"] = false;
 									editFlag = true;
 								} else if (!editFlag && defaultshowFields.indexOf(relaFieldTblNameArrayItem) != -1) {
@@ -1053,6 +1091,7 @@ var PageHome = function (_React$Component) {
 								}
 							}
 							if (isSubField) {} else {
+
 								t.refs[relaFieldTblNameArrayItem].reloadItemParam([relaFieldMap]);
 							}
 						}
@@ -1105,7 +1144,11 @@ var PageHome = function (_React$Component) {
 										}
 									} else {
 										fieldItemArray.push(fieldItem);
-										filedItemValue = fieldItem.value;
+										if (_typeof(fieldItem.value) == 'object' && fieldItem.value != null) {
+											filedItemValue = fieldItem.value.value;
+										} else {
+											filedItemValue = fieldItem.value;
+										}
 									}
 
 									if (itemParam.itemType == 'datetime') {
@@ -1271,7 +1314,11 @@ var PageHome = function (_React$Component) {
 										}
 									} else {
 										fieldItemArray.push(fieldItem);
-										filedItemValue = fieldItem.value;
+										if (_typeof(fieldItem.value) == 'object' && fieldItem.value != null) {
+											filedItemValue = fieldItem.value.value;
+										} else {
+											filedItemValue = fieldItem.value;
+										}
 									}
 
 									if (itemParam.itemType == 'datetime') {

package/lib/process_info/processInfo.js

@@ -437,6 +437,7 @@ var PageHome = function (_React$Component) {
             backShortMessage: '0',
             addlotsShortMessage: '0',
             handleInvalidShortMessage: '0',
+            endShortMessage: '0',
             sysSMSsetting: '0',
             newspyj: {},
             spyj: newComment,
@@ -478,6 +479,8 @@ var PageHome = function (_React$Component) {
         param.backAttachId = ""; //退回增加附件
         param.backInitList = [];
         param.allActivity = [];
+        param.designActivityEnd = '';
+        param.allActivityEnd = [];
         param.designActivity = '';
         param.processData = '1';
         param.processDataList = [];
@@ -960,7 +963,8 @@ var PageHome = function (_React$Component) {
                             transferShortMessage: '1,2',
                             jumpShortMessage: '1,2',
                             backShortMessage: '1,2',
-                            handleInvalidShortMessage: '1,2'
+                            handleInvalidShortMessage: '1,2',
+                            endShortMessage: '1,2'
                         });
                     } else if (sysSMSsetting && sysSMSsetting == '2') {
                         t.setState({
@@ -969,7 +973,8 @@ var PageHome = function (_React$Component) {
                             transferShortMessage: '1',
                             jumpShortMessage: '1',
                             backShortMessage: '1',
-                            handleInvalidShortMessage: '1'
+                            handleInvalidShortMessage: '1',
+                            endShortMessage: '1'
                         });
                     } else if (evoRemind && evoRemind == '2') {
                         t.setState({
@@ -978,7 +983,8 @@ var PageHome = function (_React$Component) {
                             transferShortMessage: '2',
                             jumpShortMessage: '2',
                             backShortMessage: '2',
-                            handleInvalidShortMessage: '2'
+                            handleInvalidShortMessage: '2',
+                            endShortMessage: '2'
                         });
                     } else {
                         t.setState({
@@ -987,7 +993,8 @@ var PageHome = function (_React$Component) {
                             transferShortMessage: '0',
                             jumpShortMessage: '0',
                             backShortMessage: '0',
-                            handleInvalidShortMessage: '0'
+                            handleInvalidShortMessage: '0',
+                            endShortMessage: '0'
                         });
                     }
 
@@ -3030,7 +3037,42 @@ var PageHome = function (_React$Component) {
                 this.recallClick();
             } else if (operate == 8) {
                 //结束
-                this.handleEnd();
+
+                _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);
+                        });
+                        t.setState({
+                            allActivityEnd: selectOptions, //所有环节名称
+                            designActivityEnd: selectOptions[0].value, //选择的提醒环节id
+                            operate: operate,
+                            endReason: '',
+                            pageStatus: '1'
+                        }, function () {
+                            $(window).scrollTop(0);
+                        });
+                    }
+                }).catch(function (error) {
+                    console.error(error);
+                });
+
+                // this.handleEnd();
             } else if (operate == 9) {
                 //作废
 
@@ -3951,6 +3993,9 @@ var PageHome = function (_React$Component) {
             } else if (operate == 5) {
                 //跳转
                 this.jump();
+            } else if (operate == 8) {
+                //结束
+                this.handleEnd();
             } else if (operate == 9) {
                 //作废
                 this.handleInvalid();
@@ -5119,22 +5164,23 @@ var PageHome = function (_React$Component) {
             var isPush = t.state.isPush;
             var db = _db2.default;
 
-            // Dialog.confirm({
-            //     locale: 'zh_CN',
-            //     title: '提示',
-            //     content: '是否要'+t.state.finalButtons.get("BASE_END")+'审批？',
-            //     onConfirm() {
-
-            //     },
-            //     onCancel() {
-            //     console.log('confirm cancel');
-            //     },
-            // });
+            if (t.state.endReason == null || t.state.endReason.trim() == '') {
+                _Toast2.default.show({
+                    type: 'error',
+                    content: '结束原因不能为空'
+                });
+                return false;
+            }
             db.FlowModuleAPI.forceEnd({
                 taskId: t.state.taskId,
+                dataId: t.state.dataId,
+                formId: t.state.formId,
                 processInstanceId: t.state.processInstanceId,
                 module: t.state.module,
-                permissionCode: t.state.permissionCode
+                permissionCode: t.state.permissionCode,
+                designActivity: t.state.designActivityEnd,
+                reminders: t.state.endShortMessage,
+                endReason: t.state.endReason
             }).then(function (content) {
                 _Toast2.default.show({
                     type: 'success',
@@ -5227,6 +5273,33 @@ var PageHome = function (_React$Component) {
                 t.sendFlow(param);
             }
         }
+    }, {
+        key: 'selectEndActivityChange',
+        value: function selectEndActivityChange(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({
+                designActivityEnd: designActivity
+            });
+        }
+    }, {
+        key: 'changEndShortMessage',
+        value: function changEndShortMessage(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({
+                endShortMessage: newremindStyle
+            });
+        }
     }, {
         key: 'selectProcessDataListChange',
         value: function selectProcessDataListChange(value) {
@@ -6886,6 +6959,27 @@ var PageHome = function (_React$Component) {
             });
         }
 
+        //结束
+
+    }, {
+        key: 'changeEndReasonText',
+        value: function changeEndReasonText(newValue) {
+            var regRule = /(\ud83c[\udf00-\udfff])|(\ud83d[\udc00-\ude4f\ude80-\udeff])|[\u2600-\u2B55]/g;
+            if (newValue.match(regRule)) {
+                _Toast2.default.show({
+                    type: 'error',
+                    content: '请输入非表情字符'
+                });
+                return false;
+            }
+            if (newValue.length > 50) {
+                newValue = newValue.substring(0, 50);
+            }
+            this.setState({
+                endReason: newValue
+            });
+        }
+
         /**
         * 取消操作
         **/
@@ -8302,6 +8396,42 @@ var PageHome = function (_React$Component) {
                             value: this.state.sendMailText,
                             onChange: this.changeSendMailText.bind(this) })
                     ),
+                    _react2.default.createElement(
+                        _Group2.default.List,
+                        { className: this.state.operate == 8 ? '' : '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(_TextareaField2.default, {
+                            readOnly: false,
+                            label: '结束原因',
+                            required: true,
+                            minRows: 3, maxRows: 6,
+                            placeholder: '请输入结束原因',
+                            value: this.state.endReason,
+                            onChange: this.changeEndReasonText.bind(this) }),
+                        _react2.default.createElement(_CheckboxField2.default, {
+                            className: 't-W100',
+                            required: false,
+                            label: "提醒对象",
+                            readOnly: false,
+                            data: this.state.allActivityEnd,
+                            onChange: this.selectEndActivityChange.bind(this)
+                        }),
+                        _react2.default.createElement(_CheckboxField2.default, {
+                            data: this.state.shortMessageList,
+                            className: '',
+                            mode: 'list',
+                            onChange: this.changEndShortMessage.bind(this),
+                            required: false })
+                    ),
                     _react2.default.createElement(
                         _Group2.default.List,
                         { className: this.state.operate == 9 ? '' : 't-DN' },

package/package.json

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