[feature](base/setting/pushNotification): tidy file

packages/base/src/page/System/GlobalSetting/index.tsx

@@ -14,187 +14,191 @@
 import { integerValidate } from '@actiontech/shared/lib/utils/Common';
 import useHideConfigInputNode from '../../../../../shared/lib/components/ConfigItem/hooks/useHideConfigInputNode';
 import { ConfigFieldMapMeta } from '@actiontech/shared/lib/components/ConfigItem/index.type';
+import SystemBasicTitle from '../components/BasicTitle';
 
 const GlobalSetting = () => {
   const { t } = useTranslation();
   const [messageApi, messageContextHolder] = message.useMessage();
   const [
     orderExpiredHoursFieldVisible,
     {
       setTrue: showOrderExpiredHoursField,
       setFalse: hideOrderExpiredHoursField
     }
   ] = useBoolean();
   const [
     operationRecordExpiredHoursField,
     {
       setTrue: showOperationRecordExpiredHoursField,
       setFalse: hideOperationRecordExpiredHoursField
     }
   ] = useBoolean();
   const [urlFieldVisible, { setTrue: showUrlField, setFalse: hideUrlField }] =
     useBoolean();
   const hideFieldsAction = () => {
     if (orderExpiredHoursFieldVisible) hideOrderExpiredHoursField();
     if (operationRecordExpiredHoursField)
       hideOperationRecordExpiredHoursField();
     if (urlFieldVisible) hideUrlField();
   };
   const hasOneFieldVisible = useMemo(
     () =>
       orderExpiredHoursFieldVisible ||
       operationRecordExpiredHoursField ||
       urlFieldVisible,
     [
       orderExpiredHoursFieldVisible,
       operationRecordExpiredHoursField,
       urlFieldVisible
     ]
   );
 
   useHideConfigInputNode(hasOneFieldVisible, hideFieldsAction);
 
   const integerValidator = (value: string) => {
     if (!integerValidate(value)) {
       messageApi.error(t('common.form.rule.integer'));
       return false;
     }
     return true;
   };
 
   const fieldMetaMap = new Map<
     keyof IUpdateSystemVariablesReqV1,
     ConfigFieldMapMeta
   >([
     [
       'workflow_expired_hours',
       {
         hideField: hideOrderExpiredHoursField
       }
     ],
     [
       'operation_record_expired_hours',
       {
         hideField: hideOperationRecordExpiredHoursField
       }
     ],
     [
       'url',
       {
         hideField: hideUrlField
       }
     ]
   ]);
 
   const {
     data: globalConfig,
     loading: getConfigLoading,
     refresh
   } = useRequest(() =>
     configuration.getSystemVariablesV1().then((res) => res?.data?.data ?? {})
   );
 
   const [submitLoading, { setTrue: startSubmit, setFalse: submitFinish }] =
     useBoolean();
 
   const submitGlobalConfig = (
     value: string | number,
     fieldName: keyof IUpdateSystemVariablesReqV1
   ) => {
     const fieldMeta = fieldMetaMap.get(fieldName);
 
     startSubmit();
     configuration
       .updateSystemVariablesV1({
         ...globalConfig,
         [fieldName]: value
       })
       .then((res) => {
         if (res.data.code === ResponseCode.SUCCESS) {
           refresh();
           fieldMeta?.hideField?.();
         }
       })
       .finally(() => {
         submitFinish();
       });
   };
 
   return (
-    <section className="system-form-wrapper">
-      <div className="config-title-wrapper has-border">
-        {t('dmsSystem.tabPaneTitle.globalConfiguration')}
-      </div>
-      <Spin spinning={getConfigLoading || submitLoading}>
-        {messageContextHolder}
-        <ConfigItem
-          label={
-            <LabelContent>{`${t('dmsSystem.global.orderExpiredHours')}(${t(
-              'common.time.hour'
-            )})`}</LabelContent>
-          }
-          descNode={String(globalConfig?.workflow_expired_hours ?? '-')}
-          fieldVisible={orderExpiredHoursFieldVisible}
-          showField={showOrderExpiredHoursField}
-          hideField={hideOrderExpiredHoursField}
-          inputNode={
-            <EditInputNumber
-              fieldValue={globalConfig?.workflow_expired_hours ?? 2160}
-              validator={(value: number) => integerValidator(String(value))}
-              hideField={hideOrderExpiredHoursField}
-              onSubmit={(value: number) => {
-                submitGlobalConfig(value, 'workflow_expired_hours');
-              }}
-            />
-          }
-        />
-        <ConfigItem
-          label={
-            <LabelContent>{`${t(
-              'dmsSystem.global.operationRecordExpiredHours'
-            )}(${t('common.time.hour')})`}</LabelContent>
-          }
-          descNode={String(globalConfig?.operation_record_expired_hours ?? '-')}
-          fieldVisible={operationRecordExpiredHoursField}
-          showField={showOperationRecordExpiredHoursField}
-          hideField={hideOperationRecordExpiredHoursField}
-          inputNode={
-            <EditInputNumber
-              fieldValue={globalConfig?.operation_record_expired_hours ?? 2160}
-              validator={(value: number) => integerValidator(String(value))}
-              hideField={hideOperationRecordExpiredHoursField}
-              onSubmit={(value: number) => {
-                submitGlobalConfig(value, 'operation_record_expired_hours');
-              }}
-            />
-          }
-        />
-        <ConfigItem
-          label={
-            <LabelContent
-              tips={`${t('dmsSystem.global.urlAddressPrefixTips')}, ${t(
-                'dmsSystem.global.urlAddressFormatTips'
-              )} `}
-            >
-              {t('dmsSystem.global.urlAddressPrefix')}
-            </LabelContent>
-          }
-          descNode={!!globalConfig?.url ? globalConfig.url : '-'}
-          fieldVisible={urlFieldVisible}
-          showField={showUrlField}
-          hideField={hideUrlField}
-          inputNode={
-            <EditInput
-              fieldValue={globalConfig?.url ?? ''}
-              hideField={hideUrlField}
-              onSubmit={(value: string) => {
-                submitGlobalConfig(value, 'url');
-              }}
-            />
-          }
-        />
-      </Spin>
-    </section>
+    <SystemBasicTitle title={t('dmsSystem.tabPaneTitle.globalConfiguration')}>
+      <>
+        <Spin spinning={getConfigLoading || submitLoading}>
+          {messageContextHolder}
+          <ConfigItem
+            label={
+              <LabelContent>{`${t('dmsSystem.global.orderExpiredHours')}(${t(
+                'common.time.hour'
+              )})`}</LabelContent>
+            }
+            descNode={String(globalConfig?.workflow_expired_hours ?? '-')}
+            fieldVisible={orderExpiredHoursFieldVisible}
+            showField={showOrderExpiredHoursField}
+            hideField={hideOrderExpiredHoursField}
+            inputNode={
+              <EditInputNumber
+                fieldValue={globalConfig?.workflow_expired_hours ?? 2160}
+                validator={(value: number) => integerValidator(String(value))}
+                hideField={hideOrderExpiredHoursField}
+                onSubmit={(value: number) => {
+                  submitGlobalConfig(value, 'workflow_expired_hours');
+                }}
+              />
+            }
+          />
+          <ConfigItem
+            label={
+              <LabelContent>{`${t(
+                'dmsSystem.global.operationRecordExpiredHours'
+              )}(${t('common.time.hour')})`}</LabelContent>
+            }
+            descNode={String(
+              globalConfig?.operation_record_expired_hours ?? '-'
+            )}
+            fieldVisible={operationRecordExpiredHoursField}
+            showField={showOperationRecordExpiredHoursField}
+            hideField={hideOperationRecordExpiredHoursField}
+            inputNode={
+              <EditInputNumber
+                fieldValue={
+                  globalConfig?.operation_record_expired_hours ?? 2160
+                }
+                validator={(value: number) => integerValidator(String(value))}
+                hideField={hideOperationRecordExpiredHoursField}
+                onSubmit={(value: number) => {
+                  submitGlobalConfig(value, 'operation_record_expired_hours');
+                }}
+              />
+            }
+          />
+          <ConfigItem
+            label={
+              <LabelContent
+                tips={`${t('dmsSystem.global.urlAddressPrefixTips')}, ${t(
+                  'dmsSystem.global.urlAddressFormatTips'
+                )} `}
+              >
+                {t('dmsSystem.global.urlAddressPrefix')}
+              </LabelContent>
+            }
+            descNode={!!globalConfig?.url ? globalConfig.url : '-'}
+            fieldVisible={urlFieldVisible}
+            showField={showUrlField}
+            hideField={hideUrlField}
+            inputNode={
+              <EditInput
+                fieldValue={globalConfig?.url ?? ''}
+                hideField={hideUrlField}
+                onSubmit={(value: string) => {
+                  submitGlobalConfig(value, 'url');
+                }}
+              />
+            }
+          />
+        </Spin>
+      </>
+    </SystemBasicTitle>
   );
 };
 

