Merge pull request #803 from actiontech/forwardport/pr636/main

forwardport: cherry-pick EE PR #636 to main [AI-resolved]

Author: Rain-1214

packages/base/src/page/Nav/SideMenu/UserMenu/Modal/CompanyNoticeModal/CompanyNoticeForm/index.tsx

@@ -1,8 +1,7 @@
-import { useEffect, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Form, FormInstance } from 'antd';
 import { BasicInput, BasicRangePicker } from '@actiontech/dms-kit';
-import dayjs, { Dayjs } from 'dayjs';
+import dayjs from 'dayjs';
 import { RangePickerProps } from 'antd/es/date-picker';
 import { ICompanyNoticeFormValues } from './index.type';
 
@@ -16,23 +15,10 @@ const range = (start: number, end: number) => {
 
 export const CompanyNoticeForm: React.FC<{
   form: FormInstance<ICompanyNoticeFormValues>;
-  initialValues?: Partial<ICompanyNoticeFormValues>;
   disabled?: boolean;
   onValuesChange?: () => void;
-}> = ({ form, initialValues, disabled, onValuesChange }) => {
+}> = ({ form, disabled, onValuesChange }) => {
   const { t } = useTranslation();
-  const startTimeRef = useRef<Dayjs | null>(null);
-
-  useEffect(() => {
-    if (initialValues) {
-      form.setFieldsValue({
-        ...initialValues,
-        validPeriod: initialValues.validPeriod ?? undefined
-      });
-      const period = initialValues.validPeriod;
-      startTimeRef.current = Array.isArray(period) ? period[0] ?? null : null;
-    }
-  }, [initialValues, form]);
 
   const disabledRangeTime: RangePickerProps['disabledTime'] = (date, type) => {
     const now = dayjs();
@@ -50,7 +36,7 @@ export const CompanyNoticeForm: React.FC<{
             : []
       };
     }
-    const startTime = startTimeRef.current;
+    const startTime = form.getFieldValue('validPeriod')?.[0];
     if (!startTime || !date || !date.isSame(startTime, 'day')) {
       return {};
     }
@@ -66,17 +52,7 @@ export const CompanyNoticeForm: React.FC<{
   };
 
   return (
-    <Form
-      form={form}
-      layout="vertical"
-      onValuesChange={(_, all) => {
-        const period = all.validPeriod;
-        if (Array.isArray(period) && period[0]) {
-          startTimeRef.current = period[0];
-        }
-        onValuesChange?.();
-      }}
-    >
+    <Form form={form} layout="vertical" onValuesChange={onValuesChange}>
       <Form.Item
         name="notice_str"
         label={t('dmsSystem.notification.noticeContent')}

packages/base/src/page/Nav/SideMenu/UserMenu/Modal/CompanyNoticeModal/__snapshots__/index.test.tsx.snap

@@ -467,7 +467,7 @@ exports[`base/page/Nav/SideMenu/UserMenu/CompanyNoticeModal render snap when edi
                                 placeholder="请输入公告内容"
                                 style="resize: none; height: -150px; min-height: -6px; max-height: -150px;"
                               >
-                                notice
+                                这是一条公告信息
                               </textarea>
                             </div>
                           </div>

packages/base/src/page/Nav/SideMenu/UserMenu/Modal/CompanyNoticeModal/index.test.tsx

@@ -5,7 +5,6 @@ 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';

packages/base/src/page/Nav/SideMenu/UserMenu/Modal/CompanyNoticeModal/index.tsx

@@ -123,6 +123,19 @@ const CompanyNoticeModal: React.FC = () => {
     );
   }, [dispatch]);
 
+  useEffect(() => {
+    if (!visible || !canEdit || !noticeData) {
+      return;
+    }
+    const initial = getFormInitialValues();
+    if (initial) {
+      form.setFieldsValue({
+        ...initial,
+        validPeriod: initial.validPeriod ?? undefined
+      });
+    }
+  }, [visible, canEdit, noticeData, form, getFormInitialValues]);
+
   const actions = companyNoticeModalActions(showEditor);
 
   return (
@@ -223,7 +236,6 @@ const CompanyNoticeModal: React.FC = () => {
         >
           <CompanyNoticeForm
             form={form}
-            initialValues={getFormInitialValues()}
             disabled={submitLoading}
             onValuesChange={() => setHasDirtyData(true)}
           />