doctor-admin-components 1.0.13-beta.8 → 1.0.13-pro.0

package/README.md

@@ -6,52 +6,63 @@
  * @FilePath: /doctor-admin-components/README.md
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE1
 -->
+
 # doctor-admin-components
 
 ## Project setup
+
 ```
 npm install
 ```
 
-### 运行项目可以开调试模块（example文件）
+### 运行项目可以开调试模块（example 文件）
+
 ```
 npm run serve
 ```
 
-### 打包（组件修改在packages文件中）
+### 打包（组件修改在 packages 文件中）
+
 ```
 npm run lib
 ```
 
 ### 调试
-package.json文件 入口改为："main": "packages/index.js"
+
+package.json 文件 入口改为："main": "packages/index.js"
+
 #### 把模块链接到全局
+
 ```
-sudo npm link  
+sudo npm link
 ```
 
 #### 模块取消软链接
+
 ```
-sudo npm unlink doctor-admin-components 
+sudo npm unlink doctor-admin-components
 ```
 
 #### 把模块链接到项目
+
 ```
 npm link doctor-admin-components --legacy-peer-deps
 ```
 
 #### 项目取消软链接
+
 ```
 npm unlink doctor-admin-components --legacy-peer-deps
 ```
 
 ### 发布包
+
 ```
 package.json文件  入口改为："main": "lib/index.umd.min.js"
 
 登录npm账号
 
-npm login 
+npm login
 
 1 npm run lib
 2 修改package.json里的 version
@@ -61,6 +72,6 @@ npm login
       npm publish
 ```
 
-
 ### Customize configuration
+
 See [Configuration Reference](https://cli.vuejs.org/config/).

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "doctor-admin-components",
   "version1": "1.0.11",
-  "version": "1.0.13-beta.8",
+  "version": "1.0.13-pro.0",
   "private": false,
   "main1": "lib/index.umd.min.js",
   "main": "packages/index.js",

package/packages/src/api/biz/bizContract.js

@@ -25,7 +25,6 @@ export function getBizContract(id) {
     method: "get",
   });
 }
-
 // 查询合同详细
 export function getSaleContractInfo(dealId) {
   return request({

package/packages/src/api/biz/bizContractCompany.js

@@ -50,4 +50,4 @@ export function exportBizContractCompany(query) {
     method: 'get',
     params: query
   })
-}
+}

package/packages/src/utils/request.js

@@ -1,224 +1,198 @@
-import axios from "axios";
-import { Notification, MessageBox, Message, Loading } from "element-ui";
-import store from "../store";
-import { getToken } from "./auth";
-import errorCode from "./errorCode";
-import { tansParams, blobValidate } from "./ruoyi";
-import cache from "../plugins/cache";
-import { saveAs } from "file-saver";
-import Cookies from "js-cookie";
+import axios from 'axios'
+import { Notification, MessageBox, Message, Loading } from 'element-ui'
+import store from '../store'
+import { getToken } from './auth'
+import errorCode from './errorCode'
+import { tansParams, blobValidate } from './ruoyi'
+import cache from '../plugins/cache'
+import { saveAs } from 'file-saver'
+import Cookies from 'js-cookie'
 
-let downloadLoadingInstance;
+let downloadLoadingInstance
 // 是否显示重新登录
-export let isRelogin = { show: false };
+export let isRelogin = { show: false }
 
-axios.defaults.headers["Content-Type"] = "application/json;charset=utf-8";
+axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
-  baseURL: "/prod-admin",
+  baseURL: '/prod-admin',
   // 超时
