@zgfe/modules-interval 1.0.23-zhongyuan.14 → 1.0.23-zhongyuan.15

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.
@@ -47,6 +47,7 @@ var ContentPanel = function ContentPanel(props) {
47
47
  }, searchData ? /*#__PURE__*/React.createElement(IntervalEventChart, {
48
48
  type: "boxplot",
49
49
  dataSource: eventData,
50
+ eventOldData: props.eventOldData,
50
51
  params: searchData,
51
52
  onChangeShow: onChangeShow
52
53
  }) : /*#__PURE__*/React.createElement("div", {
@@ -8,6 +8,7 @@ export interface RenderContentProps {
8
8
  * 查询结果
9
9
  */
10
10
  eventData?: ResponseDataProps;
11
+ eventOldData?: ResponseDataProps;
11
12
  /**
12
13
  * 查询条件
13
14
  */
@@ -57,13 +57,13 @@ var SearchPanel = function SearchPanel(props) {
57
57
  setDimension = _useState12[1];
58
58
  // 初始化表格表头和内容
59
59
  useEffect(function () {
60
- if (props !== null && props !== void 0 && props.eventData) {
60
+ if (props !== null && props !== void 0 && props.eventOldData) {
61
61
  var _props$searchData;
62
- var arr = extractNames(props === null || props === void 0 ? void 0 : props.eventData);
62
+ var arr = extractNames(props === null || props === void 0 ? void 0 : props.eventOldData);
63
63
  setDisplaySetupLIst(arr);
64
64
  setDisplaySetupSliceList(props === null || props === void 0 ? void 0 : (_props$searchData = props.searchData) === null || _props$searchData === void 0 ? void 0 : _props$searchData.displaySetup);
65
65
  }
66
- }, [props === null || props === void 0 ? void 0 : props.searchData, props === null || props === void 0 ? void 0 : props.eventData]);
66
+ }, [props === null || props === void 0 ? void 0 : props.searchData, props === null || props === void 0 ? void 0 : props.eventOldData]);
67
67
  // 初始化
68
68
  useEffect(function () {
69
69
  if (props.chartType && props.chartType !== chart.value) {
@@ -19,6 +19,7 @@ export interface SearchPanelProps {
19
19
  */
20
20
  displaySetup?: DisplaySetup[];
21
21
  eventData?: ResponseDataProps;
22
+ eventOldData?: ResponseDataProps;
22
23
  /**
23
24
  * 地图类型是否可选
24
25
  */
@@ -50,8 +50,8 @@ var IntervalEventChart = function IntervalEventChart(props) {
50
50
  var _dataSource$appData, _dataSource$appData$s;
51
51
  var dataSource = props.dataSource;
52
52
  if ((dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$appData = dataSource.appData) === null || _dataSource$appData === void 0 ? void 0 : (_dataSource$appData$s = _dataSource$appData.series) === null || _dataSource$appData$s === void 0 ? void 0 : _dataSource$appData$s.length) > 0) {
53
- var _extractNames;
54
- var arr = params !== null && params !== void 0 && params.displaySetup ? params === null || params === void 0 ? void 0 : params.displaySetup : (_extractNames = extractNames(dataSource)) === null || _extractNames === void 0 ? void 0 : _extractNames.splice(0, 4);
53
+ var _extractNames, _extractNames2;
54
+ var arr = params !== null && params !== void 0 && params.displaySetup ? params === null || params === void 0 ? void 0 : params.displaySetup : props !== null && props !== void 0 && props.eventOldData ? (_extractNames = extractNames(props === null || props === void 0 ? void 0 : props.eventOldData)) === null || _extractNames === void 0 ? void 0 : _extractNames.splice(0, 4) : (_extractNames2 = extractNames(dataSource)) === null || _extractNames2 === void 0 ? void 0 : _extractNames2.splice(0, 4);
55
55
  var app = getDefaultShow(dataSource, arr);
56
56
  setShowList(app);
57
57
  setDataSource(app);
@@ -12,6 +12,7 @@ export declare namespace eventChartProps {
12
12
  * 图表数据
13
13
  */
14
14
  dataSource?: ChartTypesProps;
15
+ eventOldData?: ChartTypesProps;
15
16
  dataSourceList?: DisplaySetup[];
16
17
  onlyChart?: boolean;
17
18
  /**
@@ -282,6 +282,7 @@ var EventContent = function EventContent(props) {
282
282
  }),
283
283
  eventId: eventId,
284
284
  eventData: eventData,
285
+ eventOldData: eventOldData,
285
286
  enableSelectChart: enableSelectChart,
286
287
  onChange: onChangeContent,
287
288
  onChangeShow: onChangeShow,
@@ -290,6 +291,7 @@ var EventContent = function EventContent(props) {
290
291
  loading: loading,
291
292
  isCity: isCity,
292
293
  eventData: eventData,
294
+ eventOldData: eventOldData,
293
295
  searchData: _objectSpread(_objectSpread({}, searchData), {}, {
294
296
  displaySetup: showList
295
297
  }),
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zgfe/modules-interval",
3
- "version": "1.0.23-zhongyuan.14",
3
+ "version": "1.0.23-zhongyuan.15",
4
4
  "private": false,
5
5
  "module": "dist/esm/index.js",
6
6
  "typings": "dist/esm/index.d.ts",
@@ -59,7 +59,7 @@
59
59
  "publishConfig": {
60
60
  "access": "public"
61
61
  },
62
- "gitHead": "ddbe1ee235093bae7c02f52f0ef752e132976f66",
62
+ "gitHead": "435b4b22dbb2ef66bb4c7ba71aac83575e7958c3",
63
63
  "gitHooks": {
64
64
  "pre-commit": "lint-staged"
65
65
  }