fixx: 修改组态

.fatherrc.js

@@ -24,7 +24,8 @@ const tailPkgs = pkgList
   .filter((pkg) => pkg.charAt(0) !== '.' && !headPkgs.includes(pkg))
   .map((item) => {
     const [name, path] = item.split('!');
-    return `${path}/${name}`;
+    // return `${path}/${name}`;
+    return `${name}`;
   });
 
 const type = process.env.BUILD_TYPE;

package.json

@@ -145,7 +145,9 @@
     "registry": "https://g.civnet.cn:4873"
   },
   "dependencies": {
+    "@babel/plugin-proposal-private-methods": "^7.18.6",
     "@wisdom-components/basictable": "^1.5.14",
+    "@wisdom-components/ec_historyview": "^1.4.3",
     "@wisdom-components/empty": "^1.3.9",
     "@wisdom-components/exportexcel": "^1.1.2",
     "@wisdom-components/loadbox": "1.1.4",
@@ -155,6 +157,7 @@
     "cross-spawn": "^7.0.3",
     "echarts": "^5.4.0",
     "echarts-for-react": "^3.0.2",
+    "file-loader": "^6.2.0",
     "form-render": "^0.9.12",
     "highcharts": "^9.0.1",
     "highcharts-react-official": "^3.0.0",

packages/base-components/LoadBox/src/demos/Base.tsx

@@ -28,7 +28,7 @@ const Demo = (props) => {
           justifyContent: 'center',
         }}
       >
-        <LoadBox spinning={spinning} />
+        <LoadBox spinning={spinning} tip={'加载'} />
       </div>
       <div style={{ marginTop: '20px' }}>
         <Button onClick={startClick} style={{ marginRight: '20px' }}>

packages/extend-components/EC_ConfigurationView/package.json

