@zgfe/business-lib 1.2.6 → 1.2.8-session.0

package/es/attrCondition/demo/group.js

@@ -1,6 +1,25 @@
 import React, { useRef } from 'react';
 import { BizAttrConditionGroup, DemoWrapper } from '@zgfe/business-lib';
 import { Button } from 'antd';
+var extraList = [{
+  type: 'sessionProp',
+  name: 'Session属性',
+  attrList: [{
+    id: 'sa_duration',
+    label: 'Session时长',
+    propCategory: 'extraProp',
+    key: 'extraProp-sa_duration',
+    type: 2,
+    subtype: 2
+  }, {
+    id: 'se_duration',
+    label: '事件使用时长',
+    propCategory: 'extraProp',
+    key: 'extraProp-se_duration',
+    type: 2,
+    subtype: 2
+  }]
+}];
 export default (function () {
   var groupRef = useRef(null);
   var filter = {
@@ -15,15 +34,14 @@ export default (function () {
       operator: 'equal',
       attrName: 'is_anonymous'
     }, {
-      attrId: 0,
-      propCategory: 'userProp',
-      values: ['30', '1'],
-      dimensionSub: 'last_visit_time',
-      label: '最后一次访问时间',
-      type: 3,
-      category: 'fixed',
-      operator: 'relative',
-      attrName: 'last_visit_time'
+      attrId: 'sa_duration',
+      propCategory: 'extraProp',
+      type: 2,
+      operator: 'gt',
+      values: ['158400', '1'],
+      label: 'Session时长',
+      attrName: 'Session时长',
+      subtype: 2
     }],
     relation: 'and'
   };
@@ -38,6 +56,7 @@ export default (function () {
   }, /*#__PURE__*/React.createElement(BizAttrConditionGroup, {
     value: filter,
     ref: groupRef,
+    extra: extraList,
     enableDelete: true
   }), /*#__PURE__*/React.createElement("div", {
     style: {

package/es/attrCondition/demo/index.js

@@ -1,5 +1,24 @@
 import React from 'react';
 import { BizAttrCondition, DemoWrapper } from '@zgfe/business-lib';
+var extraList = [{
+  type: 'sessionProp',
+  name: 'Session属性',
+  attrList: [{
+    id: 'sa_duration',
+    label: 'Session时长',
+    propCategory: 'extraProp',
+    key: 'extraProp-sa_duration',
+    type: 2,
+    subtype: 2
+  }, {
+    id: 'se_duration',
+    label: '事件使用时长',
+    propCategory: 'extraProp',
+    key: 'extraProp-se_duration',
+    type: 2,
+    subtype: 2
+  }]
+}];
 export default (function () {
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true
@@ -9,6 +28,7 @@ export default (function () {
       background: '#fff'
     }
   }, /*#__PURE__*/React.createElement(BizAttrCondition, {
+    extra: extraList,
     onChange: function onChange(condition) {
       console.log(condition);
     }

package/es/attrCondition/group.js

@@ -9,7 +9,8 @@ var BizAttrConditionGroup = /*#__PURE__*/React.forwardRef(function (props, ref)
     enableEventProp = props.enableEventProp,
     enableUserProp = props.enableUserProp,
     enableEnvProp = props.enableEnvProp,
-    disableItemList = props.disableItemList;
+    disableItemList = props.disableItemList,
+    extra = props.extra;
   var _useConditionGroup = useConditionGroup(props, ref),
     loading = _useConditionGroup.loading,
     conditions = _useConditionGroup.conditions,
@@ -52,6 +53,7 @@ var BizAttrConditionGroup = /*#__PURE__*/React.forwardRef(function (props, ref)
       enableUserProp: enableUserProp,
       enableEnvProp: enableEnvProp,
       disableItemList: disableItemList,
+      extra: extra,
       onChange: function onChange(data) {
         return _onChange(data, index);
       },

package/es/attrCondition/index.js

@@ -65,7 +65,8 @@ var BizAttrCondition = function BizAttrCondition(props) {
     theme: theme,
     destroyPopupOnHide: props.destroyPopupOnHide,
     placeholder: "\u8BF7\u9009\u62E9\u5C5E\u6027",
-    status: isAttrError ? 'error' : ''
+    status: isAttrError ? 'error' : '',
+    extra: props.extra
   }), isAttrError ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-error")
   }, "\u5C5E\u6027\u4E0D\u53EF\u4E3A\u7A7A") : null), /*#__PURE__*/React.createElement(BizOperateList, {

package/es/attrCondition/useAttrCondition.js

@@ -55,6 +55,17 @@ var useAttrCondition = function useAttrCondition(props) {
             dimensionSub: data.dimensionSub || data.attrName
           };
         }
+      } else if (data.propCategory === PropCategory.ExtraProp) {
+        if (data.attrId) {
+          attrData = {
+            id: data.attrId,
+            propCategory: data.propCategory,
+            type: data.type,
+            key: "".concat(data.propCategory, "-").concat(data.attrId),
+            label: data.attrNameStr || data.label,
+            subtype: data.subtype
+          };
+        }
       }
       setAttr(attrData);
     }

package/es/attrConditions/components/valuesList.js

@@ -37,7 +37,7 @@ var ValuesList = function ValuesList(props) {
     setIsFirst = _useState6[1];
   useEffect(function () {
     if (defaultValue) {
-      if ((attr === null || attr === void 0 ? void 0 : attr.propCategory) === 'userProp' && (attr === null || attr === void 0 ? void 0 : attr.subtype) === 2) {
+      if (((attr === null || attr === void 0 ? void 0 : attr.propCategory) === PropCategory.UserProp || (attr === null || attr === void 0 ? void 0 : attr.propCategory) === PropCategory.ExtraProp) && (attr === null || attr === void 0 ? void 0 : attr.subtype) === 2) {
         var num = String(parseFloat(defaultValue[0]) / getUnitCount(defaultValue[1]));
         setCurrent([num, defaultValue[1]]);
       } else {
@@ -72,7 +72,7 @@ var ValuesList = function ValuesList(props) {
   };
   var onChangeNumber = function onChangeNumber(e) {
     var data = [e.target.value];
-    if ((attr === null || attr === void 0 ? void 0 : attr.propCategory) === PropCategory.UserProp && (attr === null || attr === void 0 ? void 0 : attr.subtype) === 2) {
+    if (((attr === null || attr === void 0 ? void 0 : attr.propCategory) === PropCategory.UserProp || (attr === null || attr === void 0 ? void 0 : attr.propCategory) === PropCategory.ExtraProp) && (attr === null || attr === void 0 ? void 0 : attr.subtype) === 2) {
       var num = String(parseFloat(e.target.value) * getUnitCount(unit));
       data = [num, unit];
       setCurrent([e.target.value, unit]);
@@ -144,7 +144,7 @@ var ValuesList = function ValuesList(props) {
       status: status,
       onChange: onChangeNumber,
       suffix: attr.propCategory === 'userProp' && attr.subtype === 1 ? '%' : null
-    }), attr.propCategory === 'userProp' && attr.subtype === 2 && numberAfter);
+    }), (attr.propCategory === PropCategory.UserProp || attr.propCategory === PropCategory.ExtraProp) && attr.subtype === 2 && numberAfter);
   } else {
     if (operate === OperateTypes.Absolute) {
       return /*#__PURE__*/React.createElement(RangePicker, {

package/es/attrConditions/group.js

@@ -9,7 +9,8 @@ var BizConditionGroup = function BizConditionGroup(props, ref) {
     enableEventProp = props.enableEventProp,
     enableUserProp = props.enableUserProp,
     enableEnvProp = props.enableEnvProp,
-    disableItemList = props.disableItemList;
+    disableItemList = props.disableItemList,
+    extra = props.extra;
   var _useConditionGroup = useConditionGroup(props, ref),
     loading = _useConditionGroup.loading,
     conditions = _useConditionGroup.conditions,
@@ -47,6 +48,7 @@ var BizConditionGroup = function BizConditionGroup(props, ref) {
       enableUserProp: enableUserProp,
       enableEnvProp: enableEnvProp,
       disableItemList: disableItemList,
+      extra: extra,
       onChange: function onChange(data) {
         return _onChange(data, index);
       },

package/es/attrConditions/index.js

@@ -20,6 +20,11 @@ export function getCondition(attr, operate, values) {
   };
   if (attr.propCategory === PropCategory.EventProp) {
     responseData.attrName = attr.label;
+  } else if (attr.propCategory === PropCategory.ExtraProp) {
+    responseData.attrName = attr.label;
+    if (attr.propCategory === PropCategory.ExtraProp && attr.subtype) {
+      responseData.subtype = attr.subtype;
+    }
   } else {
     responseData.attrName = attr.name;
     responseData.category = attr.category;
@@ -68,7 +73,8 @@ var BizConditionItem = function BizConditionItem(props) {
       return _onDelete(e);
     },
     theme: theme,
-    destroyPopupOnHide: props.destroyPopupOnHide
+    destroyPopupOnHide: props.destroyPopupOnHide,
+    extra: props.extra
   }), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-panel")
   }, /*#__PURE__*/React.createElement(BizOperateList, {

package/es/attrConditions/types.d.ts

@@ -1,4 +1,4 @@
-import { EnvProp, EventProp, PropType, UserProp } from '../attributeSelector/types';
+import { AttributeSelect, EnvProp, EventProp, PropType, UserProp } from '../attributeSelector/types';
 import { BizSelectTypes } from '../select/types';
 interface BasicAttrTypes {
     eventIdList?: number[];
@@ -8,16 +8,17 @@ interface BasicAttrTypes {
     enableEnvProp?: boolean;
     disableItemList?: (EventProp | UserProp | EnvProp)[];
     theme?: BizSelectTypes.Props['theme'];
+    extra?: AttributeSelect.AttributeExtra[];
 }
 export declare namespace AttrConditionTypes {
     interface ItemValue {
         subtype?: number;
-        attrId?: number;
+        attrId?: number | string;
         attrName?: string;
         label?: string;
         attrNameStr?: string;
         type?: PropType;
-        propCategory?: 'userProp' | 'eventProp' | 'envProp';
+        propCategory?: 'userProp' | 'eventProp' | 'envProp' | 'extraProp';
         category?: 'fixed' | 'custom';
         dimensionSub?: string;
         operator?: OperateTypes;

package/es/attributeSelector/demo/extra.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+import '@zgfe/business-lib/es/assets/styles/resetAntd.less';
+declare const _default: () => React.JSX.Element;
+export default _default;

package/es/attributeSelector/demo/extra.js

@@ -0,0 +1,89 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import React, { useEffect, useState } from 'react';
+import { BizAttributeSelector, BizGlobalDataContext } from '@zgfe/business-lib';
+import '@zgfe/business-lib/es/assets/styles/resetAntd.less';
+import eventData from '../../mock/event';
+import envData from '../../mock/env';
+import userData from './userData.js';
+import convertAttributeData from '../util';
+var extraList = [{
+  type: 'sessionProp',
+  name: 'Session属性',
+  attrList: [{
+    id: 'sa_duration',
+    label: 'Session时长',
+    propCategory: 'extraProp',
+    key: 'extraProp-sa_duration',
+    type: 2,
+    subtype: 2
+  }]
+}, {
+  type: 'pageProp',
+  name: '页面属性',
+  attrList: [{
+    id: 'page_duration',
+    label: '页面访问时长',
+    propCategory: 'extraProp',
+    key: 'extraProp-page_duration'
+  }, {
+    id: 'click',
+    label: '页面点击次数',
+    propCategory: 'extraProp',
+    key: 'extraProp-click'
+  }]
+}];
+export default (function () {
+  var _useState = useState({
+      id: 'sa_duration',
+      label: 'Session时长',
+      propCategory: 'extraProp',
+      key: 'extraProp-sa_duration',
+      type: 2,
+      subtype: 2
+    }),
+    _useState2 = _slicedToArray(_useState, 2),
+    attribute = _useState2[0],
+    setAttribute = _useState2[1];
+  var _useState3 = useState(),
+    _useState4 = _slicedToArray(_useState3, 2),
+    list = _useState4[0],
+    setList = _useState4[1];
+  useEffect(function () {
+    setTimeout(function () {
+      setList(extraList);
+    }, 0);
+  }, []);
+  var store = convertAttributeData({
+    eventList: eventData,
+    userPropList: userData,
+    envPropList: envData
+  });
+  function onChange(val) {
+    setAttribute(val);
+  }
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("p", null, "\u9009\u62E9\u7684\u5C5E\u6027\u662F\uFF1A", JSON.stringify(attribute)), /*#__PURE__*/React.createElement(BizGlobalDataContext.Provider, {
+    value: {
+      eventGroupList: store.eventGroupList,
+      userPropList: store.userPropList,
+      eventEnvList: store.envPropList
+    }
+  }, /*#__PURE__*/React.createElement(BizAttributeSelector, {
+    enableEventProp: true,
+    enableUserProp: true,
+    eventIdList: [24143016],
+    value: attribute,
+    onChange: onChange,
+    enableDelete: true,
+    enableEnvProp: true,
+    extra: list,
+    disableItemList: [{
+      id: 'click',
+      propCategory: 'extraProp'
+    }]
+  })));
+});

package/es/attributeSelector/index.js

@@ -22,6 +22,7 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
   var enableDelete = props.enableDelete,
     placeholder = props.placeholder,
     theme = props.theme,
+    extra = props.extra,
     isNumber = props.isNumber;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
@@ -51,7 +52,7 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
   }, []);
   useEffect(function () {
     setCurrentAttr(getValue(props.value));
-  }, [props.value]);
+  }, [props.value, props.extra]);
   function getValue(param) {
     var res = undefined;
     var hasKey = param && param.key;
@@ -84,6 +85,16 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
           if (attr.name === param.name && attr.category === param.category) res = attr;
         }
       });
+    } else if ((param === null || param === void 0 ? void 0 : param.propCategory) === 'extraProp') {
+      extra === null || extra === void 0 ? void 0 : extra.forEach(function (item) {
+        item.attrList.forEach(function (attr) {
+          if (hasKey) {
+            if (attr.key === param.key) res = _.cloneDeep(attr);
+          } else {
+            if (attr.id === param.id) res = _.cloneDeep(attr);
+          }
+        });
+      });
     }
     return res;
   }
@@ -114,8 +125,7 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
     },
     trigger: ['click'],
     overlayStyle: {
-      minWidth: 284,
-      width: width
+      minWidth: width < 284 ? 284 : width > 520 ? 520 : width
     },
     open: visible,
     onOpenChange: onVisibleChange,

package/es/attributeSelector/listPanel.js

@@ -23,6 +23,7 @@ var AttrListPanel = function AttrListPanel(props) {
     enableUserProp = props.enableUserProp,
     eventIdList = props.eventIdList,
     funnelEventIdList = props.funnelEventIdList,
+    extra = props.extra,
     isNumber = props.isNumber;
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
@@ -58,18 +59,71 @@ var AttrListPanel = function AttrListPanel(props) {
       item.key = "eventProp-".concat(item.id);
     } else if (item.propCategory === 'userProp') {
       item.key = "userProp-".concat(item.name);
+    } else if (item.propCategory === 'extraProp') {
+      item.key = "extraProp-".concat(item.id);
     }
     return item;
   });
-  var anchor = {
-    container: "container-".concat(id),
-    event: "event".concat(id),
-    user: "user".concat(id),
-    env: "env".concat(id)
-  };
+  var _useState7 = useState({
+      container: "container-".concat(id)
+    }),
+    _useState8 = _slicedToArray(_useState7, 2),
+    anchor = _useState8[0],
+    stAnchor = _useState8[1];
+  var _useState9 = useState([]),
+    _useState10 = _slicedToArray(_useState9, 2),
+    anchorList = _useState10[0],
+    setAnchorList = _useState10[1];
+  useEffect(function () {
+    var data = {
+      container: "container-".concat(id),
+      event: "event".concat(id),
+      user: "user".concat(id),
+      env: "env".concat(id)
+    };
+    var list = [];
+    extra === null || extra === void 0 ? void 0 : extra.forEach(function (item) {
+      data[item.type] = "".concat(item.type).concat(id);
+      list.push({
+        id: "".concat(item.type).concat(id),
+        name: item.name
+      });
+    });
+    stAnchor(data);
+    if (enableEventProp) {
+      list.push({
+        id: data.event,
+        name: '事件属性'
+      });
+    }
+    if (enableUserProp) {
+      list.push({
+        id: data.user,
+        name: '用户属性'
+      });
+    }
+    if (enableEnvProp) {
+      list.push({
+        id: data.env,
+        name: '触发环境'
+      });
+    }
+    setAnchorList(list);
+  }, [id]);
   var classPrefix = 'biz-attr-select';
   useEffect(function () {
     var list = [];
+    if (extra) {
+      extra.forEach(function (item) {
+        list.push({
+          isEvent: false,
+          groupName: item.name,
+          key: item.type,
+          anchor: anchor[item.type],
+          children: item.attrList
+        });
+      });
+    }
     if (enableEventProp) {
       if (props.showCommonProp) {
         var group = {
@@ -148,7 +202,7 @@ var AttrListPanel = function AttrListPanel(props) {
       });
     }
     setOptionList(list);
-  }, [eventIdMap, userPropList, eventEnvList, eventIdList, props.showCommonProp]);
+  }, [anchor, eventIdMap, userPropList, eventEnvList, eventIdList, props.showCommonProp]);
   useEffect(function () {
     setCurrentAttr(props.value);
   }, [props.value]);
@@ -213,22 +267,14 @@ var AttrListPanel = function AttrListPanel(props) {
     getContainer: function getContainer() {
       return document.getElementById(anchor.container);
     }
-  }, enableEventProp && /*#__PURE__*/React.createElement(Link, {
-    href: "#".concat(anchor.event),
-    title: /*#__PURE__*/React.createElement(Button, {
-      size: "small"
-    }, "\u4E8B\u4EF6\u5C5E\u6027")
-  }), enableUserProp && /*#__PURE__*/React.createElement(Link, {
-    href: "#".concat(anchor.user),
-    title: /*#__PURE__*/React.createElement(Button, {
-      size: "small"
-    }, "\u7528\u6237\u5C5E\u6027")
-  }), enableEnvProp && /*#__PURE__*/React.createElement(Link, {
-    "data-type": 'event',
-    href: "#".concat(anchor.env),
-    title: /*#__PURE__*/React.createElement(Button, {
-      size: "small"
-    }, "\u89E6\u53D1\u73AF\u5883")
+  }, anchorList.map(function (item) {
+    return /*#__PURE__*/React.createElement(Link, {
+      key: item.id,
+      href: "#".concat(item.id),
+      title: /*#__PURE__*/React.createElement(Button, {
+        size: "small"
+      }, item.name)
+    });
   }))) : null, /*#__PURE__*/React.createElement("div", {
     id: anchor.container,
     className: "".concat(classPrefix, "-container")

package/es/attributeSelector/styles/index.less

@@ -44,6 +44,7 @@
   }
 
   &-anchor-panel {
+    max-width: 496px;
     padding: 12px 0;
 
     .ant-anchor {

package/es/attributeSelector/types.d.ts

@@ -8,7 +8,8 @@ export declare enum PropType {
 export declare enum PropCategory {
     EventProp = "eventProp",
     UserProp = "userProp",
-    EnvProp = "envProp"
+    EnvProp = "envProp",
+    ExtraProp = "extraProp"
 }
 export declare enum ShowStatus {
     show = 0,
@@ -37,7 +38,7 @@ export interface EventGroup {
     eventList: AnalysisEvent[];
 }
 export interface BasicProp {
-    id?: number;
+    id?: number | string;
     label?: string;
     alias?: string;
     type?: PropType;
@@ -71,12 +72,12 @@ export interface PropGroups {
     eventIdMap?: Record<number, AnalysisEvent>;
 }
 export declare namespace AttributeSelect {
-    type Value = EventProp | UserProp | EnvProp | null;
+    type Value = EventProp | UserProp | EnvProp | ExtraProp | null;
     interface Props {
         id?: string;
         value?: Value;
         defaultValue?: Value;
-        disableItemList?: (EventProp | UserProp | EnvProp)[];
+        disableItemList?: (EventProp | UserProp | EnvProp | ExtraProp)[];
         enableDelete?: boolean;
         placeholder?: string;
         enableEventProp?: boolean;
@@ -93,8 +94,20 @@ export declare namespace AttributeSelect {
         destroyPopupOnHide?: boolean;
         size?: SizeType;
         status?: string;
+        extra?: AttributeExtra[];
         isNumber?: Boolean;
     }
+    interface AttributeExtra {
+        type: string;
+        name: string;
+        attrList: ExtraProp[];
+    }
+    interface ExtraProp extends BasicProp {
+        propCategory: 'extraProp';
+        key?: number | string;
+        name?: string;
+        subtype?: number;
+    }
     interface Option {
         groupName: string;
         isEvent: boolean;

package/es/attributeSelector/types.js

@@ -9,6 +9,7 @@ export var PropCategory;
   PropCategory["EventProp"] = "eventProp";
   PropCategory["UserProp"] = "userProp";
   PropCategory["EnvProp"] = "envProp";
+  PropCategory["ExtraProp"] = "extraProp";
 })(PropCategory || (PropCategory = {}));
 export var ShowStatus;
 (function (ShowStatus) {

package/es/chart/demo/data/data.d.ts

@@ -3,6 +3,7 @@ declare const _default: {
     series: {
         names: string[];
         values: number[];
+        orderNum: number;
     }[];
 };
 export default _default;
@@ -11,5 +12,7 @@ export declare const barData: {
     series: {
         names: string[];
         values: number[];
+        orderNum: number;
     }[];
 };
+export declare const showCharts: string[];

package/es/chart/demo/data/data.js

@@ -2,46 +2,60 @@ export default {
   xAxis: ['2022-03-31', '2022-04-01', '2022-04-02', '2022-04-03', '2022-04-04', '2022-04-05', '2022-04-06', '2022-04-07', '2022-04-08', '2022-04-09', '2022-04-10', '2022-04-11', '2023-09-17', '2023-09-18'],
   series: [{
     names: ['付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功'],
-    values: [26, 27, 43, 44, 40, 34, 33, 33, 34, 24, 30, 31, 31, 38]
+    values: [26, 27, 43, 44, 40, 34, 33, 33, 34, 24, 30, 31, 31, 38],
+    orderNum: 1
   }, {
     names: ['注册-发送手机验证码'],
-    values: [11, 10, 7, 5, 13, 18, 14, 17, 11, 6, 10, 12, 15, 10]
+    values: [11, 10, 7, 5, 13, 18, 14, 17, 11, 6, 10, 12, 15, 10],
+    orderNum: 1
   }, {
     names: ['搜索商品'],
-    values: [75, 68, 86, 80, 87, 71, 72, 81, 77, 74, 78, 76, 76, 79]
+    values: [75, 68, 86, 80, 87, 71, 72, 81, 77, 74, 78, 76, 76, 79],
+    orderNum: 2
   }, {
     names: ['pv'],
-    values: [104, 89, 109, 103, 112, 93, 87, 101, 101, 97, 102, 110, 106, 98]
+    values: [104, 89, 109, 103, 112, 93, 87, 101, 101, 97, 102, 110, 106, 98],
+    orderNum: 3
   }, {
     names: ['申请退货2'],
-    values: [5, 11, 14, 9, 8, 14, 9, 10, 12, 12, 14, 16, 12, 10]
+    values: [5, 11, 14, 9, 8, 14, 9, 10, 12, 12, 14, 16, 12, 10],
+    orderNum: 4
   }, {
-    names: ['搜索商品2'],
-    values: [75, 68, 86, 80, 87, 71, 72, 81, 77, 74, 78, 76, 76, 79]
+    names: ['搜索商品'],
+    values: [75, 68, 86, 80, 87, 71, 72, 81, 77, 74, 78, 76, 76, 79],
+    orderNum: 5
   }, {
     names: ['付款成功11付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功'],
-    values: [26, 27, 43, 44, 40, 34, 33, 33, 34, 24, 30, 31, 31, 38]
+    values: [26, 27, 43, 44, 40, 34, 33, 33, 34, 24, 30, 31, 31, 38],
+    orderNum: 1
   }, {
     names: ['查看商品详情'],
-    values: [122, 107, 132, 113, 133, 115, 106, 127, 132, 117, 119, 123, 119, 117]
+    values: [122, 107, 132, 113, 133, 115, 106, 127, 132, 117, 119, 123, 119, 117],
+    orderNum: 2
   }, {
     names: ['scroll'],
-    values: [98, 96, 106, 109, 113, 105, 91, 111, 99, 99, 104, 108, 116, 92]
+    values: [98, 96, 106, 109, 113, 105, 91, 111, 99, 99, 104, 108, 116, 92],
+    orderNum: 3
   }, {
     names: ['click'],
-    values: [108, 102, 111, 90, 111, 105, 91, 129, 117, 101, 109, 109, 105, 96]
+    values: [108, 102, 111, 90, 111, 105, 91, 129, 117, 101, 109, 109, 105, 96],
+    orderNum: 4
   }, {
     names: ['申请退货'],
-    values: [5, 11, 14, 9, 8, 14, 9, 10, 12, 12, 14, 16, 12, 10]
+    values: [5, 11, 14, 9, 8, 14, 9, 10, 12, 12, 14, 16, 12, 10],
+    orderNum: 5
   }]
 };
 export var barData = {
   xAxis: ['2022-08-23|2022-08-30'],
   series: [{
     names: ['北京市', '所有用户', '查看商品'],
-    values: [1560]
+    values: [1560],
+    orderNum: 1
   }, {
     names: ['北京市', '最近7天活跃用户', '查看商品'],
-    values: [1560]
+    values: [1560],
+    orderNum: 2
   }]
-};
+};
+export var showCharts = ['注册-发送手机验证码|:|1', '搜索商品|:|2', '查看商品详情|:|2', 'scroll|:|3', '申请退货|:|5', 'click|:|4', '搜索商品|:|5'];

package/es/chart/demo/data/data3.d.ts

@@ -1,8 +1,13 @@
 declare const _default: {
     xAxis: string[];
-    series: {
+    series: ({
         names: string[];
         values: number[];
-    }[];
+        orderNum: number;
+    } | {
+        names: string[];
+        values: number[];
+        orderNum?: undefined;
+    })[];
 };
 export default _default;

package/es/chart/demo/data/data3.js

@@ -2,22 +2,34 @@ export default {
   xAxis: ['2022-08-25|2022-09-01'],
   series: [{
     names: ['北京市', '所有用户', '加购商品'],
+    values: [1370],
+    orderNum: 1
+  }, {
+    names: ['武汉市', '所有用户', '加购商品'],
     values: [1370]
+  }, {
+    names: ['武汉市', '所有用户', '加购商品'],
+    values: [22]
   }, {
     names: ['北京市', '洞察测试用户群二', '加购商品'],
-    values: [1370]
+    values: [1370],
+    orderNum: 2
   }, {
     names: ['北京市', '所有用户', '查看商品'],
-    values: [2000]
+    values: [2000],
+    orderNum: 3
   }, {
     names: ['北京市', '洞察测试用户群二', '查看商品'],
-    values: [2000]
+    values: [2000],
+    orderNum: 3
   }, {
     names: ['北京市', '所有用户', '评价商品'],
-    values: [380]
+    values: [380],
+    orderNum: 3
   }, {
     names: ['北京市', '洞察测试用户群二', '评价商品'],
-    values: [380]
+    values: [380],
+    orderNum: 4
   }, {
     names: ['武汉市', '所有用户', '加购商品'],
     values: [130]

package/es/chart/demo/index.js

@@ -6,7 +6,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useRef, useState } from 'react';
 import { BizChart } from '@zgfe/business-lib';
-import chartData from './data/data';
+import chartData, { showCharts } from './data/data';
 import { Button, Image } from 'antd';
 export default (function () {
   var chartRef = useRef();
@@ -22,7 +22,8 @@ export default (function () {
     data: chartData,
     type: "line",
     legendPosition: "bottom",
-    ref: chartRef
+    ref: chartRef,
+    showList: showCharts
   }), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(Button, {
     onClick: onClick
   }, "\u83B7\u53D6\u56FE\u8868\u56FE\u7247"), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(Image, {

package/es/chart/styles/index.less

@@ -38,6 +38,19 @@
         margin-right: @margin-xs;
         border-radius: 50%;
       }
+      .biz-tooltip-order {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 12.8px;
+        height: 12.8px;
+        margin-right: @margin-xs;
+        color: #fff;
+        font-weight: 500;
+        font-size: 8.96px;
+        background: #457dff;
+        border-radius: 50%;
+      }
       .biz-tooltip-name {
         max-width: 300px;
         white-space: pre-wrap;

package/es/chart/util/chartOptionConfig.js

@@ -45,7 +45,8 @@ export var legendConfig = {
     show: true,
     formatter: function formatter(param) {
       var maxLength = 20;
-      var names = param.name.match(new RegExp("\\S{1,".concat(maxLength, "}"), 'g'));
+      var name = param.name.split('|:|')[0];
+      var names = name.match(new RegExp("\\S{1,".concat(maxLength, "}"), 'g'));
       return names ? names.join('<br/>') : '';
     }
   }
@@ -225,8 +226,12 @@ export var getPieOption = function getPieOption() {
       color: '#021429',
       fontSize: 10,
       fontWight: 500,
+      verticalAlign: 'bottom',
       formatter: function formatter(params) {
-        return "{a|".concat("} ", util.strMiddleSplit(params.name), " {b|").concat(params.value, "}");
+        var nameArr = params.name.split('|:|');
+        var name = nameArr[0];
+        var orderNum = nameArr[1];
+        return "".concat(orderNum ? '{c|' + orderNum + '}' : '{a|' + ' }', " ").concat(util.strMiddleSplit(name), " {b|").concat(params.value, "}");
       },
       rich: {
         a: {
@@ -239,6 +244,18 @@ export var getPieOption = function getPieOption() {
           color: '#67727F',
           fontSize: 10,
           fontWight: 400
+        },
+        c: {
+          backgroundColor: 'inherit',
+          width: 8,
+          height: 8,
+          borderRadius: 8,
+          fontSize: 8,
+          padding: [3, 3, 2, 3],
+          color: '#fff',
+          align: 'center',
+          verticalAlign: 'middle',
+          lineHeight: 8
         }
       }
     },
@@ -278,7 +295,8 @@ export var getPieOption = function getPieOption() {
       var name = params.name,
         value = params.value,
         color = params.color;
-      return "<div class=\"biz-chart-tooltip-item\">\n                <div class=\"biz-chart-tooltip-content\">\n                    <span class=\"biz-tooltip-marker\" style=\"background:".concat(color, "\"></span>\n                    <div class=\"biz-tooltip-name\">").concat(name, "</div>\n                </div> \n                <span class=\"biz-chart-tooltip-value\">").concat(value, "(").concat(params.percent, "%)</span>\n              </div>");
+      var nameArr = name.split('|:|');
+      return "<div class=\"biz-chart-tooltip-item\">\n                <div class=\"biz-chart-tooltip-content\">\n                    <span class=\"".concat(nameArr[1] ? 'biz-tooltip-order' : 'biz-tooltip-marker', "\" style=\"background:").concat(color, "\">").concat(nameArr[1] || '', "</span>\n                    <div class=\"biz-tooltip-name\">").concat(nameArr[0], "</div>\n                </div> \n                <span class=\"biz-chart-tooltip-value\">").concat(value, "(").concat(params.percent, "%)</span>\n              </div>");
     };
   }
   return _objectSpread(_objectSpread({}, baseConfig), {}, {

package/es/chart/util/formatData.js

@@ -11,8 +11,10 @@ export var formatPieData = function formatPieData(data, showAll, showList, showO
     }
   };
   data.series.forEach(function (item) {
+    var names = item.names,
+      orderNum = item.orderNum;
     var series = {
-      name: item.names.join(','),
+      name: "".concat(names.join(',')).concat(orderNum ? '|:|' + orderNum : ''),
       value: item.values[0]
     };
     if (showAll) {
@@ -37,16 +39,18 @@ export var formatChartData = function formatChartData(data, showAll, showList, r
   var colorData = color || chartColors;
   data.series.forEach(function (seriesItem) {
     var name = seriesItem.names.join(',');
+    var showName = "".concat(name).concat(seriesItem.orderNum ? '|:|' + seriesItem.orderNum : '');
+    resultFormatMap["".concat(name, "Order")] = seriesItem.orderNum;
     if (seriesItem.resultFormat && !resultFormatMap[name]) {
       resultFormatMap[name] = seriesItem.resultFormat;
     }
-    if (showAll || showList && showMap[name] || !showList && sData.length < 10) {
+    if (showAll || showList && showMap[showName] || !showList && sData.length < 10) {
       if (reverseXAxis) {
         xAxis.push(name);
         sData.push({
           name: xAxisData[0],
           value: seriesItem.values[0],
-          label: name,
+          label: showName,
           itemStyle: {
             normal: {
               color: colorData[sData.length]
@@ -55,7 +59,7 @@ export var formatChartData = function formatChartData(data, showAll, showList, r
         });
       } else {
         sData.push({
-          name: name,
+          name: showName,
           data: seriesItem.values,
           type: isUseSelf ? seriesItem.type : undefined
         });

package/es/chart/util/formatOption.js

@@ -32,7 +32,10 @@ var tooltipFormatterDefault = function tooltipFormatterDefault(params, resultFor
     if (item.seriesType === 'bar' && params.length === 1 && !name) {
       name = (item.data && item.data.label ? item.data.label : item.name).trim();
     }
-    htmlArray.push("<div class=\"biz-chart-tooltip-item\">\n          <div class=\"biz-chart-tooltip-content\">\n              <span class=\"biz-tooltip-marker\" style=\"background:".concat(item.color, "\"></span>\n              <div class=\"biz-tooltip-name\">").concat(name, "</div>\n          </div> \n          <span class=\"biz-chart-tooltip-value\">").concat(lineLabel, "</span>\n        </div>"));
+    var nameArr = name.split('|:|');
+    name = nameArr[0];
+    var orderNum = nameArr[1];
+    htmlArray.push("<div class=\"biz-chart-tooltip-item\">\n          <div class=\"biz-chart-tooltip-content\">\n              <span class=\"".concat(orderNum ? 'biz-tooltip-order' : 'biz-tooltip-marker', "\" style=\"background:").concat(item.color, "\">").concat(orderNum || '', "</span>\n              <div class=\"biz-tooltip-name\">").concat(name, "</div>\n          </div> \n          <span class=\"biz-chart-tooltip-value\">").concat(lineLabel, "</span>\n        </div>"));
   });
   return htmlArray.join('');
 };
@@ -68,14 +71,15 @@ var mapTooltipFormatter = function mapTooltipFormatter(params) {
     htmlArray.push("<div class=\"biz-chart-tooltip-title\">".concat(params.name, "</div>"));
     var childrenOptions = data.childrenOptions;
     childrenOptions.forEach(function (option) {
-      htmlArray.push("<div class=\"biz-chart-tooltip-item\">\n        <span class=\"biz-chart-tooltip-content\">\n          ".concat(option.name, "\n        </span> \n        <span class=\"biz-chart-tooltip-value\">").concat(util.toThousands(option.value), "</span>\n      </div>"));
+      htmlArray.push("<div class=\"biz-chart-tooltip-item\">\n          <div class=\"biz-chart-tooltip-content\">\n                <span class=\"".concat(option.orderNum ? 'biz-tooltip-order' : '', "\">").concat(option.orderNum || '', "</span>\n                <div class=\"biz-tooltip-name\">").concat(option.name, "</div>\n            </div> \n          <span class=\"biz-chart-tooltip-value\">").concat(util.toThousands(option.value), "</span>\n      </div>"));
     });
     return htmlArray.join('');
   }
   return "<div class=\"biz-chart-tooltip-item\"><span class=\"biz-chart-tooltip-content\">".concat(data.name, ": </span><span>").concat(util.toThousands(data.value), "</span></div>");
 };
 var legendFormatterDefault = function legendFormatterDefault(label) {
-  return util.strMiddleSplit(label, {
+  var nameArr = label.split('|:|');
+  return util.strMiddleSplit(nameArr[0], {
     maxLength: maxLength,
     beginLength: maxLength / 2 - 2,
     endLength: maxLength / 2 - 2,

package/es/chart/util/mapUtil.js

@@ -124,7 +124,8 @@ var formatMapData = function formatMapData(seriesData, type) {
     var targetName = item.names.slice(1).join(',');
     var targeItem = {
       name: targetName || areaName,
-      value: item.values[0]
+      value: item.values[0],
+      orderNum: item.orderNum
     };
     if (!areaObjMap[areaName]) {
       areaObjMap[areaName] = {

package/es/datePicker/index.js

@@ -140,13 +140,16 @@ var BizDatePicker = function BizDatePicker(_ref) {
         setDateRange(getDateRange(DatePickerTypes.Unit.day, 1, includeToday));
       }
       if (type.value === 'day') {
-        setDateRange(getDateRange(DatePickerTypes.Unit.day, 1, includeToday));
+        setDateRange(getDateRange(DatePickerTypes.Unit.day, 7, includeToday));
+        setRelative([7, includeToday ? 0 : 1]);
       }
       if (type.value === 'week') {
-        setDateRange(getDateRange(DatePickerTypes.Unit.day, 7, includeToday));
+        setDateRange(getDateRange(DatePickerTypes.Unit.week, 4, includeToday));
+        setRelative([4, includeToday ? 0 : 1]);
       }
       if (type.value === 'month') {
-        setDateRange(getDateRange(DatePickerTypes.Unit.day, 30, includeToday));
+        setDateRange(getDateRange(DatePickerTypes.Unit.month, 1, includeToday));
+        setRelative([1, includeToday ? 0 : 1]);
       }
     }
   }), /*#__PURE__*/React.createElement(PickerShortcut, null), /*#__PURE__*/React.createElement(BizDate, {

package/es/productCondition/types.d.ts

@@ -101,7 +101,7 @@ export declare namespace BizProductConditionT {
         }[];
     }
     interface AttrCondition {
-        attrId: number;
+        attrId: number | string;
         attrName: string;
         operator: AttrConditionOperator;
         params: string[];

package/es/select/demo/index.js

@@ -72,6 +72,7 @@ export default (function () {
     theme: "secondary",
     onChange: onChange,
     disableItemList: disabledList,
-    dropdownExtra: /*#__PURE__*/React.createElement(Button, null, "+ \u6DFB\u52A0")
+    dropdownExtra: /*#__PURE__*/React.createElement(Button, null, "+ \u6DFB\u52A0"),
+    extraLabel: ' (别名)'
   }), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("p", null, "\u5F53\u524D\u9009\u62E9\u7684\u503C\u662F\uFF1A", JSON.stringify(data)));
 });

package/es/select/handle.js

@@ -17,7 +17,8 @@ var SelectHandle = /*#__PURE__*/React.forwardRef(function (props, ref) {
     keyField = props.keyField,
     border = props.border,
     showSelectIcon = props.showSelectIcon,
-    disable = props.disable;
+    disable = props.disable,
+    extraLabel = props.extraLabel;
   var classPrefix = 'biz-select-handle';
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -145,7 +146,7 @@ var SelectHandle = /*#__PURE__*/React.forwardRef(function (props, ref) {
   return /*#__PURE__*/React.createElement("div", {
     ref: handleRef,
     className: "".concat(classPrefix, "-input ").concat(props.theme ? props.theme : '', "\n      ").concat(props.disable ? 'disable' : '', " ").concat(focus ? 'active' : '', " \n      ").concat(mergedStatus ? "".concat(classPrefix, "-status-").concat(mergedStatus) : '', "\n      ").concat(border ? '' : 'borderless', " ").concat(props.size ? props.size : 'middle'),
-    title: props.label || (optionData === null || optionData === void 0 ? void 0 : optionData[aliasField || '']) || (optionData === null || optionData === void 0 ? void 0 : optionData[labelField])
+    title: "".concat(props.label || (optionData === null || optionData === void 0 ? void 0 : optionData[aliasField || '']) || (optionData === null || optionData === void 0 ? void 0 : optionData[labelField]) || '').concat(extraLabel)
   }, /*#__PURE__*/React.createElement("span", {
     className: "".concat(classPrefix, "-content")
   }, /*#__PURE__*/React.createElement("span", {
@@ -154,7 +155,7 @@ var SelectHandle = /*#__PURE__*/React.forwardRef(function (props, ref) {
     className: "".concat(classPrefix, "-icon")
   }, props.value.icon), props.children || props.label || (optionData === null || optionData === void 0 ? void 0 : optionData[aliasField || '']) || (optionData === null || optionData === void 0 ? void 0 : optionData[labelField]) || /*#__PURE__*/React.createElement("span", {
     className: "".concat(classPrefix, "-holder")
-  }, placeholder || '请选择'))), /*#__PURE__*/React.createElement(IconFont, {
+  }, placeholder || '请选择'), extraLabel)), /*#__PURE__*/React.createElement(IconFont, {
     className: "".concat(classPrefix, "-expand-icon").concat(props.open ? ' open' : ''),
     type: 'xiangxia'
   }));
@@ -163,6 +164,7 @@ SelectHandle.defaultProps = {
   labelField: 'label',
   keyField: 'id',
   border: true,
-  showSelectIcon: true
+  showSelectIcon: true,
+  extraLabel: ''
 };
 export default SelectHandle;

package/es/select/index.js

@@ -191,6 +191,7 @@ var BizSelect = function BizSelect(props) {
     showSelectIcon: props.showSelectIcon,
     status: props.status,
     open: visible,
+    extraLabel: props.extraLabel,
     onDelete: onDelete,
     onSearch: function onSearch(v) {
       setSearchValue(v);

package/es/select/types.d.ts

@@ -26,6 +26,7 @@ export declare namespace BizSelectTypes {
         minDropdownWidth?: number;
         options: Group[] | Option[];
         extra?: (option: Option) => ReactNode;
+        extraLabel?: ReactNode;
         dropdownExtra?: ReactNode;
         enableSearch?: boolean;
         enableCreate?: boolean;
@@ -75,6 +76,7 @@ export declare namespace BizSelectTypes {
 }
 export interface HandlerTypes {
     label?: string;
+    extraLabel?: ReactNode;
     children?: ReactNode;
     placeholder?: string;
     value?: BizSelectTypes.Option | BizSelectTypes.Option[];

package/es/targetConditionGroup/types.d.ts

@@ -21,6 +21,7 @@ export declare namespace TargetConditionTypes {
         eventName?: string;
         eventGroupId?: number;
         isBuiltIn?: boolean;
+        marked?: boolean;
     }
     interface Props {
         defaultValue?: Value;

package/es/userCondition/types.d.ts

@@ -100,7 +100,7 @@ export declare namespace BizUserConditionT {
         }[];
     }
     interface AttrCondition {
-        attrId: number;
+        attrId: number | string;
         attrName: string;
         operator: 'is not null' | 'is null' | 'not contains' | 'contains' | 'equal' | 'not equal' | 'begin with' | 'not begin with' | 'end with' | 'not end with' | Unpacked<RunTimesI, 'operator'>;
         params: string[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.2.6",
+  "version": "1.2.8-session.0",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -55,7 +55,7 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "0ac381908b90c9ed5743655821fb348c6c7a645a",
+  "gitHead": "8a2bf276e16ad49832b52b08dc033c8f4aa42319",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }