@zgfe/business-lib 1.2.3-session.0 → 1.2.3

package/es/attrCondition/demo/group.js

@@ -1,25 +1,6 @@
 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 = {
@@ -34,14 +15,15 @@ export default (function () {
       operator: 'equal',
       attrName: 'is_anonymous'
     }, {
-      attrId: 'sa_duration',
-      propCategory: 'extraProp',
-      type: 2,
-      operator: 'gt',
-      values: ['158400', '1'],
-      label: 'Session时长',
-      attrName: 'Session时长',
-      subtype: 2
+      attrId: 0,
+      propCategory: 'userProp',
+      values: ['30', '1'],
+      dimensionSub: 'last_visit_time',
+      label: '最后一次访问时间',
+      type: 3,
+      category: 'fixed',
+      operator: 'relative',
+      attrName: 'last_visit_time'
     }],
     relation: 'and'
   };
@@ -56,7 +38,6 @@ 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,24 +1,5 @@
 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
@@ -28,7 +9,6 @@ export default (function () {
       background: '#fff'
     }
   }, /*#__PURE__*/React.createElement(BizAttrCondition, {
-    extra: extraList,
     onChange: function onChange(condition) {
       console.log(condition);
     }

package/es/attrCondition/group.js

@@ -9,8 +9,7 @@ var BizAttrConditionGroup = /*#__PURE__*/React.forwardRef(function (props, ref)
     enableEventProp = props.enableEventProp,
     enableUserProp = props.enableUserProp,
     enableEnvProp = props.enableEnvProp,
-    disableItemList = props.disableItemList,
-    extra = props.extra;
+    disableItemList = props.disableItemList;
   var _useConditionGroup = useConditionGroup(props, ref),
     loading = _useConditionGroup.loading,
     conditions = _useConditionGroup.conditions,
@@ -53,7 +52,6 @@ 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,8 +65,7 @@ var BizAttrCondition = function BizAttrCondition(props) {
     theme: theme,
     destroyPopupOnHide: props.destroyPopupOnHide,
     placeholder: "\u8BF7\u9009\u62E9\u5C5E\u6027",
-    status: isAttrError ? 'error' : '',
-    extra: props.extra
+    status: isAttrError ? 'error' : ''
   }), 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,17 +55,6 @@ 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) === PropCategory.UserProp || (attr === null || attr === void 0 ? void 0 : attr.propCategory) === PropCategory.ExtraProp) && (attr === null || attr === void 0 ? void 0 : attr.subtype) === 2) {
+      if ((attr === null || attr === void 0 ? void 0 : attr.propCategory) === 'userProp' && (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.propCategory) === PropCategory.ExtraProp) && (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.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 === PropCategory.UserProp || attr.propCategory === PropCategory.ExtraProp) && attr.subtype === 2 && numberAfter);
+    }), attr.propCategory === 'userProp' && attr.subtype === 2 && numberAfter);
   } else {
     if (operate === OperateTypes.Absolute) {
       return /*#__PURE__*/React.createElement(RangePicker, {

package/es/attrConditions/group.js

@@ -9,8 +9,7 @@ var BizConditionGroup = function BizConditionGroup(props, ref) {
     enableEventProp = props.enableEventProp,
     enableUserProp = props.enableUserProp,
     enableEnvProp = props.enableEnvProp,
-    disableItemList = props.disableItemList,
-    extra = props.extra;
+    disableItemList = props.disableItemList;
   var _useConditionGroup = useConditionGroup(props, ref),
     loading = _useConditionGroup.loading,
     conditions = _useConditionGroup.conditions,
@@ -48,7 +47,6 @@ 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,11 +20,6 @@ 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;
@@ -73,8 +68,7 @@ var BizConditionItem = function BizConditionItem(props) {
       return _onDelete(e);
     },
     theme: theme,
-    destroyPopupOnHide: props.destroyPopupOnHide,
-    extra: props.extra
+    destroyPopupOnHide: props.destroyPopupOnHide
   }), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-panel")
   }, /*#__PURE__*/React.createElement(BizOperateList, {

package/es/attrConditions/types.d.ts

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

package/es/attributeSelector/demo/index.js

@@ -35,6 +35,7 @@ export default (function () {
       eventEnvList: store.envPropList
     }
   }, /*#__PURE__*/React.createElement(BizAttributeSelector, {
+    isNumber: true,
     enableEventProp: true,
     enableUserProp: true,
     eventIdList: [24143016],

package/es/attributeSelector/index.js

@@ -22,7 +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),
     currentAttr = _useState2[0],
@@ -84,16 +84,6 @@ 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;
   }
@@ -118,12 +108,14 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
         id: id
       }, props), {}, {
         value: currentAttr,
-        onChange: onChange
+        onChange: onChange,
+        isNumber: isNumber
       }));
     },
     trigger: ['click'],
     overlayStyle: {
-      minWidth: width < 284 ? 284 : width > 520 ? 520 : width
+      minWidth: 284,
+      width: width
     },
     open: visible,
     onOpenChange: onVisibleChange,