packages/base/src/page/System/License/index.tsx

@@ -1,19 +1,20 @@
 import { useBoolean, useRequest } from 'ahooks';
-import { Space } from 'antd';
 import { useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useDispatch } from 'react-redux';
-import EmitterKey from '../../../data/EmitterKey';
+
 import { updateSystemModalStatus } from '../../../store/system';
+import dms from '@actiontech/shared/lib/api/base/service/dms';
 import EventEmitter from '../../../utils/EventEmitter';
-import { Row } from 'antd';
-import { BasicButton, BasicToolTips } from '@actiontech/shared';
-import { LicenseColumn } from './index.data';
-import { IconTipGray } from '@actiontech/shared/lib/Icon';
-import { ActiontechTable } from '@actiontech/shared/lib/components/ActiontechTable';
+import EmitterKey from '../../../data/EmitterKey';
+
+import { Space } from 'antd';
+import { BasicButton } from '@actiontech/shared';
 import { ModalName } from '../../../data/ModalName';
+import SystemBasicTitle from '../components/BasicTitle';
 import ImportLicense from './Modal/ImportLicense';
-import dms from '@actiontech/shared/lib/api/base/service/dms';
+import { LicenseColumn } from './index.data';
+import { ActiontechTable } from '@actiontech/shared/lib/components/ActiontechTable';
 
 const License = () => {
   const { t } = useTranslation();
@@ -54,19 +55,11 @@ const License = () => {
   }, [refreshLicenseList]);
 
   return (
-    <section className="system-form-wrapper">
-      <Row
-        className="config-title-wrapper has-border"
-        justify={'space-between'}
-        align={'middle'}
-      >
-        <Space>
-          {t('dmsSystem.tabPaneTitle.license')}
-          {/* todo: 此处提示语待产品给出后调整 */}
-          <BasicToolTips title={t('dmsSystem.license.productName')}>
-            <IconTipGray />
-          </BasicToolTips>
-        </Space>
+    <SystemBasicTitle
+      title={t('dmsSystem.tabPaneTitle.license')}
+      // todo: 此处提示语待产品给出后调整
+      titleTip={t('dmsSystem.license.productName')}
+      titleExtra={
         <Space key="button-wrapper">
           <BasicButton
             type="primary"
@@ -79,16 +72,19 @@ const License = () => {
             {t('dmsSystem.license.import')}
           </BasicButton>
         </Space>
-      </Row>
-      <ActiontechTable
-        rowKey="name"
-        columns={LicenseColumn}
-        dataSource={data?.list}
-        loading={loading}
-        className="clear-padding-bottom"
-      />
-      <ImportLicense />
-    </section>
+      }
+    >
+      <>
+        <ActiontechTable
+          rowKey="name"
+          columns={LicenseColumn}
+          dataSource={data?.list}
+          loading={loading}
+          className="clear-padding-bottom"
+        />
+        <ImportLicense />
+      </>
+    </SystemBasicTitle>
   );
 };
 

