@zgfe/modules-interval 1.0.0-interval.31 → 1.0.0-interval.33

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 (5) hide show
  1. package/dist/esm/components/eventFilter/index.js +4 -0
  2. package/dist/esm/modules/content/index.js +1 -1
  3. package/dist/esm/modules/topPanel/index.js +16 -15
  4. package/dist/esm/types.d.ts +3 -0
  5. package/package.json +1 -1
package/dist/esm/components/eventFilter/index.js CHANGED
@@ -72,6 +72,9 @@ var EventFilter = function EventFilter(props) {
72
72
  if (_data.filters) {
73
73
  setFilter(_data.filters);
74
74
  }
75
+ if (_data.relevancy) {
76
+ setRelevancy(true);
77
+ }
75
78
  if (_data.dimension) {
76
79
  setBizAttributeSelectorValue(_objectSpread(_objectSpread({}, _data.dimension), {}, {
77
80
  key: _data.dimension.propCategory === 'eventProp' ? _data.dimension.value : _data.dimension.propCategory + '-' + _data.dimension.value
@@ -137,6 +140,7 @@ var EventFilter = function EventFilter(props) {
137
140
  if (props.relevancy && relevancy !== undefined) {
138
141
  _event.relevancy = relevancy;
139
142
  }
143
+ console.log(77711111, props);
140
144
  props.onChange && props.onChange(_event);
141
145
  }, [bizAttributeSelectorValue, filter, event, relevancy]);
142
146
  return /*#__PURE__*/React.createElement("div", {
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.id ? 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,8 +17,7 @@ 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;
21
- console.log(777777, props);
20
+ var _defaultValue$associa, _defaultValue$associa2, _finalSearchData$asso, _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$associa9, _finalSearchData$asso9, _defaultValue$associa10, _finalSearchData$asso10, _defaultValue$dimensi, _finalSearchData$dime, _defaultValue$dimensi2, _finalSearchData$dime2, _defaultValue$dimensi3, _finalSearchData$dime3, _defaultValue$dimensi4, _finalSearchData$dime4;
22
21
  var defaultValue = props.defaultValue,
23
22
  loading = props.loading,
24
23
  collapseRef = props.collapseRef,
@@ -152,25 +151,27 @@ var TopPanel = function TopPanel(props) {
152
151
  layout: "vertical",
153
152
  initialValues: {
154
153
  userGroup: userGroup ? userGroup : [0],
155
- start: defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.start,
154
+ start: _objectSpread(_objectSpread({}, defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.start), {}, {
155
+ relevancy: defaultValue !== null && defaultValue !== void 0 && (_defaultValue$associa = defaultValue.associated_next_attr) !== null && _defaultValue$associa !== void 0 && _defaultValue$associa.event_id && defaultValue !== null && defaultValue !== void 0 && (_defaultValue$associa2 = defaultValue.associated_pre_attr) !== null && _defaultValue$associa2 !== void 0 && _defaultValue$associa2.event_id || finalSearchData !== null && finalSearchData !== void 0 && (_finalSearchData$asso = finalSearchData.associatedNextAttr) !== null && _finalSearchData$asso !== void 0 && _finalSearchData$asso.eventId && finalSearchData !== null && finalSearchData !== void 0 && (_finalSearchData$asso2 = finalSearchData.associatedPreAttr) !== null && _finalSearchData$asso2 !== void 0 && _finalSearchData$asso2.eventId ? true : false
156
+ }),
156
157
  end: defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.end,
157
158
  associatedNextAttr: _objectSpread(_objectSpread({}, defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.associated_next_attr), {}, {
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,
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,
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,
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
159
+ dimensionSub: (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa3 = defaultValue.associated_next_attr) === null || _defaultValue$associa3 === void 0 ? void 0 : _defaultValue$associa3.dimension_sub) || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$asso3 = finalSearchData.associatedNextAttr) === null || _finalSearchData$asso3 === void 0 ? void 0 : _finalSearchData$asso3.dimensionSub),
160
+ isHidden: (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa4 = defaultValue.associated_next_attr) === null || _defaultValue$associa4 === void 0 ? void 0 : _defaultValue$associa4.is_hidden) || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$asso4 = finalSearchData.associatedNextAttr) === null || _finalSearchData$asso4 === void 0 ? void 0 : _finalSearchData$asso4.isHidden),
161
+ propCategory: (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa5 = defaultValue.associated_next_attr) === null || _defaultValue$associa5 === void 0 ? void 0 : _defaultValue$associa5.prop_category) || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$asso5 = finalSearchData.associatedNextAttr) === null || _finalSearchData$asso5 === void 0 ? void 0 : _finalSearchData$asso5.propCategory),
162
+ eventId: (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa6 = defaultValue.associated_next_attr) === null || _defaultValue$associa6 === void 0 ? void 0 : _defaultValue$associa6.event_id) || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$asso6 = finalSearchData.associatedNextAttr) === null || _finalSearchData$asso6 === void 0 ? void 0 : _finalSearchData$asso6.eventId)
162
163
  }),
163
164
  associatedPreAttr: _objectSpread(_objectSpread({}, defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.associated_pre_attr), {}, {
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,
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,
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,
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
165
+ dimensionSub: (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa7 = defaultValue.associated_pre_attr) === null || _defaultValue$associa7 === void 0 ? void 0 : _defaultValue$associa7.dimension_sub) || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$asso7 = finalSearchData.associatedPreAttr) === null || _finalSearchData$asso7 === void 0 ? void 0 : _finalSearchData$asso7.dimensionSub),
166
+ isHidden: (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa8 = defaultValue.associated_pre_attr) === null || _defaultValue$associa8 === void 0 ? void 0 : _defaultValue$associa8.is_hidden) || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$asso8 = finalSearchData.associatedPreAttr) === null || _finalSearchData$asso8 === void 0 ? void 0 : _finalSearchData$asso8.isHidden),
167
+ propCategory: (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa9 = defaultValue.associated_pre_attr) === null || _defaultValue$associa9 === void 0 ? void 0 : _defaultValue$associa9.prop_category) || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$asso9 = finalSearchData.associatedPreAttr) === null || _finalSearchData$asso9 === void 0 ? void 0 : _finalSearchData$asso9.propCategory),
168
+ eventId: (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa10 = defaultValue.associated_pre_attr) === null || _defaultValue$associa10 === void 0 ? void 0 : _defaultValue$associa10.event_id) || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$asso10 = finalSearchData.associatedPreAttr) === null || _finalSearchData$asso10 === void 0 ? void 0 : _finalSearchData$asso10.eventId)
168
169
  }),
169
170
  dimension: _objectSpread(_objectSpread({}, defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.dimension), {}, {
170
- dimensionSub: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$dimensi = defaultValue.dimension) === null || _defaultValue$dimensi === void 0 ? void 0 : _defaultValue$dimensi.dimension_sub,
171
- isHidden: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$dimensi2 = defaultValue.dimension) === null || _defaultValue$dimensi2 === void 0 ? void 0 : _defaultValue$dimensi2.is_hidden,
172
- propCategory: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$dimensi3 = defaultValue.dimension) === null || _defaultValue$dimensi3 === void 0 ? void 0 : _defaultValue$dimensi3.prop_category,
173
- eventId: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$dimensi4 = defaultValue.dimension) === null || _defaultValue$dimensi4 === void 0 ? void 0 : _defaultValue$dimensi4.event_id
171
+ 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),
172
+ 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),
173
+ 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),
174
+ 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)
174
175
  })
175
176
  },
176
177
  scrollToFirstError: true,
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.31",
3
+ "version": "1.0.0-interval.33",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",