@zgfe/business-lib 1.0.9 → 1.0.12

package/es/targetSelector/styles/index.less

@@ -29,6 +29,7 @@
     display: none;
     flex: none;
     width: @icon-width;
+    color: @text-color-secondary;
     line-height: 2em;
     text-align: center;
     border-radius: @border-radius-small;
@@ -67,7 +68,8 @@
     top: 45px;
     left: 0;
     z-index: 1000;
-    width: 390px;
+    width: 100%;
+    min-width: 280px;
     .__select-panel();
   }
 

package/es/utils/ajax.d.ts

@@ -1,7 +1,33 @@
-import { AxiosRequestConfig } from 'axios';
-declare const ajax: (option?: AxiosRequestConfig & {
-    responseOnce?: Boolean;
-    unique?: Boolean;
-    delay?: number;
-}) => Promise<unknown>;
-export default ajax;
+import { RequestOptionsInit } from 'umi-request';
+declare enum ResponseStatus {
+    success = 200,
+    exists = 201,
+    fail = 500,
+    sysNotInit = 501,
+    sysInited = 502,
+    notLoggin = 503,
+    paramError = 504,
+    success2 = "106000",
+    fail2 = "106001",
+    paramError2 = "106002",
+    paramError3 = "106003"
+}
+export interface InterfaceApiResult<T> {
+    code: ResponseStatus;
+    data?: T;
+    msg?: string;
+}
+export declare class ApiResult<T> implements InterfaceApiResult<T> {
+    code: ResponseStatus;
+    data?: T;
+    msg?: string;
+    constructor(code: ResponseStatus, data: any, message?: string);
+}
+declare function request<T>(url: string, options?: RequestOptionsInit & {
+    optionsWrapper?: (url: string, options?: RequestOptionsInit) => {
+        url: string;
+        options?: RequestOptionsInit;
+    };
+    responseWrapper?: (url: string, apiResult: ApiResult<T>) => ApiResult<T>;
+}): Promise<InterfaceApiResult<T> | null>;
+export default request;

package/es/utils/ajax.js