-  timeout: 60000,
-});
+  timeout: 60000
+})
 
 // request拦截器
 service.interceptors.request.use(
   (config) => {
     // 是否需要设置 token
-    const isToken = (config.headers || {}).isToken === false;
+    const isToken = (config.headers || {}).isToken === false
     // 是否需要防止数据重复提交
-    const isRepeatSubmit = (config.headers || {}).repeatSubmit === false;
-    if (
-      !config.url.includes("/api/transaction/list") &&
-      getToken() &&
-      !isToken
-    ) {
-      config.headers["Authorization"] = "Bearer " + getToken(); // 让每个请求携带自定义token 请根据实际情况自行修改
+    const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
+    if (!config.url.includes('/api/transaction/list') && getToken() && !isToken) {
+      config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
     }
     // get请求映射params参数
-    if (config.method === "get" && config.params) {
-      let url = config.url + "?" + tansParams(config.params);
-      url = url.slice(0, -1);
-      config.params = {};
-      config.url = url;
+    if (config.method === 'get' && config.params) {
+      let url = config.url + '?' + tansParams(config.params)
+      url = url.slice(0, -1)
+      config.params = {}
+      config.url = url
     }
-    if (
-      !isRepeatSubmit &&
-      (config.method === "post" || config.method === "put")
-    ) {
+    if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) {
       const requestObj = {
         url: config.url,
-        data:
-          typeof config.data === "object"
-            ? JSON.stringify(config.data)
-            : config.data,
-        time: new Date().getTime(),
-      };
-      const sessionObj = cache.session.getJSON("sessionObj");
-      if (
-        sessionObj === undefined ||
-        sessionObj === null ||
-        sessionObj === ""
-      ) {
-        cache.session.setJSON("sessionObj", requestObj);
+        data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data,
+        time: new Date().getTime()
+      }
+      const sessionObj = cache.session.getJSON('sessionObj')
+      if (sessionObj === undefined || sessionObj === null || sessionObj === '') {
+        cache.session.setJSON('sessionObj', requestObj)
       } else {
-        const s_url = sessionObj.url; // 请求地址
-        const s_data = sessionObj.data; // 请求数据
-        const s_time = sessionObj.time; // 请求时间
-        const interval = 1000; // 间隔时间(ms)，小于此时间视为重复提交
-        if (
-          s_data === requestObj.data &&
-          requestObj.time - s_time < interval &&
-          s_url === requestObj.url
-        ) {
-          const message = "数据正在处理，请勿重复提交";
-          console.warn(`[${s_url}]: ` + message);
-          return Promise.reject(new Error(message));
+        const s_url = sessionObj.url // 请求地址
+        const s_data = sessionObj.data // 请求数据
+        const s_time = sessionObj.time // 请求时间
+        const interval = 1000 // 间隔时间(ms)，小于此时间视为重复提交
+        if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
+          const message = '数据正在处理，请勿重复提交'
+          console.warn(`[${s_url}]: ` + message)
+          return Promise.reject(new Error(message))
         } else {
-          cache.session.setJSON("sessionObj", requestObj);
+          cache.session.setJSON('sessionObj', requestObj)
         }
       }
     }
 
-    if (config.url.includes("/order/tracing?askId")) {
-      config.baseURL = "";
-      const token = Cookies.get("token");
-      config.headers.token = token;
+    if (config.url.includes('/order/tracing?askId')) {
+      config.baseURL = ''
+      const token = Cookies.get('token')
+      config.headers.token = token
     }
-    return config;
+    return config
   },
   (error) => {
-    console.log(error);
-    Promise.reject(error);
+    console.log(error)
+    Promise.reject(error)
   }
-);
+)
 
 // 响应拦截器
 service.interceptors.response.use(
   (res) => {
     // 未设置状态码则默认成功状态
-    const code = res.data.code || 200;
+    const code = res.data.code || 200
     // 获取错误信息
-    const msg = errorCode[code] || res.data.msg || errorCode["default"];
+    const msg = errorCode[code] || res.data.msg || errorCode['default']
     // 二进制数据则直接返回
-    if (
-      res.request.responseType === "blob" ||
-      res.request.responseType === "arraybuffer"
-    ) {
-      return res.data;
+    if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') {
+      return res.data
     }
     if (code === 401) {
       if (!isRelogin.show) {
-        isRelogin.show = true;
-        MessageBox.confirm(
-          "登录状态已过期，您可以继续留在该页面，或者重新登录",
-          "系统提示",
-          {
-            confirmButtonText: "重新登录",
-            cancelButtonText: "取消",
-            type: "warning",
-          }
-        )
+        isRelogin.show = true
+        MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {
+          confirmButtonText: '重新登录',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
           .then(() => {
-            isRelogin.show = false;
-            store.dispatch("LogOut").then(() => {
-              location.href = "/index";
-            });
+            isRelogin.show = false
+            store.dispatch('LogOut').then(() => {
+              location.href = '/index'
+            })
           })
           .catch(() => {
-            isRelogin.show = false;
-          });
+            isRelogin.show = false
+          })
       }
-      return Promise.reject("无效的会话，或者会话已过期，请重新登录。");
+      return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
     } else if (code === 500) {
       Message({
         message: msg,
-        type: "error",
-      });
-
-      return Promise.reject(new Error(msg));
+        type: 'error'
+      })
+      return res.data
     } else if (code !== 200) {
-      Notification.error({
-        title: msg,
-      });
-      return Promise.reject("error");
+      Message({
+        message: msg,
+        type: 'error'
+      })
+      return res.data
     } else {
-      return res.data;
+      return res.data
     }
   },
   (error) => {
-    console.log("err" + error);
-    let { message } = error;
-    if (message == "Network Error") {
-      message = "后端接口连接异常";
-    } else if (message.includes("timeout")) {
-      message = "系统接口请求超时";
-    } else if (message.includes("Request failed with status code")) {
-      message = "系统接口" + message.substr(message.length - 3) + "异常";
+    console.log('err' + error)
+    let { message } = error
+    if (message == 'Network Error') {
+      message = '后端接口连接异常'
+    } else if (message.includes('timeout')) {
+      message = '系统接口请求超时'
+    } else if (message.includes('Request failed with status code')) {
+      message = '系统接口' + message.substr(message.length - 3) + '异常'
     }
     Message({
       message: message,
-      type: "error",
-      duration: 5 * 1000,
-    });
-    return Promise.reject(error);
+      type: 'error',
+      duration: 5 * 1000
+    })
+    return Promise.reject(error)
   }
