Merge remote-tracking branch 'origin/master'

xiangpei

2024-11-27 99c3d7ccf9d518d441fc1af09f792f703f8f01de

1
2
3
4
<div class="ui-grid-cell-contents">
    <img ng-if="!row.entity.customIcon" ng-src="editor-app/stencilsets/{{getStencilSetName()}}/icons/{{row.entity.icon}}" />
    <img ng-if="row.entity.customIcon" ng-src="{{getImageUrl(row.entity.icon)}}"/>
</div>