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

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;
     /**
      * 查询条件
      */
@@ -15,7 +16,10 @@ export interface RenderContentProps {
     /**
      * 显示列表
      */
-    showList: string[];
+    showList?: {
+        label: string;
+        value: number;
+    }[];
     /**
      * 是否是城市
      */
@@ -27,5 +31,8 @@ export interface RenderContentProps {
     /**
      * 改变显示内容
      */
-    onChangeShow?: (data: string[]) => void;
+    onChangeShow?: (data: {
+        label: string;
+        value: number;
+    }[]) => void;
 }

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.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) {
@@ -99,10 +99,7 @@ var SearchPanel = function SearchPanel(props) {
   // 显示设置选择
   var onDimensionChange = function onDimensionChange(val) {
     if (val) {
-      props.onChange && props.onChange({
-        time: time,
-        displaySetup: val
-      });
+      props.onChangeShow && props.onChangeShow(val);
       setDisplaySetupSliceList(val);
     }
   };

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

@@ -19,6 +19,7 @@ export interface SearchPanelProps {
      */
     displaySetup?: DisplaySetup[];
     eventData?: ResponseDataProps;
+    eventOldData?: ResponseDataProps;
     /**
      * 地图类型是否可选
      */
@@ -44,6 +45,7 @@ export interface SearchPanelProps {
      */
     onChange?: (data: SearchPanelProps) => void;
     searchData?: SearchValue;
+    onChangeShow?: (data: DisplaySetup[]) => void;
 }
 export interface DisplaySetup {
     value: number;

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

@@ -6,6 +6,10 @@ export interface TopBarProps {
      */
     searchData?: SearchValue;
     loading?: boolean;
+    showList?: {
+        label: string;
+        value: number;
+    }[];
     eventData?: ResponseDataProps;
     onJumpWarning: IntervalProps.Props['onJumpWarning'];
     platformChange: (data: number) => void;

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

@@ -28,20 +28,16 @@ var IntervalEventChart = function IntervalEventChart(props) {
     _useState2 = _slicedToArray(_useState, 2),
     showList = _useState2[0],
     setShowList = _useState2[1];
-  var _useState3 = useState([]),
+  var _useState3 = useState(props.dataSource),
     _useState4 = _slicedToArray(_useState3, 2),
-    dataSourceList = _useState4[0],
-    setDataSourceList = _useState4[1];
-  var _useState5 = useState(props.dataSource),
-    _useState6 = _slicedToArray(_useState5, 2),
-    dataSource = _useState6[0],
-    setDataSource = _useState6[1];
+    dataSource = _useState4[0],
+    setDataSource = _useState4[1];
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp;
-  var _useState7 = useState(false),
-    _useState8 = _slicedToArray(_useState7, 2),
-    loading = _useState8[0],
-    setLoading = _useState8[1];
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    loading = _useState6[0],
+    setLoading = _useState6[1];
   useEffect(function () {
     // 没有dataSource时（看板列表访问），请求查询
     if (!props.dataSource) {
@@ -54,14 +50,15 @@ 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);
-      setDataSourceList(arr);
+      setDataSource(app);
+    } else {
+      setDataSource(dataSource);
     }
-    setDataSource(dataSource);
-  }, [params === null || params === void 0 ? void 0 : params.displaySetup, props.dataSource]);
+  }, [params === null || params === void 0 ? void 0 : params.displaySetup, props.dataSource, params]);
   var fetchResult = function fetchResult() {
     var _obj$start, _obj$end, _params$start, _params$end;
     var obj = searchDataParams(params);
@@ -82,7 +79,11 @@ var IntervalEventChart = function IntervalEventChart(props) {
           onChangeException === null || onChangeException === void 0 ? void 0 : onChangeException();
           return;
         }
-        setDataSource(res.data);
+        var resultApp = res.data;
+        if (params !== null && params !== void 0 && params.showList) {
+          resultApp = getDefaultShow(res.data, params === null || params === void 0 ? void 0 : params.showList);
+        }
+        setDataSource(resultApp);
       }).catch(function () {
         setLoading(false);
       });
@@ -126,7 +127,6 @@ var IntervalEventChart = function IntervalEventChart(props) {
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(IntervalChart, {
     dataSource: dataSource,
     showList: showList,
-    dataSourceList: dataSourceList,
     params: params,
     onlyChart: props.onlyChart
   }), !props.onlyChart && /*#__PURE__*/React.createElement(EventTable, {

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

@@ -230,10 +230,13 @@ var IntervalChart = function IntervalChart(props) {
         };
       })
     };
-    setOptionECharts(eCharts);
+    setOptionECharts(function () {
+      return eCharts;
+    });
   }, [props === null || props === void 0 ? void 0 : props.showList]);
   useEffect(function () {
-    chartInstance && chartInstance.setOption(optionECharts);
+    // true 表示ecahrt不合并，直接替换
+    chartInstance && chartInstance.setOption(optionECharts, true);
   }, [optionECharts]);
   useEffect(function () {
     setTimeout(function () {

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

@@ -12,6 +12,7 @@ export declare namespace eventChartProps {
          * 图表数据
          */
         dataSource?: ChartTypesProps;
+        eventOldData?: ChartTypesProps;
         dataSourceList?: DisplaySetup[];
         onlyChart?: boolean;
         /**
@@ -33,7 +34,7 @@ export declare namespace eventChartProps {
         /**
          * 改变显示内容
          */
-        onChangeShow?: (data: string[]) => void;
+        onChangeShow?: (data: DisplaySetup[]) => void;
         /**
          *
          * 指标异常回调

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

@@ -22,7 +22,7 @@ import { ContentPanel, SearchPanel } from "../../components";
 import TopPanel from "../topPanel";
 import { message } from 'antd';
 import { ERROR_RESPONESE_CODE } from "../../constants/code";
-import { extractNames } from "../../utils/formData";
+import { extractNames, getDefaultShow } from "../../utils/formData";
 var CancelToken = Request.CancelToken;
 var cancel;
 var refresh = false;
@@ -45,28 +45,32 @@ var EventContent = function EventContent(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     eventData = _useState4[0],
     setEventData = _useState4[1];
-  var _useState5 = useState(props.show || []),
+  var _useState5 = useState(),
     _useState6 = _slicedToArray(_useState5, 2),
-    showList = _useState6[0],
-    setShowList = _useState6[1];
-  var _useState7 = useState(true),
+    eventOldData = _useState6[0],
+    setEventOldData = _useState6[1]; // 原数据存储
+  var _useState7 = useState(props.show),
     _useState8 = _slicedToArray(_useState7, 2),
-    loading = _useState8[0],
-    setLoading = _useState8[1];
-  // 地图是否可选
-  var _useState9 = useState(false),
+    showList = _useState8[0],
+    setShowList = _useState8[1];
+  var _useState9 = useState(true),
     _useState10 = _slicedToArray(_useState9, 2),
-    enableSelectChart = _useState10[0],
-    setEnableSelectChart = _useState10[1];
-  // 是否是城市
+    loading = _useState10[0],
+    setLoading = _useState10[1];
+  // 地图是否可选
   var _useState11 = useState(false),
     _useState12 = _slicedToArray(_useState11, 2),
-    isCity = _useState12[0],
-    setIsCity = _useState12[1];
-  var _useState13 = useState(-1),
+    enableSelectChart = _useState12[0],
+    setEnableSelectChart = _useState12[1];
+  // 是否是城市
+  var _useState13 = useState(false),
     _useState14 = _slicedToArray(_useState13, 2),
-    eventId = _useState14[0],
-    setEventId = _useState14[1];
+    isCity = _useState14[0],
+    setIsCity = _useState14[1];
+  var _useState15 = useState(-1),
+    _useState16 = _slicedToArray(_useState15, 2),
+    eventId = _useState16[0],
+    setEventId = _useState16[1];
   var _useContext2 = useContext(IntervalContext),
     searchData = _useContext2.searchData,
     setSearchData = _useContext2.setSearchData,
@@ -162,16 +166,16 @@ var EventContent = function EventContent(props) {
       }
       var result = res.data;
       setEventData(result);
+      setEventOldData(result); // 原数据存储
       var arr = extractNames(result);
+      var spliceResultArr = arr === null || arr === void 0 ? void 0 : arr.splice(0, 4);
       setFinalSearchData(_objectSpread(_objectSpread({}, searchData), {}, {
-        displaySetup: arr === null || arr === void 0 ? void 0 : arr.splice(0, 4)
-      }));
-      setSearchData(_objectSpread(_objectSpread({}, searchData), {}, {
-        displaySetup: arr === null || arr === void 0 ? void 0 : arr.splice(0, 4)
+        displaySetup: spliceResultArr
       }));
+      setShowList(spliceResultArr);
       loadingHandle();
-      if (props !== null && props !== void 0 && props.setShowList) {
-        props.setShowList(arr === null || arr === void 0 ? void 0 : arr.splice(0, 4));
+      if (props !== null && props !== void 0 && props.onShowChange) {
+        props.onShowChange(spliceResultArr);
       }
     }).catch(function () {
       loadingHandle();
@@ -211,8 +215,10 @@ var EventContent = function EventContent(props) {
   // 改变显示内容
   var onChangeShow = function onChangeShow(data) {
     setShowList(data);
-    if (props !== null && props !== void 0 && props.setShowList) {
-      props.setShowList(data);
+    if (props !== null && props !== void 0 && props.onShowChange) {
+      props.onShowChange(data);
+      var resultApp = getDefaultShow(eventOldData, data);
+      setEventData(resultApp);
     }
   };
 
@@ -237,10 +243,15 @@ var EventContent = function EventContent(props) {
       });
     });
   };
+
+  // displaySetup要显示的列表值 showList
+
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-header")
   }, /*#__PURE__*/React.createElement("span", null, !panelId && route && route.query && route.query.title ? route.query.title : '间隔分析'), /*#__PURE__*/React.createElement(TopBar, {
-    searchData: searchData,
+    searchData: _objectSpread(_objectSpread({}, searchData), {}, {
+      showList: showList
+    }),
     loading: loading,
     eventData: eventData,
     platformChange: platformChange,
@@ -266,18 +277,24 @@ var EventContent = function EventContent(props) {
     analysisAttr: searchData === null || searchData === void 0 ? void 0 : searchData.analysisAttr,
     displaySetup: searchData === null || searchData === void 0 ? void 0 : searchData.analysisAttr,
     analysisIndex: searchData === null || searchData === void 0 ? void 0 : searchData.analysisIndex,
-    searchData: searchData,
+    searchData: _objectSpread(_objectSpread({}, searchData), {}, {
+      displaySetup: showList
+    }),
     eventId: eventId,
     eventData: eventData,
+    eventOldData: eventOldData,
     enableSelectChart: enableSelectChart,
     onChange: onChangeContent,
+    onChangeShow: onChangeShow,
     refreshHandle: refreshHandle
   }), /*#__PURE__*/React.createElement(ContentPanel, {
     loading: loading,
     isCity: isCity,
     eventData: eventData,
-    searchData: searchData,
-    showList: showList,
+    eventOldData: eventOldData,
+    searchData: _objectSpread(_objectSpread({}, searchData), {}, {
+      displaySetup: showList
+    }),
     onChangeShow: onChangeShow
   }))));
 };

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

@@ -13,7 +13,10 @@ export declare namespace EventContentProps {
         /**
          * 展示列表
          */
-        show?: string[];
+        show?: {
+            label: string;
+            value: number;
+        }[];
         setShowList?: any;
         /**
          * 是否查询中
@@ -29,5 +32,9 @@ export declare namespace EventContentProps {
          * 查询条件初始化
          */
         initSearch?: () => void;
+        onShowChange?: (data: {
+            label: string;
+            value: number;
+        }[]) => void;
     }
 }

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

@@ -107,6 +107,9 @@ var ModuleInterval = function ModuleInterval(props) {
   useEffect(function () {
     if (props.onChange) props.onChange(searchData);
   }, [searchData]);
+  var onShowChange = function onShowChange(data) {
+    setShowList(data);
+  };
   if (loading || useBizStoreLoading) {
     return /*#__PURE__*/React.createElement("div", {
       className: classPrefix
@@ -126,7 +129,7 @@ var ModuleInterval = function ModuleInterval(props) {
           app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
           module: 'interval'
         }, searchData), {}, {
-          showList: searchData === null || searchData === void 0 ? void 0 : searchData.displaySetup
+          showList: showList
         })
       }
     } : undefined,
@@ -154,8 +157,7 @@ var ModuleInterval = function ModuleInterval(props) {
       onUserDrill: props.onUserDrill,
       onJumpWarning: props.onJumpWarning,
       exception: exception,
-      setException: setException,
-      setShowList: setShowList
+      setException: setException
     }
   }, /*#__PURE__*/React.createElement(EventContent, {
     defaultValue: props.defaultValue ? props.defaultValue.data : undefined,
@@ -164,6 +166,7 @@ var ModuleInterval = function ModuleInterval(props) {
     onUserDrill: props.onUserDrill,
     onJumpWarning: props.onJumpWarning,
     onChange: setSearchData,
+    onShowChange: onShowChange,
     initSearch: initSearch
   })));
 };

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

@@ -54,7 +54,10 @@ export declare namespace IntervalProps {
         /**
          * 展示列表
          */
-        chosen_data?: string[];
+        chosen_data?: {
+            label: string;
+            value: number;
+        }[];
         /**
          * 其他属性
          */

package/dist/esm/types.d.ts

@@ -80,7 +80,10 @@ export interface SearchValue {
     /**
      * @description  显示设置
      */
-    displaySetup?: string[];
+    displaySetup?: {
+        label: string;
+        value: number;
+    }[];
     /**
      * @description   日期
      * @default       最近一天
@@ -130,6 +133,10 @@ export interface SearchValue {
         subjectAlias?: string;
         unit: string;
     };
+    showList?: {
+        label: string;
+        value: number;
+    }[];
 }
 export type EventChartTypes = 'line' | 'bar' | 'pie' | 'map' | 'boxplot';
 /**

package/dist/esm/types.js

@@ -1,15 +1,15 @@
 import { createContext } from 'react';
 
-/**
- * 属性选择器 默认值
+/**
+ * 属性选择器 默认值
  */
 
-/**
- * 图表选择类型
+/**
+ * 图表选择类型
  */
 
-/**
- * series value
+/**
+ * series value
  */
 
 var defaultContext = {

package/package.json

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