@zgfe/business-lib 1.0.0-beta.3 → 1.0.0-beta.6

package/es/analysisLayout/index.d.ts

@@ -1,12 +1,40 @@
 import React from 'react';
 import './index.less';
 declare type AnalysisLayoutProps = {
+    /**
+     * @description    右侧内容模块
+     * @default         -
+     */
     children?: React.ReactNode;
+    /**
+     * @description    左侧内容模块
+     * @default         -
+     */
     leftPanel?: React.ReactNode;
+    /**
+     * @description    左侧底部内容模块
+     * @default         -
+     */
     leftHandle?: React.ReactNode;
+    /**
+     * @description    是否固定
+     * @default         false
+     */
     isFixed?: boolean | false;
+    /**
+     * @description    左侧默认宽度
+     * @default         580
+     */
     defaultLeftWidth?: number;
+    /**
+     * @description    左侧最小宽度
+     * @default         320
+     */
     minWidthOfLeft?: number;
+    /**
+     * @description    左侧最大宽度
+     * @default         320
+     */
     maxWidthOfLeft?: number;
 };
 declare const BizAnalysisLayout: React.FC<AnalysisLayoutProps>;

package/es/analysisLayout/index.js

@@ -108,7 +108,9 @@ var BizAnalysisLayout = function BizAnalysisLayout(props) {
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: "biz-layout-panel"
-  }, leftPanel), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "biz-left-content"
+  }, leftPanel)), /*#__PURE__*/React.createElement("div", {
     className: "biz-layout-bottom"
   }, leftHandle)), showLeft ? /*#__PURE__*/React.createElement(Tooltip, {
     title: function title() {
@@ -144,7 +146,9 @@ var BizAnalysisLayout = function BizAnalysisLayout(props) {
     style: {
       width: "calc(100% - ".concat(width, "px)")
     }
-  }, children));
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "biz-right-content"
+  }, children)));
 };
 
 export default BizAnalysisLayout;

package/es/analysisLayout/index.less

@@ -4,9 +4,8 @@
   position: relative;
   display: flex;
   width: 100%;
-  min-width: 1440px;
   height: 100%;
-  min-height: 900px;
+  overflow: hidden;
 
   .biz-layout-left {
     position: relative;
@@ -35,6 +34,9 @@
       height: calc(100% - 30px);
       padding: @searchPadding;
       overflow: auto;
+      .biz-left-content {
+        min-height: 600px;
+      }
     }
 
     .biz-layout-bottom {
@@ -63,10 +65,15 @@
 
   .biz-layout-right {
     box-sizing: border-box;
-    min-width: 600px;
     padding: @contentPadding;
     overflow: auto;
     background-color: #fff;
+
+    .biz-right-content {
+      min-width: 600px;
+      height: 100%;
+      min-height: 600px;
+    }
   }
 }
 

package/es/attributeSelector/index.d.ts

