@logwire/logwire-wms-pda-ui 3.1.2 → 3.3.2

package/src/utils/Axios.js

@@ -8,11 +8,12 @@
 import {axios} from "@bundled-es-modules/axios";
 import {ApiUtils} from "./ApiUtils";
 import {Warehouse} from "./Warehouse";
-import {lwErrMsg} from "../components/ui/ErrorMsg";
-import {lwLoading} from "../components/ui/Loading";
+import {lwErrMsg} from "../components/ErrorMsg";
+import {lwLoading} from "../components/Loading";
 import {Language} from "./Language";
 import {LocalStorage} from "./LocalStorage";
 import {Timezone} from "./Timezone";
+import {lwToast} from "./Toast"
 
 // 用于自定义处理http报错的问题，为false时候不显示报错信息，直接返回错误信息，通过catch接收
 let errGetMe = false
@@ -156,25 +157,30 @@ lwAxios.interceptors.response.use(
 
     let resp = error.response
 
-    if (resp){
+    if (resp) {
+
+      if (errGetMe) {
+        errGetMe = false
+        return Promise.reject(resp)
+      }
+
       if (resp.status === 401) {
         ApiUtils.setToken(undefined)
-        lwErrMsg.show({ message: Language.get('wms_project.pda.utils.axios.loginOvertime', '登录超时，请重新登录') })
+        lwToast.fail({
+          message: Language.get('wms_project.pda.utils.axios.loginOvertime', '登录超时，请重新登录'),
+          onClose: () => {
+            history.go(0)
+          }
+        })
         ApiUtils.delToken()
-        history.go(0)
         return Promise.reject(resp)
       }
 
-      if (resp.status === 404){
+      if (resp.status === 404) {
         lwErrMsg.show({ message: Language.get('wms_project.pda.utils.axios.serveError', '请求失败，接口路径错误(404)') })
         return Promise.reject(resp)
       }
 
-      if (errGetMe){
-        errGetMe = false
-        return Promise.reject(resp)
-      }
-
       if (resp.data) {
         lwErrMsg.show({
           message: resp.data && resp.data.message ?

package/src/utils/BarcodeResolve.js

@@ -4,8 +4,8 @@
 * @date  2022-07-02
 * */
 
-import {common} from "../api/common/common";
-import {lwErrMsg} from "../components/ui/ErrorMsg";
+import {common} from "../api/Common";
+import {lwErrMsg} from "../components/ErrorMsg";
 import {DateTime} from "luxon";
 import {Language} from "./Language";
 
@@ -18,12 +18,12 @@ const barcodeUtils = {
    * @param {string} fields 属性列表
    * @returns 根据分隔符和属性解析的对象，解析失败返回null
    */
-  split (barcode, seperator, fields) {
+  split(barcode, seperator, fields) {
     if (!barcode || !fields) {
       return null
     }
-    const values = typeof seperator === 'string' ? barcode.split(seperator) : [ barcode ]
-    const fs = Array.isArray(fields) ? fields : (typeof seperator === 'string' ? fields.split(seperator) : [ fields ])
+    const values = typeof seperator === 'string' ? barcode.split(seperator) : [barcode]
+    const fs = Array.isArray(fields) ? fields : (typeof seperator === 'string' ? fields.split(seperator) : [fields])
     if (fs.length === 0 || values.length !== fs.length) {
       return null
     }
@@ -68,10 +68,13 @@ const dataTypeValid = (value, dataType, format) => {
   if (!value) {
     return true
   }
-  switch(dataType) {
-    case 'int': return Number.isInteger(Number(value))
-    case 'decimal': return !Number.isNaN(Number(value))
-    case 'string': return typeof value === 'string'
+  switch (dataType) {
+    case 'int':
+      return Number.isInteger(Number(value))
+    case 'decimal':
+      return !Number.isNaN(Number(value))
+    case 'string':
+      return typeof value === 'string'
     case 'date':
     case 'datetime':
     case 'time':
@@ -92,16 +95,26 @@ const operatorValid = (value, validType, content) => {
     return true
   }
   switch (validType) {
-    case 'EQ': return value == content
-    case 'NEQ': return value != content
-    case 'GT': return parseFloat(value) > parseFloat(content)
-    case 'GE': return parseFloat(value) >= parseFloat(content)
-    case 'LT': return parseFloat(value) < parseFloat(content)
-    case 'LE': return parseFloat(value) <= parseFloat(content)
-    case 'IN': return content && content.split(',').includes(value)
-    case 'NOTIN': return !content || !content.split(',').includes(value)
-    case 'LENGTH': return (value.length || (!value ? 0 : 1)) === parseInt(content)
-    case 'MATCH': return !!content && !!value && new RegExp(content).test(value)
+    case 'EQ':
+      return value == content
+    case 'NEQ':
+      return value != content
+    case 'GT':
+      return parseFloat(value) > parseFloat(content)
+    case 'GE':
+      return parseFloat(value) >= parseFloat(content)
+    case 'LT':
+      return parseFloat(value) < parseFloat(content)
+    case 'LE':
+      return parseFloat(value) <= parseFloat(content)
+    case 'IN':
+      return content && content.split(',').includes(value)
+    case 'NOTIN':
+      return !content || !content.split(',').includes(value)
+    case 'LENGTH':
+      return (value.length || (!value ? 0 : 1)) === parseInt(content)
+    case 'MATCH':
+      return !!content && !!value && new RegExp(content).test(value)
   }
   return false
 }
@@ -117,9 +130,9 @@ export const BarcodeResolve = {
    * @param {String} key 需要设置值的key，默认设置顶级，传入值后设置顶级的下级
    * @return -
    * */
-  setRule(data, key=''){
+  setRule(data, key = '') {
     let index = 'barcodeResolveRule'
-    if (key) index+=('.'+key)
+    if (key) index += ('.' + key)
 
     window.lwWindowGlobalData.set(index, data)
   },
@@ -131,9 +144,9 @@ export const BarcodeResolve = {
    * @param {String} key 需要获取值的key，默认获取全部，传入值后获取指定key的数据
    * @return {Object} 返回获取到的值
    * */
-  getRule(key){
+  getRule(key) {
     let index = 'barcodeResolveRule'
-    if (key) index+=('.'+key)
+    if (key) index += ('.' + key)
 
     return window.lwWindowGlobalData.get(index) || {}
   },
@@ -145,28 +158,28 @@ export const BarcodeResolve = {
    * @param {Array} appCodeList 获取指定app的解析规则
    * @return -
    * */
-  asyncInitRule(appCodeList=[]){
-    return new Promise((PR,PE)=>{
+  asyncInitRule(appCodeList = []) {
+    return new Promise((PR, PE) => {
       common.commonWmsLoadAllComponentConfig({
         appCodeList
-      }).then(res=>{
+      }).then(res => {
 
         let obj = {}
 
         // 判断返回数据是否是数组且有值
-        if (!Array.isArray(res) || !res.length){
+        if (!Array.isArray(res) || !res.length) {
           console.error(
               '条码解析规则获取失败！接口返回数据不是数组类型或为空。将会导致条码解析无效或异常！！！返回值为：',
               res
           )
-        }else {
+        } else {
           res.forEach(item => obj[item.componentId] = item)
         }
 
         this.setRule(obj)
 
         PR()
-      }).catch((e)=>PE(e))
+      }).catch((e) => PE(e))
     })
   },
 
@@ -176,13 +189,13 @@ export const BarcodeResolve = {
    * @param {Object} param {componentId-输入框id, barcode-需要解析的内容, ownerId-货主id}
    * @return {Object} {success-解析是否成功，barcode-解析前的原始字符，bizType-成功解析的规则，data-解析后的数据对象}
    * */
-  async resolve(param){
+  async resolve(param) {
 
     const {componentId, barcode, ownerId, createRule} = param
 
-    if (!componentId){
+    if (!componentId) {
       lwErrMsg.show(
-        Language.get('wms_project.pda.utils.BarcodeResolve.qemvmsdn','获取条码解析规则失败，未指定输入框解析ID')
+          Language.get('wms_project.pda.utils.BarcodeResolve.qemvmsdn', '获取条码解析规则失败，未指定输入框解析ID')
       )
       return {
         success: false,
@@ -194,13 +207,13 @@ export const BarcodeResolve = {
     let data = this.getRule(componentId)
 
 
-    if (!data || !Object.keys(data).length){
+    if (!data || !Object.keys(data).length) {
 
       if (
-        createRule &&
-        typeof createRule === 'object' &&
-        Object.keys(createRule).length
-      ){
+          createRule &&
+          typeof createRule === 'object' &&
+          Object.keys(createRule).length
+      ) {
         try {
           data = await common.commonWmsLoadAndInitComponentConfig({
             ...createRule,
@@ -208,7 +221,7 @@ export const BarcodeResolve = {
           })
 
           this.setRule(data, componentId)
-        }catch (e){
+        } catch (e) {
           return {
             success: false,
             barcode,
@@ -216,9 +229,9 @@ export const BarcodeResolve = {
           }
         }
 
-      }else {
+      } else {
         lwErrMsg.show(
-          Language.get('wms_project.pda.utils.BarcodeResolve.bmkxoyxk','获取条码解析规则失败，未获取到解析规则。输入框解析ID：')+ componentId
+            Language.get('wms_project.pda.utils.BarcodeResolve.bmkxoyxk', '获取条码解析规则失败，未获取到解析规则。输入框解析ID：') + componentId
         )
         return {
           success: false,
@@ -228,13 +241,11 @@ export const BarcodeResolve = {
       }
 
 
-
-
     }
 
 
-    data.barcodeConfig.typeResolvers.forEach(item=>{
-      item.resolvers = item.resolvers.filter(inItem=>{
+    data.barcodeConfig.typeResolvers.forEach(item => {
+      item.resolvers = item.resolvers.filter(inItem => {
         return !inItem.ownerId || (ownerId && inItem.ownerId === ownerId)
       })
     })
@@ -244,17 +255,17 @@ export const BarcodeResolve = {
 
       // 判断是否存在解析器
       if (
-        !typeResolvers.resolvers ||
-        !Array.isArray(typeResolvers.resolvers) ||
-        !typeResolvers.resolvers.length
+          !typeResolvers.resolvers ||
+          !Array.isArray(typeResolvers.resolvers) ||
+          !typeResolvers.resolvers.length
       ) continue
 
       for (let resolvers of typeResolvers.resolvers) {
         // 判断解析脚本是否合法
         if (
-          !resolvers.clientHandle ||
-          !resolvers.clientScript ||
-          typeof resolvers.clientScript !== 'string'
+            !resolvers.clientHandle ||
+            !resolvers.clientScript ||
+            typeof resolvers.clientScript !== 'string'
         ) continue
 
 
@@ -263,17 +274,17 @@ export const BarcodeResolve = {
 
         // 校验是否解析成功，且复核验证要求
         if (
-          resolveData &&
-          ruleValidation(resolveData, typeResolvers.valids) &&
-          (
-            !(resolvers.validScript && typeof resolvers.validScript === 'string') ||
-            (new Function('$param', '$utils', '$data', resolvers.validScript))(param, barcodeUtils, resolveData)
-          )
+            resolveData &&
+            ruleValidation(resolveData, typeResolvers.valids) &&
+            (
+                !(resolvers.validScript && typeof resolvers.validScript === 'string') ||
+                (new Function('$param', '$utils', '$data', resolvers.validScript))(param, barcodeUtils, resolveData)
+            )
         ) {
 
-          if (!typeResolvers.primaryValid || !typeResolvers.primaryValid.field){
+          if (!typeResolvers.primaryValid || !typeResolvers.primaryValid.field) {
             lwErrMsg.show(
-                Language.get('wms_project.pda.utils.BarcodeResolve.stpryqma','主字段配置有误，请联系管理员重新配置')
+                Language.get('wms_project.pda.utils.BarcodeResolve.stpryqma', '主字段配置有误，请联系管理员重新配置')
             )
             return {
               success: false,
@@ -298,7 +309,7 @@ export const BarcodeResolve = {
 
 
     // 判断是否使用了默认解析
-    if (data.barcodeConfig.defaultResolve){
+    if (data.barcodeConfig.defaultResolve) {
       return {
         success: true,
         barcode,
@@ -310,7 +321,7 @@ export const BarcodeResolve = {
 
     // 走到这就是所有解析规则都没过了且没有使用默认规则
     lwErrMsg.show(
-      Language.get('wms_project.pda.utils.BarcodeResolve.agyiotes','条码解析失败！输入框ID：') + componentId
+        Language.get('wms_project.pda.utils.BarcodeResolve.agyiotes', '条码解析失败！输入框ID：') + componentId
     )
 
     return {

package/src/utils/CheckVal.js

@@ -0,0 +1,11 @@
+/*
+* 检查数据值是否正确
+* @author: 张文
+* @date  2023-03-15
+* */
+
+export function CheckVal(val, def = '-') {
+  if (val === 0) return val
+  if (val) return val
+  return def
+}

package/src/utils/DateTime.js

@@ -8,7 +8,7 @@ import {Language} from "./Language";
 import {Timezone} from "./Timezone";
 
 // 内部使用函数，截取指定时间的值
-function timeTextSplit(str, type){
+function timeTextSplit(str, type) {
   // 如果没有传入类型或者当前值不包含传入类型则返回传入值
   if (!type || !str.includes(type)) return str
 
@@ -27,7 +27,7 @@ export const DateTime = {
     if (!date) return '-'
 
     // 如果是标准时就调用标准时转换
-    if (/(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(.\d+)?Z)/gm.test(date)){
+    if (/(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(.\d+)?Z)/gm.test(date)) {
       return Timezone.UTCToTimezone({
         date,
         format
@@ -64,7 +64,7 @@ export const DateTime = {
    * @param {String} type 返回的时间类型默认秒钟，可选值：s-秒，m-分钟，h-小时, d-天
    * @return {Object} { time:返回相减后的值，不足1的忽略不计，ago: l < n 起始时间是否大于结束时间 }
    * */
-  judgeDate(l, n = Timezone.getTimezoneDate({format:'yyyy-MM-dd hh:mm:ss'}), type = 's') {
+  judgeDate(l, n = Timezone.getTimezoneDate({format: 'yyyy-MM-dd hh:mm:ss'}), type = 's') {
     const a = new Date(this.format(l, 'yyyy-MM-dd hh:mm:ss')).getTime()
     const b = new Date(this.format(n, 'yyyy-MM-dd hh:mm:ss')).getTime()
     let time
@@ -108,7 +108,16 @@ export const DateTime = {
    * }
    * @return {Object} {y-年, m-月, d-日, h-时, min-分, s-秒, text:当前时间的中文翻译，xx小时xx分xx秒, success-是否处理成功}
    * */
-  timeToStr({l, n = Timezone.getTimezoneDate({format:'yyyy-MM-dd hh:mm:ss'}), s = 0, type='y', agoText=false, minType='s'}) {
+  timeToStr(
+      {
+        l,
+        n = Timezone.getTimezoneDate({format: 'yyyy-MM-dd hh:mm:ss'}),
+        s,
+        type = 'y',
+        agoText = false,
+        minType = 's'
+      }
+  ) {
 
     const obj = {
       y: 0,
@@ -117,31 +126,30 @@ export const DateTime = {
       h: 0,
       min: 0,
       s: 0,
-      success:true
+      success: true
     }
 
     let time, ago
 
 
     try {
-
       // 判断是否传入了需要计算的秒数
-      if (!s) throw Error
+      if (!s && s !== 0) throw Error
 
       let nTime = Number(s)
-      if (isNaN(nTime) || nTime === 0) {
+      if (isNaN(nTime)) {
         throw Error
       }
 
       ago = nTime > 0
       time = Math.abs(nTime)
-    }catch {
+    } catch {
 
-      if (!l || !n){
+      if (!l || !n) {
         obj.success = false
         return {
           ...obj,
-          text:''
+          text: ''
         }
       }
 
@@ -151,12 +159,12 @@ export const DateTime = {
     }
 
     const language = {
-      s : Language.get('wms_project.pda.common.sec','秒'),
-      min : Language.get('wms_project.pda.common.min','分钟'),
-      h : Language.get('wms_project.pda.common.hour','小时'),
-      d : Language.get('wms_project.pda.common.day','天'),
-      m : Language.get('wms_project.pda.common.month','月'),
-      y : Language.get('wms_project.pda.common.year','年'),
+      s: Language.get('wms_project.pda.common.sec', '秒'),
+      min: Language.get('wms_project.pda.common.min', '分钟'),
+      h: Language.get('wms_project.pda.common.hour', '小时'),
+      d: Language.get('wms_project.pda.common.day', '天'),
+      m: Language.get('wms_project.pda.common.month', '月'),
+      y: Language.get('wms_project.pda.common.year', '年'),
     }
 
     let text
@@ -165,7 +173,7 @@ export const DateTime = {
     } else if (agoText) {
       text = agoText
     } else {
-      text = ago ? Language.get('wms_project.pda.common.ago','前') : Language.get('wms_project.pda.common.old','后')
+      text = ago ? Language.get('wms_project.pda.common.ago', '前') : Language.get('wms_project.pda.common.old', '后')
     }
 
 

package/src/utils/Dict.js

@@ -4,7 +4,7 @@
 * @date  2022-02-10
 * */
 
-import {dict} from "../api/common/Dict";
+import {dict} from "../api/Dict";
 import {LocalStorage} from "./LocalStorage";
 
 function checkKey(key){

package/src/utils/GetImgSrc.js

@@ -5,7 +5,7 @@
  @date: 2022-01-19
  */
 
-import {imgSrc} from "../api/common/GetImgSrc";
+import {imgSrc} from "../api/GetImgSrc";
 
 
 /**

package/src/utils/Language.js

@@ -4,7 +4,7 @@
 * @date  2022-04-14
 * */
 
-import {language} from "../api/common/Language";
+import {language} from "../api/Language";
 import {LocalStorage} from "./LocalStorage";
 
 

package/src/utils/NPMType.js

@@ -0,0 +1,28 @@
+/*
+* 设置当前使用的产品类型
+* @author: 张文
+* @date  2023-02-23
+* */
+
+import {lwMenu} from "./../router/menu";
+
+export const NPMType = {
+  /**
+   * 设置产品类型数据
+   * @author 张文
+   * @param {Array} data 需要设置的数据
+   * */
+  set(data = ['wms']) {
+    lwMenu.init(data)
+    window.lwWindowGlobalData.set('NPMType', data)
+  },
+
+  /**
+   * 获取产品类型数据
+   * @author 张文
+   * @return {String} 当前使用的产品类型
+   * */
+  get() {
+    return window.lwWindowGlobalData.get('NPMType')
+  },
+}

package/src/utils/Permissions.js

@@ -4,7 +4,7 @@
 * @date  2022-02-14
 * */
 
-import {permissions} from "../api/common/Permissions";
+import {permissions} from "../api/Permissions";
 
 export const Permissions = {
 

package/src/utils/Print.js

@@ -6,10 +6,10 @@
 
 import {AppPower} from "./AppPower";
 import {lwToast} from "./Toast";
-import {print} from "../api/common/Print";
-import {lwLoading} from "../components/ui/Loading";
-import {lwErrMsg} from "../components/ui/ErrorMsg";
-import {lwNoticeBar} from "../components/ui/NoticeBar";
+import {print} from "../api/Print";
+import {lwLoading} from "../components/Loading";
+import {lwErrMsg} from "../components/ErrorMsg";
+import {lwNoticeBar} from "../components/NoticeBar";
 import {Language} from "./Language";
 
 export const Print = {

package/src/utils/RouteInit.js

@@ -4,11 +4,18 @@
 * @date  2022-04-18
 * */
 
-import routeList from "./../router/index.js";
+import routeObj from "./../router/index.js";
+import {NPMType} from "./NPMType";
 
 
 export function RouteInit() {
 
-  return routeList
+  const type = NPMType.get()
+  let list = routeObj.common
+  type.forEach(item => {
+    list = list.concat(routeObj[item])
+  })
+
+  return list
 
 }

package/src/utils/SetColor.js

@@ -6,7 +6,7 @@
  * @return {Boolean}
  * */
 
-import {common} from "../api/common/common";
+import {common} from "../api/Common";
 
 
 export const SetColor = {
@@ -15,11 +15,11 @@ export const SetColor = {
    * @author 张文
    * @return {Object} 颜色配置
    * */
-  awayGet(){
-    return new Promise((pres,perr)=>{
-      common.baseWmsLoadPdaClientConfig().then(res=>{
+  awayGet() {
+    return new Promise((pres, perr) => {
+      common.baseWmsLoadPdaClientConfig().then(res => {
         pres(res.themeConfig || {})
-      }).catch((err)=>perr(err))
+      }).catch((err) => perr(err))
     })
   },
 
@@ -28,8 +28,8 @@ export const SetColor = {
    * 异步获取颜色配置后在设置颜色
    * @author 张文
    * */
-  awaySet(){
-    this.awayGet().then(res=>{
+  awaySet() {
+    this.awayGet().then(res => {
       this.set(res)
     })
   },