linkmore-design 1.1.27-beta.4 → 1.1.27-beta.6

package/lib/notification/index.js

@@ -1,27 +1,41 @@
 "use strict";
 
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getInstance = exports.default = void 0;
+
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+
 require("antd/es/notification/style");
+
 var _notification2 = _interopRequireDefault(require("antd/es/notification"));
+
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _icons = require("@ant-design/icons");
+
 var _classnames = _interopRequireDefault(require("classnames"));
+
 var _rcNotification = _interopRequireDefault(require("rc-notification"));
+
 var React = _interopRequireWildcard(require("react"));
+
 var _configProvider = _interopRequireWildcard(require("antd/es/config-provider"));
+
 var _useNotification = _interopRequireDefault(require("./hooks/useNotification"));
+
 var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
   function adopt(value) {
     return value instanceof P ? value : new P(function (resolve) {
       resolve(value);
     });
   }
+
   return new (P || (P = Promise))(function (resolve, reject) {
     function fulfilled(value) {
       try {
@@ -30,6 +44,7 @@ var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P
         reject(e);
       }
     }
+
     function rejected(value) {
       try {
         step(generator["throw"](value));
@@ -37,12 +52,15 @@ var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P
         reject(e);
       }
     }
+
     function step(result) {
       result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
     }
+
     step((generator = generator.apply(thisArg, _arguments || [])).next());
   });
 };
+
 var notificationInstance = {};
 var defaultDuration = 4.5;
 var defaultTop = 24;
@@ -53,48 +71,60 @@ var defaultGetContainer;
 var defaultCloseIcon;
 var rtl = false;
 var maxCount;
+
 function setNotificationConfig(options) {
   var duration = options.duration,
-    placement = options.placement,
-    bottom = options.bottom,
-    top = options.top,
-    getContainer = options.getContainer,
-    closeIcon = options.closeIcon,
-    prefixCls = options.prefixCls;
+      placement = options.placement,
+      bottom = options.bottom,
+      top = options.top,
+      getContainer = options.getContainer,
+      closeIcon = options.closeIcon,
+      prefixCls = options.prefixCls;
+
   if (prefixCls !== undefined) {
     defaultPrefixCls = prefixCls;
   }
+
   if (duration !== undefined) {
     defaultDuration = duration;
   }
+
   if (placement !== undefined) {
     defaultPlacement = placement;
   } else if (options.rtl) {
     defaultPlacement = 'topLeft';
   }
+
   if (bottom !== undefined) {
     defaultBottom = bottom;
   }
+
   if (top !== undefined) {
     defaultTop = top;
   }
+
   if (getContainer !== undefined) {
     defaultGetContainer = getContainer;
   }
+
   if (closeIcon !== undefined) {
     defaultCloseIcon = closeIcon;
   }
+
   if (options.rtl !== undefined) {
     rtl = options.rtl;
   }
+
   if (options.maxCount !== undefined) {
     maxCount = options.maxCount;
   }
 }
