@zgfe/business-lib 1.0.10 → 1.0.13-alpha.0

package/es/dialog/index.js

@@ -32,7 +32,8 @@ BizDialog.defaultProps = {
     size: 'large'
   },
   cancelButtonProps: {
-    size: 'large'
+    size: 'large',
+    type: 'text'
   }
 };
 export default BizDialog;

package/es/eventSelector/listPanel.js

@@ -134,6 +134,14 @@ var EventListPanel = function EventListPanel(props) {
     setCurrentGroup(currentValue === null || currentValue === void 0 ? void 0 : currentValue.group);
   }
 
+  if (!groupList || !groupList.length || !groupList[0].eventList || !groupList[0].eventList.length) {
+    return /*#__PURE__*/React.createElement("div", {
+      className: "".concat(classPrefix, "-nodata-panel")
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "".concat(classPrefix, "-nodata")
+    }, "\u6682\u65E0\u6570\u636E"));
+  }
+
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-list-panel")
   }, /*#__PURE__*/React.createElement("div", {

package/es/eventSelector/styles/index.less

@@ -10,13 +10,14 @@
     flex-direction: row;
     width: 477px;
     max-height: 400px;
+    padding: 0;
     .__select-panel();
   }
 
   &-left {
     flex: none;
     width: 192px;
-    padding: 8px;
+    padding: @padding-xs;
     overflow-y: auto;
     border-right: 1px solid @border-color-base;
   }
@@ -25,21 +26,26 @@
     display: flex;
     flex: 1;
     flex-direction: column;
-    padding: 8px;
+    padding: @padding-xs;
   }
 
   &-search {
     flex: none;
     margin-bottom: @margin-sm;
-    &.ant-input-affix-wrapper {
-      border-radius: @border-radius-normal;
-    }
   }
 
   &-list {
     flex: 1;
     overflow-y: auto;
   }
+  &-nodata-panel {
+    width: 284px;
+    .__select-panel();
+  }
+
+  &-nodata {
+    .__select-nodata();
+  }
 
   &-option {
     .__select-option();

package/es/index.d.ts

@@ -21,7 +21,8 @@ import BizUserCondition from './userCondition';
 import BizSearchInput from './searchInput';
 import BizAddToScene from './addToScene';
 import BizAddToPanel from './addToPanel';
-export { BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizUserGroup, IconFont, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetCondition, BizDatePicker, BizConditionItem, BizConditionGroup, BizUserCondition, BizAddToScene, BizAddToPanel, ajax, util, theme, convertAttributeData, };
+import setGlobalConfig from './config';
+export { BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizUserGroup, IconFont, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetCondition, BizDatePicker, BizConditionItem, BizConditionGroup, BizUserCondition, BizAddToScene, BizAddToPanel, ajax, util, theme, convertAttributeData, setGlobalConfig, };
 export type { UserGroupTypes } from './userGroup/types';
 export type { BizSelectTypes } from './select/types';
 export type { AttributeSelect } from './attributeSelector/types';

package/es/index.js

@@ -20,4 +20,5 @@ import BizUserCondition from './userCondition';
 import BizSearchInput from './searchInput';
 import BizAddToScene from './addToScene';
 import BizAddToPanel from './addToPanel';
-export { BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizUserGroup, IconFont, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetCondition, BizDatePicker, BizConditionItem, BizConditionGroup, BizUserCondition, BizAddToScene, BizAddToPanel, ajax, util, theme, convertAttributeData };
+import setGlobalConfig from './config';
+export { BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizUserGroup, IconFont, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetCondition, BizDatePicker, BizConditionItem, BizConditionGroup, BizUserCondition, BizAddToScene, BizAddToPanel, ajax, util, theme, convertAttributeData, setGlobalConfig };

package/es/select/styles/handle.less

@@ -83,6 +83,7 @@
     top: 50%;
     right: 8px;
     flex: none;
+    color: @text-color-secondary;
     font-size: @font-size-lg;
     transform: translateY(-50%);
   }

package/es/select/styles/index.less

@@ -21,9 +21,6 @@
   &-search {
     flex: none;
     margin-bottom: @margin-xs;
-    &.ant-input-affix-wrapper {
-      border-radius: @border-radius-normal;
-    }
   }
 
   &-nodata {

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,21 +1,3 @@
-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;
-}
-declare function request<T>(url: string, options?: RequestOptionsInit): Promise<InterfaceApiResult<T> | null>;
+import { ajaxConfig, InterfaceApiResult } from './type';
+declare function request<T>(url: string, options?: ajaxConfig<T>): Promise<InterfaceApiResult<T> | null>;
 export default request;

package/es/utils/ajax.js

