Risk measures with comonotonic subadditivity or convexity on product spaces