@@ -1,124 +1,225 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+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); }); }; }
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-import axios from 'axios';
-var history = {
-  option: [{
-    resolve: null,
-    reject: null
-  }]
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+import { extend } from 'umi-request';
+import { notification } from 'antd';
+import { globalConfig } from '../config';
+var ResponseStatus;
+
+(function (ResponseStatus) {
+  ResponseStatus[ResponseStatus["success"] = 200] = "success";
+  ResponseStatus[ResponseStatus["exists"] = 201] = "exists";
+  ResponseStatus[ResponseStatus["fail"] = 500] = "fail";
+  ResponseStatus[ResponseStatus["sysNotInit"] = 501] = "sysNotInit";
+  ResponseStatus[ResponseStatus["sysInited"] = 502] = "sysInited";
+  ResponseStatus[ResponseStatus["notLoggin"] = 503] = "notLoggin";
+  ResponseStatus[ResponseStatus["paramError"] = 504] = "paramError";
+  ResponseStatus["success2"] = "106000";
+  ResponseStatus["fail2"] = "106001";
+  ResponseStatus["paramError2"] = "106002";
+  ResponseStatus["paramError3"] = "106003";
+})(ResponseStatus || (ResponseStatus = {}));
+
+export var ApiResult = /*#__PURE__*/_createClass(function ApiResult(code, data, message) {
+  _classCallCheck(this, ApiResult);
+
+  this.code = void 0;
+  this.data = void 0;
+  this.msg = void 0;
+  this.code = code;
+  this.data = data;
+  this.msg = message;
+});
+var codeMessage = {
+  200: '服务器成功返回请求的数据。',
+  201: '新建或修改数据成功。',
+  202: '一个请求已经进入后台排队（异步任务）。',
+  204: '删除数据成功。',
+  400: '发出的请求有错误，服务器没有进行新建或修改数据的操作。',
+  401: '用户没有权限（令牌、用户名、密码错误）。',
+  403: '用户得到授权，但是访问是被禁止的。',
+  404: '发出的请求针对的是不存在的记录，服务器没有进行操作。',
+  406: '请求的格式不可得。',
+  410: '请求的资源被永久删除，且不会再得到的。',
+  422: '当创建一个对象时，发生一个验证错误。',
+  500: '服务器发生错误，请检查服务器。',
+  502: '网关错误。',
+  503: '服务不可用，服务器暂时过载或维护。',
+  504: '网关超时。'
 };
-var timer = {
-  url: {
-    id: 0,
-    cancel: null,
-    reject: function reject() {}
+
+var errorHandler = function errorHandler(error) {
+  var response = error.response;
+
+  if (response && response.status) {
+    var errorText = codeMessage[response.status] || response.statusText;
+    var status = response.status,
+        url = response.url;
+    notification.error({
+      message: "\u8BF7\u6C42\u9519\u8BEF ".concat(status, ": ").concat(url),
+      description: errorText
+    });
+  } else if (!response) {
+    notification.error({
+      description: '您的网络发生异常，无法连接服务器',
+      message: '网络异常'
+    });
   }
-};
-var CancelToken = axios.CancelToken;
-
-var _request = function _request(ajax) {
-  return function () {
-    var option = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
-      url: '',
-      responseOnce: false,
-      unique: false,
-      delay: 0
-    };
-    return new Promise(function (resolve, reject) {
-      var key = JSON.stringify(option);
-      var timerKey = option.url + '_' + (Object.prototype.toString.call(option.unique) === '[object String]' ? option.unique : '');
-
-      if (option.unique && timer[timerKey]) {
-        clearTimeout(timer[timerKey].id);
-
-        if (timer[timerKey].cancel) {
-          timer[timerKey].cancel();
-        } else {
-          var cancel = new Error('cancel: before request');
-          cancel.__CANCEL__ = true;
-          timer[timerKey].reject(cancel);
-        }
 
-        delete timer[timerKey];
-        if (history[key]) delete history[key];
-      }
+  return response;
+};
 
-      if (!history[key]) {
-        history[key] = [{
-          resolve: resolve,
-          reject: reject
-        }];
+function responseErrorHandler(url, apiResult) {
+  if (/\.jsp/.test(url)) {
+    return apiResult;
+  }
 
-        var request = function request() {
-          ajax(option).then(function (res) {
-            history[key].forEach(function (item) {
-              item.resolve(res);
-            });
-          }).catch(function (err) {
-            history[key].forEach(function (item) {
-              item.reject(err);
-            });
-          }).finally(function () {
-            delete timer[timerKey];
-            delete history[key];
-          });
-        };
-
-        if (option.unique) {
-          timer[timerKey] = {
-            id: 0,
-            option: option,
-            cancel: null,
-            reject: reject
-          };
-          timer[timerKey].id = setTimeout(function () {
-            option.cancelToken = new CancelToken(function (c) {
-              if (timer[timerKey]) {
-                timer[timerKey].cancel = c;
-              }
-            });
-            request();
-          }, option.delay || 0);
-        } else {
-          request();
-        }
-      } else if (option.responseOnce) {
-        var _cancel = new Error('cancel: before request');
-
-        _cancel.__CANCEL__ = true;
-        reject(_cancel);
-      } else {
-        history[key].push({
-          resolve: resolve,
-          reject: reject
-        });
-      }
+  if (!apiResult.code) {
+    notification.error({
+      message: "\u63A5\u53E3\u54CD\u5E94\u7ED3\u6784\u5F02\u5E38"
     });
-  };
-};
+    throw new Error('接口响应结构异常，缺少code');
+  }
+
+  var flag = false;
+  var message = '接口请求失败';
+
+  switch (apiResult.code) {
+    case ResponseStatus.sysNotInit:
+      message = '系统未初始化';
+      break;
+
+    case ResponseStatus.sysInited:
+      message = '系统已初始化';
+      break;
+
+    case ResponseStatus.notLoggin:
+      message = '账户未登录或登录已失效';
+      break;
+
+    case ResponseStatus.paramError:
+      message = '请求参数错误';
+      break;
 
-var _ajax = function _ajax(option) {
-  var optionData = _objectSpread({
-    method: 'post',
-    url: '',
-    data: null,
-    withCredentials: true
-  }, option);
-
-  return new Promise(function (resolve, reject) {
-    axios(optionData).then(function (res) {
-      resolve(res.data);
-    }).catch(function (error) {
-      if (axios.isCancel(error)) return;
-      reject(error);
+    case ResponseStatus.paramError2:
+      message = '请求参数缺失';
+      break;
+
+    case ResponseStatus.paramError3:
+      message = '请求参数校验异常';
+      break;
+
+    case ResponseStatus.exists:
+      message = '数据已存在';
+      break;
+
+    case ResponseStatus.success:
+      flag = true;
+      break;
+
+    case ResponseStatus.success2:
+      flag = true;
+      break;
+
+    case ResponseStatus.fail:
+      message = apiResult.msg || '接口发生未知错误';
+      break;
+
+    case ResponseStatus.fail2:
+      message = apiResult.msg || '接口发生未知错误';
+      break;
+
+    default:
+      throw new Error("\u65E0\u6CD5\u8BC6\u522B\u7684\u8BF7\u6C42\u54CD\u5E94\u7801: ".concat(apiResult.code));
+  }
+
+  if (!flag) {
+    message = apiResult.msg || message;
+    notification.error({
+      message: "\u8BF7\u6C42\u9519\u8BEF",
+      description: message
     });
-  });
-};
+    throw new Error(message);
+  }
+
+  return apiResult;
+}
+
+var req = extend({
+  errorHandler: errorHandler,
+  credentials: 'include'
+});
 
-var ajax = _request(_ajax);
+function request(_x, _x2) {
+  return _request.apply(this, arguments);
+}
+
+function _request() {
+  _request = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(url, options) {
+    var _globalConfig$request, _globalConfig$request2, err, option, list, optionsWrapper, responseWrapper, params, res;
+
+    return regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.prev = 0;
+
+            if (!/{{\S*}}/.test(url)) {
+              _context.next = 8;
+              break;
+            }
+
+            if (!(!options || !options.params)) {
+              _context.next = 5;
+              break;
+            }
+
+            err = new Error("\u5E26\u53C2URL(".concat(url, ")\u8BF7\u6C42\u4E2D\uFF0C\u7F3A\u5C11params\u53C2\u6570"));
+            throw err;
+
+          case 5:
+            option = options;
+            list = url.match(/{{\S*?}}/g) || [];
+            list.forEach(function (param) {
+              var key = param.replace(/[{|}]/g, '');
+              url = url.replace(param, option.params[key]);
+              delete option.params[key];
+            });
+
+          case 8:
+            optionsWrapper = (options === null || options === void 0 ? void 0 : options.optionsWrapper) || ((_globalConfig$request = globalConfig.request) === null || _globalConfig$request === void 0 ? void 0 : _globalConfig$request.optionsWrapper);
+            responseWrapper = (options === null || options === void 0 ? void 0 : options.responseWrapper) || ((_globalConfig$request2 = globalConfig.request) === null || _globalConfig$request2 === void 0 ? void 0 : _globalConfig$request2.responseWrapper);
+            params = optionsWrapper ? optionsWrapper(url, options) : {
+              url: url,
+              options: options
+            };
+            _context.next = 13;
+            return req(params.url, params.options);
+
+          case 13:
+            res = _context.sent;
+            return _context.abrupt("return", responseWrapper ? responseWrapper(url, responseErrorHandler(url, res)) : responseErrorHandler(url, res));
+
+          case 17:
+            _context.prev = 17;
+            _context.t0 = _context["catch"](0);
+            return _context.abrupt("return", null);
+
+          case 20:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee, null, [[0, 17]]);
+  }));
+  return _request.apply(this, arguments);
+}
 
-export default ajax;
+export default request;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.0.9",
+  "version": "1.0.12",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -36,7 +36,8 @@
     "echarts": "^5.3.2",
     "echarts-for-react": "^3.0.2",
     "lerna": "^4.0.0",
-    "react-infinite-scroll-component": "^6.1.0"
+    "react-infinite-scroll-component": "^6.1.0",
+    "umi-request": "^1.4.0"
   },
   "peerDependencies": {
     "@types/lodash": "^4.14.182",
@@ -58,5 +59,5 @@
     "prettier": "^2.2.1",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "745412d17d39bb923c36a927fe6735afbd77b384"
+  "gitHead": "05a2117de228e421103ba3de3bff19af21132b83"
 }

package/es/dialog/components/itemNode.d.ts

@@ -1,10 +0,0 @@
-import { FormItemProps } from 'antd';
-import React from 'react';
-import { DialogTypes } from '../types';
-declare const ItemNode: React.FC<{
-    value?: any;
-    field: DialogTypes.FieldProps & FormItemProps;
-    fieldNames?: DialogTypes.FieldOption;
-    onChange?: (value: any) => void;
-}>;
-export default ItemNode;

package/es/dialog/components/itemNode.js

@@ -1,109 +0,0 @@
-import { Input, Radio, Space } from 'antd';
-import React from 'react';
-import { classPrefix } from '..';
-import IconFont from '../../icon/iconFont';
-import BizSelect from '../../select';
-import BizList from './list';
-import BizSelectToInput from './selectToInput';
-import BizTab from './tab';
-
-var ItemNode = function ItemNode(props) {
-  var _props$field = props.field,
-      type = _props$field.type,
-      label = _props$field.label,
-      options = _props$field.options,
-      placeholder = _props$field.placeholder,
-      extendName = _props$field.extendName,
-      direction = _props$field.direction,
-      multiple = _props$field.multiple,
-      enableSearch = _props$field.enableSearch,
-      selectType = _props$field.selectType,
-      overlayWidth = _props$field.overlayWidth,
-      extra = _props$field.extra,
-      fieldNames = props.fieldNames;
-
-  var onChange = function onChange(data) {
-    if (props.onChange) props.onChange(data);
-    if (props.field.onChange) props.field.onChange(data);
-  };
-
-  if (type === 'input') {
-    return /*#__PURE__*/React.createElement(Input, {
-      defaultValue: props.value,
-      className: "".concat(classPrefix, "-input"),
-      placeholder: placeholder || "\u8BF7\u8F93\u5165".concat(label),
-      autoComplete: "off",
-      allowClear: {
-        clearIcon: /*#__PURE__*/React.createElement(IconFont, {
-          className: "biz-icon",
-          type: 'qingchu'
-        })
-      },
-      onChange: onChange
-    });
-  } else if (type === 'password') {
-    return /*#__PURE__*/React.createElement(Input.Password, {
-      className: "".concat(classPrefix, "-input"),
-      defaultValue: props.value,
-      placeholder: placeholder || "\u8BF7\u8F93\u5165".concat(label),
-      onChange: onChange
-    });
-  } else if (type === 'select') {
-    return /*#__PURE__*/React.createElement(BizSelect, {
-      className: "".concat(classPrefix, "-select"),
-      options: options || [],
-      defaultValue: props.value,
-      keyField: fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value,
-      labelField: fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.label,
-      multiple: multiple,
-      enableSearch: enableSearch,
-      type: selectType,
-      overlayWidth: overlayWidth,
-      extra: extra,
-      onChange: onChange
-    });
-  } else if (type === 'selectToInput') {
-    return /*#__PURE__*/React.createElement(BizSelectToInput, {
-      value: props.value,
-      options: options || [],
-      keyField: fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value,
-      labelField: fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.label,
-      onChange: onChange,
-      extendName: extendName
-    });
-  } else if (type === 'tab') {
-    return /*#__PURE__*/React.createElement(BizTab, {
-      value: props.value,
-      options: options,
-      onChange: onChange
-    });
-  } else if (type === 'radio') {
-    return /*#__PURE__*/React.createElement(Radio.Group, {
-      onChange: onChange,
-      defaultValue: props.value
-    }, /*#__PURE__*/React.createElement(Space, {
-      direction: direction || 'horizontal'
-    }, options && options.map(function (item) {
-      return /*#__PURE__*/React.createElement(Radio, {
-        key: item[fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value],
-        value: item[fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value]
-      }, item[fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.label]);
-    })));
-  } else if (type === 'list') {
-    return /*#__PURE__*/React.createElement(BizList, {
-      value: props.value,
-      options: options && options.length > 0 ? options : undefined,
-      onChange: onChange
-    });
-  }
-
-  return /*#__PURE__*/React.createElement("div", null, "\u6682\u65E0\u76F8\u5173\u7EC4\u4EF6");
-};
-
-ItemNode.defaultProps = {
-  fieldNames: {
-    label: 'label',
-    value: 'value'
-  }
-};
-export default ItemNode;

package/es/dialog/components/list.d.ts

@@ -1,5 +0,0 @@
-import React from 'react';
-import { ListProps } from '../types';
-import './styles/list.less';
-declare const BizList: React.FC<ListProps>;
-export default BizList;

package/es/dialog/components/selectToInput.d.ts

@@ -1,6 +0,0 @@
-import React from 'react';
-import { BizSelectTypes } from '../../select/types';
-import './styles/handle.less';
-import { SelectInputProps } from '../types';
-declare const BizSelectToInput: React.FC<BizSelectTypes.Props & SelectInputProps>;
-export default BizSelectToInput;