@logwire/logwire-wms-pda-ui 1.1.19 → 1.2.0

package/src/test/file/index.js

@@ -1,11 +1,11 @@
-/*
-*
-* @author: 张文
-* @date  2022-02-25
-* */
-
-import lw from "./index.vue";
-
-lw.install = Vue => Vue.component(lw.name, lw)
-
-export default lw
+/*
+*
+* @author: 张文
+* @date: 2022-02-25
+* */
+
+import lw from "./index.vue";
+
+lw.install = Vue => Vue.component(lw.name, lw)
+
+export default lw

package/src/utils/ApiUtils.js

@@ -1,48 +1,59 @@
-/*
-* token数据
-* @author 张文
-* @date  2022-02-10
-* */
-
-import lwAxios from "./Axios";
-
-export const ApiUtils = {
-
-  /**
-   * 设置token
-   * @author 张文
-   * @param {String} data 需要设置的token
-   * */
-  setToken(data){
-    window.sessionStorage.setItem('lwToken', data)
-    lwAxios.updateToken(data)
-  },
-
-
-  // 获取token
-  getToken() {
-    return window.sessionStorage.getItem('lwToken')
-  },
-
-
-  // 删除token
-  delToken() {
-    return window.sessionStorage.removeItem('lwToken')
-  },
-
-
-  /**
-   * 设置平台接口路径
-   * @author 张文
-   * @param {String} url 平台接口路径
-   * */
-  setApiUrl(url){
-    window.lwWindowGlobalData.set('apiUrl', url)
-  },
-
-
-  // 获取平台路径
-  getApiUrl(){
-    return window.lwWindowGlobalData.get('apiUrl')
-  },
-}
+/*
+* token数据
+* @author 张文
+* @date  2022-02-10
+* */
+
+import lwAxios from "./Axios";
+
+export const ApiUtils = {
+
+  /**
+   * 设置token
+   * @author 张文
+   * @param {String} data 需要设置的token
+   * */
+  setToken(data) {
+    window.sessionStorage.setItem('lwToken', data)
+    lwAxios.updateToken(data)
+  },
+
+
+  /**
+   * 获取token
+   * @author 张文
+   * @return {String} 设置的token
+   * */
+  getToken() {
+    return window.sessionStorage.getItem('lwToken')
+  },
+
+
+  /**
+   * 删除token
+   * @author 张文
+   * */
+  delToken() {
+    return window.sessionStorage.removeItem('lwToken')
+  },
+
+
+  /**
+   * 设置平台接口路径
+   * @author 张文
+   * @param {String} url 平台接口路径
+   * */
+  setApiUrl(url) {
+    window.lwWindowGlobalData.set('apiUrl', url)
+  },
+
+
+  /**
+   * 获取平台路径
+   * @author 张文
+   * @return {String} 设置的接口路径，当没有设置时返回空字符
+   * */
+  getApiUrl() {
+    return window.lwWindowGlobalData.get('apiUrl')
+  },
+}

package/src/utils/AppBack.js

