fmui-base 2.3.13 → 2.3.15

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.3.15：时分字段保存丢失值，子表删除时页面空白
+- 2.3.14：表单切换组织增加开关
 - 2.3.13：子表字段带$时计算不生效，表单切换组织时，表单赋值的宏值实时更新
 - 2.3.12：门户首页grid常用应用部件增加扩展入口调整为页签（一网通办项目需求，临时版本）
 - 2.3.11：子表支持子表按钮自定义

package/lib/form/form.js

@@ -690,8 +690,8 @@ var PageHome = function (_React$Component) {
         itemParam.decimalPlace = form.decimalPlace; //小数位数
         itemParam.dataAttr = form['dataAttr'];
         itemParam.maxlength = form['length'];
-        /*if(itemParam.dataAttr){
-          alert("265====="+itemParam.dataAttr.textLineFeed);
+        /*if(itemParam.dataAttr){
+          alert("265====="+itemParam.dataAttr.textLineFeed);
         }*/
         //宏值签名图片
         // if(itemParam.dataAttr && itemParam.dataAttr.dataSrc=='2' && !readOnly && !itemParam.bizCodeRuleId){
@@ -945,11 +945,11 @@ var PageHome = function (_React$Component) {
                   if (value == item.value) {
                     value = { value: value, text: item.name };
                   }
-                  /*}else{
-                    var defaultValue=form.defaultValue;
-                    if(defaultValue == item.value){
-                      value = {value:value,text:item.name};
-                    }
+                  /*}else{
+                    var defaultValue=form.defaultValue;
+                    if(defaultValue == item.value){
+                      value = {value:value,text:item.name};
+                    }
                   }*/
                   selectOptions.push(option);
                 }
@@ -993,8 +993,21 @@ var PageHome = function (_React$Component) {
 
         if (form.dataAttr && typeof form.dataAttr != "undefined") {
           var dateDisplayFormat = form.dataAttr.dateDisplayFormat;
-          if (dateDisplayFormat == "STime" || dateFormat == "YMDHM") {
+          // 优先按 dateDisplayFormat 识别展示类型；勿用 form.dateFormat==YMDHM 抢先匹配，
+          // 否则时分(HourMin)进不了分支，HH:mm 会被下方当作无效值清空
+          if (dateDisplayFormat == "HourMin") {
             dateFormat = "YMDHM";
+            if (value && typeof value === 'string') {
+              var hm = value.trim();
+              // HH:mm / H:mm / HH:mm:ss
+              if (/^\d{1,2}:\d{2}(:\d{2})?$/.test(hm)) {
+                var hmParts = hm.split(':');
+                var hh = hmParts[0].length === 1 ? '0' + hmParts[0] : hmParts[0];
+                var mm = hmParts[1];
+                value = formattedDate + " " + hh + ":" + mm + ":00";
+              }
+            }
+            dateFormatShow = "HourMin";
           } else if (dateDisplayFormat == "YearMon") {
             dateFormat = "YM";
           } else if (dateDisplayFormat == "MonthDay") {
@@ -1003,12 +1016,6 @@ var PageHome = function (_React$Component) {
             dateFormat = "Y";
           } else if (dateDisplayFormat == "ODate") {
             dateFormat = "YMD";
-          } else if (dateDisplayFormat == "HourMin") {
-            dateFormat = "YMDHM";
-            if (value && value.length == 5) {
-              value = formattedDate + " " + value + ":00";
-            }
-            dateFormatShow = "HourMin";
           } else if (dateDisplayFormat == "zhDate") {
             dateFormat = "YMD";
             dateFormatShow = "zhDate";
@@ -1021,6 +1028,8 @@ var PageHome = function (_React$Component) {
           } else if (dateDisplayFormat == "DateTimeInterval") {
             dateFormat = "DateInterval";
             dateFormatShow = "dayWithTime";
+          } else if (dateDisplayFormat == "STime" || dateFormat == "YMDHM") {
+            dateFormat = "YMDHM";
           } else {
             dateFormat = "YMDHM";
           }
@@ -1112,6 +1121,11 @@ var PageHome = function (_React$Component) {
             value = new Date(value).getTime();
           } else if (value && typeof value === 'string' && value.length == 7 && dateFormat == "YM") {
             value = new Date(value).getTime();
+          } else if (dateFormatShow == 'HourMin' && value && typeof value === 'string' && /^\d{1,2}:\d{2}(:\d{2})?$/.test(value.trim())) {
+            // 时分兜底：仍为 HH:mm 时拼当前日期再转时间戳，避免被清空
+            var hmFallback = value.trim().split(':');
+            var hhFallback = hmFallback[0].length === 1 ? '0' + hmFallback[0] : hmFallback[0];
+            value = new Date((formattedDate + " " + hhFallback + ":" + hmFallback[1] + ":00").replace(/-/g, "/")).getTime();
           } else {
             for (var i = 0; i < mainTblData.length; i++) {
               if (itemParam.key == mainTblData[i].key) {
@@ -2069,26 +2083,32 @@ var PageHome = function (_React$Component) {
               }
             } else if (itemParam.itemType == 'checkbox') {
               var selectOptions = itemParam.selectOptions;
-              var valueHas = false; //判断传过来的值是否有匹配
               var value = itemNew[i].value;
-              var valueArray = value.split(",");
-              selectOptions.map(function (item1) {
-                var isHas = false;
-                valueArray.map(function (item2) {
-                  if (item1.value == item2) {
-                    item1.checked = true;
-                    selectText += item1.text + ',';
-                    isHas = true;
+              // 子表删除后刷新时 value 可能为 undefined/null，直接 split 会报错
+              var valueArray = value == null || value === '' ? [] : String(value).split(",");
+              if (itemParam.isinput == '1') {
+                // 多选可输入走 SelectInput，无 checkbox_ ref
+                itemParam[key] = value == null ? '' : value;
+              } else {
+                selectOptions.map(function (item1) {
+                  var isHas = false;
+                  valueArray.map(function (item2) {
+                    if (item1.value == item2) {
+                      item1.checked = true;
+                      selectText += item1.text + ',';
+                      isHas = true;
+                    }
+                  });
+                  if (!isHas) {
+                    item1.checked = false;
                   }
                 });
-                if (!isHas) {
-                  item1.checked = false;
+                if (selectText != '') {
+                  selectText = selectText.substring(0, selectText.length - 1);
                 }
-              });
-              if (selectText != '') {
-                selectText = selectText.substring(0, selectText.length - 1);
+                itemParam[key] = value == null ? '' : value;
+                checkboxValueHas = true;
               }
-              checkboxValueHas = true;
             } else if (itemParam.itemType == 'datetime') {
               itemParam[key] = itemNew[i].value;
               if (this.props.data) {
@@ -2114,9 +2134,12 @@ var PageHome = function (_React$Component) {
           itemParam: Object.assign({}, itemParam)
         }, function () {
           if (checkboxValueHas) {
-            this.refs["checkbox_" + itemParam.tableName + "_" + itemParam.key].setState({
-              selectedText: selectText
-            });
+            var checkboxRef = this.refs["checkbox_" + itemParam.tableName + "_" + itemParam.key];
+            if (checkboxRef && typeof checkboxRef.setState === 'function') {
+              checkboxRef.setState({
+                selectedText: selectText
+              });
+            }
           }
           // if(dataType=='sub'){
           //   this.props.reloadItemParam(itemNew,this.state.itemParam);
@@ -2360,21 +2383,21 @@ var PageHome = function (_React$Component) {
       var length = item.maxlength;
       var patrn = /^-?\d+(\.\d+)?$/;
       if (newValue !== '' && newValue != '-') {
-        /* var validAttr=item['validAttr'];
-          if(validAttr!=null && validAttr.length>0){
-            for(var va=0;va<validAttr.length;va++){
-              var regular=validAttr[va]['regular'];
-              var tips=validAttr[va]['tips'];
-              var reg=new RegExp(regular.slice(1,-1),"g"); 
-              if(!reg.test(newValue)){
-                Toast.show({
-                        type: 'error',
-                        content:item.title+':'+tips
-                      });
-                      return false;
-              }
-              
-            }
+        /* var validAttr=item['validAttr'];
+          if(validAttr!=null && validAttr.length>0){
+            for(var va=0;va<validAttr.length;va++){
+              var regular=validAttr[va]['regular'];
+              var tips=validAttr[va]['tips'];
+              var reg=new RegExp(regular.slice(1,-1),"g"); 
+              if(!reg.test(newValue)){
+                Toast.show({
+                        type: 'error',
+                        content:item.title+':'+tips
+                      });
+                      return false;
+              }
+              
+            }
           }*/
         if (this.checkEmoji(newValue)) {
           _Toast2.default.show({
@@ -2847,8 +2870,21 @@ var PageHome = function (_React$Component) {
       if ((typeof value === 'undefined' ? 'undefined' : _typeof(value)) === 'object' && value != null && value.value != null) {
         raw = value.value;
       }
+      // 时分：只读回显已是 HH:mm，new Date('HH:mm') 无效会导致提交值被清空
+      if (dateFormatShow === 'HourMin' && typeof raw === 'string') {
+        var hmStr = raw.trim();
+        if (/^\d{1,2}:\d{2}(:\d{2})?$/.test(hmStr)) {
+          var p = hmStr.split(':');
+          var h = p[0].length === 1 ? '0' + p[0] : p[0];
+          return h + ':' + p[1];
+        }
+      }
       if (typeof raw === 'string') {
         if (raw.length >= 10 && raw.indexOf('-') >= 0) {
+          // 时分字段提交仍只需 HH:mm
+          if (dateFormatShow === 'HourMin') {
+            return this.dateFormat(new Date(raw.replace(/-/g, '/')).getTime(), dateFormat, dateFormatShow) || '';
+          }
           return raw.substring(0, 19);
         }
         if (/^\d+$/.test(raw)) {
@@ -3386,12 +3422,12 @@ var PageHome = function (_React$Component) {
         });
         return false;
       }
-      /*  if(newValue=''){
-        Toast.show({
-                      type: 'error',
-                      content: '意见不能为空！',
-                  });
-                  return false;
+      /*  if(newValue=''){
+        Toast.show({
+                      type: 'error',
+                      content: '意见不能为空！',
+                  });
+                  return false;
       }*/
       if (newValue.length > 2000) {
         newValue = newValue.substring(0, 2000);

package/lib/form/subForm.js

@@ -335,28 +335,28 @@ var PageHome = function (_React$Component) {
       var data = this.props.data;
       var subTblList = data.subTbl; //子表
       var relatedTbl = data.relatedTbl; //关联表
-      /* var calculateExpList = data.calculateExpList;//计算公式列表 
-       var calculateExpList1 = value.calculateExpList;//计算公式列表
-       if(calculateExpList1){
-       	for(var key in calculateExpList1){
-       		  var calculateExpValue;
-                 if(calculateExpList){
-                   calculateExpValue = calculateExpList[key];
-                   if(!calculateExpValue){
-                     calculateExpValue = [];
-                   }
-                 }else{
-                   calculateExpList = {};
-                   calculateExpValue = [];
-                 }
-                 for(var j=0;j<calculateExpList1[key].length;j++){
-               	  calculateExpValue.push(calculateExpList1[key][j]);
-                 }
-                 calculateExpList[key] = calculateExpValue;
-       		  
-       	}
-       	
-       	data.calculateExpList = calculateExpList;
+      /* var calculateExpList = data.calculateExpList;//计算公式列表 
+       var calculateExpList1 = value.calculateExpList;//计算公式列表
+       if(calculateExpList1){
+       	for(var key in calculateExpList1){
+       		  var calculateExpValue;
+                 if(calculateExpList){
+                   calculateExpValue = calculateExpList[key];
+                   if(!calculateExpValue){
+                     calculateExpValue = [];
+                   }
+                 }else{
+                   calculateExpList = {};
+                   calculateExpValue = [];
+                 }
+                 for(var j=0;j<calculateExpList1[key].length;j++){
+               	  calculateExpValue.push(calculateExpList1[key][j]);
+                 }
+                 calculateExpList[key] = calculateExpValue;
+       		  
+       	}
+       	
+       	data.calculateExpList = calculateExpList;
        }*/
 
       this.dealwithSubData(subTblList, subTblNo, value, relatedTbl);
@@ -875,8 +875,11 @@ var PageHome = function (_React$Component) {
           for (var n = 0; n < tblData.length; n++) {
             var key = tblData[n].key;
             var value = tblData[n].value;
+            if (value == null) {
+              value = '';
+            }
             if (this.refs[tblName + '_' + key + '_' + m]) {
-              this.refs[tblName + '_' + key + '_' + m].reloadItemParam([{ 'key': 'value', 'value': value }]);
+              this.refs[tblName + '_' + key + '_' + m].reloadItemParam([{ 'key': 'value', 'value': value }], { silent: true });
             }
           }
         }

package/lib/process_info/processInfo.js

@@ -517,7 +517,7 @@ var PageHome = function (_React$Component) {
             selectProcessCode: '', //选中的子流程
             subProcessType: '', //子流程类型 0串行  1并行
             urgencyList: [], //紧急程度列表
-            urgency: '' }, _defineProperty(_param, 'urgent', ''), _defineProperty(_param, 'backInitiatorEndFlow', '0'), _defineProperty(_param, 'oauthWindowURL', ''), _defineProperty(_param, 'signDataId', ''), _defineProperty(_param, 'isCaUser', '0'), _defineProperty(_param, 'caFirm', ''), _defineProperty(_param, 'caESignatureName', ''), _defineProperty(_param, 'caFormSign', ''), _defineProperty(_param, 'addlotsReturn', ''), _defineProperty(_param, 'inscriptionShow', ''), _defineProperty(_param, 'showOrgSwitcher', false), _defineProperty(_param, 'approveOrgOptions', []), _defineProperty(_param, 'approveOrgSelectValue', {}), _defineProperty(_param, 'approveCurOrgId', ''), _defineProperty(_param, 'startUserOrgId', ''), _defineProperty(_param, 'taskAssignOrgId', ''), _defineProperty(_param, 'approveOrgApiUnavailable', false), _param);
+            urgency: '' }, _defineProperty(_param, 'urgent', ''), _defineProperty(_param, 'backInitiatorEndFlow', '0'), _defineProperty(_param, 'oauthWindowURL', ''), _defineProperty(_param, 'signDataId', ''), _defineProperty(_param, 'isCaUser', '0'), _defineProperty(_param, 'caFirm', ''), _defineProperty(_param, 'caESignatureName', ''), _defineProperty(_param, 'caFormSign', ''), _defineProperty(_param, 'addlotsReturn', ''), _defineProperty(_param, 'inscriptionShow', ''), _defineProperty(_param, 'showOrgSwitcher', false), _defineProperty(_param, 'approveOrgOptions', []), _defineProperty(_param, 'approveOrgSelectValue', {}), _defineProperty(_param, 'approveFormParttimeOrgEnabled', true), _defineProperty(_param, 'approveCurOrgId', ''), _defineProperty(_param, 'startUserOrgId', ''), _defineProperty(_param, 'taskAssignOrgId', ''), _defineProperty(_param, 'approveOrgApiUnavailable', false), _param);
         FlowCommon = require('pages/flow_common/' + module).default ? require('pages/flow_common/' + module).default : require('pages/flow_common/' + module);
 
         //处理特有参数
@@ -7638,10 +7638,18 @@ var PageHome = function (_React$Component) {
                 value: org.id
             };
         }
+
+        /** 流程设置「表单切换兼职组织」是否启用，默认启用（仅明确为 0 时禁用） */
+
+    }, {
+        key: 'isApproveFormParttimeOrgEnabled',
+        value: function isApproveFormParttimeOrgEnabled() {
+            return this.state.approveFormParttimeOrgEnabled !== false;
+        }
     }, {
         key: 'renderApproveOrgSwitcher',
         value: function renderApproveOrgSwitcher(orgList, selectedOrgId) {
-            if (!orgList || orgList.length <= 1) {
+            if (!this.isApproveFormParttimeOrgEnabled() || !orgList || orgList.length <= 1) {
                 this.setState({
                     showOrgSwitcher: false,
                     approveOrgOptions: [],
@@ -7686,44 +7694,85 @@ var PageHome = function (_React$Component) {
             if (!window.approveOrgAutoSwitchedMap) {
                 window.approveOrgAutoSwitchedMap = {};
             }
-            _db2.default.FlowModuleAPI.getUserSetInfo({}).then(function (userInfo) {
-                if (currentSeq != window.approveOrgSwitcherSeq || t.state.approveOrgApiUnavailable) {
-                    return;
-                }
-                if (!userInfo) {
-                    t.hideApproveOrgSwitcherSilently();
-                    return;
-                }
-                if (userInfo.content && !userInfo.orgList) {
-                    userInfo = userInfo.content;
-                }
-                var orgList = userInfo.orgList || [];
-                if (!orgList || orgList.length <= 1) {
-                    t.setState({ showOrgSwitcher: false });
-                    return;
-                }
-                var curOrgId = userInfo.curOrgId || '';
-                var targetOrgId = t.resolveApproveOrgTargetId(orgList, curOrgId, t.state.taskAssignOrgId, t.state.startUserOrgId);
-                if (targetOrgId && targetOrgId != curOrgId && !window.approveOrgAutoSwitchedMap[autoSwitchKey]) {
-                    t.switchApproveOrg(targetOrgId, function () {
-                        if (currentSeq != window.approveOrgSwitcherSeq) {
-                            return;
-                        }
-                        window.approveOrgAutoSwitchedMap[autoSwitchKey] = true;
-                        t.renderApproveOrgSwitcher(orgList, targetOrgId);
-                    }, function () {
-                        if (currentSeq != window.approveOrgSwitcherSeq) {
-                            return;
+            // 先读取流程设置「表单切换兼职组织」（默认启用）
+            var loadOrgSwitcher = function loadOrgSwitcher(parttimeOrgEnabled) {
+                t.setState({ approveFormParttimeOrgEnabled: parttimeOrgEnabled !== false });
+                _db2.default.FlowModuleAPI.getUserSetInfo({}).then(function (userInfo) {
+                    if (currentSeq != window.approveOrgSwitcherSeq || t.state.approveOrgApiUnavailable) {
+                        return;
+                    }
+                    if (!userInfo) {
+                        t.hideApproveOrgSwitcherSilently();
+                        return;
+                    }
+                    if (userInfo.content && !userInfo.orgList) {
+                        userInfo = userInfo.content;
+                    }
+                    var orgList = userInfo.orgList || [];
+                    var showSwitcher = parttimeOrgEnabled !== false && orgList && orgList.length > 1;
+                    if (!orgList || orgList.length == 0 || !showSwitcher) {
+                        // 开关禁用但有兼职时，仍可静默切到目标组织，仅隐藏切换区
+                        if (orgList && orgList.length > 1 && parttimeOrgEnabled === false) {
+                            var curOrgIdHide = userInfo.curOrgId || '';
+                            var hideTargetOrgId = t.resolveApproveOrgTargetId(orgList, curOrgIdHide, t.state.taskAssignOrgId, t.state.startUserOrgId);
+                            if (hideTargetOrgId && hideTargetOrgId != curOrgIdHide && !window.approveOrgAutoSwitchedMap[autoSwitchKey]) {
+                                t.switchApproveOrg(hideTargetOrgId, function () {
+                                    if (currentSeq != window.approveOrgSwitcherSeq) {
+                                        return;
+                                    }
+                                    window.approveOrgAutoSwitchedMap[autoSwitchKey] = true;
+                                    t.setState({ showOrgSwitcher: false });
+                                }, function () {
+                                    if (currentSeq != window.approveOrgSwitcherSeq) {
+                                        return;
+                                    }
+                                    t.setState({ showOrgSwitcher: false });
+                                }, { silent: true });
+                                return;
+                            }
                         }
+                        t.setState({ showOrgSwitcher: false });
+                        return;
+                    }
+                    var curOrgId = userInfo.curOrgId || '';
+                    var targetOrgId = t.resolveApproveOrgTargetId(orgList, curOrgId, t.state.taskAssignOrgId, t.state.startUserOrgId);
+                    if (targetOrgId && targetOrgId != curOrgId && !window.approveOrgAutoSwitchedMap[autoSwitchKey]) {
+                        t.switchApproveOrg(targetOrgId, function () {
+                            if (currentSeq != window.approveOrgSwitcherSeq) {
+                                return;
+                            }
+                            window.approveOrgAutoSwitchedMap[autoSwitchKey] = true;
+                            t.renderApproveOrgSwitcher(orgList, targetOrgId);
+                        }, function () {
+                            if (currentSeq != window.approveOrgSwitcherSeq) {
+                                return;
+                            }
+                            t.hideApproveOrgSwitcherSilently();
+                        }, { silent: true });
+                        return;
+                    }
+                    t.renderApproveOrgSwitcher(orgList, targetOrgId || curOrgId);
+                }).catch(function (err) {
+                    if (currentSeq == window.approveOrgSwitcherSeq) {
                         t.hideApproveOrgSwitcherSilently();
-                    }, { silent: true });
+                    }
+                });
+            };
+            _db2.default.FlowModuleAPI.getSysSettingByMark({ mark: 'approveFormParttimeOrg' }).then(function (content) {
+                if (currentSeq != window.approveOrgSwitcherSeq) {
                     return;
                 }
-                t.renderApproveOrgSwitcher(orgList, targetOrgId || curOrgId);
-            }).catch(function (err) {
-                if (currentSeq == window.approveOrgSwitcherSeq) {
-                    t.hideApproveOrgSwitcherSilently();
+                var val = content;
+                if (content && (typeof content === 'undefined' ? 'undefined' : _typeof(content)) === 'object' && content.content != null) {
+                    val = content.content;
+                }
+                // 默认启用：仅明确为 '0' 时禁用
+                loadOrgSwitcher(val != '0');
+            }).catch(function () {
+                if (currentSeq != window.approveOrgSwitcherSeq) {
+                    return;
                 }
+                loadOrgSwitcher(true);
             });
         }
     }, {

package/package.json

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