ls-pro-common 3.0.79 → 3.0.81

package/lib/hooks/useShowConfirm.js

@@ -0,0 +1,23 @@
+import "antd/es/modal/style";
+import _Modal from "antd/es/modal";
+import _extends from "@babel/runtime/helpers/esm/extends";
+import React from "react";
+import ReactDOM from 'react-dom';
+/**
+ * 语法糖实现
+ *
+ * @param propsFun 参数为关闭函数
+ * @name 函数确认框
+ */
+export var showConfirmFun = function showConfirmFun(propsFun) {
+  var div = document.createElement('div');
+  document.body.appendChild(div);
+  var props = propsFun(function () {
+    ReactDOM.unmountComponentAtNode(div);
+    document.body.removeChild(div);
+  });
+  ReactDOM.render( /*#__PURE__*/React.createElement(_Modal, _extends({
+    visible: true
+  }, props), props.content), div);
+};
+export default showConfirmFun;

package/lib/hooks/useSingle/index.js

@@ -10,6 +10,7 @@ import React from "react";
 import { useState, useRef, useMemo, useCallback } from 'react';
 import { PlusCircleOutlined, EditOutlined, DeleteOutlined, ImportOutlined, ExportOutlined, AuditOutlined } from '@ant-design/icons';
 import { showConfirm, showWarn, showSuccess, showError } from '../../utils';
+import exportProcess from '../../utils/exportProcess';
 import { httpPost } from '../../http';
 import usePermission from '../usePermission';
 /**
@@ -527,7 +528,7 @@ function useSingle(inParam) {
   var onExport = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(url, param) {
       var _param$exportColumns;
-      var searchArr, arr, otherArr, whereArr, where, _result$flag4, result, _result$flag5, _result$flag6;
+      var searchArr, arr, otherArr, whereArr, where, _result$flag4, result, _result$flag5;
       return _regeneratorRuntime.wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
@@ -600,10 +601,11 @@ function useSingle(inParam) {
               _context7.next = 19;
               break;
             }
-            showSuccess(((_result$flag5 = result.flag) === null || _result$flag5 === void 0 ? void 0 : _result$flag5.retMsg) || '导出成功');
+            // showSuccess(result.flag?.retMsg || '导出成功');
+            exportProcess(result);
             return _context7.abrupt("return", true);
           case 19:
-            showError(((_result$flag6 = result.flag) === null || _result$flag6 === void 0 ? void 0 : _result$flag6.retMsg) || '导出失败,请联系系统管理员');
+            showError(((_result$flag5 = result.flag) === null || _result$flag5 === void 0 ? void 0 : _result$flag5.retMsg) || '导出失败,请联系系统管理员');
             return _context7.abrupt("return", false);
           case 21:
             _context7.next = 28;

package/lib/http/index.js

@@ -128,7 +128,7 @@ request.interceptors.response.use( /*#__PURE__*/function () {
           _data = _context.sent;
           _retCode = (_data === null || _data === void 0 ? void 0 : (_data$flag4 = _data.flag) === null || _data$flag4 === void 0 ? void 0 : _data$flag4.retCode) || '0';
           _retMsg = ((_data$flag5 = _data.flag) === null || _data$flag5 === void 0 ? void 0 : _data$flag5.retMsg) || '请求的服务出错';
-          status = (getUrlQuery('apiStatus') || '0').split(',');
+          status = (getUrlQuery('apiStatus', options.url) || '0').split(',');
           requestId = (_data$flag6 = _data.flag) === null || _data$flag6 === void 0 ? void 0 : _data$flag6.requestId;
           _faultCode = (_data$flag7 = _data.flag) === null || _data$flag7 === void 0 ? void 0 : _data$flag7.faultCode;
           if (_retCode && !status.includes(_retCode)) {

package/lib/index.d.ts

@@ -20,12 +20,16 @@ import ViewOffice from './components/ViewOffice';
 import BaseService from './service/BaseService';
 import request, { httpGet, httpPut, httpPost, httpDelete, getDict, fetchOptions } from './http';
 import * as utils from './utils';
+import exportProcess from './utils/exportProcess';
 /** Hooks */
 import useSingle from './hooks/useSingle';
 import useDtl from './hooks/useDtl';
 import usePermission from './hooks/usePermission';
 import useGetState from './hooks/useGetState';
-import { useFilterLocal } from './hooks/useFilterBack';
+import useFilterLocal from './hooks/useFilterBack';
+import useBaseDict from './hooks/useBaseDict';
+import useSelectOptions from './hooks/useSelectOptions';
+import showConfirmFun from './hooks/useShowConfirm';
 import useQueue from './hooks/useQueue';
 /** Type */
 import type { ApiResponse, TableToolbar, BaseApiType, MethodType } from './typing';
@@ -33,4 +37,4 @@ import type { DtlLyaoutProps } from './components/DtlLayout';
 import type { DescritionCardProps } from './components/DescritionCard';
 import type { PermissionProps } from './components/Permission';
 export type { ApiResponse, TableToolbar, BaseApiType, MethodType, DtlLyaoutProps, DescritionCardProps, PermissionProps, };
-export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, Permission, GroupTip, ViewOffice, IconBack, IconText, IconBell, IconQuestion, IconSearch, TagCheck, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission, useGetState, useFilterLocal, useQueue, };
+export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, Permission, GroupTip, ViewOffice, IconBack, IconText, IconBell, IconQuestion, IconSearch, TagCheck, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission, useGetState, useFilterLocal, useQueue, useBaseDict, useSelectOptions, showConfirmFun, exportProcess, };

package/lib/index.js

@@ -20,11 +20,15 @@ import ViewOffice from './components/ViewOffice';
 import BaseService from './service/BaseService';
 import request, { httpGet, httpPut, httpPost, httpDelete, getDict, fetchOptions } from './http';
 import * as utils from './utils';