@@ -12,6 +12,8 @@ export interface AttrsListProps extends BasicOption {
     value_dict?: boolean;
     hidden?: boolean | number;
     dimension_sub?: string | number;
+    id?: number;
+    label?: string;
     [prop: string]: any;
 }
 interface BasicOption {
@@ -29,8 +31,8 @@ export interface AttributeProps {
      */
     value?: string | number | AttrsListProps | null;
     /**
-     * @description       默认选项
-     * @description.zh-CN
+     * @description       默认选项,
+     * @description.zh-CN  可以是属性，也可以是事件属性的attr_name，其他属性的name -> value
      * @default           -
      */
     defaultValue?: string | number | AttrsListProps | null;

package/es/attributeSelector/index.js

@@ -141,12 +141,17 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
       var eList = group.eventList || [];
       eList.forEach(function (event) {
         event.event_attrs.forEach(function (prop) {
+          // prop.attrId = Math.random().toString();
           prop.id = prop.attr_id;
-          prop.name = prop.alias_name || prop.attr_name || '';
+          prop.label = prop.alias_name || prop.attr_name;
           prop.value = prop.attr_name;
+          prop.type = prop.prop_type;
           prop.dimensionId = [prop.dimension_sub, prop.value].join(','); // 增加属性细分唯一字段，区分同名自定义属性
 
-          prop.attrId = Math.random().toString();
+          prop.isEventProp = true;
+          prop.realTime = true;
+          prop.custom = true;
+          prop.attrType = 'EVENT_PROP';
         });
         var randomId = Math.random().toString(); // 事件（分组）添加锚点id
 
@@ -267,12 +272,21 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
       var userOptions = JSON.parse(JSON.stringify(options && options.user || userProps)); // 添加属性
 
       var userList = userOptions.map(function (prop) {
-        prop.name = prop.alias_name || prop.text;
+        prop.attrId = Math.random().toString();
+        prop.label = prop.alias_name || prop.text;
         prop.value = prop.name;
+        prop.isUserProp = true;
         prop.custom = prop.category === 'custom';
+        prop.attrType = 'USER_PROP'; // 内置属性（名称、类型、诸葛ID 、用户ID）： 实时
+
+        if (prop.name === 'name' || prop.name === 'is_anonymous' || prop.name === 'zg_id' || prop.name === 'app_user_id') {
+          prop.realTime = true;
+        } else {
+          prop.realTime = false;
+        }
+
         prop.dimensionId = [prop.dimension_sub, prop.value].join(','); // 增加属性细分唯一字段，区分同名自定义属性
 
-        prop.attrId = Math.random().toString();
         return prop;
       });
       anchors = _objectSpread(_objectSpread({}, anchors), {}, {
@@ -293,11 +307,15 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
       };
       var envOptions = JSON.parse(JSON.stringify(options && options.env || eventEnv));
       var envList = envOptions.map(function (prop) {
+        prop.attrId = Math.random().toString();
+        prop.label = prop.text;
         prop.value = prop.name;
-        prop.name = prop.text;
         prop.dimensionId = [prop.dimension_sub, prop.value].join(','); // 增加属性细分唯一字段，区分同名自定义属性
 
-        prop.attrId = Math.random().toString();
+        prop.isEnvProp = true;
+        prop.realTime = true;
+        prop.custom = false;
+        prop.attrType = 'ENV_PROP';
         return prop;
       });
       anchors = _objectSpread(_objectSpread({}, anchors), {}, {
@@ -345,11 +363,7 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
       var defaultData;
 
       if (_typeof(intoValue) === 'object') {
-        if (intoValue.attr_id) {
-          defaultData = intoValue.attr_name || '';
-        } else {
-          defaultData = intoValue.name || '';
-        }
+        defaultData = intoValue.value || intoValue.attr_name || intoValue.name || '';
       } else {
         defaultData = intoValue || '';
       }
@@ -427,7 +441,7 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
             res = _objectWithoutProperties(attr, _excluded);
 
         var child = _children.filter(function (item) {
-          return item.name && item.name.indexOf(searchValue) > -1;
+          return item.label && item.label.indexOf(searchValue) > -1;
         });
 
         searchOptions.push(_objectSpread(_objectSpread({}, res), {}, {
@@ -456,7 +470,7 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: "biz-input ".concat(children && 'biz-bg-gray')
-  }, attrs.name ? attrs.name : /*#__PURE__*/React.createElement("span", {
+  }, attrs.label ? attrs.label : /*#__PURE__*/React.createElement("span", {
     className: "biz-placeholder"
   }, placeholder)), /*#__PURE__*/React.createElement(IconFont, {
     className: "biz-select-zhankai",
@@ -537,7 +551,8 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
       var _item$name;
 
       return /*#__PURE__*/React.createElement("div", {
-        key: child.attrId,
+        // key={child.attrId}
+        key: child.dimensionId,
         className: "biz-drop-option biz-drop-index boxBg\n                    ".concat(child.value === attrs.value && 'box-active', "\n                    ").concat(child.value && attrs.value !== child.value && disabled.indexOf(child.value) > -1 && 'box-disabled'),
         onClick: function onClick(e) {
           e.stopPropagation();
@@ -567,7 +582,7 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
         type: "".concat(item.name && item.name.indexOf('用户') > -1 ? 'icon-yonghushuxing' : item.name && ((_item$name = item.name) === null || _item$name === void 0 ? void 0 : _item$name.indexOf('事件')) > -1 ? 'icon-shijianshuxing1' : 'icon-chufahuanjing')
       }), /*#__PURE__*/React.createElement("span", {
         dangerouslySetInnerHTML: {
-          __html: util.setHighLight(child.name || '', searchValue)
+          __html: util.setHighLight(child.label || '', searchValue)
         }
       }));
     });

package/es/chart/demo/bar.js

@@ -6,10 +6,10 @@ export default (function () {
     data: chartData,
     type: "bar",
     reverseXAxis: true,
-    seriesName: "fff",
     showList: ['付款成功', '搜索商品', '查看商品详情']
   }), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(BizChart, {
     data: chartData,
-    type: "bar"
+    type: "bar",
+    xRotate: -45
   }));
 });

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

@@ -0,0 +1,8 @@
+declare const _default: {
+    x_axis: string[];
+    series: {
+        names: string[];
+        values: number[];
+    }[];
+};
+export default _default;

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

@@ -0,0 +1,7 @@
+export default {
+  x_axis: ['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', '2022-04-12', '2022-04-13'],
+  series: [{
+    names: ['付款成功'],
+    values: [26, 27, 43, 44, 40, 34, 33, 33, 34, 24, 30, 31, 31, 38]
+  }]
+};

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

@@ -0,0 +1,10 @@
+declare const _default: {
+    x_axis: string[];
+    series: {
+        names: string[];
+        original_names: string[];
+        values: number[];
+        total: never[];
+    }[];
+};
+export default _default;