fix: 报表文字颜色/背景色设置无效-颜色选择器@change未传值导致style.color/bgColor写入undefined,改为读取v-model最新值写入选中单元格(支持清空)+预览补全underline/fontName样式与颜色空值防御(HTML+Excel)

Co-Authored-By: Claude Code <noreply@anthropic.com>

Author: pythonHuang

Juggle.Application/Services/Impl/ReportExecutionService.cs

@@ -397,10 +397,12 @@ private static string ReadCellStyle(JsonElement cell)
         {
             if (sEl.TryGetProperty("bold", out var b) && b.ValueKind == JsonValueKind.True) style += "font-weight:bold;";
             if (sEl.TryGetProperty("italic", out var it) && it.ValueKind == JsonValueKind.True) style += "font-style:italic;";
-            if (sEl.TryGetProperty("fontSize", out var fs)) style += $"font-size:{fs.GetInt32()}px;";
-            if (sEl.TryGetProperty("color", out var cl)) style += $"color:{cl.GetString()};";
-            if (sEl.TryGetProperty("bgColor", out var bg)) style += $"background-color:{bg.GetString()};";
-            if (sEl.TryGetProperty("align", out var al)) style += $"text-align:{al.GetString()};";
+            if (sEl.TryGetProperty("underline", out var un) && un.ValueKind == JsonValueKind.True) style += "text-decoration:underline;";
+            if (sEl.TryGetProperty("fontSize", out var fs) && fs.ValueKind == JsonValueKind.Number) style += $"font-size:{fs.GetInt32()}px;";
+            if (sEl.TryGetProperty("fontName", out var fn) && fn.ValueKind == JsonValueKind.String) style += $"font-family:{fn.GetString()};";
+            if (sEl.TryGetProperty("color", out var cl) && cl.ValueKind == JsonValueKind.String) style += $"color:{cl.GetString()};";
+            if (sEl.TryGetProperty("bgColor", out var bg) && bg.ValueKind == JsonValueKind.String) style += $"background-color:{bg.GetString()};";
+            if (sEl.TryGetProperty("align", out var al) && al.ValueKind == JsonValueKind.String) style += $"text-align:{al.GetString()};";
             if (sEl.TryGetProperty("border", out var bd) && bd.ValueKind == JsonValueKind.False) style = style.Replace("border:1px solid #ccc;", "");
         }
         return style;
@@ -460,10 +462,13 @@ private static byte[] ExportExcelCore(JsonElement root, Dictionary<string, DataT
                 if (cell.TryGetProperty("style", out var se))
                 {
                     if (se.TryGetProperty("bold", out var b) && b.ValueKind == JsonValueKind.True) xlCell.Style.Font.Bold = true;
-                    if (se.TryGetProperty("fontSize", out var fs)) xlCell.Style.Font.FontSize = fs.GetDouble();
-                    if (se.TryGetProperty("color", out var cl)) xlCell.Style.Font.FontColor = XLColor.FromHtml(cl.GetString()!);
-                    if (se.TryGetProperty("bgColor", out var bg)) xlCell.Style.Fill.BackgroundColor = XLColor.FromHtml(bg.GetString()!);
-                    if (se.TryGetProperty("align", out var al))
+                    if (se.TryGetProperty("italic", out var it) && it.ValueKind == JsonValueKind.True) xlCell.Style.Font.Italic = true;
+                    if (se.TryGetProperty("underline", out var un) && un.ValueKind == JsonValueKind.True) xlCell.Style.Font.Underline = XLFontUnderlineValues.Single;
+                    if (se.TryGetProperty("fontSize", out var fs) && fs.ValueKind == JsonValueKind.Number) xlCell.Style.Font.FontSize = fs.GetDouble();
+                    if (se.TryGetProperty("fontName", out var fn) && fn.ValueKind == JsonValueKind.String) xlCell.Style.Font.FontName = fn.GetString()!;
+                    if (se.TryGetProperty("color", out var cl) && cl.ValueKind == JsonValueKind.String) xlCell.Style.Font.FontColor = XLColor.FromHtml(cl.GetString()!);
+                    if (se.TryGetProperty("bgColor", out var bg) && bg.ValueKind == JsonValueKind.String) xlCell.Style.Fill.BackgroundColor = XLColor.FromHtml(bg.GetString()!);
+                    if (se.TryGetProperty("align", out var al) && al.ValueKind == JsonValueKind.String)
                         xlCell.Style.Alignment.Horizontal = al.GetString() switch
                         {
                             "center" => XLAlignmentHorizontalValues.Center,

JuggleNet6.Frontend/src/views/report/ReportDesigner.vue

@@ -57,8 +57,8 @@
             <el-button :type="italicActive?'primary':''" @click="applyStyle('italic')"><i>I</i></el-button>
             <el-button @click="applyStyle('underline')"><u>U</u></el-button>
           </el-button-group>
-          <el-color-picker v-model="selColor" size="small" @change="applyStyle('color')" />
-          <el-color-picker v-model="selBgColor" size="small" @change="applyStyle('bgColor')" />
+          <el-color-picker v-model="selColor" size="small" @change="onColorChange('color')" />
+          <el-color-picker v-model="selBgColor" size="small" @change="onColorChange('bgColor')" />
           <el-button-group size="small">
             <el-button @click="applyStyle('align','left')">左</el-button>
             <el-button @click="applyStyle('align','center')">中</el-button>
@@ -771,11 +771,17 @@ function applyStyle(prop:string, val?:any) {
     if (prop==='bold') { style.bold = val!==undefined?val:!style.bold; boldActive.value=style.bold }
     else if (prop==='italic') { style.italic = val!==undefined?val:!style.italic; italicActive.value=style.italic }
     else if (prop==='underline') { style.underline = val!==undefined?val:!style.underline }
+    else if (val===null || val===undefined) { delete (style as any)[prop] }   // 清除颜色等
     else { (style as any)[prop] = val }
     cells.value[key] = {...existing, style}
   })
 }
 
+/** 颜色选择器变更（v-model 已更新，读取最新值写入选中单元格） */
+function onColorChange(prop: 'color' | 'bgColor') {
+  applyStyle(prop, prop==='color' ? selColor.value : selBgColor.value)
+}
+
 function toggleBorder() { pushHistory(); forEachSelected((r,c)=>{const key=`${r},${c}`,ex=cells.value[key]||{value:''},s=ex.style||{}; s.border=s.border===false?true:false; cells.value[key]={...ex,style:s}}) }
 
 function mergeSelected() {