feats

src/pages/Student/School/Edit/Specialty.jsx

@@ -7,7 +7,6 @@ import request, { queryTable } from '@/utils/request';
 import SpecialtyModel from './components/SpecialtyModel';
 
 const Specialty = (props) => {
-  console.log(props, 'props');
   const [, setLoading] = useState(false);
   const [visible, setVisible] = useState(false);
 
@@ -49,18 +48,17 @@ const Specialty = (props) => {
   //       });
   //   };
 
-  const deleteSchoolClick = () => {
-
-    ref.current.reload();
-    //   request(`/specialty/${id}`, { method: 'delete' })
-    //     .then(() => {
-    //       notification.success({ message: '删除成功' });
-    //       ref.current.submit();
-    //     })
-    //     .catch((e) => {
-
-    //       notification.error({ message: e.message });
-    //     });
+  const deleteSpecialty = (record) => {
+    const { specialtyId } = record
+    
+    request(`/specialty/${specialtyId}`, { method: 'delete' })
+      .then(() => {
+        notification.success({ message: '删除成功' });
+        ref.current.reload();
+      })
+      .catch((e) => {
+        notification.error({ message: e.message });
+      });
   };
 
   const columns = [
@@ -97,7 +95,7 @@ const Specialty = (props) => {
           <Popconfirm
             key="popconfirm"
             title={`确认删除吗?`}
-            onConfirm={() => deleteSchoolClick(record.specialtyId)}
+            onConfirm={() => deleteSpecialty(record)}
             okText="是"
             cancelText="否"
           >

src/pages/Student/Student/List/index.jsx

@@ -1,6 +1,7 @@
 import React, { useCallback, useState } from 'react';
 import { history } from 'umi';
 import { Space } from 'antd';
+import moment from 'moment';
 import { PageContainer } from '@ant-design/pro-layout';
 import ProTable from '@ant-design/pro-table';
 import School from '@/components/School';
@@ -18,13 +19,13 @@ const StudentList = () => {
   }, []);
 
   const columns = [
-    {
-      title: '编号',
-      dataIndex: 'studentId',
-      align: 'center',
-      width: 300,
-      hideInSearch: true,
-    },
+    // {
+    //   title: '编号',
+    //   dataIndex: 'studentId',
+    //   align: 'center',
+    //   width: 300,
+    //   hideInSearch: true,
+    // },
     {
       title: '姓名',
       dataIndex: 'name',
@@ -67,6 +68,12 @@ const StudentList = () => {
       dataIndex: 'studentNo',
       align: 'center',
     },
+    {
+      title: '注册时间',
+      dataIndex: 'createDate',
+      align: 'center',
+      render: t => moment(t).format('YYYY-MM-DD HH:mm')
+    },
     {
       title: '操作',
       dataIndex: 'action',

src/utils/download.js

@@ -0,0 +1,40 @@
+
+/**
+ * 获取 query string
+ * @param {*} params 
+ * @returns string
+ */
+function getQueryString(params) {
+  if (!params) return ;
+
+  const keys = Object.keys(params)
+  const arr = keys.map((key) => {
+    const val = params[key]
+    if (val === null || val === undefined) return false;
+
+    return `${key}=${encodeURIComponent(val)}`
+  })
+
+  // eslint-disable-next-line consistent-return
+  return arr.filter(Boolean).join('&')
+}
+
+export function fetchBlob(url, opt) {
+  const { params, ...initArgs } = opt || {}
+  const resource = params ? `${url}?${getQueryString(params)}` : url
+
+  return window.fetch(resource, initArgs).then(response => response.blob())
+}
+
+export function downloadBlob(fileName, blob) {
+  const url = window.URL.createObjectURL(blob);
+  const link = document.createElement('a');
+  link.href = url;
+  link.setAttribute('download', fileName);
+  link.click();
+  window.URL.revokeObjectURL(url);
+}
+
+export function downloadUrl(fileName, url, opt) {
+  return fetchBlob(url, opt).then(blob => downloadBlob(fileName, blob))
+};

src/utils/request.js

@@ -1,7 +1,7 @@
 /** Request 网络请求工具 更详细的 api 文档: https://github.com/umijs/umi-request */
 import { extend } from 'umi-request';
 import { notification } from 'antd';
-import { downloadFile } from './utils'
+import { downloadBlob } from './download';
 
 const codeMessage = {
   200: '服务器成功返回请求的数据。',
@@ -88,7 +88,7 @@ request.interceptors.response.use(async (response) => {
     const data = await response.clone().blob();
     const content = response.headers.get('content-disposition');
     const fileName = content.replace('attachment;filename=', '')
-    downloadFile(data, decodeURIComponent(fileName))
+    downloadBlob(decodeURIComponent(fileName), data)
   }
 
   return response;

src/utils/utils.js

@@ -46,12 +46,3 @@ export function getCurrentRoute(pathname) {
 
 export const defaultAvatar = 'https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png'
 
-export function downloadFile(data, fileName) {
-  const url = window.URL.createObjectURL(new Blob([data]))
-  const link = document.createElement('a')
-  link.style.display = 'none'
-  link.href = url
-  link.setAttribute('download', fileName)
-  document.body.append(link)
-  link.click()
-}