xydata-tools 1.0.52 → 1.1.0

package/dist/components/aaa/setting/role/index.js

@@ -17,14 +17,14 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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 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 { PlusOutlined, ExclamationCircleOutlined } from "@ant-design/icons";
-import { Button, Divider, message, Modal, Checkbox, Col, Row } from "antd";
-import React, { useState, useRef, useEffect } from "react";
-import ProTable from "@ant-design/pro-table";
-;
+import { PlusOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
+import { Button, Divider, message, Modal, Checkbox, Col, Row } from 'antd';
+import React, { useState, useRef, useEffect } from 'react';
+import ProTable from '@ant-design/pro-table';
 import Auth from "../../auth";
 import UpdateForm from "./components/UpdateForm";
 import { queryRole, updateRole, addRole, removeRole, assignPerm, getRolePerms, getPermList } from "./service";
+
 /**
  * 添加角色
  * @param fields
@@ -36,15 +36,15 @@ var handleAdd = /*#__PURE__*/function () {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          hide = message.loading("正在添加");
+          hide = message.loading('正在添加');
           isSuccess = false;
           _context.prev = 2;
           _context.next = 5;
           return addRole(_objectSpread({}, fields));
         case 5:
           res = _context.sent;
-          if (res.rspCode === "000000") {
-            message.success("添加成功");
+          if (res.rspCode === '000000') {
+            message.success('添加成功');
             isSuccess = true;
           } else {
             message.error(res.rspMsg);
@@ -54,7 +54,7 @@ var handleAdd = /*#__PURE__*/function () {
         case 9:
           _context.prev = 9;
           _context.t0 = _context["catch"](2);
-          message.error("添加失败请重试！");
+          message.error('添加失败请重试！');
         case 12:
           hide();
           return _context.abrupt("return", isSuccess);
@@ -79,7 +79,7 @@ var handleUpdate = /*#__PURE__*/function () {
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          hide = message.loading("正在更新");
+          hide = message.loading('正在更新');
           isSuccess = false;
           _context2.prev = 2;
           _context2.next = 5;
@@ -90,8 +90,8 @@ var handleUpdate = /*#__PURE__*/function () {
           });
         case 5:
           res = _context2.sent;
-          if (res.rspCode === "000000") {
-            message.success("更新成功");
+          if (res.rspCode === '000000') {
+            message.success('更新成功');
             isSuccess = true;
           } else {
             message.error(res.rspMsg);
@@ -101,7 +101,7 @@ var handleUpdate = /*#__PURE__*/function () {
         case 9:
           _context2.prev = 9;
           _context2.t0 = _context2["catch"](2);
-          message.error("更新失败请重试！");
+          message.error('更新失败请重试！');
         case 12:
           hide();
           return _context2.abrupt("return", isSuccess);
@@ -126,15 +126,15 @@ var handleRemove = /*#__PURE__*/function () {
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          hide = message.loading("正在删除");
+          hide = message.loading('正在删除');
           isSuccess = false;
           _context3.prev = 2;
           _context3.next = 5;
           return removeRole(record);
         case 5:
           res = _context3.sent;
-          if (res.rspCode === "000000") {
-            message.success("删除成功");
+          if (res.rspCode === '000000') {
+            message.success('删除成功');
             isSuccess = true;
           } else {
             message.error(res.rspMsg);
@@ -145,7 +145,7 @@ var handleRemove = /*#__PURE__*/function () {
           _context3.prev = 9;
           _context3.t0 = _context3["catch"](2);
           hide();
-          message.error("删除失败，请重试");
+          message.error('删除失败，请重试');
         case 13:
           hide();
           return _context3.abrupt("return", isSuccess);
@@ -199,12 +199,12 @@ var RoleList = function RoleList() {
             return getPermList({});
           case 3:
             res = _context4.sent;
-            if (res.rspCode === "000000") {
+            if (res.rspCode === '000000') {
               dataVal = res.data;
               arr = [];
               dataVal.forEach(function (ele, index) {
                 if (!ele.moduleName) {
-                  arr.push("其他");
+                  arr.push('其他');
                 } else {
                   arr.unshift(ele.moduleName);
                 }
@@ -215,7 +215,7 @@ var RoleList = function RoleList() {
                 var str = {
                   moduleName: e,
                   permList: dataVal.filter(function (ele) {
-                    return ele.moduleName === e || ele.moduleName === null && e === "其他";
+                    return ele.moduleName === e || ele.moduleName === null && e === '其他';
                   })
                 };
                 tree.push(str);
@@ -230,7 +230,7 @@ var RoleList = function RoleList() {
             _context4.prev = 7;
             _context4.t0 = _context4["catch"](0);
             console.log(_context4.t0);
-            message.error("获取权限列表失败");
+            message.error('获取权限列表失败');
           case 11:
           case "end":
             return _context4.stop();
@@ -242,20 +242,20 @@ var RoleList = function RoleList() {
     };
   }();
   var columns = [{
-    title: "角色代码",
-    dataIndex: "roleCode",
+    title: '角色代码',
+    dataIndex: 'roleCode',
     rules: [{
       required: true,
-      message: "角色代码为必填项"
+      message: '角色代码为必填项'
     }]
   }, {
-    title: "角色名称",
-    dataIndex: "roleName",
-    valueType: "textarea"
+    title: '角色名称',
+    dataIndex: 'roleName',
+    valueType: 'textarea'
   }, {
-    title: "操作",
-    dataIndex: "option",
-    valueType: "option",
+    title: '操作',
+    dataIndex: 'option',
+    valueType: 'option',
     render: function render(_, record, index, action) {
       return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Auth, {
         code: "ROLE_EDIT"
@@ -271,9 +271,9 @@ var RoleList = function RoleList() {
       }, /*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
           Modal.confirm({
-            title: "确定删除吗?",
+            title: '确定删除吗?',
             icon: /*#__PURE__*/React.createElement(ExclamationCircleOutlined, null),
-            content: "",
+            content: '',
             onOk: function () {
               var _onOk = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
                 var success;
@@ -317,7 +317,7 @@ var RoleList = function RoleList() {
           return _regeneratorRuntime().wrap(function _callee6$(_context6) {
             while (1) switch (_context6.prev = _context6.next) {
               case 0:
-                hide = message.loading("正在获取权限信息");
+                hide = message.loading('正在获取权限信息');
                 _context6.prev = 1;
                 _context6.next = 4;
                 return getRolePerms({
@@ -325,7 +325,7 @@ var RoleList = function RoleList() {
                 });
               case 4:
                 res = _context6.sent;
-                if (res.rspCode === "000000") {
+                if (res.rspCode === '000000') {
                   _permList = res.data.map(function (e) {
                     return e.permId;
                   });
@@ -341,7 +341,7 @@ var RoleList = function RoleList() {
               case 8:
                 _context6.prev = 8;
                 _context6.t0 = _context6["catch"](1);
-                message.error("获取角色权限失败");
+                message.error('获取角色权限失败');
               case 11:
                 hide();
               case 12:
@@ -498,8 +498,8 @@ var RoleList = function RoleList() {
             });
           case 3:
             res = _context10.sent;
-            if (res.rspCode === "000000") {
-              message.success("设置成功");
+            if (res.rspCode === '000000') {
+              message.success('设置成功');
               setPermModalVisible(false);
             } else {
               message.error(res.rspMsg);
@@ -509,7 +509,7 @@ var RoleList = function RoleList() {
           case 7:
             _context10.prev = 7;
             _context10.t0 = _context10["catch"](0);
-            message.error("设置权限失败");
+            message.error('设置权限失败');
           case 10:
           case "end":
             return _context10.stop();

package/dist/components/index.js

@@ -3,6 +3,7 @@ export { default as OrganizationFront } from "./organization";
 export { default as Sso } from "./sso";
 export { default as Aaa } from "./aaa";
 export { default as BothSecurityLayout } from "./both";
+export { default as SecurityLayout, logout } from "./securityLayout";
 export { default as UploadFile } from "./uploadFile";
 export { default as DownloadFile } from "./downloadFile";
 export { default as Version } from "./tools/version";

package/dist/components/securityLayout/index.js

@@ -0,0 +1,341 @@
+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 React, { useEffect } from 'react';
+import { getSessionStorage, setSessionStorage, removeSessionStorage } from "../../utils/token.js";
+import { message, Spin } from 'antd';
+import { queryAaaCurrent, queryCurrent, accountLogout, accountAAALogout } from "../../services/service.js";
+var SecurityLayout = function SecurityLayout(props) {
+  var children = props.children,
+    propsEnvData = props.envData,
+    propsService = props.service,
+    getUserOk = props.getUserOk,
+    getUserError = props.getUserError;
+  // 安全解析 JSON，避免解析异常
+  var getEnvData = function getEnvData() {
+    if (propsEnvData) return propsEnvData;
+    var envDataStr = getSessionStorage('env_data');
+    if (!envDataStr) return {};
+    try {
+      return JSON.parse(envDataStr);
+    } catch (e) {
+      console.error('解析 env_data 失败:', e);
+      return {};
+    }
+  };
+  var envData = getEnvData();
+  var service = propsService || getSessionStorage('service');
+  var token = getSessionStorage('Token');
+  var propsLoginType = props.loginType || 'BOTH';
+  var pathName = window.location.pathname;
+
+  // 通用请求头参数
+  var commonHeaders = {
+    SID: SID,
+    service: service
+  };
+
+  // 统一的错误处理
+  var handleError = function handleError(error) {
+    var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+    console.error(context ? "".concat(context, ":") : '错误:', error);
+    message.error('网络请求失败,请稍后重试');
+  };
+
+  // 保存 Token 并跳转
+  var saveTokenAndRedirect = function saveTokenAndRedirect(token) {
+    setSessionStorage('Token', token);
+    var redirectUrl = getSessionStorage('sso_redirect_url');
+    if (redirectUrl) {
+      window.location.href = redirectUrl;
+    } else {
+      message.error('统一登陆跳转异常');
+    }
+  };
+  useEffect(function () {
+    if (!token) {
+      // 当登录方式设为两端登录时，可在路径加上sso进行统一登陆，当登录方式固定为SSO时，直接跳转到SSO登录
+      if (propsLoginType === 'BOTH' && pathName.indexOf('/sso') >= 0 || propsLoginType === 'SSO') {
+        setSessionStorage('sso_redirect_url', window.location.href);
+        envData.sso_type === 'new' ? ssoTypeByNew() : ssoTypeByOld();
+      } else {
+        // 其他情况跳转到AAA登录
+        window.location.href = "".concat(window.publicPath, "user/login");
+      }
+    } else {
+      getUserinfo();
+    }
+  }, []);
+  var getUserinfo = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var response;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.prev = 0;
+            if (!(propsLoginType === 'SSO')) {
+              _context.next = 7;
+              break;
+            }
+            _context.next = 4;
+            return queryCurrent({});
+          case 4:
+            _context.t0 = _context.sent;
+            _context.next = 10;
+            break;
+          case 7:
+            _context.next = 9;
+            return queryAaaCurrent({});
+          case 9:
+            _context.t0 = _context.sent;
+          case 10:
+            response = _context.t0;
+            if (response.rspCode === '000000') {
+              getUserOk && getUserOk(response.data);
+            } else {
+              getUserError && getUserError(response);
+            }
+            _context.next = 17;
+            break;
+          case 14:
+            _context.prev = 14;
+            _context.t1 = _context["catch"](0);
+            getUserError && getUserError(_context.t1);
+          case 17:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[0, 14]]);
+    }));
+    return function getUserinfo() {
+      return _ref.apply(this, arguments);
+    };
+  }();
+  var ssoTypeByNew = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var response, result, href;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.prev = 0;
+            _context2.next = 3;
+            return fetch('/auth/login', {
+              headers: commonHeaders,
+              method: 'POST'
+            });
+          case 3:
+            response = _context2.sent;
+            _context2.next = 6;
+            return response.json();
+          case 6:
+            result = _context2.sent;
+            if (result.rspCode === '000000') {
+              saveTokenAndRedirect(result.data);
+            } else {
+              message.error(result.rspMsg);
+              if (result.data) {
+                href = result.data + '?callback=' + encodeURIComponent(window.location.href);
+                setTimeout(function () {
+                  window.location.href = href;
+                }, 1000);
+              } else if (result.rspCode === '999000') {
+                // 服务器响应超时
+                location.reload();
+              }
+            }
+            _context2.next = 13;
+            break;
+          case 10:
+            _context2.prev = 10;
+            _context2.t0 = _context2["catch"](0);
+            handleError(_context2.t0, '/auth/login');
+          case 13:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2, null, [[0, 10]]);
+    }));
+    return function ssoTypeByNew() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  var fetchSSO = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+      var response, data;
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            _context3.prev = 0;
+            _context3.next = 3;
+            return fetch('/auth/sso', {
+              headers: commonHeaders
+            });
+          case 3:
+            response = _context3.sent;
+            if (!(response.status === 200)) {
+              _context3.next = 11;
+              break;
+            }
+            _context3.next = 7;
+            return response.text();
+          case 7:
+            data = _context3.sent;
+            window.location.href = data;
+            _context3.next = 12;
+            break;
+          case 11:
+            message.error('接口异常,请联系管理员');
+          case 12:
+            _context3.next = 17;
+            break;
+          case 14:
+            _context3.prev = 14;
+            _context3.t0 = _context3["catch"](0);
+            handleError(_context3.t0, '/auth/sso');
+          case 17:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3, null, [[0, 14]]);
+    }));
+    return function fetchSSO() {
+      return _ref3.apply(this, arguments);
+    };
+  }();
+  var ssoTypeByOld = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+      var urlParams, code, response, data, _token;
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            urlParams = new URLSearchParams(window.location.search);
+            code = urlParams.get('code');
+            if (!code) {
+              _context4.next = 19;
+              break;
+            }
+            _context4.prev = 3;
+            _context4.next = 6;
+            return fetch('/auth/token?code=' + encodeURIComponent(code), {
+              headers: commonHeaders
+            });
+          case 6:
+            response = _context4.sent;
+            _context4.next = 9;
+            return response.json();
+          case 9:
+            data = _context4.sent;
+            _token = data.access_token || (data.rspCode === '000000' ? data.data : null);
+            if (_token) {
+              saveTokenAndRedirect(_token);
+            } else {
+              message.error(data.rspMsg);
+            }
+            _context4.next = 17;
+            break;
+          case 14:
+            _context4.prev = 14;
+            _context4.t0 = _context4["catch"](3);
+            handleError(_context4.t0, '/auth/token');
+          case 17:
+            _context4.next = 20;
+            break;
+          case 19:
+            fetchSSO();
+          case 20:
+          case "end":
+            return _context4.stop();
+        }
+      }, _callee4, null, [[3, 14]]);
+    }));
+    return function ssoTypeByOld() {
+      return _ref4.apply(this, arguments);
+    };
+  }();
+
+  // 加载状态
+  if (!token) {
+    return /*#__PURE__*/React.createElement("div", {
+      style: {
+        display: 'flex',
+        justifyContent: 'center',
+        alignItems: 'center',
+        minHeight: '100vh'
+      }
+    }, /*#__PURE__*/React.createElement(Spin, {
+      size: "large"
+    }));
+  }
+
+  // 渲染子组件
+  return /*#__PURE__*/React.createElement(React.Fragment, null, children);
+};
+export default SecurityLayout;
+
+// 退出登录的工具函数
+export var logout = /*#__PURE__*/function () {
+  var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+    var loginType,
+      actualLoginType,
+      redirectUrl,
+      response,
+      _args5 = arguments;
+    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+      while (1) switch (_context5.prev = _context5.next) {
+        case 0:
+          loginType = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : 'BOTH';
+          // 当 loginType 为 BOTH 时，根据 sessionStorage 中的 'sso_redirect_url' 判断实际登录方式
+          // 有 'sso_redirect_url' 说明使用的是 SSO 登录,否则是 AAA 登录
+          actualLoginType = loginType;
+          if (loginType === 'BOTH') {
+            redirectUrl = getSessionStorage('sso_redirect_url');
+            actualLoginType = redirectUrl ? 'SSO' : 'AAA';
+          }
+
+          // 清理本地存储
+          removeSessionStorage('Token');
+          removeSessionStorage('sso_redirect_url');
+          if (!(actualLoginType === 'AAA')) {
+            _context5.next = 17;
+            break;
+          }
+          _context5.prev = 6;
+          _context5.next = 9;
+          return accountAAALogout({});
+        case 9:
+          _context5.next = 14;
+          break;
+        case 11:
+          _context5.prev = 11;
+          _context5.t0 = _context5["catch"](6);
+          console.error('AAA 退出登录失败:', _context5.t0);
+        case 14:
+          window.location.href = "".concat(window.publicPath || '/', "user/login");
+          _context5.next = 27;
+          break;
+        case 17:
+          _context5.prev = 17;
+          _context5.next = 20;
+          return accountLogout({});
+        case 20:
+          response = _context5.sent;
+          if (response) {
+            window.location.href = response;
+          }
+          _context5.next = 27;
+          break;
+        case 24:
+          _context5.prev = 24;
+          _context5.t1 = _context5["catch"](17);
+          console.error('SSO 退出登录失败:', _context5.t1);
+        case 27:
+        case "end":
+          return _context5.stop();
+      }
+    }, _callee5, null, [[6, 11], [17, 24]]);
+  }));
+  return function logout() {
+    return _ref5.apply(this, arguments);
+  };
+}();

package/dist/services/service.js

@@ -15,7 +15,7 @@ function _queryCurrent() {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          return _context.abrupt("return", doRequest('/api/currentUser', "POST", params));
+          return _context.abrupt("return", doRequest('/api/currentUser', 'POST', params));
         case 1:
         case "end":
           return _context.stop();
@@ -27,12 +27,14 @@ function _queryCurrent() {
 export function queryAaaCurrent(_x2) {
   return _queryAaaCurrent.apply(this, arguments);
 }
+
+// 退出登录 | sso
 function _queryAaaCurrent() {
   _queryAaaCurrent = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          return _context2.abrupt("return", doRequest('/api/aaa/current', "POST", params));
+          return _context2.abrupt("return", doRequest('/api/aaa/current', 'POST', params));
         case 1:
         case "end":
           return _context2.stop();
@@ -40,4 +42,40 @@ function _queryAaaCurrent() {
     }, _callee2);
   }));
   return _queryAaaCurrent.apply(this, arguments);
+}
+export function accountLogout(_x3) {
+  return _accountLogout.apply(this, arguments);
+}
+
+// 退出登录 | aaa
+function _accountLogout() {
+  _accountLogout = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          return _context3.abrupt("return", doRequest('/auth/logout', 'GET', params));
+        case 1:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  }));
+  return _accountLogout.apply(this, arguments);
+}
+export function accountAAALogout(_x4) {
+  return _accountAAALogout.apply(this, arguments);
+}
+function _accountAAALogout() {
+  _accountAAALogout = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
+    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
+        case 0:
+          return _context4.abrupt("return", doRequest('/api/aaa/logout', 'GET', params));
+        case 1:
+        case "end":
+          return _context4.stop();
+      }
+    }, _callee4);
+  }));
+  return _accountAAALogout.apply(this, arguments);
 }

