@zgfe/modules-interval 1.0.0-interval.30 → 1.0.0-interval.32

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.
Files changed (10) hide show
  1. package/dist/esm/components/eventFilter/index.js +1 -1
  2. package/dist/esm/components/topBar/index.js +1 -2
  3. package/dist/esm/modules/chart/index.js +6 -5
  4. package/dist/esm/modules/chart/index.less +1 -1
  5. package/dist/esm/modules/chart/intervalChart.js +1 -1
  6. package/dist/esm/modules/content/index.js +1 -1
  7. package/dist/esm/modules/topPanel/index.js +15 -13
  8. package/dist/esm/modules/topPanel/styles/index.less +1 -1
  9. package/dist/esm/types.d.ts +3 -0
  10. package/package.json +1 -1
package/dist/esm/components/eventFilter/index.js CHANGED
@@ -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);
package/dist/esm/components/topBar/index.js CHANGED
@@ -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
- }, searchDataParams(searchData)), {}, {
86
+ }, searchData), {}, {
88
87
  chartType: 'boxplot'
89
88
  }),
90
89
  styleOptions: chartTypes,
package/dist/esm/modules/chart/index.js CHANGED
@@ -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 _params$start, _params$end;
63
- if (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) {
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
- platform: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform) || 0
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;
package/dist/esm/modules/chart/index.less CHANGED
@@ -11,7 +11,7 @@
11
11
  font-weight: 500;
12
12
  font-size: 12px;
13
13
  font-style: normal;
14
- background: rgba(250, 251, 253, 0.8);
14
+ // background: rgba(250, 251, 253, 0.8);
15
15
  border-radius: 10px;
16
16
  box-shadow: 0px 4px 10px 0px #0000001a;
17
17
 
package/dist/esm/modules/chart/intervalChart.js CHANGED
@@ -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, {
package/dist/esm/modules/content/index.js CHANGED
@@ -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.eventId ? finalSearchData : searchDataParams(searchData);
134
+ var params = finalSearchData !== null && finalSearchData !== void 0 && (_finalSearchData$star2 = finalSearchData.start) !== null && _finalSearchData$star2 !== void 0 && _finalSearchData$star2.id ? searchDataParams(finalSearchData) : searchDataParams(searchData);
135
135
  props.onChange && props.onChange(searchData);
136
136
  // console.log(77771111, searchData, params);
137
137
  ajax(Apis.dataList, {
package/dist/esm/modules/topPanel/index.js CHANGED
@@ -17,7 +17,8 @@ import EventFilter from "../../components/eventFilter";
17
17
  import "./styles/index.less";
18
18
  var classPrefix = 'top-panel-interval';
19
19
  var TopPanel = function TopPanel(props) {
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;
20
+ var _defaultValue$associa, _finalSearchData$asso, _defaultValue$associa2, _finalSearchData$asso2, _defaultValue$associa3, _finalSearchData$asso3, _defaultValue$associa4, _finalSearchData$asso4, _defaultValue$associa5, _finalSearchData$asso5, _defaultValue$associa6, _finalSearchData$asso6, _defaultValue$associa7, _finalSearchData$asso7, _defaultValue$associa8, _finalSearchData$asso8, _defaultValue$dimensi, _finalSearchData$dime, _defaultValue$dimensi2, _finalSearchData$dime2, _defaultValue$dimensi3, _finalSearchData$dime3, _defaultValue$dimensi4, _finalSearchData$dime4;
21
+ console.log(777777, props);
21
22
  var defaultValue = props.defaultValue,
22
23
  loading = props.loading,
23
24
  collapseRef = props.collapseRef,
@@ -154,22 +155,22 @@ var TopPanel = function TopPanel(props) {
154
155
  start: defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.start,
155
156
  end: defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.end,
156
157
  associatedNextAttr: _objectSpread(_objectSpread({}, defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.associated_next_attr), {}, {
157
- dimensionSub: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa = defaultValue.associated_next_attr) === null || _defaultValue$associa === void 0 ? void 0 : _defaultValue$associa.dimension_sub,
158
- isHidden: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa2 = defaultValue.associated_next_attr) === null || _defaultValue$associa2 === void 0 ? void 0 : _defaultValue$associa2.is_hidden,
159
- propCategory: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa3 = defaultValue.associated_next_attr) === null || _defaultValue$associa3 === void 0 ? void 0 : _defaultValue$associa3.prop_category,
160
- eventId: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa4 = defaultValue.associated_next_attr) === null || _defaultValue$associa4 === void 0 ? void 0 : _defaultValue$associa4.event_id
158
+ dimensionSub: (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa = defaultValue.associated_next_attr) === null || _defaultValue$associa === void 0 ? void 0 : _defaultValue$associa.dimension_sub) || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$asso = finalSearchData.associatedNextAttr) === null || _finalSearchData$asso === void 0 ? void 0 : _finalSearchData$asso.dimensionSub),
159
+ isHidden: (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa2 = defaultValue.associated_next_attr) === null || _defaultValue$associa2 === void 0 ? void 0 : _defaultValue$associa2.is_hidden) || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$asso2 = finalSearchData.associatedNextAttr) === null || _finalSearchData$asso2 === void 0 ? void 0 : _finalSearchData$asso2.isHidden),
160
+ propCategory: (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa3 = defaultValue.associated_next_attr) === null || _defaultValue$associa3 === void 0 ? void 0 : _defaultValue$associa3.prop_category) || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$asso3 = finalSearchData.associatedNextAttr) === null || _finalSearchData$asso3 === void 0 ? void 0 : _finalSearchData$asso3.propCategory),
161
+ eventId: (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa4 = defaultValue.associated_next_attr) === null || _defaultValue$associa4 === void 0 ? void 0 : _defaultValue$associa4.event_id) || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$asso4 = finalSearchData.associatedNextAttr) === null || _finalSearchData$asso4 === void 0 ? void 0 : _finalSearchData$asso4.eventId)
161
162
  }),
