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

package/dist/{taskEntrance.54b36da5.mjs → taskEntrance.9077df61.mjs}

@@ -1,4 +1,4 @@
-import { n as t } from "./index.70e22f54.mjs";
+import { n as t } from "./index.99854c0f.mjs";
 import "vue";
 const a = {
   name: "taskEntrance",

package/dist/{taskGroup.8e208b56.mjs → taskGroup.90c61bb1.mjs}

@@ -1,4 +1,4 @@
-import { n as t } from "./index.70e22f54.mjs";
+import { n as t } from "./index.99854c0f.mjs";
 import "vue";
 const r = {
   name: "taskGroup",

package/dist/{taskGroupContent.fa054aa1.mjs → taskGroupContent.e6438d8b.mjs}

@@ -1,4 +1,4 @@
-import { n as t } from "./index.70e22f54.mjs";
+import { n as t } from "./index.99854c0f.mjs";
 import "vue";
 const o = {
   name: "content",

package/dist/{timezone.7f102e04.mjs → timezone.7ed0cd41.mjs}

@@ -1,4 +1,4 @@
-import { n as t } from "./index.70e22f54.mjs";
+import { n as t } from "./index.99854c0f.mjs";
 import "vue";
 const _ = {
   name: "timezone",

package/dist/{warehouse.9dac0310.mjs → warehouse.290ea85c.mjs}

@@ -1,4 +1,4 @@
-import { n as r } from "./index.70e22f54.mjs";
+import { n as r } from "./index.99854c0f.mjs";
 import "vue";
 const _ = {
   name: "warehouse",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logwire/logwire-wms-pda-ui",
-  "version": "3.3.3",
+  "version": "3.4.0",
   "private": false,
   "author": "zhangwen",
   "description": "运匠科技wms-PDA基础组件库",

package/src/assets/css/global.less

@@ -79,19 +79,19 @@ button {
 
 // 没有顶部padding的行样式
 .lw-global-row-start {
-  padding-bottom: 8px;
+  padding-bottom: 5px;
   .lw-global-bottom-border();
 }
 
 // 行的内边距
 .lw-global-row {
-  padding: 8px 0;
+  padding: 5px 0;
   .lw-global-bottom-border();
 }
 
 // 没有底部下划线和padding的行样式
 .lw-global-row-end {
-  padding-top: 8px;
+  padding-top: 5px;
 }
 
 // 行容器
@@ -205,6 +205,30 @@ button {
 
 }
 
+// 折叠样式标题与按钮分离
+.lw-global-collapse-title-btn {
+
+  .van-cell__title {
+    position: relative;
+    padding-right: 10px;
+
+    &::after {
+      content: ' ';
+      display: inline-block;
+      width: 1px;
+      height: 60%;
+      background: #F0F0F0;
+      position: absolute;
+      top: 20%;
+      right: 0;
+    }
+  }
+
+  .van-cell__right-icon {
+    margin: auto 0 auto 7px;
+  }
+}
+
 // 模块样式-用于模块之间的分隔-提供圆角，背景白色，padding：10
 .lw-global-model-box {
   padding: 10px;

package/src/components/Cell/index.vue

@@ -94,7 +94,7 @@ export default {
     },
 
     // 标题
-    title: String,
+    title: [String, Number],
     // 标题对齐方式
     titleAlign: {
       type: String,

package/src/components/CellPopupSelect/index.vue

@@ -61,7 +61,11 @@
                 @click="toggle(index)"
               >
                 <template #right-icon>
-                  <van-checkbox :name="i" ref="checkboxes" />
+                  <van-checkbox
+                    :name="i"
+                    ref="checkboxes"
+                    shape="square"
+                  />
                 </template>
               </van-cell>
             </van-cell-group>

package/src/components/CellSearchSelectDel/index.vue

@@ -111,6 +111,7 @@
             v-for="i in popup.list"
             :key="i[valueKey]"
             :name="i[valueKey]"
+            shape="square"
           >
             {{ labelMsg(i) }}
           </van-checkbox>
@@ -118,7 +119,7 @@
       </div>
 
       <lw-pagination
-        v-if="apiFn && needPage"
+        v-if="!!apiFn && needPage"
         v-model="popup.pageNum"
         :page-size.sync="popup.pageSize"
         :page-total="popup.pageTotal"
@@ -173,11 +174,12 @@ export default {
     //是否必填
     required: {
       type: Boolean,
-      default: true
+      default: false
     },
     focus: {
       type: Boolean,
       default: false
+
     },
 
     // 是否显示行样式
@@ -221,12 +223,9 @@ export default {
 
     // 是否需要分页，当 apiFn 为真时有效
     needPage: Boolean,
-    // 函数调用时的数据取值key
-    apiDataKey: {
-      type: String,
-      default: 'datas'
-    },
-    // 函数调用时的总条数取值key
+    // 函数调用时的数据取值key，needPage 为真时必填
+    apiDataKey: String,
+    // 函数调用时的总条数取值key，needPage 为真时必填
     apiDataTotalKey: {
       type: String,
       default: 'total'
@@ -281,6 +280,7 @@ export default {
 
     // 获取数据
     getData(keyword) {
+
       if (this.apiFn) {
         return this.apiFn({
           keyword,
@@ -322,7 +322,7 @@ export default {
       if (!this.checkMax(this.selectList.length)) return
 
       let res = await this.getData(this.outSearch)
-      if (this.apiFn) {
+      if (this.apiFn && this.apiDataKey) {
         res = res[this.apiDataKey]
       }
 
@@ -351,9 +351,9 @@ export default {
     async pageChange() {
       this.popup.result = []
       let res = await this.getData(this.popup.search)
-      if (this.apiFn) {
-        res = res[this.apiDataKey]
+      if (this.apiFn && this.apiDataKey) {
         this.needPage ? this.popup.pageTotal = res[this.apiDataTotalKey] : ''
+        res = res[this.apiDataKey]
       }
 
       this.popup.list = res

package/src/components/Input/index.vue

@@ -62,6 +62,7 @@
           @focus="inputFocus"
           @blur="inputBlur"
           @keydown.enter="confirm"
+          @click="click"
         />
 
         <!-- 输入框 -->
@@ -83,6 +84,7 @@
           @blur="inputBlur"
           @keydown.enter="confirm"
           @input="input"
+          @click="click"
         >
 
         <!-- 字数统计 -->
@@ -117,6 +119,7 @@
 </template>
 
 <script>
+
 export default {
   name: "lwInput",
   props: {
@@ -325,10 +328,25 @@ export default {
       readonlyInp: false,
       // 是否通过点击键盘
       isClickKeyboard: false,
+
+      // 点击需要的数据
+      clickData: {
+        num: 0,
+        timeout: null
+      },
+
+      // 组件解析id
+      componentId: null,
+
     }
   },
   mounted() {
     this.focusVal && this.setFocusFn()
+
+    if (this.ruleKey) {
+      this.componentId = (this.rulePrefix || this.$route.path) + '/' + this.ruleKey
+    }
+
   },
   methods: {
 
@@ -392,18 +410,16 @@ export default {
     async confirm() {
       let obj = {data: {}}
       let val = this.val
-      let componentId = ''
+
       // 去除空格
       if (val) val = val.toString().trim()
 
 
-      // 如果配置了解析规则，但是输入内容为空就不触发解析
-      if (this.ruleKey && val) {
+      // 如果配置存在解析id，且输入框有值时触发解析
+      if (this.componentId && val) {
 
-        const prefix = this.rulePrefix || this.$route.path
-        componentId = prefix + '/' + this.ruleKey
         obj = await this.$lwBarcodeResolve.resolve({
-          componentId,
+          componentId: this.componentId,
           barcode: val,
           ...this.ruleServeQuery,
           createRule: this.createRule
@@ -426,7 +442,7 @@ export default {
               this.$lwLanguage.get(
                 'wms_project.pda.components.ui.Input.index.cbomgodq',
                 '解析失败！无法获取字段【{key}】的值，请检查规则是否配置正确！输入框ID：', {key: this.ruleValueKey}
-              ) + componentId
+              ) + this.componentId
             )
             this.clearClick()
             return
@@ -455,6 +471,7 @@ export default {
       this.$emit('confirm', val, obj)
     },
 
+    // 输入框输入
     input() {
       let val = this.$refs.lwInput.value
 
@@ -490,6 +507,44 @@ export default {
 
 
       this.$emit('input', val)
+    },
+
+
+    // 点击
+    click() {
+
+      this.clickData.timeout && clearTimeout(this.clickData.timeout)
+
+      this.clickData.num++
+
+      // 显示当前输入框解析id
+      if (this.clickData.num >= 10) {
+
+        const message = this.componentId ?
+          this.$lwLanguage.get('wms_project.pda.components.Input.index.yhrktchj', '当前输入框解析ID为：') + this.componentId :
+          this.$lwLanguage.get('wms_project.pda.components.Input.index.nwiaoput', '当前输入框未配置解析ID')
+
+
+        this.$lwDialog.confirm({
+          message,
+          confirmButtonText: this.$lwLanguage.get('wms_project.pda.components.Input.index.amytwqyl', '复制ID'),
+          showConfirmButton: !!this.componentId
+        }).then(() => {
+          navigator.clipboard.writeText(this.componentId).then(() => {
+            this.$lwToast.success(
+              this.$lwLanguage.get('wms_project.pda.components.Input.index.pzencdqg', '已复制')
+            )
+          })
+        }).catch(() => {
+        })
+
+        this.clickData.num = 0
+        return
+      }
+
+      this.clickData.timeout = setTimeout(() => {
+        this.clickData.num = 0
+      }, 500)
     }
   }
 }

package/src/components/LabelValueGroup/index.js

@@ -0,0 +1,11 @@
+/*
+* 标签、值显示组
+* @author: 张文
+* @date  2023-08-10
+* */
+
+import lwLabelValueGroup from './index.vue'
+
+lwLabelValueGroup.install = Vue => Vue.component(lwLabelValueGroup.name, lwLabelValueGroup)
+
+export default lwLabelValueGroup

package/src/components/LabelValueGroup/index.vue

@@ -0,0 +1,79 @@
+<!--
+  标签、值显示组
+  @author: 张文
+  @date: 2023-08-10
+-->
+<template>
+  <div
+    :class="[
+      showModelStyle && 'lw-global-model-box',
+      !showRow && 'lw-global-row-box',
+    ]"
+  >
+
+    <lw-title-value-cell
+      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"
+    />
+
+
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "lwLabelValueGroup",
+  props: {
+    // 列表数据
+    list: {
+      type: Array,
+      default: () => []
+    },
+    // label取值key
+    labelKey: {
+      type: String,
+      default: 'label'
+    },
+    // value取值key
+    valueKey: {
+      type: String,
+      default: 'value'
+    },
+    // 是否显示模块样式
+    showModelStyle: Boolean,
+    // 是否显示行样式
+    showRowStyle: Boolean,
+    // 数据第一行是否显示起始行样式，showRow 为 false 时无效
+    showStartRowStyle: {
+      type: Boolean,
+      default: true
+    },
+    // 数据最后一行是否显示结束行样式，showRow 为 false 时无效
+    showEndRowStyle: {
+      type: Boolean,
+      default: true
+    },
+    // 值是否加粗
+    valBold: Boolean,
+    // 值是否显示红色
+    valRed: Boolean,
+
+  },
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/components/NoticeBar/index.vue

@@ -8,15 +8,18 @@
   <div
     v-if="show"
     ref="notBox"
-    class="lw-global-flex-between not-box"
+    class="not-box"
     :style="{background,color,height}"
   >
-    <div style="flex: 1">{{message}}</div>
+    <div class="lw-global-flex-between " style="padding: 10px">
+      <div style="flex: 1">{{ message }}</div>
 
-    <div
-      class="close-btn"
-      @click="close"
-    >×</div>
+      <div
+        class="close-btn"
+        @click="close"
+      >×
+      </div>
+    </div>
   </div>
 </template>
 
@@ -81,13 +84,15 @@ export default {
     },
 
     // 关闭弹框
-    close(){
+    close() {
       this.height = 0
 
-      this.dom.addEventListener('transitionend', ()=>{
-        this.show = false
-        this.timeOut && clearTimeout(this.timeOut)
-        window.lwWindowGlobalData.set('noticeBarDom',null)
+      this.dom.addEventListener('transitionend', () => {
+        this.$nextTick(() => {
+          this.show = false
+          this.timeOut && clearTimeout(this.timeOut)
+          window.lwWindowGlobalData.set('noticeBarDom', null)
+        })
       })
     },
 
@@ -99,15 +104,15 @@ export default {
 
 @import "../../assets/css/var.less";
 
-.not-box{
-  padding: 5px 10px;
+.not-box {
   position: fixed;
   top: 0;
   left: 0;
-  width: calc(100% - 20px);
+  width: 100%;
   height: auto;
-  z-index: 2147483584;
+  z-index: 2147483582;
   transition: all .3s;
+  overflow: hidden;
 }
 
 .close-btn{

package/src/components/Pagination/index.vue

@@ -177,15 +177,22 @@ export default {
     },
 
     // 是否是最大页码
-    isMax(){
+    isMax() {
       return this.allPageNum <= this.num
     },
 
     // 是否是最小页码
-    isMin(){
+    isMin() {
       return this.num === 1
     }
   },
+  watch: {
+    allPageNum: {
+      handler() {
+        this.checkPageNum()
+      }
+    }
+  },
   data() {
     return {
       // 调整数据条数的弹框
@@ -196,20 +203,32 @@ export default {
     }
   },
   methods: {
+    // 判断当前页面是否符合当前最大页面
+    checkPageNum() {
+      
+      if (this.num === 1) return
+
+      if (this.allPageNum < this.num) {
+        this.num = this.allPageNum
+        this.pageChange()
+      }
+    },
+
+
     // 页码、分页大小发生改变
-    pageChange(){
-      this.$nextTick(()=>{
+    pageChange() {
+      this.$nextTick(() => {
         this.$emit('change', {
           pageSize: this.size,
           pageNum: this.num
         })
       })
 
-      if (this.scrollTop){
+      if (this.scrollTop) {
         const dom = document.querySelector(this.scrollElement)
         dom && dom.scrollIntoView({
           behavior: "smooth",
-          block:'start',
+          block: 'start',
         });
       }
 

package/src/components/Popup/index.vue

@@ -243,7 +243,7 @@ export default {
   box-sizing: border-box;
   flex-shrink: 0;
 
-  :deep(*){
+  > :deep(*){
     flex: 1;
   }
 }

package/src/components/PopupCheckbox/index.vue

@@ -63,6 +63,7 @@
             v-for="i in selectDataList"
             :key="i[valueKey]"
             :name="i[valueKey]"
+            shape="square"
           >
             {{ labelMsg(i) }}
           </van-checkbox>

package/src/components/SearchCellPopup/index.vue

@@ -261,7 +261,7 @@ export default {
       if (res.length === 1) {
         this.resultItem = res[0]
         this.disabledInp = true
-        this.val = this.getCellMsg(res[0])
+        this.$nextTick(() => this.val = this.getCellMsg(res[0]))
         this.$emit('confirm', this.resultItem)
         return Promise.reject()
       }
@@ -325,7 +325,7 @@ export default {
       this.resultItem = list[result]
       this.popup.show = false
 
-      this.val = this.getCellMsg(list[result])
+      this.$nextTick(() => this.val = this.getCellMsg(list[result]))
       this.disabledInp = true
 
       this.$emit('confirm', this.resultItem)

package/src/components/index.js

@@ -72,6 +72,8 @@ import lwSearchCellPopup from "./SearchCellPopup";
 import lwKeyboardOpenPlaceholder from "./KeyboardOpenPlaceholder";
 // 行搜索选择删除组件
 import lwCellSearchSelectDel from "./CellSearchSelectDel";
+// 标签、值显示组
+import lwLabelValueGroup from "./LabelValueGroup";
 
 
 export default [
@@ -109,4 +111,5 @@ export default [
   lwSearchCellPopup,
   lwKeyboardOpenPlaceholder,
   lwCellSearchSelectDel,
+  lwLabelValueGroup,
 ]