@zgfe/modules-interval 1.0.0-interval.4 → 1.0.0-interval.6

package/dist/esm/components/eventFilter/index.js

@@ -15,7 +15,7 @@ import React, { useEffect, useRef, useState } from 'react';
 import { BizEventSelector, IconFont, BizAttrConditionGroup } from '@zgfe/business-lib';
 import "./styles/index.less";
 import _ from 'lodash';
-var classPrefix = 'eventfilter-box';
+var classPrefix = 'interval-box';
 var EventFilter = function EventFilter(props) {
   // 筛选条件个数
   var _useState = useState(0),

package/dist/esm/components/eventFilter/styles/index.less

@@ -1,4 +1,4 @@
-.eventfilter-box {
+.interval-box {
   > :nth-child(1) {
     display: flex;
     display: flex;

package/dist/esm/components/renderContent/index.js

@@ -41,16 +41,15 @@ var ContentPanel = function ContentPanel(props) {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-chart-container")
-  }, eventData ? /*#__PURE__*/React.createElement(EventChart, {
-    dataSource: eventData,
-    params: searchData
-  }) : /*#__PURE__*/React.createElement(MiNone, {
-    label: "\u6682\u65E0\u6570\u636E"
-  })), eventData && (_eventData$app_data = eventData.app_data) !== null && _eventData$app_data !== void 0 && (_eventData$app_data$s = _eventData$app_data.series) !== null && _eventData$app_data$s !== void 0 && _eventData$app_data$s.length ? /*#__PURE__*/React.createElement(EventChart, {
+  }, eventData && (_eventData$app_data = eventData.app_data) !== null && _eventData$app_data !== void 0 && (_eventData$app_data$s = _eventData$app_data.series) !== null && _eventData$app_data$s !== void 0 && _eventData$app_data$s.length ? /*#__PURE__*/React.createElement(EventChart, {
     type: "grid",
     dataSource: eventData,
     params: searchData,
     onChangeShow: onChangeShow
-  }) : null);
+  }) : /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-MiNone")
+  }, /*#__PURE__*/React.createElement(MiNone, {
+    label: "\u6682\u65E0\u6570\u636E"
+  }))));
 };
 export default ContentPanel;

package/dist/esm/components/renderContent/styles/index.less

@@ -13,6 +13,17 @@
     }
   }
 
