fmui-base 1.0.2 → 1.0.4

package/lib/poppage/check.js

@@ -11,23 +11,27 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
-var _TextField = require('saltui/lib/TextField');
+var _Boxs = require('saltui/lib/Boxs');
 
-var _TextField2 = _interopRequireDefault(_TextField);
+var _Boxs2 = _interopRequireDefault(_Boxs);
 
-var _Group = require('saltui/lib/Group');
+var _Button = require('saltui/lib/Button');
 
-var _Group2 = _interopRequireDefault(_Group);
+var _Button2 = _interopRequireDefault(_Button);
 
-var _table = require('./table');
+var _Dialog = require('saltui/lib/Dialog');
+
+var _Dialog2 = _interopRequireDefault(_Dialog);
+
+var _table = require('./table/table');
 
 var _table2 = _interopRequireDefault(_table);
 
-var _tree = require('./tree');
+var _tree = require('./tree/tree');
 
 var _tree2 = _interopRequireDefault(_tree);
 
-var _treetable = require('./treetable');
+var _treetable = require('./treetable/treetable');
 
 var _treetable2 = _interopRequireDefault(_treetable);
 
@@ -47,8 +51,8 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen
 
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 
-var HBox = _TextField2.default.HBox,
-    Box = _TextField2.default.Box;
+var HBox = _Boxs2.default.HBox,
+    Box = _Boxs2.default.Box;
 
 var PageHome = function (_React$Component) {
     _inherits(PageHome, _React$Component);
@@ -255,7 +259,7 @@ var PageHome = function (_React$Component) {
                         popType = popData.popType;
                         // 显示字段
                         if (popType == 'treetable') {
-                            _Group2.default.alert({
+                            _Dialog2.default.alert({
                                 content: '暂不支持树-列表格式的弹出选择！',
                                 onConfirm: function onConfirm() {
                                     $("#App").removeAttr("style");
@@ -489,7 +493,7 @@ var PageHome = function (_React$Component) {
                             'div',
                             { className: 'section-content' },
                             _react2.default.createElement(
-                                _Group2.default,
+                                _Button2.default,
                                 { type: 'primary', onClick: function onClick() {
                                         _this3.popupFuc();
                                     } },

package/lib/process_info/processInfo.js

@@ -1265,7 +1265,7 @@ var PageHome = function (_React$Component) {
                     }
                 }
             }
-            buttonList.push({ name: "邮件转发", type: 'secondary', display: 'banner', no: 18 });
+            // buttonList.push({name:"邮件转发",type:'secondary',display:'banner',no:18});
             if (listType != '0') {
                 this.setState({
                     buttonList: buttonList,

package/lib/process_list/processList.js

@@ -105,7 +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 type = this.props.fromType; //self：本应用，all:全模块
 
           var taskId = '';
           var processInstanceId = itemInfo.processInstanceId;
@@ -127,10 +127,13 @@ var ListItem = function (_React$Component) {
             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];
+            var mobilePath = module;
+            if (module.indexOf("_") > 0) {
+              var category = module.split("_")[0];
+              mobilePath = module.substring(module.indexOf("_") + 1);
+              fullUrl = fullUrl.replace(/approve/g, mobilePath).replace("/modules/", "/" + category + "/").split('?_')[0].split('/approval/all')[0];
             } else {
-              fullUrl = fullUrl.replace(/approve/g, module).split('?_')[0].split('/approval/all')[0];
+              fullUrl = fullUrl.replace(/approve/g, mobilePath).split('?_')[0].split('/approval/all')[0];
             }
             //alert(fullUrl);
             var _url = "process/processDetails/" + taskId + "/" + param_formKey + "/" + param_businessKey + "/" + param_list_type + "/0/" + processInstanceId + "/" + module + "/" + loginUserId;

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "fmui-base",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "title": "fmui-base",
-  "description": "fmui-base",
+  "description": "去掉邮件转发按钮功能",
   "main": "lib/index.js",
   "files": [
     "dist",