Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update the config item table column width #5131

Merged
merged 3 commits into from
Apr 25, 2024
Merged

feat: update the config item table column width #5131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bde8aef
Update namespace-panel-master-tab.html
refeccd Apr 21, 2024
0a4db95
Update namespace-panel-branch-tab.html
refeccd Apr 21, 2024
ed1faad
Update CHANGES.md
refeccd Apr 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ Apollo 2.3.0
* [Add comment for clusters and UI display](https://github.com/apolloconfig/apollo/pull/5072)
* [Fix the issue that the length of private namespaces are mis-calculated](https://github.com/apolloconfig/apollo/pull/5078)
* [apollo assembly optimization](https://github.com/apolloconfig/apollo/pull/5035)
* [update the config item table column width](https://github.com/apolloconfig/apollo/pull/5131)


------------------
All issues and pull requests are [here](https://github.com/apolloconfig/apollo/milestone/14?closed=1)
All issues and pull requests are [here](https://github.com/apolloconfig/apollo/milestone/14?closed=1)
28 changes: 15 additions & 13 deletions apollo-portal/src/main/resources/static/views/component/namespace-panel-branch-tab.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@

<tr ng-repeat="config in namespace.branch.branchItems |orderBy:col:desc"
ng-if="config.item.key">
<td width="7%" class="text-center">
<td width="8%" class="text-center">
<span class="label label-warning no-radius cursor-pointer" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Branch.Body.ClickToSeeItemValue' | translate }}"
Expand All @@ -188,7 +188,7 @@
data-placement="bottom"
title="{{'Component.Namespace.Branch.Body.AddedByGrayscale' | translate }}">{{'Component.Namespace.Branch.Body.Added' | translate }}</span>
</td>
<td width="7%" class="text-center">
<td width="6%" class="text-center">
<span ng-if="config.item.type == '0'"
>{{'Component.ConfigItem.ItemTypeString' | translate }}</span>
<span ng-if="config.item.type == '1'"
Expand All @@ -214,13 +214,14 @@
<span ng-bind="config.item.comment | limitTo: 250"></span>
<span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span>
</td>
<td width="7%" ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'">
<td width="10%" class="text-center"
ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'">
</td>
<td width="10%"
<td width="10%" class="text-center"
ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'">
</td>

<td width="9%" class="text-center">
<td width="6%" class="text-center">
<img src="img/edit.png" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Branch.Body.Op.Modify' | translate }}"
ng-if="!config.isDeleted" ng-click="editItem(namespace.branch, config.item)"
Expand Down Expand Up @@ -293,7 +294,7 @@
title="{{'Component.Namespace.MasterBranch.Body.ItemEffective' | translate }}"
ng-if="!config.isModified">{{'Component.Namespace.MasterBranch.Body.ItemPublished' | translate }}</span>
</td>
<td width="10%" class="cursor-pointer"
<td width="20%" class="cursor-pointer"
title="{{'Component.Namespace.Branch.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.key)">
<span ng-bind="config.item.key | limitTo: 250"></span>
Expand All @@ -309,7 +310,7 @@
data-placement="bottom"
title="{{'Component.Namespace.Branch.Body.DeletedItem' | translate }}">{{'Component.Namespace.Branch.Body.Delete' | translate }}</span>
</td>
<td width="7%" class="text-center">
<td width="6%" class="text-center">
<span ng-if="config.item.type == '0'"
>{{'Component.ConfigItem.ItemTypeString' | translate }}</span>
<span ng-if="config.item.type == '1'"
Expand All @@ -319,23 +320,24 @@
<span ng-if="config.item.type == '3'"
>{{'Component.ConfigItem.ItemTypeJson' | translate }}</span>
</td>
<td width="33%" class="cursor-pointer"
<td width="25%" class="cursor-pointer"
title="{{'Component.Namespace.Branch.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.value)">
<span ng-bind="config.item.value | limitTo: 250"></span>
<span ng-bind="config.item.value.length > 250 ? '...': ''"></span>
</td>
<td width="12%" title="{{config.item.comment}}">
<td width="15%" title="{{config.item.comment}}">
<span ng-bind="config.item.comment | limitTo: 250"></span>
<span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span>
</td>
<td width="10%" ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'">
<td width="10%" class="text-center"
ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'">
</td>
<td width="15%"
<td width="10%" class="text-center"
ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'">
</td>

<td width="5%" class="text-center">
<td width="6%" class="text-center">
<img src="img/gray.png" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.MasterBranch.Body.ModifyItem' | translate }}"
ng-if="!config.isDeleted" ng-click="editItem(namespace.branch, config.item)"
Expand Down Expand Up @@ -653,4 +655,4 @@ <h3 class="media-heading" ng-bind="commits.dataChangeCreatedByDisplayName + '('
</div>
</section>
</div>
</section>
</section>
13 changes: 7 additions & 6 deletions apollo-portal/src/main/resources/static/views/component/namespace-panel-master-tab.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@
title="{{'Component.Namespace.Master.Items.Body.PublishedTitle' | translate }}"
ng-if="!config.isModified">{{'Component.Namespace.Master.Items.Body.Published' | translate }}</span>
</td>
<td width="15%" class="cursor-pointer"
<td width="20%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.key)">
<span ng-bind="config.item.key | limitTo: 250"></span>
Expand All @@ -352,7 +352,7 @@
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.DeletedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Deleted' | translate }}</span>
</td>
<td width="7%" class="text-center">
<td width="6%" class="text-center">
<span ng-if="config.item.type == '0'"
>{{'Component.ConfigItem.ItemTypeString' | translate }}</span>
<span ng-if="config.item.type == '1'"
Expand All @@ -368,17 +368,18 @@
<span ng-bind="config.item.value | limitTo: 250"></span>
<span ng-bind="config.item.value.length > 250 ? '...': ''"></span>
</td>
<td width="11%" title="{{config.item.comment}}">
<td width="15%" title="{{config.item.comment}}">
<span ng-bind="config.item.comment | limitTo: 250"></span>
<span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span>
</td>
<td width="10%" ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'">
<td width="10%" class="text-center"
ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'">
</td>
<td width="16%"
<td width="10%" class="text-center"
ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'">
</td>

<td width="8%" class="text-center" ng-if="!config.isDeleted">
<td width="6%" class="text-center" ng-if="!config.isDeleted">
<img src="img/edit.png" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.ModifyTips' | translate }}"
ng-click="editItem(namespace, config.item)"
Expand Down
Loading