chore: 合并冲突

packages/base-components/TipTool/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 (2021-11-11)
+
+### Bug Fixes
+
+- 修复 ec_configurationview dep ([c060354](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/c06035420f0e73c33207fc28b96b14c82137f9d3))
+- 修复 ec_configurationview dep ([54f91b7](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/54f91b749b58061db9cf77eee3304541228b1e32))
+- 删除 package-lock.json 文件 C ([e7cde73](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/e7cde734de0da778140c5b511b2734b35c224702))
+
+### Features
+
+- package 文件更改 ([5ad8b22](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/5ad8b22617a078c822e8f0c3a94d91a9027218f5))
+- tip 组件封装 ([955849a](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/955849a20b008c90af60cab0270622b8be0b81bd))
+
+# 1.2.0 (2021-11-11)
+
+### Bug Fixes
+
+- 修复 ec_configurationview dep ([54f91b7](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/54f91b749b58061db9cf77eee3304541228b1e32))
+
+### Features
+
+- package 文件更改 ([5ad8b22](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/5ad8b22617a078c822e8f0c3a94d91a9027218f5))
+- tip 组件封装 ([955849a](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/955849a20b008c90af60cab0270622b8be0b81bd))
+
+# 1.1.0 (2021-11-11)
+
+### Features
+
+- package 文件更改 ([5ad8b22](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/5ad8b22617a078c822e8f0c3a94d91a9027218f5))
+- tip 组件封装 ([955849a](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/955849a20b008c90af60cab0270622b8be0b81bd))

