fmui-base 2.2.89 → 2.2.91

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.2.91：流程办理按钮名称要与办理弹窗标题同步
+- 2.2.90：表单时间字段偶发保存成时间戳
 - 2.2.89：表单子表支持一行多列显示，并支持扩展
 - 2.2.88：表单关联字段重构
 - 2.2.87：选人组件添加隐藏页签,增加业务建模表单组件

package/lib/form/form.js

@@ -7,6 +7,8 @@ exports.default = undefined;
 
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
+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; };
+
 var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
 
 var _react = require('react');
@@ -1101,12 +1103,14 @@ var PageHome = function (_React$Component) {
                 item.value = dateStr;
               }
             });
-          } else if (value && value.length >= 10) {
+          } else if (typeof value === 'number' && !isNaN(value)) {
+            // 接口偶发返回时间戳：保留数字供组件展示，提交值在下方 sync 时格式化
+          } else if (value && typeof value === 'string' && value.length >= 10) {
             value = value.substring(0, 19);
             value = new Date(value.replace(/-/g, "/")).getTime();
-          } else if (value && value.length == 4 && dateFormat == "Y") {
+          } else if (value && typeof value === 'string' && value.length == 4 && dateFormat == "Y") {
             value = new Date(value).getTime();
-          } else if (value && value.length == 7 && dateFormat == "YM") {
+          } else if (value && typeof value === 'string' && value.length == 7 && dateFormat == "YM") {
             value = new Date(value).getTime();
           } else {
             for (var i = 0; i < mainTblData.length; i++) {
@@ -1504,9 +1508,13 @@ var PageHome = function (_React$Component) {
           itemType = itemParam.itemType;
         }
         if (itemType == 'text' || itemType == 'textarea' || itemType == 'datetime') {
+          var syncValue = value;
+          if (itemType == 'datetime') {
+            syncValue = t.getDatetimeSaveValue(value, itemParam.dateFormat, itemParam.dateFormatShow);
+          }
           for (var i = 0; i < data.mainTblData.length; i++) {
             if (itemParam.key == data.mainTblData[i].key) {
-              data.mainTblData[i].value = value;
+              data.mainTblData[i].value = syncValue;
             }
           }
         }
@@ -2008,6 +2016,12 @@ var PageHome = function (_React$Component) {
                 selectText = selectText.substring(0, selectText.length - 1);
               }
               checkboxValueHas = true;
+            } else if (itemParam.itemType == 'datetime') {
+              itemParam[key] = itemNew[i].value;
+              if (this.props.data) {
+                var saveVal = this.getDatetimeSaveValue(itemNew[i].value, itemParam.dateFormat, itemParam.dateFormatShow);
+                this.editData(itemParam.key, saveVal, this.props.data);
+              }
             } else {
               itemParam[key] = itemNew[i].value;
             }
@@ -2684,6 +2698,45 @@ var PageHome = function (_React$Component) {
       return weekdays[dayIndex];
     }
 
+    // 时间字段提交值：统一格式化为字符串，避免 mainTblData 存入时间戳
+
+  }, {
+    key: 'getDatetimeSaveValue',
+    value: function getDatetimeSaveValue(value, dateFormat, dateFormatShow) {
+      if (value == null || value === '') {
+        return '';
+      }
+      if (dateFormat === 'DateInterval') {
+        if ((typeof value === 'undefined' ? 'undefined' : _typeof(value)) === 'object' && value.startDate != null && value.endDate != null) {
+          return this.dateFormat(value, dateFormat, dateFormatShow) || '';
+        }
+        if (typeof value === 'string' && value.indexOf(' - ') >= 0) {
+          return value;
+        }
+        return '';
+      }
+      var raw = value;
+      if ((typeof value === 'undefined' ? 'undefined' : _typeof(value)) === 'object' && value != null && value.value != null) {
+        raw = value.value;
+      }
+      if (typeof raw === 'string') {
+        if (raw.length >= 10 && raw.indexOf('-') >= 0) {
+          return raw.substring(0, 19);
+        }
+        if (/^\d+$/.test(raw)) {
+          raw = parseInt(raw, 10);
+        }
+      }
+      if (typeof raw === 'number' && !isNaN(raw)) {
+        return this.dateFormat(raw, dateFormat, dateFormatShow) || '';
+      }
+      var d = new Date(raw);
+      if (!isNaN(d.getTime())) {
+        return this.dateFormat(d.getTime(), dateFormat, dateFormatShow) || '';
+      }
+      return '';
+    }
+
     //时间
 
   }, {
@@ -2695,18 +2748,27 @@ var PageHome = function (_React$Component) {
       var itemParam = this.state.itemParam;
       var dateFormat = itemParam.dateFormat;
       var dateFormatShow = itemParam.dateFormatShow;
+      var dateStr = '';
       if (dateFormat == "DateInterval") {
-        if (value.startDate && value.endDate) {
-          var dateStr = this.dateFormat(value, dateFormat, dateFormatShow);
-          data = this.editData(code, dateStr, data);
+        if (value && value.startDate && value.endDate) {
+          dateStr = t.getDatetimeSaveValue(value, dateFormat, dateFormatShow);
+          data = t.editData(code, dateStr, data);
         }
       } else {
-        var dateStr = this.dateFormat(value.value, dateFormat);
-        if (dateFormat == "YMDT") {
-          //年月日，上下午修改数据
-          value.value = new Date(dateStr.replace(/-/g, "/")).getTime();
+        var pickerVal = value && (typeof value === 'undefined' ? 'undefined' : _typeof(value)) === 'object' && value.value != null ? value : { value: value };
+        dateStr = t.getDatetimeSaveValue(pickerVal, dateFormat, dateFormatShow);
+        data = t.editData(code, dateStr, data);
+        if (dateFormat == "YMDT" && dateStr) {
+          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 && (typeof pickerVal.value !== 'number' || isNaN(pickerVal.value))) {
+          var ts = new Date(dateStr.replace(/-/g, '/')).getTime();
+          if (!isNaN(ts)) {
+            pickerVal.value = ts;
+          }
         }
-        data = this.editData(code, dateStr, data);
+        value = pickerVal;
       }
 
       itemParam.value = value;
@@ -2791,7 +2853,7 @@ var PageHome = function (_React$Component) {
       var itemParam = this.state.itemParam;
       var dateFormat = itemParam.dateFormat;
 
-      var dateStr = this.dateFormat(value.value, dateFormat);
+      var dateStr = this.getDatetimeSaveValue(value, dateFormat);
       data = this.editData(code, dateStr, data);
       itemParam.value = value;
       itemParam.selectValue = dateStr;

package/lib/process_info/processInfo.js

@@ -7889,7 +7889,7 @@ var PageHome = function (_React$Component) {
                             'span',
                             { className: 'theme-color' },
                             _react2.default.createElement('i', { className: 'iconfont icon-back t-rotate-180 t-FS14 t-FR' }),
-                            '\u5BA1\u6279\u73AF\u8282'
+                            this.state.finalButtons.get("BASE_SUMBIT")
                         )
                     ),
                     _react2.default.createElement(
@@ -8131,7 +8131,7 @@ var PageHome = function (_React$Component) {
                             'span',
                             { className: 'theme-color' },
                             _react2.default.createElement('i', { className: 'iconfont icon-back t-rotate-180 t-FS14 t-FR' }),
-                            '\u4F20\u9605'
+                            this.state.finalButtons.get("HELP_CIRCULATE")
                         )
                     ),
                     _react2.default.createElement(
@@ -8170,7 +8170,7 @@ var PageHome = function (_React$Component) {
                             'span',
                             { className: 'theme-color' },
                             _react2.default.createElement('i', { className: 'iconfont icon-back t-rotate-180 t-FS14 t-FR' }),
-                            '\u8F6C\u4EA4\u73AF\u8282'
+                            this.state.finalButtons.get("BASE_TRANSFER")
                         )
                     ),
                     _react2.default.createElement(_select2.default, {
@@ -8245,7 +8245,7 @@ var PageHome = function (_React$Component) {
                                 'span',
                                 { className: 'theme-color' },
                                 _react2.default.createElement('i', { className: 'iconfont icon-back t-rotate-180 t-FS14 t-FR' }),
-                                '\u9000\u56DE\u73AF\u8282'
+                                this.state.finalButtons.get("BACK")
                             )
                         ),
                         _react2.default.createElement(_RadioField2.default, {
@@ -8395,7 +8395,7 @@ var PageHome = function (_React$Component) {
                                 'span',
                                 { className: 'theme-color' },
                                 _react2.default.createElement('i', { className: 'iconfont icon-back t-rotate-180 t-FS14 t-FR' }),
-                                '\u4F20\u9605'
+                                this.state.finalButtons.get("HELP_CIRCULATE")
                             )
                         ),
                         _react2.default.createElement(_select2.default, {
@@ -8571,7 +8571,7 @@ var PageHome = function (_React$Component) {
                                 'span',
                                 { className: 'theme-color' },
                                 _react2.default.createElement('i', { className: 'iconfont icon-back t-rotate-180 t-FS14 t-FR' }),
-                                '\u7ED3\u675F'
+                                this.state.finalButtons.get("BASE_END")
                             )
                         ),
                         _react2.default.createElement(_TextareaField2.default, {

package/package.json

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