fmui-base 2.3.24 → 2.3.26

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.3.26：月日字符时间类型不回显，办理后丢失问题修复
+- 2.3.25：表单乐观锁只有自定义流程生效 非approve流程不生效
 - 2.3.24：流程办理选人组件支持选择群组和职务
 - 2.3.23：传阅增加传阅原因，被传阅人打开流程提示传阅原因，移动端流程办理中流程分类筛选支持只显示存在的数据的分类，流程管理支持设置流程办理缓急
 - 2.3.22：排他网关支持直接连其他网关

package/lib/form/form.js

@@ -1016,6 +1016,17 @@ var PageHome = function (_React$Component) {
             dateFormat = "YM";
           } else if (dateDisplayFormat == "MonthDay") {
             dateFormat = "MD";
+            // 月日兜底：接口常为 MM-DD；先拼当年再转时间戳，避免被下方长度判断清空
+            if (value && typeof value === 'string') {
+              var mdVal = value.trim();
+              if (/^\d{1,2}-\d{1,2}$/.test(mdVal)) {
+                var mdPartsInit = mdVal.split('-');
+                var mmInit = mdPartsInit[0].length === 1 ? '0' + mdPartsInit[0] : mdPartsInit[0];
+                var ddInit = mdPartsInit[1].length === 1 ? '0' + mdPartsInit[1] : mdPartsInit[1];
+                value = year + "-" + mmInit + "-" + ddInit;
+              }
+            }
+            dateFormatShow = "MonthDay";
           } else if (dateDisplayFormat == "Year") {
             dateFormat = "Y";
           } else if (dateDisplayFormat == "ODate") {
@@ -1125,6 +1136,12 @@ 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 ((dateFormat == "MD" || dateFormatShow == "MonthDay") && value && typeof value === 'string' && /^\d{1,2}-\d{1,2}$/.test(value.trim())) {
+            // 月日兜底：仍为 MM-DD 时拼当前年再转时间戳，避免被清空（只读不回显）
+            var mdFallback = value.trim().split('-');
+            var mmFallback = mdFallback[0].length === 1 ? '0' + mdFallback[0] : mdFallback[0];
+            var ddFallback = mdFallback[1].length === 1 ? '0' + mdFallback[1] : mdFallback[1];
+            value = new Date((year + "-" + mmFallback + "-" + ddFallback).replace(/-/g, "/")).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(':');
@@ -1143,6 +1160,9 @@ var PageHome = function (_React$Component) {
         if (readOnly == true) {
           var dateStr = this.dateFormat(value, dateFormat, dateFormatShow);
           value = dateStr;
+        } else if (dateFormatShow === 'MonthDay' || dateFormat === 'MD') {
+          // 编辑态：界面显示 MM-DD，选择器仍用带年的时间戳
+          itemParam.monthDayShow = value ? this.dateFormat(value, dateFormat, dateFormatShow) || '' : '';
         }
         if (fuzhiFields && fuzhiFields.split(",").indexOf(itemParam.uniqueName) != -1 && form.defaultValue && form.defaultValue != null) {
           value = form.defaultValue;
@@ -2928,12 +2948,26 @@ var PageHome = function (_React$Component) {
           return h + ':' + p[1];
         }
       }
+      // 月日：只读回显已是 MM-DD，new Date('MM-DD') 无效会导致提交值被清空
+      if ((dateFormatShow === 'MonthDay' || dateFormat === 'MD') && typeof raw === 'string') {
+        var mdStr = raw.trim();
+        if (/^\d{1,2}-\d{1,2}$/.test(mdStr)) {
+          var mp = mdStr.split('-');
+          var mPad = mp[0].length === 1 ? '0' + mp[0] : mp[0];
+          var dPad = mp[1].length === 1 ? '0' + mp[1] : mp[1];
+          return mPad + '-' + dPad;
+        }
+      }
       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) || '';
           }
+          // 月日字段提交仍只需 MM-DD
+          if (dateFormatShow === 'MonthDay' || dateFormat === 'MD') {
+            return this.dateFormat(new Date(raw.replace(/-/g, '/')).getTime(), dateFormat, dateFormatShow) || '';
+          }
           return raw.substring(0, 19);
         }
         if (/^\d+$/.test(raw)) {
@@ -2961,6 +2995,13 @@ var PageHome = function (_React$Component) {
       var itemParam = this.state.itemParam;
       var dateFormat = itemParam.dateFormat;
       var dateFormatShow = itemParam.dateFormatShow;
+      // salt 在仅 M/D 列时会产出 NaN，直接忽略无效确认，避免把已有值清空
+      if (value && (typeof value === 'undefined' ? 'undefined' : _typeof(value)) === 'object' && (value.value == null || value.value === '' || isNaN(value.value))) {
+        return;
+      }
+      if (typeof value === 'number' && isNaN(value)) {
+        return;
+      }
       var dateStr = '';
       if (dateFormat == "DateInterval") {
         if (value && value.startDate && value.endDate) {
@@ -2975,12 +3016,25 @@ var PageHome = function (_React$Component) {
           pickerVal.value = new Date(dateStr.replace(/-/g, "/")).getTime();
         } else if (typeof pickerVal.value === 'string' && /^\d+$/.test(pickerVal.value)) {
           pickerVal.value = parseInt(pickerVal.value, 10);
+        } else if (dateStr && (dateFormatShow === 'MonthDay' || dateFormat === 'MD') && /^\d{1,2}-\d{1,2}$/.test(String(dateStr).trim())) {
+          // 月日选择后展示值为 MM-DD，拼当年再回填时间戳给组件
+          var mdPick = String(dateStr).trim().split('-');
+          var mmPick = mdPick[0].length === 1 ? '0' + mdPick[0] : mdPick[0];
+          var ddPick = mdPick[1].length === 1 ? '0' + mdPick[1] : mdPick[1];
+          var tsMd = new Date(new Date().getFullYear() + '/' + mmPick + '/' + ddPick).getTime();
+          if (!isNaN(tsMd)) {
+            pickerVal.value = tsMd;
+          }
         } else if (dateStr && (typeof pickerVal.value !== 'number' || isNaN(pickerVal.value))) {
           var ts = new Date(dateStr.replace(/-/g, '/')).getTime();
           if (!isNaN(ts)) {
             pickerVal.value = ts;
           }
         }
+        // 月日：组件展示用时间戳，文案用 MM-DD
+        if (dateFormatShow === 'MonthDay' || dateFormat === 'MD') {
+          itemParam.monthDayShow = dateStr;
+        }
         value = pickerVal;
       }
 
@@ -3180,6 +3234,70 @@ var PageHome = function (_React$Component) {
       }
     }
 
+    // 月日展示：统一为 MM-DD
+
+  }, {
+    key: 'formatMonthDayDisplay',
+    value: function formatMonthDayDisplay(value) {
+      if (value == null || value === '') {
+        return '';
+      }
+      if ((typeof value === 'undefined' ? 'undefined' : _typeof(value)) === 'object' && value.value != null) {
+        value = value.value;
+      }
+      if (typeof value === 'string') {
+        var s = value.trim();
+        if (/^\d{1,2}-\d{1,2}$/.test(s)) {
+          var p = s.split('-');
+          return (p[0].length === 1 ? '0' + p[0] : p[0]) + '-' + (p[1].length === 1 ? '0' + p[1] : p[1]);
+        }
+        if (s.length >= 10) {
+          var tsFromStr = new Date(s.replace(/-/g, '/')).getTime();
+          if (!isNaN(tsFromStr)) {
+            return this.dateFormat(tsFromStr, 'MD') || '';
+          }
+        }
+        return '';
+      }
+      if (typeof value === 'number' && !isNaN(value)) {
+        return this.dateFormat(value, 'MD') || '';
+      }
+      return '';
+    }
+
+    // 月日选择器内部值：保证是有效时间戳（salt 需带年）
+
+  }, {
+    key: 'getMonthDayPickerValue',
+    value: function getMonthDayPickerValue(value) {
+      if (value == null || value === '') {
+        return new Date().getTime();
+      }
+      if ((typeof value === 'undefined' ? 'undefined' : _typeof(value)) === 'object' && value.value != null) {
+        value = value.value;
+      }
+      if (typeof value === 'number' && !isNaN(value)) {
+        return value;
+      }
+      if (typeof value === 'string') {
+        var s = value.trim();
+        if (/^\d{1,2}-\d{1,2}$/.test(s)) {
+          var p = s.split('-');
+          var mm = p[0].length === 1 ? '0' + p[0] : p[0];
+          var dd = p[1].length === 1 ? '0' + p[1] : p[1];
+          var ts = new Date(new Date().getFullYear() + '/' + mm + '/' + dd).getTime();
+          return isNaN(ts) ? new Date().getTime() : ts;
+        }
+        if (s.length >= 10) {
+          var ts2 = new Date(s.replace(/-/g, '/')).getTime();
+          if (!isNaN(ts2)) {
+            return ts2;
+          }
+        }
+      }
+      return new Date().getTime();
+    }
+
     //附件、图片
 
   }, {
@@ -4425,7 +4543,52 @@ var PageHome = function (_React$Component) {
                 icon: _react2.default.createElement(_AngleRight2.default, { width: 26, fill: '#BCBCBC', onClick: t.handleCalendarFieldFill.bind(t, t.state.prefixName + "_" + t.state.itemParam.key, t.state.itemParam.value) })
                 // formatter: 'yyyy.MM.dd',
                 , onOk: t.handleChangeDate.bind(t, t.state.itemParam.key)
-              }) : _react2.default.createElement(_DatetimeField2.default, {
+              }) : t.state.itemParam.dateFormat === 'MD' || t.state.itemParam.dateFormatShow === 'MonthDay' ? _react2.default.createElement(
+                HBox,
+                { className: isSubFormMultiCol ? "t-field-box t-FBAC t-W100" : "t-field-box t-FBAC t-W100" },
+                _react2.default.createElement(
+                  'div',
+                  { className: t.state.itemParam.required ? "t-field-layout-h-label  required" : "t-field-layout-h-label" },
+                  t.state.itemParam.title
+                ),
+                _react2.default.createElement(
+                  HBox,
+                  { flex: '1', onClick: function onClick() {
+                      t.showSlot('md_' + t.state.itemParam.key);
+                    }, className: 't-FBAC' },
+                  _react2.default.createElement(
+                    Box,
+                    { flex: '1' },
+                    _react2.default.createElement(
+                      'span',
+                      { className: 't-FL' },
+                      t.state.itemParam.monthDayShow || t.formatMonthDayDisplay(t.state.itemParam.value) || ''
+                    ),
+                    !(t.state.itemParam.monthDayShow || t.formatMonthDayDisplay(t.state.itemParam.value)) ? _react2.default.createElement(
+                      'span',
+                      { className: 't-datetime-field-placeholder', style: { color: '#ccc' } },
+                      t.state.itemParam.placeholder || '请选择'
+                    ) : null
+                  ),
+                  _react2.default.createElement(
+                    Box,
+                    { className: 't-FBAC t-field-icon' },
+                    _react2.default.createElement(_AngleRight2.default, { width: 26, fill: '#BCBCBC' }),
+                    _react2.default.createElement(_Datetime2.default, {
+                      locale: 'zh-cn',
+                      slotRef: function slotRef(s) {
+                        return t['md_' + t.state.itemParam.key] = s;
+                      },
+                      title: t.state.itemParam.title || '月日选择',
+                      value: t.getMonthDayPickerValue(t.state.itemParam.value),
+                      columns: _Datetime2.default.YMD,
+                      minDate: t.state.itemParam.minDate ? t.state.itemParam.minDate : new Date(1900, 0, 1).getTime(),
+                      maxDate: t.state.itemParam.maxDate ? t.state.itemParam.maxDate : new Date(2051, 0, 1).getTime() - 1,
+                      onConfirm: t.handleChangeDate.bind(t, t.state.itemParam.key)
+                    })
+                  )
+                )
+              ) : _react2.default.createElement(_DatetimeField2.default, {
                 className: 't-W100',
                 layout: subFormFieldLayout,
                 multiLine: isSubFormMultiCol,

package/lib/process_info/processInfo.js

@@ -2564,7 +2564,7 @@ var PageHome = function (_React$Component) {
                         processInstanceId: _this2.state.processInstanceId,
                         permissionCode: _this2.state.permissionCode
                     };
-                    if (t.state.formDataOptlock !== '' && t.state.formDataOptlock !== null && typeof t.state.formDataOptlock !== 'undefined') {
+                    if (t.state.module === 'approve' && t.state.formDataOptlock !== '' && t.state.formDataOptlock !== null && typeof t.state.formDataOptlock !== 'undefined') {
                         param.optlock = t.state.formDataOptlock;
                     }
                     var dealActionName = "";
@@ -5309,7 +5309,7 @@ var PageHome = function (_React$Component) {
             //     param.commentbizSn=commentbizSn;
             // }
             param.commentbizSn = commentbizSn;
-            if (t.state.formDataOptlock !== '' && t.state.formDataOptlock !== null && typeof t.state.formDataOptlock !== 'undefined') {
+            if (t.state.module === 'approve' && t.state.formDataOptlock !== '' && t.state.formDataOptlock !== null && typeof t.state.formDataOptlock !== 'undefined') {
                 param.optlock = t.state.formDataOptlock;
             }
 

package/package.json

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