From e50fa16b6dbc4e7c50d5fbdbc04d2a556ca01c4e Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 02 十二月 2024 11:26:36 +0800
Subject: [PATCH] 补片流程卡调整
---
north-glass-erp/northglass-erp/src/hook/mouseMove.ts | 51 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 43 insertions(+), 8 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/hook/mouseMove.ts b/north-glass-erp/northglass-erp/src/hook/mouseMove.ts
index aacecd6..bd5b8be 100644
--- a/north-glass-erp/northglass-erp/src/hook/mouseMove.ts
+++ b/north-glass-erp/northglass-erp/src/hook/mouseMove.ts
@@ -13,7 +13,9 @@
let xGrid = ref()
let cellarea = ref(`
<div class="vxe-table--cell-area" style="font-size: 10px;text-align: left" >
- <span class="vxe-table--cell-main-area" ><p style="margin-left: 0.5rem;color: blue"></p></span>
+ <span class="vxe-table--cell-main-area" >
+ <p style="bottom: 0;color: blue;background-color: #5cadfe"></p>
+ </span>
<span class="vxe-table--cell-active-area" ></span>
</div>
`)
@@ -110,6 +112,14 @@
if (event.button === 0) {//宸﹂敭鎸変笅
// 璁板綍閫夋嫨鎿嶄綔璧峰浣嶇疆
selectionStart = getCellPosition(event.target)//璁剧疆閫夋嫨鎿嶄綔璧峰鍗曞厓鏍间綅缃�
+ selectionEnd = selectionStart
+ const activeElement = getTablexGrid().$el.querySelector(".vxe-table--main-wrapper .vxe-table--body-wrapper .vxe-table--cell-main-area p")
+ const element = xGrid.value.$el.querySelector(".vxe-table--fixed-wrapper .vxe-table--fixed-left-wrapper .vxe-table--body-wrapper .vxe-table--cell-main-area p")
+ activeElement.innerHTML =''
+ if(element){
+ element.innerHTML =''
+ }
+
isSelecting.value = true//鏍囪涓烘鍦ㄩ�夋嫨鎿嶄綔
}
@@ -134,12 +144,20 @@
if (event.button === 0) {//宸﹂敭鏉惧紑
isSelecting.value = false//鏍囪涓哄仠姝㈤�夋嫨鎿嶄綔
}
- /*const result = exportData()
+ const result = exportData()
+ if(!result){
+ return
+ }
const activeElement = getTablexGrid().$el.querySelector(".vxe-table--main-wrapper .vxe-table--body-wrapper .vxe-table--cell-main-area p")
const element = xGrid.value.$el.querySelector(".vxe-table--fixed-wrapper .vxe-table--fixed-left-wrapper .vxe-table--body-wrapper .vxe-table--cell-main-area p")
- if(result.length===2 && result[0].length===1){
+
+
+ if(result.length<=2 && result[0].length===1){
activeElement.innerHTML =''
- element.innerHTML =''
+ if(element){
+ element.innerHTML =''
+ }
+
return
}
let sum = 0
@@ -151,8 +169,14 @@
})
sum=isNaN(sum)?0:sum
- activeElement.innerHTML ="SUM:"+parseFloat(sum.toFixed(2))
- element.innerHTML ="SUM:"+parseFloat(sum.toFixed(2))*/
+ setTimeout(()=>{
+ activeElement.innerHTML ="SUM:"+parseFloat(sum.toFixed(2))
+ if(element){
+ element.innerHTML ="SUM:"+parseFloat(sum.toFixed(2))
+ }
+
+ },200)
+
}
let outevent = ref()//绉诲姩浜嬩欢,涓嶄繚瀛�,寰幆瀹氭椂鍣ㄥ唴鏃犳硶鐩戝惉鍒版柊鐨勪簨浠�
@@ -474,7 +498,13 @@
}
const exportData = () => {
+ let data = []
+ let title = []
+ try{
// //杩欓噷闇�瑕佹槸visibleData
+ if(getTablexGrid().getTableData()?.visibleData===undefined){
+ return null
+ }
let tableData = getTablexGrid().getTableData().visibleData//鑾峰彇澶勭悊鏉′欢涔嬪悗鐨勫叏閲忚〃浣撴暟鎹�
let rowStart = selectionStart.rowIndex//鑾峰彇閫変腑璧峰琛岀储寮�
let rowEnd = selectionEnd.rowIndex//鑾峰彇閫変腑缁撴潫琛岀储寮�
@@ -499,8 +529,7 @@
return colStart >= index && colEnd <= index
}
})
- let data = []
- let title = []
+
selectCols.forEach((col, index) => {
title.push(col['title'])
})
@@ -509,6 +538,7 @@
selectRows.forEach((row, index) => {
let rowData = []
selectCols.forEach((col, index) => {
+
const parts = col['property'].split('.')
let result = row
for (const part of parts) {
@@ -522,6 +552,11 @@
})
data.push(rowData)
})
+ }catch (e) {
+ // selectionStart = { rowIndex: -1, cellIndex: -1 } // 閫夋嫨鎿嶄綔璧峰鍗曞厓鏍间綅缃�
+ // selectionEnd = { rowIndex: -1, cellIndex: -1 }
+ }
+
return data
}
--
Gitblit v1.8.0