+import exportProcess from './utils/exportProcess';
 /** Hooks */
 import useSingle from './hooks/useSingle';
 import useDtl from './hooks/useDtl';
 import usePermission from './hooks/usePermission';
 import useGetState from './hooks/useGetState';
-import { useFilterLocal } from './hooks/useFilterBack';
+import useFilterLocal from './hooks/useFilterBack';
+import useBaseDict from './hooks/useBaseDict';
+import useSelectOptions from './hooks/useSelectOptions';
+import showConfirmFun from './hooks/useShowConfirm';
 import useQueue from './hooks/useQueue';
-export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, Permission, GroupTip, ViewOffice, IconBack, IconText, IconBell, IconQuestion, IconSearch, TagCheck, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission, useGetState, useFilterLocal, useQueue };
+export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, Permission, GroupTip, ViewOffice, IconBack, IconText, IconBell, IconQuestion, IconSearch, TagCheck, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission, useGetState, useFilterLocal, useQueue, useBaseDict, useSelectOptions, showConfirmFun, exportProcess };

package/lib/utils/exportProcess.d.ts

@@ -0,0 +1,8 @@
+/**
+ * 导出进度查看
+ *
+ * @param apiResult 导出接口返回数据,
+ * @returns
+ */
+declare const exportProcess: (apiResult: any) => void;
+export default exportProcess;

package/lib/utils/exportProcess.js

@@ -0,0 +1,99 @@
+import "antd/es/message/style";
+import _message from "antd/es/message";
+import React from "react";
+import { CloseOutlined } from '@ant-design/icons';
+import { showSuccess, showError, sleep, downloadFile } from '.';
+import { httpGet } from '../http';
+/**
+ * 导出进度查看
+ *
+ * @param apiResult 导出接口返回数据,
+ * @returns
+ */
+var exportProcess = function exportProcess(apiResult) {
+  if (!apiResult.taskId) {
+    var _apiResult$flag;
+    showSuccess((apiResult === null || apiResult === void 0 ? void 0 : (_apiResult$flag = apiResult.flag) === null || _apiResult$flag === void 0 ? void 0 : _apiResult$flag.retMsg) || '导出成功');
+    return;
+  }
+  var time = 0;
+  var exit = false;
+  var win = top || window;
+  var loading = _message.loading({
+    content: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", null, "\u6B63\u5728\u5BFC\u51FA\u4E2D,\u8BF7\u7A0D\u5019..."), /*#__PURE__*/React.createElement("a", {
+      onClick: function onClick() {
+        loading();
+      }
+    }, /*#__PURE__*/React.createElement(CloseOutlined, {
+      style: {
+        marginLeft: 20,
+        color: 'gray',
+        width: 13
+      }
+    }))),
+    duration: 0,
+    style: {
+      textAlign: 'right'
+    },
+    onClose: function onClose() {
+      exit = true;
+    }
+  });
+  var getResult = function getResult() {
+    if (exit) return;
+    httpGet('/petrel-poi-center-api/sysPoiExportManage/page', {
+      'page.pn': 1,
+      'page.size': 1,
+      'search.id': apiResult.taskId
+    }).then(function (result) {
+      var _result$rows = result.rows,
+        rows = _result$rows === void 0 ? [] : _result$rows;
+      var row = rows === null || rows === void 0 ? void 0 : rows[0];
+      if (!row) {
+        if (time < 3) {
+          time++;
+          sleep(5).then(function () {
+            return getResult();
+          });
+        } else {
+          showError('获取导出进度失败,请在消息中心查看导出结果');
+          win.postMessage({
+            type: 'exportError'
+          });
+          loading();
+        }
+      } else {
+        var status = row.status,
+          downloadUrl = row.downloadUrl;
+        //导出中
+        if (status < 30) {
+          sleep(5).then(function () {
+            return getResult();
+          });
+        } else {
+          //导出成功
+          if (status === 30 && downloadUrl) {
+            downloadFile(downloadUrl);
+          } else {
+            //导出失败
+            showError('导出异常,请在消息中心查看失败原因');
+            win.postMessage({
+              type: 'exportError'
+            });
+          }
+          loading();
+        }
+      }
+    }).catch(function () {
+      showError('获取导出进度失败,请在消息中心查看导出结果');
+      loading();
+      win.postMessage({
+        type: 'exportError'
+      });
+    });
+  };
+  sleep(1).then(function () {
+    return getResult();
+  });
+};
+export default exportProcess;

package/lib/utils/index.d.ts

@@ -314,3 +314,5 @@ export declare const openPageInMain: (option: {
 export declare const showLoading: (text?: string) => void;
 export declare const exitLoading: () => void;
 export declare const handleTheme: () => void;
+export declare const sleep: (secord: number) => Promise<unknown>;
+export declare const downloadFile: (url: string, fileName?: string | undefined) => void;

package/lib/utils/index.js

@@ -889,4 +889,22 @@ export var handleTheme = function handleTheme() {
   if (theme) {
     document.body.classList.add('theme-' + theme);
   }
+};
+export var sleep = function sleep(secord) {
+  return new Promise(function (resolve) {
+    setTimeout(function () {
+      resolve(true);
+    }, secord * 1000);
+  });
+};
+export var downloadFile = function downloadFile(url, fileName) {
+  var a = document.createElement('a');
+  a.href = url;
+  // a.target = '_blank'; // 新开屏有闪烁
+  if (fileName) {
+    a.setAttribute('download', fileName);
+  }
+  document.body.appendChild(a);
+  a.click();
+  document.body.removeChild(a);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "3.0.79",
+  "version": "3.0.81",
   "description": "ls-pro-common",
   "license": "MIT",
   "sideEffects": [