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

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

@@ -1,22 +1,31 @@
 <!--
-  看板背景图
+  数据看板
   @author: 张文
   @date: 2022-05-06
 -->
 <template>
   <div
     :class="[
-      'lw-global-flex-center',
+      'lw-global-flex-around',
+      'lw-look-data-bg-boss',
       clickStyle ? 'lw-global-click-style' : '',
-      'lw-look-img-bg'
+      type !== 'null' ? 'lw-look-data-bg-box' : '',
+      `lw-look-data-bg-` + type
     ]"
     @click="$emit('click')"
   >
-    <img :src="imgSrc" alt="" class="lw-look-img">
 
-    <div class="lw-global-flex-around lw-look-box">
-      <slot></slot>
+    <div
+      v-for="(i,k) in showDate"
+      :key="k"
+      :style="{color: i.color}"
+    >
+      <div>{{ i.value || 0 }}</div>
+      <div>{{ i.title }}</div>
     </div>
+
+    <slot></slot>
+
   </div>
 </template>
 
@@ -25,26 +34,32 @@
 export default {
   name: "lwDataLookBg",
   props:{
-    // 背景图样式 all - 全圆角，bottom - 底部圆角，not - 没有圆角
+    // 背景图样式 all - 全圆角，bottom - 底部圆角，top - 顶部圆角，not - 没有圆角，null - 不要背景色
     type:{
       type: String,
       default: 'all'
     },
     // 是否需要点击样式
-    clickStyle: Boolean
+    clickStyle: Boolean,
+
+    // 需要渲染的数据
+    data:{
+      type: [Array, Object],
+      default: () => []
+    }
   },
   computed:{
-    imgSrc(){
-      switch (this.type){
-        case 'all':
-          return require('./../../../assets/img/datalookBg/backgroundImg.png')
-        case 'bottom':
-          return require('./../../../assets/img/datalookBg/backgroundBottomRadius.png')
-        case 'not':
-          return require('./../../../assets/img/datalookBg/backgroundImgAngle.png')
-        default:
-          return require('./../../../assets/img/datalookBg/backgroundImg.png')
+    // 渲染的数据转换
+    showDate(){
+      if (Array.isArray(this.data)){
+        return this.data
       }
+
+      let arr = []
+      for (let i in this.data){
+        arr.push(this.data[i])
+      }
+      return arr
     }
   },
   data() {
@@ -55,36 +70,28 @@ export default {
 </script>
 
 <style scoped lang="less">
+@import "./../../../assets/css/var.less";
 
+.lw-look-data-bg-boss{
+  width: 100%;
+  height: 75px;
+  text-align: center;
 
-.lw-look-img-bg{
-  position: relative;
-
-  .lw-look-img{
-    width: 100%;
-  }
-
-  .lw-look-box{
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    color: #fff;
+  >div{
     text-align: center;
+    flex-grow: 1;
 
-    .lw-data-look-bg-title{
-      font-size: 12px;
-      margin-top: 3px;
-    }
-
-    >div{
-      text-align: center;
-      flex-grow: 1;
-
+    &>div{
+      &:first-child{
+        font-weight: bold;
+      }
+      &:last-child{
+        font-size: 12px;
+        margin-top: 3px;
+      }
     }
 
-    .lw-data-last-item {
+    &:last-child{
       position: relative;
 
       &::before {
@@ -101,4 +108,27 @@ export default {
   }
 }
 
+.lw-look-data-bg-box{
+  background: @lookDataBg;
+  color: #fff;
+}
+
+.lw-look-data-bg-all{
+  border-radius: 10px;
+}
+
+.lw-look-data-bg-top{
+  border-radius: 10px 10px 0 0;
+}
+
+.lw-look-data-bg-bottom{
+  border-radius: 0 0 10px 10px;
+}
+
+.lw-look-data-bg-null{
+  >div:last-child::before{
+    background: #232323;
+  }
+}
+
 </style>

package/src/components/ui/DataLookBg//346/225/260/346/215/256/347/234/213/346/235/277.md

@@ -0,0 +1 @@
+# 数据看板 [查看文档](https://www.yuque.com/docs/share/771b5926-1878-43b9-970c-a2c8b3c136ff)

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

@@ -22,7 +22,7 @@
     </div>
 
     <div class="lw-global-flex-center lw-error-msg-close" @click="offError">
-      <img :src="require('../../../assets/img/off.png')" alt="">
+      <img src="../../../assets/img/off.png" alt="">
     </div>
 
   </div>

package/src/components/ui/ErrorMsg//351/224/231/350/257/257/346/217/220/347/244/272/346/241/206.md

@@ -1 +1 @@
-# 错误提示框 [查看文档](https://www.yuque.com/docs/share/b61caffa-95c7-41a2-b434-4ca54df978fc)
+# 错误提示框 [查看文档](https://www.yuque.com/docs/share/b61caffa-95c7-41a2-b434-4ca54df978fc)

package/src/components/ui/Form//350/241/250/345/215/225.md

@@ -1 +1 @@
-# 表单 [查看文档](https://www.yuque.com/docs/share/04cc09e4-0688-4153-8391-5137585a91fe)
+# 表单 [查看文档](https://www.yuque.com/docs/share/04cc09e4-0688-4153-8391-5137585a91fe)

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
+      }
     }
   }
 }
@@ -86,7 +95,7 @@ export default {
   overflow: auto;
   flex-wrap: wrap;
 
-  /deep/.van-image{
+  :deep(.van-image){
     max-width: 100px;
     max-height: 100px;
   }

package/src/components/ui/ImgLook//345/233/276/347/211/207/346/237/245/347/234/213.md

@@ -1 +1 @@
-# 图片查看 [查看文档](https://www.yuque.com/docs/share/80720954-a6a4-42c9-9697-ace3142c99ac)
+# 图片查看 [查看文档](https://www.yuque.com/docs/share/80720954-a6a4-42c9-9697-ace3142c99ac)

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

@@ -1,37 +1,37 @@
-// 获取图片上传路径
-import axios from "../../../utils/Axios";
-import service from "./request";
-
-
-// 获取图片上传路径
-export function getUploadUrl(data){
-  return axios.action({
-    url:'commonWmsGetOssUploadUrl',
-    data
-  })
-}
-
-
-// 上传图片
-export function uploadFile({url, file, uploadMethod='put', uploadContentType}){
-  service.setBaseUrl(url)
-
-  if (uploadMethod.toLowerCase() === 'put'){
-    return service({
-      url:'',
-      method: 'put',
-      headers: { 'Content-Type': file.type },
-      data:file
-    })
-  }
-
-  let formData = new FormData()
-  formData.append('file', file)
-
-  return service({
-    url:'',
-    method: uploadMethod,
-    headers: { 'Content-Type': uploadContentType },
-    data: formData
-  })
-}
+// 获取图片上传路径
+import axios from "../../../utils/Axios";
+import service from "./request";
+
+
+// 获取图片上传路径
+export function getUploadUrl(data){
+  return axios.action({
+    url:'commonWmsGetOssUploadUrl',
+    data
+  })
+}
+
+
+// 上传图片
+export function uploadFile({url, file, uploadMethod='put', uploadContentType}){
+  service.setBaseUrl(url)
+
+  if (uploadMethod.toLowerCase() === 'put'){
+    return service({
+      url:'',
+      method: 'put',
+      headers: { 'Content-Type': file.type },
+      data:file
+    })
+  }
+
+  let formData = new FormData()
+  formData.append('file', file)
+
+  return service({
+    url:'',
+    method: uploadMethod,
+    headers: { 'Content-Type': uploadContentType },
+    data: formData
+  })
+}

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/ImgUpload//345/233/276/347/211/207/344/270/212/344/274/240.md

@@ -1 +1 @@
-# 图片上传 [查看文档](https://www.yuque.com/docs/share/9441a8df-d938-46ad-9849-a56f9551f363)
+# 图片上传 [查看文档](https://www.yuque.com/docs/share/9441a8df-d938-46ad-9849-a56f9551f363)

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

@@ -34,14 +34,13 @@
       <!-- 输入框主体 -->
       <div class="lw-global-flex-start lw-input-boss">
 
-        <!-- 键盘 -->
+        <!-- 扫码 -->
         <img
-          v-if="showKeyboard && !disabled && !readonly"
+          v-if="!disabled && !readonly"
           class="lw-input-img"
-          :src="require('../../../assets/img/lwInputIcon/keyboard.png')"
-          alt="键盘"
-          @click="keyboardClick"
-          @dblclick="dblclickKeyboard"
+          src="../../../assets/img/lwInputIcon/scanIcon.png"
+          alt="扫码"
+          @click="scanIconClick"
         >
 
         <!-- 文本域 -->
@@ -52,7 +51,7 @@
           v-model="val"
           :name="name"
           :disabled="disabled"
-          :readonly="readonly || readonlyInp"
+          :readonly="readonly"
           :rows="rows"
           :maxlength="maxlength"
           :style="{
@@ -75,7 +74,7 @@
           :value="val"
           :maxlength="maxlength"
           :disabled="disabled"
-          :readonly="readonly || readonlyInp"
+          :readonly="readonly"
           :style="{
             textAlign:inputAlign
           }"
@@ -97,7 +96,7 @@
 
         <!-- 清除按钮 -->
         <van-icon
-          v-if="showClear && !disabled && !readonly &&!readonlyInp  && val"
+          v-if="showClear && !disabled && !readonly && val"
           class="lw-input-clear"
           name="clear"
           @click="clearClick"
@@ -118,7 +117,6 @@
 </template>
 
 <script>
-
 export default {
   name: "lwInput",
   props:{
@@ -191,12 +189,6 @@ export default {
       default :false
     },
 
-    // 是否显示键盘图标
-    showKeyboard:{
-      type: Boolean,
-      default: true
-    },
-
     // 是否显示清除图标
     showClear:{
       type: Boolean,
@@ -267,7 +259,19 @@ export default {
     decimalScale:{
       type: Number,
       default: 0
-    }
+    },
+
+    /*
+    * 条码解析如果id不存在自主生成所需的数据，数据应当包含
+    * {
+    *   name: 规则名称,
+    *   appCode: 所属项目,
+    *   moduleName: 所属模块,
+    *   bizType: 规则类型,
+    *   defaultBizType: 默认规则
+    * }
+    * */
+    createRule: Object
   },
   computed:{
     // 输入框实际绑定的值
@@ -290,45 +294,43 @@ export default {
       }
 
       return this.$lwLanguage.get('wms_project.pda.common.scanInput', '请扫描或输入') + this.title
+    },
+    // 获取焦点
+    focusVal:{
+      get(){
+        return this.getFocus
+      },
+      set(v){
+        this.$emit('update:getFocus', v)
+      }
     }
   },
-  watch:{
-    getFocus:{
-      handler(n){
+  watch: {
+    getFocus: {
+      handler(n) {
         n ? this.setFocusFn() : this.setBlurFn()
       },
     }
   },
   data() {
     return {
-      // 用于禁止弹出键盘的零时标识
-      readonlyInp:false,
       // 是否通过点击键盘
-      isClickKeyboard:false
+      isClickKeyboard:false,
     }
   },
   mounted() {
-    this.getFocus && this.setFocusFn()
+    this.focusVal && this.setFocusFn()
   },
   methods: {
 
-    // 键盘单击
-    keyboardClick(){
-      this.inputFocus()
-      this.isClickKeyboard = true
-    },
-
-    // 键盘双击
-    dblclickKeyboard(){
-      if (this.openCameraScan){
-        this.val=this.$lwAppPower.scan() || ''
-
-        setTimeout(()=>{
-          if(this.val){
-            this.confirm()
-          }
-        },1)
-      }
+    // 扫描
+    scanIconClick(){
+      this.$lwAppPower.scan().then((result)=>{
+        if(result){
+          this.value = result
+          this.confirm()
+        }
+      })
     },
 
     // 点击清除按钮
@@ -342,7 +344,6 @@ export default {
 
     // 获取焦点
     setFocusFn(){
-      this.isOpenKeyboard()
       this.$refs.lwInput.focus()
     },
 
@@ -353,47 +354,46 @@ export default {
 
     // 获取焦点事件
     inputFocus(){
+      this.isOpenKeyboard()
       // 全局变量存入当前获取焦点的节点，方便后期获取焦点
       window.lwWindowGlobalData.set('input.dom',this.$refs.lwInput)
-      this.$emit('update:getFocus', true)
+      this.focusVal = true
     },
 
     // 失去焦点事件
     inputBlur(){
-      this.$emit('update:getFocus', false)
+      if (this.val) this.val = this.val.toString().trim()
+      this.focusVal = false
     },
 
-    // 是否弹出输入法
+    // 是否弹出键盘
     isOpenKeyboard(){
-      if (this.isClickKeyboard){
-        this.isClickKeyboard = false
-        return
-      }
-      if (this.notKeyboard){
-        this.readonlyInp=true
-        setTimeout(()=>{
-          this.readonlyInp=false
-        },200)
-      }else {
-        this.isKeyboard=false
+      if (this.notKeyboard) {
+        this.$lwAppPower.hideSoftInput(this)
       }
     },
 
     // 点击回车
-    confirm(){
-      let obj={},val = this.val
+    async confirm(){
 
-      // 如果配置了解析规则，但是输入内容为空就不触发任何事件
-      if (this.ruleKey && !val) return
+      let obj={data:{}}
+      let val = this.val
+      let componentId = ''
 
-      if (this.ruleKey){
+      // 去除空格
+      if (val) val = val.toString().trim()
 
-        const prefix = this.rulePrefix || this.$route.path
 
-        obj = this.$lwBarcodeResolve.resolve({
-          componentId: prefix + '/' + this.ruleKey,
-          barcode: this.val,
-          ...this.ruleServeQuery
+      // 如果配置了解析规则，但是输入内容为空就不触发解析
+      if (this.ruleKey && val){
+
+        const prefix = this.rulePrefix || this.$route.path
+        componentId = prefix + '/' + this.ruleKey
+        obj = await this.$lwBarcodeResolve.resolve({
+          componentId,
+          barcode: val,
+          ...this.ruleServeQuery,
+          createRule: this.createRule
         })
 
         // 如果解析失败就不触发任何事件并清空输入框
@@ -405,13 +405,29 @@ export default {
         // 回填数据
         if (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()
+        // this.clearClick()
+        this.val = ''
       }else {
+
         this.val = val
       }
 
@@ -429,9 +445,6 @@ export default {
     input(){
       let val = this.$refs.lwInput.value
 
-      // 去除空格
-      val = val.trim()
-
       // 整数
       if (this.type === 'digit'){
         val = val.replace(/\D/g, '')
@@ -497,7 +510,7 @@ export default {
 }
 
 .lw-input-img{
-  width: 20px;
+  width: 18px;
 }
 
 .lw-input-clear{

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//345/212/240/350/275/275/346/241/206.md

@@ -1 +1 @@
-# 加载框 [查看文档](https://www.yuque.com/docs/share/f5e6d983-e7ec-44dc-84db-261e9847cf93)
+# 加载框 [查看文档](https://www.yuque.com/docs/share/f5e6d983-e7ec-44dc-84db-261e9847cf93)