xydata-tools 1.1.1 → 1.1.3

package/dist/components/sso/setting/permRole/index.js

@@ -12,14 +12,14 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useEffect, useState } from "react";
-import { history } from "umi";
-import { Row, Col, Card, Button, Divider, Checkbox } from "antd";
+import React, { useEffect, useState } from 'react';
+import { history } from 'umi';
+import { Row, Col, Card, Button, Divider, Checkbox } from 'antd';
 import { fetchPerms, saveRolePerms } from "../service.js";
 import { asyncCallback } from "../../../../utils/utils.js";
-var PermRoleBoard = function PermRoleBoard(props) {
-  var _props$currentUser = props.currentUser,
-    currentUser = _props$currentUser === void 0 ? {} : _props$currentUser;
+import { connect } from 'umi';
+var PermRoleBoard = function PermRoleBoard(_ref) {
+  var currentUser = _ref.currentUser;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     roleperms = _useState2[0],
@@ -36,7 +36,7 @@ var PermRoleBoard = function PermRoleBoard(props) {
     getInitData();
   }, []);
   var getInitData = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var res, flag;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -63,14 +63,14 @@ var PermRoleBoard = function PermRoleBoard(props) {
       }, _callee);
     }));
     return function getInitData() {
-      return _ref.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
   var rightAction = function rightAction() {
     return /*#__PURE__*/React.createElement("span", {
       style: {
-        display: "block",
-        whiteSpace: "nowrap",
+        display: 'block',
+        whiteSpace: 'nowrap',
         marginBottom: 24
       }
     }, /*#__PURE__*/React.createElement(Button, {
@@ -87,7 +87,7 @@ var PermRoleBoard = function PermRoleBoard(props) {
     }, "\u5173\u95ED"));
   };
   var handleShutdown = function handleShutdown() {
-    history.push("/sso/role");
+    history.push('/sso/role');
   };
   var onChange = function onChange(e) {
     var newData = _toConsumableArray(roleperms);
@@ -106,7 +106,7 @@ var PermRoleBoard = function PermRoleBoard(props) {
     });
   };
   var handleSubmit = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var payload, res, flag;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -135,7 +135,7 @@ var PermRoleBoard = function PermRoleBoard(props) {
       }, _callee2);
     }));
     return function handleSubmit() {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
   return /*#__PURE__*/React.createElement(Card, {
@@ -165,9 +165,14 @@ var PermRoleBoard = function PermRoleBoard(props) {
         key: _.permId,
         value: _.permId,
         defaultChecked: _.roleId === null ? false : true,
-        disabled: !(currentUser.userType === "ADMIN" || currentUser.userType === "SUPERADMIN")
+        disabled: !(currentUser.userType === 'ADMIN' || currentUser.userType === 'SUPERADMIN')
       }, _.permName));
     }))));
   }));
 };
-export default PermRoleBoard;
+export default connect(function (_ref4) {
+  var user = _ref4.user;
+  return {
+    currentUser: user.currentUser
+  };
+})(PermRoleBoard);

package/dist/components/sso/setting/permission/index.js

@@ -15,11 +15,10 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { asyncCallback } from "../../../../utils/utils.js";
-import { PlusOutlined } from "@ant-design/icons";
-import ProTable from "@ant-design/pro-table";
-;
-import { Button, Card, Divider, Modal, Space } from "antd";
-import React, { useRef, useState } from "react";
+import { PlusOutlined } from '@ant-design/icons';
+import ProTable from '@ant-design/pro-table';
+import { Button, Card, Divider, Modal, Space } from 'antd';
+import React, { useRef, useState } from 'react';
 import { addPerm, queryPerm, removePerm, updatePerm } from "../service.js";
 import UpdateForm from "./components/UpdateForm";
 import styles from "./styles.less";
