fmui-base 2.0.73 → 2.0.74

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish
 
 ## 更新日志
+- 2.0.74：移动门户部件样式修改
 - 2.0.73：移动门户部件样式修改
 - 2.0.72：选人组件初始化性能优化
 - 2.0.71：移动门户部件样式修改

package/lib/react_grid/react_grid.less

@@ -23,11 +23,11 @@
   .t-tab-bar::before {
     content: "";
     width: 3px;
-    height: 65%;
+    height: 70%;
     border-radius: 3px;
     background-color: rgba(112, 59, 58,0.8);
     position: absolute;
-    top: 4px;
+    top:1px;
     left: 8px;
   }
 
@@ -46,6 +46,7 @@
       max-width: 95px;
       padding: 2px 5px;
       min-height: 28px;
+      line-height: 1;
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;
@@ -122,7 +123,7 @@
       }
 
       .global-search {
-        padding: 16px 16px 45px 16px;
+        padding: 16px 10px 25px 10px;
       }
     }
     

package/lib/selectMember/select.js

@@ -143,44 +143,63 @@ var Page = function (_React$Component) {
       popCode = popCode.replace(",dep,", ",org,");
       popObj += ",dept";
     }
-    var chooseName = "";
+    // var chooseName = "";
     var chooseObj = "";
     var extObj = {};
