cloud-web-corejs 1.0.54-dev.335 → 1.0.54-dev.337

package/src/utils/request.js

@@ -182,14 +182,20 @@ function handleCreateInfo(config, res) {
   let data = res.objx;
   if (typeof res.objx === "object") {
     if (Array.isArray(data)) {
-      res.objx.forEach(item => {
+      for(let item of res.objx){
         toDo(item);
-      })
+      }
+      /* res.objx.forEach(item => {
+        toDo(item);
+      }) */
     } else if (data && res.objx.hasOwnProperty("records")) {
       let records = res.objx.records || [];
-      records.forEach(item => {
+      for(let item of records){
+        toDo(item);
+      }
+      /* records.forEach(item => {
         toDo(item);
-      })
+      }) */
     } else {
       toDo(res.objx);
     }
@@ -231,7 +237,18 @@ async function handleNickName2(option) {
     data = res.objx.records;
   }
   let requestData = [];
-  data.forEach(item => {
+  for(let item of data){
+    let createBy = getCreateBy(item);
+    let modifyBy = getModifyBy(item);
+
+    if (createBy && !requestData.includes(createBy)) {
+      requestData.push(createBy)
+    }
+    if (modifyBy && !requestData.includes(modifyBy)) {
+      requestData.push(modifyBy)
+    }
+  }
+  /* data.forEach(item => {
     let createBy = getCreateBy(item);
     let modifyBy = getModifyBy(item);
 
@@ -241,7 +258,7 @@ async function handleNickName2(option) {
     if (modifyBy && !requestData.includes(modifyBy)) {
       requestData.push(modifyBy)
     }
-  })
+  }) */
   if (!requestData.length) {
     callback && callback(res)
     return
@@ -259,7 +276,25 @@ async function handleNickName2(option) {
     isLoading: isLoading,
     success: res2 => {
       let arr = res2.objx || [];
-      data.forEach(item => {
+      for(let item of data){
+        let createBy = getCreateBy(item);
+        let modifyBy = getModifyBy(item);
+        if (createBy) {
+          let obj = arr.find(item => item.loginAccount === createBy);
+          if (obj && obj.nickName) {
+            item._createNickName = obj.nickName;
+            item._createMobile = obj.mobile;
+          }
+        }
+        if (modifyBy) {
+          let obj = arr.find(item => item.loginAccount === modifyBy);
+          if (obj && obj.nickName) {
+            item._modifyNickName = obj.nickName;
+            item._modifyMobile = obj.mobile;
+          }
+        }
+      }
+      /* data.forEach(item => {
         let createBy = getCreateBy(item);
         let modifyBy = getModifyBy(item);
         if (createBy) {
@@ -276,7 +311,7 @@ async function handleNickName2(option) {
             item._modifyMobile = obj.mobile;
           }
         }
-      })
+      }) */
     }
   });
 }