fmui-base 1.0.0 → 1.0.2

package/lib/form_info/index.js

@@ -0,0 +1,16 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _formInfo = require('./formInfo');
+
+Object.defineProperty(exports, 'default', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_formInfo).default;
+  }
+});
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/process_list/processList.js

@@ -105,6 +105,7 @@ var ListItem = function (_React$Component) {
           var param_list_type = this.props.type; // 列表类型 待办-0,待阅-1,
           var processName = itemInfo.processName; // 流程名称
           var module = itemInfo.module; // 流程名称
+          var type = itemInfo.type; //self：本应用，all:全模块
 
           var taskId = '';
           var processInstanceId = itemInfo.processInstanceId;
@@ -117,12 +118,27 @@ var ListItem = function (_React$Component) {
           // location.hash = 'approval/approval-details/detail-servlet/' + param_list_type + '/1/' + param_processKey + '/' + param_formKey + '/' +param_businessKey +
           //                     '/' + param_startUserId;
           // alert(searchVal);
-          var url = "process/processDetails/" + taskId + "/" + param_formKey + "/" + param_businessKey + "/" + param_list_type + "/0/" + processInstanceId + "/" + module + "/" + loginUserId;
-          if (searchVal != '') {
-            url += "/" + searchVal;
+          if (type == "self") {
+            var url = "process/processDetails/" + taskId + "/" + param_formKey + "/" + param_businessKey + "/" + param_list_type + "/0/" + processInstanceId + "/" + module + "/" + loginUserId;
+            if (searchVal != '') {
+              url += "/" + searchVal;
+            }
+            decodeURI(url);
+            location.hash = url;
+          } else {
+            var fullUrl = window.location.href;
+            if (module.indexOf("hoa_") >= 0) {
+              fullUrl = fullUrl.replace(/approve/g, module).replace("/modules/", "/hoa/").split('?_')[0].split('/approval/all')[0];
+            } else {
+              fullUrl = fullUrl.replace(/approve/g, module).split('?_')[0].split('/approval/all')[0];
+            }
+            //alert(fullUrl);
+            var _url = "process/processDetails/" + taskId + "/" + param_formKey + "/" + param_businessKey + "/" + param_list_type + "/0/" + processInstanceId + "/" + module + "/" + loginUserId;
+            _url = fullUrl + '/' + _url;
+            decodeURI(_url);
+            location.href = _url;
           }
-          decodeURI(url);
-          location.hash = url;
+
           // window.salt.router.push({
           //     id: 'detailPage',
           //     url: url,
@@ -357,249 +373,6 @@ var ListItem = function (_React$Component) {
 
 ;
 
-// const ItemCollapse = React.createClass({
-//     getInitialState: function () {//组件相关的状态对象
-//       return {
-//         show: false,
-//         itemList: []
-//       }
-//     },
-//     clickList: function (item) {
-//       if (this.props.ableClick) {
-//         let processInstanceId = item.processInstanceId;
-//         let taskId = item.id;
-//         //let handleUserId = item.assignee;
-//         let formId = item.formKey;
-//         let dataId = item.businessKey;
-//         let type = this.props.type;
-//         let processKey = this.props.processKey;
-//         let category = item.category;
-//         let id = "";
-//         // if(type == 1){//已办
-//         //   id = processInstanceId;
-//         // }else{
-//         id = taskId;
-//         //}
-//         let url = "process/processDetails/" + id + "/" + formId + "/" + dataId + "/" + type + "/0/" + processInstanceId +"/approve";                        
-//         location.hash = url;
-//       } else {
-//         this.props.updateAbleClick(true);
-//       }
-//     },
-//     clickList2: function (show) {
-//       let t = this;
-//       if(!show){
-//         DB.FlowModuleAPI.getDoneTaskListByProcessId({
-//           processInstanceId:this.props.processInstanceId,
-//           module:"approve",
-//         })
-//         .then((content) => {
-//           t.setState({
-//             itemList:content.list,
-//             show: !show
-//           })
-//         }).catch((error) => {
-//           console.error(error);
-//         });
-//       }else{
-//         t.setState({
-//           itemList:[],
-//           show: !show
-//         })
-//       }
-//     },
-//     render: function () {
-//       let checkIsNotComplete = function (data) { //检查是否办理完成
-//         if (data.type == 0) { //待办
-//           return true;
-//         } else if (data.type == 1) { //待阅
-//           if(data.status == 2){
-//              return false;
-//           }else{
-//             return true;
-//           }
-//         } else if (data.type == 2) { //已办
-//           if (typeof (data.processEndTime) == 'undefined' || data.processEndTime == null) {
-//         	  if(typeof (data.curStepName) == 'undefined' || data.curStepName == null){
-//         		  return false;
-//         	  }
-//             return true;
-//           } else {
-//             return false;
-//           }
-//         } else if (data.type == 3) { //已阅
-//           if (data.status == 2) {
-//             return false;
-//           } else {
-//             return true;
-//           }
-//         } else { //我的
-//           if (typeof (data.finishedTime) == 'undefined' || data.finishedTime == null) {
-//             return true;
-//           } else {
-//             return false;
-//           }
-//         }
-//       }
-
-//       //主列表
-//       let comleteName = function (data) {
-//         if (data.type == 0) { //待办
-//           return data.name;
-//         } else if (data.type == 1) { //待阅
-//           return data.name;
-//         } else if (data.type == 2) { //已办
-//           if(data.status=='2') {
-//             return "结束";
-//           }else if(data.status=='3') {
-//             return "作废";
-//           }else if(data.status=='4') {
-//             return "取消";
-//           }
-//           return data.curStepName;
-//         } else if (data.type == 3) { //已阅
-//           return data.name;
-//         } else { //我的
-//           if(data.status=='2') {
-//             return "结束";
-//           }else if(data.status=='3') {
-//             return "作废";
-//           }else if(data.status=='4') {
-//             return "取消";
-//           }
-//           return data.curStepName;
-//         }
-//       }
-
-//       //子列表
-//       let comleteName2 = function (data,type) {
-//         if (type == 0) { //待办
-//           return data.name;
-//         } else if (type == 1) { //待阅
-//           return data.name;
-//         } else if (type == 2) { //已办
-//           return data.curStepName;
-//         } else if (type == 3) { //已阅
-//           return data.name;
-//         } else { //我的
-//           return data.curStepName;
-//         }
-//       }
-//        //主列表
-//       let assigneeName = function (data) {
-//         if (data.type == 0) { //待办
-//           return data.startUserName;
-//         } else if (data.type == 1) { //待阅
-//           return data.startUserName;
-//         } else if (data.type == 2) { //已办
-//           return data.curUserName;
-//         } else if (data.type == 3) { //已阅
-//           return data.assigneeName;
-//         } else { //我的
-//           return data.curUserName;
-//         }
-//       }
-
-//       //主列表
-//       let formatTime = function (data) {
-//         if (data.type == 0) { //待办
-//           return data.createTime;
-//         } else if (data.type == 1) { //待阅
-//           return data.createTime;
-//         } else if (data.type == 2) { //已办
-//           return data.createTime;
-//         } else if (data.type == 3) { //已阅
-//           return data.endTime;
-//         } else { //我的
-//           return data.createTime;
-//         }
-//       }
-
-//        //子列表
-//       let formatTime2 = function (data,type) {
-//         if (type == 0) { //待办
-//           return data.createTime;
-//         } else if (type == 1) { //待阅
-//           return data.createTime;
-//         } else if (type == 2) { //已办
-//           return data.endTime;
-//         } else if (type == 3) { //已阅
-//           return data.endTime;
-//         } else { //我的
-//           return data.createTime;
-//         }
-//       }
-
-//        //子列表
-//        let formatAction = function (data) {
-//         if (data.action == 'submit') { 
-//           return "提交";;
-//         } else if (data.action == 'transfer') { 
-//           return "转交";
-//         } else if (data.action == 'back') { 
-//           return "驳回";
-//         } else if (data.action == 'jump') { 
-//           return "跳转";
-//         } else if (data.action == 'end') { 
-//           return "结束";
-//         } else if (data.action == 'cancel') {
-//           return "取消";
-//         } else if(data.action == 'finish'){
-//           return "完成";
-//         }
-//       }
-
-//       return  <div className="t-BCf dd-bottom-border">
-//           <div className="dd-t-list-wrap text-omit" >
-//           <HBox className="t-BCf t-P16 t-PR12 " onClick={this.clickList2.bind(this)}>
-//           <Box flex={1}>
-//             <div className="t-omit t-FC3 t-FS16 t-LH1_3 t-MR8">
-//               <i className="t-list-title t-omit t-LH1_4"></i>
-//               {this.props.title}
-//             </div>
-//             <HBox className="t-FCddfontblue-40 t-LH1_3 t-PT8 t-FS14" vAlign="center">
-//               <HBox vAlign="center">
-//                 <Box><i className="iconfont icon-time t-MR4 t-FS14"></i></Box>
-//                 <Box><span className="t-omit t-MR26">{formatTime(this.props)}</span></Box>
-//               </HBox>
-//               <HBox flex={1} vAlign="center">
-//                 <Box><span className={checkIsNotComplete(this.props)?'t-list-text t-FCoranger t-omit t-MR4':'t-list-text t-FCgreen t-omit t-MR4'}>{checkIsNotComplete(this.props)?comleteName(this.props)+'  '+assigneeName(this.props):comleteName(this.props)}</span></Box>
-//               </HBox>
-//             </HBox>
-//           </Box>
-//           <Box>
-//           <AngleRight width={20} fill="#ccc" className="demo-t-list-arrow" />
-//           </Box>
-//         </HBox>
-//       </div>
-//           <div className={this.state.shows ? "t-DN" : "t-DN"}>
-//             {
-//               this.state.itemList.map(function (item, i) {
-//               return (
-//                 		 <div className="dd-t-list-wrap t-PL0 t-ML67 dd-top-border"  onClick={this.clickList.bind(this,item)}>
-//                          <HBox flex={1} vAlign="center">
-//                            <Box className="dd-t-list-text-content" flex={1}>
-//                              <p className="dd-t-list-title t-LH1_4 t-omit">{item.title}</p>
-//                              <div className="dd-t-list-time t-FBAC t-FBH">
-//                                <i className="iconfont icon-time t-FCc t-MR4 t-FS14"></i>
-//                                <span className="t-list-text t-omit t-MR12">{formatTime2(item,this.props.type)}</span>
-//                                <i className="iconfont icon-approval t-MR4" style={{ fontSize: 14 }}></i>
-//                                <span className="t-list-text t-omit t-MR4"> {comleteName2(item,this.props.type)}</span>
-//                                <span className="t-list-text t-MR4 t-omit">{formatAction(item)}</span>
-//                              </div>
-//                            </Box>
-//                          </HBox>
-
-//                        </div>
-//                 )
-//               }.bind(this))
-//             }
-//           </div>
-//       </div>;
-//     }
-//   });
-
-
 var transactionIndex = {
   activeTabIndex: ''
 };
@@ -618,12 +391,15 @@ var PageHome = function (_React$Component2) {
     // 禁用iOS弹性事件
     dd.ui.webViewBounce.disable();
     //获取内容显示区域高度
-    var hasBottomTab = document.getElementById("hasBottomTab").value;
+    var hasBottomTabHidden = document.getElementById("hasBottomTab") ? document.getElementById("hasBottomTab").value : "0";
+    var hasBottomTab = props.hasBottomTab ? props.hasBottomTab : hasBottomTabHidden;
     var winHeight = getScrollHigh(1, 1, hasBottomTab);
 
     var constIndex = document.getElementById("activeTabIndex").value; //常量
     var activeIndex = props.activeIndex ? props.activeIndex : 0;
     var module = props.module ? props.module : "approve";
+    var type = props.type ? props.type : "self"; //self：本应用，all:全模块
+    var tabCodes = props.tabCodes ? props.tabCodes : "undo,unread,done,read,myself"; //self：本应用，all:全模块
     var searchVal = props.search;
     if (constIndex == '') {
       if (!activeIndex) {
@@ -633,7 +409,27 @@ var PageHome = function (_React$Component2) {
     } else {
       activeIndex = constIndex;
     }
+    var undoListUrl;
+    var unreadListUrl;
+    var doneListUrl;
+    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;
+    } else {
+      undoListUrl = _variables2.default.URLS.transaction.undo;
+      unreadListUrl = _variables2.default.URLS.transaction.unread;
+      doneListUrl = _variables2.default.URLS.transaction.done;
+      readListUrl = _variables2.default.URLS.transaction.read;
+      myselfListUrl = _variables2.default.URLS.transaction.myself;
+    }
     _this2.state = {
+      tabCodes: tabCodes,
+      type: type,
       activeTabIndex: activeIndex, // 待办-0；待阅-1；已办-2；已阅-3；我的-4
       winHeight: winHeight,
       page: 0,
@@ -656,7 +452,12 @@ var PageHome = function (_React$Component2) {
       noDataTip2: '暂无数据',
       noDataTip3: '暂无数据',
       noDataTip4: '暂无数据',
-      module: module
+      module: module,
+      undoListUrl: undoListUrl,
+      unreadListUrl: unreadListUrl,
+      doneListUrl: doneListUrl,
+      readListUrl: readListUrl,
+      myselfListUrl: myselfListUrl
     };
 
     /**
@@ -1176,7 +977,7 @@ var PageHome = function (_React$Component2) {
         _react2.default.createElement(
           _Tab2.default,
           { activeKey: this.state.activeTabIndex, onChange: this.handleTabChange.bind(this), destroyInactiveTabPane: false },
-          _react2.default.createElement(
+          this.state.tabCodes.indexOf('undo') >= 0 ? _react2.default.createElement(
             _Tab2.default.Item,
             { title: "待办" + (this.state.titleCount.undo == 0 ? '' : '(' + this.state.titleCount.undo + ')') },
             _react2.default.createElement(
@@ -1199,7 +1000,7 @@ var PageHome = function (_React$Component2) {
               _react2.default.createElement(
                 _ScrollList2.default,
                 {
-                  url: _variables2.default.URLS.transaction.undo + "&module=" + this.state.module,
+                  url: this.state.undoListUrl,
                   dataType: 'json',
                   pageSize: 10,
                   beforeFetch: this.beforeFetch0.bind(this),
@@ -1211,11 +1012,11 @@ var PageHome = function (_React$Component2) {
                   noDataTip: this.state.noDataTip0,
                   onLoad: this.onLoad.bind(this)
                 },
-                _react2.default.createElement(ListItem, { type: '0', isBatch: this.state.isBatch, ableClick: this.state.ableClick, updateAbleClick: this.updateAbleClick.bind(this) })
+                _react2.default.createElement(ListItem, { type: '0', isBatch: this.state.isBatch, ableClick: this.state.ableClick, fromType: this.state.type, updateAbleClick: this.updateAbleClick.bind(this) })
               )
             )
-          ),
-          _react2.default.createElement(
+          ) : "",
+          this.state.tabCodes.indexOf('unread') >= 0 ? _react2.default.createElement(
             _Tab2.default.Item,
             { title: "待阅" + (this.state.titleCount.unread == 0 ? '' : '(' + this.state.titleCount.unread + ')') },
             _react2.default.createElement(
@@ -1238,7 +1039,7 @@ var PageHome = function (_React$Component2) {
               _react2.default.createElement(
                 _ScrollList2.default,
                 {
-                  url: _variables2.default.URLS.transaction.unread + "&module=" + this.state.module,
+                  url: this.state.unreadListUrl,
                   dataType: 'json',
                   pageSize: 10,
                   beforeFetch: this.beforeFetch1.bind(this),
@@ -1248,11 +1049,11 @@ var PageHome = function (_React$Component2) {
                   currentPageKey: 'page',
                   noDataTip: this.state.noDataTip1
                 },
-                _react2.default.createElement(ListItem, { type: '1', ableClick: this.state.ableClick, isBatch: this.state.isBatch, updateAbleClick: this.updateAbleClick.bind(this) })
+                _react2.default.createElement(ListItem, { type: '1', ableClick: this.state.ableClick, isBatch: this.state.isBatch, fromType: this.state.type, updateAbleClick: this.updateAbleClick.bind(this) })
               )
             )
-          ),
-          _react2.default.createElement(
+          ) : "",
+          this.state.tabCodes.indexOf('done') >= 0 ? _react2.default.createElement(
             _Tab2.default.Item,
             { title: "已办" + (this.state.titleCount.done == 0 ? '' : '(' + this.state.titleCount.done + ')') },
             _react2.default.createElement(
@@ -1270,7 +1071,7 @@ var PageHome = function (_React$Component2) {
               _react2.default.createElement(
                 _ScrollList2.default,
                 {
-                  url: _variables2.default.URLS.transaction.done + "&module=" + this.state.module,
+                  url: this.state.doneListUrl,
                   dataType: 'json',
                   pageSize: 10,
                   beforeFetch: this.beforeFetch2.bind(this),
@@ -1280,11 +1081,11 @@ var PageHome = function (_React$Component2) {
                   currentPageKey: 'page',
                   noDataTip: this.state.noDataTip2
                 },
-                _react2.default.createElement(ListItem, { type: '2', ableClick: this.state.ableClick, isBatch: this.state.isBatch, updateAbleClick: this.updateAbleClick.bind(this) })
+                _react2.default.createElement(ListItem, { type: '2', ableClick: this.state.ableClick, isBatch: this.state.isBatch, fromType: this.state.type, updateAbleClick: this.updateAbleClick.bind(this) })
               )
             )
-          ),
-          _react2.default.createElement(
+          ) : "",
+          this.state.tabCodes.indexOf('read') >= 0 ? _react2.default.createElement(
             _Tab2.default.Item,
             { title: "已阅" + (this.state.titleCount.read == 0 ? '' : '(' + this.state.titleCount.read + ')') },
             _react2.default.createElement(
@@ -1302,7 +1103,7 @@ var PageHome = function (_React$Component2) {
               _react2.default.createElement(
                 _ScrollList2.default,
                 {
-                  url: _variables2.default.URLS.transaction.read + "&module=" + this.state.module,
+                  url: this.state.readListUrl,
                   dataType: 'json',
                   pageSize: 10,
                   beforeFetch: this.beforeFetch3.bind(this),
@@ -1312,11 +1113,11 @@ var PageHome = function (_React$Component2) {
                   currentPageKey: 'page',
                   noDataTip: this.state.noDataTip3
                 },
-                _react2.default.createElement(ListItem, { type: '3', ableClick: this.state.ableClick, isBatch: this.state.isBatch, updateAbleClick: this.updateAbleClick.bind(this) })
+                _react2.default.createElement(ListItem, { type: '3', ableClick: this.state.ableClick, isBatch: this.state.isBatch, fromType: this.state.type, updateAbleClick: this.updateAbleClick.bind(this) })
               )
             )
-          ),
-          _react2.default.createElement(
+          ) : "",
+          this.state.tabCodes.indexOf('myself') >= 0 ? _react2.default.createElement(
             _Tab2.default.Item,
             { title: "我的" + (this.state.titleCount.myself == 0 ? '' : '(' + this.state.titleCount.myself + ')') },
             _react2.default.createElement(
@@ -1334,7 +1135,7 @@ var PageHome = function (_React$Component2) {
               _react2.default.createElement(
                 _ScrollList2.default,
                 {
-                  url: _variables2.default.URLS.transaction.myself + "&module=" + this.state.module,
+                  url: this.state.myselfListUrl,
                   dataType: 'json',
                   pageSize: 10,
                   beforeFetch: this.beforeFetch4.bind(this),
@@ -1344,10 +1145,10 @@ var PageHome = function (_React$Component2) {
                   currentPageKey: 'page',
                   noDataTip: this.state.noDataTip4
                 },
-                _react2.default.createElement(ListItem, { type: '4', ableClick: this.state.ableClick, isBatch: this.state.isBatch, updateAbleClick: this.updateAbleClick.bind(this) })
+                _react2.default.createElement(ListItem, { type: '4', ableClick: this.state.ableClick, isBatch: this.state.isBatch, fromType: this.state.type, updateAbleClick: this.updateAbleClick.bind(this) })
               )
             )
-          )
+          ) : ""
         ),
         _react2.default.createElement(
           'div',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fmui-base",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "title": "fmui-base",
   "description": "fmui-base",
   "main": "lib/index.js",