-);
+)
 
 // 通用下载方法
 export function download(url, params, filename) {
   downloadLoadingInstance = Loading.service({
-    text: "正在下载数据，请稍候",
-    spinner: "el-icon-loading",
-    background: "rgba(0, 0, 0, 0.7)",
-  });
+    text: '正在下载数据，请稍候',
+    spinner: 'el-icon-loading',
+    background: 'rgba(0, 0, 0, 0.7)'
+  })
   return service
     .post(url, params, {
       transformRequest: [
         (params) => {
-          return tansParams(params);
-        },
+          return tansParams(params)
+        }
       ],
-      headers: { "Content-Type": "application/x-www-form-urlencoded" },
-      responseType: "blob",
+      headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+      responseType: 'blob'
     })
     .then(async (data) => {
-      const isLogin = await blobValidate(data);
+      const isLogin = await blobValidate(data)
       if (isLogin) {
-        const blob = new Blob([data]);
-        saveAs(blob, filename);
+        const blob = new Blob([data])
+        saveAs(blob, filename)
       } else {
-        const resText = await data.text();
-        const rspObj = JSON.parse(resText);
-        const errMsg =
-          errorCode[rspObj.code] || rspObj.msg || errorCode["default"];
-        Message.error(errMsg);
+        const resText = await data.text()
+        const rspObj = JSON.parse(resText)
+        const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
+        Message.error(errMsg)
       }
-      downloadLoadingInstance.close();
+      downloadLoadingInstance.close()
     })
     .catch((r) => {
-      console.error(r);
-      Message.error("下载文件出现错误，请联系管理员！");
-      downloadLoadingInstance.close();
-    });
+      console.error(r)
+      Message.error('下载文件出现错误，请联系管理员！')
+      downloadLoadingInstance.close()
+    })
 }
 
 export function downloadFile(url, filename) {
-  let xmlhttp = new XMLHttpRequest();
-  xmlhttp.open("GET", url, true);
-  xmlhttp.responseType = "blob";
+  let xmlhttp = new XMLHttpRequest()
+  xmlhttp.open('GET', url, true)
+  xmlhttp.responseType = 'blob'
   xmlhttp.onload = function () {
     if (this.status == 200) {
-      const blob = this.response;
-      const link = document.createElement("a");
-      link.href = window.URL.createObjectURL(blob);
-      link.download = filename;
-      document.body.appendChild(link);
-      link.click();
-      document.body.removeChild(link);
+      const blob = this.response
+      const link = document.createElement('a')
+      link.href = window.URL.createObjectURL(blob)
+      link.download = filename
+      document.body.appendChild(link)
+      link.click()
+      document.body.removeChild(link)
     }
-  };
-  xmlhttp.send();
+  }
+  xmlhttp.send()
 }
 
-export default service;
+export default service