Merge branch 'updateTsx' into 'dev'

package.json

@@ -115,11 +115,13 @@
     "slash2": "^2.0.0",
     "style-loader": "^2.0.0",
     "stylelint": "^13.0.0",
+    "terser-webpack-plugin": "^5.1.1",
     "typescript": "^4.1.2",
     "umi": "^3.4.0",
     "umi-request": "^1.3.5",
     "umi-test": "^1.9.6",
     "umi-types": "^0.5.11",
+    "url-loader": "^4.1.1",
     "webpack": "^5.24.2",
     "webpack-bundle-analyzer": "^4.4.0",
     "webpack-cli": "^4.5.0",
@@ -136,6 +138,7 @@
   },
   "dependencies": {
     "@wisdom-components/Empty": "^1.0.1",
+    "@wisdom-components/timerangepicker": "^1.2.0",
     "classnames": "^2.2.6",
     "cross-spawn": "^7.0.3",
     "highcharts": "^9.0.1",

packages/DeviceTree/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# 1.1.0 (2021-03-24)
+
+### Bug Fixes
+
+- 修改文件格式 ([dd58b0a](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/dd58b0a40bc4a812ba46cf0b0046ad1189494bf5))
+- 修改样式写法 ([d670487](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/d670487dc174b747af9a8bdc22099bb40aa1c976))
+- document code preview ([043017c](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/043017c30e6d5b9315f0092a9e1763a244b7746b))
+
+### Features
+
+- 设备树组件 ([792058c](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/792058cab251539912bde580e0ed5a7e742f92f1))
+
 # 1.1.0 (2021-03-16)
 
 ### Bug Fixes

packages/DeviceTree/package.json

 {
   "name": "@wisdom-components/devicetree",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "> TODO: description",
   "author": "tuqian <webtuqian@163.com>",
   "homepage": "",

packages/Empty/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# 1.1.0 (2021-03-24)
+
+### Bug Fixes
+
+- 修改版本 ([04fc188](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/04fc18827700cf165c0ad9df1ee0078a1f596a97))
+- 修改文件格式 ([dd58b0a](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/dd58b0a40bc4a812ba46cf0b0046ad1189494bf5))
+- 修改样式写法 ([d670487](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/d670487dc174b747af9a8bdc22099bb40aa1c976))
+- 修改 props ([568aaef](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/568aaefdc22a2e7afb23fbd19627d421b3615001))
+- document code preview ([043017c](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/043017c30e6d5b9315f0092a9e1763a244b7746b))
+
+### Features
+
+- 无数据展示组件 ([b048c94](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/b048c948bfaf96e1465e08b4a9d5d88095a8fb42))
+
 # 1.1.0 (2021-03-16)
 
 ### Bug Fixes

packages/Empty/package.json

 {
   "name": "@wisdom-components/empty",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "@wisdom-components/empty",
   "author": "tuqian <webtuqian@163.com>",
   "homepage": "",

packages/HistoryInfo/CHANGELOG.md

+# Change Log
+
+All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+# [1.3.0](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/historyinfo@1.2.0...@wisdom-components/historyinfo@1.3.0) (2021-03-24)
+
+### Features
+
+- 修复 historyinfo ([72d2e67](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/72d2e679c0309ec5b88c76385fe396ebdaa74c8c))
+
+# [1.2.0](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/historyinfo@1.1.0...@wisdom-components/historyinfo@1.2.0) (2021-03-24)
+
+### Features
+
+- 修复 historyinfo ([e331636](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/e331636e7b021173359ade0e65416049b014d0b1))
+- 修复 historyinfo ([87f1ac3](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/87f1ac3b715de6b4e8a1f86b239f7e6fcc175f7b))
+- 修复 historyinfo ([430376d](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/430376d42546805cea5b21e474681d324e92c0a2))
+- 修复 historyinfo ([6bc7448](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/6bc744894b9d3e53ebefa2bfa557941f88c3a3c8))
+
+# 1.1.0 (2021-03-24)
+
+### Bug Fixes
+
+- 修改文件格式 ([dd58b0a](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/dd58b0a40bc4a812ba46cf0b0046ad1189494bf5))
+- document code preview ([043017c](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/043017c30e6d5b9315f0092a9e1763a244b7746b))
+
+### Features
+
+- 查看历史数据组件 ([633433d](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/633433dfde67b22b9f0cd51f25a84c119f9d5c14))

packages/HistoryInfo/package.json

 {
   "name": "@wisdom-components/historyinfo",
-  "version": "1.0.1",
+  "version": "1.3.0",
   "description": "> TODO: description",
   "author": "tuqian <webtuqian@163.com>",
   "homepage": "",

packages/HistoryInfo/src/index.js

@@ -5,7 +5,7 @@ import Highcharts from 'highcharts/highstock';
 import HighchartsReact from 'highcharts-react-official';
 import { Tabs, Select, Radio, Checkbox, Table, ConfigProvider, DatePicker } from 'antd';
 import { PlusCircleOutlined } from '@ant-design/icons';
-import TimeRangePicker from '@wisdom-components/timerangepicker/src';
+import TimeRangePicker from '@wisdom-components/timerangepicker';
 import Empty from '@wisdom-components/Empty';
 import moment from 'moment';
 import './index.less';
@@ -14,14 +14,20 @@ const { TabPane } = Tabs;
 const { RangePicker } = DatePicker;
 const { Option } = Select;
 
+const UPDATE_TIME = {
+  UPDATE_TIME: 'updateTime',
+  UPDATE_BATCH_TIME: 'updateBatchTime',
+  UPDATE_DATA_THIN: 'updateDataThin',
+};
+
 const reducer = (state, action) => {
   switch (action.type) {
-    case 'updateTime':
+    case UPDATE_TIME.UPDATE_TIME:
       return {
         ...state,
         dateRange: updateTime(action.payload),
       };
-    case 'updateBatchTime':
+    case UPDATE_TIME.UPDATE_BATCH_TIME:
       return {
         ...state,
         dateRange: action.payload,
@@ -31,7 +37,7 @@ const reducer = (state, action) => {
         ...state,
         ignoreOutliers: action.payload,
       };
-    case 'updateDataThin':
+    case UPDATE_TIME.UPDATE_DATA_THIN:
       const { zoom, unit } = action.payload;
       return {
         ...state,

packages/ImageSelect/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# 1.1.0 (2021-03-24)
+
+### Bug Fixes
+
+- 修改文件格式 ([dd58b0a](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/dd58b0a40bc4a812ba46cf0b0046ad1189494bf5))
+- 修改样式写法 ([d670487](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/d670487dc174b747af9a8bdc22099bb40aa1c976))
+- document code preview ([043017c](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/043017c30e6d5b9315f0092a9e1763a244b7746b))
+
+### Features
+
+- 图片选择组件 ([2499ae3](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/2499ae3518801ada048106f80deea8257d3647dd))
+
 # 1.1.0 (2021-03-16)
 
 ### Bug Fixes

packages/ImageSelect/package.json

 {
   "name": "@wisdom-components/imageselect",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "> TODO: description",
   "author": "tuqian <webtuqian@163.com>",
   "homepage": "",

packages/MqttView/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# 1.2.0 (2021-03-24)
+
+### Bug Fixes
+
+- 修改文件格式 ([dd58b0a](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/dd58b0a40bc4a812ba46cf0b0046ad1189494bf5))
+
+### Features
+
+- 修复 historyinfo ([72d2e67](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/72d2e679c0309ec5b88c76385fe396ebdaa74c8c))
+- add MqttView ([51eca30](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/51eca3015037844a505c5220aab38e0e058726de))
+
+# 1.1.0 (2021-03-24)
+
+### Bug Fixes
+
+- 修改文件格式 ([dd58b0a](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/dd58b0a40bc4a812ba46cf0b0046ad1189494bf5))
+
+### Features
+
+- add MqttView ([51eca30](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/51eca3015037844a505c5220aab38e0e058726de))
+
 # 1.1.0 (2021-03-16)
 
 ### Features

packages/MqttView/package.json

 {
   "name": "@wisdom-components/mqttview",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "description": "> TODO: description",
   "author": "lijiwen <961370825@qq.com>",
   "homepage": "",

packages/MqttView/src/index.js

@@ -102,7 +102,7 @@ class MqttView {
     }, 1000);
   }
 
-  //消息接收
+  //消息接收(控制和订阅)
   onMessageArrived(message, infoType) {
     var topic = message.topic;
     var code = topic.split('/')[topic.split('/').length - 1];

packages/QuotaSelect/CHANGELOG.md

@@ -2,6 +2,29 @@
 
 All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# 1.2.0 (2021-03-24)
+
+### Bug Fixes
+
+- 修改文件格式 ([dd58b0a](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/dd58b0a40bc4a812ba46cf0b0046ad1189494bf5))
+- document code preview ([043017c](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/043017c30e6d5b9315f0092a9e1763a244b7746b))
+
+### Features
+
+- 修复 historyinfo ([72d2e67](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/72d2e679c0309ec5b88c76385fe396ebdaa74c8c))
+- 指标选择组件 ([87aa3c7](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/87aa3c77022c0fe286afe4a1ef1d2600b1799736))
+
+# 1.1.0 (2021-03-24)
+
+### Bug Fixes
+
+- 修改文件格式 ([dd58b0a](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/dd58b0a40bc4a812ba46cf0b0046ad1189494bf5))
+- document code preview ([043017c](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/043017c30e6d5b9315f0092a9e1763a244b7746b))
+
+### Features
+
+- 指标选择组件 ([87aa3c7](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/87aa3c77022c0fe286afe4a1ef1d2600b1799736))
+
 # 1.1.0 (2021-03-16)
 
 ### Features

packages/QuotaSelect/package.json

 {
   "name": "@wisdom-components/quotaselect",
-  "version": "1.0.1",
+  "version": "1.2.0",
   "description": "> TODO: description",
   "author": "tuqian <webtuqian@163.com>",
   "homepage": "",

packages/QuotaSelect/src/index.js

@@ -46,7 +46,7 @@ const QuotaSelect = ({
     }
   };
 
-  const onOk = () => {
+  const onOk = (e) => {
     onModalOk && onModalOk();
     setVisible(false);
   };

packages/RealTimeInfo/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# 1.1.0 (2021-03-24)
+
+### Bug Fixes
+
+- 修改文件格式 ([dd58b0a](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/dd58b0a40bc4a812ba46cf0b0046ad1189494bf5))
+
+### Features
+
+- 实时数据组件 ([9caff7e](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/9caff7e14cbb25058b76e505f9b24295a8013709))
+
 # 1.1.0 (2021-03-16)
 
 ### Features

packages/RealTimeInfo/package.json

 {
   "name": "@wisdom-components/realtimeinfo",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "> TODO: description",
   "author": "tuqian <webtuqian@163.com>",
   "homepage": "",

packages/TimeRangePicker/CHANGELOG.md

+# Change Log
+
+All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+# 1.2.0 (2021-03-24)
+
+### Bug Fixes
+
+- 修改文件格式 ([dd58b0a](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/dd58b0a40bc4a812ba46cf0b0046ad1189494bf5))
+
+### Features
+
+- 查看历史数据组件 ([633433d](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/633433dfde67b22b9f0cd51f25a84c119f9d5c14))
+- 修复 historyinfo ([8817e32](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/8817e32dbc2b5300f54b5d014e8cb08eda3ef97c))
+- 自定义类型时间选择器组件 ([b06588a](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/b06588a4845ee7474e3820e1ede5158c9a4cc808))
+
+# 1.1.0 (2021-03-24)
+
+### Bug Fixes
+
+- 修改文件格式 ([dd58b0a](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/dd58b0a40bc4a812ba46cf0b0046ad1189494bf5))
+
+### Features
+
+- 查看历史数据组件 ([633433d](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/633433dfde67b22b9f0cd51f25a84c119f9d5c14))
+- 自定义类型时间选择器组件 ([b06588a](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/b06588a4845ee7474e3820e1ede5158c9a4cc808))

packages/TimeRangePicker/package.json

 {
   "name": "@wisdom-components/timerangepicker",
-  "version": "1.0.1",
+  "version": "1.2.0",
   "description": "> TODO: description",
   "author": "tuqian <webtuqian@163.com>",
   "homepage": "",

packages/TimeRangePicker/src/index.js

@@ -56,12 +56,7 @@ const TimeRangePicker = ({
 
   const renderVertical = () => {
     return !!dataSource.length ? (
-      <Select
-        value={value}
-        defaultValue={defaultValue}
-        style={{ width: width }}
-        onChange={onSelectChange}
-      >
+      <Select value defaultValue={defaultValue} style={{ width: width }} onChange={onSelectChange}>
         {dataSource.map((item) => (
           <Option key={item.key} value={item.key}>
             {item.name}