fix: 发布

packages/extend-components/EC_ConfigurationView/package.json

 {
     "name": "@wisdom-components/ec_configurationview",
-    "version": "1.4.40",
+    "version": "1.4.41",
     "description": "> TODO: description",
     "author": "tuqian <webtuqian@163.com>",
     "homepage": "",

packages/extend-components/EC_ConfigurationView/src/HistoryModel.js

@@ -24,7 +24,7 @@ let twoID = '';
 
 let myDiagram = null;
 let editionArr = [];
-// const guidAggre = {};
+const guidAggre = {};
 let bindData = [];
 const stationList = [];
 

packages/extend-components/EC_HistoryView/src/index.js

-import React, {useContext, useEffect, useMemo, useState} from 'react';
+import React, { useContext, useEffect, useMemo, useState } from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import {
@@ -23,20 +23,21 @@ import _ from 'lodash';
 import TimeRangePicker from '@wisdom-components/timerangepicker';
 import PandaEmpty from '@wisdom-components/empty';
 import BasicTable from '@wisdom-components/basictable';
-import {getHistoryInfo, getDeviceAlarmScheme, getExportDeviceHistoryUrl} from './apis';
+import { getHistoryInfo, getDeviceAlarmScheme, getExportDeviceHistoryUrl } from './apis';
 import SimgleChart from './SingleChart';
 import GridChart from './GridChart';
 import './index.less';
-import {globalConfig} from 'antd/lib/config-provider';
+import { globalConfig } from 'antd/lib/config-provider';
 
-const {RangePicker} = DatePicker;
-const {Option} = Select;
+const { RangePicker } = DatePicker;
+const { Option } = Select;
 
 const startFormat = 'YYYY-MM-DD 00:00:00';
 const endFormat = 'YYYY-MM-DD 23:59:59';
 const timeFormat = 'YYYY-MM-DD HH:mm:ss';
 const dateFormat = 'YYYYMMDD';
 
+// 时间列表
 const timeList = [
   {
     key: 'twelveHours',
@@ -220,7 +221,7 @@ const timeColumn = {
 };
 
 const HistoryView = (props) => {
-    const {getPrefixCls} = useContext(ConfigProvider.ConfigContext);
+  const { getPrefixCls } = useContext(ConfigProvider.ConfigContext);
   const prefixCls = getPrefixCls('history-view');
 
   const {
@@ -233,7 +234,8 @@ const HistoryView = (props) => {
     showModels,
     needMarkLine,
   } = props;
-    const isBoxPlots = deviceParams?.length === 1 && deviceParams[0]?.sensors?.split(',').length === 1;
+  const isBoxPlots =
+    deviceParams?.length === 1 && deviceParams[0]?.sensors?.split(',').length === 1;
   const [loading, setLoading] = useState(false);
   const [activeTabKey, setActiveTabKey] = useState(defaultModel);
 
@@ -388,7 +390,7 @@ const HistoryView = (props) => {
         )}
         {timeValue === 'contrast' && ( // 同期对比
           <>
-                        <Select value={contrastOption} style={{width: 60}} onChange={onContrastChange}>
+            <Select value={contrastOption} style={{ width: 60 }} onChange={onContrastChange}>
               <Option value="day">日</Option>
               <Option value="month">月</Option>
             </Select>
@@ -405,7 +407,7 @@ const HistoryView = (props) => {
                       className={classNames(`${prefixCls}-contrast-delete`)}
                       onClick={() => handleDeleteDatePicker(index)}
                     >
-                                            <CloseCircleFilled/>
+                      <CloseCircleFilled />
                     </div>
                   )}
                 </div>
@@ -414,7 +416,7 @@ const HistoryView = (props) => {
                 )}
               </div>
             ))}
-                        {datePickerArr.length < 5 && <PlusCircleOutlined onClick={handleAddDatePicker}/>}
+            {datePickerArr.length < 5 && <PlusCircleOutlined onClick={handleAddDatePicker} />}
           </>
         )}
       </div>
