fmui-base 2.3.31 → 2.3.32

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish
 
 ## 更新日志 
+- 2.3.32：移动端子表字段为空时不存，只读情况下不再默认拼一行空子表
 - 2.3.31：移动端推送点开的流程表单切换组织不显示，集成新疆CA
 - 2.3.30：移动端日期型字段日期格式（xx年xx月xx日）移动端办理后丢失
 - 2.3.29：移动端办理宏值签名丢失

package/lib/form/filterEmptySubTblRows.js

@@ -0,0 +1,148 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+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.cloneAndFilterEmptySubTblRows = cloneAndFilterEmptySubTblRows;
+/**
+ * 子表空行过滤（提交用）：UI 仍可留空行，仅从提交数据中去掉业务全空行。
+ * 系统字段忽略；0/false 有值；宏回填有值则保留。
+ */
+
+var SUB_TBL_SYS_FIELDS = {
+  id: true,
+  rowId: true,
+  rowid: true,
+  createdBy: true,
+  createdDate: true,
+  createdOrg: true,
+  lastModifiedBy: true,
+  lastModifiedDate: true,
+  lastModifiedOrg: true,
+  optlock: true,
+  fkid: true,
+  corp_id: true,
+  formid: true,
+  sort_no: true
+};
+
+function isSubTblSysField(key) {
+  if (key == null || key === '') {
+    return true;
+  }
+  if (SUB_TBL_SYS_FIELDS[key]) {
+    return true;
+  }
+  var lower = String(key).toLowerCase();
+  for (var k in SUB_TBL_SYS_FIELDS) {
+    if (Object.prototype.hasOwnProperty.call(SUB_TBL_SYS_FIELDS, k) && k.toLowerCase() === lower) {
+      return true;
+    }
+  }
+  return false;
+}
+
+function hasSubTblBusinessValue(value) {
+  if (value === null || typeof value === 'undefined') {
+    return false;
+  }
+  if (typeof value === 'boolean' || typeof value === 'number') {
+    return true;
+  }
+  if (Array.isArray(value)) {
+    if (value.length === 0) {
+      return false;
+    }
+    for (var i = 0; i < value.length; i++) {
+      if (hasSubTblBusinessValue(value[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  if ((typeof value === 'undefined' ? 'undefined' : _typeof(value)) === 'object') {
+    return Object.keys(value).length > 0;
+  }
+  var s = String(value).replace(/^\s+|\s+$/g, '');
+  if (s === '' || s === 'null' || s === 'undefined' || s === '[]' || s === '{}') {
+    return false;
+  }
+  if (s.charAt(0) === '[' && s.indexOf('scopeValue') >= 0) {
+    var compact = s.replace(/\s+/g, '');
+    if (compact.indexOf('"scopeValue":""') >= 0 || compact.indexOf('"scopeValue":null') >= 0) {
+      var stripped = compact.replace(/\{"scopeValue":""[^}]*\}/g, '').replace(/\{"scopeValue":null[^}]*\}/g, '').replace(/,/g, '');
+      if (stripped === '[]' || stripped.length <= 2) {
+        return false;
+      }
+    }
+  }
+  return true;
+}
+
+function isEmptySubTblBusinessRow(row) {
+  if (!row || !row.length) {
+    return true;
+  }
+  for (var i = 0; i < row.length; i++) {
+    var kv = row[i];
+    if (!kv || isSubTblSysField(kv.key)) {
+      continue;
+    }
+    if (hasSubTblBusinessValue(kv.value)) {
+      return false;
+    }
+  }
+  return true;
+}
+
+function filterEmptySubTblDataList(subTblData) {
+  if (!subTblData || !subTblData.length) {
+    return subTblData || [];
+  }
+  var kept = [];
+  for (var i = 0; i < subTblData.length; i++) {
+    if (!isEmptySubTblBusinessRow(subTblData[i])) {
+      kept.push(subTblData[i]);
+    }
+  }
+  return kept;
+}
+
+/**
+ * 深拷贝后过滤空子表行（不改动页面 state / UI）
+ */
+function cloneAndFilterEmptySubTblRows(editFormData) {
+  if (!editFormData) {
+    return editFormData;
+  }
+  var data;
+  try {
+    data = JSON.parse(JSON.stringify(editFormData));
+  } catch (e) {
+    return editFormData;
+  }
+  var subTbl = data.subTbl || [];
+  for (var i = 0; i < subTbl.length; i++) {
+    if (subTbl[i] && subTbl[i].subTblData) {
+      subTbl[i].subTblData = filterEmptySubTblDataList(subTbl[i].subTblData);
+    }
+  }
+  var relatedTbl = data.relatedTbl || [];
+  for (var r = 0; r < relatedTbl.length; r++) {
+    var relatedSub = relatedTbl[r] && relatedTbl[r].relatedSubTblData;
+    if (!relatedSub) {
+      continue;
+    }
+    for (var s = 0; s < relatedSub.length; s++) {
+      if (relatedSub[s] && relatedSub[s].subTblData) {
+        relatedSub[s].subTblData = filterEmptySubTblDataList(relatedSub[s].subTblData);
+      }
+    }
+  }
+  return data;
+}
+
+exports.default = cloneAndFilterEmptySubTblRows;

package/lib/form/form.js

@@ -2396,6 +2396,7 @@ var PageHome = function (_React$Component) {
       var subFormList = [];
       subForm = { show: true, form: subForm };
       var itemCode = itemParam.key;
+      var subtableReadonly = itemParam.subtableReadonly === true || this.props.status == 2;
       var value = [];
       if (subTbl.length > 0) {
         for (var i = 0; i < subTbl.length; i++) {
@@ -2407,7 +2408,7 @@ var PageHome = function (_React$Component) {
                 value.push({ mainTblData: subTblData[j], mainTblName: itemCode });
                 subFormList.push(subForm);
               }
-            } else {
+            } else if (!subtableReadonly) {
               value.push({ mainTblData: [], mainTblName: itemCode });
               subFormList.push(subForm);
             }
@@ -2417,6 +2418,11 @@ var PageHome = function (_React$Component) {
       }
       if (subFormList.length > 0) {
         itemParam.subForm = subFormList;
+      } else if (subtableReadonly) {
+        itemParam.subForm = [];
+        if (subTbl.length === 0) {
+          subTbl.push({ subTblData: [], subTblName: itemCode });
+        }
       } else {
         subFormList.push(subForm);
         itemParam.subForm = subFormList;

package/lib/form/subForm.js

@@ -224,6 +224,7 @@ var PageHome = function (_React$Component) {
       var subFormList = [];
       var itemCode = itemParam.key;
       var fieldControll = itemParam.fieldControll;
+      var subtableReadonly = itemParam.subtableReadonly === true;
       var mustFields = "";
       if (fieldControll) {
         mustFields = fieldControll.mustFields;
@@ -251,7 +252,7 @@ var PageHome = function (_React$Component) {
                     var subForm1 = { show: true, form: subForm };
                     subFormList.push(subForm1);
                   }
-                } else {
+                } else if (!subtableReadonly) {
                   var subForm2 = { show: true, form: subForm };
                   value.push({ mainTblData: [], mainTblName: itemCode });
                   subFormList.push(subForm2);
@@ -273,7 +274,7 @@ var PageHome = function (_React$Component) {
                 var subForm1 = { show: true, form: subForm };
                 subFormList.push(subForm1);
               }
-            } else {
+            } else if (!subtableReadonly) {
               var subForm2 = { show: true, form: subForm };
               value.push({ mainTblData: [], mainTblName: itemCode });
               subFormList.push(subForm2);
@@ -284,6 +285,12 @@ var PageHome = function (_React$Component) {
       }
       if (subFormList.length > 0) {
         itemParam.subForm = subFormList;
+      } else if (subtableReadonly) {
+        // 只读/查看且无数据：不补空行，仅挂空结构
+        itemParam.subForm = [];
+        if (subTbl.length === 0 && !(relatedTbl && relatedTbl.length > 0)) {
+          subTbl.push({ subTblData: [], subTblName: itemCode });
+        }
       } else if (relatedTbl && relatedTbl.length > 0) {
         var subForm3 = { show: true, form: subForm };
         subFormList.push(subForm3);

package/lib/form_info/formInfo.js

@@ -76,6 +76,8 @@ var _table = require('../form/table');
 
 var _table2 = _interopRequireDefault(_table);
 
+var _filterEmptySubTblRows = require('../form/filterEmptySubTblRows');
+
 var _FlowChart = require('./FlowChart');
 
 var _FlowChart2 = _interopRequireDefault(_FlowChart);
@@ -1394,12 +1396,12 @@ var PageHome = function (_React$Component) {
                 });
             } else if (operate == 1) {
                 //提交
-                var sendData = t.state.editFormData;
+                var sendData = (0, _filterEmptySubTblRows.cloneAndFilterEmptySubTblRows)(t.state.editFormData) || {};
                 sendData.formItem = [];
                 var param = {
                     taskId: this.state.taskId,
                     auditorUserIds: auditorUserIds,
-                    allEditIds: this.getAllEditIds(t.state.editFormData),
+                    allEditIds: this.getAllEditIds(sendData),
                     code: this.state.code,
                     formData: JSON.stringify(sendData),
                     dataId: this.state.dataId,
@@ -2282,9 +2284,9 @@ var PageHome = function (_React$Component) {
                         taskId: t.state.taskId,
                         permissionCode: t.state.permissionCode,
                         processInstanceId: t.state.processInstanceId,
-                        allEditIds: t.getAllEditIds(t.state.editFormData),
+                        allEditIds: t.getAllEditIds((0, _filterEmptySubTblRows.cloneAndFilterEmptySubTblRows)(t.state.editFormData)),
                         editType: t.state.editType,
-                        formData: JSON.stringify(t.state.editFormData),
+                        formData: JSON.stringify((0, _filterEmptySubTblRows.cloneAndFilterEmptySubTblRows)(t.state.editFormData)),
                         module: t.state.module,
                         comment: newComment
                     }).then(function (content) {
@@ -2454,7 +2456,7 @@ var PageHome = function (_React$Component) {
                         while (1) {
                             switch (_context2.prev = _context2.next) {
                                 case 0:
-                                    editFormData = _this2.state.editFormData;
+                                    editFormData = (0, _filterEmptySubTblRows.cloneAndFilterEmptySubTblRows)(_this2.state.editFormData);
                                     nextRadomListSelect = _this2.state.nextRadomList;
                                     nextActivityListSelect = _this2.state.nextActivityList;
                                     selectedActivity = '';
@@ -2727,7 +2729,7 @@ var PageHome = function (_React$Component) {
                                     param = {
                                         taskId: _this2.state.taskId,
                                         selectedActivity: selectedActivity,
-                                        allEditIds: _this2.getAllEditIds(t.state.editFormData),
+                                        allEditIds: _this2.getAllEditIds(editFormData),
                                         corpId: corpid,
                                         code: _this2.state.code,
                                         formData: JSON.stringify(editFormData),
@@ -2814,7 +2816,7 @@ var PageHome = function (_React$Component) {
                 this.jump();
             } else if (operate == 10) {
                 //随机节点结束
-                var editFormData = this.state.editFormData;
+                var editFormData = (0, _filterEmptySubTblRows.cloneAndFilterEmptySubTblRows)(this.state.editFormData);
                 var sshortMessage = '0';
                 var sendShortMessage = t.state.sendShortMessage;
                 /*if(sendShortMessage.length>0){
@@ -2828,7 +2830,7 @@ var PageHome = function (_React$Component) {
                 var param = {
                     taskId: this.state.taskId,
                     selectedActivity: '',
-                    allEditIds: this.getAllEditIds(t.state.editFormData),
+                    allEditIds: this.getAllEditIds(editFormData),
                     corpId: corpid,
                     code: this.state.code,
                     formData: JSON.stringify(editFormData),
@@ -3037,7 +3039,7 @@ var PageHome = function (_React$Component) {
 
             var t = this;
             var db = _db2.default;
-            var editFormData = this.state.editFormData;
+            var editFormData = (0, _filterEmptySubTblRows.cloneAndFilterEmptySubTblRows)(this.state.editFormData);
             newComment = t.state.newspyj.content;
             if (typeof newComment == "undefined" || newComment == '') {
                 newComment = t.state.defaultValue;
@@ -3047,7 +3049,7 @@ var PageHome = function (_React$Component) {
                 taskId: this.state.taskId,
                 module: t.state.module,
                 processInstanceId: t.state.processInstanceId,
-                allEditIds: t.getAllEditIds(t.state.editFormData),
+                allEditIds: t.getAllEditIds(editFormData),
                 formData: JSON.stringify(editFormData),
                 formType: "4",
                 editType: this.state.editType
@@ -3435,10 +3437,10 @@ var PageHome = function (_React$Component) {
                     $(window).scrollTop(0);
                 });
             } else {
-                var editFormData = this.state.editFormData;
+                var editFormData = (0, _filterEmptySubTblRows.cloneAndFilterEmptySubTblRows)(this.state.editFormData);
                 var param = {
                     taskId: this.state.taskId,
-                    allEditIds: this.getAllEditIds(t.state.editFormData),
+                    allEditIds: this.getAllEditIds(editFormData),
                     code: this.state.code,
                     formData: JSON.stringify(editFormData),
                     dataId: this.state.dataId,
@@ -4162,8 +4164,8 @@ var PageHome = function (_React$Component) {
                         processInstanceId: t.state.processInstanceId,
                         selectedActivity: selectedActivity,
                         auditorUserIds: assignId,
-                        allEditIds: t.getAllEditIds(t.state.editFormData),
-                        formData: JSON.stringify(t.state.editFormData),
+                        allEditIds: t.getAllEditIds((0, _filterEmptySubTblRows.cloneAndFilterEmptySubTblRows)(t.state.editFormData)),
+                        formData: JSON.stringify((0, _filterEmptySubTblRows.cloneAndFilterEmptySubTblRows)(t.state.editFormData)),
                         hasCommentField: '0',
                         editType: t.state.editType,
                         module: t.state.module,

package/lib/process_info/processInfo.js

@@ -88,6 +88,8 @@ var _table2 = _interopRequireDefault(_table);
 
 var _formExtHelper = require('../form/formExtHelper');
 
+var _filterEmptySubTblRows = require('../form/filterEmptySubTblRows');
+
 var _FlowChart = require('./FlowChart');
 
 var _FlowChart2 = _interopRequireDefault(_FlowChart);
@@ -2558,8 +2560,8 @@ var PageHome = function (_React$Component) {
 
                 // 定义后续提交逻辑的执行函数
                 var executeSubmitProcess = function executeSubmitProcess() {
-                    var sendData = t.state.editFormData;
-                    var allEditIds = _this2.getAllEditIds(t.state.editFormData);
+                    var sendData = (0, _filterEmptySubTblRows.cloneAndFilterEmptySubTblRows)(t.state.editFormData);
+                    var allEditIds = _this2.getAllEditIds(sendData);
                     var dataId = "";
                     if (allEditIds) {
                         dataId = allEditIds.split(",")[0];
@@ -2571,7 +2573,7 @@ var PageHome = function (_React$Component) {
                     var param = {
                         taskId: _this2.state.taskId,
                         auditorUserIds: auditorUserIds,
-                        allEditIds: _this2.getAllEditIds(t.state.editFormData),
+                        allEditIds: allEditIds,
                         code: _this2.state.code,
                         formData: JSON.stringify(sendData),
                         dataId: dataId,
@@ -3777,14 +3779,15 @@ var PageHome = function (_React$Component) {
                 title: '提示',
                 content: '确定已阅吗？',
                 onConfirm: function onConfirm() {
+                    var submitEditFormData = (0, _filterEmptySubTblRows.cloneAndFilterEmptySubTblRows)(t.state.editFormData);
                     db.FlowModuleAPI.readCompleteTask({
                         dataId: t.state.dataId,
                         taskId: t.state.taskId,
                         permissionCode: t.state.permissionCode,
                         processInstanceId: t.state.processInstanceId,
-                        allEditIds: t.getAllEditIds(t.state.editFormData),
+                        allEditIds: t.getAllEditIds(submitEditFormData),
                         editType: t.state.editType,
-                        formData: JSON.stringify(t.state.editFormData),
+                        formData: JSON.stringify(submitEditFormData),
                         module: t.state.module,
                         comment: newComment,
                         commentAttitude: t.getSelectedCommentAttitude()
@@ -4032,7 +4035,7 @@ var PageHome = function (_React$Component) {
                         while (1) {
                             switch (_context2.prev = _context2.next) {
                                 case 0:
-                                    editFormData = _this3.state.editFormData;
+                                    editFormData = (0, _filterEmptySubTblRows.cloneAndFilterEmptySubTblRows)(_this3.state.editFormData);
                                     nextRadomListSelect = _this3.state.nextRadomList;
                                     nextActivityListSelect = _this3.state.nextActivityList;
                                     selectedActivity = '';
@@ -4315,7 +4318,7 @@ var PageHome = function (_React$Component) {
                                          cshortMessage=circulateShortMessage[0].value;
                                      }*/
 
-                                    allEditIds = _this3.getAllEditIds(t.state.editFormData);
+                                    allEditIds = _this3.getAllEditIds(editFormData);
                                     dataId = "";
 
                                     if (allEditIds) {
@@ -4421,7 +4424,7 @@ var PageHome = function (_React$Component) {
                 this.handleInvalid();
             } else if (operate == 10) {
                 //随机节点结束
-                var editFormData = this.state.editFormData;
+                var editFormData = (0, _filterEmptySubTblRows.cloneAndFilterEmptySubTblRows)(this.state.editFormData);
                 var sshortMessage = '0';
                 var sendShortMessage = t.state.sendShortMessage;
                 /*if(sendShortMessage.length>0){
@@ -4435,7 +4438,7 @@ var PageHome = function (_React$Component) {
                 var param = {
                     taskId: this.state.taskId,
                     selectedActivity: '',
-                    allEditIds: this.getAllEditIds(t.state.editFormData),
+                    allEditIds: this.getAllEditIds(editFormData),
                     corpId: corpid,
                     code: this.state.code,
                     formData: JSON.stringify(editFormData),
@@ -4921,14 +4924,14 @@ var PageHome = function (_React$Component) {
 
             var t = this;
             var db = _db2.default;
-            var editFormData = this.state.editFormData;
+            var editFormData = (0, _filterEmptySubTblRows.cloneAndFilterEmptySubTblRows)(this.state.editFormData);
             newComment = t.state.newspyj.content;
             if (typeof newComment == "undefined" || newComment == '') {
                 newComment = t.state.defaultValue;
             }
             var isPush = t.state.isPush;
 
-            var allEditIds = this.getAllEditIds(t.state.editFormData);
+            var allEditIds = this.getAllEditIds(editFormData);
             var dataId = "";
             if (allEditIds) {
                 dataId = allEditIds.split(",")[0];
@@ -5757,10 +5760,10 @@ var PageHome = function (_React$Component) {
                     $(window).scrollTop(0);
                 });
             } else {
-                var editFormData = this.state.editFormData;
+                var editFormData = (0, _filterEmptySubTblRows.cloneAndFilterEmptySubTblRows)(this.state.editFormData);
                 var param = {
                     taskId: this.state.taskId,
-                    allEditIds: this.getAllEditIds(t.state.editFormData),
+                    allEditIds: this.getAllEditIds(editFormData),
                     code: this.state.code,
                     formData: JSON.stringify(editFormData),
                     dataId: this.state.dataId,
@@ -5982,13 +5985,14 @@ var PageHome = function (_React$Component) {
             if (urgent == '') {
                 urgent = '50';
             }
+            var submitEditFormData = (0, _filterEmptySubTblRows.cloneAndFilterEmptySubTblRows)(t.state.editFormData);
             var param = {
                 formId: t.state.formId,
                 dataId: t.state.dataId,
                 taskId: t.state.taskId,
                 processInstanceId: t.state.processInstanceId,
-                allEditIds: this.getAllEditIds(t.state.editFormData),
-                formData: JSON.stringify(t.state.editFormData),
+                allEditIds: this.getAllEditIds(submitEditFormData),
+                formData: JSON.stringify(submitEditFormData),
                 assignId: assignId,
                 assignName: assignName,
                 hasCommentField: t.state.hasCommentField,
@@ -6614,6 +6618,7 @@ var PageHome = function (_React$Component) {
             if (jumpShortMessage) {
                 shortMessage = jumpShortMessage;
             }
+            var submitEditFormData = (0, _filterEmptySubTblRows.cloneAndFilterEmptySubTblRows)(t.state.editFormData);
             var param = {
                 formId: t.state.formId,
                 dataId: t.state.dataId,
@@ -6621,8 +6626,8 @@ var PageHome = function (_React$Component) {
                 processInstanceId: t.state.processInstanceId,
                 selectedActivity: selectedActivity,
                 auditorUserIds: assignId,
-                allEditIds: t.getAllEditIds(t.state.editFormData),
-                formData: JSON.stringify(t.state.editFormData),
+                allEditIds: t.getAllEditIds(submitEditFormData),
+                formData: JSON.stringify(submitEditFormData),
                 hasCommentField: t.state.hasCommentField,
                 editType: t.state.editType,
                 module: t.state.module,

package/lib/tblform/formSaveUtils.js

@@ -6,9 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.getAllEditIds = getAllEditIds;
 exports.buildRuntimeDataSaveParams = buildRuntimeDataSaveParams;
 exports.isRuntimeSaveSuccess = isRuntimeSaveSuccess;
-/**
- * 纯表单保存：runtimeData 与 processInfo.editFormData 结构一致
- */
+
+var _filterEmptySubTblRows = require('../form/filterEmptySubTblRows');
 
 /** 收集主表/关联表/子表已有数据 id，对应后端 allEditIds */
 function getAllEditIds(data) {
@@ -86,12 +85,16 @@ function getAllEditIds(data) {
 /**
  * 组装 runtimeDataSave 请求参数
  */
+/**
+ * 纯表单保存：runtimeData 与 processInfo.editFormData 结构一致
+ */
 function buildRuntimeDataSaveParams(editFormData, options) {
   var opts = options || {};
   var editType = opts.editType || 'add';
   var existDataId = opts.existDataId != null ? opts.existDataId : editFormData.dataId || '';
 
-  var runtimeData = JSON.parse(JSON.stringify(editFormData));
+  // 提交前过滤空子表行（不改 UI state）
+  var runtimeData = (0, _filterEmptySubTblRows.cloneAndFilterEmptySubTblRows)(editFormData) || {};
   if (!runtimeData.formId && opts.formId) {
     runtimeData.formId = opts.formId;
   }
@@ -99,7 +102,7 @@ function buildRuntimeDataSaveParams(editFormData, options) {
   return {
     runtimeData: JSON.stringify(runtimeData),
     editType: editType,
-    allEditIds: getAllEditIds(editFormData),
+    allEditIds: getAllEditIds(runtimeData),
     existDataId: existDataId || '',
     formType: opts.formType != null ? opts.formType : '4',
     logField: opts.logField || '',

package/package.json

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