@yilianjituan/yilian_dgerm 1.0.1 → 1.0.2

package/dist/components/PageTemplate/index.interface.d.ts

@@ -1,5 +1,5 @@
-import { MethodEnum } from "../../commonType/globalEnum";
-import { ReactNode } from "react";
+import { ReactNode } from 'react';
+import { MethodEnum } from '../../commonType/globalEnum';
 export interface IPageTemPropsData {
     http: any;
     ref?: any;
@@ -21,6 +21,7 @@ export interface IPageTemPropsData {
     afterRequest?: typeEmptyFunc;
     afterReset?: typeEmptyFunc;
     beforeSearch?: typeEmptyFunc;
+    afterExport?: typeEmptyFunc;
     beforeExport?: typeEmptyFunc;
     afterErrorRequest?: typeEmptyFunc;
     columns: IColumnsProps[];

package/dist/components/PageTemplate/index.js

@@ -61,6 +61,7 @@ var PageTemplate = function PageTemplate(props, ref) {
     _useState2 = _slicedToArray(_useState, 2),
     dataSource = _useState2[0],
     setDataSource = _useState2[1];
+  var dataSourceRef = useRef([]);
   var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
     tableLoading = _useState4[0],
@@ -205,9 +206,10 @@ var PageTemplate = function PageTemplate(props, ref) {
                   result = _context.sent;
                   _ref3 = result || {}, totalElements = _ref3.totalElements, content = _ref3.content;
                   setDataSource(content || []);
+                  dataSourceRef.current = content || [];
                   setTotal(totalElements || '');
                   setCurrent(current);
-                case 7:
+                case 8:
                 case "end":
                   return _context.stop();
               }
@@ -318,15 +320,22 @@ var PageTemplate = function PageTemplate(props, ref) {
    * 导出
    */
   var exportList = function exportList() {
-    if (dataSource.length === 0) {
-      message.error('暂无数据，无法导出！');
-      return;
-    }
-    setIsSpinLoading(true);
     _onSearch();
-
-    // 需要等待搜索结束
     setTimeout(function () {
+      var _props$afterExport = props.afterExport,
+        afterExport = _props$afterExport === void 0 ? function (val) {
+          return val;
+        } : _props$afterExport;
+      if (dataSourceRef.current.length === 0) {
+        message.error('暂无数据，无法导出！');
+        return;
+      }
+      var params = form.getFieldsValue();
+      paramsRef.current = afterExport(_objectSpread(_objectSpread({}, paramsRef.current), params));
+      if (!paramsRef.current) return;
+      setIsSpinLoading(true);
+
+      // 需要等待搜索结束
       exportApi(paramsRef.current).then(function (item) {
         if (item.status === 200) {
           exportCompile(item);

package/dist/utils/common.d.ts

@@ -4,8 +4,8 @@
  */
 export declare function revertUTF8(szInput: any): string;
 /**
-* 导出编译
-*/
+ * 导出编译
+ */
 export declare function exportCompile(res: {
     data: BlobPart;
     headers: {

package/dist/utils/common.js

@@ -1,4 +1,4 @@
-import { message } from "antd";
+import { message } from 'antd';
 
 /**
  * UTF8编码转成汉字字符串
@@ -8,22 +8,22 @@ export function revertUTF8(szInput) {
   var x,
     wch,
     wch1,
-    wch2 = "",
-    szRet = "";
+    wch2 = '',
+    szRet = '';
   for (x = 0; x < szInput.length; x++) {
-    if (szInput.charAt(x) === "%") {
+    if (szInput.charAt(x) === '%') {
       wch = parseInt(szInput.charAt(++x) + szInput.charAt(++x), 16);
       if (!wch) {
         break;
       }
       if (!(wch & 0x80)) {
-        // eslint-disable-next-line 
+        // eslint-disable-next-line
         wch = wch;
       } else if (!(wch & 0x20)) {
         x++;
         wch1 = parseInt(szInput.charAt(++x) + szInput.charAt(++x), 16);
-        wch = (wch & 0x1F) << 6;
-        wch1 = wch1 & 0x3F;
+        wch = (wch & 0x1f) << 6;
+        wch1 = wch1 & 0x3f;
         wch = wch + wch1;
       } else {
         x++;
@@ -32,11 +32,11 @@ export function revertUTF8(szInput) {
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         wch2 = parseInt(szInput.charAt(++x) + szInput.charAt(++x), 16);
-        wch = (wch & 0x0F) << 12;
-        wch1 = (wch1 & 0x3F) << 6;
+        wch = (wch & 0x0f) << 12;
+        wch1 = (wch1 & 0x3f) << 6;
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
-        wch2 = wch2 & 0x3F;
+        wch2 = wch2 & 0x3f;
         wch = wch + wch1 + wch2;
       }
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -49,8 +49,8 @@ export function revertUTF8(szInput) {
   return szRet;
 }
 /**
-* 导出编译
-*/
+ * 导出编译
+ */
 export function exportCompile(res) {
   var data = res.data;
   // 有可能下载失败，设置了responseType: 'blob'，axios会把data强制转为blob
@@ -66,12 +66,13 @@ export function exportCompile(res) {
     try {
       var resData = JSON.parse(e.target.result); // this.result为FileReader获取blob数据转换为json后的数据，即后台返回的原始数据
       // 如果执行到这里，说明下载报错了，进行后续处理
-      if (resData.result === "NULL") {
+      if (resData.result === 'NULL') {
         message.error('无数据无法导出，请确认后操作');
       } else {
         message.error(resData.message);
       }
     } catch (err) {
+      var _res$headers$content;
       // 下载正常处理
       var fileName = res.headers['content-disposition'];
       // 获取文件名
@@ -90,12 +91,12 @@ export function exportCompile(res) {
         return;
       }
       var blob = new Blob([res.data], {
-        type: ""
+        type: ''
       });
       var objectUrl = URL.createObjectURL(blob);
-      var a = document.createElement("a");
+      var a = document.createElement('a');
       a.href = objectUrl;
-      a.download = revertUTF8(res.headers['content-disposition'].split('=')[1]);
+      a.download = revertUTF8((_res$headers$content = res.headers['content-disposition']) === null || _res$headers$content === void 0 ? void 0 : _res$headers$content.split('=')[1]);
       a.click();
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yilianjituan/yilian_dgerm",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "A react library developed with dumi",
   "keywords": [
     "React",