adtec-core-package 2.8.8 → 2.8.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adtec-core-package",
-  "version": "2.8.8",
+  "version": "2.8.9",
   "private": false,
   "type": "module",
   "scripts": {

package/src/utils/FrameworkUtils.ts

@@ -1,7 +1,6 @@
 import elTableTool from '../components/Table/ElTableTool.ts'
 import { ElMessage } from 'element-plus'
 import * as XLSX from 'xlsx-js-style'
-import { Linq } from 'linq-to-ts'
 import Base64 from 'crypto-js/enc-base64'
 import Utf8 from 'crypto-js/enc-utf8'
 /**
@@ -219,27 +218,45 @@ export default {
     //row单元格合并
     if (rowMerges) {
       rowMerges.forEach((m: any) => {
-        const groupList = new Linq(data1).groupBy((r: any) => {
+        const groupList = groupBy(data1, (r: any) => {
           const obj: any = {}
           m.conditions.forEach((c: any) => {
             obj[c] = r[c]
           })
-          return obj
+          return JSON.stringify(obj)
         })
-        //@ts-ignore
-        groupList.forEach((c: any) => {
+
+        Object.values(groupList).forEach((c: any) => {
           m.fields.forEach((m1: any) => {
-            const cIndex = dataColumns.indexOf(dataColumns.find((c) => c.property === m1))
-            let minOrderNum = 0
-            let maxOrderNum = 0
-            minOrderNum = new Linq(c.elements).min((c: any) => c._orderNum)
-            maxOrderNum = new Linq(c.elements).max((c: any) => c._orderNum)
+            const cIndex = dataColumns.findIndex((col) => col.property === m1)
+            if (cIndex === -1) return
+
+            const orderNums = c.elements.map((item: any) => item._orderNum)
+            const minOrderNum = orderNums.length ? Math.min(...orderNums) : 0
+            const maxOrderNum = orderNums.length ? Math.max(...orderNums) : 0
+
             merges.push({
               s: { c: cIndex, r: minOrderNum },
               e: { c: cIndex, r: maxOrderNum },
             })
           })
         })
+        function groupBy<T>(
+          array: T[],
+          getKey: (item: T) => string,
+        ): Record<string, { elements: T[] }> {
+          return array.reduce(
+            (groups, item) => {
+              const key = getKey(item)
+              if (!groups[key]) {
+                groups[key] = { elements: [] }
+              }
+              groups[key].elements.push(item)
+              return groups
+            },
+            {} as Record<string, { elements: T[] }>,
+          )
+        }
       })
     }
     data1?.forEach((r: any) => {