+
+
+
+
+
+
+
+
+
+
+
+
+
+ notice
+
+
+
+
+ 有效期
+ :
+ 2026-01-01 08:00:00
+ ~
+ 2027-01-01 07:59:59
+
+
+
diff --git a/packages/base/src/page/Nav/SideMenu/UserMenu/Modal/CompanyNoticeModal/actions.tsx b/packages/base/src/page/Nav/SideMenu/UserMenu/Modal/CompanyNoticeModal/actions.tsx
index a527d1fc4b..f8f4710dbb 100644
--- a/packages/base/src/page/Nav/SideMenu/UserMenu/Modal/CompanyNoticeModal/actions.tsx
+++ b/packages/base/src/page/Nav/SideMenu/UserMenu/Modal/CompanyNoticeModal/actions.tsx
@@ -4,7 +4,7 @@ import {
PermissionControl
} from '@actiontech/shared/lib/features';
import { t } from '../../../../../../locale';
-export const CompanyNoticeModalActions = (
+export const companyNoticeModalActions = (
onClick: () => void
): Record<'edit-notice', React.ReactNode> => {
return {
diff --git a/packages/base/src/page/Nav/SideMenu/UserMenu/Modal/CompanyNoticeModal/index.test.tsx b/packages/base/src/page/Nav/SideMenu/UserMenu/Modal/CompanyNoticeModal/index.test.tsx
index 745be2bc8c..9d9b98278c 100644
--- a/packages/base/src/page/Nav/SideMenu/UserMenu/Modal/CompanyNoticeModal/index.test.tsx
+++ b/packages/base/src/page/Nav/SideMenu/UserMenu/Modal/CompanyNoticeModal/index.test.tsx
@@ -5,9 +5,11 @@ import { act, cleanup, fireEvent, screen } from '@testing-library/react';
import { baseSuperRender } from '../../../../../../testUtils/superRender';
import { getBySelector } from '@actiontech/shared/lib/testUtil/customQuery';
import dms from '@actiontech/shared/lib/testUtil/mockApi/base/global';
+import { createSpySuccessResponse } from '@actiontech/shared/lib/testUtil/mockApi';
import { mockUseCurrentUser } from '@actiontech/shared/lib/testUtil/mockHook/mockUseCurrentUser';
import { ModalName } from '../../../../../../data/ModalName';
import { SystemRole } from '@actiontech/dms-kit';
+import { CompanyNoticeMockData } from '@actiontech/shared/lib/testUtil/mockApi/base/global/data';
jest.mock('react-redux', () => {
return {
@@ -58,7 +60,11 @@ describe('base/page/Nav/SideMenu/UserMenu/CompanyNoticeModal', () => {
expect(baseElement).toMatchSnapshot();
await act(async () => jest.advanceTimersByTime(2600));
expect(baseElement).toMatchSnapshot();
- expect(requestGetCompanyNotice).toHaveBeenCalled();
+
+ expect(requestGetCompanyNotice).toHaveBeenCalledTimes(1);
+ expect(requestGetCompanyNotice).toHaveBeenCalledWith({
+ include_latest_outside_period: true
+ });
fireEvent.click(screen.getByText('关 闭'));
await act(async () => jest.advanceTimersByTime(500));
@@ -80,22 +86,26 @@ describe('base/page/Nav/SideMenu/UserMenu/CompanyNoticeModal', () => {
});
});
+ it('should display notice content and effective period in view mode', async () => {
+ const { baseElement } = customRender();
+ await act(async () => jest.advanceTimersByTime(3300));
+ expect(baseElement).toMatchSnapshot();
+
+ expect(
+ screen.getByText(CompanyNoticeMockData.notice_str!)
+ ).toBeInTheDocument();
+ expect(screen.getByText(/有效期/)).toBeInTheDocument();
+ });
+
describe('render snap when edit notice', () => {
- it('click cancel btn', async () => {
+ it('click cancel btn without dirty data', async () => {
const { baseElement } = customRender();
+ await act(async () => jest.advanceTimersByTime(3300));
expect(screen.getByText('编 辑')).toBeInTheDocument();
fireEvent.click(screen.getByText('编 辑'));
await act(async () => jest.advanceTimersByTime(500));
- const inputEle = getBySelector('textarea.ant-input', baseElement);
- fireEvent.change(inputEle, {
- target: {
- value: '这是一条公告信息'
- }
- });
- await act(async () => jest.advanceTimersByTime(500));
-
fireEvent.click(screen.getByText('取 消'));
await act(async () => jest.advanceTimersByTime(500));
expect(baseElement).toMatchSnapshot();
@@ -105,9 +115,10 @@ describe('base/page/Nav/SideMenu/UserMenu/CompanyNoticeModal', () => {
});
});
- it('click cancel btn and confirm to cancel', async () => {
+ it('click cancel btn with dirty data and confirm to cancel', async () => {
const { baseElement } = customRender();
+ await act(async () => jest.advanceTimersByTime(3300));
expect(screen.getByText('编 辑')).toBeInTheDocument();
fireEvent.click(screen.getByText('编 辑'));
await act(async () => jest.advanceTimersByTime(500));
@@ -127,32 +138,39 @@ describe('base/page/Nav/SideMenu/UserMenu/CompanyNoticeModal', () => {
fireEvent.click(screen.getByText('确 认'));
});
- it('click submit btn', async () => {
+ it('click submit btn with valid content and time range', async () => {
+ requestUpdateCompanyNotice.mockClear();
const { baseElement } = customRender();
+ await act(async () => jest.advanceTimersByTime(3300));
fireEvent.click(screen.getByText('编 辑'));
await act(async () => jest.advanceTimersByTime(500));
- const inputEle = getBySelector('textarea.ant-input', baseElement);
- fireEvent.change(inputEle, {
- target: {
- value: '公告信息'
- }
+ expect(baseElement).toMatchSnapshot();
+ expect(requestGetCompanyNotice).toHaveBeenCalledWith({
+ include_latest_outside_period: true
});
- await act(async () => jest.advanceTimersByTime(500));
fireEvent.click(screen.getByText('提 交'));
+ // Allow validateFields microtask to resolve and UpdateCompanyNotice timer to register
await act(async () => jest.advanceTimersByTime(500));
- expect(baseElement).toMatchSnapshot();
- await act(async () => jest.advanceTimersByTime(2600));
- expect(requestUpdateCompanyNotice).toHaveBeenCalled();
- expect(requestUpdateCompanyNotice).toHaveBeenCalledWith({
- company_notice: { notice_str: '公告信息' }
- });
- expect(screen.getByText('成功发布系统公告!')).toBeInTheDocument();
+ // Resolve the UpdateCompanyNotice 3000ms timer
+ await act(async () => jest.advanceTimersByTime(3000));
+
+ expect(requestUpdateCompanyNotice).toHaveBeenCalledTimes(1);
+ expect(requestUpdateCompanyNotice).toHaveBeenCalledWith(
+ expect.objectContaining({
+ company_notice: expect.objectContaining({
+ notice_str: CompanyNoticeMockData.notice_str
+ })
+ })
+ );
expect(scopeDispatch).toHaveBeenCalledWith({
- payload: { modalStatus: { [ModalName.Company_Notice]: false } },
- type: 'nav/initModalStatus'
+ payload: {
+ modalName: ModalName.Company_Notice,
+ status: false
+ },
+ type: 'nav/updateModalStatus'
});
});
});
@@ -170,14 +188,17 @@ describe('base/page/Nav/SideMenu/UserMenu/CompanyNoticeModal', () => {
});
});
- it('render snap when visible is true', async () => {
+ it('render snap when visible is true - no edit button', async () => {
const { baseElement } = customRender();
await act(async () => jest.advanceTimersByTime(500));
expect(baseElement).toMatchSnapshot();
await act(async () => jest.advanceTimersByTime(2600));
expect(baseElement).toMatchSnapshot();
- expect(requestGetCompanyNotice).toHaveBeenCalled();
+ expect(requestGetCompanyNotice).toHaveBeenCalledTimes(1);
+ expect(requestGetCompanyNotice).toHaveBeenCalledWith({
+ include_latest_outside_period: true
+ });
fireEvent.click(screen.getByText('关 闭'));
await act(async () => jest.advanceTimersByTime(500));
diff --git a/packages/base/src/page/Nav/SideMenu/UserMenu/Modal/CompanyNoticeModal/index.tsx b/packages/base/src/page/Nav/SideMenu/UserMenu/Modal/CompanyNoticeModal/index.tsx
index f85cbec765..801997edd8 100644
--- a/packages/base/src/page/Nav/SideMenu/UserMenu/Modal/CompanyNoticeModal/index.tsx
+++ b/packages/base/src/page/Nav/SideMenu/UserMenu/Modal/CompanyNoticeModal/index.tsx
@@ -1,51 +1,77 @@
import { useCallback, useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useDispatch, useSelector } from 'react-redux';
-import { Empty, Popconfirm, Space, Spin, message } from 'antd';
-import { EmptyBox, BasicButton, BasicInput } from '@actiontech/dms-kit';
-import { LocalStorageWrapper } from '@actiontech/dms-kit';
+import {
+ Empty,
+ Form,
+ Popconfirm,
+ Space,
+ Spin,
+ Typography,
+ message
+} from 'antd';
+import { EmptyBox, BasicButton, formatTime } from '@actiontech/dms-kit';
import { useBoolean, useRequest } from 'ahooks';
import CompanyNotice from '@actiontech/shared/lib/api/base/service/CompanyNotice';
-import {
- ResponseCode,
- CompanyNoticeDisplayStatusEnum,
- StorageKey
-} from '@actiontech/dms-kit';
+import { ResponseCode } from '@actiontech/dms-kit';
import { initNavModalStatus } from '../../../../../../store/nav';
import { ModalName } from '../../../../../../data/ModalName';
import { IReduxState } from '../../../../../../store';
import { updateNavModalStatus } from '../../../../../../store/nav';
import { CompanyNoticeModalStyleWrapper } from '../../../style';
-import { CompanyNoticeModalActions } from './actions';
+import { companyNoticeModalActions } from './actions';
+import { CompanyNoticeForm } from './CompanyNoticeForm';
+import { ICompanyNoticeFormValues } from './CompanyNoticeForm/index.type';
+import dayjs from 'dayjs';
+
+const { Text } = Typography;
+
const CompanyNoticeModal: React.FC = () => {
const { t } = useTranslation();
const dispatch = useDispatch();
+ const [form] = Form.useForm
();
const visible = useSelector(
(state) => state.nav.modalStatus[ModalName.Company_Notice]
);
- const [value, setValue] = useState('');
const [canEdit, { setTrue: showEditor, setFalse: hideEditor }] = useBoolean();
const [hasDirtyData, setHasDirtyData] = useState(false);
const [submitLoading, { setTrue: startSubmit, setFalse: finishedSubmit }] =
useBoolean(false);
const [messageApi, contextHolder] = message.useMessage();
- const { data, loading } = useRequest(
+
+ const { data: noticeData, loading } = useRequest(
() =>
- CompanyNotice.GetCompanyNotice().then((res) => {
+ CompanyNotice.GetCompanyNotice({
+ include_latest_outside_period: true
+ }).then((res) => {
if (res.data.code === ResponseCode.SUCCESS) {
- setValue(res.data.data?.notice_str ?? '');
- return res.data.data?.notice_str ?? '';
+ return res.data.data;
}
}),
{
ready: !!visible
}
);
+
+ const getFormInitialValues = useCallback(():
+ | Partial
+ | undefined => {
+ if (!noticeData) return undefined;
+ return {
+ notice_str: noticeData.notice_str ?? '',
+ validPeriod:
+ noticeData.start_time && noticeData.expire_time
+ ? [dayjs(noticeData.start_time), dayjs(noticeData.expire_time)]
+ : null
+ };
+ }, [noticeData]);
+
const resetAllState = useCallback(() => {
- setValue('');
- hideEditor();
+ form.resetFields();
setHasDirtyData(false);
- }, [hideEditor]);
+ hideEditor();
+ }, [form, hideEditor]);
+
const handleCloseModal = useCallback(() => {
dispatch(
updateNavModalStatus({
@@ -55,16 +81,27 @@ const CompanyNoticeModal: React.FC = () => {
);
resetAllState();
}, [dispatch, resetAllState]);
+
const handleCancelEdit = useCallback(() => {
+ form.resetFields();
+ const initial = getFormInitialValues();
+ form.setFieldsValue(
+ initial
+ ? { ...initial, validPeriod: initial.validPeriod ?? undefined }
+ : {}
+ );
setHasDirtyData(false);
hideEditor();
- setValue(data ?? '');
- }, [data, hideEditor]);
- const submit = () => {
+ }, [form, hideEditor, getFormInitialValues]);
+
+ const handleSubmit = useCallback(async () => {
+ const values = await form.validateFields();
startSubmit();
CompanyNotice.UpdateCompanyNotice({
company_notice: {
- notice_str: value
+ notice_str: values.notice_str,
+ start_time: values.validPeriod?.[0]?.toISOString() ?? '',
+ end_time: values.validPeriod?.[1]?.toISOString() ?? ''
}
})
.then((res) => {
@@ -74,15 +111,8 @@ const CompanyNoticeModal: React.FC = () => {
}
})
.finally(finishedSubmit);
- };
- useEffect(() => {
- if (visible) {
- LocalStorageWrapper.set(
- StorageKey.SHOW_COMPANY_NOTICE,
- CompanyNoticeDisplayStatusEnum.Displayed
- );
- }
- }, [visible]);
+ }, [form, startSubmit, finishedSubmit, messageApi, t, handleCloseModal]);
+
useEffect(() => {
dispatch(
initNavModalStatus({
@@ -92,7 +122,9 @@ const CompanyNoticeModal: React.FC = () => {
})
);
}, [dispatch]);
- const actions = CompanyNoticeModalActions(showEditor);
+
+ const actions = companyNoticeModalActions(showEditor);
+
return (
{
{
if={canEdit}
defaultNode={
<>
- {data ? (
- {data}
+ {noticeData?.notice_str ? (
+
+
+ {noticeData.notice_str}
+
+ {(noticeData.start_time || noticeData.expire_time) && (
+
+ {t('dmsSystem.notification.effectivePeriod')}
+ {': '}
+ {noticeData.start_time
+ ? formatTime(noticeData.start_time)
+ : '--'}
+ {' ~ '}
+ {noticeData.expire_time
+ ? formatTime(noticeData.expire_time)
+ : '--'}
+
+ )}
+
) : (
{
}
>
- {
- setValue(e.target.value ?? '');
- setHasDirtyData(true);
- }}
+ onValuesChange={() => setHasDirtyData(true)}
/>
diff --git a/packages/base/src/page/Nav/SideMenu/UserMenu/components/UserNavigate.tsx b/packages/base/src/page/Nav/SideMenu/UserMenu/components/UserNavigate.tsx
index 415b4177a8..92f5a4d49c 100644
--- a/packages/base/src/page/Nav/SideMenu/UserMenu/components/UserNavigate.tsx
+++ b/packages/base/src/page/Nav/SideMenu/UserMenu/components/UserNavigate.tsx
@@ -11,21 +11,12 @@ import { CustomAvatarStyleWrapper } from '@actiontech/dms-kit/es/components/Cust
import { useState } from 'react';
import { useUserInfo } from '@actiontech/shared/lib/features';
import Session from '@actiontech/shared/lib/api/base/service/Session';
-import CompanyNotice from '@actiontech/shared/lib/api/base/service/CompanyNotice';
-import {
- LocalStorageWrapper,
- ResponseCode,
- SupportTheme
-} from '@actiontech/dms-kit';
+import { ResponseCode, SupportTheme } from '@actiontech/dms-kit';
import { SupportLanguage } from '@actiontech/dms-kit';
import { useDispatch } from 'react-redux';
import { updateNavModalStatus } from '../../../../../store/nav';
import { ModalName } from '../../../../../data/ModalName';
import { useTypedNavigate } from '@actiontech/shared';
-import {
- CompanyNoticeDisplayStatusEnum,
- StorageKey
-} from '@actiontech/dms-kit';
import { useBoolean, useRequest } from 'ahooks';
import { ContextMenuItem } from './ContextMenu/index.type';
import ContextMenu from './ContextMenu';
@@ -196,30 +187,6 @@ const UserNavigate: React.FC = ({
}
];
- // #if [ee]
- useRequest(
- () =>
- CompanyNotice.GetCompanyNotice().then((res) => {
- if (res.data.code === ResponseCode.SUCCESS) {
- const { read_by_current_user, notice_str } = res.data.data || {};
- if (notice_str && !read_by_current_user) {
- dispatch(
- updateNavModalStatus({
- modalName: ModalName.Company_Notice,
- status: true
- })
- );
- }
- }
- }),
- {
- ready:
- LocalStorageWrapper.get(StorageKey.SHOW_COMPANY_NOTICE) ===
- CompanyNoticeDisplayStatusEnum.NotDisplayed
- }
- );
- // #endif
-
// TODO 暂时不放开切换主题功能
// const footer = (
// <>
diff --git a/packages/base/src/page/Nav/SideMenu/UserMenu/components/__tests__/UserNavigate.ce.test.tsx b/packages/base/src/page/Nav/SideMenu/UserMenu/components/__tests__/UserNavigate.ce.test.tsx
index 4472175091..386b1a3880 100644
--- a/packages/base/src/page/Nav/SideMenu/UserMenu/components/__tests__/UserNavigate.ce.test.tsx
+++ b/packages/base/src/page/Nav/SideMenu/UserMenu/components/__tests__/UserNavigate.ce.test.tsx
@@ -9,11 +9,7 @@ import { act, cleanup, fireEvent, screen } from '@testing-library/react';
import { baseSuperRender } from '../../../../../../testUtils/superRender';
import { getBySelector } from '@actiontech/shared/lib/testUtil/customQuery';
import dms from '@actiontech/shared/lib/testUtil/mockApi/base/global';
-import { LocalStorageWrapper, SupportTheme } from '@actiontech/dms-kit';
-import {
- CompanyNoticeDisplayStatusEnum,
- SupportLanguage
-} from '@actiontech/dms-kit';
+import { SupportTheme, SupportLanguage } from '@actiontech/dms-kit';
import { mockUseUserInfo } from '@actiontech/shared/lib/testUtil/mockHook/mockUseUserInfo';
jest.mock('react-redux', () => {
@@ -63,15 +59,9 @@ describe('base/page/Nav/SideMenu/UserNavigate-ce', () => {
});
it('render snap', async () => {
- jest
- .spyOn(LocalStorageWrapper, 'get')
- .mockReturnValue(CompanyNoticeDisplayStatusEnum.NotDisplayed);
- const requestGetCompanyNotice = dms.getCompanyNotice();
-
const { baseElement } = customRender();
expect(baseElement).toMatchSnapshot();
- expect(requestGetCompanyNotice).toHaveBeenCalledTimes(0);
const iconUserName = getBySelector('.ant-avatar-string', baseElement);
fireEvent.click(iconUserName);
await act(async () => jest.advanceTimersByTime(500));
diff --git a/packages/base/src/page/Nav/SideMenu/UserMenu/components/__tests__/UserNavigate.test.tsx b/packages/base/src/page/Nav/SideMenu/UserMenu/components/__tests__/UserNavigate.test.tsx
index 1d3f9edc33..a06f5aad16 100644
--- a/packages/base/src/page/Nav/SideMenu/UserMenu/components/__tests__/UserNavigate.test.tsx
+++ b/packages/base/src/page/Nav/SideMenu/UserMenu/components/__tests__/UserNavigate.test.tsx
@@ -5,12 +5,7 @@ import { act, cleanup, fireEvent, screen } from '@testing-library/react';
import { baseSuperRender } from '../../../../../../testUtils/superRender';
import { getBySelector } from '@actiontech/shared/lib/testUtil/customQuery';
import dms from '@actiontech/shared/lib/testUtil/mockApi/base/global';
-import { LocalStorageWrapper, SupportTheme } from '@actiontech/dms-kit';
-import { ModalName } from '../../../../../../data/ModalName';
-import {
- CompanyNoticeDisplayStatusEnum,
- SupportLanguage
-} from '@actiontech/dms-kit';
+import { SupportTheme, SupportLanguage } from '@actiontech/dms-kit';
import { mockUseUserInfo } from '@actiontech/shared/lib/testUtil/mockHook/mockUseUserInfo';
import account from '@actiontech/shared/lib/testUtil/mockApi/base/account';
import { createSpySuccessResponse } from '@actiontech/shared/lib/testUtil/mockApi';
@@ -35,7 +30,6 @@ describe('base/page/Nav/SideMenu/UserNavigate-ee', () => {
const versionModalOpenFn = jest.fn();
const navigateSpy = jest.fn();
const scopeDispatch = jest.fn();
- let requestGetCompanyNotice: jest.SpyInstance;
let requestDelSession: jest.SpyInstance;
let requestUpdateCurrentUser: jest.SpyInstance;
@@ -56,7 +50,7 @@ describe('base/page/Nav/SideMenu/UserNavigate-ee', () => {
(useNavigate as jest.Mock).mockImplementation(() => navigateSpy);
(useDispatch as jest.Mock).mockImplementation(() => scopeDispatch);
jest.useFakeTimers();
- requestGetCompanyNotice = dms.getCompanyNotice();
+ dms.getCompanyNotice();
requestDelSession = dms.delSession();
requestUpdateCurrentUser = account.updateCurrentUser();
mockUseUserInfo({ clearUserInfo: mockClearUserInfo });
@@ -69,21 +63,11 @@ describe('base/page/Nav/SideMenu/UserNavigate-ee', () => {
});
it('render snap', async () => {
- jest
- .spyOn(LocalStorageWrapper, 'get')
- .mockReturnValue(CompanyNoticeDisplayStatusEnum.NotDisplayed);
const { baseElement } = customRender();
- expect(requestGetCompanyNotice).toHaveBeenCalledTimes(1);
await act(async () => jest.advanceTimersByTime(3300));
expect(baseElement).toMatchSnapshot();
- expect(scopeDispatch).toHaveBeenCalled();
- expect(scopeDispatch).toHaveBeenCalledWith({
- payload: { modalName: ModalName.Company_Notice, status: true },
- type: 'nav/updateModalStatus'
- });
-
const iconUserName = getBySelector('.ant-avatar-string', baseElement);
fireEvent.click(iconUserName);
await act(async () => jest.advanceTimersByTime(500));
diff --git a/packages/base/src/page/Nav/SideMenu/style.ts b/packages/base/src/page/Nav/SideMenu/style.ts
index 4a70b1499a..169b5c4231 100644
--- a/packages/base/src/page/Nav/SideMenu/style.ts
+++ b/packages/base/src/page/Nav/SideMenu/style.ts
@@ -38,7 +38,20 @@ export const CEModeProjectWrapperStyleWrapper = styled('div')`
export const CompanyNoticeModalStyleWrapper = styled(BasicModal)`
&.company-notice-modal {
.ant-modal-body {
- max-height: 600px;
+ max-height: 700px;
+ overflow-y: auto;
+ }
+
+ .company-notice-view-space {
+ width: 100%;
+ }
+
+ .company-notice-date-picker {
+ width: 500px;
+ }
+
+ .company-notice-effective-period {
+ font-size: 12px;
}
}
`;
diff --git a/packages/base/src/page/Nav/index.tsx b/packages/base/src/page/Nav/index.tsx
index e85c6ff99a..63cffa432d 100644
--- a/packages/base/src/page/Nav/index.tsx
+++ b/packages/base/src/page/Nav/index.tsx
@@ -2,16 +2,10 @@ import { ReactNode } from 'react';
import { LayoutStyleWrapper } from '@actiontech/dms-kit';
import useBrowserVersionTips from '../../hooks/useBrowserVersionTips';
import UserGuideModal from './UserGuideModal';
-
-// #if [ee]
+import CompanyNoticeBanner from './CompanyNoticeBanner';
import EESideMenu from './SideMenu';
-// #else
import CESideMenu from './SideMenu/index.ce';
-// #endif
-
-// #if [demo || ce]
import CopyrightInformation from './Copyright';
-// #endif
const Nav: React.FC<{ children?: ReactNode }> = (props) => {
useBrowserVersionTips();
@@ -25,6 +19,9 @@ const Nav: React.FC<{ children?: ReactNode }> = (props) => {
{/* #endif */}
+ {/* #if [ee] */}
+ (
'/v1/dms/company_notice',
- undefined,
+ paramsData,
options
);
}
diff --git a/packages/shared/lib/api/base/service/common.d.ts b/packages/shared/lib/api/base/service/common.d.ts
index 5a2a9a0198..8ed70b796d 100644
--- a/packages/shared/lib/api/base/service/common.d.ts
+++ b/packages/shared/lib/api/base/service/common.d.ts
@@ -486,9 +486,15 @@ export interface ICheckLicenseReply {
}
export interface ICompanyNotice {
+ create_user_name?: string;
+
+ expire_time?: string;
+
notice_str?: string;
read_by_current_user?: boolean;
+
+ start_time?: string;
}
export interface IComponentNameWithVersion {
@@ -1187,9 +1193,7 @@ export interface IGlobalDataExportWorkflow {
workflow_uid?: string;
}
-export interface II18nStr {
- [key: string]: string;
-}
+export interface II18nStr {}
export interface IImportDBService {
additional_params?: IAdditionalParam[];
@@ -2720,7 +2724,11 @@ export interface IUpdateBusinessTagReq {
}
export interface IUpdateCompanyNotice {
+ end_time?: string;
+
notice_str?: string;
+
+ start_time?: string;
}
export interface IUpdateCompanyNoticeReq {
diff --git a/packages/shared/lib/testUtil/mockApi/base/global/data.ts b/packages/shared/lib/testUtil/mockApi/base/global/data.ts
index a1e98e808d..d649de4ca2 100644
--- a/packages/shared/lib/testUtil/mockApi/base/global/data.ts
+++ b/packages/shared/lib/testUtil/mockApi/base/global/data.ts
@@ -48,7 +48,9 @@ export const BasicInfoMockData: IBasicInfo = {
export const CompanyNoticeMockData: ICompanyNotice = {
notice_str: 'notice',
- read_by_current_user: false
+ read_by_current_user: false,
+ start_time: '2026-01-01T00:00:00.000Z',
+ expire_time: '2026-12-31T23:59:59.000Z'
};
export const DBServicesList: IListDBServiceV2[] = [