Merge remote-tracking branch 'update/master' into update-infra

# Conflicts: # go.mod # go.sum
erda-project · Feb 18, 2022 · bad5e0a · bad5e0a
2 parents 3f0f119 + 86d8302
commit bad5e0a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/modules/dop/component-protocol/components/project-runtime/list/list.go b/modules/dop/component-protocol/components/project-runtime/list/list.go
@@ -600,10 +600,10 @@ func (p List) getBatchOperation(sdk *cptype.SDK, ids []string) map[cptype.Operat
 			ServerData: &cptype.OpServerData{
 				"options": []list.OpBatchRowsHandleOptionServerData{
 					{
-						AllowedRowIDs: ids, Icon: "chongxinqidong", ID: common.ReStartOp, Text: sdk.I18n("restart"), // allowedRowIDs = null 或不传这个key，表示所有都可选，allowedRowIDs=[]表示当前没有可选择，此处应该可以不传
+						AllowedRowIDs: ids, Icon: &commodel.Icon{Type: "chongxinqidong"}, ID: common.ReStartOp, Text: sdk.I18n("restart"), // allowedRowIDs = null 或不传这个key，表示所有都可选，allowedRowIDs=[]表示当前没有可选择，此处应该可以不传
 					},
 					{
-						AllowedRowIDs: ids, Icon: "remove", ID: common.DeleteOp, Text: sdk.I18n("delete"),
+						AllowedRowIDs: ids, Icon: &commodel.Icon{Type: "remove"}, ID: common.DeleteOp, Text: sdk.I18n("delete"),
 					},
 				},
 			},