162
163
  associatedPreAttr: _objectSpread(_objectSpread({}, defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.associated_pre_attr), {}, {
163
- dimensionSub: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa5 = defaultValue.associated_pre_attr) === null || _defaultValue$associa5 === void 0 ? void 0 : _defaultValue$associa5.dimension_sub,
164
- isHidden: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa6 = defaultValue.associated_pre_attr) === null || _defaultValue$associa6 === void 0 ? void 0 : _defaultValue$associa6.is_hidden,
165
- propCategory: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa7 = defaultValue.associated_pre_attr) === null || _defaultValue$associa7 === void 0 ? void 0 : _defaultValue$associa7.prop_category,
166
- eventId: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa8 = defaultValue.associated_pre_attr) === null || _defaultValue$associa8 === void 0 ? void 0 : _defaultValue$associa8.event_id
164
+ dimensionSub: (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa5 = defaultValue.associated_pre_attr) === null || _defaultValue$associa5 === void 0 ? void 0 : _defaultValue$associa5.dimension_sub) || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$asso5 = finalSearchData.associatedPreAttr) === null || _finalSearchData$asso5 === void 0 ? void 0 : _finalSearchData$asso5.dimensionSub),
165
+ isHidden: (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa6 = defaultValue.associated_pre_attr) === null || _defaultValue$associa6 === void 0 ? void 0 : _defaultValue$associa6.is_hidden) || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$asso6 = finalSearchData.associatedPreAttr) === null || _finalSearchData$asso6 === void 0 ? void 0 : _finalSearchData$asso6.isHidden),
166
+ propCategory: (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa7 = defaultValue.associated_pre_attr) === null || _defaultValue$associa7 === void 0 ? void 0 : _defaultValue$associa7.prop_category) || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$asso7 = finalSearchData.associatedPreAttr) === null || _finalSearchData$asso7 === void 0 ? void 0 : _finalSearchData$asso7.propCategory),
167
+ eventId: (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa8 = defaultValue.associated_pre_attr) === null || _defaultValue$associa8 === void 0 ? void 0 : _defaultValue$associa8.event_id) || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$asso8 = finalSearchData.associatedPreAttr) === null || _finalSearchData$asso8 === void 0 ? void 0 : _finalSearchData$asso8.eventId)
167
168
  }),
