doway-coms 1.4.99 → 1.5.0

package/packages/utils/gridFormat.js

@@ -1,53 +1,53 @@
-import VXETable from 'vxe-table'
-import XEUtils from 'xe-utils'
-VXETable.formats.mixin({
-    // 格式化性别
-  formatSex({ cellValue }) {
-    return cellValue ? (cellValue === '1' ? '男' : '女') : ''
-  },
-  formatCheckbox({ cellValue }) {
-    return cellValue === true ? '是' : '否'
-  },
-  // 格式化下拉选项
-  formatSelect(scope) {
-    let dataSource = scope.column.params.dataSource
-    if (!dataSource) {
-      // console.error(scope.cellValue + ' 字典缺失')
-      return scope.cellValue
-    }
-    const item = dataSource.find(item => item.value === scope.cellValue)
-    return item ? item.caption : scope.cellValue
-  },
-  // 格式化日期，默认 yyyy-MM-dd HH:mm:ss
-  formatDateTime({ cellValue }, format) {
-    if (cellValue && cellValue.indexOf('.') > 0) {
-      cellValue = cellValue.substr(0, cellValue.indexOf('.'))
-    }
-    return XEUtils.toDateString(cellValue, format || 'yyyy-MM-dd HH:mm:ss')
-  },
-  formatDate({ cellValue }, format) {
-    return XEUtils.toDateString(cellValue, format || 'yyyy-MM-dd')
-  },
-  // 四舍五入金额，每隔3位逗号分隔，默认2位数
-  formatAmount({ cellValue }, digits = 2) {
-    return '¥' + XEUtils.commafy(XEUtils.toNumber(cellValue), { digits })
-  },
-  // 格式化银行卡，默认每4位空格隔开
-  formatBankcard({ cellValue }) {
-    return XEUtils.commafy(XEUtils.toValueString(cellValue), {
-      spaceNumber: 4,
-      separator: ' '
-    })
-  },
-  // 四舍五入,默认两位数
-  formatFixedNumber({ cellValue }, digits = 2) {
-    return XEUtils.toFixed(XEUtils.round(cellValue, digits), digits)
-  },
-  // 向下舍入,默认两位数
-  formatCutNumber({ cellValue }, digits = 2) {
-    return XEUtils.toFixed(XEUtils.floor(cellValue, digits), digits)
-  },
-  formatPercent({ cellValue }) {
-    return cellValue + '%'
-  }
+import VXETable from 'vxe-table'
+import XEUtils from 'xe-utils'
+VXETable.formats.mixin({
+    // 格式化性别
+  formatSex({ cellValue }) {
+    return cellValue ? (cellValue === '1' ? '男' : '女') : ''
+  },
+  formatCheckbox({ cellValue }) {
+    return cellValue === true ? '是' : '否'
+  },
+  // 格式化下拉选项
+  formatSelect(scope) {
+    let dataSource = scope.column.params.dataSource
+    if (!dataSource) {
+      // console.error(scope.cellValue + ' 字典缺失')
+      return scope.cellValue
+    }
+    const item = dataSource.find(item => item.value === scope.cellValue)
+    return item ? item.caption : scope.cellValue
+  },
+  // 格式化日期，默认 yyyy-MM-dd HH:mm:ss
+  formatDateTime({ cellValue }, format) {
+    if (cellValue && cellValue.indexOf('.') > 0) {
+      cellValue = cellValue.substr(0, cellValue.indexOf('.'))
+    }
+    return XEUtils.toDateString(cellValue, format || 'yyyy-MM-dd HH:mm:ss')
+  },
+  formatDate({ cellValue }, format) {
+    return XEUtils.toDateString(cellValue, format || 'yyyy-MM-dd')
+  },
+  // 四舍五入金额，每隔3位逗号分隔，默认2位数
+  formatAmount({ cellValue }, digits = 2) {
+    return '¥' + XEUtils.commafy(XEUtils.toNumber(cellValue), { digits })
+  },
+  // 格式化银行卡，默认每4位空格隔开
+  formatBankcard({ cellValue }) {
+    return XEUtils.commafy(XEUtils.toValueString(cellValue), {
+      spaceNumber: 4,
+      separator: ' '
+    })
+  },
+  // 四舍五入,默认两位数
+  formatFixedNumber({ cellValue }, digits = 2) {
+    return XEUtils.toFixed(XEUtils.round(cellValue, digits), digits)
+  },
+  // 向下舍入,默认两位数
+  formatCutNumber({ cellValue }, digits = 2) {
+    return XEUtils.toFixed(XEUtils.floor(cellValue, digits), digits)
+  },
+  formatPercent({ cellValue }) {
+    return cellValue + '%'
+  }
 })

package/packages/utils/msg.js

@@ -1,17 +1,17 @@
-import {notification,Modal } from 'ant-design-vue'
-export function successMsg(msg, desc){
-    notification['success']({ message: msg, description: desc, top: '100px' })
-  }
-  export function warningMsg(msg, desc){
-    notification['warning']({ message: msg, description: desc, top: '100px' })
-  }
-  export function errorMsg(msg, desc){
-    notification['error']({ message: msg, description: desc, top: '100px' })
-  }
-  export function infoMsg(dataInfo){
-    notification['info'](dataInfo)
-  }
-  export function closeMsg(key){
-    notification.close(key)
-  }
+import {notification,Modal } from 'ant-design-vue'
+export function successMsg(msg, desc){
+    notification['success']({ message: msg, description: desc, top: '100px' })
+  }
+  export function warningMsg(msg, desc){
+    notification['warning']({ message: msg, description: desc, top: '100px' })
+  }
+  export function errorMsg(msg, desc){
+    notification['error']({ message: msg, description: desc, top: '100px' })
+  }
+  export function infoMsg(dataInfo){
+    notification['info'](dataInfo)
+  }
+  export function closeMsg(key){
+    notification.close(key)
+  }
   export const confirmMsg = Modal.confirm

package/packages/utils/patchFiles.js

@@ -1,45 +1,45 @@
-const fs = require('fs')
-
-const path = require('path')
-const chalk = require('chalk')
-
-// 解决 node_modules 修改源码，导致重新装包而要手动替换源码的重复操作。
-// 将 new_node_modules 内的文件 覆盖 真正的 node_modules
-
-const REAL_NODE_MODULES = path.resolve('./node_modules') // 旧node_modules
-
-const MY_NODE_MODULES = path.resolve('new_node_modules') // 新node_modules
-
-copy(MY_NODE_MODULES, REAL_NODE_MODULES)
-
-/**
-
-*复制目录中的所有文件包括子目录
-*@param{string}需要复制的目录、文件
-*@param{string}复制到指定的目录、文件
-*@param{function}每次复制前，都会经过一次filterFn，若返回true，则复制。
-
-*/
-
-function copy(origin, target, filterFn = () => true) {
-  if (fs.statSync(origin).isDirectory()) {
-    // 来源是个文件夹，那目标也整一个文件夹
-
-    if (!fs.existsSync(target)) {
-      fs.mkdirSync(target)
-    }
-
-    fs.readdirSync(origin).forEach(originName => {
-      const originFilePath = path.resolve(origin, originName)
-
-      const targetFilePath = path.resolve(target, originName)
-
-      copy(originFilePath, targetFilePath, filterFn)
-    })
-  } else if (filterFn(origin, target)) {
-    console.info(chalk.blue('已被覆盖的文件：', target))
-    fs.copyFileSync(origin, target)
-  }
-}
-
+const fs = require('fs')
+
+const path = require('path')
+const chalk = require('chalk')
+
+// 解决 node_modules 修改源码，导致重新装包而要手动替换源码的重复操作。
+// 将 new_node_modules 内的文件 覆盖 真正的 node_modules
+
+const REAL_NODE_MODULES = path.resolve('./node_modules') // 旧node_modules
+
+const MY_NODE_MODULES = path.resolve('new_node_modules') // 新node_modules
+
+copy(MY_NODE_MODULES, REAL_NODE_MODULES)
+
+/**
+
+*复制目录中的所有文件包括子目录
+*@param{string}需要复制的目录、文件
+*@param{string}复制到指定的目录、文件
+*@param{function}每次复制前，都会经过一次filterFn，若返回true，则复制。
+
+*/
+
+function copy(origin, target, filterFn = () => true) {
+  if (fs.statSync(origin).isDirectory()) {
+    // 来源是个文件夹，那目标也整一个文件夹
+
+    if (!fs.existsSync(target)) {
+      fs.mkdirSync(target)
+    }
+
+    fs.readdirSync(origin).forEach(originName => {
+      const originFilePath = path.resolve(origin, originName)
+
+      const targetFilePath = path.resolve(target, originName)
+
+      copy(originFilePath, targetFilePath, filterFn)
+    })
+  } else if (filterFn(origin, target)) {
+    console.info(chalk.blue('已被覆盖的文件：', target))
+    fs.copyFileSync(origin, target)
+  }
+}
+
 console.info(chalk.bold.yellow('💡💡💡 以上的文件已被rewrite_node_modules中的文件替换，升级版本后请注意检查！！！'))

package/packages/utils/request.js

@@ -1,169 +1,169 @@
-import axios from 'axios'
-import { licenseAuthorizeApi } from './api'
-import { notification, message, Modal, Input } from 'ant-design-vue'
-import Vue from 'vue'
-import store from './store'
-import moment from 'moment'
-// create an axios instance
-const service = axios.create({
-  // baseURL: process.env.BASE_API, // api的base_url
-  timeout: 1000 * 60 * 5 // request timeout
-})
-// request interceptor
-service.interceptors.request.use(
-  config => {
-    // Do something before request is sent
-    let tempToken = store.state.token
-    if (tempToken) {
-      config.headers.Authorization = `Bearer ${tempToken}`
-    }
-    // config.headers.Accept = 'application/json,Date, text/plain, */*'
-    return config
-  },
-  error => {
-    // Do something with request error
-    Promise.reject(error)
-  }
-)
-
-// respone interceptor
-service.interceptors.response.use(
-  async response => {
-    const res = response.data
-    // 导出文件进入判断
-    if (res instanceof Blob) {
-      if (res.type === 'application/json') {
-        const enc = await new TextDecoder('utf-8');
-        await res.arrayBuffer().then((buffer) => {
-          const tempData = JSON.parse(enc.decode(new Uint8Array(buffer))) || {};
-          if (tempData['code'] && tempData['code'] === 500) {
-            notification.error({
-              message: '错误信息',
-              top:"100px",
-              description: h => {
-                return h('div', null, [
-                  h('p', { domProps: { innerHTML: tempData['msg'] } }, null)
-                ])
-              }
-            })
-            return Promise.reject(tempData['msg'])
-          }
-        })
-        .catch(reason => Promise.reject(reason))
-      }
-      return response;
-    }
-    if (res.status === 200 || res.code === 200) {
-      return response.data
-    }
-    if (res.code == 60001) {
-      return new Promise(() => {
-        let inputVal = '';
-        Modal.info({
-          zIndex: 3100,
-          title: '授权',
-          okText: '授权',
-          destroyOnClose: true,
-          keyboard: true,
-          closable: true,
-          content:  h => {
-            return h('div', null, [
-              h(Input, {
-                attrs: {
-                  type: 'text',
-                  placeholder: "请输入许可",
-                },
-                on: {
-                  input: event => {
-                    inputVal = event.target.value;
-                  },
-                },
-              }),
-            ]);
-          },
-          async onOk() {
-            try {
-              let data = {
-                system: store.state.webAppCode,
-                license: inputVal
-              }
-              let info =  await licenseAuthorizeApi(data)
-              Modal.success({
-                zIndex: 4000,
-                title: '验证成功',
-                content:  h => {
-                  return h('div', null, [
-                    h('div', null, `许可有效期至:${info.content}`),
-                  ]);
-                },
-                onOk() {
-                  // 返回控制台并清空全部标签页
-                  store.dispatch('goWorkbench')
-                }
-              });
-            }
-            catch (error) {
-              Modal.error({
-                zIndex: 4000,
-                title: '错误信息',
-                destroyOnClose: true,
-                keyboard: true,
-                content:  h => {
-                  return h('div', null, [
-                    h('div', null, error),
-                  ]);
-                },
-              })
-              return Promise.reject(error)
-            }
-          },
-          onCancel() {
-            // 返回控制台并清空全部标签页
-            store.dispatch('goWorkbench')
-          }
-        });
-      })
-    }
-    if (res.status === undefined && res.code === undefined) {
-      return response.data
-    }
-    if (res.code === 401) {
-      store.dispatch('logOut')
-      return Promise.reject(res.msg)
-    }
-    // 如果是授权接口报的错，不通过通用错误显示
-    if (response.config.url.indexOf('licenseAuthorize') == -1) {
-      notification.error({
-        message: '错误信息',
-        top:"100px",
-        description: h => {
-          return h('div', null, [
-            h('p', { domProps: { innerHTML: res.msg } }, null)
-          ])
-        }
-      })
-    }
-    return Promise.reject(res.msg)
-  },
-  error => {
-    if (error.response && error.response.status === 401) {
-      // alert('会话过期1');
-        store.dispatch('logOut').then(() => {})
-      return
-    }
-    let errorMsg = ''
-    if (error.response && error.response.data && error.response.data.error) {
-      if (error.response.data.error_description) {
-        errorMsg = error.response.data.error_description
-      } else {
-        errorMsg = error.response.data.error
-      }
-    } else {
-      errorMsg = error.msg
-    }
-    notification['error']({ message: '错误信息', description: errorMsg, top:"100px" })
-    return Promise.reject(error)
-  }
-)
-
-export default service
+import axios from 'axios'
+import { licenseAuthorizeApi } from './api'
+import { notification, message, Modal, Input } from 'ant-design-vue'
+import Vue from 'vue'
+import store from './store'
+import moment from 'moment'
+// create an axios instance
+const service = axios.create({
+  // baseURL: process.env.BASE_API, // api的base_url
+  timeout: 1000 * 60 * 5 // request timeout
+})
+// request interceptor
+service.interceptors.request.use(
+  config => {
+    // Do something before request is sent
+    let tempToken = store.state.token
+    if (tempToken) {
+      config.headers.Authorization = `Bearer ${tempToken}`
+    }
+    // config.headers.Accept = 'application/json,Date, text/plain, */*'
+    return config
+  },
+  error => {
+    // Do something with request error
+    Promise.reject(error)
+  }
+)
+
+// respone interceptor
+service.interceptors.response.use(
+  async response => {
+    const res = response.data
+    // 导出文件进入判断
+    if (res instanceof Blob) {
+      if (res.type === 'application/json') {
+        const enc = await new TextDecoder('utf-8');
+        await res.arrayBuffer().then((buffer) => {
+          const tempData = JSON.parse(enc.decode(new Uint8Array(buffer))) || {};
+          if (tempData['code'] && tempData['code'] === 500) {
+            notification.error({
+              message: '错误信息',
+              top:"100px",
+              description: h => {
+                return h('div', null, [
+                  h('p', { domProps: { innerHTML: tempData['msg'] } }, null)
+                ])
+              }
+            })
+            return Promise.reject(tempData['msg'])
+          }
+        })
+        .catch(reason => Promise.reject(reason))
+      }
+      return response;
+    }
+    if (res.status === 200 || res.code === 200) {
+      return response.data
+    }
+    if (res.code == 60001) {
+      return new Promise(() => {
+        let inputVal = '';
+        Modal.info({
+          zIndex: 3100,
+          title: '授权',
+          okText: '授权',
+          destroyOnClose: true,
+          keyboard: true,
+          closable: true,
+          content:  h => {
+            return h('div', null, [
+              h(Input, {
+                attrs: {
+                  type: 'text',
+                  placeholder: "请输入许可",
+                },
+                on: {
+                  input: event => {
+                    inputVal = event.target.value;
+                  },
+                },
+              }),
+            ]);
+          },
+          async onOk() {
+            try {
+              let data = {
+                system: store.state.webAppCode,
+                license: inputVal
+              }
+              let info =  await licenseAuthorizeApi(data)
+              Modal.success({
+                zIndex: 4000,
+                title: '验证成功',
+                content:  h => {
+                  return h('div', null, [
+                    h('div', null, `许可有效期至:${info.content}`),
+                  ]);
+                },
+                onOk() {
+                  // 返回控制台并清空全部标签页
+                  store.dispatch('goWorkbench')
+                }
+              });
+            }
+            catch (error) {
+              Modal.error({
+                zIndex: 4000,
+                title: '错误信息',
+                destroyOnClose: true,
+                keyboard: true,
+                content:  h => {
+                  return h('div', null, [
+                    h('div', null, error),
+                  ]);
+                },
+              })
+              return Promise.reject(error)
+            }
+          },
+          onCancel() {
+            // 返回控制台并清空全部标签页
+            store.dispatch('goWorkbench')
+          }
+        });
+      })
+    }
+    if (res.status === undefined && res.code === undefined) {
+      return response.data
+    }
+    if (res.code === 401) {
+      store.dispatch('logOut')
+      return Promise.reject(res.msg)
+    }
+    // 如果是授权接口报的错，不通过通用错误显示
+    if (response.config.url.indexOf('licenseAuthorize') == -1) {
+      notification.error({
+        message: '错误信息',
+        top:"100px",
+        description: h => {
+          return h('div', null, [
+            h('p', { domProps: { innerHTML: res.msg } }, null)
+          ])
+        }
+      })
+    }
+    return Promise.reject(res.msg)
+  },
+  error => {
+    if (error.response && error.response.status === 401) {
+      // alert('会话过期1');
+        store.dispatch('logOut').then(() => {})
+      return
+    }
+    let errorMsg = ''
+    if (error.response && error.response.data && error.response.data.error) {
+      if (error.response.data.error_description) {
+        errorMsg = error.response.data.error_description
+      } else {
+        errorMsg = error.response.data.error
+      }
+    } else {
+      errorMsg = error.msg
+    }
+    notification['error']({ message: '错误信息', description: errorMsg, top:"100px" })
+    return Promise.reject(error)
+  }
+)
+
+export default service