+
 function getPlacementStyle(placement) {
   var top = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : defaultTop;
   var bottom = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : defaultBottom;
   var style;
+
   switch (placement) {
     case 'top':
       style = {
@@ -105,6 +135,7 @@ function getPlacementStyle(placement) {
         bottom: 'auto'
       };
       break;
+
     case 'topLeft':
       style = {
         left: 0,
@@ -112,6 +143,7 @@ function getPlacementStyle(placement) {
         bottom: 'auto'
       };
       break;
+
     case 'topRight':
       style = {
         right: 0,
@@ -119,6 +151,7 @@ function getPlacementStyle(placement) {
         bottom: 'auto'
       };
       break;
+
     case 'bottom':
       style = {
         left: '50%',
@@ -128,6 +161,7 @@ function getPlacementStyle(placement) {
         bottom: bottom
       };
       break;
+
     case 'bottomLeft':
       style = {
         left: 0,
@@ -135,6 +169,7 @@ function getPlacementStyle(placement) {
         bottom: bottom
       };
       break;
+
     default:
       style = {
         right: 0,
@@ -143,23 +178,28 @@ function getPlacementStyle(placement) {
       };
       break;
   }
+
   return style;
 }
+
 function getNotificationInstance(args, callback) {
   var _args$placement = args.placement,
-    placement = _args$placement === void 0 ? defaultPlacement : _args$placement,
-    top = args.top,
-    bottom = args.bottom,
-    _args$getContainer = args.getContainer,
-    getContainer = _args$getContainer === void 0 ? defaultGetContainer : _args$getContainer,
-    customizePrefixCls = args.prefixCls;
+      placement = _args$placement === void 0 ? defaultPlacement : _args$placement,
+      top = args.top,
+      bottom = args.bottom,
+      _args$getContainer = args.getContainer,
+      getContainer = _args$getContainer === void 0 ? defaultGetContainer : _args$getContainer,
+      customizePrefixCls = args.prefixCls;
+
   var _globalConfig = (0, _configProvider.globalConfig)(),
-    getPrefixCls = _globalConfig.getPrefixCls,
-    getIconPrefixCls = _globalConfig.getIconPrefixCls;
+      getPrefixCls = _globalConfig.getPrefixCls,
+      getIconPrefixCls = _globalConfig.getIconPrefixCls;
+
   var prefixCls = getPrefixCls('notification', customizePrefixCls || defaultPrefixCls);
   var iconPrefixCls = getIconPrefixCls();
   var cacheKey = "".concat(prefixCls, "-").concat(placement);
   var cacheInstance = notificationInstance[cacheKey];
+
   if (cacheInstance) {
     Promise.resolve(cacheInstance).then(function (instance) {
       callback({
@@ -170,6 +210,7 @@ function getNotificationInstance(args, callback) {
     });
     return;
   }
+
   var notificationClass = (0, _classnames.default)("".concat(prefixCls, "-").concat(placement), (0, _defineProperty2.default)({}, "".concat(prefixCls, "-rtl"), rtl === true));
   notificationInstance[cacheKey] = new Promise(function (resolve) {
     _rcNotification.default.newInstance({
@@ -188,30 +229,33 @@ function getNotificationInstance(args, callback) {
     });
   });
 }
+
 var typeToIcon = {
   success: _icons.CheckCircleOutlined,
   info: _icons.InfoCircleOutlined,
   error: _icons.CloseCircleOutlined,
   warning: _icons.ExclamationCircleOutlined
 };
+
 function getRCNoticeProps(args, prefixCls, iconPrefixCls) {
   var durationArg = args.duration,
-    icon = args.icon,
-    type = args.type,
-    description = args.description,
-    message = args.message,
-    btn = args.btn,
-    onClose = args.onClose,
-    onClick = args.onClick,
-    key = args.key,
-    style = args.style,
-    className = args.className,
-    _args$closeIcon = args.closeIcon,
-    closeIcon = _args$closeIcon === void 0 ? defaultCloseIcon : _args$closeIcon,
-    _args$progress = args.progress,
-    progress = _args$progress === void 0 ? true : _args$progress;
+      icon = args.icon,
+      type = args.type,
+      description = args.description,
+      message = args.message,
+      btn = args.btn,
+      onClose = args.onClose,
+      onClick = args.onClick,
+      key = args.key,
+      style = args.style,
+      className = args.className,
+      _args$closeIcon = args.closeIcon,
+      closeIcon = _args$closeIcon === void 0 ? defaultCloseIcon : _args$closeIcon,
+      _args$progress = args.progress,
+      progress = _args$progress === void 0 ? true : _args$progress;
   var duration = durationArg === undefined ? defaultDuration : durationArg;
   var iconNode = null;
+
   if (icon) {
     iconNode = /*#__PURE__*/React.createElement("span", {
       className: "".concat(prefixCls, "-icon")
@@ -221,6 +265,7 @@ function getRCNoticeProps(args, prefixCls, iconPrefixCls) {
       className: "".concat(prefixCls, "-icon ").concat(prefixCls, "-icon-").concat(type)
     });
   }
+
   var closeIconToRender = /*#__PURE__*/React.createElement("span", {
     className: "".concat(prefixCls, "-close-x")
   }, closeIcon || /*#__PURE__*/React.createElement(_icons.CloseOutlined, {
@@ -257,14 +302,16 @@ function getRCNoticeProps(args, prefixCls, iconPrefixCls) {
     className: (0, _classnames.default)(className, (0, _defineProperty2.default)({}, "".concat(prefixCls, "-").concat(type), !!type), 'lm_notification')
   };
 }
+
 function notice(args) {
   getNotificationInstance(args, function (_ref) {
     var prefixCls = _ref.prefixCls,
-      iconPrefixCls = _ref.iconPrefixCls,
-      instance = _ref.instance;
+        iconPrefixCls = _ref.iconPrefixCls,
+        instance = _ref.instance;
     instance.notice(getRCNoticeProps(args, prefixCls, iconPrefixCls));
   });
 }
+
 var api = {
   open: notice,
   close: function close(key) {
@@ -284,7 +331,6 @@ var api = {
     });
   }
 };
-
 ['success', 'info', 'warning', 'error'].forEach(function (type) {
   api[type] = function (args) {
     return api.open(Object.assign(Object.assign({}, args), {
@@ -296,6 +342,7 @@ api.warn = api.warning;
 api.useNotification = (0, _useNotification.default)(getNotificationInstance, getRCNoticeProps);
 api.antdNotification = _notification2.default;
 /** @private test Only function. Not work on production */
+
 var getInstance = function getInstance(cacheKey) {
   return __awaiter(void 0, void 0, void 0, /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
     return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
@@ -303,6 +350,7 @@ var getInstance = function getInstance(cacheKey) {
         switch (_context.prev = _context.next) {
           case 0:
             return _context.abrupt("return", process.env.NODE_ENV === 'test' ? notificationInstance[cacheKey] : null);
+
           case 1:
           case "end":
             return _context.stop();
@@ -311,6 +359,7 @@ var getInstance = function getInstance(cacheKey) {
     }, _callee);
   }));
 };
+
 exports.getInstance = getInstance;
 var _default = api;
 exports.default = _default;

package/lib/services/newRequest.js

@@ -1,26 +1,37 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
 require("antd/es/message/style");
+
 var _message2 = _interopRequireDefault(require("antd/es/message"));
+
 var _axios = _interopRequireDefault(require("axios"));
+
 var _qs = _interopRequireDefault(require("qs"));
+
 var _reactCookies = _interopRequireDefault(require("react-cookies"));
+
 var _utils = require("./utils");
+
 var _cookie$load;
-// 附近处理函数
 
+// 附近处理函数
 // cookie.save('UFXSCM_TokenId', 'Sfbw1SY/Rb2YNEGnoYlB7jiKG6mSznuGUXY5B6GNkHoHmU0IcH/d/A==');
 // cookie.save('saas_gpid', '41mzTRAtm/XBGt2X4wrn+67+XGXNr10r6CJAsvv2iEHPwRa4hOXzCw==');
-var inError = false;
-// 创建axios实例
+var inError = false; // 创建axios实例
+
 var instance = _axios.default.create({
   baseURL: process.env.BASE_API,
   timeout: 15000,
@@ -37,6 +48,7 @@ var instance = _axios.default.create({
     if (data && (data.type === 'application/octet-stream' || data.type === 'application/json')) {
       return data;
     }
+
     return JSON.parse(data);
   }],
   headers: {
@@ -45,31 +57,32 @@ var instance = _axios.default.create({
     TenantId: _reactCookies.default === null || _reactCookies.default === void 0 ? void 0 : _reactCookies.default.load('saas_gpid'),
     SystemId: (_cookie$load = _reactCookies.default === null || _reactCookies.default === void 0 ? void 0 : _reactCookies.default.load('saas_sysid')) !== null && _cookie$load !== void 0 ? _cookie$load : ''
   }
-});
+}); // 实例添加请求拦截器
+
 
-// 实例添加请求拦截器
 instance.interceptors.request.use(function (config) {
   // 在发送请求之前做处理...
   config.headers = Object.assign(config.method === 'get' ? (config.data = true, {
     Accept: 'application/json',
     'Content-Type': 'application/json; charset=UTF-8'
   }) : config.data ? '' : config.data = true, {
-    'Content-Type': 'application/json; charset=UTF-8'
-    // 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
-  }, config.headers);
-  // config.headers.token = sessionStorage.getItem(`${projectPrefix}_token_`);
+    'Content-Type': 'application/json; charset=UTF-8' // 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
+
+  }, config.headers); // config.headers.token = sessionStorage.getItem(`${projectPrefix}_token_`);
+
   if (!config.headers.Authorization) {
     delete config.headers.Authorization;
   }
+
   if (!config.headers.TenantId) {
     delete config.headers.TenantId;
   }
+
   if (['post', 'put'].includes(config.method)) {
-    var contentType = config.headers['Content-Type'];
-    // 根据Content-Type转换data格式
+    var contentType = config.headers['Content-Type']; // 根据Content-Type转换data格式
+
     if (contentType) {
-      if (contentType.includes('multipart')) {
-        // 类型 'multipart/form-data;'
+      if (contentType.includes('multipart')) {// 类型 'multipart/form-data;'
         // config.data = data;
       } else if (contentType.includes('json')) {
         // 类型 'application/json;'
@@ -82,30 +95,33 @@ instance.interceptors.request.use(function (config) {
       }
     }
   }
+
   return Promise.resolve(config);
 }, function (error) {
-  return (
-    // 对请求错误做处理...
+  return (// 对请求错误做处理...
     Promise.reject(error)
   );
-});
+}); // 实例添加响应拦截器
 
-// 实例添加响应拦截器
 instance.interceptors.response.use(function (response) {
   // 对响应数据做处理，以下根据实际数据结构改动！！...
   var _ref = response.data || {},
-    code = _ref.code;
+      code = _ref.code;
+
   if (code === 109 || code === 108) {
     // 请求超时，跳转登录页
     if (!inError) {
       _message2.default.warning('登录超时，即将跳转到登录页面...');
+
       inError = true;
       setTimeout(function () {
         _message2.default.destroy();
+
         window.location.href = '/login';
         inError = false;
       }, 2000);
     }
+
     return Promise.resolve({});
   } else if (response) {
     return Promise.resolve((0, _utils.checkStatus)(response));
@@ -123,6 +139,7 @@ instance.interceptors.response.use(function (response) {
     return Promise.reject({});
   }
 });
+
 var request = /*#__PURE__*/function () {
   var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(opt) {
     var options, res;
@@ -135,28 +152,38 @@ var request = /*#__PURE__*/function () {
               ifHandleError: true
             }, opt); // 匹配接口前缀 开发环境则通过proxy配置转发请求； 生产环境根据实际配置
             // options.baseURL = autoMatch(options.prefix);
+
             _context.prev = 1;
             _context.next = 4;
             return instance(options);
+
           case 4:
             res = _context.sent;
+
             if (!(res.code !== 200 && options.ifHandleError)) {
               _context.next = 8;
               break;
             }
+
             // 自定义参数，是否允许全局提示错误信息
             _message2.default.error(res.message || '请求处理失败！');
+
             return _context.abrupt("return", Promise.reject(options));
+
           case 8:
             return _context.abrupt("return", res);
+
           case 11:
             _context.prev = 11;
             _context.t0 = _context["catch"](1);
+
             if (options.ifHandleError) {
               // 自定义参数，是否允许全局提示错误信息
               _message2.default.error(_context.t0.message || _context.t0.msg || '请求处理失败！');
             }
+
             return _context.abrupt("return", Promise.reject(options));
+
           case 15:
           case "end":
             return _context.stop();
@@ -164,9 +191,11 @@ var request = /*#__PURE__*/function () {
       }
     }, _callee, null, [[1, 11]]);
   }));
+
   return function request(_x) {
     return _ref2.apply(this, arguments);
   };
 }();
+
 var _default = request;
 exports.default = _default;

package/lib/services/utils.js

@@ -4,51 +4,66 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.checkStatus = checkStatus;
+
 // eslint-disable-next-line import/prefer-default-export
 function checkStatus(response) {
   var status = response.status || -1000; // -1000 自己定义，连接错误的status
+
   if (status >= 200 && status < 300 || status === 304) {
     // 如果http状态码正常，则直接返回数据
     return response.data;
   } else {
     var errorInfo = '';
+
     switch (status) {
       case -1:
         errorInfo = '远程服务响应失败,请稍后重试';
         break;
+
       case 400:
         errorInfo = '400：错误请求';
         break;
+
       case 401:
         errorInfo = '401：访问令牌无效或已过期';
         break;
+
       case 403:
         errorInfo = '403：拒绝访问';
         break;
+
       case 404:
         errorInfo = '404：资源不存在';
         break;
+
       case 405:
         errorInfo = '405：请求方法未允许';
         break;
+
       case 408:
         errorInfo = '408：请求超时';
         break;
+
       case 500:
         errorInfo = '500：访问服务失败';
         break;
+
       case 501:
         errorInfo = '501：未实现';
         break;
+
       case 502:
         errorInfo = '502：无效网关';
         break;
+
       case 503:
         errorInfo = '503：服务不可用';
         break;
+
       default:
         errorInfo = "\u8FDE\u63A5\u9519\u8BEF";
     }
+
     return {
       status: status,
       msg: errorInfo

package/lib/styles/variables.css

@@ -1403,9 +1403,10 @@ p {
 .card_PTRO .card_PTRO_container:hover {
   background-color: var(--color-6);
 }
-.hasChecked .lm_card_table_container .lm_card_table_body_cell .card_checkbox,
+.hasChecked .lm_card_table_body_cell .card_checkbox,
 .hasChecked .card_PTC .card_PTC_container .card_checkbox,
-.hasChecked .card_PTR .card_PTR_container .card_PTR_body .card_checkbox {
+.hasChecked .card_PTR .card_PTR_container .card_checkbox,
+.hasChecked .card_PTRO .card_PTRO_container .card_checkbox {
   opacity: 1;
 }
 .lm_cascader.ant-select.ant-select {
@@ -2305,7 +2306,7 @@ p {
   border: 1px solid var(--primary-color);
 }
 .lm_dropdown_button .ant-btn {
-  height: 30px;
+  height: 30px !important;
   border-top: 0px;
   border-bottom: 0px;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkmore-design",
-  "version": "1.1.27-beta.4",
+  "version": "1.1.27-beta.6",
   "author": {
     "name": "nowthen",
     "email": "rnlvwyx@gmail.com"
@@ -59,18 +59,14 @@
     ]
   },
   "dependencies": {
-    "@ant-design/charts": "^1.4.2",
     "@ant-design/compatible": "1.0.8",
     "@ant-design/icons": "^4.3.0",
-    "@ant-design/plots": "^1.2.2",
     "@ant-design/pro-table": "2.77.0",
     "@babel/runtime": "^7.17.9",
     "@dnd-kit/core": "^5.0.3",
     "@dnd-kit/modifiers": "^5.0.0",
     "@dnd-kit/sortable": "^6.0.1",
     "@react-hook/resize-observer": "^1.2.6",
-    "@typescript-eslint/eslint-plugin": "^5.28.0",
-    "@typescript-eslint/parser": "^5.28.0",
     "ahooks": "^3.6.2",
     "ali-oss": "^6.17.1",
     "antd": "4.22.8",
@@ -111,6 +107,8 @@
     "node": ">=10.0.0"
   },
   "devDependencies": {
+    "@typescript-eslint/eslint-plugin": "^5.28.0",
+    "@typescript-eslint/parser": "^5.28.0",
     "@babel/plugin-transform-runtime": "^7.12.1",
     "@babel/preset-typescript": "^7.17.12",
     "@commitlint/cli": "^11.0.0",