-    // var nameObj = {};
-    $.ajax({
-      type: 'GET',
-      url: getLoginUserInfo().context + "/api/m/cmp/popuser/mobile/getSceneInfo?token=" + getLoginUserInfo().token,
-      data: {
-        popCode: popCode,
-        chooseObj: popObj
-      },
-      dataType: "json",
-      async: false,
-      success: function success(data) {
-        if (data.type == "success") {
-          if (data.data && data.data.length > 0) {
-            for (var j = 0; j < data.data.length; j++) {
-              chooseCode += data.data[j].popuCode + ",";
-              if (data.data[j].chooseObj) {
-                chooseObj += data.data[j].chooseObj ? data.data[j].chooseObj : "" + ",";
-              }
-              chooseName += data.data[j].popuName + ",";
-              if (data.data[j].popuUrl) {
-                extObj[data.data[j].popuCode] = data.data[j];
-                // nameObj[chooseCode]=data.data[j].popuName;
+
+    if (_this.checkHasEtraTab(popCode)) {
+      // var nameObj = {};
+      $.ajax({
+        type: 'GET',
+        url: getLoginUserInfo().context + "/api/m/cmp/popuser/mobile/getSceneInfo?token=" + getLoginUserInfo().token,
+        data: {
+          popCode: popCode,
+          chooseObj: popObj
+        },
+        dataType: "json",
+        async: false,
+        success: function success(data) {
+          if (data.type == "success") {
+            if (data.data && data.data.length > 0) {
+              for (var j = 0; j < data.data.length; j++) {
+                chooseCode += data.data[j].popuCode + ",";
+                if (data.data[j].chooseObj) {
+                  chooseObj += data.data[j].chooseObj ? data.data[j].chooseObj + "," : "" + ",";
+                }
+                // chooseName += data.data[j].popuName+",";
+                if (data.data[j].popuUrl) {
+                  extObj[data.data[j].popuCode] = data.data[j];
+                  // nameObj[chooseCode]=data.data[j].popuName;
+                }
               }
             }
+            if (chooseCode) {
+              chooseCode = chooseCode.substring(0, chooseCode.length - 1);
+            }
+            if (chooseObj) {
+              chooseObj = chooseObj.substring(0, chooseObj.length - 1);
+            }
           }
-          if (chooseCode) {
-            chooseCode = chooseCode.substring(0, chooseCode.length - 1);
-          }
-          if (chooseObj) {
-            chooseObj = chooseObj.substring(0, chooseObj.length - 1);
+        } });
+      if (popCode.indexOf("common,") >= 0) {
+        chooseCode = "common," + chooseCode;
+      }
+    } else {
+      var returnPopcode = _this.dealwithPopcode(popCode, popObj);
+      for (var j = 0; j < returnPopcode.length; j++) {
+        if (returnPopcode[j].popuCode) {
+          chooseCode += returnPopcode[j].popuCode + ",";
+          if (returnPopcode[j].chooseObj) {
+            chooseObj += returnPopcode[j].chooseObj ? returnPopcode[j].chooseObj + "," : "" + ",";
           }
         }
-      } });
-    if (popCode.indexOf("common,") >= 0) {
-      chooseCode = "common," + chooseCode;
+      }
+      if (chooseCode) {
+        chooseCode = chooseCode.substring(0, chooseCode.length - 1);
+      }
+      if (chooseObj) {
+        chooseObj = chooseObj.substring(0, chooseObj.length - 1);
+      }
     }
     _this.state = {
       bottomHeight: bottomHeight,
@@ -299,6 +318,144 @@ var Page = function (_React$Component) {
       });
     }
 
+    //检查是否有额外tab
+
+  }, {
+    key: 'checkHasEtraTab',
+    value: function checkHasEtraTab(codes) {
+      codes && codes.split(",").forEach(function (item) {
+        if (item == "" || item == "org" || item == "user" || item == "group" || item == "role" || item == "station" || item == "duty" || item == "personGroup" || item == "politicalOutlook") {} else {
+          return true;
+        }
+      });
+      return false;
+    }
+
+    //处理popcode
+
+  }, {
+    key: 'dealwithPopcode',
+    value: function dealwithPopcode(popCode, popObj) {
+      var codeArray = [];
+      var isOrigin = true;
+      if (popObj) {
+        isOrigin = false;
+      }
+      var popCodeArray = popCode && popCode.split(",");
+      var _iteratorNormalCompletion = true;
+      var _didIteratorError = false;
+      var _iteratorError = undefined;
+
+      try {
+        for (var _iterator = popCodeArray[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+          var item = _step.value;
+
+          if (item) {
+            var codeObj = {};
+            codeObj.popuCode = item;
+
+            if (isOrigin) {
+              if (popCode.indexOf("user") >= 0 && popCode.indexOf("org") >= 0) {
+                if ("user" != item) {
+                  if ("org" == item) {
+                    codeObj.chooseObj = "userAndOrg";
+                  }
+                } else {
+                  continue;
+                }
+              } else if (popCode.indexOf("user") >= 0 || popCode.indexOf("station") >= 0) {
+                if ("user" != item) {
+                  if ("station" == item) {
+                    codeObj.chooseObj = "userAndStation";
+                  }
+                } else {
+                  continue;
+                }
+              }
+            } else if ("user" != item) {
+              if ("org" == item) {
+                if (popObj.indexOf("userAndOrg") >= 0) {
+                  codeObj.chooseObj = "userAndOrg";
+                } else if (popObj.indexOf("userNotOrg") >= 0) {
+                  codeObj.chooseObj = "userNotOrg";
+                } else if (popObj.indexOf("org") >= 0) {
+                  codeObj.chooseObj = "org";
+                } else {
+                  codeObj.chooseObj = "";
+                }
+              } else if ("group" == item) {
+                if (popObj.indexOf("userAndGroup") >= 0) {
+                  codeObj.chooseObj = "userAndGroup";
+                } else if (popObj.indexOf("userNotGroup") >= 0) {
+                  codeObj.chooseObj = "userNotGroup";
+                } else if (popObj.indexOf("group") >= 0) {
+                  codeObj.chooseObj = "group";
+                } else {
+                  codeObj.chooseObj = "";
+                }
+              } else if ("personGroup" == item) {
+                if (popObj.indexOf("userAndPersonGroup") >= 0) {
+                  codeObj.chooseObj = "userAndPersonGroup";
+                } else if (popObj.indexOf("userNotPersonGroup") >= 0) {
+                  codeObj.chooseObj = "userNotPersonGroup";
+                } else if (popObj.indexOf("personGroup") >= 0) {
+                  codeObj.chooseObj = "personGroup";
+                } else {
+                  codeObj.chooseObj = "";
+                }
+              } else if ("station" == item) {
+                if (popObj.indexOf("userAndStation") >= 0) {
+                  codeObj.chooseObj = "userAndStation";
+                } else if (popObj.indexOf("userNotStation") >= 0) {
+                  codeObj.chooseObj = "userNotStation";
+                } else if (popObj.indexOf("station") >= 0) {
+                  codeObj.chooseObj = "station";
+                } else {
+                  codeObj.chooseObj = "";
+                }
+              } else if ("duty" == item) {
+                if (popObj.indexOf("userAndDuty") >= 0) {
+                  codeObj.chooseObj = "userAndDuty";
+                } else if (popObj.indexOf("userNotDuty") >= 0) {
+                  codeObj.chooseObj = "userNotDuty";
+                } else if (popObj.indexOf("duty") >= 0) {
+                  codeObj.chooseObj = "duty";
+                } else {
+                  codeObj.chooseObj = "";
+                }
+              } else if ("politicalOutlook" == item) {
+                if (popObj.indexOf("userAndPoliticalOutlook") >= 0) {
+                  codeObj.chooseObj = "userAndPoliticalOutlook";
+                } else if (popObj.indexOf("userNotPoliticalOutlook") >= 0) {
+                  codeObj.chooseObj = "userNotPoliticalOutlook";
+                } else if (popObj.indexOf("politicalOutlook") >= 0) {
+                  codeObj.chooseObj = "politicalOutlook";
+                } else {
+                  codeObj.chooseObj = "";
+                }
+              }
+            }
+            codeArray.push(codeObj);
+          }
+        }
+      } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+      } finally {
+        try {
+          if (!_iteratorNormalCompletion && _iterator.return) {
+            _iterator.return();
+          }
+        } finally {
+          if (_didIteratorError) {
+            throw _iteratorError;
+          }
+        }
+      }
+
+      return codeArray;
+    }
+
     //去除监听并关闭弹出页
 
   }, {

package/package.json

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