@@ -32,32 +31,32 @@ var PermList = function PermList() {
     _useState4 = _slicedToArray(_useState3, 2),
     itemValues = _useState4[0],
     setItemValues = _useState4[1];
-  var _useState5 = useState("create"),
+  var _useState5 = useState('create'),
     _useState6 = _slicedToArray(_useState5, 2),
     formType = _useState6[0],
     setFormType = _useState6[1];
   var actionRef = useRef();
   var columns = [{
-    title: "名称",
-    dataIndex: "keyString",
+    title: '名称',
+    dataIndex: 'keyString',
     hideInTable: true,
     fieldProps: {
-      placeholder: "请输入"
+      placeholder: '请输入'
     }
   }, {
-    title: "模块",
+    title: '模块',
     hideInSearch: true,
-    dataIndex: "permModule"
+    dataIndex: 'permModule'
   }, {
-    title: "编码",
+    title: '编码',
     hideInSearch: true,
-    dataIndex: "permCode"
+    dataIndex: 'permCode'
   }, {
-    title: "名称",
+    title: '名称',
     hideInSearch: true,
-    dataIndex: "permName"
+    dataIndex: 'permName'
   }, {
-    title: "操作",
+    title: '操作',
     hideInSearch: true,
     className: styles.minw110,
     render: function render(text, record) {
@@ -79,10 +78,10 @@ var PermList = function PermList() {
   }];
   var handleRemove = function handleRemove(record) {
     Modal.confirm({
-      title: "警告",
-      content: "确定删除吗？",
-      okText: "确认",
-      cancelText: "取消",
+      title: '警告',
+      content: '确定删除吗？',
+      okText: '确认',
+      cancelText: '取消',
       onOk: function onOk() {
         onSubmitRemove(record);
       }
@@ -120,7 +119,7 @@ var PermList = function PermList() {
   var handleModalVisible = function handleModalVisible(flag, record) {
     var itemVal = record === undefined ? {} : record;
     setItemValues(itemVal);
-    var type = record === undefined ? "create" : "update";
+    var type = record === undefined ? 'create' : 'update';
     setFormType(type);
     toggleModalVisible(!!flag);
   };
@@ -184,7 +183,7 @@ var PermList = function PermList() {
   }();
   var handleCancel = function handleCancel() {
     setItemValues({});
-    setFormType("");
+    setFormType('');
     toggleModalVisible(false);
   };
   var parentMethods = {
@@ -192,62 +191,57 @@ var PermList = function PermList() {
     handleUpdate: handleUpdate,
     onCancel: handleCancel
   };
-  return (
-    /*#__PURE__*/
-    // <PageHeaderWrapper title="权限">
-    React.createElement(Card, null, /*#__PURE__*/React.createElement("div", {
-      className: styles.tableList
-    }, /*#__PURE__*/React.createElement(ProTable, {
-      headerTitle: "\u6743\u9650\u5217\u8868",
-      actionRef: actionRef,
-      rowKey: "id",
-      toolBarRender: function toolBarRender() {
-        return [/*#__PURE__*/React.createElement(Button, {
-          type: "danger",
-          onClick: function onClick() {
-            return handleModalVisible(true);
-          },
-          icon: /*#__PURE__*/React.createElement(PlusOutlined, null)
-        }, "\u65B0\u5EFA")];
-      },
-      request: ( /*#__PURE__*/function () {
-        var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
-          var data;
-          return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-            while (1) switch (_context4.prev = _context4.next) {
-              case 0:
-                _context4.next = 2;
-                return queryPerm(_objectSpread(_objectSpread({}, params), {}, {
-                  page: params.current
-                }));
-              case 2:
-                data = _context4.sent;
-                return _context4.abrupt("return", {
-                  data: data.data.list,
-                  success: true,
-                  total: data.data.total
-                });
-              case 4:
-              case "end":
-                return _context4.stop();
-            }
-          }, _callee4);
-        }));
-        return function (_x4) {
-          return _ref4.apply(this, arguments);
-        };
-      }()),
-      pagination: {
-        showSizeChanger: true
-      },
-      columns: columns,
-      rowSelection: false
-    }), modalVisible ? /*#__PURE__*/React.createElement(UpdateForm, _extends({}, parentMethods, {
-      modalVisible: modalVisible,
-      currentItem: itemValues,
-      formType: formType
-    })) : null))
-    // </PageHeaderWrapper>
-  );
+  return /*#__PURE__*/React.createElement("div", {
+    className: styles.tableList
+  }, /*#__PURE__*/React.createElement(ProTable, {
+    headerTitle: "\u6743\u9650\u5217\u8868",
+    actionRef: actionRef,
+    rowKey: "id",
+    toolBarRender: function toolBarRender() {
+      return [/*#__PURE__*/React.createElement(Button, {
+        type: "danger",
+        onClick: function onClick() {
+          return handleModalVisible(true);
+        },
+        icon: /*#__PURE__*/React.createElement(PlusOutlined, null)
+      }, "\u65B0\u5EFA")];
+    },
+    request: ( /*#__PURE__*/function () {
+      var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
+        var data;
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              _context4.next = 2;
+              return queryPerm(_objectSpread(_objectSpread({}, params), {}, {
+                page: params.current
+              }));
+            case 2:
+              data = _context4.sent;
+              return _context4.abrupt("return", {
+                data: data.data.list,
+                success: true,
+                total: data.data.total
+              });
+            case 4:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4);
+      }));
+      return function (_x4) {
+        return _ref4.apply(this, arguments);
+      };
+    }()),
+    pagination: {
+      showSizeChanger: true
+    },
+    columns: columns,
+    rowSelection: false
+  }), modalVisible ? /*#__PURE__*/React.createElement(UpdateForm, _extends({}, parentMethods, {
+    modalVisible: modalVisible,
+    currentItem: itemValues,
+    formType: formType
+  })) : null);
 };
 export default PermList;

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

