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.

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

[fix](shared/actionTable&base/system):upgrade system module license table style #214

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ exports[`test DataExport/Common/AuditResultList should match snapshot 1`] = `
</div>
</div>
<div
class="ant-table-wrapper actiontech-table-namespace css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down Expand Up @@ -189,7 +189,7 @@ exports[`test DataExport/Common/AuditResultList should match snapshot 2`] = `
</div>
</div>
<div
class="ant-table-wrapper actiontech-table-namespace css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down Expand Up @@ -360,7 +360,7 @@ exports[`test DataExport/Common/AuditResultList should match snapshot 3`] = `
</div>
</div>
<div
class="ant-table-wrapper actiontech-table-namespace css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down Expand Up @@ -1238,7 +1238,7 @@ exports[`test DataExport/Common/AuditResultList should match snapshot 4`] = `
</div>
</div>
<div
class="ant-table-wrapper actiontech-table-namespace css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down Expand Up @@ -2139,7 +2139,7 @@ exports[`test DataExport/Common/AuditResultList should switch tab when click lab
</div>
</div>
<div
class="ant-table-wrapper actiontech-table-namespace css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1189,7 +1189,7 @@ exports[`first should match snapshot when pageState is equal SUBMIT_WORKFLOW 1`]
</div>
</div>
<div
class="ant-table-wrapper actiontech-table-namespace css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ exports[`test base/DataExport/Create/SubmitWorkflow should match snapshot 1`] =
</div>
</div>
<div
class="ant-table-wrapper actiontech-table-namespace css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down Expand Up @@ -352,7 +352,7 @@ exports[`test base/DataExport/Create/SubmitWorkflow should match snapshot 2`] =
</div>
</div>
<div
class="ant-table-wrapper actiontech-table-namespace css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exports[`test base/DataExport/Detail/OverviewList should match snapshot 1`] = `
<div>
<div
class="ant-table-wrapper actiontech-table-namespace table-row-cursor css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace table-row-cursor css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2465,7 +2465,7 @@ exports[`test base/DataExport/Detail/ExportDetail should match snapshot when cur
</div>
</div>
<div
class="ant-table-wrapper actiontech-table-namespace table-row-cursor css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace table-row-cursor css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ exports[`test base/DataExport/List render batch close button When the user is no
</div>
</div>
<div
class="ant-table-wrapper actiontech-table-namespace table-row-cursor css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace table-row-cursor css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down Expand Up @@ -1475,7 +1475,7 @@ exports[`test base/DataExport/List render init snapshot 1`] = `
</div>
</div>
<div
class="ant-table-wrapper actiontech-table-namespace table-row-cursor css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace table-row-cursor css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down Expand Up @@ -2131,7 +2131,7 @@ exports[`test base/DataExport/List render init snapshot 2`] = `
</div>
</div>
<div
class="ant-table-wrapper actiontech-table-namespace table-row-cursor css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace table-row-cursor css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down Expand Up @@ -3539,7 +3539,7 @@ exports[`test base/DataExport/List render table filter items 1`] = `
</div>
</div>
<div
class="ant-table-wrapper actiontech-table-namespace table-row-cursor css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace table-row-cursor css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ exports[`page/DataSource/DataSourceList render list no permission 1`] = `
</div>
</div>
<div
class="ant-table-wrapper actiontech-table-namespace css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down Expand Up @@ -590,7 +590,7 @@ exports[`page/DataSource/DataSourceList render list snap 1`] = `
</div>
</div>
<div
class="ant-table-wrapper actiontech-table-namespace css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down Expand Up @@ -1114,7 +1114,7 @@ exports[`page/DataSource/DataSourceList render table filter option val 1`] = `
</div>
</div>
<div
class="ant-table-wrapper actiontech-table-namespace css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down Expand Up @@ -1856,7 +1856,7 @@ exports[`page/DataSource/DataSourceList render table for action btn render table
</div>
</div>
<div
class="ant-table-wrapper actiontech-table-namespace css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down Expand Up @@ -2561,7 +2561,7 @@ exports[`page/DataSource/DataSourceList render table for action btn render table
</div>
</div>
<div
class="ant-table-wrapper actiontech-table-namespace css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down Expand Up @@ -3266,7 +3266,7 @@ exports[`page/DataSource/DataSourceList render table for api has data 1`] = `
</div>
</div>
<div
class="ant-table-wrapper actiontech-table-namespace css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down Expand Up @@ -4009,7 +4009,7 @@ exports[`page/DataSource/DataSourceList render table for api has data 2`] = `
</div>
</div>
<div
class="ant-table-wrapper actiontech-table-namespace css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down Expand Up @@ -4775,7 +4775,7 @@ exports[`page/DataSource/DataSourceList render table for api return no data 1`]
</div>
</div>
<div
class="ant-table-wrapper actiontech-table-namespace css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down Expand Up @@ -5154,7 +5154,7 @@ exports[`page/DataSource/DataSourceList render table for api return no data 2`]
</div>
</div>
<div
class="ant-table-wrapper actiontech-table-namespace css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down Expand Up @@ -5533,7 +5533,7 @@ exports[`page/DataSource/DataSourceList render table for column val 1`] = `
</div>
</div>
<div
class="ant-table-wrapper actiontech-table-namespace css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ exports[`base/MemberGroupList render member group table 1`] = `
<body>
<div>
<div
class="ant-table-wrapper actiontech-table-namespace css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down Expand Up @@ -686,7 +686,7 @@ exports[`base/MemberGroupList should render empty tips when request not success
<body>
<div>
<div
class="ant-table-wrapper actiontech-table-namespace css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ exports[`base/MemberList render member table 1`] = `
<body>
<div>
<div
class="ant-table-wrapper actiontech-table-namespace css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down Expand Up @@ -672,7 +672,7 @@ exports[`base/MemberList should render empty tips when request not success 1`] =
<body>
<div>
<div
class="ant-table-wrapper actiontech-table-namespace css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ exports[`base/Member should render member list when it first entered the member
</div>
</div>
<div
class="ant-table-wrapper actiontech-table-namespace css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down Expand Up @@ -735,7 +735,7 @@ exports[`base/Member should update content when change segmented value 1`] = `
</div>
</div>
<div
class="ant-table-wrapper actiontech-table-namespace css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exports[`test base/project/list should be get data from the request to render the table 1`] = `
<div>
<div
class="ant-table-wrapper actiontech-table-namespace css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down Expand Up @@ -194,7 +194,7 @@ exports[`test base/project/list should be get data from the request to render th
exports[`test base/project/list should be get data from the request to render the table 2`] = `
<div>
<div
class="ant-table-wrapper actiontech-table-namespace css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ exports[`test base/page/project should match snapshot 1`] = `
</div>
</div>
<div
class="ant-table-wrapper actiontech-table-namespace css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down Expand Up @@ -318,7 +318,7 @@ exports[`test base/page/project should match snapshot 2`] = `
</div>
</div>
<div
class="ant-table-wrapper actiontech-table-namespace css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ exports[`page/SyncDataSource/SyncTaskList render list action when no permission
</div>
</div>
<div
class="ant-table-wrapper actiontech-table-namespace css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down Expand Up @@ -531,7 +531,7 @@ exports[`page/SyncDataSource/SyncTaskList render list column data for table 1`]
</div>
</div>
<div
class="ant-table-wrapper actiontech-table-namespace css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down Expand Up @@ -1017,7 +1017,7 @@ exports[`page/SyncDataSource/SyncTaskList render list snap 1`] = `
</div>
</div>
<div
class="ant-table-wrapper actiontech-table-namespace css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down Expand Up @@ -1322,7 +1322,7 @@ exports[`page/SyncDataSource/SyncTaskList render list snap 2`] = `
</div>
</div>
<div
class="ant-table-wrapper actiontech-table-namespace css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down Expand Up @@ -1820,7 +1820,7 @@ exports[`page/SyncDataSource/SyncTaskList render list snap when no projectID 1`]
</div>
</div>
<div
class="ant-table-wrapper actiontech-table-namespace css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down Expand Up @@ -2101,7 +2101,7 @@ exports[`page/SyncDataSource/SyncTaskList render list snap when no projectID 2`]
</div>
</div>
<div
class="ant-table-wrapper actiontech-table-namespace css-fxd6ka css-dev-only-do-not-override-bj9uhl"
class="ant-table-wrapper actiontech-table-namespace css-555x9n css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-spin-nested-loading css-dev-only-do-not-override-bj9uhl"
Expand Down
2 changes: 1 addition & 1 deletion packages/base/src/page/System/License/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,76 +16,76 @@
import { LicenseColumn } from './index.data';
import { ActiontechTable } from '@actiontech/shared/lib/components/ActiontechTable';

