fmui-base 2.2.18 → 2.2.20

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.2.20：流程列表组件支持流程分类category参数
+- 2.2.19：上传组件添加图片点击放大事件
 - 2.2.18：修改关联流程暂无数据样式
 - 2.2.17：表单字段关联支持主表字段和子表字段一起配置
 - 2.2.16：修改关联流程暂无数据样式

package/lib/process_list/processList.js

@@ -482,6 +482,7 @@ var PageHome = function (_React$Component2) {
     var activeIndex = props.activeIndex ? props.activeIndex : 0;
     var type = props.type ? props.type : "self"; //self：本应用，all:全模块
     var module = props.module ? props.module : type == "self" ? "approve" : "";
+    var category = props.category ? props.category : ""; //分类
     var hasBatch = eval(props.hasBatch ? props.hasBatch : "true"); //是否有批量办理
     var tabCodes = props.tabCodes ? props.tabCodes : "undo,unread,done,read,myself"; //标签页
     var searchVal = props.search;
@@ -501,17 +502,17 @@ var PageHome = function (_React$Component2) {
     var readListUrl;
     var myselfListUrl;
     if (type == "self") {
-      undoListUrl = _variables2.default.URLS.transaction.undo + "&module=" + module;
-      unreadListUrl = _variables2.default.URLS.transaction.unread + "&module=" + module;
-      doneListUrl = _variables2.default.URLS.transaction.done + "&module=" + module;
-      readListUrl = _variables2.default.URLS.transaction.read + "&module=" + module;
-      myselfListUrl = _variables2.default.URLS.transaction.myself + "&module=" + module;
+      undoListUrl = _variables2.default.URLS.transaction.undo + "&module=" + module + "&category=" + category;
+      unreadListUrl = _variables2.default.URLS.transaction.unread + "&module=" + module + "&category=" + category;
+      doneListUrl = _variables2.default.URLS.transaction.done + "&module=" + module + "&category=" + category;
+      readListUrl = _variables2.default.URLS.transaction.read + "&module=" + module + "&category=" + category;
+      myselfListUrl = _variables2.default.URLS.transaction.myself + "&module=" + module + "&category=" + category;
     } else {
-      undoListUrl = _variables2.default.URLS.transaction.undo + "&unified=1&sourceType=unitedapprove&module=" + module;
-      unreadListUrl = _variables2.default.URLS.transaction.unread + "&unified=1&sourceType=unitedapprove&module=" + module;
-      doneListUrl = _variables2.default.URLS.transaction.done + "&unified=1&sourceType=unitedapprove&module=" + module;
-      readListUrl = _variables2.default.URLS.transaction.read + "&unified=1&sourceType=unitedapprove&module=" + module;
-      myselfListUrl = _variables2.default.URLS.transaction.myself + "&unified=1&sourceType=unitedapprove&module=" + module;
+      undoListUrl = _variables2.default.URLS.transaction.undo + "&unified=1&sourceType=unitedapprove&module=" + module + "&category=" + category;
+      unreadListUrl = _variables2.default.URLS.transaction.unread + "&unified=1&sourceType=unitedapprove&module=" + module + "&category=" + category;
+      doneListUrl = _variables2.default.URLS.transaction.done + "&unified=1&sourceType=unitedapprove&module=" + module + "&category=" + category;
+      readListUrl = _variables2.default.URLS.transaction.read + "&unified=1&sourceType=unitedapprove&module=" + module + "&category=" + category;
+      myselfListUrl = _variables2.default.URLS.transaction.myself + "&unified=1&sourceType=unitedapprove&module=" + module + "&category=" + category;
     }
     _this2.state = {
       tabCodes: tabCodes,
@@ -552,10 +553,11 @@ var PageHome = function (_React$Component2) {
       category1: [],
       category2: [],
       category3: [],
-      category4: []
+      category4: [],
+      category: category
     };
-    _this2.getTransactionTitleCount(module, "undo,unread");
-    _this2.getCategoryListByModule(module);
+    _this2.getTransactionTitleCount(module, "undo,unread", category);
+    _this2.getCategoryListByModule(module, category);
     /**
      * 办理页面搜索框设置项
      * @type {{locale: string, instantSearch: boolean, hasHistory: boolean, searchDelay: number, onEnter: (()), onExit: (()), onChange: ((p1:*)), onSearch: ((p1?:*))}}
@@ -643,13 +645,14 @@ var PageHome = function (_React$Component2) {
 
   }, {
     key: 'getTransactionTitleCount',
-    value: function getTransactionTitleCount(module, codes) {
+    value: function getTransactionTitleCount(module, codes, category) {
       var _this3 = this;
 
       var t = this;
       _db2.default.FlowApproval.getApproveCount({
         module: module,
-        codes: codes
+        codes: codes,
+        category: category
       }).then(function (content) {
         _this3.state.titleCount.undo = content.undo;
         _this3.state.titleCount.unread = content.unread;
@@ -664,12 +667,13 @@ var PageHome = function (_React$Component2) {
 
   }, {
     key: 'getCategoryListByModule',
-    value: function getCategoryListByModule(module) {
+    value: function getCategoryListByModule(module, category) {
       var _this4 = this;
 
       var t = this;
       _db2.default.FlowApproval.getCategoryListByModule({
-        module: module
+        module: module,
+        code: category
       }).then(function (content) {
         if (content) {
           _this4.state.categoryList = content;
@@ -1322,8 +1326,7 @@ var PageHome = function (_React$Component2) {
                   processData: this.processData.bind(this),
                   ref: 'transaction_undo_ref',
                   noDataImage: _variables2.default.nodataIcon,
-                  currentPageKey: 'page',
-                  noDataTip: this.state.noDataTip0
+                  currentPageKey: 'page'
                 },
                 _react2.default.createElement(ListItem, { type: '0', isBatch: this.state.isBatch, ableClick: this.state.ableClick, fromType: this.state.type, projectPath: this.state.projectPath, updateAbleClick: this.updateAbleClick.bind(this) })
               )
@@ -1372,8 +1375,7 @@ var PageHome = function (_React$Component2) {
                   processData: this.processData.bind(this),
                   ref: 'transaction_unread_ref',
                   noDataImage: _variables2.default.nodataIcon,
-                  currentPageKey: 'page',
-                  noDataTip: this.state.noDataTip1
+                  currentPageKey: 'page'
                 },
                 _react2.default.createElement(ListItem, { type: '1', ableClick: this.state.ableClick, isBatch: this.state.isBatch, fromType: this.state.type, projectPath: this.state.projectPath, updateAbleClick: this.updateAbleClick.bind(this) })
               )
@@ -1417,8 +1419,7 @@ var PageHome = function (_React$Component2) {
                   processData: this.processData.bind(this),
                   ref: 'transaction_done_ref',
                   noDataImage: _variables2.default.nodataIcon,
-                  currentPageKey: 'page',
-                  noDataTip: this.state.noDataTip2
+                  currentPageKey: 'page'
                 },
                 _react2.default.createElement(ListItem, { type: '2', ableClick: this.state.ableClick, isBatch: this.state.isBatch, fromType: this.state.type, projectPath: this.state.projectPath, updateAbleClick: this.updateAbleClick.bind(this) })
               )
@@ -1462,8 +1463,7 @@ var PageHome = function (_React$Component2) {
                   processData: this.processData.bind(this),
                   ref: 'transaction_read_ref',
                   noDataImage: _variables2.default.nodataIcon,
-                  currentPageKey: 'page',
-                  noDataTip: this.state.noDataTip3
+                  currentPageKey: 'page'
                 },
                 _react2.default.createElement(ListItem, { type: '3', ableClick: this.state.ableClick, isBatch: this.state.isBatch, fromType: this.state.type, projectPath: this.state.projectPath, updateAbleClick: this.updateAbleClick.bind(this) })
               )
@@ -1507,8 +1507,8 @@ var PageHome = function (_React$Component2) {
                   processData: this.processData.bind(this),
                   ref: 'transaction_myself_ref',
                   noDataImage: _variables2.default.nodataIcon,
-                  currentPageKey: 'page',
-                  noDataTip: this.state.noDataTip4
+                  currentPageKey: 'page'
+
                 },
                 _react2.default.createElement(ListItem, { type: '4', ableClick: this.state.ableClick, isBatch: this.state.isBatch, fromType: this.state.type, projectPath: this.state.projectPath, updateAbleClick: this.updateAbleClick.bind(this) })
               )

package/lib/upload/upload.js

@@ -21,10 +21,16 @@ var _Progress2 = _interopRequireDefault(_Progress);
 
 var _uploadcore = require('uploadcore');
 
+var _h5Imageviewer = require('h5-imageviewer');
+
+var viewer = _interopRequireWildcard(_h5Imageviewer);
+
 require('whatwg-fetch');
 
 require('es6-promise');
 
+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 }; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -91,6 +97,12 @@ var PageHome = function (_React$Component) {
             return currentFileName;
         };
 
+        _this.viewImageHandel = function (url) {
+            viewer.showViewer({
+                src: url
+            });
+        };
+
         var label = props.label;
         if (!label) {
             label = '';
@@ -505,7 +517,13 @@ var PageHome = function (_React$Component) {
                 var isCopy = this.props.isCopy;
                 var isPrint = this.props.isPrint;
                 var fileExt = file.fileExt;
-                downloadFile(id, 'android', fileExt, isCopy, isPrint, allowDownLoad);
+
+                if (fileExt == ".jpg" || fileExt == ".jpeg" || fileExt == ".gif" || fileExt == ".png") {
+                    var urlFileImg = this.state.urlPrev + id;
+                    this.viewImageHandel(urlFileImg);
+                } else {
+                    downloadFile(id, 'android', fileExt, isCopy, isPrint, allowDownLoad);
+                }
             } else {
                 downloadFile(id);
             }
@@ -610,11 +628,13 @@ var PageHome = function (_React$Component) {
 
         // 文件图标
 
-    }, {
-        key: 'render',
-
         //加载文件列表
 
+
+        // 点击放大图片
+
+    }, {
+        key: 'render',
         value: function render() {
             var _this3 = this;
 
@@ -653,7 +673,7 @@ var PageHome = function (_React$Component) {
                         return t.state.uploadType == 'image' ? _react2.default.createElement(
                             'div',
                             { className: 'upload-image-item', key: i },
-                            _react2.default.createElement('img', { width: '100', height: '98', src: t.state.urlPrev + item.id }),
+                            _react2.default.createElement('img', { width: '100', height: '98', onClick: _this3.viewImageHandel.bind(_this3, t.state.urlPrev + item.id), src: t.state.urlPrev + item.id }),
                             _react2.default.createElement('i', { className: t.state.canDel ? 'iconfont icon-minus' : 't-DN', onClick: _this3.del.bind(_this3, i) })
                         ) :
                         // <div className="t-FBH" key={i}  >

package/package.json

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