cloud-web-corejs 1.0.54-dev.29 → 1.0.54-dev.291

package/src/utils/request.js

@@ -1,357 +1,351 @@
-/**version-1.0*/
-import Vue from 'vue'
-import axios from 'axios'
-import qs from 'qs'
-import store from '../store/index.js'
-import {
-  getToken
-} from './auth.js'
-import ErroreBox from '../components/errorMsg/index.js'
-import PopupManager from 'element-ui/src/utils/popup/popup-manager.js'
-import settingConfig from "@/settings.js";
-import {encode} from "js-base64";
-import {encrypt} from "@base/utils/aes";
-
-let configUtil = {
-  baseUrl: process.env.VUE_APP_BASE_API,
-  logout: function () {
-    store.dispatch("user/resetToken").then(() => {
-      let redirect = window.$vueRoot && window.$vueRoot.$router & window.$vueRoot.$router.fullPath ? window.$vueRoot.$router.fullPath : null;
-      let path = redirect ? `/login?redirect=${redirect}` : `/login`;
-      window.location.hash = path;
-      location.reload(true);
-    });
-  }
-};
-let service;
-
-// create an axios instance
-service = axios.create({
-  baseURL: configUtil.baseUrl, // url = base url + request url
-  // withCredentials: true, // send cookies when cross-domain requests
-  //timeout: 5000 // request timeout
-});
-
-// request interceptor
-service.interceptors.request.use(
-  config => {
-
-    if (config.useToken !== false) {
-      let token = getToken();
-      if (token) {
-        config.headers['X-Token'] = token;
-        config.headers['Authorization'] = 'Bearer ' + token;
-      }
-    }
-    /* if (!config.headers['Content-Type']) {
-    	config.headers['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
-    } */
-    if (!config.filterConfig || config.filterConfig.enabled !== false && window.commonDataUtil) {
-      config.data = window.commonDataUtil.handleForm(config.data, config.filterConfig);
-    }
-    if (
-      (config.headers['Content-Type'] == "application/x-www-form-urlencoded" ||
-        config.headers['Content-Type'] == "application/x-www-form-urlencoded;charset=UTF-8") &&
-      typeof (config.data) !== 'string' && config.data) {
-      config.data = qs.stringify(config.data);
-    } else if (settingConfig.base64Urls && settingConfig.base64Urls.includes(config.url)) {
-      config.data = {"_baenboda": encode(JSON.stringify(config.data))};
-    } else if (config.aes) {
-      config.data = {"_aeenboda": encrypt(JSON.stringify(config.data))};
-    }
-
-    if (config.modal !== false && config.loadingTarget) {
-      let zIndex = PopupManager.nextZIndex();
-      let pd = document.createElement('div');
-      pd.className = "el-loading-mask AjaxOverlay";
-      pd.style = "display: block !important;background-color: unset;z-index:" + zIndex + ";";
-      config.loadingTarget.append(pd);
-      config.ajaxOverlay = pd;
-    }
-
-    if (config.isLoading) {
-      let vueTarget = config.vueTarget || window;
-      let _ajaxLoadingNum = vueTarget._ajaxLoadingNum || 0;
-      if (!vueTarget._ajaxLoadingNum && !vueTarget._loadingInstance) {
-        vueTarget._ajaxLoadingNum = _ajaxLoadingNum + 1;
-        let loadingInstance = Vue.prototype.$baseLoading({
-          target: config.loadingTarget || document.body,
-          background: 'unset'
-        });
-        vueTarget._loadingInstance = loadingInstance;
-      }
-
-    }
-    return config;
-  },
-  error => {
-    // do something with request error
-    console.error(error); // for debug
-    return Promise.reject(error);
-  }
-);
-
-function removeModel(config) {
-  if (config) {
-    if (config.modal !== false && config.ajaxOverlay) {
-      config.ajaxOverlay.remove();
-    }
-    let vueTarget = config.vueTarget || window;
-    if (!!vueTarget) {
-      setTimeout(function () {
-        let _ajaxLoadingNum = vueTarget._ajaxLoadingNum || 0;
-        if (config.isLoading && _ajaxLoadingNum) {
-          _ajaxLoadingNum = _ajaxLoadingNum - 1;
-          vueTarget._ajaxLoadingNum = _ajaxLoadingNum;
-        }
-        if(!vueTarget._ajaxLoadingNum){
-          vueTarget._loadingInstance && vueTarget._loadingInstance.close();
-          vueTarget._loadingInstance = null;
-        }
-      }, 200);
-    }
-  }
-}
-
-async function handleNickName(vueTarget, res, callback) {
-  if (res.type != "success" || !res.objx) {
-    callback && callback(res)
-    return
-  }
-  let data = res.objx;
-  if (Array.isArray(data) || data.hasOwnProperty("records")) {
-    await handleNickName2(vueTarget, res, callback)
-    return;
-  }
-
-  let createBy = getCreateBy(data);
-  let modifyBy = getModifyBy(data);
-  let requestData = [];
-  if (createBy) {
-    requestData.push(createBy)
-  }
-  if (modifyBy && !requestData.includes(modifyBy)) {
-    requestData.push(modifyBy)
-  }
-  if (!requestData.length) {
-    callback && callback(res)
-    return
-  }
-  if (!vueTarget) vueTarget = window.$vueRoot
-
-
-  return vueTarget.$http({
-    url: USER_PREFIX + `/userb/getUserBasicInfos`,
-    method: `post`,
-    data: requestData,
-    success: res2 => {
-      let arr = res2.objx || [];
-      if (createBy) {
-        let obj = arr.find(item => item.loginAccount == createBy);
-        if (obj && obj.nickName) {
-          res.objx._createNickName = obj.nickName;
-          res.objx._createMobile = obj.mobile;
-        }
-      }
-      if (modifyBy) {
-        let obj = arr.find(item => item.loginAccount == modifyBy);
-        if (obj && obj.nickName) {
-          res.objx._modifyNickName = obj.nickName;
-          res.objx._modifyMobile = obj.mobile;
-        }
-      }
-
-    }
-  });
-}
-
-function handleCreateInfo(config, res) {
-  if (!config.addCreateInfo) return
-  let queryCreateInfo = config.queryCreateInfo || "0";
-  let toDo = (row) => {
-    if (!row) {
-      return;
-    }
-    let _createBy = null;
-    let _modifyBy = null;
-    if (row._createNickName) {
-      if (queryCreateInfo == "1") {
-        _createBy = getCreateBy(row) + "(" + row._createNickName + ")";
-      } else if (queryCreateInfo == "2") {
-        _createBy = row._createNickName;
-      }
-    }
-    if (row._modifyNickName) {
-      if (queryCreateInfo == "1") {
-        _modifyBy = getModifyBy(row) + "(" + row._modifyNickName + ")";
-      } else if (queryCreateInfo == "2") {
-        _modifyBy = row._modifyNickName;
-      }
-    }
-    row._createBy = _createBy || getCreateBy(row) || null;
-    row._modifyBy = _modifyBy || getCreateBy(row) || null;
-  }
-  let data = res.objx;
-  if (typeof res.objx == "object") {
-    if (Array.isArray(data)) {
-      res.objx.forEach(item => {
-        toDo(item);
-      })
-    } else if (data && res.objx.hasOwnProperty("records")) {
-      let records = res.objx.records || [];
-      records.forEach(item => {
-        toDo(item);
-      })
-    } else {
-      toDo(res.objx);
-    }
-  }
-}
-
-function getCreateBy(row) {
-  let result = null;
-  if (row) {
-    if (row.hasOwnProperty("createBy")) {
-      result = row.createBy;
-    } else if (row.hasOwnProperty("create_by")) {
-      result = row.create_by;
-    }
-  }
-  return result;
-}
-
-function getModifyBy(row) {
-  let result = null;
-  if (row) {
-    if (row.hasOwnProperty("modifyBy")) {
-      result = row.modifyBy;
-    } else if (row.hasOwnProperty("modify_by")) {
-      result = row.modify_by;
-    }
-  }
-  return result;
-}
-
-async function handleNickName2(vueTarget, res, callback) {
-  if (res.type != "success" || !res.objx) {
-    callback && callback(res)
-    return
-  }
-  let data = res.objx;
-  if (!Array.isArray(data)) {
-    data = res.objx.records;
-  }
-  let requestData = [];
-  data.forEach(item => {
-    let createBy = getCreateBy(item);
-    let modifyBy = getModifyBy(item);
-
-    if (createBy && !requestData.includes(createBy)) {
-      requestData.push(createBy)
-    }
-    if (modifyBy && !requestData.includes(modifyBy)) {
-      requestData.push(modifyBy)
-    }
-  })
-  if (!requestData.length) {
-    callback && callback(res)
-    return
-  }
-  if (!vueTarget) vueTarget = window.$vueRoot
-
-
-  return vueTarget.$http({
-    url: USER_PREFIX + `/userb/getUserBasicInfos`,
-    method: `post`,
-    data: requestData,
-    success: res2 => {
-      let arr = res2.objx || [];
-      data.forEach(item => {
-        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;
-          }
-        }
-      })
-    }
-  });
-}
-
-// response interceptor
-service.interceptors.response.use(
-  async response => {
-    const res = response.data;
-    const config = response.config;
-    if (config.resultType == "other") {
-      config.callback && config.callback(res, response);
-      removeModel(config);
-      return res;
-    } else if (res.type) {
-      if (res.type == "success") {
-        if (settingConfig.queryCreateInfo !== false && config.queryCreateInfo && config.queryCreateInfo != "0") {
-          await handleNickName(config.vueTarget, res);
-        }
-        if (config.addCreateInfo) {
-          handleCreateInfo(config, res);
-        }
-
-        config.success && config.success(res, response);
-        config.callback && config.callback(res, response);
-        removeModel(config);
-        return res;
-      } else {
-        if (res.rmid == "999999999") {
-          removeModel(config);
-          configUtil.logout();
-        } else {
-          config.fail && config.fail(res, response);
-          config.callback && config.callback(res, response);
-          if (config.modalStrictly !== true) {
-            removeModel(config);
-          }
-          if (config.resultType != "special" && config.failMsg !== false) {
-            ErroreBox.msg(res);
-          }
-        }
-        return res;
-      }
-    } else {
-      if (config.modalStrictly !== true) {
-        removeModel(config);
-      }
-      return res;
-    }
-  },
-  error => {
-    let config = error.config;
-    if (error.response && error.response.data && error.response.data.rmid == "999999999") {
-      removeModel(config);
-      configUtil.logout();
-    } else {
-      config.error && config.error(error);
-      if (config.modalStrictly !== true) {
-        removeModel(config);
-      }
-      if (config.errorMsg !== false) {
-        ErroreBox.msg({
-          content: error.message,
-          type: 'error',
-        });
-      }
-    }
-    return Promise.reject(error);
-  }
-);
-
-export default service;
+/**version-1.0*/
+import Vue from 'vue'
+import axios from 'axios'
+import qs from 'qs'
+import store from '../store/index.js'
+import {
+  getToken
+} from './auth.js'
+import ErroreBox from '../components/errorMsg/index.js'
+import PopupManager from 'element-ui/src/utils/popup/popup-manager.js'
+import settingConfig from "@/settings.js";
+import {encode} from "js-base64";
+import {encrypt} from "@base/utils/aes";
+
+let configUtil = {
+  baseUrl: process.env.VUE_APP_BASE_API,
+  logout: function () {
+    store.dispatch("user/resetToken").then(() => {
+      let redirect = window.$vueRoot && window.$vueRoot.$router & window.$vueRoot.$router.fullPath ? window.$vueRoot.$router.fullPath : null;
+      let path = redirect ? `/login?redirect=${redirect}` : `/login`;
+      window.location.hash = path;
+      location.reload(true);
+    });
+  }
+};
+let service;
+
+// create an axios instance
+service = axios.create({
+  baseURL: configUtil.baseUrl, // url = base url + request url
+  // withCredentials: true, // send cookies when cross-domain requests
+  //timeout: 5000 // request timeout
+});
+
+// request interceptor
+service.interceptors.request.use(
+  config => {
+
+    if (config.useToken !== false) {
+      let token = getToken();
+      if (token) {
+        config.headers['X-Token'] = token;
+        config.headers['Authorization'] = 'Bearer ' + token;
+      }
+    }
+    /* if (!config.headers['Content-Type']) {
+    	config.headers['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
+    } */
+    if (!config.filterConfig || config.filterConfig.enabled !== false && window.commonDataUtil) {
+      config.data = window.commonDataUtil.handleForm(config.data, config.filterConfig);
+    }
+    if (
+      (config.headers['Content-Type'] == "application/x-www-form-urlencoded" ||
+        config.headers['Content-Type'] == "application/x-www-form-urlencoded;charset=UTF-8") &&
+      typeof (config.data) !== 'string' && config.data) {
+      config.data = qs.stringify(config.data);
+    } else if (settingConfig.base64Urls && settingConfig.base64Urls.includes(config.url)) {
+      config.data = {"_baenboda": encode(JSON.stringify(config.data))};
+    } else if (config.aes) {
+      config.data = {"_aeenboda": encrypt(JSON.stringify(config.data))};
+    }
+
+    if (config.modal !== false && config.loadingTarget) {
+      let zIndex = PopupManager.nextZIndex();
+      let pd = document.createElement('div');
+      pd.className = "el-loading-mask AjaxOverlay";
+      pd.style = "display: block !important;background-color: unset;z-index:" + zIndex + ";";
+      config.loadingTarget.append(pd);
+      config.ajaxOverlay = pd;
+    }
+
+    if (config.isLoading) {
+      config.loadingInstance = Vue.prototype.$baseLoading({
+        target: config.loadingTarget || document.body,
+        background: 'unset'
+      });
+    }
+    return config;
+  },
+  error => {
+    // do something with request error
+    console.error(error); // for debug
+    return Promise.reject(error);
+  }
+);
+
+function removeModel(config) {
+  if (config) {
+    if (config.modal !== false && config.ajaxOverlay) {
+      config.ajaxOverlay.remove();
+    }
+    if (config.loadingInstance) {
+      setTimeout(function () {
+        config.loadingInstance.close();
+        config.loadingInstance = null;
+      }, 200);
+    }
+  }
+}
+
+async function handleNickName(option) {
+  let {vueTarget, res, callback, config} = option;
+  if (res.type != "success" || !res.objx) {
+    callback && callback(res)
+    return
+  }
+  let data = res.objx;
+  if (Array.isArray(data) || data.hasOwnProperty("records")) {
+    await handleNickName2(option)
+    return;
+  }
+
+  let createBy = getCreateBy(data);
+  let modifyBy = getModifyBy(data);
+  let requestData = [];
+  if (createBy) {
+    requestData.push(createBy)
+  }
+  if (modifyBy && !requestData.includes(modifyBy)) {
+    requestData.push(modifyBy)
+  }
+  if (!requestData.length) {
+    callback && callback(res)
+    return
+  }
+  if (!vueTarget) vueTarget = window.$vueRoot
+  let modal = config.modal ?? true;
+  let isLoading = config.isLoading || false;
+  return vueTarget.$http({
+    url: USER_PREFIX + `/userb/getUserBasicInfos`,
+    method: `post`,
+    data: requestData,
+    modal: modal,
+    isLoading: isLoading,
+    success: res2 => {
+      let arr = res2.objx || [];
+      if (createBy) {
+        let obj = arr.find(item => item.loginAccount == createBy);
+        if (obj && obj.nickName) {
+          res.objx._createNickName = obj.nickName;
+          res.objx._createMobile = obj.mobile;
+        }
+      }
+      if (modifyBy) {
+        let obj = arr.find(item => item.loginAccount == modifyBy);
+        if (obj && obj.nickName) {
+          res.objx._modifyNickName = obj.nickName;
+          res.objx._modifyMobile = obj.mobile;
+        }
+      }
+
+    }
+  });
+}
+
+function handleCreateInfo(config, res) {
+  if (!config.addCreateInfo) return
+  let queryCreateInfo = config.queryCreateInfo || "0";
+  let toDo = (row) => {
+    if (!row) {
+      return;
+    }
+    let _createBy = null;
+    let _modifyBy = null;
+    if (row._createNickName) {
+      if (queryCreateInfo == "1") {
+        _createBy = getCreateBy(row) + "(" + row._createNickName + ")";
+      } else if (queryCreateInfo == "2") {
+        _createBy = row._createNickName;
+      }
+    }
+    if (row._modifyNickName) {
+      if (queryCreateInfo == "1") {
+        _modifyBy = getModifyBy(row) + "(" + row._modifyNickName + ")";
+      } else if (queryCreateInfo == "2") {
+        _modifyBy = row._modifyNickName;
+      }
+    }
+    row._createBy = _createBy || getCreateBy(row) || null;
+    row._modifyBy = _modifyBy || getCreateBy(row) || null;
+  }
+  let data = res.objx;
+  if (typeof res.objx == "object") {
+    if (Array.isArray(data)) {
+      res.objx.forEach(item => {
+        toDo(item);
+      })
+    } else if (data && res.objx.hasOwnProperty("records")) {
+      let records = res.objx.records || [];
+      records.forEach(item => {
+        toDo(item);
+      })
+    } else {
+      toDo(res.objx);
+    }
+  }
+}
+
+function getCreateBy(row) {
+  let result = null;
+  if (row) {
+    if (row.hasOwnProperty("createBy")) {
+      result = row.createBy;
+    } else if (row.hasOwnProperty("create_by")) {
+      result = row.create_by;
+    }
+  }
+  return result;
+}
+
+function getModifyBy(row) {
+  let result = null;
+  if (row) {
+    if (row.hasOwnProperty("modifyBy")) {
+      result = row.modifyBy;
+    } else if (row.hasOwnProperty("modify_by")) {
+      result = row.modify_by;
+    }
+  }
+  return result;
+}
+
+async function handleNickName2(option) {
+  let {vueTarget, res, callback, config} = option;
+  if (res.type != "success" || !res.objx) {
+    callback && callback(res)
+    return
+  }
+  let data = res.objx;
+  if (!Array.isArray(data)) {
+    data = res.objx.records;
+  }
+  let requestData = [];
+  data.forEach(item => {
+    let createBy = getCreateBy(item);
+    let modifyBy = getModifyBy(item);
+
+    if (createBy && !requestData.includes(createBy)) {
+      requestData.push(createBy)
+    }
+    if (modifyBy && !requestData.includes(modifyBy)) {
+      requestData.push(modifyBy)
+    }
+  })
+  if (!requestData.length) {
+    callback && callback(res)
+    return
+  }
+  if (!vueTarget) vueTarget = window.$vueRoot
+
+  let modal = config.modal ?? true;
+  let isLoading = config.isLoading || false;
+
+  return vueTarget.$http({
+    url: USER_PREFIX + `/userb/getUserBasicInfos`,
+    method: `post`,
+    data: requestData,
+    modal: modal,
+    isLoading: isLoading,
+    success: res2 => {
+      let arr = res2.objx || [];
+      data.forEach(item => {
+        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;
+          }
+        }
+      })
+    }
+  });
+}
+
+// response interceptor
+service.interceptors.response.use(
+  async response => {
+    const res = response.data;
+    const config = response.config;
+    if (config.resultType == "other") {
+      config.callback && config.callback(res, response);
+      removeModel(config);
+      return res;
+    } else if (res.type) {
+      if (res.type == "success") {
+        if (settingConfig.queryCreateInfo !== false && config.queryCreateInfo && config.queryCreateInfo != "0") {
+          let vueTarget = config.vueTarget;
+          await handleNickName({vueTarget, res, config});
+        }
+        if (config.addCreateInfo) {
+          handleCreateInfo(config, res);
+        }
+
+        config.success && config.success(res, response);
+        config.callback && config.callback(res, response);
+        removeModel(config);
+        return res;
+      } else {
+        if (res.rmid == "999999999") {
+          removeModel(config);
+          configUtil.logout();
+        } else {
+          config.fail && config.fail(res, response);
+          config.callback && config.callback(res, response);
+          if (config.modalStrictly !== true) {
+            removeModel(config);
+          }
+          if (config.resultType != "special" && config.failMsg !== false) {
+            ErroreBox.msg(res);
+          }
+        }
+        return res;
+      }
+    } else {
+      if (config.modalStrictly !== true) {
+        removeModel(config);
+      }
+      return res;
+    }
+  },
+  error => {
+    let config = error.config;
+    if (error.response && error.response.data && error.response.data.rmid == "999999999") {
+      removeModel(config);
+      configUtil.logout();
+    } else {
+      config.error && config.error(error);
+      if (config.modalStrictly !== true) {
+        removeModel(config);
+      }
+      if (config.errorMsg !== false) {
+        ErroreBox.msg({
+          content: error.message,
+          type: 'error',
+        });
+      }
+    }
+    return Promise.reject(error);
+  }
+);
+
+export default service;