fmui-base 2.3.59 → 2.3.61

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.3.61：移动端流程提交时过滤主键无效参数，如null字符串
+- 2.3.60：移动端支持减签
 - 2.3.59：移动端不通过的流程允许作废，移动端支持关联流程
 - 2.3.58：移动端数据表设置字段的关联值支持用户岗位
 - 2.3.57：移动端自动通过返回后打开表单报错

package/lib/db/db.js

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

package/lib/db/variables.js

@@ -92,6 +92,8 @@ exports.default = {
         queryFlowChart: approveUrlPrefix + "queryFlowChart" + '?', //查找流程记录
         getFlowImage: approveUrlPrefix + "getFlowImage" + '?token=' + getLoginUserInfo().token + "&processInstanceId=", //查找流程图片
         addSign: approveUrlPrefix + "addSign" + '?', //加签
+        getSignUserList: approveUrlPrefix + "getSignUserList" + '?', //减签用户列表
+        reduceSign: approveUrlPrefix + "reduceSign" + '?', //减签
         getCanJumpActivity: approveUrlPrefix + "getCanJumpActivity" + '?', //跳转流程
         jump: approveUrlPrefix + "jump" + '?', //跳转
         getDoneTaskListByProcessId: approveUrlPrefix + "getDoneTaskListByProcessId" + '?', //根据流程实例id查询已办

package/lib/form/filterEmptySubTblRows.js

@@ -6,10 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 
 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; };
 
