fmui-base 2.2.92 → 2.2.94

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.2.94：流程办理回调时的type不准确问题修复
+- 2.2.93：表单关联字段重构兼容老版本接口
 - 2.2.92：选人组件页签用户改成组织
 - 2.2.91：流程办理按钮名称要与办理弹窗标题同步
 - 2.2.90：表单时间字段偶发保存成时间戳

package/lib/form/table.js

@@ -198,12 +198,16 @@ var PageHome = function (_React$Component) {
 				success: function success(data) {
 					if (data.code == "0") {
 						var responseData = data.data || {};
-						// 移动端新结构：triggerFieldsMap 按触发字段分组；relaFieldsMap 按关联字段分组且保留全局优先级
+						// 兼容新老接口：新结构 {triggerFieldsMap,relaFieldsMap}；老结构直接为按触发字段分组的 Map
 						if (responseData.triggerFieldsMap) {
 							formRelaFieldMaps = responseData.triggerFieldsMap;
-							formRelaFieldMapsNew = responseData.relaFieldsMap || {};
+							formRelaFieldMapsNew = responseData.relaFieldsMap;
 						} else {
 							formRelaFieldMaps = responseData;
+							formRelaFieldMapsNew = null;
+						}
+						// 老接口或新接口未返回 relaFieldsMap 时，前端按 sortNo 本地转换，保证联动逻辑一致
+						if (!formRelaFieldMapsNew || Object.keys(formRelaFieldMapsNew).length === 0) {
 							formRelaFieldMapsNew = buildFormRelaFieldMapsByRelaField(formRelaFieldMaps);
 						}
 					}
@@ -818,7 +822,8 @@ var PageHome = function (_React$Component) {
 					}
 
 					//关联字段刷新（silent 模式，不向上触发 onChange）
-					if (t.state.formRelaFieldMaps) {
+					var hasRelaFieldsMap = t.state.formRelaFieldMaps && Object.keys(t.state.formRelaFieldMaps).length > 0;
+					if (hasRelaFieldsMap) {
 						var isSubTrigger = typeof subTblNo != 'undefined' && itemParam.tableName != data.mainTblName;
 						t._isRelaFieldRefreshing = true;
 						try {
@@ -910,7 +915,7 @@ var PageHome = function (_React$Component) {
 			var data = t.props.data;
 			t._isRelaFieldRefreshing = true;
 			try {
-				if (t.state.formRelaFieldMaps) {
+				if (t.state.formRelaFieldMaps && Object.keys(t.state.formRelaFieldMaps).length > 0) {
 					t.refreshAllRelaFieldsByRelaMap(data);
 				} else if (formRelaFieldMaps) {
 					var _iteratorNormalCompletion2 = true;

package/lib/nvoice/nvoice.js

@@ -55,29 +55,13 @@ var Nvoice = function (_React$Component) {
         var _this = _possibleConstructorReturn(this, (Nvoice.__proto__ || Object.getPrototypeOf(Nvoice)).call(this, props));
 
         _this.initFn = function (id) {
-            var invoicedata = [{
-                "invoicestatus": "1",
-                "invoicename": "天津增值税普通发票",
-                "invoicestate": "已验真",
-                "invoicefileInfo": "[{\"id\":\"2c93ab0c9a8164f2019a81a3717b0556\",\"dingSpaceId\":\"null\",\"url\":\"/attachment/download?fid=2c93ab0c9a8164f2019a81a3717b0556&chksum=75a39c299a3498218beae0c3d0a6acc1.2c93ab0c92888ecb019288cc7b59060c\",\"name\":\"房租发票.jpg\",\"checksum\":\"75a39c299a3498218beae0c3d0a6acc1.2c93ab0c92888ecb019288cc7b59060c\",\"fileExt\":\".jpg\",\"fileName\":\"a998196929944e97b33300ede8ad1fad.jpg\",\"relativePath\":\"form_invoice/202511\",\"secretLevel\":\"0\",\"size\":\"289801\"}]",
-                "invoicetype": "增值税普通发票",
-                "id": "2c93ab0c9a8164f2019a81a396880559",
-                "invoiceno": "01200200010500221591",
-                "invoicefileid": "2c93ab0c9a8164f2019a81a3717b0556",
-                "invoicedate": "20240308",
-                "invoiceamount": "16500.00"
-            }];
-            _this.setState({
-                invoicedata: invoicedata
-            });
 
             // 初始发票详情数据  
             _db2.default.form.getNoInvoiceList({
                 invoicedataid: id
             }).then(function (content) {
-                var invoicedata = content;
                 _this.setState({
-                    invoicedata: invoicedata
+                    invoicedata: content
                 });
             }).catch(function (error) {
                 console.error('获取详情数据失败', error);
@@ -135,11 +119,17 @@ var Nvoice = function (_React$Component) {
                         null,
                         this.state.invoicedata.map(function (item, index) {
                             var fileList = [];
-                            fileList = JSON.parse(item.invoicefileInfo);
+                            try {
+                                if (item.invoicefileInfo) {
+                                    fileList = JSON.parse(item.invoicefileInfo);
+                                }
+                            } catch (e) {
+                                console.error('发票附件解析失败', e);
+                            }
 
                             return _react2.default.createElement(
                                 'div',
-                                { key: item.id },
+                                { key: item.id, className: 't-MT2' },
                                 _react2.default.createElement(
                                     VBox,
                                     { className: 'nvoice-filetitle', hAlign: 'start' },
@@ -165,12 +155,13 @@ var Nvoice = function (_React$Component) {
                                     )
                                 ),
                                 _react2.default.createElement(_upload2.default, {
-                                    required: true,
-                                    canDel: true,
+                                    required: false,
+                                    canDel: false,
+                                    canPreview: true,
+                                    canDownload: true,
                                     initList: fileList,
-                                    dir: 'document',
-                                    limitNo: '0',
-                                    ref: 'upload'
+                                    dir: 'form_invoice',
+                                    ref: 'upload_invoice'
                                 })
                             );
                         })

package/lib/process_info/processInfo.js

@@ -2803,9 +2803,6 @@ var PageHome = function (_React$Component) {
                                     checkedItem.end = item.end;
                                     checkedItem.must = item.must;
                                     checkedItem.participants = participants;
-                                    if (item.end == true) {
-                                        isEnd = true;
-                                    }
                                     checkedItem.level = item.level;
                                     checkedItem.maxOutgoing = maxOutgoing;
                                     if (item.must == true && (maxOutgoing == 1 && checkActi == 0 || maxOutgoing == 0)) {
@@ -2849,6 +2846,7 @@ var PageHome = function (_React$Component) {
                                         //nextSelectType = 'radom';
                                     }
                                 }
+                                isEnd = t.getSelectedIsEnd(nextActivityList, nextRadomList);
 
                                 //紧急
                                 var _urgent = t.state.urgent;
@@ -4874,6 +4872,33 @@ var PageHome = function (_React$Component) {
                 t.saveForm(1);
             }, saveTime * 60 * 1000);
         }
+        //根据当前选中的后继/随机节点判断是否结束
+
+    }, {
+        key: 'getSelectedIsEnd',
+        value: function getSelectedIsEnd(nextActivityList, nextRadomList) {
+            var t = this;
+            var activityList = nextActivityList != null ? nextActivityList : t.state.nextActivityList || [];
+            var radomList = nextRadomList != null ? nextRadomList : t.state.nextRadomList || [];
+            for (var i = 0; i < activityList.length; i++) {
+                if (activityList[i].checked && activityList[i].end === true) {
+                    return true;
+                }
+            }
+            for (var j = 0; j < radomList.length; j++) {
+                var subList = radomList[j].subRandomList || [];
+                for (var k = 0; k < subList.length; k++) {
+                    if (subList[k].checked && subList[k].end === true) {
+                        return true;
+                    }
+                }
+            }
+            if (activityList.length === 0 && radomList.length === 0) {
+                return t.state.isEnd;
+            }
+            return false;
+        }
+
         //提交发送流程
 
     }, {
@@ -5017,8 +5042,8 @@ var PageHome = function (_React$Component) {
                     //是不是起始节点 或再次发起
                     type = 4;
                 }
-                if (t.state.isEnd) {
-                    //是不是结束节点
+                if (t.getSelectedIsEnd()) {
+                    //是不是结束节点（以实际选中节点为准）
                     type = 1;
                 }
                 var dataId = t.state.dataId;
@@ -7312,7 +7337,8 @@ var PageHome = function (_React$Component) {
 
                         this.setState({
                             nextActivityList: nextActivityList,
-                            nextRadomList: nextRadomListMain
+                            nextRadomList: nextRadomListMain,
+                            isEnd: this.getSelectedIsEnd(nextActivityList, nextRadomListMain)
                             //nextSelectType:type
                         });
                     } else {
@@ -7337,7 +7363,8 @@ var PageHome = function (_React$Component) {
                         }
                         this.setState({
                             nextActivityList: nextActivity,
-                            nextRadomList: nextRadomListMain
+                            nextRadomList: nextRadomListMain,
+                            isEnd: this.getSelectedIsEnd(nextActivity, nextRadomListMain)
                             //nextSelectType:type
                         });
                     }
@@ -7345,7 +7372,8 @@ var PageHome = function (_React$Component) {
                     if (type == 'next') {
                         //选的是后继节点
                         this.setState({
-                            nextActivityList: nextActivityList
+                            nextActivityList: nextActivityList,
+                            isEnd: this.getSelectedIsEnd(nextActivityList, this.state.nextRadomList)
                             //nextSelectType:type
                         });
                     } else {
@@ -7353,7 +7381,8 @@ var PageHome = function (_React$Component) {
                         var nextRadomListMain = this.state.nextRadomList;
                         nextRadomListMain[n].subRandomList = nextActivityList;
                         this.setState({
-                            nextRadomList: nextRadomListMain
+                            nextRadomList: nextRadomListMain,
+                            isEnd: this.getSelectedIsEnd(this.state.nextActivityList, nextRadomListMain)
                             //nextSelectType:type
                         });
                     }

package/lib/tblform/FlowCommentPane.js

@@ -49,8 +49,8 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; } /**
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                * 流程批示意见区块（默认意见、退回意见等），与 TblForm 纯表单分离使用
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; } /**
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                * 流程批示意见区块（默认意见、退回意见等），与 TblForm 纯表单分离使用
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 */
 
 

package/package.json

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

package/lib/css/processList.css

@@ -1,8 +0,0 @@
-.searchActive .t-search-bar-holder {
-  left: 0;
-  -webkit-transform: translate3d(0, 0, 0);
-  transform: translate3d(0, 0, 0);
-}
-.t-mask {
-  display: none;
-}