Browse Source

Merge remote-tracking branch 'origin/eta/1.0.2'

Roc 1 year ago
parent
commit
d55a352293
1 changed files with 5 additions and 5 deletions
  1. 5 5
      services/excel/lucky_sheet.go

+ 5 - 5
services/excel/lucky_sheet.go

@@ -119,7 +119,7 @@ type LuckySheetData struct {
 	ScrollLeft        float64       `json:"scrollLeft" description:"左右滚动条位置"`
 	ScrollTop         float64       `json:"scrollTop" description:"上下滚动条位置"`
 	CalcChain         []interface{} `json:"calcChain" description:"公式链"`
-	Status            int64         `json:"status" description:"激活状态"`
+	Status            interface{}   `json:"status" description:"激活状态"`
 	VisibleDataColumn []int64       `json:"visibledatacolumn" description:"所有列的位置信息,递增的列位置数据,初始化无需设置"`
 	VisibleDataRow    []int64       `json:"visibledatarow" description:"所有行的位置信息,递增的行位置数据,初始化无需设置"`
 	ZoomRatio         float64       `json:"zoomRatio" description:"sheet缩放比例"`
@@ -898,10 +898,10 @@ var LuckyFontFamilyMap = map[int]string{
 	2:  "Tahoma",
 	3:  "Verdana",
 	4:  "微软雅黑",
-	5:  "宋体",   //宋体(Song)、
-	6:  "黑体",   // 黑体(ST Heiti)
-	7:  "楷体",   //楷体(ST Kaiti),
-	8:  "仿宋",   //仿宋(ST FangSong),
+	5:  "宋体",  //宋体(Song)、
+	6:  "黑体",  // 黑体(ST Heiti)
+	7:  "楷体",  //楷体(ST Kaiti),
+	8:  "仿宋",  //仿宋(ST FangSong),
 	9:  "新宋体", //新宋体(ST Song),
 	10: "华文新魏",
 	11: "华文行楷",