@skyfox2000/webui 1.3.5 → 1.3.7

package/src/utils/form-excel.ts

@@ -7,7 +7,7 @@ import message from 'vue-m-message';
 import { ValidateRule } from '@/typings/form';
 import { validMessages } from './form-validate';
 import { UploadFile } from '@/typings/upload';
-import { toExcel, type ExcelMarkInfo } from './excel-view';
+import { toExcel, type ExcelMarkInfo, excelToNormalized } from './excel-view';
 
 // ExcelMarkCell 和 ExcelMarkInfo 类型已移至 excel-view.ts 统一管理
 
@@ -17,105 +17,31 @@ import { toExcel, type ExcelMarkInfo } from './excel-view';
  * @returns 包含工作簿、工作表、表头和数据的对象
  */
 export const processExcelFile = async (excelBuffer: ArrayBuffer) => {
-   // 动态导入 exceljs
-   const ExcelJS = await import('exceljs');
-   const workbook = new ExcelJS.default.Workbook();
-   await workbook.xlsx.load(excelBuffer);
-
-   // 获取第一个工作表
-   const worksheet = workbook.worksheets[0];
-   if (!worksheet) {
+   // 使用excel-view.ts中的统一方法
+   const normalized = await excelToNormalized(excelBuffer);
+
+   if (normalized.headers.length === 0) {
       message.error('Excel文件不包含工作表');
       return null;
    }
 
-   // 提取表头和数据
-   const headers: string[] = [];
-   // 表头对象数据行
+   // 转换为原有格式以保持兼容性
    const excelData: Record<string, any>[] = [];
-   // 纯数据行
-   const excelRows: any[][] = [];
-
-   // 提取表头（第一行）
-   worksheet.getRow(1).eachCell((cell) => {
-      // 处理不同类型的单元格值，确保对象类型值被正确转换为字符串
-      let headerValue = '';
-      if (cell.value !== null && cell.value !== undefined) {
-         // 处理不同类型的单元格值
-         if (typeof cell.value === 'object') {
-            // 处理RichText类型
-            if ('richText' in cell.value && Array.isArray(cell.value.richText)) {
-               headerValue = cell.value.richText.map((rt: any) => rt.text || '').join('');
-            }
-            // 处理带有text属性的对象
-            else if ('text' in cell.value && typeof cell.value.text === 'string') {
-               headerValue = cell.value.text;
-            }
-            // 处理日期类型
-            else if (cell.value instanceof Date) {
-               headerValue = cell.value.toLocaleDateString();
-            }
-            // 其他对象类型，尝试获取有意义的字符串表示
-            else {
-               try {
-                  headerValue = JSON.stringify(cell.value);
-               } catch {
-                  headerValue = String(cell.value);
-               }
-            }
-         } else {
-            // 非对象类型直接转字符串
-            headerValue = String(cell.value);
+   normalized.rows.forEach((row) => {
+      const rowData: Record<string, any> = {};
+      normalized.headers.forEach((header, idx) => {
+         if (header) {
+            rowData[header] = row[idx];
          }
-      }
-      headers.push(headerValue);
-   });
-
-   // 提取数据行
-   worksheet.eachRow((row, rowNumber) => {
-      if (rowNumber > 1) {
-         // 跳过表头
-         const rowData: Record<string, any> = {};
-         const rowDataArray: any[] = [];
-         headers.forEach((header, idx) => {
-            if (header) {
-               const cell = row.getCell(idx + 1);
-               const cellValue = cell.value;
-
-               // 使用与表头处理相同的逻辑来提取单元格值
-               if (cellValue !== null && cellValue !== undefined) {
-                  if (typeof cellValue === 'object') {
-                     // 处理RichText类型
-                     if ('richText' in cellValue && Array.isArray(cellValue.richText)) {
-                        rowData[header] = cellValue.richText.map((rt: any) => rt.text || '').join('');
-                     }
-                     // 处理带有text属性的对象
-                     else if ('text' in cellValue && typeof cellValue.text === 'string') {
-                        rowData[header] = cellValue.text;
-                     }
-                     // 日期类型保留原样，便于验证处理
-                     else if (cellValue instanceof Date) {
-                        rowData[header] = cellValue;
-                     }
-                     // 其他对象类型
-                     else {
-                        rowData[header] = cellValue;
-                     }
-                  } else {
-                     rowData[header] = cellValue;
-                  }
-               } else {
-                  rowData[header] = null;
-               }
-               rowDataArray.push(rowData[header]);
-            }
-         });
-         excelData.push(rowData);
-         excelRows.push(rowDataArray);
-      }
+      });
+      excelData.push(rowData);
    });
 
-   return { workbook, worksheet, headers, excelData, excelRows };
+   return {
+      headers: normalized.headers,
+      excelData,
+      excelRows: normalized.rows,
+   };
 };
 
 /**
@@ -170,7 +96,8 @@ export const validateExcel = async (
    rules?: Record<string, ValidateRule>,
 ): Promise<{
    hasError: boolean;
-   errBlob?: Blob;
+   markCells?: Array<{ row: number; col: number; color: string }>;
+   markHeaders?: string[];
 }> => {
    if (!rules || isEmpty(rules)) {
       return { hasError: false };
@@ -203,7 +130,7 @@ export const validateExcel = async (
    // 验证数据（仅验证非缺失字段）
    const validationErrors = await validateExcelData(headers, excelJson, validator);
 
-   // 如果有验证错误或缺失字段，标记错误单元格和表头
+   // 如果有验证错误或缺失字段，返回标记信息
    if (validationErrors.length > 0 || missingFields.length > 0) {
       // 准备需要标记的单元格
       const markCells = validationErrors.map((error) => ({
@@ -212,27 +139,14 @@ export const validateExcel = async (
          color: 'FFFF0000', // 红色
       }));
 
-      // 使用excel-view统一创建标记Excel
-      const markResult = await createMarkedExcelView(
-         excelBuffer,
-         {
-            markCells,
-            markHeaders: missingFields,
-         },
-         'validation_errors.xlsx',
-      );
-
-      if (markResult.success && markResult.blobUrl) {
-         // 从blob URL创建blob对象
-         const response = await fetch(markResult.blobUrl);
-         const errBlob = await response.blob();
-         return { hasError: true, errBlob };
-      } else {
-         return { hasError: true };
-      }
+      return {
+         hasError: true,
+         markCells,
+         markHeaders: missingFields,
+      };
    }
 
-   return { hasError: false }; // 没有错误时返回null
+   return { hasError: false };
 };
 
 type ExcelValidationError = ValidateError & {
@@ -296,7 +210,8 @@ export const checkExcelDuplicates = async (
    url?: IUrlInfo,
 ): Promise<{
    hasError: boolean;
-   errBlob?: Blob;
+   markCells?: Array<{ row: number; col: number; color: string }>;
+   markHeaders?: string[];
 }> => {
    if (!duplicateRules || duplicateRules.length === 0) {
       return { hasError: false };
@@ -328,14 +243,18 @@ export const checkExcelDuplicates = async (
 
    rows.forEach((rowData, index) => {
       // 构建唯一键，将所有重复规则字段的值连接起来
-      const uniqueKey = duplicateRules.map((field) => rowData[field]).join('|');
+      const keyValues = duplicateRules.map((field) => rowData[field]);
+      const uniqueKey = keyValues.join('|');
       allKeys.push(uniqueKey);
 
-      if (uniqueValues.has(uniqueKey)) {
+      // 只检测非空值的重复，避免多个空行被误判为重复
+      const hasValidValue = keyValues.some((value) => value !== null && value !== undefined && value !== '');
+
+      if (hasValidValue && uniqueValues.has(uniqueKey)) {
          // 找到重复行，记录当前索引和第一次出现的索引
          duplicateIndices.add(index); // 添加当前重复行
          duplicateIndices.add(uniqueValues.get(uniqueKey)!); // 添加第一次出现的行
-      } else {
+      } else if (hasValidValue) {
          uniqueValues.set(uniqueKey, index);
       }
    });
@@ -367,33 +286,120 @@ export const checkExcelDuplicates = async (
                markCells.push({
                   row: rowIndex + 2, // Excel行号 = 数组索引 + 2（表头和1-based索引）
                   col: colIndex + 1, // Excel列号 = 数组索引 + 1（1-based索引）
-                  color: 'FFFF0000', // 红色
+                  color: 'FFA500', // 黄橙色
                });
             }
          });
       });
 
-      // 使用excel-view统一创建标记Excel
+      return {
+         hasError: true,
+         markCells,
+         markHeaders: missingDuplicateFields,
+      };
+   }
+
+   return { hasError: false }; // 没有重复数据
+};
+
+/**
+ * 统一验证Excel数据（格式验证和重复验证）
+ * @param excelBuffer Excel文件的ArrayBuffer
+ * @param rules 验证规则
+ * @param duplicateRules 重复规则
+ * @param duplicateUrl 重复检查URL
+ * @returns 统一验证结果
+ */
+export const validateExcelUnified = async (
+   excelBuffer: ArrayBuffer,
+   rules?: Record<string, ValidateRule>,
+   duplicateRules?: string[],
+   duplicateUrl?: IUrlInfo,
+): Promise<{
+   hasError: boolean;
+   errBlob?: Blob;
+   validationMsg: string;
+   duplicateMsg: string;
+}> => {
+   const allMarkCells: Array<{ row: number; col: number; color: string }> = [];
+   const allMarkHeaders: string[] = [];
+   let hasValidationError = false;
+   let hasDuplicateError = false;
+   let validationMsg = '数据验证成功';
+   let duplicateMsg = '数据验证通过';
+
+   // 1. 格式验证
+   const validationResult = await validateExcel(excelBuffer, rules);
+   if (validationResult.hasError) {
+      hasValidationError = true;
+      validationMsg = '数据验证失败';
+      if (validationResult.markCells) {
+         allMarkCells.push(...validationResult.markCells);
+      }
+      if (validationResult.markHeaders) {
+         allMarkHeaders.push(...validationResult.markHeaders);
+      }
+   }
+
+   // 2. 重复验证
+   if (duplicateRules && duplicateRules.length > 0) {
+      const duplicateResult = await checkExcelDuplicates(excelBuffer, duplicateRules, duplicateUrl);
+      if (duplicateResult.hasError) {
+         hasDuplicateError = true;
+         duplicateMsg = '检测到重复数据';
+         if (duplicateResult.markCells) {
+            // 检查是否有重复标记的单元格，如果有则改为深红色
+            duplicateResult.markCells.forEach((duplicateCell) => {
+               const existingCell = allMarkCells.find(
+                  (cell) => cell.row === duplicateCell.row && cell.col === duplicateCell.col,
+               );
+               if (existingCell) {
+                  existingCell.color = '8B0000'; // 深红色
+               } else {
+                  allMarkCells.push(duplicateCell);
+               }
+            });
+         }
+         if (duplicateResult.markHeaders) {
+            allMarkHeaders.push(...duplicateResult.markHeaders);
+         }
+      }
+   }
+
+   // 3. 如果有任何错误，创建统一的标记Excel
+   if (hasValidationError || hasDuplicateError) {
       const markResult = await createMarkedExcelView(
          excelBuffer,
          {
-            markCells,
-            markHeaders: missingDuplicateFields,
+            markCells: allMarkCells,
+            markHeaders: allMarkHeaders,
          },
-         'duplicate_errors.xlsx',
+         'validation_errors.xlsx',
       );
 
       if (markResult.success && markResult.blobUrl) {
-         // 从blob URL创建blob对象
          const response = await fetch(markResult.blobUrl);
          const errBlob = await response.blob();
-         return { hasError: true, errBlob };
+         return {
+            hasError: true,
+            errBlob,
+            validationMsg,
+            duplicateMsg,
+         };
       } else {
-         return { hasError: true };
+         return {
+            hasError: true,
+            validationMsg,
+            duplicateMsg,
+         };
       }
    }
 
-   return { hasError: false }; // 没有重复数据
+   return {
+      hasError: false,
+      validationMsg,
+      duplicateMsg,
+   };
 };
 
 /**

package/lib/assets/modules/index-CKJIxasX.js

@@ -1,333 +0,0 @@
-import D from "async-validator";
-import { httpPost as S, ResStatus as T } from "@skyfox2000/fapi";
-import { i as _, ag as j } from "./uploadList-0f2FA_5s.js";
-import d from "vue-m-message";
-import { defineComponent as C, useAttrs as V, createElementBlock as A, openBlock as U, createVNode as O, unref as F, mergeProps as B } from "vue";
-import { Spin as H } from "ant-design-vue";
-const k = (u) => {
-  const o = u.split(`
-`).filter((i) => i.trim() !== "");
-  if (o.length === 0)
-    return { headers: [], rows: [] };
-  const s = o.map((i) => i.split(",").map((r) => {
-    const e = r.trim();
-    if (e === "" || e === "null") return null;
-    const t = Number(e);
-    return isNaN(t) ? e : t;
-  })), a = s[0].map((i) => String(i || "")), l = s.slice(1);
-  return { headers: a, rows: l };
-}, z = async (u) => {
-  try {
-    const o = await import("exceljs"), s = new o.default.Workbook();
-    await s.xlsx.load(u);
-    const a = s.worksheets[0];
-    if (!a)
-      return { headers: [], rows: [] };
-    const l = [], i = [];
-    return a.getRow(1).eachCell((r) => {
-      let e = "";
-      r.value !== null && r.value !== void 0 && (typeof r.value == "object" ? "richText" in r.value && Array.isArray(r.value.richText) ? e = r.value.richText.map((t) => t.text || "").join("") : "text" in r.value && typeof r.value.text == "string" ? e = r.value.text : r.value instanceof Date ? e = r.value.toLocaleDateString() : e = String(r.value) : e = String(r.value)), l.push(e);
-    }), a.eachRow((r, e) => {
-      if (e > 1) {
-        const t = [];
-        l.forEach((n, c) => {
-          const h = r.getCell(c + 1).value;
-          h != null ? typeof h == "object" ? "richText" in h && Array.isArray(h.richText) ? t.push(h.richText.map((p) => p.text || "").join("")) : "text" in h && typeof h.text == "string" ? t.push(h.text) : (h instanceof Date, t.push(h)) : t.push(h) : t.push(null);
-        }), i.push(t);
-      }
-    }), { headers: l, rows: i };
-  } catch (o) {
-    return console.error("Excel解析失败:", o), { headers: [], rows: [] };
-  }
-}, m = async (u, o, s) => {
-  try {
-    const a = await import("exceljs"), l = new a.default.Workbook(), i = l.addWorksheet("Sheet1"), { headers: r, rows: e } = u;
-    if (r.length === 0)
-      throw new Error("数据为空");
-    const t = /* @__PURE__ */ new Map();
-    s != null && s.markCells && s.markCells.forEach(({ row: p, col: w, color: x }) => {
-      const E = `${p}-${w}`;
-      t.set(E, x || "FFFF0000");
-    });
-    const n = i.getRow(1);
-    r.forEach((p, w) => {
-      const x = n.getCell(w + 1);
-      x.value = p, x.font = { bold: !0 }, x.fill = {
-        type: "pattern",
-        pattern: "solid",
-        fgColor: { argb: "FFE0E0E0" }
-      }, s != null && s.markHeaders && s.markHeaders.includes(p) && (x.fill = {
-        type: "pattern",
-        pattern: "solid",
-        fgColor: { argb: "FFFF0000" }
-      }, x.font = {
-        name: "Arial",
-        size: 10,
-        bold: !0,
-        color: { argb: "FFFFFFFF" }
-      });
-    }), e.forEach((p, w) => {
-      const x = i.getRow(w + 2);
-      p.forEach((E, b) => {
-        const y = x.getCell(b + 1);
-        y.value = E;
-        const v = `${w + 2}-${b + 1}`;
-        t.has(v) && (y.fill = {
-          type: "pattern",
-          pattern: "solid",
-          fgColor: { argb: t.get(v) }
-        });
-      });
-    }), i.columns.forEach((p) => {
-      p.width = 15;
-    });
-    const c = await l.xlsx.writeBuffer(), f = new Blob([c], {
-      type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
-    });
-    return {
-      success: !0,
-      blobUrl: URL.createObjectURL(f),
-      fileName: o.replace(/\.(csv|xlsx?)$/i, ".xlsx")
-    };
-  } catch (a) {
-    return console.error("转换Excel失败:", a), {
-      success: !1,
-      error: a instanceof Error ? a.message : "未知错误"
-    };
-  }
-}, N = async (u, o) => {
-  try {
-    const s = k(u);
-    return await m(s, o);
-  } catch (s) {
-    return {
-      success: !1,
-      error: s instanceof Error ? s.message : "CSV处理失败"
-    };
-  }
-}, M = async (u, o) => {
-  try {
-    const s = new Blob([u], {
-      type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
-    });
-    return {
-      success: !0,
-      blobUrl: URL.createObjectURL(s),
-      fileName: o
-    };
-  } catch (s) {
-    return {
-      success: !1,
-      error: s instanceof Error ? s.message : "Excel处理失败"
-    };
-  }
-}, $ = async (u, o) => await m(u, o), X = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
-  __proto__: null,
-  csvToExcelView: N,
-  csvToNormalized: k,
-  excelToExcelView: M,
-  excelToNormalized: z,
-  normalizedToExcelView: $,
-  toExcel: m
-}, Symbol.toStringTag, { value: "Module" })), g = async (u) => {
-  const o = await import("exceljs"), s = new o.default.Workbook();
-  await s.xlsx.load(u);
-  const a = s.worksheets[0];
-  if (!a)
-    return d.error("Excel文件不包含工作表"), null;
-  const l = [], i = [], r = [];
-  return a.getRow(1).eachCell((e) => {
-    let t = "";
-    if (e.value !== null && e.value !== void 0)
-      if (typeof e.value == "object")
-        if ("richText" in e.value && Array.isArray(e.value.richText))
-          t = e.value.richText.map((n) => n.text || "").join("");
-        else if ("text" in e.value && typeof e.value.text == "string")
-          t = e.value.text;
-        else if (e.value instanceof Date)
-          t = e.value.toLocaleDateString();
-        else
-          try {
-            t = JSON.stringify(e.value);
-          } catch {
-            t = String(e.value);
-          }
-      else
-        t = String(e.value);
-    l.push(t);
-  }), a.eachRow((e, t) => {
-    if (t > 1) {
-      const n = {}, c = [];
-      l.forEach((f, h) => {
-        if (f) {
-          const w = e.getCell(h + 1).value;
-          w != null ? typeof w == "object" ? "richText" in w && Array.isArray(w.richText) ? n[f] = w.richText.map((x) => x.text || "").join("") : "text" in w && typeof w.text == "string" ? n[f] = w.text : (w instanceof Date, n[f] = w) : n[f] = w : n[f] = null, c.push(n[f]);
-        }
-      }), i.push(n), r.push(c);
-    }
-  }), { workbook: s, worksheet: a, headers: l, excelData: i, excelRows: r };
-}, R = async (u, o, s) => {
-  const a = await g(u);
-  if (!a)
-    return { success: !1, error: "Excel文件处理失败" };
-  const { headers: l, excelRows: i } = a, { markHeaders: r } = o, e = [...l];
-  r && r.length > 0 && r.forEach((n) => {
-    e.includes(n) || e.push(n);
-  });
-  const t = i.map((n) => {
-    const c = [...n];
-    for (; c.length < e.length; )
-      c.push(null);
-    return c;
-  });
-  return await m({ headers: e, rows: t }, s, o);
-}, Y = async (u, o) => {
-  if (!o || _(o))
-    return { hasError: !1 };
-  const s = await g(u);
-  if (!s) return { hasError: !0 };
-  const { headers: a, excelData: l } = s, i = [];
-  if (Object.keys(o).forEach((t) => {
-    a.includes(t) || i.push(t);
-  }), a.length === 0 || l.length === 0)
-    return d.error("Excel文件不包含足够的数据"), { hasError: !0 };
-  const r = new D({});
-  r.messages(j.messages()), r.define(o);
-  const e = await L(a, l, r);
-  if (e.length > 0 || i.length > 0) {
-    const t = e.map((c) => ({
-      row: c.row + 2,
-      // 转为Excel行号（+2是因为表头占一行，且是1-based索引）
-      col: c.col + 1,
-      // 转为Excel列号（+1是因为是1-based索引）
-      color: "FFFF0000"
-      // 红色
-    })), n = await R(
-      u,
-      {
-        markCells: t,
-        markHeaders: i
-      },
-      "validation_errors.xlsx"
-    );
-    return n.success && n.blobUrl ? { hasError: !0, errBlob: await (await fetch(n.blobUrl)).blob() } : { hasError: !0 };
-  }
-  return { hasError: !1 };
-}, L = async (u, o, s) => {
-  const a = [];
-  for (let l = 0; l < o.length; l++) {
-    const i = o[l];
-    try {
-      await s.validate(i).catch(({ errors: r }) => {
-        const e = [];
-        r.forEach((t) => {
-          const n = u.indexOf(t.field);
-          n >= 0 && (e.some((f) => f.row === l && f.col === n) || e.push({
-            row: l,
-            col: n,
-            header: t.field,
-            message: t.message.replace("${label}", u[n])
-          }));
-        }), a.push(...e);
-      });
-    } catch (r) {
-      console.error("验证表格数据时发生错误:", r), d.error("验证表格数据时发生错误:" + r);
-    }
-  }
-  return a;
-}, Z = async (u, o, s) => {
-  if (!o || o.length === 0)
-    return { hasError: !1 };
-  const a = await g(u);
-  if (!a) return { hasError: !0 };
-  const { headers: l, excelData: i } = a, r = [];
-  if (o.forEach((c) => {
-    l.includes(c) || r.push(c);
-  }), r.length > 0)
-    return d.error(`表头缺少重复检测所需字段: ${r.join(", ")}`), { hasError: !0 };
-  const e = /* @__PURE__ */ new Map(), t = /* @__PURE__ */ new Set(), n = new Array();
-  if (i.forEach((c, f) => {
-    const h = o.map((p) => c[p]).join("|");
-    n.push(h), e.has(h) ? (t.add(f), t.add(e.get(h))) : e.set(h, f);
-  }), s) {
-    const c = await S(s, {
-      Data: n
-    });
-    if (c != null && c.data && c.data.forEach((f) => {
-      t.add(f);
-    }), (c == null ? void 0 : c.status) === T.ERROR)
-      throw new Error(c.msg);
-  }
-  if (t.size > 0) {
-    const c = [];
-    t.forEach((h) => {
-      o.forEach((p) => {
-        const w = l.indexOf(p);
-        w >= 0 && c.push({
-          row: h + 2,
-          // Excel行号 = 数组索引 + 2（表头和1-based索引）
-          col: w + 1,
-          // Excel列号 = 数组索引 + 1（1-based索引）
-          color: "FFFF0000"
-          // 红色
-        });
-      });
-    });
-    const f = await R(
-      u,
-      {
-        markCells: c,
-        markHeaders: r
-      },
-      "duplicate_errors.xlsx"
-    );
-    return f.success && f.blobUrl ? { hasError: !0, errBlob: await (await fetch(f.blobUrl)).blob() } : { hasError: !0 };
-  }
-  return { hasError: !1 };
-}, I = async (u, o, s) => {
-  const a = u.originFileObj;
-  if (a) {
-    const l = await a.arrayBuffer(), i = await g(l);
-    if (!i) {
-      d.error("上传的文件不是Excel文件");
-      return;
-    }
-    const { headers: r, excelRows: e, excelData: t } = i;
-    s && s.length > 0 ? s.forEach((n) => {
-      switch (n) {
-        case "Headers":
-          o.Headers = r;
-          break;
-        case "RawRows":
-          o.RawRows = e;
-          break;
-        case "Records":
-          o.Records = t;
-          break;
-      }
-    }) : (o.Headers = r, o.RawRows = e, o.Records = t);
-  }
-}, J = { class: "absolute z-[9999] w-full h-full top-0 flex flex-flow row items-center justify-center" }, ee = /* @__PURE__ */ C({
-  __name: "index",
-  setup(u) {
-    const o = V();
-    return (s, a) => (U(), A("div", J, [
-      O(F(H), B({ style: { "margin-top": "-10%" } }, F(o)), null, 16)
-    ]));
-  }
-});
-export {
-  ee as _,
-  Z as a,
-  I as b,
-  N as c,
-  R as d,
-  k as e,
-  z as f,
-  M as g,
-  X as h,
-  $ as n,
-  g as p,
-  m as t,
-  Y as v
-};