@zgfe/modules-interval 1.0.0-interval.30 → 1.0.0-interval.31
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/esm/components/eventFilter/index.js +1 -1
- package/dist/esm/components/topBar/index.js +1 -2
- package/dist/esm/modules/chart/index.js +6 -5
- package/dist/esm/modules/chart/index.less +1 -1
- package/dist/esm/modules/chart/intervalChart.js +1 -1
- package/dist/esm/modules/content/index.js +1 -1
- package/dist/esm/modules/topPanel/index.js +2 -0
- package/dist/esm/modules/topPanel/styles/index.less +1 -1
- package/package.json +1 -1
|
@@ -168,7 +168,7 @@ var EventFilter = function EventFilter(props) {
|
|
|
168
168
|
style: {
|
|
169
169
|
marginLeft: 24
|
|
170
170
|
},
|
|
171
|
-
checked: relevancy,
|
|
171
|
+
checked: relevancy && !props.relevancyFl,
|
|
172
172
|
disabled: props.relevancyFl,
|
|
173
173
|
onChange: function onChange(checked) {
|
|
174
174
|
return setRelevancy(checked);
|
|
@@ -16,7 +16,6 @@ import { BizAddToPanel, BizAddToScene, BizGlobalDataContext } from '@zgfe/busine
|
|
|
16
16
|
import "./styles/index.less";
|
|
17
17
|
import { EventContext } from "../../types";
|
|
18
18
|
import { chartTypes, platformOption } from "../../constants/fields";
|
|
19
|
-
import { searchDataParams } from "../../modules/content/utils";
|
|
20
19
|
import { appVersionType } from '@zgfe/business-lib/es/context';
|
|
21
20
|
var classPrefix = 'modules-interval-topbar';
|
|
22
21
|
var TopBar = function TopBar(props) {
|
|
@@ -84,7 +83,7 @@ var TopBar = function TopBar(props) {
|
|
|
84
83
|
params: _objectSpread(_objectSpread({
|
|
85
84
|
appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
|
|
86
85
|
module: 'interval'
|
|
87
|
-
},
|
|
86
|
+
}, searchData), {}, {
|
|
88
87
|
chartType: 'boxplot'
|
|
89
88
|
}),
|
|
90
89
|
styleOptions: chartTypes,
|
|
@@ -17,6 +17,7 @@ import { extractNames, getDefaultShow } from "../../utils/formData";
|
|
|
17
17
|
import { Apis } from "../../constants";
|
|
18
18
|
import { Spin } from 'antd';
|
|
19
19
|
import IntervalChart from "./intervalChart";
|
|
20
|
+
import { searchDataParams } from "../content/utils";
|
|
20
21
|
var IntervalEventChart = function IntervalEventChart(props) {
|
|
21
22
|
var _dataSource$appData2;
|
|
22
23
|
console.log(55555, props);
|
|
@@ -59,15 +60,15 @@ var IntervalEventChart = function IntervalEventChart(props) {
|
|
|
59
60
|
}
|
|
60
61
|
}, [params === null || params === void 0 ? void 0 : params.displaySetup, dataSource]);
|
|
61
62
|
var fetchResult = function fetchResult() {
|
|
62
|
-
var
|
|
63
|
-
|
|
63
|
+
var _obj$start, _obj$end;
|
|
64
|
+
var obj = searchDataParams(params);
|
|
65
|
+
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) {
|
|
64
66
|
setLoading(true);
|
|
65
67
|
ajax(Apis.dataList, {
|
|
66
68
|
method: 'post',
|
|
67
69
|
data: _objectSpread({
|
|
68
|
-
appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
|
|
69
|
-
|
|
70
|
-
}, params)
|
|
70
|
+
appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
|
|
71
|
+
}, obj)
|
|
71
72
|
}).then(function (res) {
|
|
72
73
|
if (!res) {
|
|
73
74
|
return;
|
|
@@ -109,7 +109,7 @@ var IntervalChart = function IntervalChart(props) {
|
|
|
109
109
|
tooltip: {
|
|
110
110
|
show: true,
|
|
111
111
|
// 单独配置series中的tooltip为显示
|
|
112
|
-
extraCssText: 'border: none;padding:0;border-radius:10px',
|
|
112
|
+
extraCssText: 'border: none;padding:0;border-radius:10px;background: rgba(250, 251, 253, 0.8)',
|
|
113
113
|
// 添加自定义的CSS样式，去掉边框
|
|
114
114
|
formatter: function formatter(params) {
|
|
115
115
|
var tooltipString = renderToString( /*#__PURE__*/React.createElement(CustomTooltip, {
|
|
@@ -131,7 +131,7 @@ var EventContent = function EventContent(props) {
|
|
|
131
131
|
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)) {
|
|
132
132
|
return message.error('您查询的属性不一致，暂不支持查询');
|
|
133
133
|
}
|
|
134
|
-
var params = finalSearchData !== null && finalSearchData !== void 0 && (_finalSearchData$star2 = finalSearchData.start) !== null && _finalSearchData$star2 !== void 0 && _finalSearchData$star2.
|
|
134
|
+
var params = finalSearchData !== null && finalSearchData !== void 0 && (_finalSearchData$star2 = finalSearchData.start) !== null && _finalSearchData$star2 !== void 0 && _finalSearchData$star2.id ? finalSearchData : searchDataParams(searchData);
|
|
135
135
|
props.onChange && props.onChange(searchData);
|
|
136
136
|
// console.log(77771111, searchData, params);
|
|
137
137
|
ajax(Apis.dataList, {
|
|
@@ -18,6 +18,7 @@ import "./styles/index.less";
|
|
|
18
18
|
var classPrefix = 'top-panel-interval';
|
|
19
19
|
var TopPanel = function TopPanel(props) {
|
|
20
20
|
var _defaultValue$associa, _defaultValue$associa2, _defaultValue$associa3, _defaultValue$associa4, _defaultValue$associa5, _defaultValue$associa6, _defaultValue$associa7, _defaultValue$associa8, _defaultValue$dimensi, _defaultValue$dimensi2, _defaultValue$dimensi3, _defaultValue$dimensi4;
|
|
21
|
+
console.log(777777, props);
|
|
21
22
|
var defaultValue = props.defaultValue,
|
|
22
23
|
loading = props.loading,
|
|
23
24
|
collapseRef = props.collapseRef,
|
|
@@ -249,6 +250,7 @@ var TopPanel = function TopPanel(props) {
|
|
|
249
250
|
onChangeAttr(undefined, 'associatedPreAttr');
|
|
250
251
|
onChangeAttr(undefined, 'associatedNextAttr');
|
|
251
252
|
setRelevancy(false);
|
|
253
|
+
setRelevancyFl(true);
|
|
252
254
|
},
|
|
253
255
|
className: "bsicon qingchu"
|
|
254
256
|
})) : '', /*#__PURE__*/React.createElement(Form.Item, {
|