@logwire/logwire-wms-pda-ui 3.1.0 → 3.1.1

package/src/components/ui/NoticeBar/index.vue

@@ -21,7 +21,6 @@
 </template>
 
 <script>
-import {lwCloseNoticeBar} from "./index";
 
 /* 注意此组件不能使用 this.$XXX 的方法，因为没有注册组件是通过指令调用的 */
 
@@ -61,7 +60,7 @@ export default {
 
     // 手动关闭
     closeClick(){
-      lwCloseNoticeBar()
+      this.$lwCloseNoticeBar()
     },
 
     // 关闭弹框

package/src/directive/Permissions.js

@@ -5,7 +5,7 @@
 * */
 
 import {Permissions} from "../utils/Permissions";
-import {lwShowErrorMsg} from "../components/ui/ErrorMsg";
+import {lwErrMsg} from "../components/ui/ErrorMsg";
 
 export default {
   inserted(el, binding) {
@@ -26,7 +26,7 @@ export default {
         el.parentNode && el.parentNode.removeChild(el)
       }
     } else {
-      lwShowErrorMsg('权限校验失败，请检查传入数据是否正确')
+      lwErrMsg.show('权限校验失败，请检查传入数据是否正确')
       throw new Error(
           "权限校验失败，请检查传入数据是否正确! 像这样使用：<div v-permission=\"['admin','editor']\"></div>"
       )

package/src/utils/Axios.js

@@ -5,11 +5,11 @@
 * @date 2022-02-10
 * */
 
-import Axios from 'axios';
+import {axios} from "@bundled-es-modules/axios";
 import {ApiUtils} from "./ApiUtils";
 import {Warehouse} from "./Warehouse";
-import {lwShowErrorMsg} from "../components/ui/ErrorMsg";
-import {lwShowLoading, lwCloseLoading} from "../components/ui/Loading";
+import {lwErrMsg} from "../components/ui/ErrorMsg";
+import {lwLoading} from "../components/ui/Loading";
 import {Language} from "./Language";
 import {LocalStorage} from "./LocalStorage";
 import {Timezone} from "./Timezone";
@@ -17,7 +17,7 @@ import {Timezone} from "./Timezone";
 // 用于自定义处理http报错的问题，为false时候不显示报错信息，直接返回错误信息，通过catch接收
 let errGetMe = false
 
-const lwAxios = Axios.create({
+const lwAxios = axios.create({
   baseURL: import.meta.env.VITE_APP_BASE_URL,
   timeout: 1000 * 60 * 30,
 })
@@ -112,7 +112,7 @@ lwAxios.interceptors.request.use(
 
     // 判断是否显示加载框
     if (config.loading || config.loading === undefined){
-      lwShowLoading()
+      lwLoading.show()
     }
 
     // 记录当前请求是否需要手动处理报错
@@ -121,7 +121,7 @@ lwAxios.interceptors.request.use(
     return config
   },
   error => {
-    lwCloseLoading()
+    lwLoading.close()
     console.error('请求异常: ', error)
     return Promise.reject(error)
   }
@@ -131,7 +131,7 @@ lwAxios.interceptors.request.use(
 lwAxios.interceptors.response.use(
   response => {
 
-    lwCloseLoading()
+    lwLoading.close()
 
     let result = response.data
     if (!result || !['none', 'success'].includes(result.code)) {
@@ -151,7 +151,7 @@ lwAxios.interceptors.response.use(
   },
   error => {
 
-    lwCloseLoading()
+    lwLoading.close()
     console.error('接口返回异常: ', error)
 
     let resp = error.response
@@ -164,19 +164,19 @@ lwAxios.interceptors.response.use(
     if (resp){
       if (resp.status === 401) {
         ApiUtils.setToken(undefined)
-        lwShowErrorMsg({ message: Language.get('wms_project.pda.utils.axios.loginOvertime', '登录超时，请重新登录') })
+        lwErrMsg.show({ message: Language.get('wms_project.pda.utils.axios.loginOvertime', '登录超时，请重新登录') })
         ApiUtils.delToken()
         history.go(0)
         return Promise.reject(resp)
       }
 
       if (resp.status === 404){
-        lwShowErrorMsg({ message: Language.get('wms_project.pda.utils.axios.serveError', '请求失败，接口路径错误(404)') })
+        lwErrMsg.show({ message: Language.get('wms_project.pda.utils.axios.serveError', '请求失败，接口路径错误(404)') })
         return Promise.reject(resp)
       }
 
       if (resp.data) {
-        lwShowErrorMsg({
+        lwErrMsg.show({
           message: resp.data && resp.data.message ?
             resp.data.message :
             Language.get('wms_project.pda.utils.axios.unknownError', '未知错误（可能是系统正在升级或异常）请稍后再试')
@@ -186,7 +186,7 @@ lwAxios.interceptors.response.use(
 
     }
 
-    lwShowErrorMsg({message: Language.get('wms_project.pda.utils.axios.network', '请求失败，请检查网络连接')})
+    lwErrMsg.show({message: Language.get('wms_project.pda.utils.axios.network', '请求失败，请检查网络连接')})
     return Promise.reject(resp)
   }
 )

package/src/utils/BarcodeResolve.js

@@ -5,7 +5,7 @@
 * */
 
 import {common} from "../api/common/common";
-import {lwShowErrorMsg} from "../components/ui/ErrorMsg";
+import {lwErrMsg} from "../components/ui/ErrorMsg";
 import {DateTime} from "luxon";
 import {Language} from "./Language";
 
@@ -181,7 +181,7 @@ export const BarcodeResolve = {
     const {componentId, barcode, ownerId, createRule} = param
 
     if (!componentId){
-      lwShowErrorMsg(
+      lwErrMsg.show(
         Language.get('wms_project.pda.utils.BarcodeResolve.qemvmsdn','获取条码解析规则失败，未指定输入框解析ID')
       )
       return {
@@ -217,7 +217,7 @@ export const BarcodeResolve = {
         }
 
       }else {
-        lwShowErrorMsg(
+        lwErrMsg.show(
           Language.get('wms_project.pda.utils.BarcodeResolve.bmkxoyxk','获取条码解析规则失败，未获取到解析规则。输入框解析ID：')+ componentId
         )
         return {
@@ -272,7 +272,7 @@ export const BarcodeResolve = {
         ) {
 
           if (!typeResolvers.primaryValid || !typeResolvers.primaryValid.field){
-            lwShowErrorMsg(
+            lwErrMsg.show(
                 Language.get('wms_project.pda.utils.BarcodeResolve.stpryqma','主字段配置有误，请联系管理员重新配置')
             )
             return {
@@ -309,7 +309,7 @@ export const BarcodeResolve = {
 
 
     // 走到这就是所有解析规则都没过了且没有使用默认规则
-    lwShowErrorMsg(
+    lwErrMsg.show(
       Language.get('wms_project.pda.utils.BarcodeResolve.agyiotes','条码解析失败！输入框ID：') + componentId
     )
 

package/src/utils/Print.js

@@ -7,9 +7,9 @@
 import {AppPower} from "./AppPower";
 import {lwToast} from "./Toast";
 import {print} from "../api/common/Print";
-import {lwCloseLoading, lwShowLoading} from "../components/ui/Loading";
-import {lwShowErrorMsg} from "../components/ui/ErrorMsg";
-import {lwShowNoticeBar} from "../components/ui/NoticeBar";
+import {lwLoading} from "../components/ui/Loading";
+import {lwErrMsg} from "../components/ui/ErrorMsg";
+import {lwNoticeBar} from "../components/ui/NoticeBar";
 import {Language} from "./Language";
 
 export const Print = {
@@ -87,7 +87,7 @@ export const Print = {
       }
     }
     const message = msg + Language.get('','打印模板未配置！请前往【打印设置栏】配置模板。模板编码：') + templateCode
-    needWarn ? lwShowErrorMsg(message) : lwShowNoticeBar({message, showTime: 8, type:'warning'})
+    needWarn ? lwErrMsg.show(message) : lwNoticeBar.show({message, showTime: 8, type:'warning'})
     return {success: false, printData: {}}
   },
 
@@ -112,11 +112,11 @@ export const Print = {
 
     if (!taskId && !taskNo) {
       msg = Language.get('wms_project.pda.utils.print.error', '打印数据有误')
-      lwShowErrorMsg(msg)
+      lwErrMsg.show(msg)
       throw new Error(msg)
     }
 
-    lwShowLoading(Language.get('wms_project.pda.utils.print.printing', '正在打印') + '...')
+    lwLoading.show(Language.get('wms_project.pda.utils.print.printing', '正在打印') + '...')
 
     try {
       await this.asyncGeyPrintData({
@@ -128,7 +128,7 @@ export const Print = {
         billStatusList,
       })
 
-      lwCloseLoading()
+      lwLoading.close()
 
       lwToast.success({
         message: Language.get('wms_project.pda.utils.print.success', '打印成功'),
@@ -137,9 +137,9 @@ export const Print = {
     }catch (e){
       console.log(e,'方法错误')
       if (e.msg){
-        lwShowErrorMsg(e.msg)
+        lwErrMsg.show(e.msg)
       }
-      lwCloseLoading()
+      lwLoading.close()
       throw new Error(e)
     }
 

package/src/utils/index.js

@@ -7,8 +7,8 @@
 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 {lwLoading} from "../components/ui/Loading"
+import {lwErrMsg} from "../components/ui/ErrorMsg"
 import lwAxios from './Axios'
 import {GetImgSrc} from "./GetImgSrc";
 import {lwToast} from "./Toast";
@@ -32,7 +32,7 @@ import {BarcodeResolve} from "./BarcodeResolve";
 import {lwDialog} from "./Dialog";
 import {Timezone} from "./Timezone";
 import {Utils} from "./Utils";
-import {lwCloseNoticeBar, lwShowNoticeBar} from "../components/ui/NoticeBar";
+import {lwNoticeBar} from "../components/ui/NoticeBar";
 
 
 
@@ -40,12 +40,12 @@ 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.$lwShowNoticeBar = lwShowNoticeBar
-  Vue.prototype.$lwCloseNoticeBar = lwCloseNoticeBar
-  Vue.prototype.$lwCloseErrorMsg = lwCloseErrorMsg
+  Vue.prototype.$lwShowLoading = lwLoading.show
+  Vue.prototype.$lwCloseLoading = lwLoading.close
+  Vue.prototype.$lwShowErrorMsg = lwErrMsg.show
+  Vue.prototype.$lwCloseErrorMsg = lwErrMsg.close
+  Vue.prototype.$lwShowNoticeBar = lwNoticeBar.show
+  Vue.prototype.$lwCloseNoticeBar = lwNoticeBar.close
   Vue.prototype.$lwAxios = lwAxios
   Vue.prototype.$lwGetImgSrc = GetImgSrc
   Vue.prototype.$lwToast = lwToast