@@ -14,18 +14,18 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useState, useRef } from "react";
-import { history } from "umi";
-import { Card, Form, Button, Modal, Divider, Space } from "antd";
-import styles from "./styles.less";
-import { PlusOutlined } from "@ant-design/icons";
-import UpdateForm from "./components/UpdateForm";
-import { addRole, queryRole, removeRole, updateRole } from "../service.js";
 import { asyncCallback } from "../../../../utils/utils.js";
-import ProTable from "@ant-design/pro-table";
-;
+import { PlusOutlined } from '@ant-design/icons';
+import ProTable from '@ant-design/pro-table';
+import { Button, Divider, Form, Modal, Space } from 'antd';
+import { useRef, useState } from 'react';
+import { connect, history } from 'umi';
+import { addRole, queryRole, removeRole, updateRole } from "../service.js";
+import UpdateForm from "./components/UpdateForm";
+import styles from "./styles.less";
 var PAGE_SIZE = 10;
-var RoleList = function RoleList(props) {
+var RoleList = function RoleList(_ref) {
+  var currentUser = _ref.currentUser;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -37,33 +37,32 @@ var RoleList = function RoleList(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     itemValues = _useState4[0],
     setItemValues = _useState4[1];
-  var _useState5 = useState("create"),
+  var _useState5 = useState('create'),
     _useState6 = _slicedToArray(_useState5, 2),
     formType = _useState6[0],
     setFormType = _useState6[1];
   var actionRef = useRef();
-  var currentUser = props.currentUser;
   var columns = [{
-    title: "查询内容",
-    dataIndex: "keyString",
+    title: '查询内容',
+    dataIndex: 'keyString',
     hideInTable: true,
     fieldProps: {
-      placeholder: "请输入名称"
+      placeholder: '请输入名称'
     }
   }, {
-    title: "编码",
-    dataIndex: "roleCode",
+    title: '编码',
+    dataIndex: 'roleCode',
     hideInSearch: true
   }, {
-    title: "名称",
-    dataIndex: "roleName",
+    title: '名称',
+    dataIndex: 'roleName',
     hideInSearch: true
   }, {
-    title: "操作",
+    title: '操作',
     className: styles.w180,
     hideInSearch: true,
     render: function render(text, record) {
-      if (currentUser.userType === "ADMIN" || currentUser.userType === "SUPERADMIN") {
+      if (currentUser.userType === 'ADMIN' || currentUser.userType === 'SUPERADMIN') {
         return /*#__PURE__*/React.createElement(Space, {
           split: /*#__PURE__*/React.createElement(Divider, {
             type: "vertical"
@@ -95,7 +94,7 @@ var RoleList = function RoleList(props) {
   }];
   var handleSetAbility = function handleSetAbility(record) {
     history.push({
-      pathname: "/sso/permrole",
+      pathname: '/sso/permrole',
       query: {
         roleId: record.id
       }
@@ -103,17 +102,17 @@ var RoleList = function RoleList(props) {
   };
   var handleRemove = function handleRemove(record) {
     Modal.confirm({
-      title: "警告",
-      content: "确定删除吗？",
-      okText: "确认",
-      cancelText: "取消",
+      title: '警告',
+      content: '确定删除吗？',
+      okText: '确认',
+      cancelText: '取消',
       onOk: function onOk() {
         onSubmitRemove(record);
       }
     });
   };
   var onSubmitRemove = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(record) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(record) {
       var res, flag;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -138,23 +137,23 @@ var RoleList = function RoleList(props) {
       }, _callee);
     }));
     return function onSubmitRemove(_x) {
-      return _ref.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
   var handleModalVisible = function handleModalVisible(flag, record) {
     var val = record === undefined ? {} : record;
-    var type = record === undefined ? "create" : "update";
+    var type = record === undefined ? 'create' : 'update';
     setItemValues(val);
     setFormType(type);
     toggleModalVisible(!!flag);
   };
   var handleCancel = function handleCancel() {
     setItemValues({});
-    setFormType("");
+    setFormType('');
     toggleModalVisible(false);
   };
   var handleAdd = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(fields) {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(fields) {
       var res, flag;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -179,11 +178,11 @@ var RoleList = function RoleList(props) {
       }, _callee2);
     }));
     return function handleAdd(_x2) {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
   var handleUpdate = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(fields) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(fields) {
       var res, flag;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
@@ -208,7 +207,7 @@ var RoleList = function RoleList(props) {
       }, _callee3);
     }));
     return function handleUpdate(_x3) {
-      return _ref3.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
   var parentMethods = {
@@ -216,7 +215,7 @@ var RoleList = function RoleList(props) {
     handleUpdate: handleUpdate,
     onCancel: handleCancel
   };
-  return /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement("div", {
     className: styles.tableList
   }, /*#__PURE__*/React.createElement(ProTable, {
     headerTitle: "\u89D2\u8272\u5217\u8868",
@@ -231,7 +230,7 @@ var RoleList = function RoleList(props) {
       }, /*#__PURE__*/React.createElement(PlusOutlined, null), " \u65B0\u5EFA")];
     },
     request: ( /*#__PURE__*/function () {
-      var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
+      var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
         var data;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
@@ -254,7 +253,7 @@ var RoleList = function RoleList(props) {
         }, _callee4);
       }));
       return function (_x4) {
-        return _ref4.apply(this, arguments);
+        return _ref5.apply(this, arguments);
       };
     }()),
     pagination: {
@@ -266,9 +265,11 @@ var RoleList = function RoleList(props) {
     modalVisible: modalVisible,
     currentItem: itemValues,
     formType: formType
-  })) : null));
+  })) : null);
 };
