fmui-base 2.3.25 → 2.3.27

package/README.md

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

package/lib/comment_list/List.js

@@ -23,6 +23,10 @@ var _db = require('../db/db');
 
 var _db2 = _interopRequireDefault(_db);
 
+var _upload = require('../upload/upload');
+
+var _upload2 = _interopRequireDefault(_upload);
+
 require('whatwg-fetch');
 
 require('es6-promise');
@@ -31,8 +35,6 @@ require('./List.less');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
-
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
@@ -51,27 +53,9 @@ var PageHome = function (_React$Component) {
 
     var _this = _possibleConstructorReturn(this, (PageHome.__proto__ || Object.getPrototypeOf(PageHome)).call(this, props));
 
-    var setting = getSysAttachSetting();
-
-    //预览类型，view：永中预览，download：下载
-    var viewType = 'view';
-
-    if (setting.sysAttachmentView == 0) {
-      //如果设置中预览关闭则默认下载
-      viewType = "download";
-    }
-
-    // let startUserName = decodeURI(this.props.params.startUserName);//创建人用户
-    // let startUserGroupName = decodeURI(this.props.params.startUserGroupName);//创建人组织
-    //let startUserId = this.props.params.startUserId;
-    var token = document.getElementById('token').value;
     _this.state = {
-      // attachId:props.attachId,
       loadImg: _variables2.default.loadImg + "&fid=",
-      // imgUrl:getImagePreUrl()+'/attachment/download?token='+token+'&',
-      // queryUrl: context + '/api/m/plugin/attachment/mobile/getAttachmentByIds?token='+token+'&ids=',
-      commentList: [],
-      viewType: viewType
+      commentList: props.list || []
     };
 
     return _this;
@@ -81,13 +65,10 @@ var PageHome = function (_React$Component) {
     key: 'componentDidMount',
     value: function componentDidMount() {
       var t = this;
-      var token = document.getElementById('token').value;
-      this.initData(token, function (commentList) {
-        t.setState({
-          commentList: commentList
-        }, function () {
-          t.casigin();
-        });
+      t.setState({
+        commentList: t.props.list || []
+      }, function () {
+        t.casigin();
       });
     }
 
@@ -168,149 +149,15 @@ var PageHome = function (_React$Component) {
       }
     }
 
-    //初始化ids
+    /** 批示意见 attachId 多为 | 分隔，Upload 组件 initIds 用逗号 */
 
   }, {
-    key: 'initData',
-    value: function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(token, sucess) {
-        var t, context, url, commentList, attachIds;
-        return regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                t = this;
-                context = document.getElementById("context").value;
-                url = context + '/api/m/plugin/attachment/mobile/getAttachmentByIds?token=' + token + '&ids=';
-                commentList = this.props.list;
-                attachIds = "";
-
-                if (!commentList || typeof commentList == 'undefined' || commentList.length == 0) {
-                  commentList = [];
-                }
-                // var attachMap = {};
-                commentList.map(function (item) {
-                  // var commentId = item.id;
-                  var attachId = item.attachId;
-                  if (attachId) {
-                    attachId = attachId.replaceAll("|", ",");
-                    attachIds = attachIds + "," + attachId;
-                    // attachMap[commentId] = attachId;
-                  }
-                });
-
-                if (!attachIds) {
-                  _context.next = 14;
-                  break;
-                }
-
-                attachIds = attachIds.substring(1);
-                _context.next = 11;
-                return t.promises(url + attachIds).then(function (e) {
-                  commentList.map(function (item) {
-                    // var commentId = item.id;
-                    var attachId = item.attachId;
-                    if (attachId) {
-                      var fileList = [];
-                      var attachArray = attachId.split("|");
-                      attachArray.map(function (attachItem) {
-                        for (var i = 0; i < e.length; i++) {
-                          if (attachItem == e[i].id) {
-                            fileList.push(e[i]);
-                          }
-                        }
-                      });
-                      item.fileList = fileList;
-                    }
-                  });
-                });
-
-              case 11:
-                sucess(commentList);
-                _context.next = 15;
-                break;
-
-              case 14:
-                sucess(commentList);
-
-              case 15:
-              case 'end':
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
-
-      function initData(_x, _x2) {
-        return _ref.apply(this, arguments);
-      }
-
-      return initData;
-    }()
-  }, {
-    key: 'promises',
-    value: function promises(url) {
-      return new Promise(function (resolve, reject) {
-        try {
-          fetch(url, {
-            method: "POST",
-            headers: {
-              'Content-Type': 'application/x-www-form-urlencoded'
-            }
-          }).then(function (res) {
-            if (res.ok) {
-              res.json().then(function (obj) {
-                var objList = obj.data;
-                resolve(objList);
-              });
-            } else if (res.status == 401) {
-              // To do with res
-            }
-          });
-        } catch (e) {
-          console.log(e);
-        }
-      });
-    }
-
-    //预览
-
-  }, {
-    key: 'view',
-    value: function view(file) {
-      var id = file.id;
-      if (this.state.viewType == 'view') {
-        var fileExt = file.fileExt;
-        downloadFile(id, 'android', fileExt);
-      } else {
-        downloadFile(id);
-      }
-    }
-
-    //下载批示意见附件
-
-  }, {
-    key: 'downloadAttach',
-    value: function downloadAttach(file, e) {
-      if (e && e.stopPropagation) {
-        e.stopPropagation();
-      }
-      if (e && e.preventDefault) {
-        e.preventDefault();
-      }
-      // 公众号不支持下载
-      if (getLoginUserInfo().thirdMenuType == 'WeChat') {
-        return;
-      }
-      var id = file.id;
-      var fileExt = file.fileExt;
-      if (typeof downloadFile === 'function') {
-        try {
-          downloadFile(id, 'download', fileExt);
-        } catch (err) {
-          downloadFile(id);
-        }
+    key: 'getAttachInitIds',
+    value: function getAttachInitIds(attachId) {
+      if (!attachId) {
+        return '';
       }
+      return String(attachId).replace(/\|/g, ',');
     }
   }, {
     key: 'getCommentSign',
@@ -404,49 +251,18 @@ var PageHome = function (_React$Component) {
               { className: 't-PR16' },
               _react2.default.createElement('img', { width: '100%', height: '128', src: t.state.loadImg + item.fullMessage })
             ),
-            _react2.default.createElement(
+            item.attachId ? _react2.default.createElement(
               'div',
-              { className: 'comment-attach-list' },
-              item.fileList && item.fileList.length > 0 ? item.fileList.map(function (item2, i) {
-                function calculate(no) {
-                  var a = no / 1024;
-                  if (a < 1) {
-                    return no + 'B';
-                  }
-                  var b = a / 1024;
-                  if (b < 1) {
-                    return Math.round(a * 100) / 100 + 'KB';
-                  }
-                  return Math.round(b * 100) / 100 + 'MB';
-                }
-                var showDownload = getLoginUserInfo().thirdMenuType != 'WeChat';
-                return _react2.default.createElement(
-                  'div',
-                  { className: 't-FBH comment-attach-item', key: i },
-                  _react2.default.createElement(
-                    'div',
-                    { className: 'dd-t-border t-P6 t-MB10 t-FB1', onClick: t.view.bind(t, item2) },
-                    _react2.default.createElement('i', { className: 'iconfont icon-file t-FC9 t-FL t-MR6' }),
-                    _react2.default.createElement(
-                      'div',
-                      { className: 'dd-t-list-text-content' },
-                      _react2.default.createElement(
-                        'div',
-                        { className: 't-list-title comment-attach-name t-LH1_4' },
-                        typeof item2.fileDisplayName == 'undefined' ? item2.name : item2.fileDisplayName
-                      ),
-                      _react2.default.createElement(
-                        'div',
-                        { className: 'dd-t-list-time t-FBAC' },
-                        calculate(typeof item2.fileSize == 'undefined' ? item2.size : item2.fileSize)
-                      )
-                    )
-                  ),
-                  _react2.default.createElement('i', { className: showDownload ? 'iconfont icon-download1 comment-attach-download' : 't-DN',
-                    onClick: t.downloadAttach.bind(t, item2) })
-                );
-              }) : ""
-            ),
+              { className: 'comment-attach-list t-PR16' },
+              _react2.default.createElement(_upload2.default, {
+                key: 'comment_attach_' + item.id,
+                required: false,
+                canAdd: false,
+                canDel: false,
+                canDownload: true,
+                initIds: t.getAttachInitIds(item.attachId)
+              })
+            ) : null,
             _react2.default.createElement(
               Box,
               { vAlign: 'start', hAlign: 'end', id: 'commentSign-' + item.id, className: 't-FBH t-PR16' },

package/lib/comment_list/List.less

@@ -5,45 +5,7 @@
   padding-right:0px;
 }
 
-/* 批示意见附件：名称完整换行显示 */
+/* 批示意见附件复用 Upload 组件样式，仅保留容器间距 */
 .comment-attach-list {
-  .comment-attach-item {
-    align-items: flex-start;
-  }
-
-  .comment-attach-name,
-  .t-list-title.comment-attach-name {
-    display: block !important;
-    white-space: normal !important;
-    word-break: break-all !important;
-    overflow-wrap: break-word !important;
-    word-wrap: break-word !important;
-    overflow: visible !important;
-    text-overflow: clip !important;
-    -webkit-line-clamp: unset !important;
-    line-clamp: unset !important;
-    -webkit-box-orient: horizontal !important;
-    max-width: 100%;
-    line-height: 1.4;
-  }
-
-  .dd-t-list-text-content {
-    min-width: 0;
-    overflow: visible;
-  }
-
-  /* 与表单附件下载按钮保持一致：普通图标，无蓝色圆底 */
-  .comment-attach-download {
-    flex-shrink: 0;
-    margin-right: 5px;
-    margin-top: 8px;
-    font-size: 16px;
-    background: transparent;
-    color: inherit;
-    width: auto;
-    height: auto;
-    line-height: inherit;
-    border-radius: 0;
-    text-align: center;
-  }
+  margin-top: 4px;
 }

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/package.json

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