+
),
@@ -414,17 +415,20 @@ const NotifyGroup = ({ memberStore, commonPayload }: IProps) => {
{
title: i18n.t('default:creator'),
dataIndex: 'creator',
+ width: 160,
render: (text) => userMap[text]?.nick,
},
{
title: i18n.t('default:create time'),
dataIndex: 'createdAt',
+ width: 176,
render: (text) => moment(text).format('YYYY-MM-DD HH:mm:ss'),
},
{
title: i18n.t('default:operation'),
dataIndex: 'id',
- width: 150,
+ width: 160,
+ fixed: 'right',
render: (id: number, record) => {
return (
@@ -470,7 +474,7 @@ const NotifyGroup = ({ memberStore, commonPayload }: IProps) => {
modalProps={{ destroyOnClose: true }}
/>
-
+
);
diff --git a/shell/app/modules/application/pages/settings/components/app-notify/notify-config.tsx b/shell/app/modules/application/pages/settings/components/app-notify/notify-config.tsx
index 49f6d6a606..22c34fba92 100644
--- a/shell/app/modules/application/pages/settings/components/app-notify/notify-config.tsx
+++ b/shell/app/modules/application/pages/settings/components/app-notify/notify-config.tsx
@@ -218,8 +218,9 @@ export const NotifyConfig = ({ commonPayload, memberStore }: IProps) => {
dataIndex: ['notifyGroup', 'targets'],
ellipsis: true,
className: 'notify-info',
+ width: 200,
render: (targets) => (
-
+
),
@@ -227,17 +228,20 @@ export const NotifyConfig = ({ commonPayload, memberStore }: IProps) => {
{
title: i18n.t('default:creator'),
dataIndex: 'creator',
+ width: 160,
render: (text) => userMap[text]?.nick,
},
{
title: i18n.t('default:create time'),
dataIndex: 'createdAt',
+ width: 176,
render: (text) => moment(text).format('YYYY-MM-DD HH:mm:ss'),
},
{
title: i18n.t('default:operation'),
dataIndex: 'id',
- width: 150,
+ width: 160,
+ fixed: 'right',
render: (text, record) => {
return (
@@ -293,7 +297,7 @@ export const NotifyConfig = ({ commonPayload, memberStore }: IProps) => {
modalProps={{ destroyOnClose: true }}
/>
-
+
);
diff --git a/shell/app/modules/application/pages/settings/components/app-variable-config.tsx b/shell/app/modules/application/pages/settings/components/app-variable-config.tsx
index 4d59a90995..cc0114952f 100644
--- a/shell/app/modules/application/pages/settings/components/app-variable-config.tsx
+++ b/shell/app/modules/application/pages/settings/components/app-variable-config.tsx
@@ -15,6 +15,7 @@ import { useLoading } from 'core/stores/loading';
import configStore from 'app/modules/application/stores/pipeline-config';
import appStore from 'application/stores/application';
import { Copy, IF, useUpdate, CustomFilter, FileEditor } from 'common';
+import { ColumnProps } from 'core/common/interface';
import { WORKSPACE_LIST } from 'common/constants';
import routeInfoStore from 'core/stores/route';
import i18n from 'i18n';
@@ -203,14 +204,15 @@ const VariableConfig = ({
});
};
- const getColumns = (_env: string) => [
+ const getColumns = (_env: string): Array
> => [
{
title: 'Key',
dataIndex: 'key',
+ width: 176,
sorter: (a: IKey, b: IKey) => a.key.charCodeAt(0) - b.key.charCodeAt(0),
render: (text: string, { isFromDefault, source }: IKey) => (
-
+
{text}
@@ -228,6 +230,7 @@ const VariableConfig = ({
title: 'Value',
dataIndex: 'value',
className: 'nowrap',
+ width: 176,
render: (text: string, record: IKey) => {
return record.type === typeMap.kv ? (
record.encrypt ? (
@@ -247,6 +250,7 @@ const VariableConfig = ({
{
title: i18n.t('application:type'),
dataIndex: 'type',
+ width: 96,
render: (text: string) => (text === typeMap.kv ? i18n.t('application:value') : i18n.t('application:file')),
},
{
@@ -257,7 +261,8 @@ const VariableConfig = ({
{
title: i18n.t('common:operation'),
dataIndex: 'operations',
- width: 160,
+ width: 200,
+ fixed: 'right',
render: (operations: IKeyOperations, record: IKey) => {
const { canDelete, canDownload, canEdit } = operations || {};
const { encrypt } = record;
@@ -380,7 +385,7 @@ const VariableConfig = ({
)}
-
+
);
})}
diff --git a/shell/app/modules/application/pages/test/test-list.tsx b/shell/app/modules/application/pages/test/test-list.tsx
index 385bfceb37..0ce65ec9e4 100644
--- a/shell/app/modules/application/pages/test/test-list.tsx
+++ b/shell/app/modules/application/pages/test/test-list.tsx
@@ -68,6 +68,7 @@ const columns: Array> = [
{
title: i18n.t('default:name'),
dataIndex: 'name',
+ width: 176,
render: (text) => {cutStr(text, 30, { showTip: true })},
},
{
@@ -77,19 +78,23 @@ const columns: Array> = [
{
title: i18n.t('default:creator'),
dataIndex: 'operatorName',
+ width: 120,
},
{
title: i18n.t('default:create time'),
dataIndex: 'createdAt',
+ width: 176,
render: (text) => fromNow(text),
},
{
title: i18n.t('default:type'),
dataIndex: 'type',
+ width: 120,
},
{
title: i18n.t('application:time consuming'),
dataIndex: ['totals', 'duration'],
+ width: 160,
render: (text) => getTestDuration(text),
},
{
@@ -134,7 +139,7 @@ const TestList = () => {
...testListPaging,
onChange: handlePageChange,
}}
- scroll={{ x: '100%' }}
+ scroll={{ x: 1100 }}
/>
diff --git a/shell/app/modules/cmp/pages/cluster-manage/operation-history.tsx b/shell/app/modules/cmp/pages/cluster-manage/operation-history.tsx
index 926a53ca73..afa00164b7 100644
--- a/shell/app/modules/cmp/pages/cluster-manage/operation-history.tsx
+++ b/shell/app/modules/cmp/pages/cluster-manage/operation-history.tsx
@@ -80,7 +80,7 @@ export const OperationHistory = () => {
{
title: 'ID',
dataIndex: 'recordID',
- width: 90,
+ width: 96,
},
{
title: i18n.t('org:cluster name'),
@@ -90,7 +90,7 @@ export const OperationHistory = () => {
{
title: `${i18n.t('operation')}${i18n.t('name')}`,
dataIndex: 'recordType',
- width: 140,
+ width: 160,
render: (val: string) => {
return
{val};
},
@@ -111,7 +111,7 @@ export const OperationHistory = () => {
{
title: i18n.t('time'),
dataIndex: 'createTime',
- width: 190,
+ width: 200,
render: (createTime: string) => {
return
{moment(createTime).format('YYYY-MM-DD HH:mm:ss')};
},
@@ -119,7 +119,7 @@ export const OperationHistory = () => {
{
title: i18n.t('user'),
dataIndex: 'userID',
- width: 100,
+ width: 120,
render: (id: string) =>
userMap[id] ?
{cutStr(userMap[id].nick || userMap[id].name, 8, { showTip: true })} : null,
},
@@ -194,7 +194,7 @@ export const OperationHistory = () => {
total: operationPaging.total,
onChange: (no: number) => getList({ pageNo: no, ...filters }),
}}
- scroll={{ x: '100%' }}
+ scroll={{ x: 1100 }}
/>
updater.curRow(null)} />