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

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

@@ -1,36 +1,36 @@
-<!--
-  @name: 表单
-  @description: -
-  @author 张文
-  @date: 2022-01-25
--->
-<template>
-  <form @submit="submit">
-    <slot></slot>
-  </form>
-</template>
-
-<script>
-
-export default {
-  name: "lwForm",
-  data() {
-    return {}
-  },
-  methods: {
-    submit(ev){
-      const form = ev.target.getElementsByTagName('input')
-      let data={}
-      for (let i=0;i<form.length;i++){
-        data[form[i].name] = form[i].value
-      }
-      ev.preventDefault();
-      this.$emit('submit', data)
-    }
-  }
-}
-</script>
-
-<style scoped lang="less">
-
-</style>
+<!--
+  @name: 表单
+  @description: -
+  @author 张文
+  @date: 2022-01-25
+-->
+<template>
+  <form @submit="submit">
+    <slot></slot>
+  </form>
+</template>
+
+<script>
+
+export default {
+  name: "lwForm",
+  data() {
+    return {}
+  },
+  methods: {
+    submit(ev){
+      const form = ev.target.getElementsByTagName('input')
+      let data={}
+      for (let i=0;i<form.length;i++){
+        data[form[i].name] = form[i].value
+      }
+      ev.preventDefault();
+      this.$emit('submit', data)
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/components/ui/ImgLook/index.js

@@ -1,5 +1,5 @@
-import lwImgLook from './index.vue'
-
-lwImgLook.install = Vue => Vue.component(lwImgLook.name, lwImgLook)
-
-export default lwImgLook
+import lwImgLook from './index.vue'
+
+lwImgLook.install = Vue => Vue.component(lwImgLook.name, lwImgLook)
+
+export default lwImgLook

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

@@ -39,6 +39,11 @@ export default {
     showBigImg:{
       type:Boolean,
       default:true
+    },
+    // 是否需要通过接口获取图片地址
+    apiGatSrc:{
+      type: Boolean,
+      default: true
     }
   },
   watch:{
@@ -70,9 +75,13 @@ export default {
 
     getUrl(){
       this.imgArr=[]
-      GetImgSrc.asyncGet(this.imgList.join('|')).then(arr=>{
-        this.imgArr=arr
-      })
+      if (this.apiGatSrc) {
+        GetImgSrc.asyncGet(this.imgList.join('|')).then(arr=>{
+          this.imgArr=arr
+        })
+      }else {
+        this.imgArr=this.imgList
+      }
     }
   }
 }

package/src/components/ui/ImgUpload/index.js

@@ -1,12 +1,12 @@
-/*
-* 图片上传组件的暴露出口
-* @author 张文
-* @date  2022-01-19
-* */
-
-import lwImgUpload from './index.vue'
-
-lwImgUpload.install = Vue => Vue.component(lwImgUpload.name, lwImgUpload)
-
-export default lwImgUpload
-
+/*
+* 图片上传组件的暴露出口
+* @author 张文
+* @date  2022-01-19
+* */
+
+import lwImgUpload from './index.vue'
+
+lwImgUpload.install = Vue => Vue.component(lwImgUpload.name, lwImgUpload)
+
+export default lwImgUpload
+

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

@@ -93,7 +93,7 @@ export default {
 
       }catch (err){
 
-        console.warn('图片上传异常：', err)
+        console.error('图片上传异常：', err)
 
         file.status = 'failed'
         file.message = this.$lwLanguage.get('wms_project.pda.component.imgUpload.uploadFail', '上传失败');

package/src/components/ui/ImgUpload/request.js

@@ -1,39 +1,39 @@
-import axios from 'axios'
-
-// create an axios instance
-const service = axios.create({
-  baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
-  // withCredentials: true, // send cookies when cross-domain requests
-  timeout: 300000 // request timeout
-})
-service.setBaseUrl = url => service.defaults.baseURL = url
-// request interceptor
-service.interceptors.request.use(
-  config => {
-    return config
-  },
-  error => {
-    // do something with request error
-    console.log(error) // for debug
-    return Promise.reject(error)
-  }
-)
-
-// response interceptor
-service.interceptors.response.use(
-  response => {
-    const res = response.data
-
-    // if the custom code is not 0, it is judged as an error.
-    if (res.code && res.code !== '0') {
-      return Promise.reject(new Error(res.msg || '接口code校验失败，返回了非0字符，被接口拦截'))
-    } else {
-      return res
-    }
-  },
-  error => {
-    return Promise.reject(error)
-  }
-)
-
-export default service
+import axios from 'axios'
+
+// create an axios instance
+const service = axios.create({
+  baseURL: import.meta.env.VITE_APP_BASE_URL, // url = base url + request url
+  // withCredentials: true, // send cookies when cross-domain requests
+  timeout: 300000 // request timeout
+})
+service.setBaseUrl = url => service.defaults.baseURL = url
+// request interceptor
+service.interceptors.request.use(
+  config => {
+    return config
+  },
+  error => {
+    // do something with request error
+    console.log(error) // for debug
+    return Promise.reject(error)
+  }
+)
+
+// response interceptor
+service.interceptors.response.use(
+  response => {
+    const res = response.data
+
+    // if the custom code is not 0, it is judged as an error.
+    if (res.code && res.code !== '0') {
+      return Promise.reject(new Error(res.msg || '接口code校验失败，返回了非0字符，被接口拦截'))
+    } else {
+      return res
+    }
+  },
+  error => {
+    return Promise.reject(error)
+  }
+)
+
+export default service

package/src/components/ui/Input/index.js

@@ -1,5 +1,5 @@
-import lwInput from './index.vue'
-
-lwInput.install = Vue => Vue.component(lwInput.name, lwInput)
-
-export default lwInput
+import lwInput from './index.vue'
+
+lwInput.install = Vue => Vue.component(lwInput.name, lwInput)
+
+export default lwInput

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

@@ -38,7 +38,7 @@
         <img
           v-if="showKeyboard && !disabled && !readonly"
           class="lw-input-img"
-          :src="require('../../../assets/img/lwInputIcon/keyboard.png')"
+          src="../../../assets/img/lwInputIcon/keyboard.png"
           alt="键盘"
           @click="keyboardClick"
           @dblclick="dblclickKeyboard"
@@ -118,7 +118,6 @@
 </template>
 
 <script>
-
 export default {
   name: "lwInput",
   props:{
@@ -267,7 +266,19 @@ export default {
     decimalScale:{
       type: Number,
       default: 0
-    }
+    },
+
+    /*
+    * 条码解析如果id不存在自主生成所需的数据，数据应当包含
+    * {
+    *   name: 规则名称,
+    *   appCode: 所属项目,
+    *   moduleName: 所属模块,
+    *   bizType: 规则类型,
+    *   defaultBizType: 默认规则
+    * }
+    * */
+    ruleProductionData: Object
   },
   computed:{
     // 输入框实际绑定的值
@@ -304,7 +315,7 @@ export default {
       // 用于禁止弹出键盘的零时标识
       readonlyInp:false,
       // 是否通过点击键盘
-      isClickKeyboard:false
+      isClickKeyboard:false,
     }
   },
   mounted() {
@@ -360,6 +371,7 @@ export default {
 
     // 失去焦点事件
     inputBlur(){
+      if (this.val) this.val = this.val.trim()
       this.$emit('update:getFocus', false)
     },
 
@@ -380,17 +392,24 @@ export default {
     },
 
     // 点击回车
-    confirm(){
-      let obj={},val = this.val
+    async confirm(){
 
-      if (this.ruleKey){
+      let obj={}, val = this.val, componentId = ''
 
-        const prefix = this.rulePrefix || this.$route.path
+      // 去除空格
+      if (val) val = val.trim()
+
+
+      // 如果配置了解析规则，但是输入内容为空就不触发解析
+      if (this.ruleKey && val){
 
-        obj = this.$lwBarcodeResolve.resolve({
-          componentId: prefix + '/' + this.ruleKey,
+        const prefix = this.rulePrefix || this.$route.path
+        componentId = prefix + '/' + this.ruleKey
+        obj = await this.$lwBarcodeResolve.resolve({
+          componentId,
           barcode: this.val,
-          ...this.ruleServeQuery
+          ...this.ruleServeQuery,
+          ruleProductionData: this.ruleProductionData
         })
 
         // 如果解析失败就不触发任何事件并清空输入框
@@ -399,31 +418,47 @@ export default {
           return
         }
 
+        // 回填数据
         if (this.ruleValueKey){
-          val = obj.data[this.ruleValueKey] || '-'
+          val = obj.data[this.ruleValueKey]
+
+          //如果无法获取回填数据就认为解析失败
+          if (!val){
+
+            this.$lwShowErrorMsg(
+              this.$lwLanguage.get(
+                'wms_project.pda.components.ui.Input.index.cbomgodq',
+                '解析失败！无法获取字段【{key}】的值，请检查规则是否配置正确！输入框ID：',{key:this.ruleValueKey}
+              ) + componentId
+            )
+            this.clearClick()
+            return
+          }
+
         }
       }
 
-
+      // 是否需要清空输入框
       if (this.autoClearVal){
         this.clearClick()
       }else {
         this.val = val
       }
 
+      // 输入框是否需要失去焦点
       if (this.inputOverBlur){
         this.inputBlur()
       }
+
+      // 触发震动
       this.$lwAppPower.shortVibrate(500)
+
       this.$emit('confirm', val, obj)
     },
 
     input(){
       let val = this.$refs.lwInput.value
 
-      // 去除空格
-      val = val.trim()
-
       // 整数
       if (this.type === 'digit'){
         val = val.replace(/\D/g, '')

package/src/components/ui/Input//350/276/223/345/205/245/346/241/206.md

@@ -1 +1 @@
-# 输入框 [查看文档](https://www.yuque.com/docs/share/58281a3a-8b0d-4b99-b96a-bb67d9e684b2)
+# 输入框 [查看文档](https://www.yuque.com/docs/share/58281a3a-8b0d-4b99-b96a-bb67d9e684b2)

package/src/components/ui/Loading/index.js

@@ -44,6 +44,6 @@ export const lwCloseLoading = () => {
       if (toastNew.loading <=0) toastNew.loading = 0
     }
   }catch (err){
-    console.warn('关闭加载框出错', err)
+    console.error('关闭加载框出错', err)
   }
 }

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

@@ -1,61 +1,61 @@
-<!--
-  @name: 加载框
-  @description: -
-  @author 张文
-  @date: 2022-01-24
--->
-<template>
-  <div class="lw-global-flex-center lw-loading" v-if="loading > 0">
-    <div class="lw-global-flex-center lw-loading-block">
-      <span class="van-loading__spinner van-loading__spinner--circular" style="width: 24px; height: 24px;">
-        <svg viewBox="25 25 50 50" class="van-loading__circular">
-          <circle cx="50" cy="50" r="20" fill="none"></circle>
-        </svg>
-      </span>
-      <div style="margin-top: 5px">{{ msg || $lwLanguage.get('wms_project.pda.common.loading', '加载中') + '...' }}</div>
-    </div>
-  </div>
-</template>
-
-<script>
-
-export default {
-  name: "lwLoading",
-  data() {
-    return {
-      msg:'',
-      loading:0
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-
-
-@import "../../../assets/css/var.less";
-
-.lw-loading {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 2147483583;
-  background-color: rgba(0, 0, 0, 0.1);
-  color: #fff;
-  font-size: 12px;
-
-  &-block {
-    padding: 16px;
-    border-radius: 8px;
-    width: 88px;
-    max-width: 70%;
-    min-height: 88px;
-    background-color: #4f4f4f;
-    flex-direction: column;
-  }
-}
-
-
-</style>
+<!--
+  @name: 加载框
+  @description: -
+  @author 张文
+  @date: 2022-01-24
+-->
+<template>
+  <div class="lw-global-flex-center lw-loading" v-if="loading > 0">
+    <div class="lw-global-flex-center lw-loading-block">
+      <span class="van-loading__spinner van-loading__spinner--circular" style="width: 24px; height: 24px;">
+        <svg viewBox="25 25 50 50" class="van-loading__circular">
+          <circle cx="50" cy="50" r="20" fill="none"></circle>
+        </svg>
+      </span>
+      <div style="margin-top: 5px">{{ msg || $lwLanguage.get('wms_project.pda.common.loading', '加载中') + '...' }}</div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "lwLoading",
+  data() {
+    return {
+      msg:'',
+      loading:0
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+
+
+@import "../../../assets/css/var.less";
+
+.lw-loading {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 2147483583;
+  background-color: rgba(0, 0, 0, 0.1);
+  color: #fff;
+  font-size: 12px;
+
+  &-block {
+    padding: 16px;
+    border-radius: 8px;
+    width: 88px;
+    max-width: 70%;
+    min-height: 88px;
+    background-color: #4f4f4f;
+    flex-direction: column;
+  }
+}
+
+
+</style>

package/src/components/ui/MenuItem/index.js

@@ -1,5 +1,5 @@
-import lwMenuItem from './index.vue'
-
-lwMenuItem.install = Vue => Vue.component(lwMenuItem.name, lwMenuItem)
-
-export default lwMenuItem
+import lwMenuItem from './index.vue'
+
+lwMenuItem.install = Vue => Vue.component(lwMenuItem.name, lwMenuItem)
+
+export default lwMenuItem