@logwire/logwire-wms-pda-ui 3.5.4 → 3.5.5-wat.2

package/package.json

@@ -1,58 +1,56 @@
-{
-  "name": "@logwire/logwire-wms-pda-ui",
-  "version": "3.5.4",
-  "private": false,
-  "author": "zhangwen",
-  "description": "运匠科技wms-PDA基础组件库",
-  "main": "./src/index.js",
-  "license": "MIT",
-  "scripts": {
-    "build": "vite build",
-    "push": "npm publish",
-    "getNPMHttp": "npm get registry",
-    "setLocalHttp": "npm config set registry http://192.168.0.12:8081/repository/npm-hosted/",
-    "recoverHttp": "npm config set registry https://registry.npmjs.org/"
-  },
-  "files": [
-    "dist",
-    "src"
-  ],
-  "keywords": [
-    "logwire-wms",
-    "logwire",
-    "wms"
-  ],
-  "dependencies": {
-    "@bundled-es-modules/axios": "^0.27.2",
-    "core-js": "^3.37.0",
-    "lodash": "^4.17.21",
-    "luxon": "^3.4.4",
-    "vant": "^2.12.48",
-    "vue": "^2.7.7",
-    "string-random": "^0.1.3"
-  },
-  "devDependencies": {
-    "@vitejs/plugin-legacy": "^5.4.0",
-    "@vitejs/plugin-vue2": "^2.3.1",
-    "eslint": "8.22.0",
-    "eslint-plugin-vue": "^9.25.0",
-    "less": "^4.2.0",
-    "rollup-plugin-copy": "^3.5.0",
-    "terser": "^5.31.0",
-    "vite": "^5.1.6"
-  },
-  "eslintConfig": {
-    "root": true,
-    "env": {
-      "node": true
-    },
-    "extends": [
-      "plugin:vue/essential",
-      "eslint:recommended"
-    ],
-    "parserOptions": {
-      "parser": "babel-eslint"
-    },
-    "rules": {}
-  }
-}
+{
+  "name": "@logwire/logwire-wms-pda-ui",
+  "version": "3.5.5-wat.2",
+  "private": false,
+  "author": "zhangwen",
+  "description": "运匠科技wms-PDA基础组件库",
+  "main": "./src/index.js",
+  "license": "MIT",
+  "files": [
+    "dist",
+    "src"
+  ],
+  "keywords": [
+    "logwire-wms",
+    "logwire",
+    "wms"
+  ],
+  "dependencies": {
+    "axios": "^1.6.8",
+    "core-js": "^3.39.0",
+    "lodash": "^4.17.21",
+    "luxon": "^3.4.4",
+    "vant": "^2.12.48",
+    "vue": "^2.7.16"
+  },
+  "devDependencies": {
+    "@vitejs/plugin-legacy": "^5.4.3",
+    "@vitejs/plugin-vue2": "^2.3.1",
+    "eslint": "8.22.0",
+    "eslint-plugin-vue": "^9.30.0",
+    "less": "^4.2.0",
+    "rollup-plugin-copy": "^3.5.0",
+    "terser": "^5.36.0",
+    "vite": "^5.4.10"
+  },
+  "eslintConfig": {
+    "root": true,
+    "env": {
+      "node": true
+    },
+    "extends": [
+      "plugin:vue/essential",
+      "eslint:recommended"
+    ],
+    "parserOptions": {
+      "parser": "babel-eslint"
+    },
+    "rules": {}
+  },
+  "scripts": {
+    "build": "vite build",
+    "push": "npm publish",
+    "getNPMHttp": "npm get registry",
+    "recoverHttp": "npm config set registry https://registry.npmjs.org/"
+  }
+}

package/src/api/Common.js

@@ -4,7 +4,7 @@
 * @date  2022-05-12
 * */
 
-import lwAxios from "./../utils/Axios";
+import lwAxios, { actionRequest } from './../utils/Axios'
 
 export const common = {
 
@@ -308,4 +308,6 @@ export const common = {
       }
     })
   },
+  // 获取只能串行请求的 url 列表
+  listPdaSerialAction: actionRequest('listPdaSerialAction')
 }

package/src/components/Button/index.vue

@@ -6,6 +6,7 @@
 -->
 <template>
   <button
