diff --git a/kernel/api/av.go b/kernel/api/av.go index 8a2e6d8c4..6052a4a04 100644 --- a/kernel/api/av.go +++ b/kernel/api/av.go @@ -615,17 +615,6 @@ func getCurrentAttrViewImages(c *gin.Context) { if nil != viewIDArg { viewID = viewIDArg.(string) } - page := 1 - pageArg := arg["page"] - if nil != pageArg { - page = int(pageArg.(float64)) - } - - pageSize := -1 - pageSizeArg := arg["pageSize"] - if nil != pageSizeArg { - pageSize = int(pageSizeArg.(float64)) - } query := "" queryArg := arg["query"] @@ -633,7 +622,7 @@ func getCurrentAttrViewImages(c *gin.Context) { query = queryArg.(string) } - images, err := model.GetCurrentAttributeViewImages(id, viewID, query, page, pageSize) + images, err := model.GetCurrentAttributeViewImages(id, viewID, query) if err != nil { ret.Code = -1 ret.Msg = err.Error() @@ -642,7 +631,6 @@ func getCurrentAttrViewImages(c *gin.Context) { ret.Data = images } - func getAttributeViewKeys(c *gin.Context) { ret := gulu.Ret.NewResult() defer c.JSON(http.StatusOK, ret) diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go index be0844975..b658d6037 100644 --- a/kernel/model/attribute_view.go +++ b/kernel/model/attribute_view.go @@ -933,8 +933,7 @@ func renderAttributeView(attrView *av.AttributeView, viewID, query string, page, return } -func GetCurrentAttributeViewImages(avID, viewID, query string, page, pageSize int) (ret []string, err error) { - +func GetCurrentAttributeViewImages(avID, viewID, query string) (ret []string, err error) { var attrView *av.AttributeView attrView, err = av.ParseAttributeView(avID) if err != nil { @@ -942,7 +941,7 @@ func GetCurrentAttributeViewImages(avID, viewID, query string, page, pageSize in return } var view *av.View - + if "" != viewID { view, _ = attrView.GetCurrentView(viewID) } else { @@ -955,19 +954,14 @@ func GetCurrentAttributeViewImages(avID, viewID, query string, page, pageSize in for _, row := range table.Rows { for _, cell := range row.Cells { - if nil != cell.Value { - if av.KeyTypeMAsset == cell.Value.Type { - if nil != cell.Value.MAsset { - for _, a := range cell.Value.MAsset { - if av.AssetTypeImage == a.Type { - ret = append(ret, a.Content) - } - } + if nil != cell.Value && av.KeyTypeMAsset == cell.Value.Type && nil != cell.Value.MAsset { + for _, a := range cell.Value.MAsset { + if av.AssetTypeImage == a.Type { + ret = append(ret, a.Content) } } } } - } return }