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

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

@@ -1,11 +1,21 @@
-.mi-table {
+.mi-interval-table {
   width: 100%;
   margin-top: 16px;
 
   .ant-table {
     border-radius: 8px;
   }
-
+  .ant-table-cell-with-append .ant-table-row-expand-icon {
+    left: 16px !important;
+    color: #9aa1a9;
+    border: 1px solid #9aa1a9;
+  }
+  .ant-table-row-expand-icon::before {
+    height: 1.4px !important;
+  }
+  .ant-table-row-expand-icon::after {
+    width: 1.4px !important;
+  }
   .ant-table-cell {
     height: 50px;
     padding: 0 16px !important;
@@ -31,26 +41,31 @@
     line-height: 50px;
     background: #fafafb;
     border: 1px solid var(--gray-6, #ecedf0);
+    border-bottom: none;
     border-radius: 8px 8px 0 0;
 
     > :nth-child(2) {
       display: flex;
       margin-top: 9px;
-
       div {
+        display: flex;
+        align-items: center;
         height: 32px;
         padding: 0 16px;
         line-height: 32px;
         background: #fff;
         border: 1px solid #f2f3f4;
+        border-radius: 4px;
         cursor: pointer;
-
         .xiazai1 {
           margin-right: 4px;
-          font-size: 18px !important;
-          vertical-align: -2px;
+          font-size: 16px !important;
         }
       }
+      div:hover {
+        color: #165dff;
+        border: 1px solid #165dff;
+      }
     }
   }
 

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

@@ -11,14 +11,14 @@ 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";
 import { chartTypes, platformOption } from "../../constants/fields";
-var classPrefix = 'modules-event-topbar';
+import { appVersionType } from '@zgfe/business-lib/es/context';
+var classPrefix = 'modules-interval-topbar';
 var TopBar = function TopBar(props) {
-  // console.log('TopBar', props);
   var _useContext = useContext(EventContext),
     panelId = _useContext.panelId,
     afterEditTarget = _useContext.afterEditTarget,
@@ -31,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) {
@@ -54,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);
@@ -66,15 +74,18 @@ var TopBar = function TopBar(props) {
   }, !panelId && /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-panel")
   }, /*#__PURE__*/React.createElement(Button, {
+    disabled: showLoading,
     onClick: function onClick() {
       setShowPanel(true);
     }
   }, "\u6DFB\u52A0\u5230\u770B\u677F"), showPanel && /*#__PURE__*/React.createElement(BizAddToPanel, {
     type: panelType,
-    params: _objectSpread({
-      app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-      module: 'event'
-    }, searchData),
+    params: _objectSpread(_objectSpread({
+      appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+      module: 'interval'
+    }, searchData), {}, {
+      chartType: 'boxplot'
+    }),
     styleOptions: chartTypes,
     onCancel: function onCancel() {
       return closeHandle('panel');
@@ -85,13 +96,14 @@ var TopBar = function TopBar(props) {
   })), enableAddScene && /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-scene")
   }, /*#__PURE__*/React.createElement(Button, {
+    disabled: showLoading,
     onClick: function onClick() {
       setShowScene(true);
     }
   }, "\u6DFB\u52A0\u5E38\u7528\u573A\u666F"), showScene && /*#__PURE__*/React.createElement(BizAddToScene, {
     params: _objectSpread({
-      app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-      module: 'event'
+      appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+      module: 'interval'
     }, searchData),
     onOk: function onOk(data) {
       return _onOk('scene', data);
@@ -99,9 +111,10 @@ var TopBar = function TopBar(props) {
     onCancel: function onCancel() {
       return closeHandle('scene');
     }
-  })), /*#__PURE__*/React.createElement(Button, {
+  })), (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appVersion) === appVersionType.CityCommercialBank ? /*#__PURE__*/React.createElement(Button, {
     className: "".concat(classPrefix, "-earlywarning"),
     type: "primary",
+    disabled: showLoading,
     onClick: function onClick() {
       props.onUserDrill({
         appId: Number(currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId),
@@ -112,7 +125,7 @@ var TopBar = function TopBar(props) {
         url: ''
       }, searchData);
     }
-  }, "\u8BBE\u7F6E\u6D41\u5931\u9884\u8B66"), /*#__PURE__*/React.createElement("div", {
+  }, "\u8BBE\u7F6E\u6D41\u5931\u9884\u8B66") : null, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-platform")
   }, platformOption.map(function (item) {
     return /*#__PURE__*/React.createElement("div", {

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;
@@ -21,6 +21,7 @@
     > div {
       position: relative;
       padding: 0 16px;
+      font-size: 14px;
       background: #fff;
       border: 1px solid #ecedf0;
       cursor: pointer;

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

@@ -1,9 +1,11 @@
-import { SearchValue, UserDrillParamsProp } from '../../types';
+import { ResponseDataProps, SearchValue, UserDrillParamsProp } from '../../types';
 export interface TopBarProps {
     /**
      * @description   标题
      */
     searchData?: SearchValue;
+    loading?: boolean;
+    eventData?: ResponseDataProps;
     onUserDrill: (data: UserDrillParamsProp, searchData: SearchValue) => void;
     platformChange: (data: number) => void;
 }

package/dist/esm/constants/apis.js

@@ -2,6 +2,6 @@ var Apis = {
   // dataList: '/zg/web/v2/data/eventDataList',
   dataList: '/zg/web/v2/interval/intervalData',
   getEventDataSql: '/zg/web/v2/dataSql/getEventDataSql',
-  eventDownloadReport: '/interval/downLoadintervalData.jsp'
+  eventDownloadReport: '/zg/web/v2/interval/downLoadintervalData'
 };
 export default Apis;

package/dist/esm/constants/fields.d.ts

@@ -2,35 +2,11 @@ export declare const platformOption: {
     key: number;
     value: string;
 }[];
-export declare const chartTypes: ({
+export declare const chartTypes: {
     label: string;
     value: string;
     icon: string;
-    children?: undefined;
-    disabled?: undefined;
-} | {
-    label: string;
-    icon: string;
-    value: string;
-    children: ({
-        label: string;
-        value: string;
-        icon: string;
-        disabled?: undefined;
-    } | {
-        label: string;
-        value: string;
-        icon: string;
-        disabled: boolean;
-    })[];
-    disabled?: undefined;
-} | {
-    label: string;
-    value: string;
-    icon: string;
-    disabled: boolean;
-    children?: undefined;
-})[];
+}[];
 export declare const addPanelFields: ({
     label: string;
     name: string;
@@ -66,35 +42,11 @@ export declare const addPanelFields: ({
     label: string;
     name: string;
     type: string;
-    options: ({
-        label: string;
-        value: string;
-        icon: string;
-        children?: undefined;
-        disabled?: undefined;
-    } | {
-        label: string;
-        icon: string;
-        value: string;
-        children: ({
-            label: string;
-            value: string;
-            icon: string;
-            disabled?: undefined;
-        } | {
-            label: string;
-            value: string;
-            icon: string;
-            disabled: boolean;
-        })[];
-        disabled?: undefined;
-    } | {
+    options: {
         label: string;
         value: string;
         icon: string;
-        disabled: boolean;
-        children?: undefined;
-    })[];
+    }[];
     rules: {
         required: boolean;
         message: string;
@@ -128,35 +80,11 @@ export declare const editPanelFields: ({
     label: string;
     name: string;
     type: string;
-    options: ({
-        label: string;
-        value: string;
-        icon: string;
-        children?: undefined;
-        disabled?: undefined;
-    } | {
-        label: string;
-        icon: string;
-        value: string;
-        children: ({
-            label: string;
-            value: string;
-            icon: string;
-            disabled?: undefined;
-        } | {
-            label: string;
-            value: string;
-            icon: string;
-            disabled: boolean;
-        })[];
-        disabled?: undefined;
-    } | {
+    options: {
         label: string;
         value: string;
         icon: string;
-        disabled: boolean;
-        children?: undefined;
-    })[];
+    }[];
     rules: {
         required: boolean;
         message: string;

package/dist/esm/constants/fields.js

@@ -2,59 +2,19 @@ export var platformOption = [{
   key: 0,
   value: '全部'
 }, {
-  key: 1,
-  value: 'Android'
+  key: 3,
+  value: 'JS'
 }, {
   key: 2,
   value: 'IOS'
 }, {
-  key: 3,
-  value: 'JS'
+  key: 1,
+  value: 'Android'
 }];
 export var chartTypes = [{
-  label: '趋势图',
-  value: 'line',
-  icon: 'qushitu1'
-}, {
-  label: '汇总图',
-  value: 'bar',
-  icon: 'huizongtu'
-}, {
-  label: '占比图',
-  value: 'pie',
-  icon: 'bingtu'
-}, {
-  label: '表格',
-  icon: 'biaoge',
-  value: 'grid',
-  children: [{
-    label: '',
-    value: 'line',
-    icon: 'qushitu1'
-  }, {
-    label: '',
-    value: 'bar',
-    icon: 'huizongtu'
-  }, {
-    label: '',
-    value: 'pie',
-    icon: 'bingtu'
-  }, {
-    label: '',
-    value: 'map',
-    icon: 'ditu',
-    disabled: true
-  }]
-}, {
-  label: '地图',
-  value: 'map',
-  icon: 'ditu',
-  disabled: true
-}, {
-  label: '数值',
-  value: 'number',
-  icon: 'fenshu',
-  disabled: true
+  label: '盒须图',
+  value: 'boxplot',
+  icon: 'hexutu'
 }];
 
 // 添加看板弹窗内容

package/dist/esm/index.d.ts

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

package/dist/esm/index.js

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

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

@@ -15,12 +15,18 @@ var CustomTooltip = function CustomTooltip(_ref) {
   var marker = payload === null || payload === void 0 ? void 0 : payload.marker;
   var value = payload === null || payload === void 0 ? void 0 : payload.value;
   return /*#__PURE__*/React.createElement("div", {
-    className: "custom-tooltip"
-  }, /*#__PURE__*/React.createElement("div", null, payload.name), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+    className: "custom-tooltip-chart"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "custom-tooltip-name"
+  }, payload.name, " "), /*#__PURE__*/React.createElement("div", {
+    className: "custom-tooltip-div"
+  }, (series === null || series === void 0 ? void 0 : series.names[0]) && /*#__PURE__*/React.createElement("div", {
+    className: "tooltip-marker"
+  }, /*#__PURE__*/React.createElement("div", {
     dangerouslySetInnerHTML: {
       __html: marker
     }
-  }), (series === null || series === void 0 ? void 0 : series.names[0]) && /*#__PURE__*/React.createElement("div", {
+  }), /*#__PURE__*/React.createElement("div", {
     className: "tooltip-span"
   }, series.names[0])), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
     className: "tooltip-span"

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[];
+    };
 };