@zgfe/modules-event 1.0.7 → 1.0.29-zhongyuan.2

package/es/components/renderContent/index.js

@@ -1,11 +1,4 @@
-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 { Empty } from 'antd';
-import React, { useState, useContext, useEffect } from 'react';
+import React, { useContext } from 'react';
 import { BizLoading } from '@zgfe/business-lib';
 import { EventContext } from '../../types';
 import './styles/index.less';
@@ -16,19 +9,15 @@ var ContentPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     searchData = props.searchData;
   var _useContext = useContext(EventContext),
     loading = _useContext.loading,
-    onSelectEvent = _useContext.onSelectEvent;
-  var _useState = useState(props.showList || []),
-    _useState2 = _slicedToArray(_useState, 2),
-    showList = _useState2[0],
-    setShowList = _useState2[1];
-  useEffect(function () {
-    setShowList(props.showList);
-  }, [eventData]);
+    refreshLoading = _useContext.refreshLoading,
+    onSelectEvent = _useContext.onSelectEvent,
+    showListHome = _useContext.showListHome,
+    setShowListHome = _useContext.setShowListHome,
+    completedSearchData = _useContext.completedSearchData;
   var onChangeShow = function onChangeShow(names) {
-    setShowList(names);
-    if (props.onChangeShow) props.onChangeShow(names);
+    setShowListHome(names);
   };
-  if (loading) {
+  if (loading || refreshLoading) {
     return /*#__PURE__*/React.createElement(BizLoading, {
       className: "".concat(classPrefix, "-loading")
     });
@@ -37,19 +26,19 @@ var ContentPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-chart-container")
-  }, eventData ? /*#__PURE__*/React.createElement(EventChart, {
+  }, /*#__PURE__*/React.createElement(EventChart, {
     ref: ref,
     dataSource: eventData,
     params: searchData,
-    showList: showList
-  }) : /*#__PURE__*/React.createElement(Empty, {
-    image: Empty.PRESENTED_IMAGE_SIMPLE,
-    description: "\u6682\u65E0\u6570\u636E"
+    completedSearchData: completedSearchData,
+    showList: showListHome
   })), eventData && eventData.series.length > 0 ? /*#__PURE__*/React.createElement(EventChart, {
     type: "grid",
+    isHideDel: true,
     dataSource: eventData,
     params: searchData,
-    showList: showList,
+    completedSearchData: completedSearchData,
+    showList: showListHome,
     onChangeShow: onChangeShow,
     onSelectEvent: onSelectEvent
   }) : null);

package/es/components/renderContent/styles/index.less

@@ -1,19 +1,19 @@
-@import '~@zgfe/business-lib/es/assets/styles/variable.less';
-
-.render-content {
-  &-chart-container {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 392px;
-    padding: @padding-lg;
-    border: 1px solid @border-color-base;
-    border-radius: @border-radius-normal;
-    .echarts-for-react {
-      width: 100%;
-    }
-  }
-  &-loading {
-    min-height: 300px;
-  }
-}
+@import '~@zgfe/business-lib/es/assets/styles/variable.less';
+
+.render-content {
+  &-chart-container {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 392px;
+    padding: @padding-lg;
+    border: 1px solid @border-color-base;
+    border-radius: @border-radius-normal;
+    .echarts-for-react {
+      width: 100%;
+    }
+  }
+  &-loading {
+    min-height: 300px;
+  }
+}

package/es/components/renderContent/types.d.ts

