fmui-base 2.3.22 → 2.3.24

package/lib/process_list/processList.js

@@ -722,7 +722,7 @@ var PageHome = function (_React$Component2) {
       category: category
     };
     _this3.getTransactionTitleCount(module, "undo,unread", category);
-    _this3.getCategoryListByModule(module, category);
+    _this3.getCategoryListByModule(module, category, activeIndex);
     /**
      * 办理页面搜索框设置项
      * @type {{locale: string, instantSearch: boolean, hasHistory: boolean, searchDelay: number, onEnter: (()), onExit: (()), onChange: ((p1:*)), onSearch: ((p1?:*))}}
@@ -802,6 +802,8 @@ var PageHome = function (_React$Component2) {
 
       // 点击tab页签，关闭遮罩
       $('.title-wrapper.active').click();
+      // 切换 Tab 时按当前列表重新拉取「有数据」的分类
+      this.getCategoryListByModule(this.state.module, this.state.category, active);
     }
 
     /**
@@ -827,21 +829,33 @@ var PageHome = function (_React$Component2) {
     }
 
     /**
-     * 获取分类
+     * 获取分类（仅当前列表有数据的分类）
+     * @param listType 0待办/1待阅/2已办/3已阅/4我的，默认当前 Tab
      */
 
   }, {
     key: 'getCategoryListByModule',
-    value: function getCategoryListByModule(module, category) {
+    value: function getCategoryListByModule(module, category, listType) {
       var _this5 = this;
 
       var t = this;
+      var type = listType;
+      if (type === undefined || type === null || type === '') {
+        type = this.state.activeTabIndex;
+      }
       _db2.default.FlowApproval.getCategoryListByModule({
         module: module,
-        code: category
+        code: category,
+        listType: type
       }).then(function (content) {
         if (content) {
-          _this5.state.categoryList = content;
+          _this5.setState({
+            categoryList: content
+          });
+        } else {
+          _this5.setState({
+            categoryList: []
+          });
         }
       }).catch(function (error) {
         console.log(error);

package/lib/upload/upload.js

@@ -33,6 +33,8 @@ require('whatwg-fetch');
 
 require('es6-promise');
 
+require('./upload.less');
+
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -262,19 +264,28 @@ var PageHome = function (_React$Component) {
         key: 'componentDidMount',
         value: function componentDidMount() {
             var t = this;
-            var param = {
-                name: 'file',
-                url: this.state.uploadUrl,
-                autoPending: true,
-                accept: t.state.accept,
-                multiple: true,
-                fileSizeLimit: t.state.fileSizeLimit
-            };
-            var limitNo = t.state.limitNo;
-            //param.queueCapcity= limitNo;
-            var up = this.getCore(param);
-            var picker = up.getPickerCollector();
-            picker.addArea(document.getElementById('ddUploadPic' + t.state.keyNum));
+            try {
+                var param = {
+                    name: 'file',
+                    url: this.state.uploadUrl,
+                    autoPending: true,
+                    accept: t.state.accept,
+                    multiple: true,
+                    fileSizeLimit: t.state.fileSizeLimit
+                };
+                var up = this.getCore(param);
+                var picker = up.getPickerCollector();
+                var areaEl = document.getElementById('ddUploadPic' + t.state.keyNum);
+                if (areaEl) {
+                    picker.addArea(areaEl);
+                }
+            } catch (e) {
+                console.log('upload picker init error:', e);
+            }
+            // 父级 ref 回调偶发未触发时，自行按 initIds 拉附件列表
+            if (this.props.initIds) {
+                this.initData();
+            }
         }
     }, {
         key: 'getCore',
@@ -613,21 +624,29 @@ var PageHome = function (_React$Component) {
                     // t.props.onChange(initList);
                     if (res.ok) {
                         res.json().then(function (obj) {
-                            var objList = obj.data;
+                            // 接口常 HTTP 200 + body failure；data 非数组时不能 concat，否则渲染崩溃导致附件区空白
+                            var objList = obj && obj.data ? obj.data : [];
+                            if (!(objList instanceof Array)) {
+                                objList = [];
+                            }
+                            if (obj && obj.type === 'failure') {
+                                console.log('getAttachmentByIds failure:', obj.message || obj.code);
+                                return;
+                            }
                             initList = initList.concat(objList);
                             if (t.props.onChange) {
-                                t.props.onChange(initList);
+                                // 初始化回填：传 '1'，避免触发表单向上 onChange 导致重挂载丢列表
+                                t.props.onChange(initList, '1');
                             }
                             t.setState({
                                 initList: initList
                             });
-                            // Get the JSON
                         });
                     } else if (res.status == 401) {
-                        // To do with res
+                        console.log('getAttachmentByIds 401');
                     }
                 }, function (e) {
-                    // Handling errors
+                    console.log('getAttachmentByIds network error', e);
                 }).catch(function (error) {
                     console.log("错误：" + error);
                 });
@@ -731,7 +750,7 @@ var PageHome = function (_React$Component) {
                                                     _react2.default.createElement('i', { className: _this3.getIcon(item.fileExt) }),
                                                     _react2.default.createElement(
                                                         'div',
-                                                        { className: 't-list-title t-omit t-LH1_4' },
+                                                        { className: 't-list-title upload-file-name t-LH1_4' },
                                                         typeof item.fileDisplayName == 'undefined' ? item.name : item.fileDisplayName
                                                     )
                                                 ),
@@ -751,7 +770,7 @@ var PageHome = function (_React$Component) {
                                             _react2.default.createElement('i', { className: _this3.getIcon(item.fileExt) }),
                                             _react2.default.createElement(
                                                 'div',
-                                                { className: 't-list-title t-omit t-LH1_4' },
+                                                { className: 't-list-title upload-file-name t-LH1_4' },
                                                 typeof item.fileDisplayName == 'undefined' ? item.name : item.fileDisplayName
                                             )
                                         ),

package/lib/upload/upload.less

@@ -0,0 +1,345 @@
+/* 上传组件基础样式（勿整文件覆盖，否则附件区会空白） */
+.upload {
+  width: 100%;
+  text-align: left;
+  box-sizing: border-box;
+}
+
+.upload .t-field-box {
+  padding-right: 10px;
+}
+
+.upload-list {
+  margin: 5px 0;
+}
+
+.upload-list-item {
+  display: flex;
+  align-items: center;
+  width: 100%;
+  padding: 5px 10px 5px 10px;
+  border-radius: 5px;
+  background: #f5f5f5;
+}
+
+.upload-list-item-content {
+  max-width: 85%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: flex-start;
+}
+
+.upload-name-icon {
+  width: 100%;
+  display: flex;
+  align-items: center;
+}
+
+.upload-icon {
+  margin-left: auto;
+}
+
+.upload-list-item .icon-delete {
+  margin-left: auto;
+  font-size: 16px;
+  color: #fa5151;
+}
+
+.upload-list-item .t-list-title {
+  font-size: 14px;
+  color: #000000;
+}
+
+.upload-list-item .iconfont-fontsize {
+  margin-right: 5px;
+  font-size: 12px;
+}
+
+.upload-list-item .icon-PDF {
+  color: #ee3434;
+}
+
+.upload-list-item .icon-DPS {
+  color: #ff6a10;
+}
+
+.upload-list-item .icon-XLS {
+  color: #4ec10f;
+}
+
+.upload-list-item .icon-DOC {
+  color: #4799e7;
+}
+
+.upload-list-item .icon-ET {
+  color: #4ec10f;
+}
+
+.upload-list-item .icon-OFD {
+  color: #ee3434;
+}
+
+.upload-list-item .icon-WPS {
+  color: #ff6a10;
+}
+
+.upload-list-item .icon-ZIP {
+  color: #337ab7;
+}
+
+.upload-list-item .icon-TXT {
+  color: #4799e7;
+}
+
+.upload-list-item .icon-TIF {
+  color: #ff9900;
+}
+
+.upload-list-item .icon-SWF {
+  color: #a94442;
+}
+
+.upload-list-item .icon-RAR {
+  color: #337ab7;
+}
+
+.upload-list-item .icon-PPT {
+  color: #ff6a10;
+}
+
+.upload-list-item .icon-MP3 {
+  color: #a06feb;
+}
+
+.upload-list-item .icon-MP4 {
+  color: #a06feb;
+}
+
+.upload-list-item .icon-MOV {
+  color: #0fb8c3;
+}
+
+.upload-list-item .icon-GIF {
+  color: #ff9900;
+}
+
+.upload-list-item .icon-FLV {
+  color: #0fb8c3;
+}
+
+.upload-list-item .icon-EXE {
+  color: #31708f;
+}
+
+.upload-list-item .icon-AVI {
+  color: #0fb8c3;
+}
+
+.upload-list-item .icon-7Z {
+  color: #337ab7;
+}
+
+.upload-list-item .icon-download1 {
+  margin-right: 5px;
+  font-size: 16px;
+}
+
+.upload-list-item .dd-t-list-time {
+  font-size: 10px;
+  line-height: 12px;
+}
+
+.upload-file {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: relative;
+  width: 100%;
+  height: 40px;
+  font-size: 20px;
+  background: #ffffff;
+  color: rgba(0, 0, 0, 0.3);
+  border-radius: 10px;
+  border: 1px dashed rgba(0, 0, 0, 0.3);
+}
+
+.upload-image {
+  position: relative;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 100px;
+  height: 99px;
+  background: #ffffff;
+  font-size: 20px;
+  color: rgba(0, 0, 0, 0.3);
+  border-radius: 10px;
+  border: 1px dashed rgba(0, 0, 0, 0.3);
+}
+
+.upload-image .icon-plus {
+  color: rgba(0, 0, 0, 0.3);
+}
+
+.upload-file-p {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: relative;
+  width: 100%;
+  padding: 4px;
+  margin-bottom: 5px;
+  font-size: 20px;
+  background: #ffffff;
+  color: rgba(0, 0, 0, 0.3);
+  border-radius: 10px;
+  border: 1px dashed rgba(0, 0, 0, 0.3);
+}
+
+.upload-image-p {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 100px;
+  height: 99px;
+  margin-right: 10px;
+  padding: 0 4px;
+  background: #ffffff;
+  font-size: 20px;
+  color: rgba(0, 0, 0, 0.3);
+  border-radius: 10px;
+  border: 1px dashed rgba(0, 0, 0, 0.3);
+}
+
+.upload-image-item {
+  width: 100px;
+  height: 98px;
+  position: relative;
+  margin: 0 10px 25px 0px;
+  border-radius: 10px;
+  background: rgba(0, 0, 0, 0.2);
+}
+
+.upload-progress {
+  margin-bottom: 15px;
+}
+
+.upload-progress-tip {
+  width: 100%;
+  display: block;
+  text-align: center;
+  font-size: 12px;
+}
+
+.upload-progress .progress-bar.green-bar .bar-core {
+  box-shadow: 0 0;
+}
+
+.upload-image-item img {
+  border-radius: 10px;
+}
+
+.upload-image-content {
+  position: relative;
+}
+
+.dd-upload-file {
+  flex-wrap: wrap;
+}
+
+.upload-image-item .iconfont {
+  position: absolute;
+  right: -10px;
+  top: -10px;
+  background: #fa5151;
+  font-size: 14px;
+  width: 21px;
+  height: 21px;
+  line-height: 21px;
+  text-align: center;
+  border-radius: 50%;
+  color: #fff;
+  z-index: 10;
+}
+
+.upload-image-test-hidden {
+  display: none;
+}
+
+.upload-image-test {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+  padding-right: 27px;
+  margin-top: 18px;
+  margin-bottom: 21px;
+}
+
+.upload-image-test-left {
+  font-family: PingFangSC-Regular;
+  font-size: 16px;
+  color: rgba(0, 0, 0, 0.85);
+}
+
+.upload-image-test-right {
+  font-size: 12px;
+  color: rgba(0, 0, 0, 0.3);
+  font-family: SourceHanSansSC-Regular;
+}
+
+.dd-uploaded-delete {
+  background: #ff213b;
+  font-size: 14px;
+  width: 21px;
+  height: 21px;
+  line-height: 21px;
+  text-align: center;
+  border-radius: 50%;
+  color: #fff;
+  margin: 14px 0 0 16px;
+}
+
+/* 流程表单附件：名称完整显示，过长换行（不截断省略） */
+.upload-list {
+  .upload-list-item {
+    align-items: flex-start;
+  }
+
+  .upload-content,
+  .upload-list-item,
+  .upload-list-item-content,
+  .upload-name-icon {
+    min-width: 0;
+  }
+
+  .upload-list-item-content {
+    flex: 1;
+    max-width: none;
+  }
+
+  .upload-name-icon {
+    align-items: flex-start;
+  }
+
+  .upload-name-icon > i {
+    flex-shrink: 0;
+  }
+
+  .upload-file-name,
+  .t-list-title.upload-file-name {
+    flex: 1;
+    min-width: 0;
+    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;
+    max-width: 100%;
+    line-height: 1.4;
+  }
+}

package/package.json

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