xydata-tools 1.1.16 → 1.1.18

package/dist/components/sms/conf/index.js

@@ -100,35 +100,6 @@ var SMSConfig = function SMSConfig() {
       return _ref2.apply(this, arguments);
     };
   }();
-  var handleSwitchChange = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(checked, record) {
-      var res;
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
-          case 0:
-            _context3.next = 2;
-            return saveSmsProperty({
-              id: record.id,
-              value: checked.toString()
-            });
-          case 2:
-            res = _context3.sent;
-            if (res && res.rspCode === '000000') {
-              message.success("".concat(record.propertyName, " \u5DF2").concat(checked ? '开启' : '关闭'));
-              fetchData();
-            } else {
-              message.error((res === null || res === void 0 ? void 0 : res.rspMsg) || '操作失败');
-            }
-          case 4:
-          case "end":
-            return _context3.stop();
-        }
-      }, _callee3);
-    }));
-    return function handleSwitchChange(_x2, _x3) {
-      return _ref3.apply(this, arguments);
-    };
-  }();
 
   // 数据按 groupName 分组
   var groupedData = dataSource.reduce(function (acc, item) {
@@ -210,7 +181,8 @@ var SMSConfig = function SMSConfig() {
     onCancel: function onCancel() {
       setModalVisible(false);
       setEditingRecord(null);
-    }
+    },
+    onOk: handleEditSave
   }));
 };
 export default SMSConfig;

package/dist/types/utils/request.d.ts

@@ -1,27 +1,13 @@
+export default doRequest;
 /**
- * 统一请求封装函数
- * 支持 GET、POST、PUT、DELETE 等方法
- * 自动处理认证、错误提示、响应解析等
- *
+ * 配置request请求时的默认参数
+ */
+export const request: import("umi-request").RequestMethod<false>;
+/**
+ * 封装后的 doRequest 函数，保持与原有项目的参数兼容性
  * @param {string} url - 请求地址
- * @param {string} method - 请求方法 (GET, POST, PUT, DELETE 等)
- * @param {Object} [data] - 请求体数据 (POST, PUT 等)
- * @param {Object} [params] - URL 查询参数 (GET 等)
- * @param {Object} [options] - 额外的请求配置
- * @returns {Promise<any>} 响应数据
- *
- * @example
- * // GET 请求
- * const users = await doRequest('/api/users', 'GET', null, { page: 1 });
- *
- * @example
- * // POST 请求
- * const result = await doRequest('/api/login', 'POST', { username, password });
- *
- * @example
- * // 自定义配置
- * const data = await doRequest('/api/upload', 'POST', formData, null, {
- *   headers: { 'Content-Type': 'multipart/form-data' }
- * });
+ * @param {string} method - 请求方法
+ * @param {Object} data - 请求体数据
+ * @param {Object} options - 额外配置
  */
-export default function doRequest(url: string, method: string, data?: any, params?: any, options?: any): Promise<any>;
+export function doRequest(url: string, method: string, data?: any, options?: any): Promise<any>;

package/dist/utils/request.js

@@ -1,215 +1,208 @@
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-import { request } from 'umi';
-import { message } from 'antd';
+/**
+ * request 网络请求工具
+ * api 文档: https://github.com/umijs/umi-request/blob/master/README_zh-CN.md
+ */
+import { extend } from 'umi-request';
+import { notification, message } from 'antd';
 import { getSessionStorage } from "./token.js";
 import { handleUnauthorized } from "../components";
 
