@skyfox2000/webui 1.3.3 → 1.3.4

package/src/utils/form-excel.ts

@@ -7,23 +7,9 @@ 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';
 
-/**
- * Excel数据处理需要标记的单元格
- */
-export type ExcelMarkCell = {
-   row: number;
-   col: number;
-   color?: string;
-};
-
-/**
- * Excel标记类型
- */
-export type ExcelMarkInfo = {
-   markCells: ExcelMarkCell[];
-   markHeaders?: string[];
-};
+// ExcelMarkCell 和 ExcelMarkInfo 类型已移至 excel-view.ts 统一管理
 
 /**
  * 处理Excel文件的通用函数，用于提取表头和数据
@@ -133,31 +119,23 @@ export const processExcelFile = async (excelBuffer: ArrayBuffer) => {
 };
 
 /**
- * 生成标记了错误/重复数据的Excel文件
+ * 创建带错误标记的Excel预览
  * @param excelBuffer 原始Excel文件的ArrayBuffer
- * @param markInfo 标记信息，包含要标记的单元格和表头
- * @returns 标记后的Excel文件Blob
+ * @param markInfo 标记信息
+ * @param fileName 文件名
+ * @returns 标记后的Excel预览结果
  */
-export const createMarkedExcelBlob = async (
-   excelBuffer: ArrayBuffer,
-   markInfo: ExcelMarkInfo,
-): Promise<{
-   hasError: boolean;
-   errBlob?: Blob;
-}> => {
-   const ExcelJS = await import('exceljs');
-   // 处理Excel文件
+export const createMarkedExcelView = async (excelBuffer: ArrayBuffer, markInfo: ExcelMarkInfo, fileName: string) => {
+   // 处理Excel文件获取数据
    const excelData = await processExcelFile(excelBuffer);
-   if (!excelData) return { hasError: true };
-
-   const { worksheet, headers: originalHeaders } = excelData;
-   const { markCells, markHeaders } = markInfo;
-
-   if (markCells.length === 0 && (!markHeaders || markHeaders.length === 0)) {
-      return { hasError: false }; // 没有需要标记的内容
+   if (!excelData) {
+      return { success: false, error: 'Excel文件处理失败' };
    }
 
-   // 处理缺失字段，将缺失字段添加到headers中
+   const { headers: originalHeaders, excelRows } = excelData;
+   const { markHeaders } = markInfo;
+
+   // 处理缺失字段，添加到表头
    const headers = [...originalHeaders];
    if (markHeaders && markHeaders.length > 0) {
       markHeaders.forEach((field) => {
@@ -167,158 +145,18 @@ export const createMarkedExcelBlob = async (
       });
    }
 
-   // 创建一个新的工作簿和工作表
-   const newWorkbook = new ExcelJS.default.Workbook();
-   const newWorksheet = newWorkbook.addWorksheet('Sheet1');
-
-   // 默认列宽
-   const defaultColumnWidth = 15;
-
-   // 创建错误单元格位置的查询表，用于快速检查
-   const cellMarkMap = new Map<string, string>();
-   markCells.forEach(({ row, col, color }) => {
-      const cellKey = `${row}-${col}`;
-      cellMarkMap.set(cellKey, color || 'FFFF0000'); // 默认红色
-   });
-
-   // 复制列宽并应用于新工作表
-   for (let i = 0; i < headers.length; i++) {
-      const column = newWorksheet.getColumn(i + 1);
-
-      if (i < worksheet.columnCount && i < originalHeaders.length) {
-         const originalCol = worksheet.getColumn(i + 1);
-         if (originalCol && originalCol.width) {
-            column.width = originalCol.width;
-         } else {
-            column.width = defaultColumnWidth;
-         }
-      } else {
-         column.width = defaultColumnWidth;
-      }
-   }
-
-   // 复制表头行
-   const headerRow = newWorksheet.getRow(1);
-   headers.forEach((header, index) => {
-      const headerCell = headerRow.getCell(index + 1);
-      headerCell.value = header;
-
-      const isOriginalHeader = index < originalHeaders.length;
-      if (isOriginalHeader && index < worksheet.columnCount) {
-         // 复制原表头样式
-         const originalCell = worksheet.getRow(1).getCell(index + 1);
-
-         // 复制样式
-         if (originalCell.style) headerCell.style = JSON.parse(JSON.stringify(originalCell.style));
-         if (originalCell.font) headerCell.font = JSON.parse(JSON.stringify(originalCell.font));
-         if (originalCell.alignment) headerCell.alignment = JSON.parse(JSON.stringify(originalCell.alignment));
-         if (originalCell.border) headerCell.border = JSON.parse(JSON.stringify(originalCell.border));
-         if (originalCell.numFmt) headerCell.numFmt = originalCell.numFmt;
-         if (originalCell.fill) headerCell.fill = JSON.parse(JSON.stringify(originalCell.fill));
-      }
-
-      // 仅标记缺失的表头字段，不标记数据重复的表头
-      if (markHeaders && markHeaders.includes(header) && !isOriginalHeader) {
-         headerCell.fill = {
-            type: 'pattern',
-            pattern: 'solid',
-            fgColor: { argb: 'FFFF0000' }, // 红色背景
-         };
-
-         // 添加白色文字
-         headerCell.font = {
-            name: 'Arial',
-            size: 10,
-            bold: true,
-            color: { argb: 'FFFFFFFF' }, // 白色文字
-         };
+   // 扩展数据行以匹配新的表头长度
+   const rows = excelRows.map((row) => {
+      const newRow = [...row];
+      // 为新增的表头字段添加空值
+      while (newRow.length < headers.length) {
+         newRow.push(null);
       }
+      return newRow;
    });
-   headerRow.commit();
-
-   // 处理数据行
-   worksheet.eachRow((row, rowNumber) => {
-      if (rowNumber > 1) {
-         // 跳过表头行
-         const newRow = newWorksheet.getRow(rowNumber);
-
-         // 使用表头长度来循环每个单元格
-         for (let colIndex = 0; colIndex < headers.length; colIndex++) {
-            const newCell = newRow.getCell(colIndex + 1);
-            const isOriginalHeader = colIndex < originalHeaders.length;
-
-            if (isOriginalHeader && colIndex < worksheet.columnCount) {
-               // 对原始数据中存在的列
-               const originalCell = row.getCell(colIndex + 1);
-
-               // 复制值
-               newCell.value = originalCell.value;
-
-               // 处理对象类型的单元格值，确保正确显示
-               if (newCell.value !== null && newCell.value !== undefined && typeof newCell.value === 'object') {
-                  // 对于RichText，保留原格式
-                  if (
-                     !('richText' in newCell.value) &&
-                     !('formula' in newCell.value) &&
-                     !('hyperlink' in newCell.value) &&
-                     !(newCell.value instanceof Date)
-                  ) {
-                     // 尝试转换为字符串显示
-                     try {
-                        if ('text' in newCell.value && typeof newCell.value.text === 'string') {
-                           newCell.value = newCell.value.text;
-                        } else {
-                           // 其他对象类型尝试JSON序列化
-                           newCell.value = JSON.stringify(newCell.value);
-                        }
-                     } catch {
-                        // 如果转换失败，使用toString
-                        newCell.value = String(newCell.value);
-                     }
-                  }
-               }
 
-               // 复制样式
-               if (originalCell.style) newCell.style = JSON.parse(JSON.stringify(originalCell.style));
-               if (originalCell.font) newCell.font = JSON.parse(JSON.stringify(originalCell.font));
-               if (originalCell.alignment) newCell.alignment = JSON.parse(JSON.stringify(originalCell.alignment));
-               if (originalCell.border) newCell.border = JSON.parse(JSON.stringify(originalCell.border));
-               if (originalCell.numFmt) newCell.numFmt = originalCell.numFmt;
-               if (originalCell.fill) newCell.fill = JSON.parse(JSON.stringify(originalCell.fill));
-
-               // 检查是否为需要标记的单元格
-               const cellKey = `${rowNumber}-${colIndex + 1}`;
-               if (cellMarkMap.has(cellKey)) {
-                  // 设置背景颜色
-                  newCell.fill = {
-                     type: 'pattern',
-                     pattern: 'solid',
-                     fgColor: { argb: cellMarkMap.get(cellKey) },
-                  };
-               }
-            } else {
-               // 为新增列设置空值
-               newCell.value = null;
-            }
-         }
-
-         // 复制行属性
-         if (row.height) newRow.height = row.height;
-         if (row.outlineLevel) newRow.outlineLevel = row.outlineLevel;
-
-         newRow.commit();
-      }
-   });
-
-   // 生成Excel文件Buffer
-   const excelOutput = await newWorkbook.xlsx.writeBuffer();
-
-   // 创建Blob对象
-   const excelBlob = new Blob([excelOutput], {
-      type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-   });
-
-   return { hasError: true, errBlob: excelBlob };
+   // 调用excel-view的方法生成带标记的Excel
+   return await toExcel({ headers, rows }, fileName, markInfo);
 };
 
 /**
@@ -374,11 +212,24 @@ export const validateExcel = async (
          color: 'FFFF0000', // 红色
       }));
 
-      // 创建标记过的Excel文件，确保传入所有表头（包括缺失的）
-      return createMarkedExcelBlob(excelBuffer, {
-         markCells,
-         markHeaders: missingFields,
-      });
+      // 使用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: false }; // 没有错误时返回null
@@ -522,8 +373,24 @@ export const checkExcelDuplicates = async (
          });
       });
 
-      // 创建标记过的Excel文件
-      return createMarkedExcelBlob(excelBuffer, { markCells, markHeaders: missingDuplicateFields });
+      // 使用excel-view统一创建标记Excel
+      const markResult = await createMarkedExcelView(
+         excelBuffer,
+         {
+            markCells,
+            markHeaders: missingDuplicateFields,
+         },
+         'duplicate_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: false }; // 没有重复数据

package/vite.config.ts

@@ -47,7 +47,6 @@ export default defineConfig(({ mode }: ConfigEnv) => {
             '@': path.resolve('./src'),
             '@skyfox2000/fapi': path.resolve('../502417_fapi'),
             '@skyfox2000/microbase': path.resolve('../502424_MicroBase'),
-            '@skyfox2000/webbase': path.resolve('../502428_WebBase'),
          },
          extensions: ['.js', '.ts', '.vue', 'json'],
       },

package/lib/assets/modules/form-excel-D1vXB4c4.js

@@ -1,235 +0,0 @@
-import k from "async-validator";
-import { httpPost as J, ResStatus as C } from "@skyfox2000/fapi";
-import { i as N, ag as R } from "./uploadList-DA4TRDWR.js";
-import E from "vue-m-message";
-const F = async (d) => {
-  const o = await import("exceljs"), g = new o.default.Workbook();
-  await g.xlsx.load(d);
-  const c = g.worksheets[0];
-  if (!c)
-    return E.error("Excel文件不包含工作表"), null;
-  const s = [], h = [], i = [];
-  return c.getRow(1).eachCell((e) => {
-    let r = "";
-    if (e.value !== null && e.value !== void 0)
-      if (typeof e.value == "object")
-        if ("richText" in e.value && Array.isArray(e.value.richText))
-          r = e.value.richText.map((a) => a.text || "").join("");
-        else if ("text" in e.value && typeof e.value.text == "string")
-          r = e.value.text;
-        else if (e.value instanceof Date)
-          r = e.value.toLocaleDateString();
-        else
-          try {
-            r = JSON.stringify(e.value);
-          } catch {
-            r = String(e.value);
-          }
-      else
-        r = String(e.value);
-    s.push(r);
-  }), c.eachRow((e, r) => {
-    if (r > 1) {
-      const a = {}, n = [];
-      s.forEach((l, y) => {
-        if (l) {
-          const m = e.getCell(y + 1).value;
-          m != null ? typeof m == "object" ? "richText" in m && Array.isArray(m.richText) ? a[l] = m.richText.map((O) => O.text || "").join("") : "text" in m && typeof m.text == "string" ? a[l] = m.text : (m instanceof Date, a[l] = m) : a[l] = m : a[l] = null, n.push(a[l]);
-        }
-      }), h.push(a), i.push(n);
-    }
-  }), { workbook: g, worksheet: c, headers: s, excelData: h, excelRows: i };
-}, b = async (d, o) => {
-  const g = await import("exceljs"), c = await F(d);
-  if (!c) return { hasError: !0 };
-  const { worksheet: s, headers: h } = c, { markCells: i, markHeaders: e } = o;
-  if (i.length === 0 && (!e || e.length === 0))
-    return { hasError: !1 };
-  const r = [...h];
-  e && e.length > 0 && e.forEach((f) => {
-    r.includes(f) || r.push(f);
-  });
-  const a = new g.default.Workbook(), n = a.addWorksheet("Sheet1"), l = 15, y = /* @__PURE__ */ new Map();
-  i.forEach(({ row: f, col: p, color: u }) => {
-    const v = `${f}-${p}`;
-    y.set(v, u || "FFFF0000");
-  });
-  for (let f = 0; f < r.length; f++) {
-    const p = n.getColumn(f + 1);
-    if (f < s.columnCount && f < h.length) {
-      const u = s.getColumn(f + 1);
-      u && u.width ? p.width = u.width : p.width = l;
-    } else
-      p.width = l;
-  }
-  const x = n.getRow(1);
-  r.forEach((f, p) => {
-    const u = x.getCell(p + 1);
-    u.value = f;
-    const v = p < h.length;
-    if (v && p < s.columnCount) {
-      const t = s.getRow(1).getCell(p + 1);
-      t.style && (u.style = JSON.parse(JSON.stringify(t.style))), t.font && (u.font = JSON.parse(JSON.stringify(t.font))), t.alignment && (u.alignment = JSON.parse(JSON.stringify(t.alignment))), t.border && (u.border = JSON.parse(JSON.stringify(t.border))), t.numFmt && (u.numFmt = t.numFmt), t.fill && (u.fill = JSON.parse(JSON.stringify(t.fill)));
-    }
-    e && e.includes(f) && !v && (u.fill = {
-      type: "pattern",
-      pattern: "solid",
-      fgColor: { argb: "FFFF0000" }
-      // 红色背景
-    }, u.font = {
-      name: "Arial",
-      size: 10,
-      bold: !0,
-      color: { argb: "FFFFFFFF" }
-      // 白色文字
-    });
-  }), x.commit(), s.eachRow((f, p) => {
-    if (p > 1) {
-      const u = n.getRow(p);
-      for (let v = 0; v < r.length; v++) {
-        const t = u.getCell(v + 1);
-        if (v < h.length && v < s.columnCount) {
-          const w = f.getCell(v + 1);
-          if (t.value = w.value, t.value !== null && t.value !== void 0 && typeof t.value == "object" && !("richText" in t.value) && !("formula" in t.value) && !("hyperlink" in t.value) && !(t.value instanceof Date))
-            try {
-              "text" in t.value && typeof t.value.text == "string" ? t.value = t.value.text : t.value = JSON.stringify(t.value);
-            } catch {
-              t.value = String(t.value);
-            }
-          w.style && (t.style = JSON.parse(JSON.stringify(w.style))), w.font && (t.font = JSON.parse(JSON.stringify(w.font))), w.alignment && (t.alignment = JSON.parse(JSON.stringify(w.alignment))), w.border && (t.border = JSON.parse(JSON.stringify(w.border))), w.numFmt && (t.numFmt = w.numFmt), w.fill && (t.fill = JSON.parse(JSON.stringify(w.fill)));
-          const S = `${p}-${v + 1}`;
-          y.has(S) && (t.fill = {
-            type: "pattern",
-            pattern: "solid",
-            fgColor: { argb: y.get(S) }
-          });
-        } else
-          t.value = null;
-      }
-      f.height && (u.height = f.height), f.outlineLevel && (u.outlineLevel = f.outlineLevel), u.commit();
-    }
-  });
-  const m = await a.xlsx.writeBuffer();
-  return { hasError: !0, errBlob: new Blob([m], {
-    type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
-  }) };
-}, W = async (d, o) => {
-  if (!o || N(o))
-    return { hasError: !1 };
-  const g = await F(d);
-  if (!g) return { hasError: !0 };
-  const { headers: c, excelData: s } = g, h = [];
-  if (Object.keys(o).forEach((r) => {
-    c.includes(r) || h.push(r);
-  }), c.length === 0 || s.length === 0)
-    return E.error("Excel文件不包含足够的数据"), { hasError: !0 };
-  const i = new k({});
-  i.messages(R.messages()), i.define(o);
-  const e = await D(c, s, i);
-  if (e.length > 0 || h.length > 0) {
-    const r = e.map((a) => ({
-      row: a.row + 2,
-      // 转为Excel行号（+2是因为表头占一行，且是1-based索引）
-      col: a.col + 1,
-      // 转为Excel列号（+1是因为是1-based索引）
-      color: "FFFF0000"
-      // 红色
-    }));
-    return b(d, {
-      markCells: r,
-      markHeaders: h
-    });
-  }
-  return { hasError: !1 };
-}, D = async (d, o, g) => {
-  const c = [];
-  for (let s = 0; s < o.length; s++) {
-    const h = o[s];
-    try {
-      await g.validate(h).catch(({ errors: i }) => {
-        const e = [];
-        i.forEach((r) => {
-          const a = d.indexOf(r.field);
-          a >= 0 && (e.some((l) => l.row === s && l.col === a) || e.push({
-            row: s,
-            col: a,
-            header: r.field,
-            message: r.message.replace("${label}", d[a])
-          }));
-        }), c.push(...e);
-      });
-    } catch (i) {
-      console.error("验证表格数据时发生错误:", i), E.error("验证表格数据时发生错误:" + i);
-    }
-  }
-  return c;
-}, $ = async (d, o, g) => {
-  if (!o || o.length === 0)
-    return { hasError: !1 };
-  const c = await F(d);
-  if (!c) return { hasError: !0 };
-  const { headers: s, excelData: h } = c, i = [];
-  if (o.forEach((n) => {
-    s.includes(n) || i.push(n);
-  }), i.length > 0)
-    return E.error(`表头缺少重复检测所需字段: ${i.join(", ")}`), { hasError: !0 };
-  const e = /* @__PURE__ */ new Map(), r = /* @__PURE__ */ new Set(), a = new Array();
-  if (h.forEach((n, l) => {
-    const y = o.map((x) => n[x]).join("|");
-    a.push(y), e.has(y) ? (r.add(l), r.add(e.get(y))) : e.set(y, l);
-  }), g) {
-    const n = await J(g, {
-      Data: a
-    });
-    if (n != null && n.data && n.data.forEach((l) => {
-      r.add(l);
-    }), (n == null ? void 0 : n.status) === C.ERROR)
-      throw new Error(n.msg);
-  }
-  if (r.size > 0) {
-    const n = [];
-    return r.forEach((l) => {
-      o.forEach((y) => {
-        const x = s.indexOf(y);
-        x >= 0 && n.push({
-          row: l + 2,
-          // Excel行号 = 数组索引 + 2（表头和1-based索引）
-          col: x + 1,
-          // Excel列号 = 数组索引 + 1（1-based索引）
-          color: "FFFF0000"
-          // 红色
-        });
-      });
-    }), b(d, { markCells: n, markHeaders: i });
-  }
-  return { hasError: !1 };
-}, B = async (d, o, g) => {
-  const c = d.originFileObj;
-  if (c) {
-    const s = await c.arrayBuffer(), h = await F(s);
-    if (!h) {
-      E.error("上传的文件不是Excel文件");
-      return;
-    }
-    const { headers: i, excelRows: e, excelData: r } = h;
-    g && g.length > 0 ? g.forEach((a) => {
-      switch (a) {
-        case "Headers":
-          o.Headers = i;
-          break;
-        case "RawRows":
-          o.RawRows = e;
-          break;
-        case "Records":
-          o.Records = r;
-          break;
-      }
-    }) : (o.Headers = i, o.RawRows = e, o.Records = r);
-  }
-};
-export {
-  B as a,
-  $ as c,
-  F as p,
-  W as v
-};