@@ -2,7 +2,6 @@ import { SearchValue, ResponseDataProps } from '../../types';
 export interface RenderContentProps {
     eventData?: ResponseDataProps;
     searchData?: SearchValue;
-    showList: string[];
     isCity?: boolean;
     afterEditTarget?: (type: string, value?: any) => void;
     onChangeShow?: (data: string[]) => void;

package/es/components/searchPanel/index.js

@@ -10,7 +10,8 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 { BizDatePicker, BizSelect, BizTargetDimension, useChanged } from '@zgfe/business-lib';
+import { BizSelect, BizTargetDimension, useChanged, IconFont, BizDatePickerV2 } from '@zgfe/business-lib';
+import { Button } from 'antd';
 import React, { useContext, useEffect, useState } from 'react';
 import { chartTypeOptions, getInitDate } from '../../constants';
 import { EventContext } from '../../types';
@@ -20,7 +21,9 @@ var classPrefix = 'search-panel';
 var SearchPanel = function SearchPanel(props) {
   var _useContext = useContext(EventContext),
     includeToday = _useContext.includeToday,
-    searchData = _useContext.searchData;
+    searchData = _useContext.searchData,
+    currentApp = _useContext.currentApp,
+    refreshLoading = _useContext.refreshLoading;
   var analysisSubjectType = props.analysisSubjectType,
     dimension = props.dimension,
     setDimension = props.setDimension;
@@ -32,7 +35,7 @@ var SearchPanel = function SearchPanel(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     chart = _useState4[0],
     setChart = _useState4[1];
-  var currentNormalOptions = analysisSubjectType === 'user' ? normalOptions : normalEventOptions;
+  var currentNormalOptions = analysisSubjectType === 'user' ? normalOptions(currentApp === null || currentApp === void 0 ? void 0 : currentApp.type) : normalEventOptions;
   useEffect(function () {
     if (searchData.chartType && searchData.chartType !== chart.value) {
       if (searchData.chartType.indexOf(',') !== -1) {
@@ -89,10 +92,11 @@ var SearchPanel = function SearchPanel(props) {
     style: {
       display: 'flex'
     }
-  }, /*#__PURE__*/React.createElement(BizDatePicker, {
+  }, /*#__PURE__*/React.createElement(BizDatePickerV2, {
     defaultValue: time,
     onChange: onChangeTime,
-    selectRange: 365
+    selectRange: 365,
+    selectRangeUnit: "days"
   }), /*#__PURE__*/React.createElement(BizTargetDimension, {
     normalOptions: currentNormalOptions,
     value: dimension,
@@ -101,7 +105,16 @@ var SearchPanel = function SearchPanel(props) {
     onChange: onDimensionChange
   })), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-search-right")
-  }, props.optionNode, /*#__PURE__*/React.createElement(BizSelect, {
+  }, /*#__PURE__*/React.createElement(Button, {
+    className: "".concat(classPrefix, "-search-right-refresh"),
+    icon: /*#__PURE__*/React.createElement(IconFont, {
+      type: "zhongxinjiazai"
+    }),
+    loading: refreshLoading,
+    onClick: function onClick() {
+      return props.refreshHandle();
+    }
+  }, "\u5237\u65B0"), /*#__PURE__*/React.createElement(BizSelect, {
     className: "".concat(classPrefix, "-select"),
     options: chartTypeOptions,
     defaultValue: chart,

package/es/components/searchPanel/styles/index.less

@@ -1,18 +1,22 @@
-@import '~@zgfe/business-lib/es/assets/styles/variable.less';
-
-.search-panel {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  height: 32px;
-  margin-bottom: 24px;
-
-  &-search-right {
-    display: flex;
-  }
-
-  &-select {
-    width: 112px;
-    margin-left: 16px;
-  }
-}
+@import '~@zgfe/business-lib/es/assets/styles/variable.less';
+
+.search-panel {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 32px;
+  margin-bottom: 24px;
+
+  &-search-right {
+    display: flex;
+    gap: 16px;
+    &-refresh {
+      display: flex !important;
+      gap: 4px;
+    }
+  }
+
+  &-select {
+    width: 112px;
+  }
+}

package/es/components/searchPanel/types.d.ts

@@ -1,6 +1,5 @@
 import { DatePickerTypes } from '@zgfe/business-lib/es/datePicker/types';
 import { EventChartTypes } from '../../types';
-import { ReactNode } from 'react';
 import { TargetConditionTypes } from '@zgfe/business-lib';
 export interface AnalysisSubject {
     subjectId?: number;
@@ -11,13 +10,13 @@ export interface AnalysisSubject {
     subjectName?: string;
 }
 export interface SearchPanelProps {
+    refreshHandle: Function;
     analysisIndex?: string;
     analysisAttr?: string;
     enableSelectChart?: boolean;
     time?: DatePickerTypes.Value;
     eventId?: number;
     chartType?: EventChartTypes;
-    optionNode?: ReactNode;
     onChange?: (data: SearchPanelProps) => void;
     setIsCity?: Function;
     setEnableSelectChart?: Function;
@@ -25,4 +24,5 @@ export interface SearchPanelProps {
     analysisSubject?: AnalysisSubject;
     dimension?: TargetConditionTypes.DimensionValue;
     setDimension?: Function;
+    optionNode?: any;
 }

package/es/components/table/index.js

@@ -4,6 +4,10 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 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); }
@@ -17,7 +21,7 @@ import { CopyToClipboard } from 'react-copy-to-clipboard';
 import 'highlight.js/styles/vs.css';
 import base64 from '../../utils/base64';
 import { Apis } from '../../constants';
-import { Modal, message, Table, ConfigProvider, Empty } from 'antd';
+import { Modal, message, Table, ConfigProvider, Empty, Tooltip } from 'antd';
 import { formTableData, getColumns } from '../../utils/formData';
 import './styles/index.less';
 import { getValue } from '../../modules/content/utils';
@@ -34,17 +38,18 @@ var EventTable = function EventTable(props) {
     tableData = _useState2[0],
     setTableData = _useState2[1];
   var _useContext = useContext(BizGlobalDataContext),
-    currentApp = _useContext.currentApp,
     _useContext$eventGrou = _useContext.eventGroupList,
     eventGroupList = _useContext$eventGrou === void 0 ? [] : _useContext$eventGrou,
     eventEnvList = _useContext.eventEnvList,
     userPropList = _useContext.userPropList,
+    userGroupList = _useContext.userGroupList,
     authority = _useContext.authority;
   var _useContext2 = useContext(EventContext),
     onUserDrill = _useContext2.onUserDrill,
     _useContext2$defaultS = _useContext2.defaultSearch,
     defaultSearch = _useContext2$defaultS === void 0 ? {} : _useContext2$defaultS,
-    panelName = _useContext2.panelName;
+    panelName = _useContext2.panelName,
+    currentApp = _useContext2.currentApp;
   var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
     sqlModal = _useState4[0],
@@ -65,11 +70,37 @@ var EventTable = function EventTable(props) {
     _useState12 = _slicedToArray(_useState11, 2),
     total = _useState12[0],
     setTotal = _useState12[1];
+  var _useState13 = useState(),
+    _useState14 = _slicedToArray(_useState13, 2),
+    pvTitle = _useState14[0],
+    setPvTitle = _useState14[1];
   useEffect(function () {
     var gLen = (searchData === null || searchData === void 0 ? void 0 : searchData.dimension) ? 1 : 0;
     var _data = formTableData(dataSource, searchData.userGroup || [0], gLen);
     setTotal(_data.length);
-    setTableData(_data);
+    var dataAll = [];
+    if (dataSource.userGroupEventTimeSum) {
+      dataSource.userGroupEventTimeSum.map(function (item) {
+        var data = {
+          eventName: '总计',
+          dimension: '总计',
+          isAdd: true,
+          id: Math.random(),
+          name: '总计',
+          nameGroup: '总计',
+          originalName: '总计',
+          userGroup: Object.keys(item)[0]
+        };
+        Object.values(item)[0].forEach(function (item, index) {
+          data["field".concat(index)] = item;
+        });
+        dataAll.push(data);
+      });
+      setPvTitle(dataSource.eventPvTitle.split(';').map(function (item) {
+        return item.split(' ');
+      }));
+    }
+    setTableData([].concat(dataAll, _toConsumableArray(_data)));
   }, []);
   var columns = useMemo(function () {
     var _searchData$userGroup = searchData.userGroup,
@@ -79,6 +110,14 @@ var EventTable = function EventTable(props) {
     };
     var onClickToDetail = function onClickToDetail(item, time, count) {
       var _searchData$filters;
+      var userGroupData = userGroup[0] == null ? [] : [userGroup[0]];
+      if ((userGroup === null || userGroup === void 0 ? void 0 : userGroup.length) > 1) {
+        userGroupList && userGroupList.forEach(function (user) {
+          if (user.name === item.userGroup) {
+            userGroupData = [user.id];
+          }
+        });
+      }
       var _time = time.split('|');
       var groupValue = '';
       if (searchData.dimension && item.dimension) {
@@ -100,7 +139,7 @@ var EventTable = function EventTable(props) {
         params: {
           groupValue: groupValue,
           id: searchData.id,
-          userGroup: searchData.userGroup,
+          userGroup: userGroupData,
           chartType: searchData.chartType,
           conditions: (_searchData$filters = searchData.filters) === null || _searchData$filters === void 0 ? void 0 : _searchData$filters.conditions,
           dimension: searchData.dimension,
@@ -128,7 +167,7 @@ var EventTable = function EventTable(props) {
       method: 'post',
       data: _objectSpread({
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-        platform: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform) || 0,
+        platform: (searchData === null || searchData === void 0 ? void 0 : searchData.platform) || 0,
         service: !searchData.dimension ? 'event/overview_sql' : 'event_sql'
       }, searchData)
     }).then(function (res) {
@@ -140,7 +179,7 @@ var EventTable = function EventTable(props) {
   };
   var download = function download() {
     var seriesNames = [];
-    if (searchData.userGroup && searchData.userGroup.length > 1) {
+    if (searchData.userGroup && (searchData.userGroup.length > 1 || searchData.userGroup[0] !== 0)) {
       seriesNames.push(base64.encode('用户群'));
     }
     if (searchData.dimension) {
@@ -152,7 +191,7 @@ var EventTable = function EventTable(props) {
     var fname = "\u4E8B\u4EF6\u5206\u6790-".concat((searchData === null || searchData === void 0 ? void 0 : searchData.name) ? getEventAliasName(searchData === null || searchData === void 0 ? void 0 : searchData.name, eventGroupList) : '事件概览');
     var params = _objectSpread(_objectSpread({
       appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-      platform: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform) || 0
+      platform: (searchData === null || searchData === void 0 ? void 0 : searchData.platform) || 0
     }, searchData), {}, {
       down: {
         fname: base64.encode(fname),
@@ -183,7 +222,18 @@ var EventTable = function EventTable(props) {
     className: classPrefix
   }, !sourcePanel && /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-table-header")
-  }, /*#__PURE__*/React.createElement("span", null, "\u6307\u6807\u8BE6\u60C5"), /*#__PURE__*/React.createElement("div", null, authority[100051] && /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("span", {
+    className: "".concat(classPrefix, "-table-header-left")
+  }, "\u6307\u6807\u8BE6\u60C5", pvTitle && pvTitle.length ? /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-table-header-left-box")
+  }, "\uFF08\u4E8B\u4EF6\u603B\u91CF\uFF1A", /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-table-header-left-content")
+  }, pvTitle.map(function (item, index) {
+    return /*#__PURE__*/React.createElement(Tooltip, {
+      title: item[0] + '：' + item[1],
+      key: index
+    }, /*#__PURE__*/React.createElement("span", null, item[0], "\uFF1A"), /*#__PURE__*/React.createElement("span", null, item[1], index === pvTitle.length - 1 ? '' : ' ｜ '));
+  }), "\uFF09")) : null), /*#__PURE__*/React.createElement("div", null, authority[100051] && /*#__PURE__*/React.createElement("div", {
     onClick: seeSql
   }, "\u67E5\u770BSQL"), authority[100050] && /*#__PURE__*/React.createElement("div", {
     onClick: download
@@ -203,6 +253,7 @@ var EventTable = function EventTable(props) {
     },
     pagination: {
       showQuickJumper: true,
+      showSizeChanger: true,
       total: total,
       defaultPageSize: 10,
       defaultCurrent: 1,