+  &-MiNone {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 100%;
+    height: 368px;
+    padding: 24px 16px;
+    border: 1px solid #ecedf0;
+    border-radius: 8px;
+  }
+
   &-spin-container {
     display: flex;
     align-items: center;

package/dist/esm/components/searchPanel/index.js

@@ -110,6 +110,7 @@ var SearchPanel = function SearchPanel(props) {
     onChange: onChangeTime
   }), /*#__PURE__*/React.createElement(BizSelect, {
     multiple: true,
+    disable: displaySetupList.length === 0,
     onChange: onDimensionChange,
     className: "".concat(classPrefix, "-select"),
     placeholder: "\u8BF7\u9009\u62E9\u663E\u793A\u8BBE\u7F6E",

package/dist/esm/components/table/index.js

@@ -12,7 +12,6 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { ajax, BizGlobalDataContext, BizTable, IconFont } from '@zgfe/business-lib';
 import React, { useContext, useEffect, useMemo, useState } from 'react';
-// import 'highlight.js/styles/vs.css';
 import base64 from "../../utils/base64";
 import { Apis } from "../../constants";
 import { message } from 'antd';
@@ -20,7 +19,7 @@ import { formTableData, getColumns } from "../../utils/formData";
 import "./styles/index.less";
 import { getValue, searchDataParams } from "../../modules/content/utils";
 import { EventContext } from "../../types";
-var classPrefix = 'mi-table';
+var classPrefix = 'mi-interval-table';
 var EventTable = function EventTable(props) {
   var _dataSource$app_data2;
   var dataSource = props.dataSource,
@@ -63,7 +62,7 @@ var EventTable = function EventTable(props) {
     var sortData = formTableData(dataSource);
     setSearchTable(sortData);
     setSortTable(sortData);
-    setTableData(sortData === null || sortData === void 0 ? void 0 : sortData.slice(0, 10));
+    setTableData(sortData);
   }, [dataSource]);
 
   // 表格column
@@ -71,73 +70,16 @@ var EventTable = function EventTable(props) {
     var _dataSource$app_data;
     var _searchData$userGroup = searchData.userGroup,
       userGroup = _searchData$userGroup === void 0 ? [0] : _searchData$userGroup;
-
-    // // 用户钻取
-    // const onClickToDetail = (item: EventProps.ColumnsDataType, time: string, count: number) => {
-    //   let _time = time.split('|');
-    //   let groupValue = '';
-    //   // 有细分属性
-    //   if (searchData.dimension && item.dimension) {
-    //     groupValue = item.dimension;
-    //   } else {
-    //     // 有事件，无细分属性 || 事件概览
-    //     eventGroupList?.forEach((group) => {
-    //       group.eventList?.forEach((event) => {
-    //         if (event.name === item.name) {
-    //           groupValue = event.id.toString();
-    //         }
-    //       });
-    //     });
-    //   }
-
-    //   onUserDrill &&
-    //     onUserDrill(
-    //       {
-    //         appId: currentApp?.appId,
-    //         platform: currentApp?.platform || 0,
-    //         count,
-    //         module: 'event',
-    //         params: {
-    //           groupValue,
-    //           id: searchData.id,
-    //           userGroup: searchData.userGroup,
-    //           chartType: searchData.chartType,
-    //           conditions: searchData.filters?.conditions,
-    //           dimension: searchData.dimension,
-    //           dataType: searchData.id ? 'event' : 'overview',
-    //           time: {
-    //             ...searchData.time,
-    //             begin: _time[0],
-    //             end: _time.length > 1 ? _time[1] : _time[0],
-    //           },
-    //         },
-    //         source: 'EVENT',
-    //         url: '/zg/web/v2/data/appEventBatch',
-    //       },
-    //       {
-    //         source: 'EVENT',
-    //         ...defaultSearch,
-    //         name: panelName,
-    //         data: searchData,
-    //       },
-    //     );
-    // };
-    var _getColumns = getColumns(eventGroupList, userPropList, eventEnvList, (dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$app_data = dataSource.app_data) === null || _dataSource$app_data === void 0 ? void 0 : _dataSource$app_data.x_axis) || [], userGroup, searchData, showList
-    // onClickToDetail,
-    );
-
+    var _getColumns = getColumns(eventGroupList, userPropList, eventEnvList, (dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$app_data = dataSource.app_data) === null || _dataSource$app_data === void 0 ? void 0 : _dataSource$app_data.x_axis) || [], dataSource, userGroup, searchData, showList);
     return _getColumns;
   }, [dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$app_data2 = dataSource.app_data) === null || _dataSource$app_data2 === void 0 ? void 0 : _dataSource$app_data2.x_axis, showList, sortTable, panelName]);
 
   // 监听分页变化，如果页码发生变化则调用合并行方法
   var onChangeTable = function onChangeTable(pagination) {
-    var startNum = (pagination.current - 1) * pagination.pageSize;
-    var endNum = pagination.current * pagination.pageSize;
     setPageData({
       pageSize: pagination.pageSize,
       current: pagination.current
     });
-    setTableData(searchTable === null || searchTable === void 0 ? void 0 : searchTable.slice(startNum, endNum));
   };
 
   // 下载数据
@@ -191,7 +133,7 @@ var EventTable = function EventTable(props) {
     rowKey: "key",
     scroll: {
       x: 800,
-      y: 200
+      y: 550
     },
     onChange: onChangeTable
   }));

package/dist/esm/components/table/styles/index.less