@@ -2,41 +2,10 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 
 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 _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); } }
-
-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';
-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[ResponseStatus["success2"] = 106000] = "success2";
-  ResponseStatus[ResponseStatus["fail2"] = 106001] = "fail2";
-  ResponseStatus[ResponseStatus["paramError2"] = 106002] = "paramError2";
-  ResponseStatus[ResponseStatus["paramError3"] = 106003] = "paramError3";
-})(ResponseStatus || (ResponseStatus = {}));
-
-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;
-});
-
+import { globalConfig } from '../config';
+import { ResponseStatus } from './type';
 var codeMessage = {
   200: '服务器成功返回请求的数据。',
   201: '新建或修改数据成功。',
@@ -85,59 +54,16 @@ function responseErrorHandler(url, apiResult) {
     notification.error({
       message: "\u63A5\u53E3\u54CD\u5E94\u7ED3\u6784\u5F02\u5E38"
     });
-    throw new Error('接口响应结构异常，缺少status');
+    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;
-
-    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 (new RegExp("".concat(ResponseStatus.success, "$")).test(apiResult.code)) {
+    flag = true;
+  } else if (new RegExp("".concat(ResponseStatus.notLogin)).test(apiResult.code)) {
+    message = '账户未登录或登录已失效';
   }
 
   if (!flag) {
@@ -163,7 +89,8 @@ function request(_x, _x2) {
 
 function _request() {
   _request = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(url, options) {
-    var err, option, list, res;
+    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) {
@@ -193,24 +120,30 @@ function _request() {
             });
 
           case 8:
-            _context.next = 10;
-            return req(url, options);
-
-          case 10:
+            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", responseErrorHandler(url, res));
+            return _context.abrupt("return", responseWrapper ? responseWrapper(url, responseErrorHandler(url, res)) : responseErrorHandler(url, res));
 
-          case 14:
-            _context.prev = 14;
+          case 17:
+            _context.prev = 17;
             _context.t0 = _context["catch"](0);
             return _context.abrupt("return", null);
 
-          case 17:
+          case 20:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[0, 14]]);
+    }, _callee, null, [[0, 17]]);
   }));
   return _request.apply(this, arguments);
 }

package/es/utils/type.d.ts

@@ -1,3 +1,4 @@
+import { RequestOptionsInit } from 'umi-request';
 import { PropType } from '../attributeSelector/types';
 export interface Event {
     value?: string | number;
@@ -50,3 +51,33 @@ export declare namespace OldSystem {
     interface EnvProp extends UserProp {
     }
 }
+export declare enum ResponseStatus {
+    success = "00",
+    fail = "01",
+    paramNotFound = "02",
+    paramError = "03",
+    saveFileFail = "04",
+    readFileFail = "05",
+    notValid = "06",
+    notLogin = "07",
+    delFileFail = "08",
+    systemError = "09"
+}
+export interface InterfaceApiResult<T> {
+    code: string;
+    data?: T;
+    msg?: string;
+}
+export declare class ApiResult<T> implements InterfaceApiResult<T> {
+    code: string;
+    data?: T;
+    msg?: string;
+    constructor(code: ResponseStatus, data: any, message?: string);
+}
+export declare type ajaxConfig<T> = RequestOptionsInit & {
+    optionsWrapper?: (url: string, options?: RequestOptionsInit) => {
+        url: string;
+        options?: RequestOptionsInit;
+    };
+    responseWrapper?: (url: string, apiResult: ApiResult<T>) => ApiResult<T>;
+};

package/es/utils/type.js

@@ -1 +1,31 @@
-export {};
+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); } }
+
+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"); } }
+
+export var ResponseStatus;
+
+(function (ResponseStatus) {
+  ResponseStatus["success"] = "00";
+  ResponseStatus["fail"] = "01";
+  ResponseStatus["paramNotFound"] = "02";
+  ResponseStatus["paramError"] = "03";
+  ResponseStatus["saveFileFail"] = "04";
+  ResponseStatus["readFileFail"] = "05";
+  ResponseStatus["notValid"] = "06";
+  ResponseStatus["notLogin"] = "07";
+  ResponseStatus["delFileFail"] = "08";
+  ResponseStatus["systemError"] = "09";
+})(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;
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.0.10",
+  "version": "1.0.13-alpha.0",
   "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",
@@ -56,8 +57,7 @@
     "gh-pages": "^3.0.0",
     "lint-staged": "^10.0.7",
     "prettier": "^2.2.1",
-    "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "31f61ad6ee6757193c95445304205616b143193b"
+  "gitHead": "f622cd527db39c1afb4bd457edc8457d337478fe"
 }