fmui-base 2.1.14 → 2.1.15

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish
 
 ## 更新日志  
+- 2.1.15：统一流程跳转问题
 - 2.1.14：增加分页组件
 - 2.1.13：表单选人组件全部类型可选时选不到用户处理
 - 2.1.12：上传组件增加后台类型校验的参数，预算跳转流程表单路径特殊处理

package/lib/process_list/processList.js

@@ -132,6 +132,7 @@ var ListItem = function (_React$Component) {
             location.hash = url;
           } else {
             var fullUrl = window.location.href;
+            fullUrl = fullUrl.replace("clientType", "");
             var mobilePath = module;
             //projectPath =  modules/mobileoffice  
             // 预算模块跳转特殊处理
@@ -139,7 +140,7 @@ var ListItem = function (_React$Component) {
               fullUrl = fullUrl.replace("/" + projectPath + "/", "/budget/budgetcost/").split('?_')[0].split('/approval/all')[0];
             } else if (module == 'bud_project') {
               fullUrl = fullUrl.replace("/" + projectPath + "/", "/budget/budgetproject/").split('?_')[0].split('/approval/all')[0];
-            } else if (module.indexOf("hoa_") > 0) {
+            } else if (module.indexOf("hoa_") != '-1') {
               var category = module.split("_")[0];
               mobilePath = module.substring(module.indexOf("_") + 1);
               fullUrl = fullUrl.replace("/" + projectPath + "/", "/" + category + "/" + mobilePath + "/").split('?_')[0].split('/approval/all')[0];

package/lib/selectMember/select.js

@@ -618,7 +618,7 @@ var Page = function (_React$Component) {
 
         if (chooseObj) {
           // code = this.props.chooseObj;
-          if (chooseObj.indexOf("userAndOrg") >= 0 && chooseObj.indexOf("org") >= 0) {
+          if (chooseObj.indexOf("userAndOrg") >= 0) {
             chooseType = "userAndOrg";
           } else if (chooseObj.indexOf("userNotOrg") >= 0 && chooseObj.indexOf("org") >= 0) {
             chooseType = "userAndOrg";
@@ -1839,34 +1839,34 @@ var Page = function (_React$Component) {
       var orgType = this.getOrgType();
       if (type == "org") {
         if (chooseType.indexOf("userNotOrg") < 0 && chooseType.indexOf("userAndOrg") < 0) {
-          url = context + "/api/m/cmp/popuser/mobile/getPopuOrgInfo?token=" + token + "&orgId=" + id + "&orgName=" + search + "&corpId=" + baseCorpId + searchLimit + "&orgType=" + orgType;
+          url = context + "/api/m/cmp/popuser/mobile/getPopuOrgInfo?" + "&orgId=" + id + "&orgName=" + search + "&corpId=" + baseCorpId + searchLimit + "&orgType=" + orgType;
         } else {
           if (isOrgChild) {
-            url = context + "/api/m/cmp/popuser/mobile/getPopuOrgChildInfo?token=" + token + "&orgId=" + id + "&searchData=" + search + "&type=user&corpId=" + baseCorpId + searchLimit + "&orgType=" + orgType;
+            url = context + "/api/m/cmp/popuser/mobile/getPopuOrgChildInfo?" + "&orgId=" + id + "&searchData=" + search + "&type=user&corpId=" + baseCorpId + searchLimit + "&orgType=" + orgType;
           } else {
-            url = context + "/api/m/cmp/popuser/mobile/getPopuOrgInfo?token=" + token + "&orgId=" + id + "&orgName=" + search + "&corpId=" + baseCorpId + searchLimit + "&orgType=" + orgType;
+            url = context + "/api/m/cmp/popuser/mobile/getPopuOrgInfo?" + "&orgId=" + id + "&orgName=" + search + "&corpId=" + baseCorpId + searchLimit + "&orgType=" + orgType;
           }
         }
       } else if (type == "user") {
         if (isOrgChild) {
-          url = context + "/api/m/cmp/popuser/mobile/getPopuOrgChildInfo?token=" + token + "&orgId=" + id + "&type=" + type + "&corpId=" + baseCorpId + searchLimit + "&orgType=" + orgType;
+          url = context + "/api/m/cmp/popuser/mobile/getPopuOrgChildInfo?" + "&orgId=" + id + "&type=" + type + "&corpId=" + baseCorpId + searchLimit + "&orgType=" + orgType;
         } else {
-          url = context + "/api/m/cmp/popuser/mobile/getPopuUserInfo?token=" + token + "&userName=" + search + "&corpId=" + baseCorpId + searchLimit;
+          url = context + "/api/m/cmp/popuser/mobile/getPopuUserInfo?" + "&userName=" + search + "&corpId=" + baseCorpId + searchLimit;
         }
       } else if (type == "station") {
         if (isOrgChild) {
-          url = context + "/api/m/cmp/popuser/mobile/getPopuOrgChildInfo?token=" + token + "&orgId=" + id + "&type=" + type + "&corpId=" + baseCorpId + searchLimit + "&orgType=" + orgType;
+          url = context + "/api/m/cmp/popuser/mobile/getPopuOrgChildInfo?" + "&orgId=" + id + "&type=" + type + "&corpId=" + baseCorpId + searchLimit + "&orgType=" + orgType;
         } else {
-          url = context + "/api/m/cmp/popuser/mobile/getPopuStationUserInfo?token=" + token + "&stationId=" + id + "&searchData=" + search + "&corpId=" + baseCorpId + searchLimit;
+          url = context + "/api/m/cmp/popuser/mobile/getPopuStationUserInfo?" + "&stationId=" + id + "&searchData=" + search + "&corpId=" + baseCorpId + searchLimit;
         }
       } else if (type == "group") {
         if (chooseType.indexOf("userNotGroup") < 0 && chooseType.indexOf("userAndGroup") < 0) {
-          url = context + "/api/m/cmp/popuser/mobile/getPopuGroupInfo?token=" + token + "&groupId=" + id + "&type=group" + "&searchData=" + search + "&corpId=" + baseCorpId + searchLimit;
+          url = context + "/api/m/cmp/popuser/mobile/getPopuGroupInfo?" + "&groupId=" + id + "&type=group" + "&searchData=" + search + "&corpId=" + baseCorpId + searchLimit;
         } else {
           if (isOrgChild) {
-            url = context + "/api/m/cmp/popuser/mobile/getPopuGroupInfo?token=" + token + "&groupId=" + id + "&type=user" + "&searchData=" + search + "&corpId=" + baseCorpId + searchLimit;
+            url = context + "/api/m/cmp/popuser/mobile/getPopuGroupInfo?" + "&groupId=" + id + "&type=user" + "&searchData=" + search + "&corpId=" + baseCorpId + searchLimit;
           } else {
-            url = context + "/api/m/cmp/popuser/mobile/getPopuGroupInfo?token=" + token + "&groupId=" + id + "&type=group" + "&searchData=" + search + "&corpId=" + baseCorpId + searchLimit;
+            url = context + "/api/m/cmp/popuser/mobile/getPopuGroupInfo?" + "&groupId=" + id + "&type=group" + "&searchData=" + search + "&corpId=" + baseCorpId + searchLimit;
           }
         }
       } else if (type == "personGroup") {
@@ -1876,17 +1876,17 @@ var Page = function (_React$Component) {
         } else if (isOrgChild) {
           isPersonalGroupChild = 1;
         }
-        url = context + "/api/m/oaPersonalGroup/mobile/allList?token=" + token + "&personalGroupId=" + id + "&type=personGroup" + "&personalGroupName=" + search + "&isPersonalGroupChild=" + isPersonalGroupChild + "&corpId=" + baseCorpId + searchLimit;
+        url = context + "/api/m/oaPersonalGroup/mobile/allList?" + "&personalGroupId=" + id + "&type=personGroup" + "&personalGroupName=" + search + "&isPersonalGroupChild=" + isPersonalGroupChild + "&corpId=" + baseCorpId + searchLimit;
       } else if (type == "role") {
-        url = context + "/api/m/cmp/popuser/mobile/getPopuRoleInfo?token=" + token + "&roleName=" + search + "&corpId=" + baseCorpId;
+        url = context + "/api/m/cmp/popuser/mobile/getPopuRoleInfo?" + "&roleName=" + search + "&corpId=" + baseCorpId;
       } else if (type == "myOrg") {
         //获取当前用户组织
-        url = context + "/api/m/cmp/popuser/mobile/getOrgList?token=" + token + "&orgIds=" + orgHiddenId + "&corpId=" + realCorpId + "&queryType=2&thirdType=";
+        url = context + "/api/m/cmp/popuser/mobile/getOrgList?" + "&orgIds=" + orgHiddenId + "&corpId=" + realCorpId + "&queryType=2&thirdType=";
       } else if (type == "curOrgUser") {
-        url = context + "/api/mobile/user/common/getCurrentOrgUsers?token=" + token + "&userId=" + id;
+        url = context + "/api/mobile/user/common/getCurrentOrgUsers?" + "&userId=" + id;
       } else if (type == "politicalOutlook") {
         //政治面貌
-        url = context + "/api/m/cmp/popuser/mobile/getPopuPoliticalOutlookInfo?token=" + token + "&politicalOutlookCode=" + id + "&searchData=" + search + "&corpId=" + realCorpId + searchLimit;
+        url = context + "/api/m/cmp/popuser/mobile/getPopuPoliticalOutlookInfo?" + "&politicalOutlookCode=" + id + "&searchData=" + search + "&corpId=" + realCorpId + searchLimit;
       } else if (type == "duty") {
         //岗位
         var pId = "";
@@ -1897,7 +1897,7 @@ var Page = function (_React$Component) {
             pId = idArray[1];
           }
         }
-        url = context + "/api/m/cmp/popuser/mobile/getPopuDutyInfo?token=" + token + "&dutyId=" + id + "&searchData=" + search + "&corpId=" + realCorpId + searchLimit;
+        url = context + "/api/m/cmp/popuser/mobile/getPopuDutyInfo?" + "&dutyId=" + id + "&searchData=" + search + "&corpId=" + realCorpId + searchLimit;
         if (search) {
           url += "&type=3";
         } else if (id == null || id == undefined || id == "") {
@@ -1908,7 +1908,7 @@ var Page = function (_React$Component) {
           url += "&type=2";
         }
       } else {
-        url = context + this.dealwithExtUrl(this.state.extObj[type].popuUrl) + "?token=" + token + "&searchData=" + search + "&corpId=" + realCorpId + searchLimit;
+        url = context + this.dealwithExtUrl(this.state.extObj[type].popuUrl) + "?" + "&searchData=" + search + "&corpId=" + realCorpId + searchLimit;
       }
       return url;
     }
@@ -1960,7 +1960,8 @@ var Page = function (_React$Component) {
             mode: "cors",
             headers: {
               'Accept': 'application/json, text/plain, */*',
-              'Content-Type': 'application/x-www-form-urlencoded'
+              'Content-Type': 'application/x-www-form-urlencoded',
+              'Authorization': 'Bearer ' + getLoginUserInfo().token
             }
           }).then(function (response) {
             return response.json();
@@ -2062,7 +2063,8 @@ var Page = function (_React$Component) {
           mode: "cors",
           headers: {
             'Accept': 'application/json, text/plain, */*',
-            'Content-Type': 'application/x-www-form-urlencoded'
+            'Content-Type': 'application/x-www-form-urlencoded',
+            'Authorization': 'Bearer ' + getLoginUserInfo().token
           }
         }).then(function (response) {
           return response.json();
@@ -2132,7 +2134,8 @@ var Page = function (_React$Component) {
           mode: "cors",
           headers: {
             'Accept': 'application/json, text/plain, */*',
-            'Content-Type': 'application/x-www-form-urlencoded'
+            'Content-Type': 'application/x-www-form-urlencoded',
+            'Authorization': 'Bearer ' + getLoginUserInfo().token
           }
         }).then(function (response) {
           return response.json();
@@ -2230,7 +2233,8 @@ var Page = function (_React$Component) {
           mode: "cors",
           headers: {
             'Accept': 'application/json, text/plain, */*',
-            'Content-Type': 'application/x-www-form-urlencoded'
+            'Content-Type': 'application/x-www-form-urlencoded',
+            'Authorization': 'Bearer ' + getLoginUserInfo().token
           }
         }).then(function (response) {
           return response.json();
@@ -2344,7 +2348,8 @@ var Page = function (_React$Component) {
           mode: "cors",
           headers: {
             'Accept': 'application/json, text/plain, */*',
-            'Content-Type': 'application/x-www-form-urlencoded'
+            'Content-Type': 'application/x-www-form-urlencoded',
+            'Authorization': 'Bearer ' + getLoginUserInfo().token
           }
         }).then(function (response) {
           return response.json();
@@ -2435,7 +2440,8 @@ var Page = function (_React$Component) {
           mode: "cors",
           headers: {
             'Accept': 'application/json, text/plain, */*',
-            'Content-Type': 'application/x-www-form-urlencoded'
+            'Content-Type': 'application/x-www-form-urlencoded',
+            'Authorization': 'Bearer ' + getLoginUserInfo().token
           }
         }).then(function (response) {
           return response.json();
@@ -2526,7 +2532,8 @@ var Page = function (_React$Component) {
           mode: "cors",
           headers: {
             'Accept': 'application/json, text/plain, */*',
-            'Content-Type': 'application/x-www-form-urlencoded'
+            'Content-Type': 'application/x-www-form-urlencoded',
+            'Authorization': 'Bearer ' + getLoginUserInfo().token
           }
         }).then(function (response) {
           return response.json();
@@ -2621,7 +2628,8 @@ var Page = function (_React$Component) {
           mode: "cors",
           headers: {
             'Accept': 'application/json, text/plain, */*',
-            'Content-Type': 'application/x-www-form-urlencoded'
+            'Content-Type': 'application/x-www-form-urlencoded',
+            'Authorization': 'Bearer ' + getLoginUserInfo().token
           }
         }).then(function (response) {
           return response.json();

package/package.json

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