@zgfe/modules-interval 1.0.0-interval.13 → 1.0.0-interval.15

package/dist/esm/assets/business/iconfont.json

@@ -5,6 +5,55 @@
   "css_prefix_text": "",
   "description": "诸葛业务平台",
   "glyphs": [
+    {
+      "icon_id": "37343412",
+      "name": "盒须图",
+      "font_class": "hexutu",
+      "unicode": "e796",
+      "unicode_decimal": 59286
+    },
+    {
+      "icon_id": "37316029",
+      "name": "全屏展示",
+      "font_class": "quanpingzhanshi",
+      "unicode": "e6a3",
+      "unicode_decimal": 59043
+    },
+    {
+      "icon_id": "37316033",
+      "name": "流向图",
+      "font_class": "liuxiangtu",
+      "unicode": "e78f",
+      "unicode_decimal": 59279
+    },
+    {
+      "icon_id": "37316032",
+      "name": "旭日图",
+      "font_class": "xuritu",
+      "unicode": "e790",
+      "unicode_decimal": 59280
+    },
+    {
+      "icon_id": "37316031",
+      "name": "桑基图",
+      "font_class": "sangjitu",
+      "unicode": "e791",
+      "unicode_decimal": 59281
+    },
+    {
+      "icon_id": "37316030",
+      "name": "树形图",
+      "font_class": "shuxingtu",
+      "unicode": "e792",
+      "unicode_decimal": 59282
+    },
+    {
+      "icon_id": "37316028",
+      "name": "全屏收起",
+      "font_class": "quanpingshouqi",
+      "unicode": "e793",
+      "unicode_decimal": 59283
+    },
     {
       "icon_id": "36957204",
       "name": "对勾",
@@ -656,13 +705,6 @@
       "unicode": "e6a5",
       "unicode_decimal": 59045
     },
-    {
-      "icon_id": "31389407",
-      "name": "全屏展示",
-      "font_class": "quanpingzhanshi",
-      "unicode": "e6a3",
-      "unicode_decimal": 59043
-    },
     {
       "icon_id": "31360676",
       "name": "收藏",

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

@@ -8,7 +8,7 @@ import { Spin } from 'antd';
 import React, { useEffect, useState } from 'react';
 import { MiNone, MiSpin } from '..';
 import "./styles/index.less";
-import EventChart from "../../modules/chart";
+import IntervalEventChart from "../../modules/chart";
 var classPrefix = 'render-content-interval';
 var ContentPanel = function ContentPanel(props) {
   var _eventData$appData, _eventData$appData$se;
@@ -41,8 +41,8 @@ var ContentPanel = function ContentPanel(props) {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-chart-container")
-  }, eventData && (_eventData$appData = eventData.appData) !== null && _eventData$appData !== void 0 && (_eventData$appData$se = _eventData$appData.series) !== null && _eventData$appData$se !== void 0 && _eventData$appData$se.length ? /*#__PURE__*/React.createElement(EventChart, {
-    type: "grid",
+  }, eventData && (_eventData$appData = eventData.appData) !== null && _eventData$appData !== void 0 && (_eventData$appData$se = _eventData$appData.series) !== null && _eventData$appData$se !== void 0 && _eventData$appData$se.length ? /*#__PURE__*/React.createElement(IntervalEventChart, {
+    type: "boxplot",
     dataSource: eventData,
     params: searchData,
     onChangeShow: onChangeShow

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

@@ -11,7 +11,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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 { Button } from 'antd';
-import React, { useContext, useState } from 'react';
+import React, { useContext, useEffect, useState } from 'react';
 import { BizAddToPanel, BizAddToScene, BizGlobalDataContext } from '@zgfe/business-lib';
 import "./styles/index.less";
 import { EventContext } from "../../types";
@@ -19,7 +19,6 @@ import { chartTypes, platformOption } from "../../constants/fields";
 import { searchDataParams } from "../../modules/content/utils";
 var classPrefix = 'modules-interval-topbar';
 var TopBar = function TopBar(props) {
-  var _props$eventData, _props$eventData$appD, _props$eventData$appD2, _props$eventData2, _props$eventData2$app, _props$eventData2$app2, _props$eventData3, _props$eventData3$app, _props$eventData3$app2;
   var _useContext = useContext(EventContext),
     panelId = _useContext.panelId,
     afterEditTarget = _useContext.afterEditTarget,
@@ -32,19 +31,23 @@ var TopBar = function TopBar(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     showScene = _useState4[0],
     setShowScene = _useState4[1];
+  var _useState5 = useState(true),
+    _useState6 = _slicedToArray(_useState5, 2),
+    showLoading = _useState6[0],
+    setShowLoading = _useState6[1];
   var _useContext2 = useContext(BizGlobalDataContext),
     currentApp = _useContext2.currentApp;
   var searchData = props.searchData,
     platformChange = props.platformChange;
-  var _useState5 = useState((searchData === null || searchData === void 0 ? void 0 : searchData.platform) === undefined ? 0 : searchData.platform),
-    _useState6 = _slicedToArray(_useState5, 2),
-    selectPlatform = _useState6[0],
-    setselectPlatform = _useState6[1];
-  // 看板弹窗类型
-  var _useState7 = useState(),
+  var _useState7 = useState((searchData === null || searchData === void 0 ? void 0 : searchData.platform) === undefined ? 0 : searchData.platform),
     _useState8 = _slicedToArray(_useState7, 2),
-    panelType = _useState8[0],
-    setPanelType = _useState8[1];
+    selectPlatform = _useState8[0],
+    setselectPlatform = _useState8[1];
+  // 看板弹窗类型
+  var _useState9 = useState(),
+    _useState10 = _slicedToArray(_useState9, 2),
+    panelType = _useState10[0],
+    setPanelType = _useState10[1];
 
   // 关闭弹窗
   var closeHandle = function closeHandle(type) {
@@ -55,7 +58,11 @@ var TopBar = function TopBar(props) {
       setShowScene(false);
     }
   };
-
+  useEffect(function () {
+    if (props.eventData !== undefined) {
+      setShowLoading(false);
+    }
+  }, [props.eventData]);
   // 保存
   var _onOk = function onOk(type, val) {
     // console.log('onOk', type, val);
@@ -67,7 +74,7 @@ var TopBar = function TopBar(props) {
   }, !panelId && /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-panel")
   }, /*#__PURE__*/React.createElement(Button, {
-    disabled: !(props !== null && props !== void 0 && props.eventData) || (props === null || props === void 0 ? void 0 : (_props$eventData = props.eventData) === null || _props$eventData === void 0 ? void 0 : (_props$eventData$appD = _props$eventData.appData) === null || _props$eventData$appD === void 0 ? void 0 : (_props$eventData$appD2 = _props$eventData$appD.series) === null || _props$eventData$appD2 === void 0 ? void 0 : _props$eventData$appD2.length) === 0,
+    disabled: showLoading,
     onClick: function onClick() {
       setShowPanel(true);
     }
@@ -89,7 +96,7 @@ var TopBar = function TopBar(props) {
   })), enableAddScene && /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-scene")
   }, /*#__PURE__*/React.createElement(Button, {
-    disabled: !(props !== null && props !== void 0 && props.eventData) || (props === null || props === void 0 ? void 0 : (_props$eventData2 = props.eventData) === null || _props$eventData2 === void 0 ? void 0 : (_props$eventData2$app = _props$eventData2.appData) === null || _props$eventData2$app === void 0 ? void 0 : (_props$eventData2$app2 = _props$eventData2$app.series) === null || _props$eventData2$app2 === void 0 ? void 0 : _props$eventData2$app2.length) === 0,
+    disabled: showLoading,
     onClick: function onClick() {
       setShowScene(true);
     }
@@ -97,17 +104,17 @@ var TopBar = function TopBar(props) {
     params: _objectSpread({
       appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
       module: 'interval'
-    }, searchDataParams(searchData)),
+    }, searchData),
     onOk: function onOk(data) {
       return _onOk('scene', data);
     },
     onCancel: function onCancel() {
       return closeHandle('scene');
     }
-  })), (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appVersion) === 1 || (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appVersion) === 2 ? /*#__PURE__*/React.createElement(Button, {
+  })), (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appVersion) === 2 ? /*#__PURE__*/React.createElement(Button, {
     className: "".concat(classPrefix, "-earlywarning"),
     type: "primary",
-    disabled: !(props !== null && props !== void 0 && props.eventData) || (props === null || props === void 0 ? void 0 : (_props$eventData3 = props.eventData) === null || _props$eventData3 === void 0 ? void 0 : (_props$eventData3$app = _props$eventData3.appData) === null || _props$eventData3$app === void 0 ? void 0 : (_props$eventData3$app2 = _props$eventData3$app.series) === null || _props$eventData3$app2 === void 0 ? void 0 : _props$eventData3$app2.length) === 0,
+    disabled: showLoading,
     onClick: function onClick() {
       props.onUserDrill({
         appId: Number(currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId),

package/dist/esm/components/topBar/types.d.ts

@@ -4,6 +4,7 @@ export interface TopBarProps {
      * @description   标题
      */
     searchData?: SearchValue;
+    loading?: boolean;
     eventData?: ResponseDataProps;
     onUserDrill: (data: UserDrillParamsProp, searchData: SearchValue) => void;
     platformChange: (data: number) => void;

package/dist/esm/constants/fields.js

@@ -14,7 +14,7 @@ export var platformOption = [{
 export var chartTypes = [{
   label: '盒须图',
   value: 'boxplot',
-  icon: 'qushitu1'
+  icon: 'hexutu'
 }];
 
 // 添加看板弹窗内容

package/dist/esm/index.d.ts

@@ -1,4 +1,4 @@
 /// <reference path="../typings.d.ts" />
-import IntervalChart from './modules/chart/intervalChart';
+import IntervalEventChart from './modules/chart';
 import ModuleInterval from './modules/home';
-export { ModuleInterval, IntervalChart };
+export { ModuleInterval, IntervalEventChart };

package/dist/esm/index.js

@@ -1,4 +1,4 @@
 /// <reference path="../typings.d.ts" />
-import IntervalChart from "./modules/chart/intervalChart";
+import IntervalEventChart from "./modules/chart";
 import ModuleInterval from "./modules/home";
-export { ModuleInterval, IntervalChart };
+export { ModuleInterval, IntervalEventChart };

package/dist/esm/modules/chart/demo/data.d.ts

@@ -1,79 +1,42 @@
-export declare const result: {
-    xAxis: string[];
-    series: ({
-        duration: never[];
-        index: string;
-        names: string[];
-        values: number[];
-    } | {
-        duration: {
-            name: string;
-            values: number[];
-        }[];
-        index: null;
-        names: string[];
-        values: number[];
-    })[];
-};
-export declare const totalResult: {
-    xAxis: string[];
-    series: ({
-        duration: never[];
-        index: string;
-        names: string[];
-        original_names: never[];
-        p_total: never[];
-        total: never[];
-        values: number[];
-    } | {
-        duration: never[];
-        index: null;
-        names: string[];
-        original_names: never[];
-        p_total: never[];
-        total: never[];
-        values: number[];
-    })[];
-};
 export declare const searchData: {
-    targets: {
-        type: string;
-        alias: string;
-        eventId: number;
-        eventName: string;
-        eventGroupId: number;
-        analysisDimension: {
-            analysisIndex: string;
-        };
-    }[];
-    userGroup: number[];
+    appId: number;
     time: {
-        unit: string;
-        relative: number[];
-        begin: string;
-        end: string;
+        dimensionDate: string;
+        beginDate: string;
+        endDate: string;
     };
-    chartType: string;
-};
-export declare const totalSearchData: {
-    appId: number;
     platform: number;
-    targets: {
-        type: string;
-        alias: string;
+    userGroup: number[];
+    start: {
+        operator: string;
         eventId: number;
         eventName: string;
-        eventGroupId: number;
-        analysisDimension: {
-            analysisIndex: string;
-        };
-    }[];
-    userGroup: number[];
-    time: {
-        unit: string;
-        relative: number[];
-        begin: string;
-        end: string;
     };
-    chartType: string;
+    end: {
+        operator: string;
+        eventId: number;
+        eventName: string;
+    };
+    dimension: null;
+};
+export declare const searchDataParams: {
+    appData: {
+        huanbi: never[];
+        series: {
+            diyTarget: boolean;
+            duration: never[];
+            index: null;
+            names: never[];
+            originalNames: never[];
+            pNext: never[];
+            pTotal: never[];
+            resultFormat: null;
+            total: never[];
+            values: number[][];
+        }[];
+        tongbi: never[];
+        total: never[];
+        xAxis: string[];
+        yesterDay: never[];
+    };
 };