@@ -33,7 +33,7 @@
     },
     "dependencies": {
         "@babel/runtime": "^7.17.9",
-        "@wisdom-components/ec_historyinfo": "1.2.23",
+        "@wisdom-components/ec_historyview": "1.4.3",
         "@wisdom-components/empty": "1.3.9",
         "@wisdom-components/loadbox": "1.1.4",
         "@wisdom-components/mqttview": "1.3.6",

packages/extend-components/EC_ConfigurationView/src/EC_ConfigurationView.md

@@ -23,12 +23,11 @@ group:
 
 ## API
 
-| 参数             | 说明                             | 类型    | 默认值 |
-| ---------------- | -------------------------------- | ------- | ------ |
-| name `必需`      | 画板名称                         | string  | ''     |
-| devices `必需`   | 画板设备                         | array   | []     |
-| deviceName       | 画板设备名称                     | array   | []     |
-| dictionaryParams | 图标颜色数据字典参数             | object  | {}     |
-| config           | 全局 globalConfig,没有时需要传递 | object  | {}     |
-| isZoom           | 是否可缩放(手持上建议设置 true)  | boolean | false  |
-| flowShow         | 是否水流效果（无数据表现）       | boolean | true   |
+| 参数           | 说明                             | 类型    | 默认值 |
+| -------------- | -------------------------------- | ------- | ------ |
+| name `必需`    | 画板名称                         | string  | ''     |
+| devices `必需` | 画板设备                         | array   | []     |
+| deviceName     | 画板设备名称                     | array   | []     |
+| config         | 全局 globalConfig,没有时需要传递 | object  | {}     |
+| isZoom         | 是否可缩放(手持上建议设置 true)  | boolean | false  |
+| flowShow       | 是否水流效果（无数据表现）       | boolean | true   |

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

@@ -15,7 +15,7 @@ import {
 } from '@ant-design/icons';
 import MqttView from '@wisdom-components/mqttview';
 import PropTypes from 'prop-types';
-import HistoryInfo from '@wisdom-components/ec_historyinfo';
+import HistoryView from '@wisdom-components/ec_historyview';
 import * as go from './js/go';
 import GuidedDraggingTool from './js/GuidedDraggingTool';
 import TopRotatingTool from './js/RotatingTool';
@@ -23,14 +23,7 @@ import BarLink from './js/BarLink';
 import WaterFlowControlView from './js/WaterFlowControlView';
 import ConfigurationDetail from './js/ConfigurationDetail';
 import DragModal from './js/DragModal';
-import {
-  getSketchPadList,
-  getSketchPadContent,
-  getPointAddress,
-  getHistoryInfo,
-  getDictionaryList,
-  getDeviceRealInfo,
-} from './apis';
+import { getSketchPadList, getSketchPadContent, getPointAddress, getDeviceRealInfo } from './apis';
 import {
   isNumber,
   createGuid,
@@ -51,7 +44,7 @@ let auModalConfirmFn = null; // 登录模态框的确定事件
 let jumpModalProps = null;
 let modalProps = {};
 let modalWidth = 520;
-let historyInfoParams = {};
+let historyInfoParams = [];
 let nodeData = null; // 选中节点的数据
 let twoID = ``;
 
@@ -109,14 +102,7 @@ const ConfigurationView = (props) => {
   const AuthorFrom = useRef();
   const ConfigurationRef = useRef();
   const customBack = props.customBack ? props.customBack : () => {};
-  const {
-    devices = [],
-    dictionaryParams,
-    config,
-    isZoom = false,
-    flowShow = true,
-    deviceName = [],
-  } = props;
+  const { devices = [], config, isZoom = false, flowShow = true, deviceName = [] } = props;
   const globalConfig = window.globalConfig || config;
   let isClose = false;
 
@@ -884,21 +870,13 @@ const ConfigurationView = (props) => {
 
   /** **************************************历史模态渲染****************************************** */
   const historyModalRender = (data, list) => {
-    historyInfoParams = {
-      stream: [
-        {
-          stationCode: list.code,
-          sensors: data.shName,
-          pointVersions: list.type,
-          dateFrom: '',
-          dateTo: '',
-        },
-      ],
-      ignoreOutliers: false, // 过滤异常值
-      isVertical: false, // 是否展示竖表
-      zoom: '', // 数据抽稀
-      unit: '', // 数据抽稀 min h
-    };
+    historyInfoParams = [
+      {
+        deviceCode: list.code,
+        sensors: data.shName,
+        deviceType: list.type,
+      },
+    ];
     setIsHIModalVisible(true);
   };
 
@@ -2192,7 +2170,7 @@ const ConfigurationView = (props) => {
           okText={'确定'}
           width={modalWidth}
           cancelText={'取消'}
-          visible={isModalVisible}
+          open={isModalVisible}
           onOk={handleOk}
           onCancel={handleCancel}
           wrapClassName={classNames(`${prefixCls}-baseModal`)}
@@ -2209,10 +2187,11 @@ const ConfigurationView = (props) => {
           title={'权限认证'}
           okText={'确定'}
           cancelText={'取消'}
-          visible={isAuModalVisible}
+          open={isAuModalVisible}
           onOk={handleAuOk}
           onCancel={() => setIsAuModalVisible(false)}
           getContainer={ConfigurationRef.current}
+          width={520}
           wrapClassName={classNames(`${prefixCls}-baseModal`)}
         >
           <Form className={classNames('authorizeControlContent')} ref={AuthorFrom} name="loginForm">
@@ -2220,7 +2199,7 @@ const ConfigurationView = (props) => {
               <Input placeholder="请输入用户名" />
             </Form.Item>
             <Form.Item className={classNames('authorizeControlItem')} name="password" label="密码">
-              <Input placeholder="请输入密码" />
+              <Input.Password placeholder="请输入密码" />
             </Form.Item>
           </Form>
         </Modal>
@@ -2229,24 +2208,15 @@ const ConfigurationView = (props) => {
       {isHIModalVisible && (
         <Modal
           centered
-          width={960}
+          width={1100}
           footer={null}
-          visible={isHIModalVisible}
+          open={isHIModalVisible}
           onOk={() => setIsHIModalVisible(false)}
           onCancel={() => setIsHIModalVisible(false)}
           getContainer={ConfigurationRef.current}
           wrapClassName={classNames(`${prefixCls}-historyInfoModal`)}
         >
-          <HistoryInfo
-            title={''}
-            tableProps={{ bordered: true, pagination: { pageSize: 20 } }}
-            historyInfoService={getHistoryInfo}
-            historyInfoParams={historyInfoParams}
-            dictionaryService={getDictionaryList}
-            dictionaryParams={
-              Object.keys(dictionaryParams).length ? dictionaryParams : { nodeID: 0 }
-            }
-          />
+          <HistoryView deviceParams={historyInfoParams} />
         </Modal>
       )}
       {/* 画板跳转 */}
@@ -2285,7 +2255,6 @@ ConfigurationView.defaultProps = {
   name: '',
   devices: [],
   deviceName: [],
-  dictionaryParams: {},
   config: {},
   isZoom: false,
   flowShow: true,
@@ -2295,7 +2264,6 @@ ConfigurationView.propTypes = {
   name: PropTypes.string,
   devices: PropTypes.array,
   deviceName: PropTypes.array,
-  dictionaryParams: PropTypes.object,
   config: PropTypes.object,
   isZoom: PropTypes.bool,
   flowShow: PropTypes.bool,

packages/extend-components/EC_ConfigurationView/src/index.less

@@ -120,6 +120,10 @@
         align-items: center;
         margin-bottom: 20px;
 
+        .@{ant-prefix}-row {
+          width: 100%;
+        }
+
         .@{ant-prefix}-col.@{ant-prefix}-form-item-label {
           margin-right: 10px;
 
@@ -167,6 +171,10 @@
         &:last-of-type {
           margin-bottom: 0;
         }
+
+        .@{ant-prefix}-input-password-icon.anticon {
+          color: #ffffff;
+        }
       }
     }