@@ -1,44 +1,43 @@
-/*
-* 提供给app返回按钮使用
-* @author: 张文
-* @date  2022-06-15
-* */
-
-export const AppBack = {
-
-  /**
-   * 产品预设的返回路由
-   * @author 张文
-   * */
-  projectRoute(){
-    return ['/', '/lwHome', '/lwLogin', '/lwMy', '/lwInit']
-  },
-
-  /**
-   * 设置需要退出app的路由
-   * @author 张文
-   * @param {Array} arr 需要设置的数据
-   * @return -
-   * */
-  setExitRoute(arr=[]){
-
-    if (!Array.isArray(arr)){
-      console.warn('app返回路由设置：设置数据为非数组！设置将不生效', arr)
-      return
-    }
-
-    window.lwWindowGlobalData.set('appBackRoute', arr)
-  },
-
-  /**
-   * 获取退出app的路由
-   * @author 张文
-   * @return {Array} 当前设置的路由
-   * */
-  getExitRoute(){
-    let list = window.lwWindowGlobalData.get('appBackRoute') || []
-
-    return this.projectRoute().concat(list)
-  },
-
-}
+/*
+* 提供给app返回按钮使用
+* @author: 张文
+* @date  2022-06-15
+* */
+
+export const AppBack = {
+
+  /**
+   * 产品预设的返回路由
+   * @author 张文
+   * */
+  projectRoute() {
+    return ['/', '/lwHome', '/lwLogin', '/lwMy', '/lwInit']
+  },
+
+  /**
+   * 设置需要退出app的路由
+   * @author 张文
+   * @param {Array} arr 需要设置的数据
+   * */
+  setExitRoute(arr = []) {
+
+    if (!Array.isArray(arr)) {
+      console.error('app返回路由设置：设置数据为非数组！设置将不生效', arr)
+      return
+    }
+
+    window.lwWindowGlobalData.set('appBackRoute', arr)
+  },
+
+  /**
+   * 获取退出app的路由
+   * @author 张文
+   * @return {Array} 当前设置的路由
+   * */
+  getExitRoute() {
+    let list = window.lwWindowGlobalData.get('appBackRoute') || []
+
+    return this.projectRoute().concat(list)
+  },
+
+}

package/src/utils/AppPower.js

