@chenchaolong/plugin-trade-compliance-workbench 1.0.34 → 1.0.35

package/dist/lib/remote-components/trade-compliance-workbench/editor-source.mjs

@@ -76,8 +76,8 @@ function cellStyle(cell) {
   if (font.strike) style.st = { s: 1 }
   const fontColor = color(font.color)
   if (fontColor) style.cl = { rgb: fontColor }
-  const fillColor = color(fill.fgColor || fill.bgColor)
-  if (fillColor) style.bg = { rgb: fillColor }
+  const fillColorValue = fillColor(fill)
+  if (fillColorValue) style.bg = { rgb: fillColorValue }
   const horizontal = horizontalAlign(alignment.horizontal)
   if (horizontal) style.ht = horizontal
   const vertical = verticalAlign(alignment.vertical)
@@ -90,7 +90,17 @@ function cellStyle(cell) {
 
 function color(value) {
   const argb = typeof value?.argb === 'string' ? value.argb : ''
-  return argb.length === 8 ? argb.slice(2) : argb || undefined
+  const raw = argb.length === 8 ? argb.substring(2) : argb
+  const rgb = raw.trim().replace(/^#/, '').toUpperCase()
+  if (!/^[0-9A-F]{6}$/.test(rgb)) return undefined
+  return `#${rgb}`
+}
+
+function fillColor(fill) {
+  if (!fill || fill.type !== 'pattern' || fill.pattern === 'none') return undefined
+  const normalized = color(fill.fgColor || fill.bgColor)
+  if (normalized === '#FFFFFF') return undefined
+  return normalized
 }
 
 function horizontalAlign(value) {
@@ -106,7 +116,7 @@ function borderStyle(border) {
   const map = { top: 't', right: 'r', bottom: 'b', left: 'l' }
   for (const [excelKey, univerKey] of Object.entries(map)) {
     const side = border[excelKey]
-    if (side?.style) result[univerKey] = { s: side.style === 'medium' || side.style === 'thick' ? 2 : 1, cl: { rgb: color(side.color) || '000000' } }
+    if (side?.style) result[univerKey] = { s: side.style === 'medium' || side.style === 'thick' ? 2 : 1, cl: { rgb: color(side.color) || '#000000' } }
   }
   return Object.keys(result).length ? result : undefined
 }