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

package/dist/esm/components/renderContent/index.js

@@ -47,6 +47,7 @@ var ContentPanel = function ContentPanel(props) {
   }, searchData ? /*#__PURE__*/React.createElement(IntervalEventChart, {
     type: "boxplot",
     dataSource: eventData,
+    eventOldData: props.eventOldData,
     params: searchData,
     onChangeShow: onChangeShow
   }) : /*#__PURE__*/React.createElement("div", {

package/dist/esm/components/renderContent/types.d.ts

@@ -8,6 +8,7 @@ export interface RenderContentProps {
      * 查询结果
      */
     eventData?: ResponseDataProps;
+    eventOldData?: ResponseDataProps;
     /**
      * 查询条件
      */

package/dist/esm/components/searchPanel/index.js

@@ -57,13 +57,13 @@ var SearchPanel = function SearchPanel(props) {
     setDimension = _useState12[1];
   // 初始化表格表头和内容
   useEffect(function () {
-    if (props !== null && props !== void 0 && props.eventData) {
+    if (props !== null && props !== void 0 && props.eventOldData) {
       var _props$searchData;
-      var arr = extractNames(props === null || props === void 0 ? void 0 : props.eventData);
+      var arr = extractNames(props === null || props === void 0 ? void 0 : props.eventOldData);
       setDisplaySetupLIst(arr);
       setDisplaySetupSliceList(props === null || props === void 0 ? void 0 : (_props$searchData = props.searchData) === null || _props$searchData === void 0 ? void 0 : _props$searchData.displaySetup);
     }
-  }, [props === null || props === void 0 ? void 0 : props.searchData, props === null || props === void 0 ? void 0 : props.eventData]);
+  }, [props === null || props === void 0 ? void 0 : props.searchData, props === null || props === void 0 ? void 0 : props.eventOldData]);
   // 初始化
   useEffect(function () {
     if (props.chartType && props.chartType !== chart.value) {

package/dist/esm/components/searchPanel/types.d.ts

@@ -19,6 +19,7 @@ export interface SearchPanelProps {
      */
     displaySetup?: DisplaySetup[];
     eventData?: ResponseDataProps;
+    eventOldData?: ResponseDataProps;
     /**
      * 地图类型是否可选
      */

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

@@ -50,8 +50,8 @@ var IntervalEventChart = function IntervalEventChart(props) {
     var _dataSource$appData, _dataSource$appData$s;
     var dataSource = props.dataSource;
     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) {
-      var _extractNames;
-      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);
+      var _extractNames, _extractNames2;
+      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);
       var app = getDefaultShow(dataSource, arr);
       setShowList(app);
       setDataSource(app);
@@ -130,7 +130,7 @@ var IntervalEventChart = function IntervalEventChart(props) {
     params: params,
     onlyChart: props.onlyChart
   }), !props.onlyChart && /*#__PURE__*/React.createElement(EventTable, {
-    dataSource: dataSource,
+    dataSource: props === null || props === void 0 ? void 0 : props.eventOldData,
     searchData: params,
     showList: [],
     changeShow: onChangeShow

package/dist/esm/modules/chart/types.d.ts

@@ -12,6 +12,7 @@ export declare namespace eventChartProps {
          * 图表数据
          */
         dataSource?: ChartTypesProps;
+        eventOldData?: ChartTypesProps;
         dataSourceList?: DisplaySetup[];
         onlyChart?: boolean;
         /**

package/dist/esm/modules/content/index.js

@@ -168,7 +168,7 @@ var EventContent = function EventContent(props) {
       setEventData(result);
       setEventOldData(result); // 原数据存储
       var arr = extractNames(result);
-      var spliceResultArr = arr === null || arr === void 0 ? void 0 : arr.splice(0, 4);
+      var spliceResultArr = showList ? showList : arr === null || arr === void 0 ? void 0 : arr.splice(0, 4);
       setFinalSearchData(_objectSpread(_objectSpread({}, searchData), {}, {
         displaySetup: spliceResultArr
       }));
@@ -282,6 +282,7 @@ var EventContent = function EventContent(props) {
     }),
     eventId: eventId,
     eventData: eventData,
+    eventOldData: eventOldData,
     enableSelectChart: enableSelectChart,
     onChange: onChangeContent,
     onChangeShow: onChangeShow,
@@ -290,6 +291,7 @@ var EventContent = function EventContent(props) {
     loading: loading,
     isCity: isCity,
     eventData: eventData,
+    eventOldData: eventOldData,
     searchData: _objectSpread(_objectSpread({}, searchData), {}, {
       displaySetup: showList
     }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-interval",
-  "version": "1.0.23-zhongyuan.14",
+  "version": "1.0.23-zhongyuan.16",
   "private": false,
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
@@ -59,7 +59,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ddbe1ee235093bae7c02f52f0ef752e132976f66",
+  "gitHead": "d1b8253833f99d2ad396eebe7fd208b628d37f0a",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }