@zgfe/modules-interval 1.0.0-interval.37 → 1.0.0-interval.39

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

@@ -20,11 +20,13 @@ var CustomTooltip = function CustomTooltip(_ref) {
     className: "custom-tooltip-name"
   }, payload.name, " "), /*#__PURE__*/React.createElement("div", {
     className: "custom-tooltip-div"
-  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("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/index.js

@@ -20,7 +20,8 @@ import IntervalChart from "./intervalChart";
 import { searchDataParams } from "../content/utils";
 var IntervalEventChart = function IntervalEventChart(props) {
   var _dataSource$appData2;
-  console.log(55555, props);
+  // console.log(55555, props);
+
   var params = props.params;
   // 显示内容
   var _useState = useState(),

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

@@ -51,7 +51,7 @@
       justify-content: space-between;
     }
 
-    > div:nth-child(1) {
+    .tooltip-marker {
       justify-content: flex-start;
     }
   }

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('5555555', props);
   // 最后的查询数据（防止图表在还没查询时就改变了类型）
   var _useState = useState(props.value),
     _useState2 = _slicedToArray(_useState, 2),
@@ -128,12 +127,8 @@ var EventContent = function EventContent(props) {
     if (searchData !== null && searchData !== void 0 && (_searchData$associate = searchData.associatedNextAttr) !== null && _searchData$associate !== void 0 && _searchData$associate.type && (searchData === null || searchData === void 0 ? void 0 : (_searchData$associate2 = searchData.associatedPreAttr) === null || _searchData$associate2 === void 0 ? void 0 : _searchData$associate2.type) !== (searchData === null || searchData === void 0 ? void 0 : (_searchData$associate3 = searchData.associatedNextAttr) === null || _searchData$associate3 === void 0 ? void 0 : _searchData$associate3.type)) {
       return message.error('您查询的属性不一致，暂不支持查询');
     }
-    // const params = finalSearchData?.module === "interval"
-    //   ? searchDataParams(finalSearchData)
-    //   : searchDataParams(searchData);
     var params = searchDataParams(searchData);
     props.onChange && props.onChange(searchData);
-    // console.log(77771111, searchData, params);
     ajax(Apis.dataList, {
       method: 'post',
       data: _objectSpread({
@@ -160,10 +155,10 @@ var EventContent = function EventContent(props) {
 
   // 改变时间和图表类型
   var onChangeContent = function onChangeContent(data) {
-    setAjaxFlag(true);
     setSearchData(function (value) {
       return _objectSpread(_objectSpread({}, value), data);
     });
+    setAjaxFlag(true);
   };
 
   // 改变显示内容
@@ -173,21 +168,23 @@ var EventContent = function EventContent(props) {
 
   // 平台变更
   var platformChange = function platformChange(data) {
-    setAjaxFlag(true);
-    setSearchData(function (_searchData) {
-      return _objectSpread(_objectSpread({}, _searchData), {}, {
+    setSearchData(function (value) {
+      return _objectSpread(_objectSpread({}, value), {}, {
         platform: data
       });
     });
+    setTimeout(function () {
+      setAjaxFlag(true);
+    }, 100);
   };
 
   // TopPanel组件数值变更
   var onChangeSearch = function onChangeSearch(data, flag) {
-    setAjaxFlag(false);
     data.id ? setEventId(data.id) : setEventId(-1);
     setSearchData(function (_searchData) {
       return _objectSpread(_objectSpread({}, _searchData), data);
     });
+    setAjaxFlag(false);
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TopBar, {
     searchData: searchData,

package/dist/esm/utils/formData.js

@@ -32,11 +32,11 @@ function convertToHMS(seconds) {
 export function getColumns(eventGroupList, userPropList, eventEnvList, columnData, dataSource, userGroup, searchData, showList
 // onClickToDetailCallback: Function,
 ) {
-  var _searchData$dimension, _dataSource$appData, _dataSource$appData$s, _searchData$dimension2;
-  console.log(66666661111111, searchData === null || searchData === void 0 ? void 0 : (_searchData$dimension = searchData.dimension) === null || _searchData$dimension === void 0 ? void 0 : _searchData$dimension.label);
+  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$dimension2 = searchData.dimension) === null || _searchData$dimension2 === void 0 ? void 0 : _searchData$dimension2.label : '日期',
+    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 : '日期',
     width: 148,
     ellipsis: true,
     key: 'time',

package/package.json

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