Merge remote-tracking branch 'origin/master'

luohairen

2024-11-26 3832f51c8d596645d8f24f385a72e5c5d448a751

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>