|
@@ -43,6 +43,9 @@ func (this *ExcelInfoController) GetTableDetail() {
|
|
return
|
|
return
|
|
}
|
|
}
|
|
fromScene, _ := this.GetInt("FromScene", 0)
|
|
fromScene, _ := this.GetInt("FromScene", 0)
|
|
|
|
+ referencedId, _ := this.GetInt("ReferencedId", 0)
|
|
|
|
+ uuid := this.GetString("Uuid")
|
|
|
|
+
|
|
key := utils.HZ_CHART_LIB_EXCEL_TABLE_DETAIL + ":" + uniqueCode
|
|
key := utils.HZ_CHART_LIB_EXCEL_TABLE_DETAIL + ":" + uniqueCode
|
|
resp := new(response.ExcelTableDetailResp)
|
|
resp := new(response.ExcelTableDetailResp)
|
|
switch fromScene {
|
|
switch fromScene {
|
|
@@ -257,6 +260,14 @@ func (this *ExcelInfoController) GetTableDetail() {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ // 获取表格引用
|
|
|
|
+ reference, err := models.GetReferencedExcelConfig(referencedId, fromScene, uniqueCode, uuid)
|
|
|
|
+ if err != nil && err.Error() != utils.ErrNoRow() {
|
|
|
|
+ br.Msg = "获取失败"
|
|
|
|
+ br.ErrMsg = "获取表格引用失败,Err:" + err.Error()
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+
|
|
resp.TableInfo = tableData
|
|
resp.TableInfo = tableData
|
|
resp.Source = excelInfo.Source
|
|
resp.Source = excelInfo.Source
|
|
resp.ExcelType = excelInfo.ExcelType
|
|
resp.ExcelType = excelInfo.ExcelType
|
|
@@ -265,6 +276,7 @@ func (this *ExcelInfoController) GetTableDetail() {
|
|
resp.UniqueCode = excelInfo.UniqueCode
|
|
resp.UniqueCode = excelInfo.UniqueCode
|
|
resp.Config = config
|
|
resp.Config = config
|
|
resp.SourcesFrom = excelInfo.SourcesFrom
|
|
resp.SourcesFrom = excelInfo.SourcesFrom
|
|
|
|
+ resp.ReferencedExcelConfig = reference
|
|
|
|
|
|
if utils.Re == nil {
|
|
if utils.Re == nil {
|
|
data, _ := json.Marshal(resp)
|
|
data, _ := json.Marshal(resp)
|