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

package/src/utils/SetColor.js

@@ -5,18 +5,53 @@
  * @param {Object} obj 需要修改的颜色
  * @return {Boolean}
  * */
-export const SetColor = (obj) => {
-  if (typeof obj !== 'object' || !Object.keys(obj).length) {
-    console.error('修改主题颜色时传入的参数不为对象或为空对象，传入数据为：')
-    console.error(obj)
-    return false
-  }
 
-  const bodyDom = document.getElementsByTagName('body')[0].style
+import {common} from "../api/common/common";
 
-  for (let key in obj) {
-    bodyDom.setProperty(`--${key}`, obj[key]);
-  }
 
-  return true
+export const SetColor = {
+  /**
+   * 异步获取颜色配置
+   * @author 张文
+   * @return {Object} 颜色配置
+   * */
+  awayGet(){
+    return new Promise((pres,perr)=>{
+      common.baseWmsLoadPdaClientConfig().then(res=>{
+        pres(res.themeConfig || {})
+      }).catch((err)=>perr(err))
+    })
+  },
+
+
+  /**
+   * 异步获取颜色配置后在设置颜色
+   * @author 张文
+   * */
+  awaySet(){
+    this.awayGet().then(res=>{
+      this.set(res)
+    })
+  },
+
+  /**
+   * 设置颜色
+   * @author 张文
+   * @param {Object} obj - 需要设置的颜色
+   * */
+  set(obj) {
+
+    if (typeof obj !== 'object' || !Object.keys(obj).length) {
+      console.error('修改主题颜色时传入的参数不为对象或为空对象，传入数据为：')
+      console.error(obj)
+      return
+    }
+
+    const bodyDom = document.getElementsByTagName('body')[0].style
+
+    for (let key in obj) {
+      bodyDom.setProperty(`--${key}`, obj[key]);
+    }
+
+  }
 }

package/src/utils/TabBar.js

@@ -10,10 +10,10 @@ export const TabBar = {
   /**
    * 设置底部导航栏数据
    * @author 张文
-   * @param {Object} data 需要设置的仓库数据
-   * @param {String} key 需要修改的数据key
+   * @param {Object} data 需要设置的数据
+   * @param {String} key 需要修改的数据key，为空时修改全部
    * */
-  set(data, key = ''){
+  set(data, key = '') {
     const k = key ? 'tabBar.' + key : 'tabBar'
     window.lwWindowGlobalData.set(k, data)
   },
@@ -23,6 +23,7 @@ export const TabBar = {
    * 获取导航栏数据
    * @author 张文
    * @param {Boolean} isDeep 是否需要深拷贝
+   * @return {Object}
    * */
   get(isDeep = true) {
     return window.lwWindowGlobalData.get('tabBar', isDeep)

package/src/utils/Timezone.js

@@ -0,0 +1,179 @@
+/*
+* 时区
+* @author: 张文
+* @date  2022-08-03
+* */
+
+import {DateTime} from "./DateTime";
+import {LocalStorage} from "./LocalStorage";
+
+
+export const Timezone = {
+
+  /**
+   * 获取时区数据
+   * @author 张文
+   * @return {Object} 时区
+   * */
+  get(){
+    return window.lwWindowGlobalData.get('timezone')
+  },
+
+
+  /**
+   * 获取指定时区的偏移量
+   * @author 张文
+   * @param {String|null} timezone 需要获取的时区
+   * @return {Number} 时区的偏移值(min)
+   * */
+  getTimezoneOffset(timezone = null){
+
+    let numOffset = ''
+
+    if (timezone){
+      // 获取时区的值
+      let timezoneObj = this.get()[timezone] || {}
+      // 判断是否成功获取到时区
+      if (!Object.keys(timezoneObj).length) {
+        console.error('调用【时间转换】方法时，传入的timezone无法获取到时区，已默认为0时区，数据可能存在差异，请注意！')
+        numOffset = 0
+      }else {
+        numOffset = timezoneObj.offset
+      }
+
+    }else {
+      // 如果没有传入偏移值就取系统选择的时区
+      numOffset = Number(LocalStorage.get('lwTimezone').offset)
+    }
+
+    return numOffset
+  },
+
+
+  /**
+   * 获取当前时区，及偏移量
+   * @author 张文
+   * @return {Object} {timezone: 时区, offset: 时区差值(min)}
+   * */
+  getTimezone(){
+
+    let offset = new Date().getTimezoneOffset()
+    let timezone = offset / 60
+
+    // 判断是否是0时区
+    if (timezone === 0){
+      return {
+        timezone: 'UTC',
+        offset: 0
+      }
+    }
+
+    // 判断是否是西时区
+    if (timezone > 0) {
+      return {
+        timezone: 'UTC-' + timezone,
+        offset: Number('-' + timezone) * 60
+      }
+    }
+
+    return {
+      timezone: 'UTC+' + Math.abs(timezone),
+      offset: Math.abs(timezone) * 60
+    }
+  },
+
+
+  /**
+   * 将时区时间转换为标准时间
+   * @author 张文
+   * @param {Object} obj
+   * date - 需要转换的时间；
+   * timezone - 转换时间所属的时区 - 为空时默认取用户选择的时区；
+   * format - 格式化表达式；
+   * backUTC - 当格式化表达式为空时，是否返回标准时间格式；
+   * @return {String|Number} 当format为空时返回标准时间格式或时间戳，否则返回格式化后的时间
+   * */
+  timezoneToUTC({date, timezone, format, backUTC = true}){
+
+    // 标准时间的时间戳
+    let utc = ''
+
+    // 获取当前设备所处时区
+    const nowTimezone = this.getTimezone()
+
+    // 获取设备所处时区的标准时间戳
+    const s = Date.parse(new Date(date).toUTCString())
+
+    let numOffset = this.getTimezoneOffset(timezone)
+
+    utc = s + (nowTimezone.offset - numOffset) * 60 * 1000
+
+    if (format) {
+      // DateTime.format方法是通过new Date()实现，所以需要减去当前时间偏移量才是标准时间
+      return DateTime.format(utc - nowTimezone.offset * 60 * 1000, format)
+    }
+
+    if (backUTC){
+      const utcList = DateTime.format(utc - nowTimezone.offset * 60 * 1000, 'yyyy-MM-dd hh:mm:ss').split(' ')
+      return utcList.join('T')+'Z'
+    }
+
+    return utc
+
+  },
+
+
+  /**
+   * 将标准时间转换为时区时间
+   * @author 张文
+   * @param {Object} obj date - 需要转换的标准时间；timezone-需要转换的时区 - 为空时默认取用户选择的时区；format - 格式化表达式
+   * @return {String|Number} 当format为空时返回时间戳，否则返回格式化后的时间
+   * */
+  UTCToTimezone({date, timezone, format = 'yyyy-MM-dd hh:mm'}){
+
+    // 时区时间戳
+    let timezoneTime = ''
+    let d = date
+    if (/(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(.\d+)?Z)/gm.test(date)){
+      d = date.replace(/[T|Z]/gm,' ')
+    }
+
+    // 获取标准时间的时间戳
+    const s = Date.parse(d)
+
+    let numOffset = this.getTimezoneOffset(timezone)
+
+    timezoneTime = s + numOffset * 60 * 1000
+
+    if (format) return DateTime.format(timezoneTime, format)
+
+    return timezoneTime
+  },
+
+
+  /**
+   * 获取指定时区的时间
+   * @author 张文
+   * @param {Object} obj timezone - 需要获取时间的时区；format - 格式化表达式
+   * @return {String|Number} 当format为空时返回时间戳，否则返回格式化后的时间
+   * */
+  getTimezoneDate({timezone, format}={}){
+
+    // 获取设备所处时区的标准时毫秒数
+    const s = Date.parse(new Date().toUTCString())
+    // 获取当前时区
+    const nowTimezone = this.getTimezone()
+
+    // 获取时区的偏移值
+    let numOffset = this.getTimezoneOffset(timezone)
+
+    // 根据当前值和时间偏移值计算出偏移后的标准时毫秒数
+    const utc = s + (numOffset - nowTimezone.offset) * 60 * 1000
+
+    if (format) return DateTime.format(utc, format)
+
+    return utc
+
+  },
+
+}

package/src/utils/Tip.js

@@ -9,18 +9,18 @@
  * 角标数字格式化
  * @author 张文
  * @date 2022-03-11
- * @param {String|Number} val val-需要格式化的数据；
- * @param {Number} max max-最大显示值；
- * @return {String|Number} 返回对象格式化后的对象
+ * @param {String|Number} val 需要格式化的数据；
+ * @param {Number} max 最大显示值；
+ * @return {String|Number} 返回对象格式化后的数据
  * */
-export function Tip (val, max=9){
+export function Tip(val, max = 9) {
   const num = Number(val)
 
   if (isNaN(num)) return val
 
-  if (num > max){
+  if (num > max) {
     return max + '+'
-  }else {
+  } else {
     return num
   }
 }

package/src/utils/Toast.js

@@ -1,41 +1,41 @@
-/*
-* 轻提醒
-* @author: 张文
-* @date  2022-02-15
-* */
-
-import {Toast} from "vant";
-import {AppPower} from "./AppPower";
-
-// 自定义Toast
-Toast.setDefaultOptions({
-  forbidClick:true,
-  onOpened(){
-
-  },
-  zIndex:3000
-})
-
-Toast.setDefaultOptions('success',{
-  onOpened(){
-    AppPower.shortVibrate(500)
-    AppPower.speak(this.message)
-  }
-})
-
-export const lwToast = {
-  // 轻提醒
-  toast(obj){
-    return Toast(obj)
-  },
-
-  // 成功
-  success(obj){
-    return Toast.success(obj);
-  },
-
-  // 失败
-  fail(obj){
-    return Toast.fail(obj);
-  },
-}
+/*
+* 轻提醒
+* @author: 张文
+* @date  2022-02-15
+* */
+
+import {Toast} from "vant";
+import {AppPower} from "./AppPower";
+
+// 自定义Toast
+Toast.setDefaultOptions({
+  forbidClick:true,
+  onOpened(){
+
+  },
+  zIndex:3000
+})
+
+Toast.setDefaultOptions('success',{
+  onOpened(){
+    AppPower.shortVibrate(500)
+    AppPower.speak(this.message)
+  }
+})
+
+export const lwToast = {
+  // 轻提醒
+  toast(obj){
+    return Toast(obj)
+  },
+
+  // 成功
+  success(obj){
+    return Toast.success(obj);
+  },
+
+  // 失败
+  fail(obj){
+    return Toast.fail(obj);
+  },
+}

package/src/utils/UUID.js

@@ -8,7 +8,13 @@ import {AppPower} from "./AppPower";
 import {uuid} from "../api/common/UUID";
 
 export const UUID = {
-  // 绑定设备id
+
+  /**
+   * 绑定设备id
+   * @author 张文
+   * @date 2022-03-11
+   * @return {Promise}
+   * */
   bound() {
 
     return new Promise((res, err) => {

package/src/utils/Utils.js

@@ -0,0 +1,34 @@
+/*
+* 公共方法
+* @author: 张文
+* @date  2022-08-18
+* */
+export const Utils = {
+
+  /**
+   * 配合卡片切换组件使用。用于计算当前显示页是否符合时间最大条数
+   * @author 张文
+   * @date 2022-08-18
+   * @param {Number} index 需要比较的值
+   * @param {Number} length 比较的最大值
+   * @return {Number} 符合要求的数组
+   * */
+  cutCardIndexCount(index, length) {
+    const i = Number(index)
+    const l = Number(length)
+    if (isNaN(i)) {
+      console.error('传入【index】无法转换为数字，值为：' + index)
+      return 0
+    }
+    if (isNaN(l)) {
+      console.error('传入【length】无法转换为数字，值为：' + length)
+      return 0
+    }
+
+    if (l === 0) return 0
+
+    if ((i + 1) > l) return i - 1
+
+    return i
+  }
+}

package/src/utils/Warehouse.js

@@ -12,13 +12,17 @@ export const Warehouse = {
    * @author 张文
    * @param {Object} data 需要设置的仓库数据
    * */
-  set(data){
+  set(data) {
     window.lwWindowGlobalData.set('warehouse', data)
     window.sessionStorage.setItem('lwWarehouse', JSON.stringify(data))
   },
 
 
-  // 获取仓库数据
+  /**
+   * 获取仓库数据
+   * @author 张文
+   * @return {Object} 仓库数据
+   * */
   get() {
     return window.lwWindowGlobalData.get('warehouse')
   },

package/src/utils/index.js

@@ -1,63 +1,69 @@
-/*
-* 导出公共方法的统一入口
-* @author 张文
-* @date  2022-01-26
-* */
-
-import {DateTime} from "./DateTime"
-import {ScanRule} from "./ScanRule"
-import {AppPower} from './AppPower'
-import {lwShowLoading, lwCloseLoading} from "../components/ui/Loading"
-import {lwShowErrorMsg, lwCloseErrorMsg} from "../components/ui/ErrorMsg"
-import lwAxios from './Axios'
-import {GetImgSrc} from "./GetImgSrc";
-import {lwToast} from "./Toast";
-import {Print} from "./Print";
-import {DeepCopy} from "./DeepCopy";
-import {LocalStorage} from "./LocalStorage";
-import {SetColor} from "./SetColor";
-import {Tip} from "./Tip";
-import {Language} from "./Language";
-import {Init} from "./Init";
-import {lwMenu} from "../router/menu";
-import {Dict} from "./Dict"
-import {ApiUtils} from "./ApiUtils"
-import {Warehouse} from "./Warehouse";
-import {Permissions} from "./Permissions";
-import {TabBar} from "./TabBar";
-import {RouteInit} from "./RouteInit";
-import {UUID} from "./UUID";
-import {AppBack} from "./AppBack";
-import {barcodeResolve} from "./BarcodeResolve";
-
-
-
-export const utils = (Vue) => {
-  Vue.prototype.$lwDate = DateTime
-  Vue.prototype.$lwScanRule = ScanRule
-  Vue.prototype.$lwAppPower = AppPower
-  Vue.prototype.$lwShowLoading = lwShowLoading
-  Vue.prototype.$lwCloseLoading = lwCloseLoading
-  Vue.prototype.$lwShowErrorMsg = lwShowErrorMsg
-  Vue.prototype.$lwCloseErrorMsg = lwCloseErrorMsg
-  Vue.prototype.$lwAxios = lwAxios
-  Vue.prototype.$lwGetImgSrc = GetImgSrc
-  Vue.prototype.$lwToast = lwToast
-  Vue.prototype.$lwPrint = Print
-  Vue.prototype.$lwDeepCopy = DeepCopy
-  Vue.prototype.$lwLocalStorag = LocalStorage
-  Vue.prototype.$lwSetColor = SetColor
-  Vue.prototype.$lwTip = Tip
-  Vue.prototype.$lwLanguage = Language
-  Vue.prototype.$lwInit = Init
-  Vue.prototype.$lwMenu = lwMenu
-  Vue.prototype.$lwDict = Dict
-  Vue.prototype.$lwApiUtils = ApiUtils
-  Vue.prototype.$lwWarehouse = Warehouse
-  Vue.prototype.$lwPermissions = Permissions
-  Vue.prototype.$lwTabBar = TabBar
-  Vue.prototype.$lwRouteInit = RouteInit
-  Vue.prototype.$lwUUID = UUID
-  Vue.prototype.$lwAppBack = AppBack
-  Vue.prototype.$lwBarcodeResolve = barcodeResolve
-}
+/*
+* 导出公共方法的统一入口
+* @author 张文
+* @date  2022-01-26
+* */
+
+import {DateTime} from "./DateTime"
+import {ScanRule} from "./ScanRule"
+import {AppPower} from './AppPower'
+import {lwShowLoading, lwCloseLoading} from "../components/ui/Loading"
+import {lwShowErrorMsg, lwCloseErrorMsg} from "../components/ui/ErrorMsg"
+import lwAxios from './Axios'
+import {GetImgSrc} from "./GetImgSrc";
+import {lwToast} from "./Toast";
+import {Print} from "./Print";
+import {DeepCopy} from "./DeepCopy";
+import {LocalStorage} from "./LocalStorage";
+import {SetColor} from "./SetColor";
+import {Tip} from "./Tip";
+import {Language} from "./Language";
+import {Init} from "./Init";
+import {lwMenu} from "../router/menu";
+import {Dict} from "./Dict"
+import {ApiUtils} from "./ApiUtils"
+import {Warehouse} from "./Warehouse";
+import {Permissions} from "./Permissions";
+import {TabBar} from "./TabBar";
+import {RouteInit} from "./RouteInit";
+import {UUID} from "./UUID";
+import {AppBack} from "./AppBack";
+import {BarcodeResolve} from "./BarcodeResolve";
+import {lwDialog} from "./Dialog";
+import {Timezone} from "./Timezone";
+import {Utils} from "./Utils";
+
+
+
+export const utils = (Vue) => {
+  Vue.prototype.$lwDate = DateTime
+  Vue.prototype.$lwScanRule = ScanRule
+  Vue.prototype.$lwAppPower = AppPower
+  Vue.prototype.$lwShowLoading = lwShowLoading
+  Vue.prototype.$lwCloseLoading = lwCloseLoading
+  Vue.prototype.$lwShowErrorMsg = lwShowErrorMsg
+  Vue.prototype.$lwCloseErrorMsg = lwCloseErrorMsg
+  Vue.prototype.$lwAxios = lwAxios
+  Vue.prototype.$lwGetImgSrc = GetImgSrc
+  Vue.prototype.$lwToast = lwToast
+  Vue.prototype.$lwPrint = Print
+  Vue.prototype.$lwDeepCopy = DeepCopy
+  Vue.prototype.$lwLocalStorag = LocalStorage
+  Vue.prototype.$lwSetColor = SetColor
+  Vue.prototype.$lwTip = Tip
+  Vue.prototype.$lwLanguage = Language
+  Vue.prototype.$lwInit = Init
+  Vue.prototype.$lwMenu = lwMenu
+  Vue.prototype.$lwDict = Dict
+  Vue.prototype.$lwApiUtils = ApiUtils
+  Vue.prototype.$lwWarehouse = Warehouse
+  Vue.prototype.$lwPermissions = Permissions
+  Vue.prototype.$lwTabBar = TabBar
+  Vue.prototype.$lwRouteInit = RouteInit
+  Vue.prototype.$lwUUID = UUID
+  Vue.prototype.$lwAppBack = AppBack
+  Vue.prototype.$lwBarcodeResolve = BarcodeResolve
+  Vue.prototype.$lwDialog = lwDialog.call(Vue.prototype)
+  Vue.prototype.$lwTimezone = Timezone
+  Vue.prototype.$lwUtils = Utils
+}

package/src/utils/windowGlobalData.js

@@ -42,7 +42,33 @@ export function lwWindowGlobalData(){
       data:{}
     },
     // app返回的路由
-    appBackRoute:[]
+    appBackRoute:[],
+    // 时区
+    timezone: {
+      'UTC': {timezone: 'UTC', offset: 0},
+      'UTC+1': {timezone: 'UTC+1', offset: 60},
+      'UTC+2': {timezone: 'UTC+2', offset: 120},
+      'UTC+3': {timezone: 'UTC+3', offset: 180},
+      'UTC+4': {timezone: 'UTC+4', offset: 240},
+      'UTC+5': {timezone: 'UTC+5', offset: 300},
+      'UTC+6': {timezone: 'UTC+6', offset: 360},
+      'UTC+7': {timezone: 'UTC+7', offset: 420},
+      'UTC+8': {timezone: 'UTC+8', offset: 480},
+      'UTC+9': {timezone: 'UTC+9', offset: 540},
+      'UTC+10': {timezone: 'UTC+10', offset: 600},
+      'UTC+11': {timezone: 'UTC+11', offset: 660},
+      'UTC-1': {timezone: 'UTC-1', offset: -60},
+      'UTC-2': {timezone: 'UTC-2', offset: -120},
+      'UTC-3': {timezone: 'UTC-3', offset: -180},
+      'UTC-4': {timezone: 'UTC-4', offset: -240},
+      'UTC-5': {timezone: 'UTC-5', offset: -300},
+      'UTC-6': {timezone: 'UTC-6', offset: -360},
+      'UTC-7': {timezone: 'UTC-7', offset: -420},
+      'UTC-8': {timezone: 'UTC-8', offset: -480},
+      'UTC-9': {timezone: 'UTC-9', offset: -540},
+      'UTC-10': {timezone: 'UTC-10', offset: -600},
+      'UTC-11': {timezone: 'UTC-11', offset: -660},
+    }
   }
 
   // 初始化时获取本地储存的仓库信息