-/**
- * 构建请求头
- * @returns {Object} 请求头对象
- */
-var buildHeaders = function buildHeaders() {
-  var token = getSessionStorage('Token');
-  var userId = getSessionStorage('userId');
-  var orgId = getSessionStorage('orgId');
-  var service = getSessionStorage('service') || 'unknown';
-  return {
-    SID: SID,
-    Authorization: token ? "Bearer ".concat(token) : '',
-    UserId: userId || '',
-    OrgId: orgId || '',
-    service: service
-  };
+/* ********************************************************************************************************************************* */
+/* ********************************************************************************************************************************* */
+/* ********************************************************************************************************************************* */
+// 无需TOKEN验证的接口，例如AAA登录接口
+var NO_TOKEN_URLS = [];
+
+// 需要在业务层处理的状态编码，例如需要判断当接口返回999999时需要弹窗提示，那么可在下方加上999999，未配置的会进入错误回调
+var PROCESS_RESPONSE_CODES = ['000000'];
+
+/* ********************************************************************************************************************************* */
+/* ********************************************************************************************************************************* */
+/* ********************************************************************************************************************************* */
+
+// 服务器状态中文映射
+var CODE_MESSAGE = {
+  200: '服务器成功返回请求的数据。',
+  201: '新建或修改数据成功。',
+  202: '一个请求已经进入后台排队（异步任务）。',
+  204: '删除数据成功。',
+  400: '发出的请求有错误，服务器没有进行新建或修改数据的操作。',
+  401: '用户没有权限（令牌、用户名、密码错误）。',
+  403: '用户得到授权，但是访问是被禁止的。',
+  404: '发出的请求针对的是不存在的记录，服务器没有进行操作。',
+  406: '请求的格式不可得。',
+  410: '请求的资源被永久删除，且不会再得到的。',
+  422: '当创建一个对象时，发生一个验证错误。',
+  429: '太火爆了，请稍后再试。',
+  500: '服务器发生错误，请检查服务器。',
+  502: '网关错误。',
+  503: '服务不可用，服务器暂时过载或维护。',
+  504: '网关超时。'
 };
 
-/**
- * 安全解析 JSON 响应
- * @param {Response} response - 响应对象
- * @returns {Promise<any>} 解析后的数据,失败时返回 null
- */
-var safeParseJSON = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(response) {
+// 请求异常处理程序。进入错误回调的，只会返回false。
+var errorHandler = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(error) {
+    var response, errorText, status, url, errorData, rspMsg;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          _context.prev = 0;
-          _context.next = 3;
+          response = error.response;
+          if (!(response && response.status)) {
+            _context.next = 23;
+            break;
+          }
+          errorText = CODE_MESSAGE[response.status] || response.statusText;
+          status = response.status, url = response.url;
+          _context.prev = 4;
+          _context.next = 7;
           return response.json();
-        case 3:
-          return _context.abrupt("return", _context.sent);
-        case 6:
-          _context.prev = 6;
-          _context.t0 = _context["catch"](0);
-          console.error('JSON 解析失败:', _context.t0);
-          return _context.abrupt("return", null);
-        case 10:
+        case 7:
+          errorData = _context.sent;
+          rspMsg = errorData.rspMsg;
+          if (rspMsg) {
+            message.error(rspMsg);
+          }
+          if (!(status == 401)) {
+            _context.next = 14;
+            break;
+          }
+          handleUnauthorized(ENV_DATA);
+          _context.next = 16;
+          break;
+        case 14:
+          if (!(status !== 200)) {
+            _context.next = 16;
+            break;
+          }
+          throw new Error();
+        case 16:
+          _context.next = 21;
+          break;
+        case 18:
+          _context.prev = 18;
+          _context.t0 = _context["catch"](4);
+          notification.error({
+            message: "\u8BF7\u6C42\u9519\u8BEF ".concat(status, ": ").concat(url),
+            description: errorText
+          });
+        case 21:
+          _context.next = 24;
+          break;
+        case 23:
+          if (!response) {
+            console.error(error);
+            notification.error({
+              message: '网络异常',
+              description: '您的网络发生异常，无法连接服务器'
+            });
+          }
+        case 24:
+          return _context.abrupt("return", false);
+        case 25:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[0, 6]]);
+    }, _callee, null, [[4, 18]]);
   }));
-  return function safeParseJSON(_x) {
+  return function errorHandler(_x) {
     return _ref.apply(this, arguments);
   };
 }();
 
 /**
- * 处理成功响应
- * @param {Object} responseData - 响应数据对象,包含 data 和 response
- * @returns {any} 处理后的数据
+ * 配置request请求时的默认参数
  */
-var handleSuccessResponse = function handleSuccessResponse(_ref2) {
-  var data = _ref2.data,
-    response = _ref2.response;
-  // 如果是字符串类型(如 text/plain),直接返回
-  if (typeof data === 'string') {
-    return data;
-  }
+var request = extend({
+  errorHandler: errorHandler
+});
 
-  // 如果是对象类型(JSON 响应)
-  if (data && _typeof(data) === 'object') {
-    // 检查业务错误码
-    if (data.rspCode && data.rspCode !== '000000') {
-      // 业务逻辑错误
-      if (data.rspMsg) {
-        message.error(data.rspMsg);
-      }
-    }
-    return data;
+// request拦截器
+request.interceptors.request.use(function (url, options) {
+  options.headers = {
+    'Content-Type': 'application/json; charset=utf-8',
+    Accept: 'application/json',
+    UserId: getSessionStorage('userId'),
+    OrgId: getSessionStorage('orgId'),
+    service: getSessionStorage('service') || 'unknown',
+    SID: SID
+  };
+  // 过滤不需要TOKEN的请求，统一加上Authorization
+  if (!NO_TOKEN_URLS.includes(url)) {
+    // TOKEN在每次调用的时候获取最新值
+    var token = getSessionStorage('Token');
+    options.headers.Authorization = token ? "Bearer ".concat(token) : '';
   }
+  return {
+    url: url,
+    options: options
+  };
+});
 
-  // 其他类型(如 null, undefined, number 等)直接返回
-  return data;
-};
-
-/**
- * 处理错误响应
- * @param {Error} error - 错误对象
- * @returns {Promise<any>} 处理后的响应或 null
- */
-var handleErrorResponse = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(error) {
-    var status, data, _error$request;
+// response拦截器
+request.interceptors.response.use( /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(response, options) {
+    var data, rspCode;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          if (error.response) {
-            _context2.next = 4;
+          if (!response.ok) {
+            _context2.next = 7;
             break;
           }
-          console.error('网络请求失败:', {
-            message: error.message,
-            stack: error.stack,
-            error: error
-          });
-          message.error('网络请求失败,请检查网络连接');
-          return _context2.abrupt("return", null);
-        case 4:
-          status = error.response.status;
-          if (!(status === 401)) {
-            _context2.next = 8;
+          _context2.next = 3;
+          return response.clone().json();
+        case 3:
+          data = _context2.sent;
+          rspCode = data.rspCode; // 状态编码只有在已定义的，需要处理的编码里才会返回响应，否则会进入错误回调
+          if (!(rspCode && PROCESS_RESPONSE_CODES.includes(rspCode))) {
+            _context2.next = 7;
             break;
           }
-          handleUnauthorized(ENV_DATA);
-          return _context2.abrupt("return");
+          return _context2.abrupt("return", data);
+        case 7:
+          throw {
+            response: response
+          };
         case 8:
-          if (!(status >= 400 && status < 500)) {
-            _context2.next = 15;
-            break;
-          }
-          _context2.next = 11;
-          return safeParseJSON(error.response);
-        case 11:
-          data = _context2.sent;
-          if (data !== null && data !== void 0 && data.rspMsg) {
-            message.error(data.rspMsg);
-          } else {
-            message.error("\u8BF7\u6C42\u9519\u8BEF (".concat(status, ")"));
-          }
-          _context2.next = 16;
-          break;
-        case 15:
-          if (status >= 500) {
-            // 服务器错误
-            console.error('服务器错误:', {
-              status: status,
-              url: (_error$request = error.request) === null || _error$request === void 0 ? void 0 : _error$request.url,
-              error: error
-            });
-            message.error('服务器异常,请稍后重试');
-          } else {
-            // 其他未知错误
-            console.error('未知错误:', error);
-            message.error('请求失败,请稍后重试');
-          }
-        case 16:
-          return _context2.abrupt("return", error.response);
-        case 17:
         case "end":
           return _context2.stop();
       }
     }, _callee2);
   }));