+    v-permissions="permissionCode"
     ref="lwButton"
     :type="nativeType"
     :class="[
@@ -36,6 +37,14 @@ export default {
   name: "lwButton",
   props: {
     // 按钮类型 main、normal、last
+    authSuffixCode: {
+      type: String,
+      default: null,
+    },
+    authCode: {
+      type: String,
+      default: null,
+    },
     type: {
       type: String,
       default: 'main'
@@ -99,6 +108,15 @@ export default {
       }
       if (this.disabled) return
       this.$emit('click', ev)
+    },
+    permissionCode() {
+      if (!this.authCode && !this.authSuffixCode) return
+      if (this.authCode) {
+        return this.authCode
+      }
+      if (this.authSuffixCode) {
+        return '/wms/pda' + this.$route.path + '.btn.' + this.authSuffixCode
+      }
     }
   }
 }

package/src/components/DataLookItem/index.vue

@@ -6,14 +6,14 @@
 <template>
   <div class="lw-data-look-item-box">
     <div
-      :style="{color}"
+      :style="{color,fontSize:valSize}"
       class="lw-data-look-item-value"
       :class="{'lw-global-value-bold-red':subjectColor}"
     >
       {{ $lwCheckVal(value) }}
     </div>
     <div
-      :style="{color}"
+      :style="{color:titleColor}"
       class="lw-data-look-item-title"
       :class="{'lw-global-title':subjectColor}"
     >