const License = () => {
const { t } = useTranslation();
const dispatch = useDispatch();
const [
collectLicenseLoading,
{ setTrue: startCollect, setFalse: collectFinish }
] = useBoolean();

const {
data,
loading,
refresh: refreshLicenseList
} = useRequest(() => {
return dms.GetLicense().then((res) => ({ list: res?.data?.license ?? [] }));
});

const collectLicense = () => {
startCollect();
dms.GetLicenseInfo({ responseType: 'blob' }).finally(() => collectFinish());
};

const importLicense = () => {
dispatch(
updateSystemModalStatus({
modalName: ModalName.DMS_Import_License,
status: true
})
);
};

useEffect(() => {
const { unsubscribe } = EventEmitter.subscribe(
EmitterKey.DMS_Refresh_License_List,
refreshLicenseList
);
return unsubscribe;
}, [refreshLicenseList]);

return (
<SystemBasicTitle
title={t('dmsSystem.tabPaneTitle.license')}
// todo: 此处提示语待产品给出后调整
titleTip={t('dmsSystem.license.productName')}
titleExtra={
<Space key="button-wrapper">
<BasicButton
type="primary"
onClick={collectLicense}
loading={collectLicenseLoading}
>
{t('dmsSystem.license.collect')}
</BasicButton>
<BasicButton type="primary" onClick={importLicense}>
{t('dmsSystem.license.import')}
</BasicButton>
</Space>
}
>
<>
<ActiontechTable
rowKey="name"
columns={LicenseColumn}
dataSource={data?.list}
loading={loading}
className="clear-padding-bottom"
className="clear-padding-bottom clear-right-box-shadow"
/>
<ImportLicense />
</>
</SystemBasicTitle>
);

Check warning on line 88 in packages/base/src/page/System/License/index.tsx

View workflow job for this annotation

GitHub Actions / Coverage annotations (🧪 jest-coverage-report-action)

🧾 Statement is not covered

Warning! Not covered statement
};

Check warning on line 89 in packages/base/src/page/System/License/index.tsx

View workflow job for this annotation

GitHub Actions / Coverage annotations (🧪 jest-coverage-report-action)

🧾 Statement is not covered

Warning! Not covered statement

export default License;
Loading
Loading