@@ -424,8 +426,8 @@ const HistoryView = (props) => {
   // 曲线设置项选择/取消
   const onCheckboxChange = (e, key) => {
     let data = [...checkboxData];
-        let _index = data.findIndex(item => item.key === 'justLine'); // 仅查看曲线会在勾选了数据滤波后展示
-        let _index1 = data.findIndex(item => item.key === 'ignoreOutliers'); // 仅查看曲线会在勾选了数据滤波后展示
+    let _index = data.findIndex((item) => item.key === 'justLine'); // 仅查看曲线会在勾选了数据滤波后展示
+    let _index1 = data.findIndex((item) => item.key === 'ignoreOutliers'); // 仅查看曲线会在勾选了数据滤波后展示
     data.forEach((item) => {
       if (item.key === key) {
         item.checked = e.target.checked;
@@ -463,7 +465,7 @@ const HistoryView = (props) => {
           </Checkbox>
           {child.tooltip && (
             <Tooltip title={child.tooltip}>
-                            <QuestionCircleFilled className={`${prefixCls}-question`}/>
+              <QuestionCircleFilled className={`${prefixCls}-question`} />
             </Tooltip>
           )}
         </>
@@ -474,18 +476,25 @@ const HistoryView = (props) => {
   const renderCurveOption = (isChart, isSingle) => {
     return (
       <div className={classNames(`${prefixCls}-cover`)}>
-                {
-                    isChart && isSingle ? <>
+        {isChart && isSingle ? (
+          <>
             <div className={classNames(`${prefixCls}-label`)}>曲线形态</div>
-                        <Radio.Group value={chartType} style={{marginRight: 16}} onChange={(e) => {
+            <Radio.Group
+              value={chartType}
+              style={{ marginRight: 16 }}
+              onChange={(e) => {
                 let _value = e.target.value;
                 setChartType(_value);
-                            onCheckboxChange({target: {value: _value !== 'boxChart'}}, 'chartType')
-                        }}>
+                onCheckboxChange({ target: { value: _value !== 'boxChart' } }, 'chartType');
+              }}
+            >
               <Radio.Button value={'lineChart'}>线形图</Radio.Button>
               <Radio.Button value={'boxChart'}>箱线图</Radio.Button>
-                        </Radio.Group></> : ''
-                }
+            </Radio.Group>
+          </>
+        ) : (
+          ''
+        )}
         <div className={classNames(`${prefixCls}-label`)}>曲线设置</div>
         {checkboxData.map((child) => {
           const box = renderCheckbox(child);
@@ -499,7 +508,7 @@ const HistoryView = (props) => {
         {activeTabKey === 'table' && (
           <Select
             value={dataThinKey}
-                        style={{width: 90}}
+            style={{ width: 90 }}
             onChange={onTimeIntervalChange}
             disabled={!dataConfig.dataThin}
           >
@@ -537,15 +546,14 @@ const HistoryView = (props) => {
           aDom.click();
           aDom.remove();
         })
-                .catch((err) => {
-                });
+        .catch((err) => {});
     });
   };
 
   const handleTableData = (data) => {
     const ignoreOutliers = checkboxData.find((item) => item.key === 'ignoreOutliers').checked;
     const dataIndexAccess = (dataItem, index) => {
-            const {stationCode, sensorName} = dataItem;
+      const { stationCode, sensorName } = dataItem;
       return `${stationCode}-${sensorName}-${index}`;
     };
 
@@ -556,7 +564,7 @@ const HistoryView = (props) => {
 
     // 处理表头数据
     const columnsData = data.map((item, index) => {
-            const {stationCode, equipmentName, sensorName, unit, dataModel} = item;
+      const { stationCode, equipmentName, sensorName, unit, dataModel } = item;
       const dataIndex = dataIndexAccess(item, index);
       let col = {
         title: `${equipmentName}-${sensorName}${unit ? `(${unit})` : ''}`,
@@ -579,7 +587,7 @@ const HistoryView = (props) => {
     const timeData = {};
 
     const buildDefaultData = (time) => {
-            const obj = {key: time, time: time};
+      const obj = { key: time, time: time };
       data.forEach((item, index) => {
         const dataIndex = dataIndexAccess(item, index);
         obj[dataIndex] = '';
@@ -587,7 +595,7 @@ const HistoryView = (props) => {
       return obj;
     };
     data.forEach((item, index) => {
-            const {stationCode, sensorName, dataModel} = item;
+      const { stationCode, sensorName, dataModel } = item;
       dataModel.forEach((data) => {
         const formatTime = moment(data.pt).format(format);
 
@@ -602,7 +610,7 @@ const HistoryView = (props) => {
 
     // 处理表格数据
     data.forEach((child, index) => {
-            const {dataModel} = child;
+      const { dataModel } = child;
       const dataIndex = dataIndexAccess(child, index);
       dataModel.forEach((value, j) => {
         const formatTime = moment(value.pt).format(format);
@@ -652,23 +660,23 @@ const HistoryView = (props) => {
   const handleDataThinKey = (diffDays) => {
     // edit by zy 根据选择的时长控制抽稀频度
     if (diffDays >= 7 && diffDays < 15) {
-            return {unit: 'h', zoom: '2'};
+      return { unit: 'h', zoom: '2' };
     } else if (diffDays >= 15 && diffDays < 30) {
-            return {unit: 'h', zoom: '4'};
+      return { unit: 'h', zoom: '4' };
     } else if (diffDays >= 30) {
-            return {unit: 'h', zoom: '6'};
+      return { unit: 'h', zoom: '6' };
     } else if (diffDays < 7 && diffDays >= 2) {
-            return {unit: 'min', zoom: '40'};
+      return { unit: 'min', zoom: '40' };
     } else if (diffDays < 2 && diffDays >= 1) {
-            return {unit: 'min', zoom: '30'};
+      return { unit: 'min', zoom: '30' };
     } else {
-            return {unit: 'min', zoom: '10'};
+      return { unit: 'min', zoom: '10' };
     }
   };
 
   // 处理接口服务参数的变化
   const onChangeParams = (value = {}) => {
-        const {dateRange, isDilute, ignoreOutliers, zoom, unit} = value;
+    const { dateRange, isDilute, ignoreOutliers, zoom, unit } = value;
     const requestArr = [];
     const acrossTables = [];
     deviceParams.forEach((i) => {
@@ -681,7 +689,7 @@ const HistoryView = (props) => {
       return;
     }
     dateRange.forEach((item) => {
-            let _showLine = checkboxData.find(item => item.key === 'justLine');
+      let _showLine = checkboxData.find((item) => item.key === 'justLine');
       const param = {
         isDilute,
         zoom,
@@ -691,20 +699,20 @@ const HistoryView = (props) => {
         dateFrom: item.dateFrom,
         dateTo: item.dateTo,
         acrossTables,
-                isBoxPlots: isBoxPlots
+        isBoxPlots: isBoxPlots,
       };
       let diffDays = moment(item.dateTo).diff(moment(item.dateFrom), 'days');
       let zoomParam = activeTabKey === 'curve' ? handleDataThinKey(diffDays) : {};
-            requestArr.push(getHistoryInfo({...param, ...zoomParam}));
+      requestArr.push(getHistoryInfo({ ...param, ...zoomParam }));
     });
     setLoading(true);
     Promise.all(requestArr).then((results) => {
       if (results.length) {
         let data = [];
         results.forEach((res, index) => {
-                    const {dateFrom, dateTo} = dateRange?.[index] ?? {};
+          const { dateFrom, dateTo } = dateRange?.[index] ?? {};
           if (res.code === 0 && res.data.length) {
-                        debugger
+            debugger;
             res.data.forEach((d) => {
               d.dateFrom = dateFrom;
               d.dateTo = dateTo;
@@ -732,7 +740,7 @@ const HistoryView = (props) => {
   };
 
   useEffect(() => {
-        const {dataThin, ignoreOutliers, zoom, unit} = dataConfig;
+    const { dataThin, ignoreOutliers, zoom, unit } = dataConfig;
     beforChangeParams().finally(() => {
       onChangeParams({
         isDilute: dataThin,
@@ -740,7 +748,7 @@ const HistoryView = (props) => {
         zoom,
         unit,
         dateRange,
-                isBoxPlots: isBoxPlots
+        isBoxPlots: isBoxPlots,
       });
     });
   }, [dateRange, dataConfig, deviceParams, chartType]);
@@ -751,11 +759,14 @@ const HistoryView = (props) => {
         <>
           <div className={`${prefixCls}-options`}>
             {renderTimeOption()}
-                        {renderCurveOption(true, (deviceParams?.length === 1 && deviceParams[0]?.sensors?.split(',').length === 1))}
+            {renderCurveOption(
+              true,
+              deviceParams?.length === 1 && deviceParams[0]?.sensors?.split(',').length === 1,
+            )}
           </div>
           <div className={`${prefixCls}-content`}>
             {!chartDataSource.length ? (
-                            <PandaEmpty/>
+              <PandaEmpty />
             ) : grid === true ? (
               <GridChart
                 curveCenter={curveCenter}
@@ -771,7 +782,7 @@ const HistoryView = (props) => {
                 showGridLine={chartGrid}
                 prefixCls={prefixCls}
                 dataSource={chartDataSource}
-                                justLine={!!checkboxData.find(item => item.key === 'justLine' && item.checked)}
+                justLine={!!checkboxData.find((item) => item.key === 'justLine' && item.checked)}
                 chartType={isBoxPlots ? chartType : null}
                 contrast={timeValue === 'contrast'}
                 contrastOption={contrastOption}
@@ -796,11 +807,10 @@ const HistoryView = (props) => {
                 columns={columns}
                 {...tableProps}
                 pagination={false}
-                                onChange={() => {
-                                }}
+                onChange={() => {}}
               />
             ) : (
-                            <PandaEmpty/>
+              <PandaEmpty />
             )}
           </div>
         </>
@@ -825,7 +835,7 @@ const HistoryView = (props) => {
                 <div className={`${prefixCls}-extra-right`}>
                   {activeTabKey === 'table' && (
                     <Button type="link" onClick={exportExcelBtn}>
-                                            <DownloadOutlined/>
+                      <DownloadOutlined />
                       下载
                     </Button>
                   )}