@@ -1,183 +1,191 @@
-
-/*
-* app壳子提供的能力
-* @author 蔡礼标
-* @date 2022-01-19
-* */
-
-export const AppPower = {
-
-  /**
-   * app 蓝牙打印
-   * @param template string 模板
-   * @param data  打印数据--"[{},{}]"
-   * @returns true|false
-   */
-  bluePrint: (template, data) => {
-    let app = window.App_bluePrint
-    if (app && typeof (app.bluePrint) == "function") {
-      return true == app.bluePrint(JSON.stringify({"template": template, "data": data}))
-    } else {
-      return false
-    }
-  },
-
-
-  /**
-   * 预先连接蓝牙打印 提升打印连接速度
-   * 可多次调用
-   * @returns {boolean}
-   */
-  bluePrintOpen: () => {
-    let app = window.App_bluePrint
-    if (app && typeof (app.bluePrintOpen) == "function") {
-      return true == app.bluePrintOpen()
-    } else {
-      return false
-    }
-  },
-
-
-  /**
-   * 关闭蓝牙打印连接
-   * 可多次调用
-   * @returns {boolean}
-   */
-  bluePrintClose: () => {
-    let app = window.App_bluePrint
-    if (app && typeof (app.bluePrintClose) == "function") {
-      return true == app.bluePrintClose()
-    } else {
-      return false
-    }
-  },
-
-
-  /**
-   * 一次震动
-   * @param time
-   * @returns {boolean}
-   */
-  shortVibrate: (time) => {
-    let app = window.App_vibrate
-    if (app && typeof (app.shortVibrate) == "function") {
-      return true == app.shortVibrate(time)
-    } else {
-      return false
-    }
-  },
-
-
-  /**
-   * 获取UUID
-   * 示例 shortVibrate(500)
-   * @returns uuid
-   */
-  appUUID: () => {
-    let app = window.App_uuid
-    if (app && typeof (app.getUUID) == "function") {
-      return app.getUUID()
-    } else {
-      return false
-    }
-  },
-
-
-  /**
-   * 波动震动
-   * list：0+n*2=停止时间，1+n*2=震动时间
-   * 示例 longVibrate([50,150,100,150,100,1000])
-   * @param list
-   * @returns {boolean}
-   */
-  longVibrate: (list) => {
-    let app = window.App_vibrate
-
-    if (app && typeof (app.waveVibrate) == "function") {
-      return true == app.waveVibrate(JSON.stringify({"list": list, "repeat": -1}))
-    } else {
-      return false
-    }
-  },
-
-
-  /**
-   * 语音提示
-   * 示例  speak("1234567")
-   */
-  speak: (data) => {
-    let app = window.App_tts
-    if (app && typeof (app.speak) == "function") {
-      // 大于15个字符就不朗读
-      if (data.length > 15) return false
-      return true == app.speak(data)
-    } else {
-      return false
-    }
-  },
-
-
-  // 扫描
-  scan: () => {
-    let app = window.App_scan
-    if (app && typeof (app.scan) == "function") {
-      return app.scan()
-    } else {
-      return null
-    }
-  },
-
-
-  // 获取图片 多张 默认最多9
-  getImages: (maxNum) => {
-    let app = window.App_gallery
-    if (app && typeof (app.images) == "function") {
-      let images = app.images(maxNum);
-      if (images) return JSON.parse(images)
-    }
-
-    return null
-  },
-
-
-
-  /**
-   * 获取配置信息：环境名
-   * @returns {string}
-   */
-  appHostName:() => {
-    let app = window.App_config
-    if(app && typeof (app.getHostName) == "function"){
-      return app.getHostName()
-    }else{
-      return "-"
-    }
-  },
-
-  /**
-   * 获取配置信息：调试模式
-   * @returns {boolean}
-   */
-  appIsDebug:() => {
-    let app = window.App_config
-    if(app && typeof (app.isDebug) == "function"){
-      return true == app.isDebug()
-    }else{
-      return false
-    }
-  },
-
-  /**
-   * 获取配置信息：发布类型
-   * @returns {string}
-   */
-  appChannel:() => {
-    let app = window.App_config
-    if(app && typeof (app.getChannel) == "function"){
-      return app.getChannel()
-    }else{
-      return ""
-    }
-  }
-
-}
+
+/*
+* app壳子提供的能力
+* @author 蔡礼标
+* @date 2022-01-19
+* */
+
+import {Language} from "./Language";
+
+export const AppPower = {
+
+  /**
+   * app 蓝牙打印
+   * @param template string 模板
+   * @param data  打印数据--"[{},{}]"
+   * @returns true|false
+   */
+  bluePrint: (template, data) => {
+    let app = window.App_bluePrint
+    if (app && typeof (app.bluePrint) == "function") {
+      return true == app.bluePrint(JSON.stringify({"template": template, "data": data}))
+    } else {
+      return false
+    }
+  },
+
+
+  /**
+   * 预先连接蓝牙打印 提升打印连接速度
+   * 可多次调用
+   * @returns {boolean}
+   */
+  bluePrintOpen: () => {
+    let app = window.App_bluePrint
+    if (app && typeof (app.bluePrintOpen) == "function") {
+      return true == app.bluePrintOpen()
+    } else {
+      return false
+    }
+  },
+
+
+  /**
+   * 关闭蓝牙打印连接
+   * 可多次调用
+   * @returns {boolean}
+   */
+  bluePrintClose: () => {
+    let app = window.App_bluePrint
+    if (app && typeof (app.bluePrintClose) == "function") {
+      return true == app.bluePrintClose()
+    } else {
+      return false
+    }
+  },
+
+
+  /**
+   * 一次震动
+   * @param time
+   * @returns {boolean}
+   */
+  shortVibrate: (time) => {
+    let app = window.App_vibrate
+    if (app && typeof (app.shortVibrate) == "function") {
+      return true == app.shortVibrate(time)
+    } else {
+      return false
+    }
+  },
+
+
+  /**
+   * 获取UUID
+   * 示例 shortVibrate(500)
+   * @returns uuid
+   */
+  appUUID: () => {
+    let app = window.App_uuid
+    if (app && typeof (app.getUUID) == "function") {
+      return app.getUUID()
+    } else {
+      return false
+    }
+  },
+
+
+  /**
+   * 波动震动
+   * list：0+n*2=停止时间，1+n*2=震动时间
+   * 示例 longVibrate([50,150,100,150,100,1000])
+   * @param list
+   * @returns {boolean}
+   */
+  longVibrate: (list) => {
+    let app = window.App_vibrate
+
+    if (app && typeof (app.waveVibrate) == "function") {
+      return true == app.waveVibrate(JSON.stringify({"list": list, "repeat": -1}))
+    } else {
+      return false
+    }
+  },
+
+
+  /**
+   * 语音提示
+   * 示例  speak("1234567")
+   */
+  speak: (data) => {
+    let app = window.App_tts
+    if (app && typeof (app.speak) == "function") {
+      // 如果设置的语言是中文
+      if (Language.getKey().includes('zh')){
+        // 大于30个字符就不朗读
+        if (data.length > 30) return false
+      }else {
+        if (data.split(' ').length > 30) return false
+      }
+
+      return true == app.speak(data)
+    } else {
+      return false
+    }
+  },
+
+
+  // 扫描
+  scan: () => {
+    let app = window.App_scan
+    if (app && typeof (app.scan) == "function") {
+      return app.scan()
+    } else {
+      return null
+    }
+  },
+
+
+  // 获取图片 多张 默认最多9
+  getImages: (maxNum) => {
+    let app = window.App_gallery
+    if (app && typeof (app.images) == "function") {
+      let images = app.images(maxNum);
+      if (images) return JSON.parse(images)
+    }
+
+    return null
+  },
+
+
+
+  /**
+   * 获取配置信息：环境名
+   * @returns {string}
+   */
+  appHostName:() => {
+    let app = window.App_config
+    if(app && typeof (app.getHostName) == "function"){
+      return app.getHostName()
+    }else{
+      return "-"
+    }
+  },
+
+  /**
+   * 获取配置信息：调试模式
+   * @returns {boolean}
+   */
+  appIsDebug:() => {
+    let app = window.App_config
+    if(app && typeof (app.isDebug) == "function"){
+      return true == app.isDebug()
+    }else{
+      return false
+    }
+  },
+
+  /**
+   * 获取配置信息：发布类型
+   * @returns {string}
+   */
+  appChannel:() => {
+    let app = window.App_config
+    if(app && typeof (app.getChannel) == "function"){
+      return app.getChannel()
+    }else{
+      return ""
+    }
+  }
+
+}

