Explorar o código

fix: #9367 通知模板/通知配置 修复导出文件名

jackhoo_98 %!s(int64=3) %!d(string=hai) anos
pai
achega
58ec09289e

+ 4 - 17
src/pages/notice/Config/index.tsx

@@ -22,7 +22,6 @@ import SearchComponent from '@/components/SearchComponent';
 import { getMenuPathByParams, MENUS_CODE } from '@/utils/menu';
 import { getMenuPathByParams, MENUS_CODE } from '@/utils/menu';
 import { history } from 'umi';
 import { history } from 'umi';
 import { model } from '@formily/reactive';
 import { model } from '@formily/reactive';
-import moment from 'moment';
 import { PermissionButton, ProTableCard } from '@/components';
 import { PermissionButton, ProTableCard } from '@/components';
 import NoticeConfig from '@/components/ProTableCard/CardItems/noticeConfig';
 import NoticeConfig from '@/components/ProTableCard/CardItems/noticeConfig';
 import Debug from '@/pages/notice/Config/Debug';
 import Debug from '@/pages/notice/Config/Debug';
@@ -129,17 +128,12 @@ const Config = observer(() => {
           type="link"
           type="link"
           style={{ padding: 0 }}
           style={{ padding: 0 }}
           isPermission={configPermission.export}
           isPermission={configPermission.export}
-          onClick={() =>
-            downloadObject(
-              record,
-              `通知配置${record.name}-${moment(new Date()).format('YYYY/MM/DD HH:mm:ss')}`,
-            )
-          }
+          onClick={() => downloadObject(record, `通知配置_${record.name}`)}
           key="download"
           key="download"
           tooltip={{
           tooltip={{
             title: intl.formatMessage({
             title: intl.formatMessage({
-              id: 'pages.data.option.download',
-              defaultMessage: '下载配置',
+              id: 'pages.data.option.export',
+              defaultMessage: '导出',
             }),
             }),
           }}
           }}
         >
         >
@@ -376,14 +370,7 @@ const Config = observer(() => {
                         type={'link'}
                         type={'link'}
                         key="export"
                         key="export"
                         isPermission={configPermission.export}
                         isPermission={configPermission.export}
-                        onClick={() =>
-                          downloadObject(
-                            record,
-                            `通知配置${record.name}-${moment(new Date()).format(
-                              'YYYY/MM/DD HH:mm:ss',
-                            )}`,
-                          )
-                        }
+                        onClick={() => downloadObject(record, `通知配置_${record.name}`)}
                       >
                       >
                         <ArrowDownOutlined />
                         <ArrowDownOutlined />
                         导出
                         导出

+ 2 - 6
src/pages/notice/Template/index.tsx

@@ -21,7 +21,6 @@ import { model } from '@formily/reactive';
 import Debug from './Debug';
 import Debug from './Debug';
 import Log from '@/pages/notice/Template/Log';
 import Log from '@/pages/notice/Template/Log';
 import { downloadObject, onlyMessage } from '@/utils/util';
 import { downloadObject, onlyMessage } from '@/utils/util';
-import moment from 'moment';
 import { PermissionButton, ProTableCard } from '@/components';
 import { PermissionButton, ProTableCard } from '@/components';
 import NoticeCard, {
 import NoticeCard, {
   typeList,
   typeList,
@@ -113,7 +112,7 @@ const Template = observer(() => {
           tooltip={{ title: '导出' }}
           tooltip={{ title: '导出' }}
           isPermission={templatePermission.export}
           isPermission={templatePermission.export}
           onClick={() => {
           onClick={() => {
-            downloadObject(record, `${record.name}-${moment(new Date()).format('YYYY_MM_DD')}`);
+            downloadObject(record, `通知模板_${record.name}`);
           }}
           }}
         >
         >
           <ArrowDownOutlined />
           <ArrowDownOutlined />
@@ -308,10 +307,7 @@ const Template = observer(() => {
                 key="export"
                 key="export"
                 isPermission={templatePermission.export}
                 isPermission={templatePermission.export}
                 onClick={() => {
                 onClick={() => {
-                  downloadObject(
-                    record,
-                    `${record.name}-${moment(new Date()).format('YYYY/MM/DD HH:mm:ss')}`,
-                  );
+                  downloadObject(record, `通知模板_${record.name}`);
                 }}
                 }}
               >
               >
                 <ArrowDownOutlined />
                 <ArrowDownOutlined />

+ 1 - 1
src/utils/util.ts

@@ -53,7 +53,7 @@ export const downloadFileByUrl = (url: string, name: string, type: string) => {
 export const downloadObject = (record: Record<string, any>, fileName: string, format?: string) => {
 export const downloadObject = (record: Record<string, any>, fileName: string, format?: string) => {
   // 创建隐藏的可下载链接
   // 创建隐藏的可下载链接
   const ghostLink = document.createElement('a');
   const ghostLink = document.createElement('a');
-  ghostLink.download = `${record?.name || ''}${fileName}_${moment(new Date()).format(
+  ghostLink.download = `${fileName ? '' : record?.name}${fileName}_${moment(new Date()).format(
     format || 'YYYY_MM_DD',
     format || 'YYYY_MM_DD',
   )}.json`;
   )}.json`;
   ghostLink.style.display = 'none';
   ghostLink.style.display = 'none';