package/dist/types/components/index.d.ts

@@ -7,3 +7,4 @@ export { default as UploadFile } from "./uploadFile";
 export { default as DownloadFile } from "./downloadFile";
 export { default as Version } from "./tools/version";
 export { default as MaterialCard } from "./materialCard";
+export { default as SecurityLayout, logout } from "./securityLayout";

package/dist/types/components/securityLayout/index.d.ts

@@ -0,0 +1,3 @@
+export default SecurityLayout;
+export function logout(loginType?: string): Promise<void>;
+declare function SecurityLayout(props: any): JSX.Element;

package/dist/types/components/uploadFile/index.d.ts

@@ -51,3 +51,7 @@ declare function UploadFile(props: {
     uploadOptions: UploadProps;
     buttonOptions: ButtonProps;
 }): JSX.Element;
+import { FormProps } from "antd";
+import { FormItemProps } from "antd";
+import { UploadProps } from "antd";
+import { ButtonProps } from "antd";

package/dist/utils/request.js

@@ -7,7 +7,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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 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-request';
+import { request } from 'umi';
 import { message } from 'antd';
 import { getSessionStorage } from "./token.js";
 import { history } from 'umi';
@@ -62,7 +62,7 @@ function _doRequest() {
                     _context.next = 8;
                     break;
                   case 7:
-                    message.error("服务器异常");
+                    message.error('服务器异常');
                   case 8:
                     return _context.abrupt("return", error.response);
                   case 9:

package/package.json

@@ -1,54 +1,58 @@
 {
-  "name": "xydata-tools",
-  "version": "1.0.52",
-  "description": "xydata tools",
-  "main": "dist/index.js",
-  "module": "dist/index.js",
-  "types": "dist/types/index.d.ts",
-  "repository": {
-    "type": "git",
-    "url": "https://172.16.1.252/wuxiaohu/xydata-tools.git"
-  },
-  "homepage": "https://172.16.1.252/wuxiaohu/xydata-tools",
-  "scripts": {
-    "dev": "father dev",
-    "build": "father build",
-    "generate-types": "tsc --emitDeclarationOnly --project tsconfig.json",
-    "prepublishOnly": "npm run build && npm run generate-types"
-  }, 
-  "keywords": [],
-  "authors": [],
-  "license": "MIT",
-  "files": [
-    "/dist"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "peerDependencies": {
-    "react": "^17.0.0",
-    "react-dom": "^17.0.0",
-    "moment": "^2.30.1",
-    "antd": "^4.24.16",
-    "@ant-design/icons": "^4.5.0",
-    "@ant-design/pro-form": "^1.69.4",
-    "@ant-design/pro-table": "^2.80.8"
-  },
-  "devDependencies": {
-    "@babel/core": "7.24.9",
-    "@babel/preset-env": "7.24.8",
-    "@babel/preset-react": "7.24.7",
-    "@vitejs/plugin-vue2": "2.3.1",
-    "father": "4.1.5",
-    "terser": "5.31.3",
-    "vue": "2.7.16",
-    "vue-loader": "15.11.1",
-    "vue-template-compiler": "2.7.16"
-  },
-  "dependencies": {
-    "@zhengxs/js.tree": "0.5.0",
-    "querystring": "0.2.1", 
-    "styled-components": "4.4.1", 
-    "compressorjs": "1.2.1"
-  }
+	"name": "xydata-tools",
+	"version": "1.1.0",
+	"description": "xydata tools",
+	"main": "dist/index.js",
+	"module": "dist/index.js",
+	"types": "dist/types/index.d.ts",
+	"repository": {
+		"type": "git",
+		"url": "https://172.16.1.252/wuxiaohu/xydata-tools.git"
+	},
+	"homepage": "https://172.16.1.252/wuxiaohu/xydata-tools",
+	"scripts": {
+		"dev": "father dev",
+		"build": "father build",
+		"generate-types": "tsc --emitDeclarationOnly --project tsconfig.json",
+		"prepublishOnly": "npm run build && npm run generate-types"
+	},
+	"keywords": [],
+	"authors": [],
+	"license": "MIT",
+	"files": [
+		"/dist"
+	],
+	"publishConfig": {
+		"access": "public"
+	},
+	"peerDependencies": {
+		"@ant-design/icons": "^4.5.0",
+		"@ant-design/pro-form": "^1.69.4",
+		"@ant-design/pro-table": "^2.80.8",
+		"antd": "^4.24.16",
+		"moment": "^2.30.1",
+		"react": "^17.0.0",
+		"react-dom": "^17.0.0"
+	},
+	"devDependencies": {
+		"@babel/core": "7.24.9",
+		"@babel/preset-env": "7.24.8",
+		"@babel/preset-react": "7.24.7",
+		"@vitejs/plugin-vue2": "2.3.1",
+		"father": "4.1.5",
+		"terser": "5.31.3",
+		"vue": "2.7.16",
+		"vue-loader": "15.11.1",
+		"vue-template-compiler": "2.7.16"
+	},
+	"dependencies": {
+		"@ant-design/icons": "4.5.0",
+		"@ant-design/pro-form": "1.69.4",
+		"@ant-design/pro-table": "2.80.8",
+		"@zhengxs/js.tree": "0.5.0",
+		"compressorjs": "1.2.1",
+		"moment": "^2.30.1",
+		"querystring": "0.2.1",
+		"styled-components": "4.4.1"
+	}
 }