package/src/utils/Axios.js

@@ -5,18 +5,19 @@
 * @date 2022-02-10
 * */
 
-import Axios from 'axios'
+import Axios from 'axios';
 import {ApiUtils} from "./ApiUtils";
 import {Warehouse} from "./Warehouse";
 import {lwShowErrorMsg} from "../components/ui/ErrorMsg";
 import {lwShowLoading, lwCloseLoading} from "../components/ui/Loading";
 import {Language} from "./Language";
+import {LocalStorage} from "./LocalStorage";
 
 // 用于自定义处理http报错的问题，为false时候不显示报错信息，直接返回错误信息，通过catch接收
 let errGetMe = false
 
 const lwAxios = Axios.create({
-  baseURL: process.env.VUE_APP_BASE_URL,
+  baseURL: import.meta.env.VITE_APP_BASE_URL,
   timeout: 1000 * 60 * 30,
 })
 
@@ -28,6 +29,9 @@ const lwAxios = Axios.create({
  * */
 lwAxios.setBaseUrl = url => lwAxios.defaults.baseURL = url
 
+lwAxios.setLanguage = lang => lwAxios.defaults.headers['Accept-Language'] = (lang || LocalStorage.get('lwLanguage') || 'zh-CN,zh')
+
+lwAxios.setLanguage()
 
 /**
  * 更新请求的 Token，正常情况下无需手动更新token，因为当token发生变化时应当主动触发 lwApiUtils.setToken 方法。从而会自动更新当前token
@@ -88,7 +92,7 @@ lwAxios.interceptors.request.use(
   },
   error => {
     lwCloseLoading()
-    console.warn('请求异常: ', error)
+    console.error('请求异常: ', error)
     return Promise.reject(error)
   }
 )
@@ -118,7 +122,7 @@ lwAxios.interceptors.response.use(
   error => {
 
     lwCloseLoading()
-    console.warn('接口返回异常: ', error)
+    console.error('接口返回异常: ', error)
 
     let resp = error.response