-  return function handleErrorResponse(_x2) {
-    return _ref3.apply(this, arguments);
+  return function (_x2, _x3) {
+    return _ref2.apply(this, arguments);
   };
-}();
+}());
 
 /**
- * 统一请求封装函数
- * 支持 GET、POST、PUT、DELETE 等方法
- * 自动处理认证、错误提示、响应解析等
- *
+ * 封装后的 doRequest 函数，保持与原有项目的参数兼容性
  * @param {string} url - 请求地址
- * @param {string} method - 请求方法 (GET, POST, PUT, DELETE 等)
- * @param {Object} [data] - 请求体数据 (POST, PUT 等)
- * @param {Object} [params] - URL 查询参数 (GET 等)
- * @param {Object} [options] - 额外的请求配置
- * @returns {Promise<any>} 响应数据
- *
- * @example
- * // GET 请求
- * const users = await doRequest('/api/users', 'GET', null, { page: 1 });
- *
- * @example
- * // POST 请求
- * const result = await doRequest('/api/login', 'POST', { username, password });
- *
- * @example
- * // 自定义配置
- * const data = await doRequest('/api/upload', 'POST', formData, null, {
- *   headers: { 'Content-Type': 'multipart/form-data' }
- * });
+ * @param {string} method - 请求方法
+ * @param {Object} data - 请求体数据
+ * @param {Object} options - 额外配置
  */
-export default function doRequest(_x3, _x4, _x5, _x6) {
+function doRequest(_x4, _x5) {
   return _doRequest.apply(this, arguments);
 }
 function _doRequest() {
-  _doRequest = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(url, method, data, params) {
-    var options,
-      headers,
+  _doRequest = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(url, method) {
+    var data,
+      options,
       _args3 = arguments;
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          options = _args3.length > 4 && _args3[4] !== undefined ? _args3[4] : {};
-          headers = buildHeaders();
-          return _context3.abrupt("return", request(url, _objectSpread({
+          data = _args3.length > 2 && _args3[2] !== undefined ? _args3[2] : {};
+          options = _args3.length > 3 && _args3[3] !== undefined ? _args3[3] : {};
+          return _context3.abrupt("return", request(url, {
             method: method,
-            params: params,
-            data: data,
-            headers: _objectSpread(_objectSpread({}, headers), options.headers),
-            getResponse: true,
-            skipErrorHandler: true
-          }, options)).then(handleSuccessResponse).catch(handleErrorResponse));
+            data: data
+          }));
         case 3:
         case "end":
           return _context3.stop();
@@ -217,4 +210,6 @@ function _doRequest() {
     }, _callee3);
   }));
   return _doRequest.apply(this, arguments);
-}
+}
+export { request, doRequest };
+export default doRequest;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "xydata-tools",
-	"version": "1.1.16",
+	"version": "1.1.18",
 	"description": "xydata tools",
 	"main": "dist/index.js",
 	"module": "dist/index.js",
@@ -65,6 +65,7 @@
 		"compressorjs": "1.2.1",
 		"querystring": "0.2.1",
 		"react-json-view": "^1.21.3",
-		"styled-components": "4.4.1"
+		"styled-components": "4.4.1",
+		"umi-request": "^1.4.0"
 	}
 }