packages/base-components/TipTool/package.json

 {
   "name": "@wisdom-components/tiptool",
-  "version": "1.0.2",
+  "version": "1.3.0",
   "description": "> TODO: description",
   "author": "qinwenhai <939637841@qq.com>",
   "homepage": "",

packages/base-components/TipTool/src/index.js

-import React, { useContext, useState } from 'react';
+import React, { useState } from 'react';
 import { Header } from './header';
 import { LeftList } from './leftList';
 import './index.less';
@@ -6,6 +6,7 @@ import './index.less';
 const TipTool = (props) => {
   const { style } = props;
   const { leftSetting, headerSetting, events } = props.dataList;
+
   const data = [
     {
       name: 'middle',

packages/extend-components/EC_ConfigurationView/.gitignore

+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+**/node_modules
+# roadhog-api-doc ignore
+/src/utils/request-temp.js
+_roadhog-api-doc
+
+# production
+**/dist
+/.vscode
+**/**/lib/**
+**/**/es/**
+# misc
+.DS_Store
+npm-debug.log*
+yarn-error.log
+
+/coverage
+.idea
+package-lock.json
+*bak
+.vscode
+
+# visual studio code
+.history
+*.log
+
+functions/mock
+.temp/**
+
+# umi
+.umi
+.umi-production
+
+# screenshot
+screenshot
+.firebase
+.eslintcache
+.changelog
+
+# devServer-host
+host/
+webpack.host.js
\ No newline at end of file

packages/extend-components/EC_ConfigurationView/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.4](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/ec_configurationview@1.2.1...@wisdom-components/ec_configurationview@1.2.4) (2021-11-11)
+
+### Bug Fixes
+
+- 修复 ec_configurationview dep ([54f91b7](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/54f91b749b58061db9cf77eee3304541228b1e32))
+- 删除 package-lock.json 文件 C ([e7cde73](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/e7cde734de0da778140c5b511b2734b35c224702))
+
+## [1.2.3](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/ec_configurationview@1.2.1...@wisdom-components/ec_configurationview@1.2.3) (2021-11-11)
+
+### Bug Fixes
+
+- 修复 ec_configurationview dep ([54f91b7](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/54f91b749b58061db9cf77eee3304541228b1e32))
+
+## [1.2.2](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/ec_configurationview@1.2.1...@wisdom-components/ec_configurationview@1.2.2) (2021-11-11)
+
+**Note:** Version bump only for package @wisdom-components/ec_configurationview
+
 ## [1.2.1](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/ec_configurationview@1.2.0...@wisdom-components/ec_configurationview@1.2.1) (2021-10-09)
 
 ### Bug Fixes

packages/extend-components/EC_ConfigurationView/package.json

 {
     "name": "@wisdom-components/ec_configurationview",
-  "version": "1.2.1",
+    "version": "1.2.4",
     "description": "> TODO: description",
     "author": "tuqian <webtuqian@163.com>",
     "homepage": "",
@@ -22,5 +22,10 @@
     },
     "scripts": {
         "test": "echo \"Error: run tests from root\" && exit 1"
+    },
+    "dependencies": {
+        "@wisdom-components/ec_historyinfo": "1.2.19",
+        "@wisdom-components/mqttview": "1.3.4",
+        "cross-env": "^7.0.3"
     }
 }

packages/extend-components/EC_DeviceTree/.gitignore

+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+**/node_modules
+# roadhog-api-doc ignore
+/src/utils/request-temp.js
+_roadhog-api-doc
+
+# production
+**/dist
+/.vscode
+**/**/lib/**
+**/**/es/**
+# misc
+.DS_Store
+npm-debug.log*
+yarn-error.log
+
+/coverage
+.idea
+package-lock.json
+*bak
+.vscode
+
+# visual studio code
+.history
+*.log
+
+functions/mock
+.temp/**
+
+# umi
+.umi
+.umi-production
+
+# screenshot
+screenshot
+.firebase
+.eslintcache
+.changelog
+
+# devServer-host
+host/
+webpack.host.js
\ No newline at end of file

packages/extend-components/EC_DeviceTree/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.5.17](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/ec_devicetree@1.5.15...@wisdom-components/ec_devicetree@1.5.17) (2021-11-11)
+
+### Bug Fixes
+
+- 修复 ec_configurationview dep ([54f91b7](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/54f91b749b58061db9cf77eee3304541228b1e32))
+- 删除 package-lock.json 文件 C ([e7cde73](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/e7cde734de0da778140c5b511b2734b35c224702))
+
+## [1.5.16](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/ec_devicetree@1.5.15...@wisdom-components/ec_devicetree@1.5.16) (2021-11-11)
+
+### Bug Fixes
+
+- 修复 ec_configurationview dep ([54f91b7](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/54f91b749b58061db9cf77eee3304541228b1e32))
+
 ## [1.5.15](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/ec_devicetree@1.5.14...@wisdom-components/ec_devicetree@1.5.15) (2021-10-09)
 
 ### Bug Fixes

packages/extend-components/EC_DeviceTree/package.json

 {
   "name": "@wisdom-components/ec_devicetree",
-  "version": "1.5.15",
+  "version": "1.5.17",
   "description": "> TODO: description",
   "author": "tuqian <webtuqian@163.com>",
   "homepage": "",

packages/extend-components/EC_HistoryInfo/.gitignore

+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+**/node_modules
+# roadhog-api-doc ignore
+/src/utils/request-temp.js
+_roadhog-api-doc
+
+# production
+**/dist
+/.vscode
+**/**/lib/**
+**/**/es/**
+# misc
+.DS_Store
+npm-debug.log*
+yarn-error.log
+
+/coverage
+.idea
+package-lock.json
+*bak
+.vscode
+
+# visual studio code
+.history
+*.log
+
+functions/mock
+.temp/**
+
+# umi
+.umi
+.umi-production
+
+# screenshot
+screenshot
+.firebase
+.eslintcache
+.changelog
+
+# devServer-host
+host/
+webpack.host.js
\ No newline at end of file

packages/extend-components/EC_HistoryInfo/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.19](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/ec_historyinfo@1.2.17...@wisdom-components/ec_historyinfo@1.2.19) (2021-11-11)
+
+### Bug Fixes
+
+- 修复 ec_configurationview dep ([54f91b7](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/54f91b749b58061db9cf77eee3304541228b1e32))
+- 删除 package-lock.json 文件 C ([e7cde73](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/e7cde734de0da778140c5b511b2734b35c224702))
+
+## [1.2.18](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/ec_historyinfo@1.2.17...@wisdom-components/ec_historyinfo@1.2.18) (2021-11-11)
+
+### Bug Fixes
+
+- 修复 ec_configurationview dep ([54f91b7](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/54f91b749b58061db9cf77eee3304541228b1e32))
+
 ## [1.2.17](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/ec_historyinfo@1.2.16...@wisdom-components/ec_historyinfo@1.2.17) (2021-10-09)
 
 ### Bug Fixes

packages/extend-components/EC_HistoryInfo/package.json

 {
   "name": "@wisdom-components/ec_historyinfo",
-  "version": "1.2.17",
+  "version": "1.2.19",
   "description": "> TODO: description",
   "author": "tuqian <webtuqian@163.com>",
   "homepage": "",