@@ -32,7 +32,11 @@ export default {
     value: [String, Number],
     color: [String],
     // 是否使用主题色
-    subjectColor: Boolean
+    subjectColor: Boolean,
+    // 数据字体大小
+    valSize: String,
+    // 标题颜色
+    titleColor: String
   },
   computed: {},
   data() {

package/src/components/ImgUpload/request.js

@@ -1,5 +1,5 @@
 
-import {axios} from "@bundled-es-modules/axios";
+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

package/src/components/Popup/index.vue

@@ -50,7 +50,9 @@
         :color="btnColor"
         :plain="btnPlain"
         @click="offBtnClick"
-      >{{ offBtnText || $lwLanguage.get('wms_project.pda.components.ui.popup.off','关闭') }}</lw-button>
+      >
+        {{ offBtnText || $lwLanguage.get('wms_project.pda.components.ui.popup.off', '关闭') }}
+      </lw-button>
       <slot name="button"></slot>
     </div>
 

package/src/components/PopupCheckbox/index.vue

@@ -11,7 +11,13 @@
     :title="title"
     :height="height"
     :show-keyboard-placeholder="false"
-    :off-btn-text="$lwLanguage.get('wms_project.pda.common.cancel', '取消')"
+    :off-btn-text="offBtnText || $lwLanguage.get('wms_project.pda.common.cancel', '取消')"
+    v-bind="$attrs"
+    @open="$emit('open')"
+    @opened="$emit('opened')"
+    @close="$emit('close')"
+    @closed="$emit('closed')"
+    @clickCloseBtn="$emit('clickCloseBtn')"
   >
 
 
@@ -29,13 +35,15 @@
             plain
             type="last"
             @click="clearInp"
-          >{{ $lwLanguage.get('wms_project.pda.common.clear', '重置') }}
+          >
+            {{ $lwLanguage.get('wms_project.pda.common.clear', '重置') }}
           </lw-button>
           <lw-button
             mini
             round
             @click="searchFn"
-          >{{ $lwLanguage.get('wms_project.pda.common.search', '搜索') }}
+          >
+            {{ $lwLanguage.get('wms_project.pda.common.search', '搜索') }}
           </lw-button>
         </template>
       </lw-input>
@@ -81,7 +89,8 @@
       <lw-button
         v-if="selectDataInfo.length"
         @click="confirm"
-      >{{ $lwLanguage.get('wms_project.pda.common.confirm', '确定') }}
+      >
+        {{ $lwLanguage.get('wms_project.pda.common.confirm', '确定') }}
       </lw-button>
     </template>
   </lw-popup>
@@ -97,6 +106,8 @@ export default {
       type: Boolean,
       default: false
     },
+    // 取消按钮文字
+    offBtnText: String,
     // 标题
     title: String,
     // 提供选择的数据

package/src/directive/Permissions.js

@@ -4,32 +4,36 @@
 * @date  2022-02-14
 * */
 
-import {Permissions} from "../utils/Permissions";
-import {lwErrMsg} from "../components/ErrorMsg";
+import { Permissions } from '../utils/Permissions'
+import { lwErrMsg } from '../components/ErrorMsg'
+import {WarehouseConfig} from "../utils/WarehouseConfig";
 
 export default {
-  inserted(el, binding) {
-    const { value } = binding
+  inserted (el, binding) {
+    let value = binding.value
     const permissions = Permissions.get() || []
+    const btnPermissionEnabled = WarehouseConfig.get('systemConfig.WAREHOUSE_WMS_PDA_BUTTON_PERMISSION_ENABLED')
+    console.log('WAREHOUSE_WMS_PDA_BUTTON_PERMISSION_ENABLED', btnPermissionEnabled)
+    if (value) {
+      if (typeof value === 'function') {
+        const res = value()
+        if (!res) return
+        console.log(res)
+        if (res.indexOf(".btn.") > 0 && btnPermissionEnabled !== 'true') return
+        value = [res]
+      }
+      if (Array.isArray(value)) {
+        if (value.length === 0) return true
 
-    if (value && value instanceof Array) {
-
-      if(value.length === 0) return true
-
-      const permissionRoles = value
-
-      const hasPermission = permissions.some(role => {
-        return permissionRoles.includes(role)
-      })
-
-      if (!hasPermission) {
-        el.parentNode && el.parentNode.removeChild(el)
+        if (!permissions.some(role => value.includes(role))) {
+          el.parentNode && el.parentNode.removeChild(el)
+        }
+      } else {
+        lwErrMsg.show('权限校验失败，请检查传入数据是否正确')
+        throw new Error(
+          '权限校验失败，请检查传入数据是否正确! 像这样使用：<div v-permission="[\'admin\',\'editor\']"></div>'
+        )
       }
-    } else {
-      lwErrMsg.show('权限校验失败，请检查传入数据是否正确')
-      throw new Error(
-          "权限校验失败，请检查传入数据是否正确! 像这样使用：<div v-permission=\"['admin','editor']\"></div>"
-      )
     }
   }
 }

package/src/mixins/loginAndInit/index.js

@@ -4,10 +4,20 @@
 * @date  2022-07-06
 * */
 
+import { common } from '../../api/Common'
+import { setSerialRequestPaths } from '../../utils/Axios'
+
 export const loginAndInit = {
   methods: {
     // 获取仓库系统配置等信息
     getSystemInitData() {
+      // 获取串口请求路径列表
+      common.listPdaSerialAction().then(res => {
+        if (res.paths?.length) {
+          setSerialRequestPaths(res.paths)
+        }
+      })
+
       // 获取颜色配置并设置
       this.$lwSetColor.awaySet()
 

package/src/utils/Axios.js

@@ -5,7 +5,7 @@
 * @date 2022-02-10
 * */
 
-import {axios} from "@bundled-es-modules/axios";
+import axios from "axios";
 import {ApiUtils} from "./ApiUtils";
 import {Warehouse} from "./Warehouse";
 import {lwErrMsg} from "../components/ErrorMsg";
@@ -87,6 +87,41 @@ lwAxios.updateToken = token => {
 // 是否有用户Token
 lwAxios.hasToken = () => !!lwAxios.defaults.headers.common['token']
 
+// 只能串行的请求
+const serialRequestPaths = new Set()
+export const setSerialRequestPaths = (paths) => {
+  serialRequestPaths.clear()
+  paths.forEach(it => serialRequestPaths.add(it))
+}
+// 存储正在进行的请求
+const pendingRequests = new Set()
+// 生成请求唯一标识（fingerprint）
+const getRequestKey = (config) => {
+  const { url, data } = config
+  const body = typeof data === 'object' ? JSON.stringify(data) : data
+  return `${url}|${body}`
+}
+// 添加请求到缓存中
+const putPendingRequest = (config) => {
+  if (!serialRequestPaths.has(config.url)) return true; // 只处理配置的请求
+
+  const requestKey = getRequestKey(config)
+  if (pendingRequests.has(requestKey)) {
+    config.cancelToken = new axios.CancelToken(cancel => {
+      cancel(`重复请求，执行取消`)
+    })
+    return false
+  }
+  pendingRequests.add(requestKey)
+  return true
+}
+// 移除请求
+const removePendingRequest = (config) => {
+  if (!config || !serialRequestPaths.has(config.url)) return; // 只处理配置的请求
+
+  const requestKey = getRequestKey(config)
+  pendingRequests.delete(requestKey)
+}
 
 /**
  * 调用平台接口的方法
@@ -111,10 +146,15 @@ lwAxios.action = ({url, data, config, method = 'post'}) => {
   })
 }
 
+export const actionRequest = (action) => (data = null) => lwAxios.action({ url: action, data })
 
 // 请求拦截
 lwAxios.interceptors.request.use(
   config => {
+    if (!putPendingRequest(config)) {
+      return config
+    }
+
     let csrf = /XSRF-TOKEN=([\w-]+)/.test(document.cookie) && RegExp.$1
     if (csrf) {
       config.headers['X-XSRF-TOKEN'] = csrf
@@ -131,6 +171,7 @@ lwAxios.interceptors.request.use(
     return config
   },
   error => {
+    removePendingRequest(error?.config)
     lwLoading.close()
     console.error('请求异常: ', error)
     return Promise.reject(error)
@@ -157,9 +198,19 @@ lwAxios.interceptors.response.use(
       return response.config['map'](result.data)
     }
 
+    removePendingRequest(response.config)
+
     return result.data
   },
   error => {
+    removePendingRequest(error?.config)
+    if (axios.isCancel(error)) {
+      lwToast.toast({
+        message: '重复请求',
+        duration: 500,
+      })
+      return Promise.reject()
+    }
 
     lwLoading.close()
     console.error('接口返回异常: ', error)

package/src/utils/DeepCopy.js

@@ -3,7 +3,7 @@
 * @author: 张文
 * @date  2022-02-16
 * */
-import lodash from "lodash";
+import {cloneDeep} from "lodash/lang";
 
 
 /**
@@ -21,7 +21,7 @@ export function DeepCopy(data) {
   }*/
 
   // 文档：https://www.lodashjs.com/docs/lodash.cloneDeep
-  return lodash.cloneDeep(data)
+  return cloneDeep(data)
 
 
   /*if (useLodash) {

package/src/utils/ProjectCustomHandler.js

@@ -19,7 +19,8 @@
 * */
 
 
-import lodash from "lodash";
+import {at, set} from "lodash/object";
+import {isArray} from "lodash/lang";
 
 
 class ProjectCustomHandler {
@@ -41,10 +42,10 @@ class ProjectCustomHandler {
 
     if (key) {
       // 文档：https://www.lodashjs.com/docs/lodash.at
-      let aData = lodash.at(this.handler, key)
+      let aData = at(this.handler, key)
 
       // 文档：https://www.lodashjs.com/docs/lodash.isArray
-      data = lodash.isArray(key) ? aData : aData[0]
+      data = isArray(key) ? aData : aData[0]
 
       if (typeof data !== 'function') data = undefined
     } else {
@@ -61,7 +62,7 @@ class ProjectCustomHandler {
    * @param data 需要设置的数据
    * */
   set(key, data) {
-    lodash.set(this.handler, key, data)
+    set(this.handler, key, data)
   }
 
 }

package/src/utils/ProjectCustomRender.js

@@ -5,7 +5,8 @@
 * */
 
 
-import lodash from "lodash";
+import {at, set} from "lodash/object";
+import {isArray} from "lodash/lang";
 /*
 * 用于存放自定义渲染函数
 * */
@@ -24,10 +25,10 @@ export const ProjectCustomRender = {
 
     if (key) {
       // 文档：https://www.lodashjs.com/docs/lodash.at
-      let aData = lodash.at(formatFn, key)
+      let aData = at(formatFn, key)
 
       // 文档：https://www.lodashjs.com/docs/lodash.isArray
-      data = lodash.isArray(key) ? aData : aData[0]
+      data = isArray(key) ? aData : aData[0]
     } else {
       data = formatFn
     }
@@ -42,7 +43,7 @@ export const ProjectCustomRender = {
    * @param data 需要设置的数据
    * */
   set(key, data) {
-    lodash.set(formatFn, key, data)
+    set(formatFn, key, data)
   },
 
   /**

package/src/utils/StringRandom.js

@@ -0,0 +1,46 @@
+/*
+* 随机字符串
+* @author: 张文
+* @date  2024-09-05
+* */
+
+
+const numbers = '0123456789';
+const letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
+const specials = '~!@#$%^*()_+-=[]{}|;:,./<>?';
+
+/**
+ * 获取随机字符串
+ * @param {Number} length 字符串的长度
+ * @param {Object} options - 配置项{number:是否允许数字，letters:是否允许字母，specials:是否需要符号，}
+ * @return {String}
+ */
+function random(length = 8, options) {
+
+  let chars = '';
+  let result = '';
+
+  if (!options || !Object.keys(options).length) {
+    chars = numbers + letters + specials;
+  } else {
+    if (options.numbers) {
+      chars += numbers;
+    }
+
+    if (options.letters) {
+      chars += letters;
+    }
+
+    if (options.specials) {
+      chars += specials;
+    }
+  }
+
+  while (length > 0) {
+    length--;
+    result += chars[Math.floor(Math.random() * chars.length)];
+  }
+  return result;
+}
+
+export default random;

package/src/utils/SystemConfig.js

@@ -5,7 +5,8 @@
 * */
 
 
-import lodash from "lodash";
+import {at, set} from "lodash/object";
+import {isArray} from "lodash/lang";
 import {DeepCopy} from "./DeepCopy";
 
 // 配置表
@@ -54,10 +55,10 @@ export const SystemConfig = {
 
     if (key) {
       // 文档：https://www.lodashjs.com/docs/lodash.at
-      let aData = lodash.at(config, key)
+      let aData = at(config, key)
 
       // 文档：https://www.lodashjs.com/docs/lodash.isArray
-      data = lodash.isArray(key) ? aData : aData[0]
+      data = isArray(key) ? aData : aData[0]
     } else {
       data = config
     }
@@ -72,7 +73,7 @@ export const SystemConfig = {
    * @param data 需要设置的数据
    * */
   set(key, data) {
-    lodash.set(config, key, data)
+    set(config, key, data)
   },
 
   /**

package/src/utils/index.js

@@ -41,6 +41,7 @@ import {LocalStaff} from "./LocalStaff";
 import {SystemConfig} from "./SystemConfig";
 import {ProjectCustomRender} from "./ProjectCustomRender";
 import ProjectCustomHandler from "./ProjectCustomHandler";
+import random from "./StringRandom";
 
 
 export const utils = (Vue) => {
@@ -84,4 +85,5 @@ export const utils = (Vue) => {
   Vue.prototype.$lwSystemConfig = SystemConfig
   Vue.prototype.$lwProjectCustomRender = ProjectCustomRender
   Vue.prototype.$lwProjectCustomHandler = new ProjectCustomHandler()
+  Vue.prototype.$lwStringRandom = random
 }

package/src/utils/windowGlobalData.js

@@ -4,7 +4,8 @@
 * @date  2022-05-05
 * */
 
-import lodash from "lodash";
+import {at, set} from "lodash/object";
+import {isArray} from "lodash/lang";
 import {DeepCopy} from "./DeepCopy";
 
 export function lwWindowGlobalData() {
@@ -90,7 +91,7 @@ export function lwWindowGlobalData() {
      * */
     set(key, data) {
       // 文档：https://www.lodashjs.com/docs/lodash.set
-      lodash.set(lwGlobalData, key, data)
+      set(lwGlobalData, key, data)
     },
 
     /**
@@ -105,10 +106,10 @@ export function lwWindowGlobalData() {
 
       if (key) {
         // 文档：https://www.lodashjs.com/docs/lodash.at
-        let aData = lodash.at(lwGlobalData, key)
+        let aData = at(lwGlobalData, key)
 
         // 文档：https://www.lodashjs.com/docs/lodash.isArray
-        data = lodash.isArray(key) ? aData : aData[0]
+        data = isArray(key) ? aData : aData[0]
       } else {
         data = lwGlobalData
       }