@logwire/logwire-wms-pda-ui 3.4.0 → 3.5.0

package/src/components/ImgLook/index.vue

@@ -14,6 +14,11 @@
       :src="i"
       @click="showBig(k)"
     />
+    <div
+      v-if="domId"
+      :id="domId"
+      :style="{zIndex:domZIndex}"
+    ></div>
   </div>
 </template>
 
@@ -59,17 +64,24 @@ export default {
   },
   data() {
     return {
-      imgArr: []
+      imgArr: [],
+      domId: '',
+      domZIndex: 1,
     }
   },
+  mounted() {
+    this.domId = 'domId' + Date.now()
+  },
   methods: {
     showBig(index) {
       this.$emit('click', index, this.imgArr[index])
       if (!this.showBigImg) return
+      this.domZIndex = this.$lwUtils.getMaxZIndex()
       ImagePreview({
         images: this.imgArr,
         startPosition: index,
         closeable: true,
+        getContainer: '#' + this.domId
       });
     },
 
@@ -95,7 +107,7 @@ export default {
   overflow: auto;
   flex-wrap: wrap;
 
-  :deep(.van-image) {
+  /deep/ .van-image {
     max-width: 100px;
     max-height: 100px;
   }

package/src/components/Input/index.vue

@@ -108,7 +108,10 @@
         <div class="lw-input-border"></div>
 
         <!-- 按钮插槽 -->
-        <div v-if="!!$slots.button" class="lw-input-button-box">
+        <div
+          v-if="$slots.button"
+          class="lw-input-button-box"
+        >
           <slot name="button"></slot>
         </div>
       </div>
@@ -228,25 +231,6 @@ export default {
       default: false
     },
 
-    // 扫码解析规则
-    ruleKey: String,
-
-    // 条码解析规则前缀，不传默认使用路由地址+ruleKey
-    rulePrefix: String,
-
-    // 扫码解析后输入框回填字段的key
-    ruleValueKey: {
-      type: String,
-      default: 'key'
-    },
-
-    // 解码的额外参数
-    ruleServeQuery: {
-      type: Object,
-      default: () => {
-      }
-    },
-
     // 是否显示扫描图标
     showScanIcon: {
       type: Boolean,
@@ -281,7 +265,29 @@ export default {
     *   defaultBizType: 默认规则
     * }
     * */
-    createRule: Object
+    createRule: Object,
+    // 货主id
+    ownerId: null,
+    // 扫码解析规则
+    ruleKey: String,
+    // 条码解析规则前缀，不传默认使用路由地址+ruleKey
+    rulePrefix: String,
+    // 扫码解析后输入框回填字段的key
+    ruleValueKey: {
+      type: String,
+      default: 'key'
+    },
+    // 解码的额外参数
+    ruleServeQuery: {
+      type: Object,
+      default: () => {
+      }
+    },
+    // 是否保存当前获取焦点的状态
+    saveFocusStatus: {
+      type: Boolean,
+      default: true
+    }
   },
   computed: {
     // 输入框实际绑定的值
@@ -335,18 +341,11 @@ export default {
         timeout: null
       },
 
-      // 组件解析id
-      componentId: null,
-
     }
   },
   mounted() {
     this.focusVal && this.setFocusFn()
 
-    if (this.ruleKey) {
-      this.componentId = (this.rulePrefix || this.$route.path) + '/' + this.ruleKey
-    }
-
   },
   methods: {
 
@@ -363,13 +362,17 @@ export default {
 
     // 点击清除按钮
     clearClick() {
+      this.clearVal()
+      this.$emit('clear')
+    },
+    // 点击清除
+    clearVal() {
       this.val = ''
       this.$refs.lwInput.value = ''
-      this.input()
       this.$refs.lwInput.focus()
-      this.$emit('clear')
     },
 
+
     // 获取焦点
     setFocusFn() {
       this.$refs.lwInput.focus()
@@ -384,7 +387,7 @@ export default {
     inputFocus() {
       this.isOpenKeyboard()
       // 全局变量存入当前获取焦点的节点，方便后期获取焦点
-      window.lwWindowGlobalData.set('input.dom', this.$refs.lwInput)
+      window.lwWindowGlobalData.set('input.dom', this.saveFocusStatus ? this.$refs.lwInput : null)
       this.focusVal = true
     },
 
@@ -416,45 +419,42 @@ export default {
 
 
       // 如果配置存在解析id，且输入框有值时触发解析
-      if (this.componentId && val) {
+      if (this.ruleKey && val) {
+
+        const componentId = (this.rulePrefix || this.$route.path) + '/' + this.ruleKey
+
+        let hasFocus = false
+        if (this.focusVal) {
+          hasFocus = true
+          this.focusVal = false
+        }
 
         obj = await this.$lwBarcodeResolve.resolve({
-          componentId: this.componentId,
+          componentId,
           barcode: val,
-          ...this.ruleServeQuery,
-          createRule: this.createRule
+          createRule: this.createRule,
+          args: this.ruleServeQuery,
+          ownerId: this.ownerId
         })
 
+        if (hasFocus) this.focusVal = true
+
         // 如果解析失败就不触发任何事件并清空输入框
         if (!obj.success) {
-          this.clearClick()
+          this.clearVal()
           return
         }
 
-        // 回填数据
+        // 回填数据 当所需值不存在时，取key
         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}
-              ) + this.componentId
-            )
-            this.clearClick()
-            return
-          }
-
+          val = obj.data[this.ruleValueKey] || obj.data.key
         }
       }
 
       // 是否需要清空输入框
-      if (this.autoClearVal) {
-        // this.clearClick()
-        this.val = ''
+      if (this.autoClearVal || obj.autoClear) {
+        this.clearVal()
+        // this.val = ''
       } else {
 
         this.val = val
@@ -520,17 +520,20 @@ export default {
       // 显示当前输入框解析id
       if (this.clickData.num >= 10) {
 
-        const message = this.componentId ?
-          this.$lwLanguage.get('wms_project.pda.components.Input.index.yhrktchj', '当前输入框解析ID为：') + this.componentId :
+        const componentId = (this.rulePrefix || this.$route.path) + '/' + this.ruleKey
+
+        const message = this.ruleKey ?
+          this.$lwLanguage.get('wms_project.pda.components.Input.index.yhrktchj', '当前输入框解析ID为：') + componentId :
           this.$lwLanguage.get('wms_project.pda.components.Input.index.nwiaoput', '当前输入框未配置解析ID')
 
 
         this.$lwDialog.confirm({
+          type: this.ruleKey ? 'success' : 'warning',
           message,
           confirmButtonText: this.$lwLanguage.get('wms_project.pda.components.Input.index.amytwqyl', '复制ID'),
-          showConfirmButton: !!this.componentId
+          showConfirmButton: !!this.ruleKey
         }).then(() => {
-          navigator.clipboard.writeText(this.componentId).then(() => {
+          navigator.clipboard.writeText(componentId).then(() => {
             this.$lwToast.success(
               this.$lwLanguage.get('wms_project.pda.components.Input.index.pzencdqg', '已复制')
             )
@@ -557,7 +560,7 @@ export default {
 .lw-input-box {
   font-size: 14px;
   overflow: hidden;
-  padding: 5px 0;
+  padding: 2px 0;
 }
 
 .lw-input-title {
@@ -579,6 +582,7 @@ export default {
 
 .lw-input-img {
   width: 18px;
+  padding: 5px;
 }
 
 .lw-input-clear {
@@ -628,8 +632,8 @@ export default {
 }
 
 .lw-input-button-box {
-  padding-left: 8px;
   flex-shrink: 0;
+  margin-left: 5px;
 }
 
 </style>

package/src/components/LabelValueGroup/cellTag.vue

@@ -0,0 +1,81 @@
+<!--
+  显示行或标签
+  @author: 张文
+  @date: 2023-11-15
+-->
+<template>
+  <div>
+    <lw-title-value-cell
+      v-if="item.type==='LV'"
+      :title="item[labelKey]"
+      :value="getValue(item)"
+      :val-red="item.valRed"
+      :val-bold="item.valBold"
+      :val-style="item.valueStyle"
+      :title-style="item.labelStyle"
+      :is-row="false"
+    />
+
+    <div
+      v-if="item.type==='TAG'"
+      style="flex-shrink: 0"
+    >
+      <lw-tag
+        v-for="(tag,tagKey) in item.tagList"
+        :key="'tag'+tagKey"
+        :type="tag.type || 'primary'"
+        :plain="tag.plain !== false"
+        :round="tag.round !== false"
+      >
+        {{ tag.tag }}
+      </lw-tag>
+    </div>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "cellTag",
+  props: {
+    item: {
+      type: Object,
+      default: () => {
+      }
+    },
+    // label取值key
+    labelKey: {
+      type: String,
+      default: 'label'
+    },
+    // value取值key
+    valueKey: {
+      type: String,
+      default: 'value'
+    },
+  },
+  data() {
+    return {}
+  },
+  methods: {
+
+
+    // 获取显示值
+    getValue(item) {
+      switch (item.valueType) {
+        case 'datetime':
+          return this.$lwTimezone.UTCToTimezone({
+            date: item[this.valueKey],
+            format: item.formatMethod || 'yyyy-MM-dd hh:mm:ss'
+          })
+        default:
+          return item[this.valueKey]
+      }
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/components/LabelValueGroup/index.vue

@@ -6,31 +6,72 @@
 <template>
   <div
     :class="[
-      showModelStyle && 'lw-global-model-box',
-      !showRow && 'lw-global-row-box',
+      (showModelStyle && list.length) && 'lw-global-model-box',
+      !showRowStyle && 'lw-global-row-box',
     ]"
+    @click="$emit('click')"
   >
 
-    <lw-title-value-cell
+    <div
       v-for="(i,k) in list"
       :key="k"
-      :title="i[labelKey]"
-      :value="i[valueKey]"
-      :val-bold="valBold"
-      :val-red="valRed"
-      :is-row="showRowStyle"
-      :is-row-start="k===0 && showRowStyle && showStartRowStyle"
-      :is-row-end="(k+1)===list.length && showRowStyle && showEndRowStyle"
-    />
+      :class="[
+        'lw-global-flex-between',
+        getRowClass(k)
+      ]"
+    >
+      <template v-for="(item,key) in i">
+
+        <div
+          v-if="item.type === 'JOIN'"
+          :key="'inner'+key"
+          class="lw-global-flex-start"
+        >
+          <template v-for="(join,num) in item.child">
+
+            <cell-tag
+              :key="'join'+num"
+              :item="join"
+              :label-key="labelKey"
+              :value-key="valueKey"
+            />
+
+            <div
+              v-if="(num+1) !== item.child.length"
+              :key="'joinIcon'+num"
+              style="margin: 0 3px"
+            >
+              {{ item.join || '/' }}
+            </div>
+
+          </template>
+
+
+        </div>
+
+        <cell-tag
+          v-else
+          :key="'inner'+key"
+          :item="item"
+          :label-key="labelKey"
+          :value-key="valueKey"
+        />
+      </template>
+
+    </div>
 
 
   </div>
 </template>
 
 <script>
+import cellTag from "./cellTag.vue";
 
 export default {
   name: "lwLabelValueGroup",
+  components: {
+    cellTag
+  },
   props: {
     // 列表数据
     list: {
@@ -50,7 +91,10 @@ export default {
     // 是否显示模块样式
     showModelStyle: Boolean,
     // 是否显示行样式
-    showRowStyle: Boolean,
+    showRowStyle: {
+      type: Boolean,
+      default: true
+    },
     // 数据第一行是否显示起始行样式，showRow 为 false 时无效
     showStartRowStyle: {
       type: Boolean,
@@ -61,16 +105,24 @@ export default {
       type: Boolean,
       default: true
     },
-    // 值是否加粗
-    valBold: Boolean,
-    // 值是否显示红色
-    valRed: Boolean,
-
   },
   data() {
     return {}
   },
-  methods: {}
+  methods: {
+    // 行样式
+    getRowClass(k) {
+      if (!this.showRowStyle) return ''
+
+      if (this.showEndRowStyle && this.list.length === 1) return 'lw-global-row-end'
+
+      if (this.showStartRowStyle && k === 0) return 'lw-global-row-start'
+
+      if (this.showEndRowStyle && (k + 1) === this.list.length) return 'lw-global-row-end'
+
+      return 'lw-global-row'
+    }
+  }
 }
 </script>
 

package/src/components/Loading/index.vue

@@ -5,26 +5,35 @@
   @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"
+    v-if="loading > 0"
+    :style="{zIndex:utils.getMaxZIndex()}"
+  >
     <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 style="margin-top: 5px">{{
+          msg || $lwLanguage.get('wms_project.pda.common.loading', '加载中') + '...'
+        }}
+      </div>
     </div>
   </div>
 </template>
 
 <script>
+import {Utils} from "./../../utils/Utils";
 
 export default {
   name: "lwLoading",
   data() {
     return {
-      msg:'',
-      loading:0
+      msg: '',
+      loading: 0,
+      utils: Utils
     }
   }
 }
@@ -41,7 +50,6 @@ export default {
   right: 0;
   bottom: 0;
   left: 0;
-  z-index: 2147483583;
   background-color: rgba(0, 0, 0, 0.1);
   color: #fff;
   font-size: 12px;

package/src/components/NoticeBar/index.vue

@@ -9,7 +9,7 @@
     v-if="show"
     ref="notBox"
     class="not-box"
-    :style="{background,color,height}"
+    :style="{background,color,height,zIndex:utils.getMaxZIndex()}"
   >
     <div class="lw-global-flex-between " style="padding: 10px">
       <div style="flex: 1">{{ message }}</div>
@@ -24,7 +24,7 @@
 </template>
 
 <script>
-
+import {Utils} from "./../../utils/Utils";
 /* 注意此组件不能使用 this.$XXX 的方法，因为没有注册组件是通过指令调用的 */
 
 
@@ -36,19 +36,20 @@ export default {
   data() {
     return {
       // 是否显示
-      show:false,
+      show: false,
       // 提示信息
-      message:'',
+      message: '',
       // 背景颜色
-      background:'',
+      background: '',
       // 字体颜色
-      color:'',
+      color: '',
       // 显示时长
       showTime: '',
       // 定时器
-      timeOut:'',
+      timeOut: '',
       // 高度
-      height: ''
+      height: '',
+      utils: Utils
     }
   },
   watch:{
@@ -110,7 +111,6 @@ export default {
   left: 0;
   width: 100%;
   height: auto;
-  z-index: 2147483582;
   transition: all .3s;
   overflow: hidden;
 }