cloud-web-corejs 1.0.54-dev.336 → 1.0.54-dev.338

package/src/components/xform/mixins/scriptHttp.js

@@ -45,66 +45,66 @@ modules = {
       return this.getFormRef ? this.getFormRef() : this;
     },
     formHttp(opts) {
-      let data = opts.data;
-      let scriptCode = opts.scriptCode ? opts.scriptCode.trim() : null;
-      let formCode = opts.formCode ? opts.formCode.trim() : null;
-      let isLoading = opts.isLoading ?? true;
-      let success = opts.success;
-      let fail = opts.fail;
-      let error = opts.error;
+      return new Promise((resolve, reject) => {
+        let data = opts.data;
+        let scriptCode = opts.scriptCode ? opts.scriptCode.trim() : null;
+        let formCode = opts.formCode ? opts.formCode.trim() : null;
+        let isLoading = opts.isLoading ?? true;
+        let success = opts.success;
+        let fail = opts.fail;
+        let error = opts.error;
 
-      let that = this;
-      let reportTemplate = that.getFormRef ? that.getFormRef().reportTemplate : that.reportTemplate;
-      if (scriptCode && !formCode) {
-        let arr = scriptCode.split("/").filter(item => item)
-        if (arr.length > 1) {
-          formCode = arr[0];
-          scriptCode = arr[1];
+        let that = this;
+        let reportTemplate = that.getFormRef ? that.getFormRef().reportTemplate : that.reportTemplate;
+        if (scriptCode && !formCode) {
+          let arr = scriptCode.split("/").filter(item => item)
+          if (arr.length > 1) {
+            formCode = arr[0];
+            scriptCode = arr[1];
+          }
+        }
+        if (!formCode) {
+          formCode = reportTemplate.formCode
         }
-      }
-      if (!formCode) {
-        formCode = reportTemplate.formCode
-      }
 
-      delete opts.data
-      delete opts.scriptCode
-      delete opts.formCode
-      delete opts.isLoading
-      delete opts.success
-      delete opts.fail
-      delete opts.error
+        delete opts.data
+        delete opts.scriptCode
+        delete opts.formCode
+        delete opts.isLoading
+        delete opts.success
+        delete opts.fail
+        delete opts.error
 
 
-      let getServiceName = (callback) => {
+        let getServiceName = (callback) => {
 
-        if (formCode && formCode !== reportTemplate.formCode) {
-          this.getHttpTarget().$http({
-            // aes: true,
-            url: USER_PREFIX + `/formScript/getServiceName`,
-            method: `post`,
-            data: {
-              formCode,
-              scriptCode
-            },
-            isLoading,
-            // loadingTarget: this.getLoadingTarget(),
-            // modalStrictly: true,
-            success: res => {
-              let serviceName = res.objx;
-              if (serviceName) {
-                callback(serviceName)
-              } else {
-                this.$baseAlert("服务名不存在")
+          if (formCode && formCode !== reportTemplate.formCode) {
+            this.getHttpTarget().$http({
+              // aes: true,
+              url: USER_PREFIX + `/formScript/getServiceName`,
+              method: `post`,
+              data: {
+                formCode,
+                scriptCode
+              },
+              isLoading,
+              // loadingTarget: this.getLoadingTarget(),
+              // modalStrictly: true,
+              success: res => {
+                let serviceName = res.objx;
+                if (serviceName) {
+                  callback(serviceName)
+                } else {
+                  this.$baseAlert("服务名不存在")
+                }
               }
-            }
-          });
-        } else {
-          callback(reportTemplate.serviceName)
-        }
+            });
+          } else {
+            callback(reportTemplate.serviceName)
+          }
 
-      }
-      let toDo = () => {
-        return new Promise((resolve, reject) => {
+        }
+        let toDo = () => {
           getServiceName(searviceName => {
             let reqData;
             reqData = data;
@@ -164,15 +164,16 @@ modules = {
               }
             });
           })
-        })
-      }
-      if (opts.isConfirm) {
-        this.$baseConfirm(opts.confirmText).then(() => {
-          return toDo();
-        });
-      } else {
-        return toDo();
-      }
+        }
+        if (opts.isConfirm) {
+          this.$baseConfirm(opts.confirmText).then(() => {
+             toDo();
+          });
+        } else {
+           toDo();
+        }
+      });
+      
     }
   }
 }

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;
           }
         }
-      })
+      }) */
     }
   });
 }