fmui-base 2.2.85 → 2.2.87

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.2.87：选人组件添加隐藏页签,增加业务建模表单组件
+- 2.2.86: 流程表单按钮超过三个按钮显示更多，修改更多按钮样式，待办保存按钮强制放到更多里面
 - 2.2.85: 北京ca开启电子签章获取ca签名，不受表单加签控制
 - 2.2.84: 选人组件baseCorpId取值问题修复
 - 2.2.83: 批示意见增加签名印章功能

package/lib/db/db.js

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

package/lib/db/variables.js

@@ -65,7 +65,9 @@ exports.default = {
         batchFavoriteProcess: urlPrefix + 'batchFavoriteProcess' + '?', //批量添加常用流程的接口
         getRemindBadgeCount: urlPrefix + 'getRemindBadgeCount' + '?', //分类统计小红点
         queryProcessForm: urlPrefix + 'getMobileForm' + '?', //获取流程表单
+        getPureMobileForm: urlPrefix + 'getPureMobileForm' + '?', //获取纯表单（无流程）
         getRelaFieldsMap: formUrlPrefix + 'relafield/getRelaFieldsMap' + '?', //获取关联表单字段
+        runtimeDataSave: formUrlPrefix + 'runtime/runtimeDataSave' + '?', //纯表单运行时保存
         getNoInvoiceList: formUrlPrefix + 'form/invoice/getNoInvoiceList' + '?', //获取未开票列表
         getComponentInfoList: urlBasicPrefix + 'mobilehall/mobileoffice/getComponentInfoList' + '?', //获取关联表单字段
 

package/lib/form/form.js

@@ -115,6 +115,8 @@ var _db = require('../db/db');
 
 var _db2 = _interopRequireDefault(_db);
 
+var _formExtHelper = require('./formExtHelper');
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -169,11 +171,13 @@ var PageHome = function (_React$Component) {
     /* alert(commentField);*/
     var context = document.getElementById("context").value;
     //alert(props.defaultValue);
-    var module = props.module && props.module != "undefined" ? props.module : "approve";
+    var extLoaded = (0, _formExtHelper.loadFlowOrFormCommon)(props);
+    var module = extLoaded.module;
+    FlowCommon = extLoaded.FlowCommon;
     var isRemoveCommentFormHtml = props.isRemoveCommentFormHtml && props.isRemoveCommentFormHtml != "undefined" ? props.isRemoveCommentFormHtml : "0";
-    FlowCommon = require('pages/flow_common/' + module).default ? require('pages/flow_common/' + module).default : require('pages/flow_common/' + module);
     _this.state = {
       module: module,
+      formCode: extLoaded.formCode,
       fold: true,
       atfold: true,
       status: status,
@@ -1342,12 +1346,12 @@ var PageHome = function (_React$Component) {
         //在线编辑
         var formDataAttr = form.dataAttr;
         itemParam.webofficeDownload = formDataAttr && formDataAttr.webofficeDownload == '0' ? false : true;
-        if (typeof FlowCommon.dealwithWeboffice === "function" && value != null && value != "") {
+        if (FlowCommon && typeof FlowCommon.dealwithWeboffice === "function" && value != null && value != "") {
           FlowCommon.dealwithWeboffice(value, function (content) {
             itemParam.initIds = content;
             itemParam.value = value;
             //处理特有按钮事件
-            if (typeof FlowCommon.dealwithCommonFormParam === "function") {
+            if (FlowCommon && typeof FlowCommon.dealwithCommonFormParam === "function") {
               itemParam = FlowCommon.dealwithCommonFormParam(itemParam, this);
               itemType = itemParam.itemType;
             }
@@ -1355,12 +1359,12 @@ var PageHome = function (_React$Component) {
             var mobileExt;
             try {
               if (formKey) {
-                mobileExt = typeof eval(module + "_" + formKey + "_mobileExt") !== 'undefined' ? eval(module + "_" + formKey + "_mobileExt") : null;
+                mobileExt = (0, _formExtHelper.resolveMobileFormExt)(this.props.formCode, module, formKey);
               }
             } catch (e) {
               // alert("exception: "+e.message);
             }
-            if (typeof mobileExt !== 'undefined' && typeof mobileExt["dealwithFormParamExt"] === "function") {
+            if (mobileExt && typeof mobileExt["dealwithFormParamExt"] === "function") {
               itemParam = mobileExt["dealwithFormParamExt"](itemParam, this);
               itemType = itemParam.itemType;
             }
@@ -1400,7 +1404,7 @@ var PageHome = function (_React$Component) {
           itemParam.value = value;
 
           //处理特有按钮事件
-          if (typeof FlowCommon.dealwithCommonFormParam === "function") {
+          if (FlowCommon && typeof FlowCommon.dealwithCommonFormParam === "function") {
             itemParam = FlowCommon.dealwithCommonFormParam(itemParam, this);
             itemType = itemParam.itemType;
           }
@@ -1408,12 +1412,12 @@ var PageHome = function (_React$Component) {
           var mobileExt;
           try {
             if (formKey) {
-              mobileExt = typeof eval(module + "_" + formKey + "_mobileExt") !== 'undefined' ? eval(module + "_" + formKey + "_mobileExt") : null;
+              mobileExt = (0, _formExtHelper.resolveMobileFormExt)(this.props.formCode, module, formKey);
             }
           } catch (e) {
             // alert("exception: "+e.message);
           }
-          if (typeof mobileExt !== 'undefined' && typeof mobileExt[module + "_dealwithFormParamExt"] === "function") {
+          if (mobileExt && typeof mobileExt[module + "_dealwithFormParamExt"] === "function") {
             itemParam = mobileExt[module + "_dealwithFormParamExt"](itemParam, this);
             itemType = itemParam.itemType;
           }
@@ -1495,7 +1499,7 @@ var PageHome = function (_React$Component) {
         itemParam.value = value;
 
         //处理特有按钮事件
-        if (typeof FlowCommon.dealwithCommonFormParam === "function") {
+        if (FlowCommon && typeof FlowCommon.dealwithCommonFormParam === "function") {
           itemParam = FlowCommon.dealwithCommonFormParam(itemParam, this);
           itemType = itemParam.itemType;
         }
@@ -1511,12 +1515,12 @@ var PageHome = function (_React$Component) {
         var mobileExt;
         try {
           if (formKey) {
-            mobileExt = typeof eval(module + "_" + formKey + "_mobileExt") !== 'undefined' ? eval(module + "_" + formKey + "_mobileExt") : null;
+            mobileExt = (0, _formExtHelper.resolveMobileFormExt)(this.props.formCode, module, formKey);
           }
         } catch (e) {
           // alert("exception: "+e.message);
         }
-        if (typeof mobileExt !== 'undefined' && typeof mobileExt["dealwithFormParamExt"] === "function") {
+        if (mobileExt && typeof mobileExt["dealwithFormParamExt"] === "function") {
           itemParam = mobileExt["dealwithFormParamExt"](itemParam, this);
           itemType = itemParam.itemType;
         }
@@ -1600,12 +1604,12 @@ var PageHome = function (_React$Component) {
         var mobileExt;
         try {
           if (formKey) {
-            mobileExt = typeof eval(module + "_" + formKey + "_mobileExt") !== 'undefined' ? eval(module + "_" + formKey + "_mobileExt") : null;
+            mobileExt = (0, _formExtHelper.resolveMobileFormExt)(this.props.formCode, module, formKey);
           }
         } catch (e) {
           // alert("exception: "+e.message);
         }
-        if (typeof mobileExt !== 'undefined' && typeof mobileExt["casigin"] === "function") {
+        if (mobileExt && typeof mobileExt["casigin"] === "function") {
           var isVerifySing = mobileExt["casigin"](itemParam, data, uniqueName, isVerifySingValue);
           itemParam.isVerifySing = isVerifySing;
           this.setState(itemParam);
@@ -2166,7 +2170,7 @@ var PageHome = function (_React$Component) {
       var fieldTblId = itemParam.tblId;
       var fieldTblName = itemParam.tblName;
       //处理操作返回数据
-      if (typeof FlowCommon.dealwithReturnData === "function") {
+      if (FlowCommon && typeof FlowCommon.dealwithReturnData === "function") {
         FlowCommon.dealwithReturnData(itemCode, value, function (itemCode1, value1) {
           itemCode = itemCode1;
           value = value1;

package/lib/form/formExtHelper.js

@@ -0,0 +1,152 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.loadFlowOrFormCommon = loadFlowOrFormCommon;
+exports.resolveMobileFormExt = resolveMobileFormExt;
+/**
+ * 表单扩展加载：流程 flow_common / 纯表单 form_common
+ *
+ * form_common 使用包内 require.context('./form_common')，避免宿主无 pages/form_common 时 webpack 告警。
+ * 宿主扩展目录请通过 webpack alias 映射到 fmui-base/lib/form/form_common（见 tblform/README）。
+ */
+
+var formCommonContext = require.context('./form_common', false, /\.js$/);
+
+function loadFormCommonModule(formCode) {
+
+  if (!formCode) {
+
+    return null;
+  }
+
+  var keys = ['./' + formCode + '.js', './' + formCode];
+
+  for (var i = 0; i < keys.length; i++) {
+
+    if (!formCommonContext.keys().includes(keys[i])) {
+
+      continue;
+    }
+
+    try {
+
+      var mod = formCommonContext(keys[i]);
+
+      return mod.default ? mod.default : mod;
+    } catch (e) {
+
+      // try next key
+
+    }
+  }
+
+  return loadFormCommonFromGlobal(formCode);
+}
+
+/** 宿主可在 window 挂载 {formCode}_formCommon，无需改 node_modules */
+
+function loadFormCommonFromGlobal(formCode) {
+
+  if (!formCode) {
+
+    return null;
+  }
+
+  try {
+
+    var globalName = formCode + '_formCommon';
+
+    if (typeof window !== 'undefined' && window[globalName]) {
+
+      return window[globalName];
+    }
+
+    if (typeof global !== 'undefined' && global[globalName]) {
+
+      return global[globalName];
+    }
+  } catch (e) {
+
+    // ignore
+
+  }
+
+  return null;
+}
+
+function loadFlowOrFormCommon(props) {
+
+  var formCode = props && props.formCode || '';
+
+  var module = props && props.module;
+
+  if (module === undefined || module === null || module === 'undefined') {
+
+    module = formCode ? '' : 'approve';
+  }
+
+  var FlowCommon = null;
+
+  try {
+
+    if (formCode) {
+
+      FlowCommon = loadFormCommonModule(formCode);
+    } else if (module) {
+
+      var mod = require('pages/flow_common/' + module);
+
+      FlowCommon = mod.default ? mod.default : mod;
+    }
+  } catch (e) {
+
+    FlowCommon = null;
+  }
+
+  return { FlowCommon: FlowCommon, module: module, formCode: formCode };
+}
+
+/** form_common: {formCode}_mobileExt；流程: {module}_{formKey}_mobileExt */
+
+function resolveMobileFormExt(formCode, module, formKey) {
+
+  if (formCode) {
+
+    try {
+
+      var extName = formCode + '_mobileExt';
+
+      if (typeof eval(extName) !== 'undefined') {
+
+        return eval(extName);
+      }
+    } catch (e) {
+
+      // ignore
+
+    }
+
+    return null;
+  }
+
+  if (module && formKey) {
+
+    try {
+
+      var _extName = module + '_' + formKey + '_mobileExt';
+
+      if (typeof eval(_extName) !== 'undefined') {
+
+        return eval(_extName);
+      }
+    } catch (e) {
+
+      // ignore
+
+    }
+  }
+
+  return null;
+}

package/lib/form/form_common/.placeholder.js

@@ -0,0 +1,5 @@
+/**
+ * 占位模块：无 form_common 扩展时不报错。
+ * 业务扩展请放在宿主工程 pages/form_common/，并通过 webpack alias 指向本目录（见 tblform/README）。
+ */
+export default {};

package/lib/form/subForm.js

@@ -23,6 +23,8 @@ var _form = require('./form');
 
 var _form2 = _interopRequireDefault(_form);
 
+var _formExtHelper = require('./formExtHelper');
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -34,6 +36,7 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"
 var HBox = _Boxs2.default.HBox,
     Box = _Boxs2.default.Box;
 
+
 var FlowCommon = void 0;
 
 var PageHome = function (_React$Component) {
@@ -49,14 +52,16 @@ var PageHome = function (_React$Component) {
     var status = props.status;
     var context = document.getElementById("context").value;
 
-    var module = props.module && props.module != "undefined" ? props.module : "approve";
-    FlowCommon = require('pages/flow_common/' + module).default ? require('pages/flow_common/' + module).default : require('pages/flow_common/' + module);
+    var extLoaded = (0, _formExtHelper.loadFlowOrFormCommon)(props);
+    var module = extLoaded.module;
+    FlowCommon = extLoaded.FlowCommon;
     //需要隐藏表头的子表表名
     var isHideSubTblHeadTblList = ['dj_org_mb_duty_now'];
 
     // var itemParam = 
     _this.state = {
       module: module,
+      formCode: extLoaded.formCode,
       status: status,
       fieldControll: props.fieldControll,
       urlPrev: context + '/dingisv/api/common/viewImage?fid=',
@@ -189,7 +194,7 @@ var PageHome = function (_React$Component) {
       itemParam.value = value;
       itemParam.detailAction = form.detailAction; //添加事件名字
       //处理特有按钮事件
-      if (typeof FlowCommon.dealwithCommonFormParam === "function") {
+      if (FlowCommon && typeof FlowCommon.dealwithCommonFormParam === "function") {
         itemParam = FlowCommon.dealwithCommonFormParam(itemParam, this);
       }
 
@@ -197,12 +202,12 @@ var PageHome = function (_React$Component) {
       var mobileExt;
       try {
         if (formKey) {
-          mobileExt = typeof eval(module + "_" + formKey + "_mobileExt") !== 'undefined' ? eval(module + "_" + formKey + "_mobileExt") : null;
+          mobileExt = (0, _formExtHelper.resolveMobileFormExt)(this.props.formCode, module, formKey);
         }
       } catch (e) {
         // alert("exception: "+e.message);
       }
-      if (typeof mobileExt !== 'undefined' && typeof mobileExt["dealwithFormParamExt"] === "function") {
+      if (mobileExt && typeof mobileExt["dealwithFormParamExt"] === "function") {
         itemParam = mobileExt["dealwithFormParamExt"](itemParam, this);
         itemType = itemParam.itemType;
       }
@@ -777,7 +782,7 @@ var PageHome = function (_React$Component) {
   }, {
     key: 'extOperate',
     value: function extOperate(i, itemParam, buttonFun, extParam) {
-      if (typeof FlowCommon.subFormItemExtOperate === "function") {
+      if (FlowCommon && typeof FlowCommon.subFormItemExtOperate === "function") {
         FlowCommon.subFormItemExtOperate(this.state, i, itemParam, buttonFun, extParam, this);
       }
     }

package/lib/form/table.js

@@ -61,6 +61,8 @@ var _db = require('../db/db');
 
 var _db2 = _interopRequireDefault(_db);
 
+var _formExtHelper = require('./formExtHelper');
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -247,10 +249,16 @@ var PageHome = function (_React$Component) {
 			chooseSignature: []
 		};
 
-		var module = props.module && props.module != "undefined" ? props.module : "approve";
-		try {
-			FlowCommon = require('pages/flow_common/' + module).default ? require('pages/flow_common/' + module).default : require('pages/flow_common/' + module);
-		} catch (error) {}
+		var module = props.module;
+		if (module === undefined || module === null || module === 'undefined') {
+			module = 'approve';
+		}
+		// module 为空时不加载 flow_common（纯表单 TblForm 使用 form_common）
+		if (module) {
+			try {
+				FlowCommon = require('pages/flow_common/' + module).default ? require('pages/flow_common/' + module).default : require('pages/flow_common/' + module);
+			} catch (error) {}
+		}
 
 		// DB.form.getRelaFieldsMap({
 		// 	formId: formId,
@@ -353,23 +361,17 @@ var PageHome = function (_React$Component) {
 				}
 				// var subTblNo = data.subTblNo; 
 				//处理特有参数
-				if (typeof FlowCommon.dealwithFormItemChange === "function") {
+				if (FlowCommon && typeof FlowCommon.dealwithFormItemChange === "function") {
 					try {
 						FlowCommon.dealwithFormItemChange(itemParam, this);
 					} catch (error) {
 						console.log("Error occurred while dealing with form item change:", error);
 					}
 				}
-				var mobileExt;
-				try {
-					if (formKey) {
-						mobileExt = typeof eval(module + "_" + formKey + "_mobileExt") !== 'undefined' ? eval(module + "_" + formKey + "_mobileExt") : null;
-					}
-				} catch (e) {}
-				// alert("exception: "+e.message);
-
+				var formCode = t.props.formCode || t.state && t.state.formCode || '';
+				var mobileExt = (0, _formExtHelper.resolveMobileFormExt)(formCode, module, formKey);
 				//项目开发扩展
-				if (typeof mobileExt !== 'undefined' && typeof mobileExt["dealwithFormItemChangeExt"] === "function") {
+				if (mobileExt && typeof mobileExt["dealwithFormItemChangeExt"] === "function") {
 					mobileExt["dealwithFormItemChangeExt"](itemParam, this, function (paramsExt) {
 						if (paramsExt.length > 0) {
 							paramsExt.map(function (itemExt) {

package/lib/process_info/processInfo.js

@@ -6527,13 +6527,20 @@ var PageHome = function (_React$Component) {
                     }
                     buttonCodeList = buttonCodeList.concat();
                     var alllength = buttonCodeList.length + extensionButtonList.length;
-                    if (alllength > 4) {
-                        buttonList.push({ name: '更多', type: 'text', display: 'inline', no: -1 });
+                    if (alllength > 3) {
+                        buttonList.push({ name: '更多', type: 'secondary', display: 'inline', no: -1 });
                         var buttonCodeListNew = [];
+                        var mainSlotCount = 0;
+                        var todoSaveInMore = _this3.state.listType == "0";
                         for (var c = 0; c < buttonCodeList.length; c++) {
                             var buttonCode = buttonCodeList[c]['buttonCode'];
                             var buttonName = buttonCodeList[c]['buttonName'];
-                            if (c < 3) {
+                            if (todoSaveInMore && buttonCode == 'PAGE_SAVE') {
+                                actionSheetButtonOpt.push(buttonCode);
+                                actionSheetButtonOptName.push(buttonName);
+                                continue;
+                            }
+                            if (mainSlotCount < 2) {
                                 if (buttonCode == 'BACK') {
                                     buttonCodeListNew.push({ name: buttonName, type: 'danger', display: 'inline', no: 2 });
                                 } else if (buttonCode == 'PAGE_SAVE') {
@@ -6565,18 +6572,15 @@ var PageHome = function (_React$Component) {
                                 } else {
                                     buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: buttonCode });
                                 }
-                            } else if (c == 3) {
-                                //buttonList.push({name:'更多',type:'secondary',display:'banner',no:-1});
-                                actionSheetButtonOpt.push(buttonCode);
-                                actionSheetButtonOptName.push(buttonName);
-                            } else if (c > 3) {
+                                mainSlotCount++;
+                            } else {
                                 actionSheetButtonOpt.push(buttonCode);
                                 actionSheetButtonOptName.push(buttonName);
                             }
                         }
-                        var nowNum = buttonCodeList.length;
+                        var nowNum = mainSlotCount;
                         for (var d = 0; d < extensionButtonList.length; d++) {
-                            if (nowNum < 3) {
+                            if (nowNum < 2) {
                                 buttonList.push(extensionButtonList[d]);
                             } else {
                                 actionSheetButtonOpt.push(extensionButtonList[d].no);