@zgfe/business-lib 1.0.12 → 1.0.13-alpha.2

package/es/attrConditions/index.js

@@ -62,18 +62,22 @@ var BizConditionItem = function BizConditionItem(props) {
             id: data.attrId,
             propCategory: data.propCategory,
             type: data.type,
-            key: data.attrId
+            key: data.attrId,
+            dimensionSub: data.dimensionSub || 'event_attr'
           };
         }
       } else if (data.propCategory === PropCategory.UserProp || data.propCategory === PropCategory.EnvProp) {
         if (data.attrName) {
+          var aId = data.attrId || 0;
           attrData = {
+            id: aId,
             name: data.attrName,
             propCategory: data.propCategory,
             type: data.type,
             category: data.category,
-            key: "".concat(data.propCategory, "-").concat(data.attrName),
-            subtype: data.subtype
+            key: "".concat(data.propCategory, "-").concat(data.dimensionSub || data.attrName, "-").concat(aId),
+            subtype: data.subtype,
+            dimensionSub: data.dimensionSub || data.attrName
           };
         }
       }
@@ -92,14 +96,16 @@ var BizConditionItem = function BizConditionItem(props) {
     if (props.onChange) {
       if (!attr) return;
       var responseData = {
+        attrId: attr.id,
         propCategory: attr.propCategory,
         type: attr.type,
         operator: operate,
-        values: values || []
+        values: values || [],
+        dimensionSub: attr.dimensionSub
       };
 
       if (attr.propCategory === PropCategory.EventProp) {
-        responseData.attrId = attr.id;
+        responseData.attrName = attr.label;
       } else {
         responseData.attrName = attr.name;
         responseData.category = attr.category;

package/es/attrConditions/styles/index.less

@@ -23,7 +23,7 @@
   }
 
   .ant-input {
-    background-color: @background-color-gray;
+    background-color: @background-color-gray !important;
   }
 
   .biz-attr-select-del-icon {
@@ -61,7 +61,7 @@
 
   &-input {
     .ant-input-group-addon {
-      background-color: @background-color-gray;
+      background-color: @background-color-gray !important;
       border: none;
     }
 

package/es/attrConditions/types.d.ts

@@ -15,6 +15,7 @@ export declare namespace AttrConditionTypes {
         type?: PropType;
         propCategory?: 'userProp' | 'eventProp' | 'envProp';
         category?: 'fixed' | 'custom';
+        dimensionSub?: string;
         operator?: string;
         values?: string[];
     }

package/es/attributeSelector/index.js

@@ -144,6 +144,8 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
 
 BizAttributeSelector.defaultProps = {
   enableDelete: false,
-  placeholder: '请选择'
+  placeholder: '请选择',
+  propSymbol: '*',
+  optionsHeaderTip: '带＊的属性每日凌晨更新'
 };
 export default BizAttributeSelector;

package/es/attributeSelector/listPanel.js

@@ -166,7 +166,7 @@ var AttrListPanel = function AttrListPanel(props) {
       return setSearchValue(val);
     },
     placeholder: "\u641C\u7D22\u5C5E\u6027"
-  }), showList.length ? /*#__PURE__*/React.createElement(Anchor, {
+  }), showList.length ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Anchor, {
     className: "".concat(classPrefix, "-anchor-panel"),
     affix: false,
     onClick: function onClick(e) {
@@ -191,7 +191,7 @@ var AttrListPanel = function AttrListPanel(props) {
     title: /*#__PURE__*/React.createElement(Button, {
       size: "small"
     }, "\u89E6\u53D1\u73AF\u5883")
-  })) : null, /*#__PURE__*/React.createElement("div", {
+  }))) : null, /*#__PURE__*/React.createElement("div", {
     id: anchor.container,
     className: "".concat(classPrefix, "-container")
   }, showList.length ? showList : /*#__PURE__*/React.createElement("div", {

package/es/attributeSelector/option.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { ReactNode } from 'react';
 import { AttributeSelect } from './types';
 declare const Option: React.FC<{
     option?: AttributeSelect.Value;
@@ -9,6 +9,7 @@ declare const Option: React.FC<{
         text: string;
         color?: string;
     };
+    propSymbol?: ReactNode;
     checked?: boolean;
     onClick?: (option: AttributeSelect.Value) => void;
 }>;

package/es/attributeSelector/styles/index.less

@@ -28,7 +28,7 @@
     }
   }
   &-anchor-panel {
-    padding: 12px 0 20px 0;
+    padding: 12px 0;
     .ant-anchor {
       display: flex;
       flex-direction: row;

package/es/attributeSelector/types.d.ts

@@ -1,3 +1,4 @@
+import { ReactNode } from 'react';
 export declare enum PropType {
     STRING = 1,
     NUMBER = 2,
@@ -23,10 +24,12 @@ export interface EventGroup {
     eventList: AnalysisEvent[];
 }
 export interface BasicProp {
+    id: number;
     label?: string;
     alias?: string;
     type?: PropType;
     realTime?: boolean;
+    dimensionSub?: string;
 }
 export interface UserProp extends BasicProp {
     name: string;
@@ -43,7 +46,6 @@ export interface EnvProp extends BasicProp {
 }
 export interface EventProp extends BasicProp {
     eventId?: number;
-    id: number;
     propCategory: 'eventProp';
     key?: number;
     isHidden?: boolean;
@@ -66,6 +68,8 @@ export declare namespace AttributeSelect {
         enableUserProp?: boolean;
         enableEnvProp?: boolean;
         eventIdList?: number[];
+        propSymbol?: ReactNode;
+        optionsHeaderTip?: string;
         onChange?: (value: Value) => void;
         onDelete?: (value?: Value) => void;
     }

package/es/attributeSelector/util.js

@@ -28,7 +28,8 @@ export default function convertAttributeData(store) {
             label: item.attr_name,
             propCategory: 'eventProp',
             type: item.prop_type,
-            realTime: true
+            realTime: true,
+            dimensionSub: item.dimension_sub || 'event_attr'
           };
         }),
         id: e.event_id,
@@ -42,27 +43,31 @@ export default function convertAttributeData(store) {
   });
   res.envPropList = (_store$envPropList = store.envPropList) === null || _store$envPropList === void 0 ? void 0 : _store$envPropList.map(function (prop) {
     return {
+      id: prop.id || 0,
       alias: prop.alias_name,
       category: prop.category,
-      key: "envProp-".concat(prop.name),
+      key: "envProp-".concat(prop.dimension_sub, "-").concat(prop.id || 0),
       label: prop.text,
       name: prop.name,
       propCategory: 'envProp',
       type: prop.type,
-      realTime: true
+      realTime: true,
+      dimensionSub: prop.dimension_sub || prop.name
     };
   });
   res.userPropList = (_store$userPropList = store.userPropList) === null || _store$userPropList === void 0 ? void 0 : _store$userPropList.map(function (prop) {
     return {
+      id: prop.id || 0,
       alias: prop.alias_name,
       category: prop.category,
-      key: "userProp-".concat(prop.name),
-      label: prop.text,
+      key: "userProp-".concat(prop.dimension_sub, "-").concat(prop.id || 0),
+      label: prop.text || prop.name,
       name: prop.name,
       propCategory: 'userProp',
       type: prop.type,
       subtype: prop.subtype,
-      realTime: prop.category === 'custom'
+      realTime: prop.category === 'custom',
+      dimensionSub: prop.dimension_sub || prop.name
     };
   });
   return res;

package/es/chart/util/chartOptionConfig.d.ts

@@ -7,7 +7,7 @@ export declare const baseConfig: EChartsOption;
 export declare const seriesConfig: any;
 export declare const legendConfig: LegendComponentOption;
 export declare const gridConfig: {
-    left: number;
+    left: string;
     right: string;
     bottom: number;
     top: number;

package/es/chart/util/chartOptionConfig.js

@@ -44,7 +44,7 @@ export var legendConfig = {
   }
 };
 export var gridConfig = {
-  left: 0,
+  left: '2%',
   right: '3%',
   bottom: 0,
   top: 24,
@@ -188,7 +188,7 @@ export var getChartOption = function getChartOption(chartType, data) {
     legend.left = 'left';
     legend.height = 'auto';
     legend.width = 50;
-    grid.left = 80;
+    grid.left = '10%';
   }
 
   if (chartType === 'line') {
@@ -230,7 +230,7 @@ export var getPieOption = function getPieOption() {
     legend.left = 'left';
     legend.height = 'auto';
     legend.width = 50;
-    grid.left = 80;
+    grid.left = '10%';
   }
 
   tooltip.trigger = 'item';

package/es/config.d.ts

@@ -1,5 +1,5 @@
 import { RequestOptionsInit } from 'umi-request';
-import { ApiResult } from './utils/ajax';
+import { ApiResult } from './utils/type';
 export interface RequestConfig {
     optionsWrapper?: (url: string, options?: RequestOptionsInit) => {
         url: string;

package/es/datePicker/styles/index.less

@@ -45,7 +45,7 @@
 
     &.active {
       color: @primary-color;
-      background: @primary-1;
+      background: color(~`colorPalette('@{primary-color}', 0.1) `);
       border: 1px solid @primary-color;
     }
   }

package/es/eventSelector/listPanel.js

@@ -168,7 +168,7 @@ var EventListPanel = function EventListPanel(props) {
     onChange: function onChange(val) {
       return setSearchValue(val);
     },
-    placeholder: "\u641C\u7D22\u4E8B\u4EF6"
+    placeholder: "\u641C\u7D22\u57CB\u70B9\u4E8B\u4EF6"
   }), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-list")
   }, /*#__PURE__*/React.createElement(InfiniteScroll, {

package/es/mock/user.js

@@ -2,9 +2,9 @@ export default [{
   dimension_sub: 'name',
   value_dict: false,
   name: 'name',
-  id: 0,
+  id: 114,
   text: '名称',
-  category: 'fixed',
+  category: 'custom',
   type: 1,
   alias_name: null
 }, {

package/es/select/styles/index.less

@@ -67,7 +67,7 @@
     &.biz-select-option-multiple {
       &:hover:not(.disabled) {
         color: @primary-color;
-        background-color: @primary-1;
+        background-color: color(~`colorPalette('@{primary-color}', 0.1) `);
       }
 
       &.active:not(.disabled) {

package/es/targetConditionGroup/data/operates.js

@@ -33,9 +33,6 @@ export var normalOptions = [{
 }, {
   label: '次数',
   value: 'times'
-}, {
-  label: '活跃比',
-  value: 'active_ratio'
 }, {
   label: '人均次数',
   value: 'per'

package/es/targetSelector/editBox.js

@@ -72,7 +72,8 @@ var BizEventNameEditBox = function BizEventNameEditBox(props) {
     className: "".concat(classPrefix, "-footer")
   }, /*#__PURE__*/React.createElement(Button, {
     onClick: onCancel,
-    type: "text"
+    type: "text",
+    className: "".concat(classPrefix, "-mr8")
   }, "\u53D6\u6D88"), /*#__PURE__*/React.createElement(Button, {
     onClick: onClick,
     type: "primary"

package/es/targetSelector/styles/index.less

@@ -87,4 +87,8 @@
   &-footer {
     text-align: right;
   }
+
+  &-mr8 {
+    margin-right: @margin-xs;
+  }
 }

package/es/utils/ajax.d.ts

@@ -1,33 +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;
-}
-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>;
+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';
 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;
-});
+import { ResponseStatus } from './type';
 var codeMessage = {
   200: '服务器成功返回请求的数据。',
   201: '新建或修改数据成功。',
@@ -76,7 +45,7 @@ var errorHandler = function errorHandler(error) {
   return response;
 };
 
-function responseErrorHandler(url, apiResult) {
+function responseErrorHandler(url, apiResult, errorTitle) {
   if (/\.jsp/.test(url)) {
     return apiResult;
   }
@@ -91,59 +60,16 @@ function responseErrorHandler(url, apiResult) {
   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) {
     message = apiResult.msg || message;
     notification.error({
-      message: "\u8BF7\u6C42\u9519\u8BEF",
+      message: errorTitle || "\u8BF7\u6C42\u9519\u8BEF",
       description: message
     });
     throw new Error(message);
@@ -205,7 +131,7 @@ function _request() {
 
           case 13:
             res = _context.sent;
-            return _context.abrupt("return", responseWrapper ? responseWrapper(url, responseErrorHandler(url, res)) : responseErrorHandler(url, res));
+            return _context.abrupt("return", responseWrapper ? responseWrapper(url, responseErrorHandler(url, res, options === null || options === void 0 ? void 0 : options.errorTitle)) : responseErrorHandler(url, res, options === null || options === void 0 ? void 0 : options.errorTitle));
 
           case 17:
             _context.prev = 17;

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;
@@ -39,6 +40,7 @@ export declare namespace OldSystem {
         prop_type: PropType;
     }
     interface UserProp {
+        id: number;
         alias_name?: string;
         category: 'fixed' | 'custom';
         dimension_sub: string;
@@ -50,3 +52,34 @@ 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 & {
+    errorTitle?: string;
+    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.12",
+  "version": "1.0.13-alpha.2",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -59,5 +59,5 @@
     "prettier": "^2.2.1",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "05a2117de228e421103ba3de3bff19af21132b83"
+  "gitHead": "5bb31a0840b92867d28324abf58b5c006f9932e7"
 }