@@ -1,4 +1,4 @@
-.mi-table {
+.mi-interval-table {
   width: 100%;
   margin-top: 16px;
 

package/dist/esm/components/topBar/index.js

@@ -16,7 +16,7 @@ import { BizAddToPanel, BizAddToScene, BizGlobalDataContext } from '@zgfe/busine
 import "./styles/index.less";
 import { EventContext } from "../../types";
 import { chartTypes, platformOption } from "../../constants/fields";
-var classPrefix = 'modules-event-topbar';
+var classPrefix = 'modules-interval-topbar';
 var TopBar = function TopBar(props) {
   // console.log('TopBar', props);
   var _useContext = useContext(EventContext),

package/dist/esm/components/topBar/styles/index.less

@@ -1,6 +1,6 @@
 @import '~@zgfe/business-lib/es/assets/styles/inner.less';
 
-.modules-event-topbar {
+.modules-interval-topbar {
   display: flex;
   justify-content: flex-end;
   margin: 8px 0;

package/dist/esm/modules/chart/index.js

@@ -18,8 +18,7 @@ import { Apis } from "../../constants";
 import { Spin } from 'antd';
 import IntervalChart from "./intervalChart";
 var EventChart = function EventChart(props) {
-  var _dataSource$app_data, _dataSource$app_data$;
-  console.log(888811111, props);
+  var _dataSource$app_data;
   var params = props.params;
   // 显示内容
   var _useState = useState(),
@@ -82,7 +81,7 @@ var EventChart = function EventChart(props) {
       className: "spin-container"
     });
   }
-  if (!dataSource || !(dataSource !== null && dataSource !== void 0 && (_dataSource$app_data = dataSource.app_data) !== null && _dataSource$app_data !== void 0 && (_dataSource$app_data$ = _dataSource$app_data.series) !== null && _dataSource$app_data$ !== void 0 && _dataSource$app_data$.length)) {
+  if (!dataSource || !(dataSource !== null && dataSource !== void 0 && (_dataSource$app_data = dataSource.app_data) !== null && _dataSource$app_data !== void 0 && _dataSource$app_data.series.length)) {
     return /*#__PURE__*/React.createElement(MiNone, {
       label: "\u6682\u65E0\u6570\u636E"
     });

package/dist/esm/modules/content/index.js

@@ -25,7 +25,7 @@ var timer = 0;
 var ajaxFlag = true;
 var CancelToken = Request.CancelToken;
 var cancel;
-var classPrefix = 'event-content';
+var classPrefix = 'interval-content';
 var EventContent = function EventContent(props) {
   // console.log('EventContent', props);
   // 最后的查询数据（防止图表在还没查询时就改变了类型）
@@ -117,9 +117,10 @@ var EventContent = function EventContent(props) {
       return message.error('您查询的属性不一致，暂不支持查询');
     }
     var params = searchDataParams(searchData);
-    // const params = {"app_id":177,"platform":0,"user_group":"0","time":{"dimension_date":"week","begin_date":"2023-08-07","end_date":"2023-09-04"},"start":{"operator":"and","event_id":16530,"event_name":"查看商品A"},"end":{"operator":"and","event_id":16530,"event_name":"查看商品A"},"dimension":{"sub":"user_attr","category":"fixed","user_attr":"name"}}
-    // console.log(666666, searchData, params);
+
+    // const params = {"app_id":501909,"platform":0,"user_group":0,"time":{"dimension_date":"day","begin_date":"2023-08-08","end_date":"2023-09-07"},"start":{"operator":"and","event_id":48618641,"event_name":"Webhook事件"},"end":{"operator":"and","event_id":48618641,"event_name":"Webhook事件"}}
     props.onChange && props.onChange(searchData);
+    console.log(77771111, searchData, params);
     ajax(Apis.dataList, {
       method: 'post',
       data: _objectSpread({

package/dist/esm/modules/content/styles/index.less

@@ -1,4 +1,4 @@
-.event-content {
+.interval-content {
   &-options {
     display: flex;
     justify-content: flex-end;

package/dist/esm/modules/home/index.js

@@ -18,7 +18,7 @@ import { EventContext } from "../../types";
 import { getInitDate } from "../../constants/initData";
 import EventContent from "../content";
 import { chartTypes } from "../../constants";
-var classPrefix = 'event-container';
+var classPrefix = 'interval-container';
 var ModuleInterval = function ModuleInterval(props) {
   // 属性
   var _useContext = useContext(BizGlobalDataContext),

package/dist/esm/modules/home/styles/index.less

@@ -3,7 +3,7 @@
   padding: 0;
 }
 
-.event-container {
+.interval-container {
   width: 100%;
   min-width: 1000px;
   height: 100%;

package/dist/esm/style/index.less

@@ -1,7 +1,11 @@
-.event-form-data {
+.interval-form-data {
   &-table-td {
     padding: 0 !important;
 
+    .ant-table-column-sorters {
+      justify-content: end !important;
+    }
+
     &-show {
       display: flex;
       align-items: center;
@@ -9,6 +13,7 @@
       min-width: 60px;
       height: 48px;
       cursor: pointer;
+
       span {
         width: 10px;
         height: 10px;
@@ -20,6 +25,7 @@
     &-name {
       display: flex;
       align-items: center;
+
       .bsicon {
         margin-right: 4px;
         color: #fd9f41;
@@ -37,6 +43,7 @@
 
     &-link {
       cursor: pointer;
+
       &:hover {
         color: #165dff;
         text-decoration: underline;

package/dist/esm/utils/formData.d.ts

@@ -9,7 +9,7 @@ import { DisplaySetup } from '../components/searchPanel/types';
  * @param columnData xAxis
  * @returns column fields
  */
-export declare function getColumns(eventGroupList: EventGroup[] | undefined, userPropList: UserProp[] | undefined, eventEnvList: EnvProp[] | undefined, columnData: string[], userGroup: number[], searchData: SearchValue, showList: string[]): ColumnsType<EventProps.ColumnsDataType>;
+export declare function getColumns(eventGroupList: EventGroup[] | undefined, userPropList: UserProp[] | undefined, eventEnvList: EnvProp[] | undefined, columnData: string[], dataSource: ResponseDataProps, userGroup: number[], searchData: SearchValue, showList: string[]): ColumnsType<EventProps.ColumnsDataType>;
 /**
  * 获取属性的label
  * @param attrData 当前属性
@@ -27,6 +27,16 @@ export declare function getColumns(eventGroupList: EventGroup[] | undefined, use
  * @returns
  */
 export declare function formTableData(originalData: ChartData): {
+    key: string;
+    time: string;
+    max: number;
+    Q1: number;
+    median: number;
+    Q3: number;
+    min: number;
+    perValue: number;
+    peopleNum: number;
+}[] | {
     key: number;
     time: string;
     max: number;
@@ -36,6 +46,17 @@ export declare function formTableData(originalData: ChartData): {
     min: number;
     perValue: number;
     peopleNum: number;
+    children: {
+        key: string;
+        time: string;
+        max: number;
+        Q1: number;
+        median: number;
+        Q3: number;
+        min: number;
+        perValue: number;
+        peopleNum: number;
+    }[];
 }[] | undefined;
 type ChartData = {
     app_data: {
@@ -49,9 +70,9 @@ type ChartData = {
 };
 export declare function convertDateArray(params: SearchValue | undefined, dateArray: string[]): string[] | undefined;
 /**
- * 获取查询结果的前10条
+ * 获取查询结果
  * @param source 结果数据
- * @returns 获取查询结果的前10条
+ * @returns 获取查询结果
  */
 export declare function getDefaultShow(source: ResponseDataProps, data: DisplaySetup[]): never[] | {
     app_data: any;

package/dist/esm/utils/formData.js

@@ -14,7 +14,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React from 'react';
 import { chartColors } from "../constants/color";
 import "../style/index.less";
-var classPrefix = 'event-form-data';
+var classPrefix = 'interval-form-data';
 function convertToHMS(seconds) {
   var hours = Math.floor(seconds / 3600);
   var h = hours ? hours + '时' : '';
@@ -29,12 +29,13 @@ function convertToHMS(seconds) {
  * @param columnData xAxis
  * @returns column fields
  */
-export function getColumns(eventGroupList, userPropList, eventEnvList, columnData, userGroup, searchData, showList
+export function getColumns(eventGroupList, userPropList, eventEnvList, columnData, dataSource, userGroup, searchData, showList
 // onClickToDetailCallback: Function,
 ) {
+  var _dataSource$app_data, _dataSource$app_data$;
   // 显示
   var data = [{
-    title: '日期',
+    title: dataSource !== null && dataSource !== void 0 && (_dataSource$app_data = dataSource.app_data) !== null && _dataSource$app_data !== void 0 && (_dataSource$app_data$ = _dataSource$app_data.series[0]) !== null && _dataSource$app_data$ !== void 0 && _dataSource$app_data$.names[0] ? '' : '日期',
     width: 148,
     ellipsis: true,
     key: 'time',
@@ -48,9 +49,13 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
     title: '最大值',
     width: 148,
     ellipsis: true,
-    align: 'center',
+    align: 'right',
     dataIndex: 'min',
     key: 'min',
+    sorter: function sorter(a, b) {
+      var _a$min, _b$min;
+      return ((_a$min = a === null || a === void 0 ? void 0 : a.min) !== null && _a$min !== void 0 ? _a$min : 0) - ((_b$min = b === null || b === void 0 ? void 0 : b.min) !== null && _b$min !== void 0 ? _b$min : 0);
+    },
     className: "".concat(classPrefix, "-table-td"),
     render: function render(text, record) {
       return /*#__PURE__*/React.createElement("span", null, " ", convertToHMS(text));
@@ -59,9 +64,13 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
     title: '上四分位',
     width: 148,
     ellipsis: true,
-    align: 'center',
+    align: 'right',
     key: 'Q1',
     dataIndex: 'Q1',
+    sorter: function sorter(a, b) {
+      var _a$min2, _b$min2;
+      return ((_a$min2 = a === null || a === void 0 ? void 0 : a.min) !== null && _a$min2 !== void 0 ? _a$min2 : 0) - ((_b$min2 = b === null || b === void 0 ? void 0 : b.min) !== null && _b$min2 !== void 0 ? _b$min2 : 0);
+    },
     className: "".concat(classPrefix, "-table-td"),
     render: function render(text, record) {
       return /*#__PURE__*/React.createElement("span", null, " ", convertToHMS(text));
@@ -70,8 +79,12 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
     title: '中位数',
     width: 148,
     ellipsis: true,
-    align: 'center',
+    align: 'right',
     dataIndex: 'median',
+    sorter: function sorter(a, b) {
+      var _a$min3, _b$min3;
+      return ((_a$min3 = a === null || a === void 0 ? void 0 : a.min) !== null && _a$min3 !== void 0 ? _a$min3 : 0) - ((_b$min3 = b === null || b === void 0 ? void 0 : b.min) !== null && _b$min3 !== void 0 ? _b$min3 : 0);
+    },
     key: 'median',
     className: "".concat(classPrefix, "-table-td"),
     render: function render(text, record) {
@@ -81,8 +94,12 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
     title: '下四分位',
     width: 148,
     ellipsis: true,
-    align: 'center',
+    align: 'right',
     dataIndex: 'Q3',
+    sorter: function sorter(a, b) {
+      var _a$min4, _b$min4;
+      return ((_a$min4 = a === null || a === void 0 ? void 0 : a.min) !== null && _a$min4 !== void 0 ? _a$min4 : 0) - ((_b$min4 = b === null || b === void 0 ? void 0 : b.min) !== null && _b$min4 !== void 0 ? _b$min4 : 0);
+    },
     key: 'Q3',
     className: "".concat(classPrefix, "-table-td"),
     render: function render(text, record) {
@@ -92,8 +109,12 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
     title: '最小值',
     width: 148,
     ellipsis: true,
-    align: 'center',
+    align: 'right',
     key: 'max',
+    sorter: function sorter(a, b) {
+      var _a$min5, _b$min5;
+      return ((_a$min5 = a === null || a === void 0 ? void 0 : a.min) !== null && _a$min5 !== void 0 ? _a$min5 : 0) - ((_b$min5 = b === null || b === void 0 ? void 0 : b.min) !== null && _b$min5 !== void 0 ? _b$min5 : 0);
+    },
     dataIndex: 'max',
     className: "".concat(classPrefix, "-table-td"),
     render: function render(text, record) {
@@ -103,8 +124,12 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
     title: '人均值',
     width: 148,
     ellipsis: true,
-    align: 'center',
+    align: 'right',
     dataIndex: 'perValue',
+    sorter: function sorter(a, b) {
+      var _a$min6, _b$min6;
+      return ((_a$min6 = a === null || a === void 0 ? void 0 : a.min) !== null && _a$min6 !== void 0 ? _a$min6 : 0) - ((_b$min6 = b === null || b === void 0 ? void 0 : b.min) !== null && _b$min6 !== void 0 ? _b$min6 : 0);
+    },
     key: 'perValue',
     className: "".concat(classPrefix, "-table-td"),
     render: function render(text, record) {
@@ -114,8 +139,12 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
     title: '人数',
     width: 148,
     ellipsis: true,
-    align: 'center',
+    align: 'right',
     dataIndex: 'peopleNum',
+    sorter: function sorter(a, b) {
+      var _a$min7, _b$min7;
+      return ((_a$min7 = a === null || a === void 0 ? void 0 : a.min) !== null && _a$min7 !== void 0 ? _a$min7 : 0) - ((_b$min7 = b === null || b === void 0 ? void 0 : b.min) !== null && _b$min7 !== void 0 ? _b$min7 : 0);
+    },
     key: 'peopleNum',
     className: "".concat(classPrefix, "-table-td"),
     render: function render(text, record) {
@@ -207,7 +236,7 @@ function getChildrenData(data, index) {
     var values = firstSeries.values;
     return x_axis.map(function (time, i) {
       return {
-        key: i + (index + 1) * 10,
+        key: i + (index + 1) * 10 + 'key',
         time: time,
         max: values[i][0] || 0,
         Q1: values[i][1] || 0,
@@ -222,17 +251,21 @@ function getChildrenData(data, index) {
   return [];
 }
 /**
- * 获取查询结果的前10条
+ * 获取查询结果
  * @param source 结果数据
- * @returns 获取查询结果的前10条
+ * @returns 获取查询结果
  */
 export function getDefaultShow(source, data) {
   if (source.app_data.series) {
     var filteredArr = source.app_data.series.filter(function (obj) {
       var names = obj.names;
-      return data.some(function (item) {
-        return names.includes(item.label);
-      });
+      if (!names) {
+        return data.some(function (item) {
+          return names.includes(item.label);
+        });
+      } else {
+        return obj;
+      }
     });
     return _objectSpread(_objectSpread({}, source), {}, {
       app_data: _objectSpread(_objectSpread({}, source.app_data), {}, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-interval",
-  "version": "1.0.0-interval.4",
+  "version": "1.0.0-interval.6",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",