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

package/es/assets/styles/chunks.less

@@ -7,7 +7,7 @@
 // 通用hover样式，适用于下拉选项等
 .__default-hover {
   color: @primary-color;
-  background: @primary-1;
+  background: color(~`colorPalette('@{primary-color}', 0.1) `);
   border-color: @primary-color;
   cursor: pointer;
 
@@ -20,7 +20,7 @@
 .__default-focused {
   background-color: #fff;
   border-color: @primary-color;
-  box-shadow: 0 0 0 4px @primary-1;
+  box-shadow: 0 0 0 4px color(~`colorPalette('@{primary-color}', 0.1) `);
 }
 
 // 下拉组件操作栏样式

package/es/assets/styles/resetAntd.less

@@ -37,13 +37,13 @@
 // 输入框
 .ant-input {
   background-color: @background-color-base!important;
-  border-color: @background-color-base!important;
+  // border-color: @background-color-base!important;
   border-radius: @border-radius-small!important;
 
   &:focus,
   &-focused {
     background-color: #fff !important;
-    box-shadow: 0 0 0 4px @primary-1!important;
+    box-shadow: 0 0 0 4px color(~`colorPalette('@{primary-color}', 0.1) `) !important;
   }
   &.ant-input-status-error {
     border-color: @error-color !important;
@@ -62,7 +62,7 @@
 // 选择框下拉选项
 .ant-select-item {
   height: @height-lg!important;
-  padding: 0 @padding-sm!important;
+  padding: @padding-xs @padding-sm!important;
   border-radius: @border-radius-normal!important;
 
   &:hover:not(.ant-select-item-option-disabled, .ant-select-item-option-selected) {
@@ -236,7 +236,7 @@
 
   /*日期范围内背景色*/
   .ant-picker-cell-in-range::before {
-    background: @primary-1!important;
+    background: color(~`colorPalette('@{primary-color}', 0.1) `) !important;
   }
 
   /*日期范围内的hover效果-背景不变*/
@@ -251,7 +251,7 @@
   .ant-picker-panel
     > :not(.ant-picker-date-panel)
     .ant-picker-cell-in-view.ant-picker-cell-in-range.ant-picker-cell-range-hover-end::before {
-    background: @primary-1!important;
+    background: color(~`colorPalette('@{primary-color}', 0.1) `) !important;
   }
 
   /*日期范围内的hover效果*/
@@ -298,6 +298,7 @@
 
   .ant-modal-body {
     max-height: 400px !important;
+    padding-top: @padding-xs !important;
     padding-bottom: 0 !important;
     overflow: auto !important;
   }
@@ -396,7 +397,7 @@
 
   .ant-table-tbody > tr.ant-table-row:hover > td,
   .ant-table-tbody > tr > td.ant-table-cell-row-hover {
-    background: @primary-1!important;
+    background: color(~`colorPalette('@{primary-color}', 0.1) `) !important;
   }
 }
 

package/es/assets/styles/variable.less

@@ -5,24 +5,9 @@
 @border-radius-normal: 8px;
 @border-radius-large: 20px;
 @option-height: @height-lg;
-@background-color-base: #fafafb;
 @background-color-gray: #f6f6f6;
 @icon-width: 24px;
 
-@shadow-color: rgba(0, 0, 0, 0.1);
 @shadow-color-light: rgba(0, 0, 0, 0.1);
-@box-shadow-base: 0px 4px 10px @shadow-color;
 @box-shadow-small: 0px 1px 2px @shadow-color-light;
-@box-shadow-form: 0 0 0 4px @primary-1;
-
-// 正文
-@text-color: #021429;
-// 次要
-@text-color-secondary: #5f6085;
-// 中性色/重要-文标题2
-@tooltip-bg: #242541;
-// 错误颜色
-@error-color: #fb5547;
-
-// text-btn hover背景色
-@btn-text-hover-bg: #cacdd4;
+@box-shadow-form: 0 0 0 4px color(~`colorPalette('@{primary-color}', 0.1) `);

package/es/assets/theme.d.ts

@@ -1,10 +1,15 @@
 declare const _default: {
     'primary-color': string;
     'border-color-base': string;
-    'primary-1': string;
+    'background-color-base': string;
     'text-color': string;
     'text-color-secondary': string;
+    'tooltip-bg': string;
     'error-color': string;
+    'shadow-color': string;
+    'box-shadow-base': string;
+    'btn-text-hover-bg': string;
     'warning-color': string;
+    'border-color-split': string;
 };
 export default _default;

package/es/assets/theme.js

@@ -1,9 +1,14 @@
 export default {
   'primary-color': '#165dff',
   'border-color-base': '#ECEDF0',
-  'primary-1': '#E8EFFF',
+  'background-color-base': '#fafafb',
   'text-color': '#021429',
   'text-color-secondary': '#5f6085',
-  'error-color': '#FB5547',
-  'warning-color': '#FD9F41'
+  'tooltip-bg': '#242541',
+  'error-color': '#fb5547',
+  'shadow-color': 'rgba(0, 0, 0, 0.1)',
+  'box-shadow-base': '0px 4px 10px rgba(0, 0, 0, 0.1)',
+  'btn-text-hover-bg': '#cacdd4',
+  'warning-color': '#FD9F41',
+  'border-color-split': '#E8EFFF'
 };

package/es/attrConditions/components/operateList.js

@@ -20,7 +20,7 @@ var BizOperateList = function BizOperateList(props) {
   var _props$attr2;
 
   var _useState = useState({
-    value: props.defaultValue
+    value: ''
   }),
       _useState2 = _slicedToArray(_useState, 2),
       current = _useState2[0],
@@ -39,7 +39,7 @@ var BizOperateList = function BizOperateList(props) {
     setOptions(optionData);
     var flag = true;
 
-    if (current) {
+    if (current.value) {
       optionData.forEach(function (item) {
         if (item.value === current.value) {
           if (current.name && current.name === item.name) {
@@ -47,6 +47,11 @@ var BizOperateList = function BizOperateList(props) {
           }
         }
       });
+    } else if (props.defaultValue) {
+      setCurrent({
+        value: props.defaultValue
+      });
+      return;
     }
 
     if (!flag) return;

package/es/attrConditions/components/stringList.js

@@ -16,7 +16,6 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { useContext, useEffect, useState } from 'react';
 import { classPrefix } from '..';
-import { PropCategory } from '../../attributeSelector/types';
 import Apis from '../../constants/apis';
 import BizGlobalDataContext from '../../context';
 import BizSelect from '../../select';
@@ -84,8 +83,8 @@ var StringList = function StringList(props) {
                 app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
                 platform: currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform,
                 limit: 10000,
-                attr: (attrData === null || attrData === void 0 ? void 0 : attrData.propCategory) === PropCategory.EventProp ? attrData.id : 0,
-                dimension_sub: (attrData === null || attrData === void 0 ? void 0 : attrData.propCategory) === PropCategory.EventProp ? 'event_attr' : attrData === null || attrData === void 0 ? void 0 : attrData.name,
+                attr: (attrData === null || attrData === void 0 ? void 0 : attrData.id) || 0,
+                dimension_sub: attrData === null || attrData === void 0 ? void 0 : attrData.dimensionSub,
                 v: ''
               };
 

package/es/attrConditions/demo/group.js

@@ -18,6 +18,7 @@ import userData from '../../mock/user';
 import { Button } from 'antd';
 var conditions = [{
   propCategory: 'userProp',
+  attrId: 0,
   type: 2,
   operator: 'gt',
   values: ['25200', '1'],

package/es/attrConditions/demo/index.js

@@ -29,6 +29,7 @@ export default (function () {
       values: ['25200', '1'],
       subtype: 2,
       attrName: 'duration',
+      attrId: 0,
       category: 'fixed'
     }
   }),

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/context/index.d.ts

@@ -5,12 +5,21 @@ interface AppInfoProps {
     platform?: string | number;
     [prop: string]: any;
 }
+interface UserInfo {
+    id: number;
+    username: string;
+    email: string;
+    companyId: number;
+    companyName: string;
+}
 export interface GlobalContextProps {
     userGroupList?: Array<any>;
     eventGroupList?: EventGroup[];
     userPropList?: UserProp[];
     eventEnvList?: EnvProp[];
     currentApp?: AppInfoProps;
+    currentUser?: UserInfo;
+    isDemo?: boolean;
 }
 declare const BizGlobalDataContext: import("react").Context<GlobalContextProps>;
 export default BizGlobalDataContext;

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.js

@@ -45,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;
   }
@@ -69,7 +69,7 @@ function responseErrorHandler(url, apiResult) {
   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);
@@ -131,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

@@ -40,6 +40,7 @@ export declare namespace OldSystem {
         prop_type: PropType;
     }
     interface UserProp {
+        id: number;
         alias_name?: string;
         category: 'fixed' | 'custom';
         dimension_sub: string;
@@ -75,6 +76,7 @@ export declare class ApiResult<T> implements InterfaceApiResult<T> {
     constructor(code: ResponseStatus, data: any, message?: string);
 }
 export declare type ajaxConfig<T> = RequestOptionsInit & {
+    errorTitle?: string;
     optionsWrapper?: (url: string, options?: RequestOptionsInit) => {
         url: string;
         options?: RequestOptionsInit;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.0.13-alpha.0",
+  "version": "1.0.13-alpha.3",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -59,5 +59,5 @@
     "prettier": "^2.2.1",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "f622cd527db39c1afb4bd457edc8457d337478fe"
+  "gitHead": "889d6b7091fc5b4e2efe3ebf00892045597017f7"
 }