-export default RoleList;
-// export default connect(({ user }) => ({
-//   currentUser: user.currentUser,
-// }))(RoleList);
+export default connect(function (_ref6) {
+  var user = _ref6.user;
+  return {
+    currentUser: user.currentUser
+  };
+})(RoleList);

package/dist/components/sso/setting/user/index.js

@@ -9,10 +9,10 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { asyncCallback } from "../../../../utils/utils.js";
-import ProTable from "@ant-design/pro-table";
-;
-import { Card, Divider, Form, Modal, Space } from "antd";
-import React, { useRef, useState } from "react";
+import ProTable from '@ant-design/pro-table';
+import { Divider, Form, Modal, Space } from 'antd';
+import React, { useRef, useState } from 'react';
+import { connect } from 'umi';
 import { assignRole, changeAdmin, fetchUsers } from "../service.js";
 import RoleUpdateForm from "./components/RoleUpdateForm";
 var confirm = Modal.confirm;
@@ -35,66 +35,66 @@ var UserList = function UserList(props) {
   var actionRef = useRef();
   var currentUser = props.currentUser;
   var columns = [{
-    title: "查询内容",
-    dataIndex: "keyString",
+    title: '查询内容',
+    dataIndex: 'keyString',
     hideInTable: true,
     fieldProps: {
-      placeholder: "姓名、用户名、所属机构"
+      placeholder: '姓名、用户名、所属机构'
     }
   }, {
-    title: "姓名",
-    dataIndex: "realName",
+    title: '姓名',
+    dataIndex: 'realName',
     hideInSearch: true
   }, {
-    title: "用户名",
-    dataIndex: "userName",
+    title: '用户名',
+    dataIndex: 'userName',
     hideInSearch: true
   }, {
-    title: "角色",
-    dataIndex: "roleName",
+    title: '角色',
+    dataIndex: 'roleName',
     hideInSearch: true,
     render: function render(text, record) {
       var b = [];
       record.roles.map(function (_) {
         b.push(_.roleName);
       });
-      return b.join(",");
+      return b.join(',');
     }
   }, {
-    title: "所属机构",
+    title: '所属机构',
     hideInSearch: true,
-    dataIndex: "orgName"
+    dataIndex: 'orgName'
   }, {
-    title: "操作",
+    title: '操作',
     hideInSearch: true,
     render: function render(text, record) {
-      if (record.userType == "ADMIN") {
+      if (record.userType == 'ADMIN') {
         return /*#__PURE__*/React.createElement(Space, {
           split: /*#__PURE__*/React.createElement(Divider, {
             type: "vertical"
           })
-        }, currentUser.userType === "SUPERADMIN" && record.userTypeCode > currentUser.userTypeCode && /*#__PURE__*/React.createElement("a", {
+        }, currentUser.userType === 'SUPERADMIN' && record.userTypeCode > currentUser.userTypeCode && /*#__PURE__*/React.createElement("a", {
           onClick: function onClick() {
             return handleModalVisible(true, record);
           },
           className: "textGreen"
-        }, "\u5206\u914D\u89D2\u8272"), currentUser.userType === "SUPERADMIN" && /*#__PURE__*/React.createElement("a", {
+        }, "\u5206\u914D\u89D2\u8272"), currentUser.userType === 'SUPERADMIN' && /*#__PURE__*/React.createElement("a", {
           onClick: function onClick() {
             return handleAdminChange(record);
           }
         }, "\u53D6\u6D88\u7BA1\u7406\u5458"));
       }
-      if (record.userType == "USER") {
+      if (record.userType == 'USER') {
         return /*#__PURE__*/React.createElement(Space, {
           split: /*#__PURE__*/React.createElement(Divider, {
             type: "vertical"
           })
-        }, currentUser.userType === "SUPERADMIN" && record.userTypeCode > currentUser.userTypeCode && /*#__PURE__*/React.createElement("a", {
+        }, currentUser.userType === 'SUPERADMIN' && record.userTypeCode > currentUser.userTypeCode && /*#__PURE__*/React.createElement("a", {
           onClick: function onClick() {
             return handleModalVisible(true, record);
           },
           className: "textGreen"
-        }, "\u5206\u914D\u89D2\u8272"), currentUser.userType === "SUPERADMIN" && /*#__PURE__*/React.createElement("a", {
+        }, "\u5206\u914D\u89D2\u8272"), currentUser.userType === 'SUPERADMIN' && /*#__PURE__*/React.createElement("a", {
           onClick: function onClick() {
             return handleAdminChange(record);
           }
@@ -108,10 +108,10 @@ var UserList = function UserList(props) {
   };
   var handleAdminChange = function handleAdminChange(record) {
     confirm({
-      title: "警告",
-      content: record.userType === "ADMIN" ? "确定取消管理员吗？" : "确定设置管理员吗？",
-      okText: "确认",
-      cancelText: "取消",
+      title: '警告',
+      content: record.userType === 'ADMIN' ? '确定取消管理员吗？' : '确定设置管理员吗？',
+      okText: '确认',
+      cancelText: '取消',
       onOk: function onOk() {
         changeRole(record);
       },
@@ -188,7 +188,7 @@ var UserList = function UserList(props) {
     form.resetFields();
     actionRef.current.reload();
   };
-  return /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(ProTable, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ProTable, {
     headerTitle: "\u7528\u6237\u5217\u8868",
     actionRef: actionRef,
     rowKey: "id",
@@ -232,7 +232,9 @@ var UserList = function UserList(props) {
     roles: roles
   }));
 };
-export default UserList;
-// export default connect(({ user }) => ({
-//   currentUser: user.currentUser,
-// }))(UserList);
+export default connect(function (_ref4) {
+  var user = _ref4.user;
+  return {
+    currentUser: user.currentUser
+  };
+})(UserList);

package/dist/components/xyAuthLayout/index.js

@@ -27,7 +27,7 @@ var XyAuthLayout = function XyAuthLayout(props) {
   var envData = getEnvData();
   var service = propsService || getSessionStorage('service');
   var token = getSessionStorage('Token');
-  var propsLoginType = props.loginType || 'BOTH';
+  var loginType = envData.login_type || 'BOTH';
   var pathName = window.location.pathname;
 
   // 通用请求头参数
@@ -56,7 +56,7 @@ var XyAuthLayout = function XyAuthLayout(props) {
   useEffect(function () {
     if (!token) {
       // 当登录方式设为两端登录时，可在路径加上sso进行统一登陆，当登录方式固定为SSO时，直接跳转到SSO登录
-      if (propsLoginType === 'BOTH' && pathName.indexOf('/sso') >= 0 || propsLoginType === 'SSO') {
+      if (loginType === 'BOTH' && pathName.indexOf('/sso') >= 0 || loginType === 'SSO') {
         setSessionStorage('sso_redirect_url', window.location.href);
         envData.sso_type === 'new' ? ssoTypeByNew() : ssoTypeByOld();
       } else {
@@ -70,8 +70,8 @@ var XyAuthLayout = function XyAuthLayout(props) {
 
   // 处理 401 未授权错误(登录过期)
   var handleUnauthorized = function handleUnauthorized() {
-    var actualLoginType = propsLoginType;
-    if (propsLoginType === 'BOTH') {
+    var actualLoginType = loginType;
+    if (loginType === 'BOTH') {
       var redirectUrl = getSessionStorage('sso_redirect_url');
       actualLoginType = redirectUrl ? 'SSO' : 'AAA';
     }
@@ -92,68 +92,60 @@ var XyAuthLayout = function XyAuthLayout(props) {
   };
   var getUserinfo = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var actualLoginType, redirectUrl, response;
+      var response;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _context.prev = 0;
-            // 确定实际使用的登录类型
-            actualLoginType = propsLoginType;
-            if (propsLoginType === 'BOTH') {
-              redirectUrl = getSessionStorage('sso_redirect_url');
-              actualLoginType = redirectUrl ? 'SSO' : 'AAA';
-            }
-
-            // 根据实际登录类型调用对应的接口
-            if (!(actualLoginType === 'SSO')) {
-              _context.next = 9;
+            if (!(loginType === 'SSO')) {
+              _context.next = 7;
               break;
             }
-            _context.next = 6;
+            _context.next = 4;
             return queryCurrent({});
-          case 6:
+          case 4:
             _context.t0 = _context.sent;
-            _context.next = 12;
+            _context.next = 10;
             break;
-          case 9:
-            _context.next = 11;
+          case 7:
+            _context.next = 9;
             return queryAaaCurrent({});
-          case 11:
+          case 9:
             _context.t0 = _context.sent;
-          case 12:
+          case 10:
             response = _context.t0;
             if (!((response === null || response === void 0 ? void 0 : response.status) === 401 || (response === null || response === void 0 ? void 0 : response.rspCode) === '401')) {
-              _context.next = 19;
+              _context.next = 17;
               break;
             }
             if (!getUserError) {
-              _context.next = 17;
+              _context.next = 15;
               break;
             }
             getUserError(response);
             return _context.abrupt("return");
-          case 17:
+          case 15:
             // 否则自动处理登录过期
             handleUnauthorized();
             return _context.abrupt("return");
-          case 19:
+          case 17:
             if (response.rspCode === '000000') {
               getUserOk && getUserOk(response.data);
             } else {
               getUserError && getUserError(response);
             }
-            _context.next = 26;
+            _context.next = 24;
             break;
-          case 22:
-            _context.prev = 22;
+          case 20:
+            _context.prev = 20;
             _context.t1 = _context["catch"](0);
             console.error('获取用户信息失败:', _context.t1);
             getUserError && getUserError(_context.t1);
-          case 26:
+          case 24:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 22]]);
+      }, _callee, null, [[0, 20]]);
     }));
     return function getUserinfo() {
       return _ref.apply(this, arguments);
@@ -327,11 +319,16 @@ export var logout = /*#__PURE__*/function () {
     var loginType,
       actualLoginType,
       redirectUrl,
-      response,
+      res,
+      removeSessionData,
       _args5 = arguments;
     return _regeneratorRuntime().wrap(function _callee5$(_context5) {
       while (1) switch (_context5.prev = _context5.next) {
         case 0:
+          removeSessionData = function _removeSessionData() {
+            removeSessionStorage('Token');
+            removeSessionStorage('sso_redirect_url');
+          };
           loginType = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : 'BOTH';
           // 当 loginType 为 BOTH 时，根据 sessionStorage 中的 'sso_redirect_url' 判断实际登录方式
           // 有 'sso_redirect_url' 说明使用的是 SSO 登录,否则是 AAA 登录
@@ -340,48 +337,46 @@ export var logout = /*#__PURE__*/function () {
             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;
+          _context5.prev = 5;
+          _context5.next = 8;
           return accountAAALogout({});
-        case 9:
+        case 8:
+          removeSessionData();
           _context5.next = 14;
           break;
         case 11:
           _context5.prev = 11;
-          _context5.t0 = _context5["catch"](6);
+          _context5.t0 = _context5["catch"](5);
           console.error('AAA 退出登录失败:', _context5.t0);
         case 14:
           window.location.href = "".concat(window.publicPath || '/', "user/login");
-          _context5.next = 27;
+          _context5.next = 28;
           break;
         case 17:
           _context5.prev = 17;
           _context5.next = 20;
           return accountLogout({});
         case 20:
-          response = _context5.sent;
-          if (response) {
-            window.location.href = response;
+          res = _context5.sent;
+          removeSessionData();
+          if (res) {
+            window.location.href = res;
           }
-          _context5.next = 27;
+          _context5.next = 28;
           break;
-        case 24:
-          _context5.prev = 24;
+        case 25:
+          _context5.prev = 25;
           _context5.t1 = _context5["catch"](17);
           console.error('SSO 退出登录失败:', _context5.t1);
-        case 27:
+        case 28:
         case "end":
           return _context5.stop();
       }
-    }, _callee5, null, [[6, 11], [17, 24]]);
+    }, _callee5, null, [[5, 11], [17, 25]]);
   }));
   return function logout() {
     return _ref5.apply(this, arguments);

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

@@ -1,2 +1,2 @@
 export default Auth;
-declare function Auth(props: any): JSX.Element;
+declare function Auth(props: any): import("react/jsx-runtime").JSX.Element;

package/dist/types/components/aaa/setting/permission/components/UpdateForm.d.ts

@@ -1,2 +1,2 @@
 export default UpdateForm;
-declare function UpdateForm(props: any): JSX.Element;
+declare function UpdateForm(props: any): import("react/jsx-runtime").JSX.Element;

package/dist/types/components/aaa/setting/permission/components/UriModal.d.ts

@@ -8,4 +8,4 @@ declare function UriModal({ visible, onCancel, onOk, loading, title, uriList, se
     uriList?: any[];
     selectedUris?: any[];
     onSelectedChange: any;
-}): JSX.Element;
+}): import("react/jsx-runtime").JSX.Element;

package/dist/types/components/aaa/setting/permission/index.d.ts

@@ -1,2 +1,2 @@
 export default PermList;
-declare function PermList(): JSX.Element;
+declare function PermList(): import("react/jsx-runtime").JSX.Element;

package/dist/types/components/aaa/setting/requesturl/components/UpdateForm.d.ts

@@ -1,2 +1,2 @@
 export default UpdateForm;
-declare function UpdateForm(props: any): JSX.Element;
+declare function UpdateForm(props: any): import("react/jsx-runtime").JSX.Element;

package/dist/types/components/aaa/setting/requesturl/index.d.ts

@@ -1,2 +1,2 @@
 export default RequestUriList;
-declare function RequestUriList(): JSX.Element;
+declare function RequestUriList(): import("react/jsx-runtime").JSX.Element;

package/dist/types/components/aaa/setting/role/components/UpdateForm.d.ts

@@ -1,2 +1,2 @@
 export default UpdateForm;
-declare function UpdateForm(props: any): JSX.Element;
+declare function UpdateForm(props: any): import("react/jsx-runtime").JSX.Element;

package/dist/types/components/aaa/setting/role/index.d.ts

@@ -1,2 +1,2 @@
 export default RoleList;
-declare function RoleList(): JSX.Element;
+declare function RoleList(): import("react/jsx-runtime").JSX.Element;

package/dist/types/components/aaa/setting/user/components/UpdateForm.d.ts

@@ -1,2 +1,2 @@
 export default UpdateForm;
-declare function UpdateForm(props: any): JSX.Element;
+declare function UpdateForm(props: any): import("react/jsx-runtime").JSX.Element;

package/dist/types/components/aaa/setting/user/index.d.ts

@@ -1,2 +1,2 @@
 export default UserList;
-declare function UserList(props: any): JSX.Element;
+declare function UserList(props: any): import("react/jsx-runtime").JSX.Element;

package/dist/types/components/both/security-layout/index.d.ts

@@ -1,2 +1,2 @@
 export default BothSecurityLayout;
-declare function BothSecurityLayout(props: any): JSX.Element;
+declare function BothSecurityLayout(props: any): import("react/jsx-runtime").JSX.Element;

package/dist/types/components/dictionary/components/UpdateForm.d.ts

@@ -1,2 +1,2 @@
 export default UpdateForm;
-declare function UpdateForm(props: any): JSX.Element;
+declare function UpdateForm(props: any): import("react/jsx-runtime").JSX.Element;

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

@@ -1,2 +1,2 @@
 export default DictionaryList;
-declare function DictionaryList(): JSX.Element;
+declare function DictionaryList(): import("react/jsx-runtime").JSX.Element;

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

@@ -39,4 +39,4 @@ declare function DownloadFile(props: {
         };
         onError?: (error: Error) => void;
     };
-}): JSX.Element;
+}): import("react/jsx-runtime").JSX.Element;

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

@@ -55,4 +55,4 @@ declare function MaterialCard(props: {
     dividerType?: 'solid' | 'dashed' | 'dotted';
     dividerStyle?: React.CSSProperties;
     children?: React.ReactNode;
-}): JSX.Element;
+}): import("react/jsx-runtime").JSX.Element;

package/dist/types/components/organization/components/CreatePeopleForm.d.ts

@@ -1,2 +1,2 @@
 export default CreatePeopleForm;
-declare function CreatePeopleForm(props: any): JSX.Element;
+declare function CreatePeopleForm(props: any): import("react/jsx-runtime").JSX.Element;

package/dist/types/components/organization/components/CreateSubStoreForm.d.ts

@@ -1,2 +1,2 @@
 export default CreateSubStoreForm;
-declare function CreateSubStoreForm(props: any): JSX.Element;
+declare function CreateSubStoreForm(props: any): import("react/jsx-runtime").JSX.Element;

package/dist/types/components/organization/components/OrgTree.d.ts

@@ -1,2 +1,2 @@
-declare function _default(props: any): JSX.Element;
+declare function _default(props: any): import("react/jsx-runtime").JSX.Element;
 export default _default;

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

@@ -1,2 +1,2 @@
 export default Organization;
-declare function Organization(props: any): JSX.Element;
+declare function Organization(props: any): import("react/jsx-runtime").JSX.Element;

package/dist/types/components/sso/security-layout/index.d.ts

@@ -1,2 +1,2 @@
 export default SsoSecurityLayout;
-declare function SsoSecurityLayout(props: any): JSX.Element;
+declare function SsoSecurityLayout(props: any): import("react/jsx-runtime").JSX.Element;

package/dist/types/components/sso/setting/permRole/index.d.ts

@@ -1,2 +1,2 @@
-export default PermRoleBoard;
-declare function PermRoleBoard(props: any): JSX.Element;
+declare const _default: any;
+export default _default;

package/dist/types/components/sso/setting/permission/components/UpdateForm.d.ts

@@ -1,2 +1,2 @@
 export default UpdateForm;
-declare function UpdateForm(props: any): JSX.Element;
+declare function UpdateForm(props: any): import("react/jsx-runtime").JSX.Element;

package/dist/types/components/sso/setting/permission/index.d.ts

@@ -1,2 +1,2 @@
 export default PermList;
-declare function PermList(): JSX.Element;
+declare function PermList(): import("react/jsx-runtime").JSX.Element;

package/dist/types/components/sso/setting/role/components/UpdateForm.d.ts

@@ -1,2 +1,2 @@
 export default UpdateForm;
-declare function UpdateForm(props: any): JSX.Element;
+declare function UpdateForm(props: any): import("react/jsx-runtime").JSX.Element;

package/dist/types/components/sso/setting/role/index.d.ts

@@ -1,2 +1,2 @@
-export default RoleList;
-declare function RoleList(props: any): JSX.Element;
+declare const _default: any;
+export default _default;

package/dist/types/components/sso/setting/user/components/RoleUpdateForm.d.ts

@@ -1,2 +1,2 @@
 export default RoleUpdateForm;
-declare function RoleUpdateForm(props: any): JSX.Element;
+declare function RoleUpdateForm(props: any): import("react/jsx-runtime").JSX.Element;

package/dist/types/components/sso/setting/user/index.d.ts

@@ -1,2 +1,2 @@
-export default UserList;
-declare function UserList(props: any): JSX.Element;
+declare const _default: any;
+export default _default;

package/dist/types/components/tools/version.d.ts

@@ -9,4 +9,4 @@ export default Version;
 declare function Version(props: {
     envData?: any;
     position?: string;
-}): JSX.Element;
+}): import("react/jsx-runtime").JSX.Element;

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

@@ -50,7 +50,7 @@ declare function UploadFile(props: {
     formItemOptions: FormItemProps;
     uploadOptions: UploadProps;
     buttonOptions: ButtonProps;
-}): JSX.Element;
+}): import("react/jsx-runtime").JSX.Element;
 import { FormProps } from "antd";
 import { FormItemProps } from "antd";
 import { UploadProps } from "antd";

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

@@ -1,3 +1,3 @@
 export default XyAuthLayout;
 export function logout(loginType?: string): Promise<void>;
-declare function XyAuthLayout(props: any): JSX.Element;
+declare function XyAuthLayout(props: any): import("react/jsx-runtime").JSX.Element;

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

@@ -13,7 +13,7 @@ export function getQueryVariable(variable: string): string | boolean;
  * @returns {Object} - 返回处理后的表格数据
  */
 export function handleTableResponse(config: {
-    actionRef: React.MutableRefObject;
+    actionRef: import("react").MutableRefObject<any>;
     res: any;
     type?: string;
 }): any;

package/dist/utils/request.js

@@ -7,11 +7,9 @@ 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';
+import { request, history } from 'umi';
 import { message } from 'antd';
 import { getSessionStorage } from "./token.js";
-import { history } from 'umi';
-var token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJiZGFkYWJlOTAxMTA0MDc1YWZiNzU4ZWRhNTI4ZDc2NSIsImV4cCI6MTcxMzkzMzIzNywiaWF0IjoxNzEzOTI2MDM3fQ.fB4vs1wRvvbVth430mIPRIlhM8tXDvTCuvB339-E2fc';
 export default function doRequest(_x, _x2, _x3, _x4) {
   return _doRequest.apply(this, arguments);
 }
@@ -23,7 +21,6 @@ function _doRequest() {
         case 0:
           headers = {
             SID: SID,
-            // Authorization: 'Bearer ' + token,
             Authorization: 'Bearer ' + getSessionStorage(),
             UserId: getSessionStorage('userId'),
             OrgId: getSessionStorage('orgId')
@@ -35,15 +32,14 @@ function _doRequest() {
             headers: _objectSpread(_objectSpread({}, headers), {}, {
               service: getSessionStorage('service') || 'unknow'
             }),
-            getResponse: true
+            getResponse: true,
+            skipErrorHandler: true
           }).then(function (_ref) {
             var data = _ref.data;
-            if (data.rspCode === '000000') {
-              return data;
-            } else {
+            if (data.rspCode !== '000000' && data.rspMsg) {
               message.error(data.rspMsg);
-              return data;
             }
+            return data;
           }).catch( /*#__PURE__*/function () {
             var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(error) {
               var _data;
@@ -58,7 +54,7 @@ function _doRequest() {
                     return error.response.json();
                   case 3:
                     _data = _context.sent;
-                    message.error(_data.rspMsg);
+                    _data.rspMsg && message.error(_data.rspMsg);
                     _context.next = 8;
                     break;
                   case 7:

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "xydata-tools",
-	"version": "1.1.1",
+	"version": "1.1.3",
 	"description": "xydata tools",
 	"main": "dist/index.js",
 	"module": "dist/index.js",
@@ -32,26 +32,32 @@
 		"antd": "^4.24.16",
 		"moment": "^2.30.1",
 		"react": "^17.0.0",
-		"react-dom": "^17.0.0"
+		"react-dom": "^17.0.0",
+		"umi": "^3.5.20"
 	},
 	"devDependencies": {
+		"@ant-design/icons": "^4.5.0",
+		"@ant-design/pro-form": "^1.69.4",
+		"@ant-design/pro-table": "^2.80.8",
 		"@babel/core": "7.24.9",
 		"@babel/preset-env": "7.24.8",
 		"@babel/preset-react": "7.24.7",
 		"@vitejs/plugin-vue2": "2.3.1",
+		"antd": "^4.24.16",
+		"cross-env": "^10.1.0",
 		"father": "4.1.5",
+		"moment": "^2.30.1",
+		"react": "^17.0.0",
+		"react-dom": "^17.0.0",
 		"terser": "5.31.3",
+		"umi": "^3.5.20",
 		"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"
 	}