+exports.isValidFormDataId = isValidFormDataId;
 exports.cloneAndFilterEmptySubTblRows = cloneAndFilterEmptySubTblRows;
 /**
- * 子表空行过滤（提交用）：UI 仍可留空行，仅从提交数据中去掉业务全空行。
- * 系统字段忽略；0/false 有值；宏回填有值则保留。
+ * 子表空行过滤 + 提交 formData 精简（对齐 PC runtimeUtil.getInputData）：
+ * - UI 仍可留空行，仅从提交数据中去掉业务全空行
+ * - 去掉 formItem / linkFields 等仅前端渲染用的大字段
+ * - 字段项只保留 key / value（与 PC、后端 KeyValueDto 一致）
  */
 
 var SUB_TBL_SYS_FIELDS = {
@@ -29,6 +32,27 @@ var SUB_TBL_SYS_FIELDS = {
   sort_no: true
 };
 
+/** 提交时从 formData 顶层去掉的前端元数据（PC getInputData 不携带） */
+var SUBMIT_STRIP_TOP_KEYS = {
+  formItem: true,
+  linkFields: true
+};
+
+/**
+ * 是否为可用的主表 dataId（排除 null / "null" / "undefined" / 空串）
+ * 后端 optlock 校验：已传 optlock 但 dataId 无效会直接报「数据已被他人修改」
+ */
+function isValidFormDataId(dataId) {
+  if (dataId === null || typeof dataId === 'undefined') {
+    return false;
+  }
+  var s = String(dataId).replace(/^\s+|\s+$/g, '');
+  if (s === '' || s === 'null' || s === 'undefined' || s === '-1') {
+    return false;
+  }
+  return true;
+}
+
 function isSubTblSysField(key) {
   if (key == null || key === '') {
     return true;
@@ -87,11 +111,14 @@ function isEmptySubTblBusinessRow(row) {
     return true;
   }
   for (var i = 0; i < row.length; i++) {
-    var kv = row[i];
-    if (!kv || isSubTblSysField(kv.key)) {
+    var cell = row[i];
+    if (!cell) {
+      continue;
+    }
+    if (isSubTblSysField(cell.key)) {
       continue;
     }
-    if (hasSubTblBusinessValue(kv.value)) {
+    if (hasSubTblBusinessValue(cell.value)) {
       return false;
     }
   }
@@ -111,8 +138,103 @@ function filterEmptySubTblDataList(subTblData) {
   return kept;
 }
 
+/** 对齐 PC：字段项只保留 key / value */
+function slimKeyValueItem(item) {
+  if (!item || (typeof item === 'undefined' ? 'undefined' : _typeof(item)) !== 'object') {
+    return item;
+  }
+  return {
+    key: item.key,
+    value: item.value
+  };
+}
+
+function slimKeyValueList(list) {
+  if (!list || !list.length) {
+    return list || [];
+  }
+  var out = [];
+  for (var i = 0; i < list.length; i++) {
+    out.push(slimKeyValueItem(list[i]));
+  }
+  return out;
+}
+
+function slimSubTblDataRows(subTblData) {
+  if (!subTblData || !subTblData.length) {
+    return subTblData || [];
+  }
+  var rows = [];
+  for (var i = 0; i < subTblData.length; i++) {
+    rows.push(slimKeyValueList(subTblData[i]));
+  }
+  return rows;
+}
+
+/**
+ * 去掉 formItem/linkFields，并将 main/sub/related 字段精简为 key/value
+ */
+function slimFormDataForSubmit(data) {
+  if (!data || (typeof data === 'undefined' ? 'undefined' : _typeof(data)) !== 'object') {
+    return data;
+  }
+  for (var stripKey in SUBMIT_STRIP_TOP_KEYS) {
+    if (Object.prototype.hasOwnProperty.call(SUBMIT_STRIP_TOP_KEYS, stripKey) && data.hasOwnProperty(stripKey)) {
+      delete data[stripKey];
+    }
+  }
+  // 规范化 dataId：字符串 "null" 会导致后端 optlock 按主键更新失败
+  if (!isValidFormDataId(data.dataId)) {
+    data.dataId = '';
+    // 无真实主键时不带 optlock，后端才会跳过乐观锁校验（新建/发起场景）
+    if (data.hasOwnProperty('optlock')) {
+      delete data.optlock;
+    }
+  }
+  // 对齐 PC getInputData：moduleCode / paramJson 用空串，不传 null
+  if (data.moduleCode == null || data.moduleCode === 'null' || data.moduleCode === 'undefined') {
+    data.moduleCode = '';
+  }
+  if (data.paramJson == null || data.paramJson === 'null' || data.paramJson === 'undefined') {
+    data.paramJson = '';
+  }
+  // PC 已注释写入 formVersion；无有效值时不携带，避免 formVersion:null
+  if (data.formVersion == null || data.formVersion === '' || data.formVersion === 'null' || data.formVersion === 'undefined') {
+    delete data.formVersion;
+  }
+  if (data.mainTblData) {
+    data.mainTblData = slimKeyValueList(data.mainTblData);
+  }
+  var subTbl = data.subTbl || [];
+  for (var i = 0; i < subTbl.length; i++) {
+    if (subTbl[i] && subTbl[i].subTblData) {
+      subTbl[i].subTblData = slimSubTblDataRows(subTbl[i].subTblData);
+    }
+  }
+  var relatedTbl = data.relatedTbl || [];
+  for (var r = 0; r < relatedTbl.length; r++) {
+    var related = relatedTbl[r];
+    if (!related) {
+      continue;
+    }
+    if (related.relatedMainTblData) {
+      related.relatedMainTblData = slimKeyValueList(related.relatedMainTblData);
+    }
+    var relatedSub = related.relatedSubTblData;
+    if (!relatedSub) {
+      continue;
+    }
+    for (var s = 0; s < relatedSub.length; s++) {
+      if (relatedSub[s] && relatedSub[s].subTblData) {
+        relatedSub[s].subTblData = slimSubTblDataRows(relatedSub[s].subTblData);
+      }
+    }
+  }
+  return data;
+}
+
 /**
- * 深拷贝后过滤空子表行（不改动页面 state / UI）
+ * 深拷贝后过滤空子表行，并精简为与 PC getInputData 一致的提交结构（不改动页面 state / UI）
  */
 function cloneAndFilterEmptySubTblRows(editFormData) {
   if (!editFormData) {
@@ -122,7 +244,12 @@ function cloneAndFilterEmptySubTblRows(editFormData) {
   try {
     data = JSON.parse(JSON.stringify(editFormData));
   } catch (e) {
-    return editFormData;
+    // 深拷贝失败时仍做顶层清洗，避免新建把 formItem/optlock 原样提交
+    try {
+      data = Object.assign({}, editFormData);
+    } catch (e2) {
+      return slimFormDataForSubmit(editFormData);
+    }
   }
   var subTbl = data.subTbl || [];
   for (var i = 0; i < subTbl.length; i++) {
@@ -142,7 +269,7 @@ function cloneAndFilterEmptySubTblRows(editFormData) {
       }
     }
   }
-  return data;
+  return slimFormDataForSubmit(data);
 }
 
 exports.default = cloneAndFilterEmptySubTblRows;

package/lib/form/form.js

@@ -423,9 +423,39 @@ var PageHome = function (_React$Component) {
         //处理数据
         var tableData = {};
         if (status == '0') {
-          //新增 
-          //新增 
-          value = form.defaultValue;
+          //新增 / 再次发起(readd 也走 status=0 以便自动编号取 defaultValue)
+          // 再次发起等场景：formData 已带回原值。若一律用 defaultValue，普通字段会空，且后面 sync 会冲掉 mainTblData。
+          // 但自动编号/赋值宏必须继续用重新生成的 defaultValue，不能继承原单编号。
+          var loadedValue = this.dealwithData(itemParam, mainTblData, relatedTbl);
+          var hasLoadedField = false;
+          if (formTblId.indexOf(fieldTblId) > 0) {
+            relatedTbl.map(function (item) {
+              if (item.relatedMainTblName == fieldTblName) {
+                item.relatedMainTblData.map(function (item2) {
+                  if (item2.key == key) {
+                    hasLoadedField = true;
+                  }
+                });
+              }
+            });
+          } else {
+            mainTblData.map(function (item) {
+              if (item.key == key) {
+                hasLoadedField = true;
+              }
+            });
+          }
+          var isBizCodeMacroEarly = form.dataAttr && form.dataAttr.dataSrc == '2' && form.dataAttr.fromMacro && form.dataAttr.fromMacro.value == 'bizCode';
+          var inFuzhiFields = !!(fuzhiFields && fuzhiFields.split(",").indexOf(uniqueName) != -1);
+          // 赋值字段 或 自动编号宏：有新 defaultValue 时强制重生（对齐上次「再次发起自动编号重新生成」）
+          var shouldRegenDefault = form.defaultValue != null && form.defaultValue !== '' && (inFuzhiFields || isBizCodeMacroEarly);
+          if (shouldRegenDefault) {
+            value = form.defaultValue;
+          } else if (hasLoadedField) {
+            value = loadedValue || loadedValue === 0 ? loadedValue : form.defaultValue != null ? form.defaultValue : '';
+          } else {
+            value = form.defaultValue;
+          }
 
           if (formTblId.indexOf(fieldTblId) > 0) {
             var hasTable = false;
@@ -445,7 +475,7 @@ var PageHome = function (_React$Component) {
               //字段不存在
 
               tableData.key = key;
-              tableData.value = form.defaultValue;
+              tableData.value = value;
               tableData.required = required;
               tableData.label = title;
               tableData.inputFormat = form.inputFormat;
@@ -484,7 +514,7 @@ var PageHome = function (_React$Component) {
             });
             if (!hasField) {
               tableData.key = key;
-              tableData.value = form.defaultValue;
+              tableData.value = value;
               tableData.required = required;
               tableData.label = title;
               tableData.inputFormat = form.inputFormat;
@@ -703,13 +733,19 @@ var PageHome = function (_React$Component) {
         //     value = form.defaultValue;
         // }
         // 宏值新需求，赋值字段取defaultValue；自动编号额外兜底 form.value，避免 formData 偶发缺字段导致空白/丢数
+        // 再次发起(status=0)：即使 formData 已有旧编号，赋值/自动编号仍强制用重新生成的 defaultValue
         if (itemParam.dataAttr && itemParam.dataAttr.dataSrc == '2' && fuzhiFields != '') {
           var isBizCodeMacro = itemParam.dataAttr.fromMacro && itemParam.dataAttr.fromMacro.value == 'bizCode';
           if (fuzhiFields.split(",").indexOf(itemParam.uniqueName) != -1 && form.defaultValue && form.defaultValue != null) {
             value = form.defaultValue;
+          } else if (status == '0' && isBizCodeMacro && form.defaultValue && form.defaultValue != null) {
+            value = form.defaultValue;
           } else if (isBizCodeMacro && (value === '' || value == null || typeof value == 'undefined') && form.value) {
             value = form.value;
           }
+        } else if (itemParam.dataAttr && itemParam.dataAttr.dataSrc == '2' && itemParam.dataAttr.fromMacro && itemParam.dataAttr.fromMacro.value == 'bizCode' && status == '0' && form.defaultValue && form.defaultValue != null) {
+          // 再次发起：无 fuzhiFields 列表时，只要后端 readd 重生了 defaultValue 也要用新编号
+          value = form.defaultValue;
         } else if (itemParam.dataAttr && itemParam.dataAttr.dataSrc == '2' && itemParam.dataAttr.fromMacro && itemParam.dataAttr.fromMacro.value == 'bizCode' && (value === '' || value == null || typeof value == 'undefined') && form.value) {
           value = form.value;
         } else if (itemParam.dataAttr && itemParam.dataAttr.dataSrc == '2' && itemParam.dataAttr.fromMacro && itemParam.dataAttr.fromMacro.value == 'bizCode' && (value === '' || value == null || typeof value == 'undefined') && form.defaultValue) {
@@ -888,15 +924,17 @@ var PageHome = function (_React$Component) {
             // }else{
             //   valueArray.push(value);
             // }
-            if (status == '0') {
+            if (status == '0' && !value && value !== 0) {
               selectItem.map(function (selectI) {
                 if (selectI.isDefault == 1) {
                   valueArray.push(selectI.value);
                 }
               });
             } else {
-              if (value.indexOf("[") >= 0) {
+              if (value && (value + '').indexOf("[") >= 0) {
                 valueArray = JSON.parse(value);
+              } else if (value || value === 0) {
+                valueArray = (value + '').split(",");
               }
             }
             selectItem.map(function (selectI) {
@@ -1425,9 +1463,12 @@ var PageHome = function (_React$Component) {
             value = false;
           }
         } else {
-          var defaultValue = form.defaultValue;
-          if (defaultValue) {
-            if (defaultValue == '1') {
+          // 再次发起：已有落库值优先；全新新增才用设计默认
+          var switchSrc = value || value === 0 || value === false ? value : form.defaultValue;
+          if (switchSrc === true || switchSrc === false) {
+            value = switchSrc;
+          } else if (switchSrc) {
+            if (switchSrc == '1') {
               value = true;
             } else {
               value = false;

package/lib/form_info/formInfo.js

@@ -1432,7 +1432,6 @@ var PageHome = function (_React$Component) {
             } else if (operate == 1) {
                 //提交
                 var sendData = (0, _filterEmptySubTblRows.cloneAndFilterEmptySubTblRows)(t.state.editFormData) || {};
-                sendData.formItem = [];
                 var param = {
                     taskId: this.state.taskId,
                     auditorUserIds: auditorUserIds,
@@ -1444,8 +1443,14 @@ var PageHome = function (_React$Component) {
                     module: this.state.module,
                     lock: this.state.lock,
                     reminderContent: this.state.reminderContent,
-                    processInstanceId: this.state.processInstanceId
+                    processInstanceId: this.state.processInstanceId,
+                    // 网关条件「上一环节办理人批示内容」依赖当前批示意见，getNextActivity 必须透传
+                    comment: typeof newComment === 'undefined' || newComment == null ? '' : newComment,
+                    commentType: 'text'
                 };
+                if (this.state.commentId) {
+                    param.commentId = this.state.commentId;
+                }
                 var dealActionName = "";
                 if (this.state.isStart == true) {
                     dealActionName = "提交";

package/lib/process_batch/processBatch.js

@@ -323,7 +323,10 @@ var PageHome = function (_React$Component) {
             var hasRadomList = false; //判断下次办理是否有随机活动节点
             _db2.default.FlowModuleAPI.getNextActivity({
                 taskId: taskId,
-                code: code
+                code: code,
+                // 网关条件「上一环节办理人批示内容」依赖当前批示意见，getNextActivity 必须透传
+                comment: t.state.spyj == null || typeof t.state.spyj === 'undefined' ? '' : t.state.spyj,
+                commentType: 'text'
             }).then(function (content) {
                 var nextList = content.activityList; //下一个后继节点列表
                 var radomList = content.radomList; //下一个随机活动节点

package/lib/process_info/processInfo.js

@@ -474,6 +474,10 @@ var PageHome = function (_React$Component) {
             nextJumpActivity: [], //下一个跳转节点
             jumpPersonValue: [], //转交选择的用户
             addlotsPersonValue: [], //加签选择的用户
+            reduceSignUserList: [], //减签候选原始列表
+            reduceSignAddPool: [], //加签用户池（可移到减签）
+            reduceSignReducePool: [], //减签用户池（真正提交）
+            reduceShortMessage: '0', //减签提醒方式
             circulateNodePersonValue: [], //传阅节点选择的用户
             forwardNodePersonValue: [], //转发节点选择的用户
             circulatePersonValue: [], //通过传阅的用户
@@ -1357,6 +1361,10 @@ var PageHome = function (_React$Component) {
                     }
                     formData.linkFields = form.linkFields;
                     formData.formItem = formItem;
+                    // 后端偶发带回字符串 "null"，会导致提交带无效 dataId+optlock 被乐观锁拦截
+                    if (!(0, _filterEmptySubTblRows.isValidFormDataId)(formData.dataId)) {
+                        formData.dataId = '';
+                    }
 
                     //关联字段
                     var formRelaField = content.formRelaField;
@@ -1601,9 +1609,24 @@ var PageHome = function (_React$Component) {
                     //     }
                     // }
                     var resolvedOptlock = formData && formData.optlock !== undefined && formData.optlock !== null && formData.optlock !== '' ? String(formData.optlock) : content.optlock !== undefined && content.optlock !== null && content.optlock !== '' ? String(content.optlock) : '';
+                    var forceOptlock = false;
                     if (t._pendingForceOptlock) {
                         resolvedOptlock = String(t._pendingForceOptlock);
                         t._pendingForceOptlock = null;
+                        forceOptlock = true;
+                    }
+                    // 无有效主表主键时不缓存 optlock，避免发起/新建误传版本号。
+                    // 仅认 formData.dataId（提交真正用的主键）；不要用 businessKey 单独保留版本号，否则会顶栏带 optlock、formData 无 dataId 被后端拦。
+                    if (!forceOptlock && !(0, _filterEmptySubTblRows.isValidFormDataId)(formData && formData.dataId)) {
+                        var contentDataId = content && (content.dataId || content.businessKey);
+                        if ((0, _filterEmptySubTblRows.isValidFormDataId)(contentDataId)) {
+                            formData.dataId = contentDataId;
+                        } else {
+                            resolvedOptlock = '';
+                            if (formData && formData.hasOwnProperty('optlock')) {
+                                delete formData.optlock;
+                            }
+                        }
                     }
                     t.setState({
                         editFormData: formData,
@@ -2631,6 +2654,9 @@ var PageHome = function (_React$Component) {
                         case 'HELP_ADDLOTS':
                             t.handleSubmit(6);
                             break;
+                        case 'HELP_REDUCELOTS':
+                            t.handleSubmit(22);
+                            break;
                         case 'FLOW_REVOKE':
                             t.handleSubmit(7);
                             break;
@@ -2700,9 +2726,13 @@ var PageHome = function (_React$Component) {
                         reminderContent: _this2.state.reminderContent,
                         processInstanceId: _this2.state.processInstanceId,
                         permissionCode: _this2.state.permissionCode
-                    };
-                    if (t.state.module === 'approve' && t.state.formDataOptlock !== '' && t.state.formDataOptlock !== null && typeof t.state.formDataOptlock !== 'undefined') {
-                        param.optlock = t.state.formDataOptlock;
+                        // 仅当提交 formData 有真实主键时带 optlock（勿用 state.dataId 兜底，新建易误传）
+                    };if (t.state.module === 'approve') {
+                        if ((0, _filterEmptySubTblRows.isValidFormDataId)(sendData && sendData.dataId) && t.state.formDataOptlock !== '' && t.state.formDataOptlock != null) {
+                            param.optlock = t.state.formDataOptlock;
+                        } else if (param.optlock !== undefined) {
+                            delete param.optlock;
+                        }
                     }
                     var dealActionName = "";
                     if (_this2.state.isStart == true) {
@@ -2711,6 +2741,12 @@ var PageHome = function (_React$Component) {
                         dealActionName = _this2.state.finalButtons.get("BASE_SUMBIT");
                     }
                     param.dealActionName = dealActionName;
+                    // 网关条件「上一环节办理人批示内容」依赖当前批示意见，getNextActivity 必须透传
+                    param.comment = typeof newComment === 'undefined' || newComment == null ? '' : newComment;
+                    param.commentType = 'text';
+                    if (t.state.commentId) {
+                        param.commentId = t.state.commentId;
+                    }
                     var nextList = null; //下一个后继节点列表
                     var radomList = null; //下一个随机活动节点
                     var succeedRange = ""; //后继活动id
@@ -3390,6 +3426,9 @@ var PageHome = function (_React$Component) {
                 }, function () {
                     $(window).scrollTop(0);
                 });
+            } else if (operate == 22) {
+                //减签
+                t.openReduceSign();
             } else if (operate == 7) {
                 //撤销
                 this.recallClick();
@@ -4022,7 +4061,7 @@ var PageHome = function (_React$Component) {
             var allEditIdsArray = [];
 
             //主表id
-            if (data.dataId) {
+            if ((0, _filterEmptySubTblRows.isValidFormDataId)(data && data.dataId)) {
                 var mainTableId = data.dataId;
                 allEditIdsArray.push(mainTableId);
             }
@@ -4638,6 +4677,9 @@ var PageHome = function (_React$Component) {
             } else if (operate == 6) {
                 //加签
                 this.addlots();
+            } else if (operate == 22) {
+                //减签
+                this.reduceSign();
             } else if (operate == 4) {
                 //传阅
                 this.circulateNode();
@@ -5726,6 +5768,67 @@ var PageHome = function (_React$Component) {
                 _Toast2.default.show({ type: 'error', content: '刷新表单失败，请手动刷新页面' });
             });
         }
+
+        /**
+         * sendFlow 提交前清洗 optlock：
+         * - 以 formData.dataId 为准（再 slim 一次）
+         * - 无有效主键时删除顶栏 optlock，并去掉 formData 内 optlock
+         * - 勿用 state.dataId 兜底（新建场景易误传 0）
+         */
+
+    }, {
+        key: 'sanitizeSendFlowOptlockParam',
+        value: function sanitizeSendFlowOptlockParam(param) {
+            var t = this;
+            if (!param || t.state.module !== 'approve') {
+                return;
+            }
+            var fd = null;
+            try {
+                if (param.formData) {
+                    fd = typeof param.formData === 'string' ? JSON.parse(param.formData) : param.formData;
+                    fd = (0, _filterEmptySubTblRows.cloneAndFilterEmptySubTblRows)(fd) || fd;
+                }
+            } catch (e1) {
+                fd = null;
+            }
+            var payloadDataId = '';
+            if (fd && (0, _filterEmptySubTblRows.isValidFormDataId)(fd.dataId)) {
+                payloadDataId = fd.dataId;
+            } else if ((0, _filterEmptySubTblRows.isValidFormDataId)(param.dataId)) {
+                payloadDataId = param.dataId;
+            }
+            if (!(0, _filterEmptySubTblRows.isValidFormDataId)(payloadDataId)) {
+                delete param.optlock;
+                if (fd) {
+                    fd.dataId = '';
+                    if (fd.hasOwnProperty('optlock')) {
+                        delete fd.optlock;
+                    }
+                    try {
+                        param.formData = JSON.stringify(fd);
+                    } catch (e2) {}
+                }
+                return;
+            }
+            if (t.state.formDataOptlock !== '' && t.state.formDataOptlock != null && typeof t.state.formDataOptlock !== 'undefined') {
+                param.optlock = t.state.formDataOptlock;
+                if (fd) {
+                    fd.optlock = t.state.formDataOptlock;
+                    try {
+                        param.formData = JSON.stringify(fd);
+                    } catch (e3) {}
+                }
+            } else {
+                delete param.optlock;
+                if (fd && fd.hasOwnProperty('optlock')) {
+                    delete fd.optlock;
+                    try {
+                        param.formData = JSON.stringify(fd);
+                    } catch (e4) {}
+                }
+            }
+        }
     }, {
         key: 'sendFlowFuc',
         value: function sendFlowFuc(param) {
@@ -5792,9 +5895,8 @@ var PageHome = function (_React$Component) {
             //     param.commentbizSn=commentbizSn;
             // }
             param.commentbizSn = commentbizSn;
-            if (t.state.module === 'approve' && t.state.formDataOptlock !== '' && t.state.formDataOptlock !== null && typeof t.state.formDataOptlock !== 'undefined') {
-                param.optlock = t.state.formDataOptlock;
-            }
+            // 提交前统一清洗：新建无主键绝不带 optlock（含 getNextActivity 残留）
+            t.sanitizeSendFlowOptlockParam(param);
 
             var db = _db2.default;
             db.FlowModuleAPI.sendFlow(param).then(function (content) {
@@ -6725,6 +6827,152 @@ var PageHome = function (_React$Component) {
                 }
             });
         }
+
+        // 打开减签页：拉取本节点被加签人列表
+
+    }, {
+        key: 'openReduceSign',
+        value: function openReduceSign() {
+            var t = this;
+            _db2.default.FlowModuleAPI.getSignUserList({
+                taskId: t.state.taskId
+            }).then(function (content) {
+                var list = content || [];
+                var addPool = [];
+                for (var i = 0; i < list.length; i++) {
+                    var item = list[i];
+                    addPool.push({
+                        userid: item.userid,
+                        username: item.username,
+                        status: item.status
+                    });
+                }
+                t.setState({
+                    pageStatus: '1',
+                    operate: 22,
+                    reduceSignUserList: list,
+                    reduceSignAddPool: addPool,
+                    reduceSignReducePool: [],
+                    reduceShortMessage: t.state.addlotsShortMessage || '0'
+                }, function () {
+                    $(window).scrollTop(0);
+                });
+            }).catch(function (error) {
+                _Toast2.default.show({
+                    type: 'error',
+                    content: error && error.errorMsg ? error.errorMsg : '获取减签用户失败'
+                });
+            });
+        }
+    }, {
+        key: 'moveToReducePool',
+        value: function moveToReducePool(userId) {
+            var addPool = (this.state.reduceSignAddPool || []).slice();
+            var reducePool = (this.state.reduceSignReducePool || []).slice();
+            for (var i = 0; i < addPool.length; i++) {
+                if (addPool[i].userid == userId && addPool[i].status != '1') {
+                    reducePool.push(addPool[i]);
+                    addPool.splice(i, 1);
+                    break;
+                }
+            }
+            this.setState({
+                reduceSignAddPool: addPool,
+                reduceSignReducePool: reducePool
+            });
+        }
+    }, {
+        key: 'moveToAddPool',
+        value: function moveToAddPool(userId) {
+            var addPool = (this.state.reduceSignAddPool || []).slice();
+            var reducePool = (this.state.reduceSignReducePool || []).slice();
+            for (var i = 0; i < reducePool.length; i++) {
+                if (reducePool[i].userid == userId) {
+                    addPool.push(reducePool[i]);
+                    reducePool.splice(i, 1);
+                    break;
+                }
+            }
+            this.setState({
+                reduceSignAddPool: addPool,
+                reduceSignReducePool: reducePool
+            });
+        }
+    }, {
+        key: 'changeReduceShortMessage',
+        value: function changeReduceShortMessage(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({
+                reduceShortMessage: newremindStyle || '0'
+            });
+        }
+    }, {
+        key: 'reduceSign',
+        value: function reduceSign() {
+            var t = this;
+            var selected = t.state.reduceSignReducePool || [];
+            var userIds = '';
+            var userNames = '';
+            selected.map(function (item) {
+                userIds += item.userid + ',';
+                userNames += item.username + ',';
+            });
+            if (userIds == '') {
+                _Toast2.default.show({
+                    type: 'error',
+                    content: '请选择需要减签的用户'
+                });
+                return false;
+            }
+            userIds = userIds.substring(0, userIds.length - 1);
+            userNames = userNames.substring(0, userNames.length - 1);
+            var processTitle = t.state.processTitle || t.state.fileTitle || '';
+            var reminders = t.state.reduceShortMessage;
+            if (reminders == '0') {
+                reminders = '';
+            }
+            var isPush = t.state.isPush;
+            _db2.default.FlowModuleAPI.reduceSign({
+                taskId: t.state.taskId,
+                userIds: userIds,
+                userNames: userNames,
+                reminders: reminders,
+                processTitle: processTitle,
+                module: t.state.module,
+                processInstanceId: t.state.processInstanceId,
+                formId: t.state.formId,
+                dataId: t.state.dataId,
+                permissionCode: t.state.permissionCode,
+                categoryCode: t.state.category || ''
+            }).then(function (content) {
+                _Toast2.default.show({
+                    type: 'success',
+                    content: (t.state.finalButtons.get('HELP_REDUCELOTS') || '减签') + '成功'
+                });
+                if (isPush == '1') {
+                    closePage();
+                } else {
+                    setTimeout(function () {
+                        history.back();
+                    }, 1500);
+                }
+            }).catch(function (error) {
+                if (typeof error.errorMsg == 'undefined') {
+                    _Toast2.default.show({
+                        type: 'error',
+                        content: '提交出错'
+                    });
+                } else {
+                    _Toast2.default.show({
+                        type: 'error',
+                        content: error.errorMsg.replace('!', '').replace('！', '')
+                    });
+                }
+            });
+        }
     }, {
         key: 'circulateNode',
         value: function circulateNode() {
@@ -7469,6 +7717,11 @@ var PageHome = function (_React$Component) {
                                     buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 5 });
                                 } else if (buttonCode == 'HELP_ADDLOTS') {
                                     buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 6 });
+                                    var pmMore = String(_this4.state.participantMode);
+                                    if (pmMore == '1' || pmMore == '2') {
+                                        var reduceNameMore = _this4.state.finalButtons.get('HELP_REDUCELOTS') || '减签';
+                                        buttonCodeListNew.push({ name: reduceNameMore, type: 'secondary', display: 'inline', no: 22 });
+                                    }
                                 } else if (buttonCode == 'BASE_END') {
                                     buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 8 });
                                 } else if (buttonCode == 'BASE_NOTPASS') {
@@ -7488,6 +7741,13 @@ var PageHome = function (_React$Component) {
                             } else {
                                 actionSheetButtonOpt.push(buttonCode);
                                 actionSheetButtonOptName.push(buttonName);
+                                if (buttonCode == 'HELP_ADDLOTS') {
+                                    var pmSheet = String(_this4.state.participantMode);
+                                    if (pmSheet == '1' || pmSheet == '2') {
+                                        actionSheetButtonOpt.push('HELP_REDUCELOTS');
+                                        actionSheetButtonOptName.push(_this4.state.finalButtons.get('HELP_REDUCELOTS') || '减签');
+                                    }
+                                }
                             }
                         }
                         var nowNum = mainSlotCount;
@@ -7526,6 +7786,11 @@ var PageHome = function (_React$Component) {
                                 buttonList.push({ name: buttonName, type: 'secondary', display: 'inline', no: 5 });
                             } else if (buttonCode == 'HELP_ADDLOTS') {
                                 buttonList.push({ name: buttonName, type: 'secondary', display: 'inline', no: 6 });
+                                var pmFew = String(_this4.state.participantMode);
+                                if (pmFew == '1' || pmFew == '2') {
+                                    var reduceNameFew = _this4.state.finalButtons.get('HELP_REDUCELOTS') || '减签';
+                                    buttonList.push({ name: reduceNameFew, type: 'secondary', display: 'inline', no: 22 });
+                                }
                             } else if (buttonCode == 'BASE_END') {
                                 buttonList.push({ name: buttonName, type: 'secondary', display: 'inline', no: 8 });
                             } else if (buttonCode == 'BASE_NOTPASS') {
@@ -9903,6 +10168,73 @@ var PageHome = function (_React$Component) {
                             onChange: this.changeAddlotsShortMessage.bind(this),
                             required: false })
                     ),
+                    _react2.default.createElement(
+                        _Group2.default.List,
+                        { className: this.state.operate == 22 ? '' : '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' }),
+                                this.state.finalButtons.get("HELP_REDUCELOTS") || '减签'
+                            )
+                        ),
+                        _react2.default.createElement(
+                            'div',
+                            { className: 't-field-box t-FBH t-FBAC', style: { padding: '10px 16px', flexWrap: 'wrap' } },
+                            _react2.default.createElement(
+                                'div',
+                                { className: 't-field-layout-h-label', style: { width: '100%', marginBottom: '6px' } },
+                                '\u52A0\u7B7E\u7528\u6237'
+                            ),
+                            _react2.default.createElement(
+                                'div',
+                                { style: { display: 'flex', flexWrap: 'wrap', width: '100%' } },
+                                (this.state.reduceSignAddPool || []).map(function (item, idx) {
+                                    return item.status == '1' ? _react2.default.createElement(
+                                        'span',
+                                        { key: 'add-' + item.userid + '-' + idx, style: { margin: '0 8px 8px 0', padding: '4px 10px', background: '#f0f0f0', color: '#999', borderRadius: '4px', fontSize: '13px' } },
+                                        item.username,
+                                        '(\u5DF2\u529E)'
+                                    ) : _react2.default.createElement(
+                                        'span',
+                                        { key: 'add-' + item.userid + '-' + idx, onClick: _this5.moveToReducePool.bind(_this5, item.userid), style: { margin: '0 8px 8px 0', padding: '4px 10px', background: '#e60012', color: '#fff', borderRadius: '4px', fontSize: '13px' } },
+                                        item.username,
+                                        ' \xD7'
+                                    );
+                                })
+                            )
+                        ),
+                        _react2.default.createElement(
+                            'div',
+                            { className: 't-field-box t-FBH t-FBAC', style: { padding: '10px 16px', flexWrap: 'wrap' } },
+                            _react2.default.createElement(
+                                'div',
+                                { className: 't-field-layout-h-label', style: { width: '100%', marginBottom: '6px' } },
+                                '\u51CF\u7B7E\u7528\u6237'
+                            ),
+                            _react2.default.createElement(
+                                'div',
+                                { style: { display: 'flex', flexWrap: 'wrap', width: '100%' } },
+                                (this.state.reduceSignReducePool || []).map(function (item, idx) {
+                                    return _react2.default.createElement(
+                                        'span',
+                                        { key: 'reduce-' + item.userid + '-' + idx, onClick: _this5.moveToAddPool.bind(_this5, item.userid), style: { margin: '0 8px 8px 0', padding: '4px 10px', background: '#e60012', color: '#fff', borderRadius: '4px', fontSize: '13px' } },
+                                        item.username,
+                                        ' \xD7'
+                                    );
+                                })
+                            )
+                        ),
+                        _react2.default.createElement(_CheckboxField2.default, {
+                            data: this.state.shortMessageList,
+                            className: '',
+                            mode: 'list',
+                            onChange: this.changeReduceShortMessage.bind(this),
+                            required: false })
+                    ),
                     _react2.default.createElement(
                         _Group2.default.List,
                         { className: this.state.operate == 4 ? '' : 't-DN' },

package/lib/tblform/formSaveUtils.js

@@ -16,7 +16,7 @@ function getAllEditIds(data) {
     return '';
   }
 
-  if (data.dataId) {
+  if ((0, _filterEmptySubTblRows.isValidFormDataId)(data.dataId)) {
     allEditIdsArray.push(data.dataId);
   }
 

package/package.json

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