@zgfe/modules-interval 1.0.0-interval.46 → 1.0.0-interval.47

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

@@ -101,10 +101,12 @@ var TopBar = function TopBar(props) {
       setShowScene(true);
     }
   }, "\u6DFB\u52A0\u5E38\u7528\u573A\u666F"), showScene && /*#__PURE__*/React.createElement(BizAddToScene, {
-    params: _objectSpread({
+    params: _objectSpread(_objectSpread({
       appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
       module: 'interval'
-    }, searchData),
+    }, searchData), {}, {
+      chartType: 'line'
+    }),
     onOk: function onOk(data) {
       return _onOk('scene', data);
     },

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

@@ -11,17 +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 React, { useContext, useEffect, useState } from 'react';
-import { BizGlobalDataContext, ajax } from '@zgfe/business-lib';
+import { BizGlobalDataContext, BizLoading, ajax } from '@zgfe/business-lib';
 import { EventTable, MiNone } from "../../components";
 import { extractNames, getDefaultShow } from "../../utils/formData";
 import { Apis } from "../../constants";
-import { Spin } from 'antd';
 import IntervalChart from "./intervalChart";
 import { searchDataParams } from "../content/utils";
 var IntervalEventChart = function IntervalEventChart(props) {
   var _dataSource$appData2;
-  // console.log(55555, props);
-
   var params = props.params;
   // 显示内容
   var _useState = useState(),
@@ -61,9 +58,9 @@ var IntervalEventChart = function IntervalEventChart(props) {
     }
   }, [params === null || params === void 0 ? void 0 : params.displaySetup, dataSource]);
   var fetchResult = function fetchResult() {
-    var _obj$start, _obj$end;
+    var _obj$start, _obj$end, _params$start, _params$end;
     var obj = searchDataParams(params);
-    if (obj !== null && obj !== void 0 && (_obj$start = obj.start) !== null && _obj$start !== void 0 && _obj$start.eventId && obj !== null && obj !== void 0 && (_obj$end = obj.end) !== null && _obj$end !== void 0 && _obj$end.eventId) {
+    if (obj !== null && obj !== void 0 && (_obj$start = obj.start) !== null && _obj$start !== void 0 && _obj$start.eventId && obj !== null && obj !== void 0 && (_obj$end = obj.end) !== null && _obj$end !== void 0 && _obj$end.eventId || params !== null && params !== void 0 && (_params$start = params.start) !== null && _params$start !== void 0 && _params$start.eventId && params !== null && params !== void 0 && (_params$end = params.end) !== null && _params$end !== void 0 && _params$end.eventId) {
       setLoading(true);
       ajax(Apis.dataList, {
         method: 'post',
@@ -87,9 +84,9 @@ var IntervalEventChart = function IntervalEventChart(props) {
     if (props.onChangeShow) props.onChangeShow(names);
   };
   if (loading) {
-    return /*#__PURE__*/React.createElement(Spin, {
-      className: "spin-container"
-    });
+    return /*#__PURE__*/React.createElement(BizLoading, {
+      className: "mi-common-interval-content"
+    }, /*#__PURE__*/React.createElement("div", null));
   }
   if (!dataSource || !(dataSource !== null && dataSource !== void 0 && (_dataSource$appData2 = dataSource.appData) !== null && _dataSource$appData2 !== void 0 && _dataSource$appData2.series.length)) {
     return /*#__PURE__*/React.createElement(MiNone, {

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

@@ -26,7 +26,6 @@ var CancelToken = Request.CancelToken;
 var cancel;
 var classPrefix = 'interval-content';
 var EventContent = function EventContent(props) {
-  console.log(66666, props);
   // 最后的查询数据（防止图表在还没查询时就改变了类型）
   var _useState = useState(props.value),
     _useState2 = _slicedToArray(_useState, 2),

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

@@ -20,7 +20,6 @@ import EventContent from "../content";
 import { chartTypes } from "../../constants";
 var classPrefix = 'interval-module-container';
 var ModuleInterval = function ModuleInterval(props) {
-  console.log(9999999911111, props);
   // 属性
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp,

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

@@ -23,7 +23,6 @@ var TopPanel = function TopPanel(props) {
     collapseRef = props.collapseRef,
     finalSearchData = props.finalSearchData,
     fetchRequest = props.fetchRequest;
-  console.log('99999999', props);
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];

package/dist/esm/utils/formData.js

@@ -33,7 +33,6 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
 // onClickToDetailCallback: Function,
 ) {
   var _dataSource$appData, _dataSource$appData$s, _searchData$dimension;
-  // console.log(66666661111111, searchData?.dimension?.label);
   // 显示
   var data = [{
     title: dataSource !== null && dataSource !== void 0 && (_dataSource$appData = dataSource.appData) !== null && _dataSource$appData !== void 0 && (_dataSource$appData$s = _dataSource$appData.series[0]) !== null && _dataSource$appData$s !== void 0 && _dataSource$appData$s.names[0] ? searchData === null || searchData === void 0 ? void 0 : (_searchData$dimension = searchData.dimension) === null || _searchData$dimension === void 0 ? void 0 : _searchData$dimension.label : '日期',

package/package.json

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