168
169
  dimension: _objectSpread(_objectSpread({}, defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.dimension), {}, {
169
- dimensionSub: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$dimensi = defaultValue.dimension) === null || _defaultValue$dimensi === void 0 ? void 0 : _defaultValue$dimensi.dimension_sub,
170
- isHidden: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$dimensi2 = defaultValue.dimension) === null || _defaultValue$dimensi2 === void 0 ? void 0 : _defaultValue$dimensi2.is_hidden,
171
- propCategory: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$dimensi3 = defaultValue.dimension) === null || _defaultValue$dimensi3 === void 0 ? void 0 : _defaultValue$dimensi3.prop_category,
172
- eventId: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$dimensi4 = defaultValue.dimension) === null || _defaultValue$dimensi4 === void 0 ? void 0 : _defaultValue$dimensi4.event_id
170
+ dimensionSub: (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$dimensi = defaultValue.dimension) === null || _defaultValue$dimensi === void 0 ? void 0 : _defaultValue$dimensi.dimension_sub) || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$dime = finalSearchData.dimension) === null || _finalSearchData$dime === void 0 ? void 0 : _finalSearchData$dime.dimensionSub),
171
+ isHidden: (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$dimensi2 = defaultValue.dimension) === null || _defaultValue$dimensi2 === void 0 ? void 0 : _defaultValue$dimensi2.is_hidden) || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$dime2 = finalSearchData.dimension) === null || _finalSearchData$dime2 === void 0 ? void 0 : _finalSearchData$dime2.isHidden),
172
+ propCategory: (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$dimensi3 = defaultValue.dimension) === null || _defaultValue$dimensi3 === void 0 ? void 0 : _defaultValue$dimensi3.prop_category) || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$dime3 = finalSearchData.dimension) === null || _finalSearchData$dime3 === void 0 ? void 0 : _finalSearchData$dime3.propCategory),
173
+ eventId: (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$dimensi4 = defaultValue.dimension) === null || _defaultValue$dimensi4 === void 0 ? void 0 : _defaultValue$dimensi4.event_id) || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$dime4 = finalSearchData.dimension) === null || _finalSearchData$dime4 === void 0 ? void 0 : _finalSearchData$dime4.eventId)
173
174
  })
174
175
  },
175
176
  scrollToFirstError: true,
@@ -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, {
package/dist/esm/modules/topPanel/styles/index.less CHANGED
@@ -89,7 +89,7 @@
89
89
  }
90
90
 
91
91
  .biz-attr-condition-group-container {
92
- gap: 4px !important;
92
+ gap: 0px !important;
93
93
  }
94
94
 
95
95
  .biz-attr-condition-group-container-item {
package/dist/esm/types.d.ts CHANGED
@@ -9,10 +9,13 @@ export interface bizAttributeSelectorValueProp {
9
9
  propCategory?: string;
10
10
  prop_category?: string;
11
11
  dimension_sub?: string;
12
+ dimensionSub?: string;
12
13
  label?: string;
13
14
  is_hidden?: string;
15
+ isHidden?: string;
14
16
  real_time?: string;
15
17
  event_id?: string;
18
+ eventId?: string;
16
19
  category?: string;
17
20
  value?: number | string;
18
21
  key?: number | string;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zgfe/modules-interval",
3
- "version": "1.0.0-interval.30",
3
+ "version": "1.0.0-interval.32",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",