doway-coms 2.10.75 → 2.10.77

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "2.10.75",
+  "version": "2.10.77",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",

package/packages/BaseGrid/src/index.vue

@@ -2169,7 +2169,7 @@ export default {
       //防止报错 有slots值就走前面 没有slots这个键key就走后面
       if (
         originCol.controlType !== controlType.operation &&
-        originCol.filter === true
+        (originCol.filter === true || originCol.filters === true) //兼容来的模式filters筛选
       ) {
         let filterTypeName = `${originCol.controlType}_filter`
         if (originCol.filterControlType) {

package/packages/BasePulldown/src/index.vue

@@ -421,15 +421,15 @@ export default {
       }
     },
   },
-  watch: {
-    // 触发下拉表格字段更改，直接重新渲染
-    columns: {
-      handler(newVal) {
-        this.reloadColumn()
-      },
-      deep: true
-    }
-  },
+  // watch: { //davis20250111注释掉，会照成死循环问题
+  //   // 触发下拉表格字段更改，直接重新渲染
+  //   columns: {
+  //     handler(newVal) {
+  //       this.reloadColumn()
+  //     },
+  //     deep: true
+  //   }
+  // },
   computed: {
     currentValue: {
       // 动态计算currentValue的值

package/packages/utils/tscPrinter.js

@@ -0,0 +1,101 @@
+import { encode } from 'gbk.js' // 修正包名
+import XEUtils from 'xe-utils'
+export function getPrinterPath() {
+  return new Promise((resolve, reject) => {
+    const websocket = new WebSocket(process.env.VUE_APP_PRINT_USB_URL)
+
+    websocket.onopen = function() {
+      websocket.send(JSON.stringify({ usb_list: [] }))
+    }
+
+    websocket.onmessage = function(event) {
+      try {
+        const data = JSON.parse(event.data)
+        if ('usb_list' in data) {
+          if (data.usb_list.length === 0) {
+            reject(new Error('未找到USB打印机'))
+          } else {
+            resolve(data.usb_list[0].USBPath)
+          }
+          websocket.close()
+        }
+      } catch (e) {
+        reject(new Error('获取打印机信息失败: ' + e))
+      }
+    }
+
+    websocket.onerror = function(error) {
+      reject(new Error('WebSocket连接失败: ' + error))
+    }
+
+    // 设置超时
+    setTimeout(() => {
+      websocket.close()
+      reject(new Error('获取打印机超时'))
+    }, 5000)
+  })
+}
+
+export async function printLabel(printerPath, command) {
+  return new Promise((resolve, reject) => {
+    const websocket = new WebSocket(process.env.VUE_APP_PRINT_USB_URL)
+
+    websocket.onopen = function() {
+      const encodedCommand = btoa(
+        Array.from(encode(command))
+          .map(val => String.fromCharCode(val))
+          .join('')
+      )
+      const printObj = {
+        functions_inorder: [
+          { openport_usb: printerPath },
+          { sendUint8Array: encodedCommand },
+          { closeport: '' }
+        ]
+      }
+      websocket.send(JSON.stringify(printObj))
+    }
+
+    websocket.onmessage = function(event) {
+      if (event.data === 'Finished') {
+        websocket.close()
+        resolve()
+      }
+    }
+
+    websocket.onerror = function(error) {
+      reject(new Error('打印失败: ' + error))
+    }
+  })
+}
+
+export async function printLabelByte(printerPath, encodedCommands) {
+  return new Promise((resolve, reject) => {
+    const websocket = new WebSocket(process.env.VUE_APP_PRINT_USB_URL)
+    websocket.onopen = function() {
+      const printObj = {
+        functions_inorder: [
+          { openport_usb: printerPath }
+          // {"sendUint8Array": encodedCommand},
+          // {"sendUint8Array": encodedCommand},
+          // {"closeport": ""}
+        ]
+      }
+      XEUtils.arrayEach(encodedCommands, encodedCommand => {
+        printObj.functions_inorder.push({ sendUint8Array: encodedCommand })
+      })
+      printObj.functions_inorder.push({ closeport: '' })
+      websocket.send(JSON.stringify(printObj))
+    }
+    websocket.onmessage = function(event) {
+      if (event.data === 'Finished') {
+        websocket.close()
+        resolve()
+      }
+    }
+
+    websocket.onerror = function(error) {
+      reject(new Error('打印失败: ' + error))
+    }
+  })
+}