package/es/attributeSelector/listPanel.js

@@ -23,7 +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),
     searchValue = _useState2[0],
@@ -58,71 +58,18 @@ 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 _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 anchor = {
+    container: "container-".concat(id),
+    event: "event".concat(id),
+    user: "user".concat(id),
+    env: "env".concat(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 = {
@@ -156,7 +103,9 @@ var AttrListPanel = function AttrListPanel(props) {
             groupName: event.alias || event.name,
             anchor: hasAnchor ? String(Math.random()) : anchor.event,
             key: "event-".concat(event.id),
-            children: event.attrList.slice()
+            children: event.attrList.slice().filter(function (item) {
+              return isNumber ? item.type === 2 : true;
+            })
           };
           list.push(group);
         });
@@ -199,7 +148,7 @@ var AttrListPanel = function AttrListPanel(props) {
       });
     }
     setOptionList(list);
-  }, [anchor, eventIdMap, userPropList, eventEnvList, eventIdList, props.showCommonProp]);
+  }, [eventIdMap, userPropList, eventEnvList, eventIdList, props.showCommonProp]);
   useEffect(function () {
     setCurrentAttr(props.value);
   }, [props.value]);
@@ -264,14 +213,22 @@ var AttrListPanel = function AttrListPanel(props) {
     getContainer: function getContainer() {
       return document.getElementById(anchor.container);
     }
-  }, 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)
-    });
+  }, 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")
   }))) : null, /*#__PURE__*/React.createElement("div", {
     id: anchor.container,
     className: "".concat(classPrefix, "-container")

package/es/attributeSelector/styles/index.less

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

package/es/attributeSelector/types.d.ts

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

package/es/attributeSelector/types.js

@@ -9,7 +9,6 @@ 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/data4.d.ts

@@ -0,0 +1,24 @@
+declare const _default: {
+    series: ({
+        type: string;
+        names: string[];
+        values: number[];
+        duration?: undefined;
+        index?: undefined;
+    } | {
+        duration: never[];
+        type: string;
+        index: string;
+        names: string[];
+        values: number[];
+    })[];
+    xAxis: string[];
+};
+export default _default;
+export declare const barData: {
+    xAxis: string[];
+    series: {
+        names: string[];
+        values: number[];
+    }[];
+};

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

@@ -0,0 +1,60 @@
+export default {
+  series: [{
+    type: 'bar',
+    names: ['histogramFirstUv'],
+    values: [0, 0, 1, 0, 0, 10000, 0, 0, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+  }, {
+    duration: [],
+    type: 'bar',
+    index: '人数',
+    names: ['histogramSecondUv'],
+    values: [0, 0, 0, 0, 0, 0, 10000, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+  }, {
+    duration: [],
+    type: 'bar',
+    index: '人数',
+    names: ['lineChartFirstUv'],
+    values: [0, 0, 0, 0, 0, 0, 0, 10000, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+  }, {
+    duration: [],
+    type: 'bar',
+    index: '人数',
+    names: ['lineChartSecondUv'],
+    values: [0, 0, 0, 0, 0, 0, 0, 10000, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+  }, {
+    duration: [],
+    type: 'line',
+    index: '额度',
+    names: ['histogramFirstNv'],
+    values: [0, 0, 1, 0, 0, 0, 0, 0, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+  }, {
+    duration: [],
+    type: 'line',
+    index: '额度',
+    names: ['histogramSecondNv'],
+    values: [0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+  }, {
+    duration: [],
+    type: 'line',
+    index: '额度',
+    names: ['lineChartFirstNv'],
+    values: [0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 10, 20, 40, 80, 160, 320, 640, 1280, 2560, 5120, 10240, 20480, 40960, 81920]
+  }, {
+    duration: [],
+    type: 'line',
+    index: '额度',
+    names: ['lineChartSecondNv'],
+    values: [0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+  }],
+  xAxis: ['2023-10-25 00:00:00', '2023-10-25 01:00:00', '2023-10-25 02:00:00', '2023-10-25 03:00:00', '2023-10-25 04:00:00', '2023-10-25 05:00:00', '2023-10-25 06:00:00', '2023-10-25 07:00:00', '2023-10-25 08:00:00', '2023-10-25 09:00:00', '2023-10-25 10:00:00', '2023-10-25 11:00:00', '2023-10-25 12:00:00', '2023-10-25 13:00:00', '2023-10-25 14:00:00', '2023-10-25 15:00:00', '2023-10-25 16:00:00', '2023-10-25 17:00:00', '2023-10-25 18:00:00', '2023-10-25 19:00:00', '2023-10-25 20:00:00', '2023-10-25 21:00:00', '2023-10-25 22:00:00', '2023-10-25 23:00:00']
+};
+export var barData = {
+  xAxis: ['2022-08-23|2022-08-30'],
+  series: [{
+    names: ['北京市', '所有用户', '查看商品'],
+    values: [1560]
+  }, {
+    names: ['北京市', '最近7天活跃用户', '查看商品'],
+    values: [1560]
+  }]
+};

package/es/{attributeSelector/demo/extra.d.ts → chart/demo/line_bar.d.ts}

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

package/es/chart/demo/line_bar.js

@@ -0,0 +1,11 @@
+import React from 'react';
+import { BizChart } from '@zgfe/business-lib';
+import data from './data/data4';
+export default (function () {
+  return /*#__PURE__*/React.createElement(BizChart, {
+    data: data,
+    type: "line_bar",
+    showAll: false,
+    legendPosition: "bottom"
+  });
+});

package/es/chart/index.js

@@ -107,8 +107,8 @@ var BizChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
     if (type === 'pie') {
       var rData = formatPieData(data, showAll, showList, props.showOther);
       eOption = getPieOption(rData, legendPosition, legendOrient, props.showLabel, props.radius, props.center, tooltipFormatter);
-    } else if (type === 'line' || type === 'bar') {
-      var _rData = formatChartData(data, showAll, showList, reverseXAxis, colors);
+    } else if (type === 'line' || type === 'bar' || type === 'line_bar') {
+      var _rData = formatChartData(data, showAll, showList, reverseXAxis, colors, type === 'line_bar');
       eOption = getChartOption(type, _rData, legendPosition, legendOrient, valueUnit, xRotate, yRotate, tooltipFormatter, xAxisFormatter, yAxisFormatter, legendFormatter, reverseXAxis, seriesName);
     } else if (type === 'map') {
       var series = isCity ? citySeries(data) : provinceSeries(data);
@@ -122,6 +122,7 @@ var BizChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
     if (type === 'line') {
       eOption = dashedLineFormat(eOption);
     }
+    console.log('eOption', eOption);
     setChartOption(function () {
       return _objectSpread({}, eOption);
     });

package/es/chart/types.d.ts

@@ -28,7 +28,7 @@ export declare namespace ChartTypes {
         };
     }
     interface Props {
-        type?: 'bar' | 'pie' | 'line' | 'map';
+        type?: 'bar' | 'pie' | 'line' | 'map' | 'line_bar';
         data?: Value;
         option?: EChartsOption;
         isCity?: boolean;

package/es/chart/util/chartOptionConfig.js

@@ -157,7 +157,8 @@ export var getChartOption = function getChartOption(chartType, data) {
   if (!reverseXAxis) {
     series = data.series.map(function (item) {
       return _objectSpread(_objectSpread(_objectSpread({}, item), seriesItem), {}, {
-        type: chartType
+        type: chartType === 'line_bar' ? item.type : chartType,
+        yAxisIndex: item.type === 'line' ? 0 : 1
       });
     });
   } else {
@@ -165,7 +166,8 @@ export var getChartOption = function getChartOption(chartType, data) {
       name: seriesName || '',
       data: data.series
     }, seriesItem), {}, {
-      type: chartType
+      type: chartType === 'line_bar' ? seriesItem.type : chartType,
+      yAxisIndex: seriesItem.type === 'line' ? 0 : 1
     })];
   }
   tooltip.axisPointer = tooltip.axisPointer || {};
@@ -190,10 +192,12 @@ export var getChartOption = function getChartOption(chartType, data) {
     legend.icon = 'circle';
   }
   legend.formatter = legendFormatter ? legendFormatter : legendFormatterDefault;
+  var dealyAxis = [yAxis, yAxis];
+  console.log('yAxis', dealyAxis);
   return _objectSpread(_objectSpread({}, baseConfig), {}, {
     legend: legend,
     xAxis: xAxis,
-    yAxis: yAxis,
+    yAxis: dealyAxis,
     tooltip: tooltip,
     grid: grid,
     series: series

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

@@ -6,7 +6,7 @@ export declare const formatPieData: (data: ChartTypes.Value, showAll?: boolean,
         color: string;
     };
 }[];
-export declare const formatChartData: (data: ChartTypes.Value, showAll?: boolean, showList?: Array<any>, reverseXAxis?: boolean, color?: string[]) => {
+export declare const formatChartData: (data: ChartTypes.Value, showAll?: boolean, showList?: Array<any>, reverseXAxis?: boolean, color?: string[], isUseSelf?: boolean) => {
     xAxis: string[];
     series: any;
     resultFormatMap: {

package/es/chart/util/formatData.js

@@ -28,7 +28,7 @@ export var formatPieData = function formatPieData(data, showAll, showList, showO
   if (showOther && !showAll && other.value > 0) list.push(other);
   return list;
 };
-export var formatChartData = function formatChartData(data, showAll, showList, reverseXAxis, color) {
+export var formatChartData = function formatChartData(data, showAll, showList, reverseXAxis, color, isUseSelf) {
   var showMap = getShowMap(showList);
   var xAxisData = data.xAxis || data.x_axis;
   var xAxis = reverseXAxis && data.series.length ? [] : xAxisData;
@@ -56,7 +56,8 @@ export var formatChartData = function formatChartData(data, showAll, showList, r
       } else {
         sData.push({
           name: name,
-          data: seriesItem.values
+          data: seriesItem.values,
+          type: isUseSelf ? seriesItem.type : undefined
         });
       }
     }

package/es/datePicker/index.js

@@ -136,6 +136,18 @@ var BizDatePicker = function BizDatePicker(_ref) {
       if (type.value === 'custom') {
         setDateRange(getDateRange(DatePickerTypes.Unit.day, 7, includeToday));
       }
+      if (type.value === 'hour') {
+        setDateRange(getDateRange(DatePickerTypes.Unit.day, 1, includeToday));
+      }
+      if (type.value === 'day') {
+        setDateRange(getDateRange(DatePickerTypes.Unit.day, 1, includeToday));
+      }
+      if (type.value === 'week') {
+        setDateRange(getDateRange(DatePickerTypes.Unit.day, 7, includeToday));
+      }
+      if (type.value === 'month') {
+        setDateRange(getDateRange(DatePickerTypes.Unit.day, 30, includeToday));
+      }
     }
   }), /*#__PURE__*/React.createElement(PickerShortcut, null), /*#__PURE__*/React.createElement(BizDate, {
     selectRange: selectRange

package/es/select/demo/index.js

@@ -72,7 +72,6 @@ export default (function () {
     theme: "secondary",
     onChange: onChange,
     disableItemList: disabledList,
-    dropdownExtra: /*#__PURE__*/React.createElement(Button, null, "+ \u6DFB\u52A0"),
-    extraLabel: ' (别名)'
+    dropdownExtra: /*#__PURE__*/React.createElement(Button, null, "+ \u6DFB\u52A0")
   }), /*#__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,8 +17,7 @@ var SelectHandle = /*#__PURE__*/React.forwardRef(function (props, ref) {
     keyField = props.keyField,
     border = props.border,
     showSelectIcon = props.showSelectIcon,
-    disable = props.disable,
-    extraLabel = props.extraLabel;
+    disable = props.disable;
   var classPrefix = 'biz-select-handle';
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -146,7 +145,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: "".concat(props.label || (optionData === null || optionData === void 0 ? void 0 : optionData[aliasField || '']) || (optionData === null || optionData === void 0 ? void 0 : optionData[labelField]) || '').concat(extraLabel)
+    title: 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, "-content")
   }, /*#__PURE__*/React.createElement("span", {
@@ -155,7 +154,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 || '请选择'), extraLabel)), /*#__PURE__*/React.createElement(IconFont, {
+  }, placeholder || '请选择'))), /*#__PURE__*/React.createElement(IconFont, {
     className: "".concat(classPrefix, "-expand-icon").concat(props.open ? ' open' : ''),
     type: 'xiangxia'
   }));
@@ -164,7 +163,6 @@ SelectHandle.defaultProps = {
   labelField: 'label',
   keyField: 'id',
   border: true,
-  showSelectIcon: true,
-  extraLabel: ''
+  showSelectIcon: true
 };
 export default SelectHandle;

package/es/select/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.2.3-session.0",
+  "version": "1.2.3",
   "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": "606cac66fdf2ee6464434df5778c7873d1de4733",
+  "gitHead": "691c01390d4672d59fe4f686bbe7ee0a41046a10",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }

package/es/attributeSelector/demo/extra.js

@@ -1,80 +0,0 @@
-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, { 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'
-  }, {
-    id: 'se_duration',
-    label: '事件使用时长',
-    propCategory: 'extraProp',
-    key: 'extraProp-se_duration'
-  }]
-}, {
-  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({
-      propCategory: 'extraProp',
-      key: 'extraProp-click',
-      id: 'page_duration'
-    }),
-    _useState2 = _slicedToArray(_useState, 2),
-    attribute = _useState2[0],
-    setAttribute = _useState2[1];
-  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: extraList,
-    disableItemList: [{
-      id: 'click',
-      propCategory: 'extraProp'
-    }]
-  })));
-});