packages/base/src/page/System/LoginConnection/index.tsx

@@ -1,19 +1,19 @@
 import { useTranslation } from 'react-i18next';
 import LDAPSetting from './LDAPSetting';
 import Oauth from './Oauth';
+import SystemBasicTitle from '../components/BasicTitle';
 
 const LoginConnection = () => {
   const { t } = useTranslation();
 
   return (
-    <section className="system-form-wrapper">
-      <div className="config-title-wrapper">
-        {t('dmsSystem.tabPaneTitle.loginConnection')}
-      </div>
-      <LDAPSetting />
-      <Oauth />
-    </section>
+    <SystemBasicTitle title={t('dmsSystem.tabPaneTitle.loginConnection')}>
+      <>
+        <LDAPSetting />
+        <Oauth />
+      </>
+    </SystemBasicTitle>
   );
 };
 
 export default LoginConnection;

packages/base/src/page/System/PersonalizeSetting/index.tsx

@@ -18,6 +18,7 @@ import { useMemo } from 'react';
 import { ConfigFieldMapMeta } from '@actiontech/shared/lib/components/ConfigItem/index.type';
 import useHideConfigInputNode from '@actiontech/shared/lib/components/ConfigItem/hooks/useHideConfigInputNode';
 import useSystemConfig from '../../../hooks/useSystemConfig';
+import SystemBasicTitle from '../components/BasicTitle';
 
 const PersonalizeSetting: React.FC = () => {
   const { t } = useTranslation();
@@ -87,10 +88,7 @@ const PersonalizeSetting: React.FC = () => {
   };
 
   return (
-    <section className="system-form-wrapper">
-      <div className="config-title-wrapper has-border">
-        {t('dmsSystem.tabPaneTitle.personalize')}
-      </div>
+    <SystemBasicTitle title={t('dmsSystem.tabPaneTitle.personalize')}>
       <Spin spinning={loading}>
         <ConfigItem
           label={
@@ -132,7 +130,7 @@ const PersonalizeSetting: React.FC = () => {
           }
         />
       </Spin>
-    </section>
+    </SystemBasicTitle>
   );
 };
 

packages/base/src/page/System/ProcessConnection/DingTalkSetting/components/ConfigExtraButtons.tsx

@@ -0,0 +1,71 @@
+import { useTranslation } from 'react-i18next';
+import { useRef } from 'react';
+
+import { message, Space } from 'antd';
+import { BasicToolTips, BasicButton } from '@actiontech/shared';
+import ConfigModifyBtn from '../../../components/ConfigModifyBtn';
+import { IconTest } from '../../../../../icon/system';
+
+import configuration from '@actiontech/shared/lib/api/sqle/service/configuration';
+import { ResponseCode } from '@actiontech/shared/lib/enum';
+
+interface ConfigExtraButtonsProps {
+  isConfigClosed: boolean;
+  extraButtonsVisible: boolean;
+  handleClickModify: () => void;
+}
+
+const ConfigExtraButtons = ({
+  isConfigClosed,
+  extraButtonsVisible,
+  handleClickModify
+}: ConfigExtraButtonsProps) => {
+  const { t } = useTranslation();
+  const [messageApi, messageContextHolder] = message.useMessage();
+
+  const testTing = useRef(false);
+  const testDingTalkConfiguration = () => {
+    if (testTing.current) {
+      return;
+    }
+    testTing.current = true;
+    configuration
+      .testDingTalkConfigV1()
+      .then((res) => {
+        if (res.data.code === ResponseCode.SUCCESS) {
+          if (res.data.data?.is_ding_talk_send_normal) {
+            messageApi.success(t('dmsSystem.dingTalk.testSuccess'));
+          } else {
+            messageApi.error(
+              res.data.data?.send_error_message ?? t('common.unknownError')
+            );
+          }
+        }
+      })
+      .finally(() => {
+        testTing.current = false;
+      });
+  };
+
+  return (
+    <>
+      {messageContextHolder}
+      <Space size={12} hidden={isConfigClosed || !extraButtonsVisible}>
+        <BasicToolTips title={t('common.test')} titleWidth={54}>
+          <BasicButton
+            htmlType="submit"
+            type="text"
+            className="system-config-button"
+            loading={testTing.current}
+            disabled={testTing.current}
+            icon={<IconTest />}
+            onClick={testDingTalkConfiguration}
+          />
+        </BasicToolTips>
+        <ConfigModifyBtn onClick={handleClickModify} />
+      </Space>
+    </>
+  );
+};
+
+export default ConfigExtraButtons;