Skip to content

W
wisdom-components
Commit c19528b1 authored by 涂茜's avatar 涂茜
Browse files
Options

fix: 解决冲突

parents 0fb8d9f6 497c53c4
Pipeline #25789 failed with stages
          in 8 seconds
          Show whitespace changes
          Inline Side-by-side
          Showing with 79 additions and 13 deletions
          packages/BasicTable/CHANGELOG.md
          View file @ c19528b1
          ...@@ -2,6 +2,16 @@ ...@@ -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. 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-04-09)
          ### Bug Fixes
          - update table ([dcf8ae6](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/dcf8ae65818c903c9bf08080b26250c79b26c4b7))
          ### Features
          - 新增标准表格组件 ([f0b0666](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/f0b0666a246761fd3debe0f3d8a3b3ca4df5a568))
          # 1.2.0 (2021-04-09) # 1.2.0 (2021-04-09)
          ### Bug Fixes ### Bug Fixes
          ......
          packages/BasicTable/package.json
          View file @ c19528b1
          { {
          "name": "@wisdom-components/basictable", "name": "@wisdom-components/basictable",
          "version": "1.2.0", "version": "1.3.0",
          "description": "> TODO: description", "description": "> TODO: description",
          "author": "tuqian <webtuqian@163.com>", "author": "tuqian <webtuqian@163.com>",
          "homepage": "", "homepage": "",
          ......
          packages/BasicTools/CHANGELOG.md
          View file @ c19528b1
          ...@@ -2,6 +2,10 @@ ...@@ -2,6 +2,10 @@
          All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
          ## [1.2.5](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/basictools@1.2.2...@wisdom-components/basictools@1.2.5) (2021-04-09)
          **Note:** Version bump only for package @wisdom-components/basictools
          ## [1.2.4](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/basictools@1.2.2...@wisdom-components/basictools@1.2.4) (2021-04-09) ## [1.2.4](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/basictools@1.2.2...@wisdom-components/basictools@1.2.4) (2021-04-09)
          **Note:** Version bump only for package @wisdom-components/basictools **Note:** Version bump only for package @wisdom-components/basictools
          ......
          packages/BasicTools/package.json
          View file @ c19528b1
          { {
          "name": "@wisdom-components/basictools", "name": "@wisdom-components/basictools",
          "version": "1.2.4", "version": "1.2.5",
          "description": "> TODO: description", "description": "> TODO: description",
          "author": "tuqian <webtuqian@163.com>", "author": "tuqian <webtuqian@163.com>",
          "homepage": "", "homepage": "",
          ......
          packages/DeviceTree/CHANGELOG.md
          View file @ c19528b1
          ...@@ -2,6 +2,10 @@ ...@@ -2,6 +2,10 @@
          All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
          ## [1.3.5](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/devicetree@1.3.2...@wisdom-components/devicetree@1.3.5) (2021-04-09)
          **Note:** Version bump only for package @wisdom-components/devicetree
          ## [1.3.4](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/devicetree@1.3.2...@wisdom-components/devicetree@1.3.4) (2021-04-09) ## [1.3.4](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/devicetree@1.3.2...@wisdom-components/devicetree@1.3.4) (2021-04-09)
          **Note:** Version bump only for package @wisdom-components/devicetree **Note:** Version bump only for package @wisdom-components/devicetree
          ......
          packages/DeviceTree/package.json
          View file @ c19528b1
          { {
          "name": "@wisdom-components/devicetree", "name": "@wisdom-components/devicetree",
          "version": "1.3.4", "version": "1.3.5",
          "description": "> TODO: description", "description": "> TODO: description",
          "author": "tuqian <webtuqian@163.com>", "author": "tuqian <webtuqian@163.com>",
          "homepage": "", "homepage": "",
          ......
          packages/Empty/CHANGELOG.md
          View file @ c19528b1
          ...@@ -2,6 +2,12 @@ ...@@ -2,6 +2,12 @@
          All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
          ## [1.3.5](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/empty@1.3.2...@wisdom-components/empty@1.3.5) (2021-04-09)
          ### Bug Fixes
          - update empty ([195dc64](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/195dc64e73585e3205f28784e1cd53e61feca9b0))
          ## [1.3.4](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/empty@1.3.2...@wisdom-components/empty@1.3.4) (2021-04-09) ## [1.3.4](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/empty@1.3.2...@wisdom-components/empty@1.3.4) (2021-04-09)
          ### Bug Fixes ### Bug Fixes
          ......
          packages/Empty/package.json
          View file @ c19528b1
          { {
          "name": "@wisdom-components/empty", "name": "@wisdom-components/empty",
          "version": "1.3.4", "version": "1.3.5",
          "description": "@wisdom-components/empty", "description": "@wisdom-components/empty",
          "author": "tuqian <webtuqian@163.com>", "author": "tuqian <webtuqian@163.com>",
          "homepage": "", "homepage": "",
          ......
          packages/ExportExcel/CHANGELOG.md
          View file @ c19528b1
          ...@@ -2,6 +2,10 @@ ...@@ -2,6 +2,10 @@
          All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
          ## [1.0.5](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/exportexcel@1.0.2...@wisdom-components/exportexcel@1.0.5) (2021-04-09)
          **Note:** Version bump only for package @wisdom-components/exportexcel
          ## [1.0.4](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/exportexcel@1.0.2...@wisdom-components/exportexcel@1.0.4) (2021-04-09) ## [1.0.4](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/exportexcel@1.0.2...@wisdom-components/exportexcel@1.0.4) (2021-04-09)
          **Note:** Version bump only for package @wisdom-components/exportexcel **Note:** Version bump only for package @wisdom-components/exportexcel
          ......
          packages/ExportExcel/package.json
          View file @ c19528b1
          { {
          "name": "@wisdom-components/exportexcel", "name": "@wisdom-components/exportexcel",
          "version": "1.0.4", "version": "1.0.5",
          "description": "> TODO: description", "description": "> TODO: description",
          "author": "lijiwen <961370825@qq.com>", "author": "lijiwen <961370825@qq.com>",
          "homepage": "", "homepage": "",
          ......
          packages/HistoryInfo/CHANGELOG.md
          View file @ c19528b1
          ...@@ -2,6 +2,12 @@ ...@@ -2,6 +2,12 @@
          All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
          ## [1.4.5](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/historyinfo@1.4.2...@wisdom-components/historyinfo@1.4.5) (2021-04-09)
          ### Bug Fixes
          - update historyinfo and realtimeinfo ([d937324](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/d937324eb5daf4a55bea700f0c186b4ae95d98e2))
          ## [1.4.4](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/historyinfo@1.4.2...@wisdom-components/historyinfo@1.4.4) (2021-04-09) ## [1.4.4](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/historyinfo@1.4.2...@wisdom-components/historyinfo@1.4.4) (2021-04-09)
          ### Bug Fixes ### Bug Fixes
          ......
          packages/HistoryInfo/package.json
          View file @ c19528b1
          { {
          "name": "@wisdom-components/historyinfo", "name": "@wisdom-components/historyinfo",
          "version": "1.4.4", "version": "1.4.5",
          "description": "> TODO: description", "description": "> TODO: description",
          "author": "tuqian <webtuqian@163.com>", "author": "tuqian <webtuqian@163.com>",
          "homepage": "", "homepage": "",
          ......
          packages/ImageSelect/CHANGELOG.md
          View file @ c19528b1
          ...@@ -2,6 +2,10 @@ ...@@ -2,6 +2,10 @@
          All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
          ## [1.3.5](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/imageselect@1.3.2...@wisdom-components/imageselect@1.3.5) (2021-04-09)
          **Note:** Version bump only for package @wisdom-components/imageselect
          ## [1.3.4](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/imageselect@1.3.2...@wisdom-components/imageselect@1.3.4) (2021-04-09) ## [1.3.4](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/imageselect@1.3.2...@wisdom-components/imageselect@1.3.4) (2021-04-09)
          **Note:** Version bump only for package @wisdom-components/imageselect **Note:** Version bump only for package @wisdom-components/imageselect
          ......
          packages/ImageSelect/package.json
          View file @ c19528b1
          { {
          "name": "@wisdom-components/imageselect", "name": "@wisdom-components/imageselect",
          "version": "1.3.4", "version": "1.3.5",
          "description": "> TODO: description", "description": "> TODO: description",
          "author": "tuqian <webtuqian@163.com>", "author": "tuqian <webtuqian@163.com>",
          "homepage": "", "homepage": "",
          ......
          packages/MqttView/CHANGELOG.md
          View file @ c19528b1
          ...@@ -2,6 +2,10 @@ ...@@ -2,6 +2,10 @@
          All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
          ## [1.2.7](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/mqttview@1.2.4...@wisdom-components/mqttview@1.2.7) (2021-04-09)
          **Note:** Version bump only for package @wisdom-components/mqttview
          ## [1.2.6](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/mqttview@1.2.4...@wisdom-components/mqttview@1.2.6) (2021-04-09) ## [1.2.6](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/mqttview@1.2.4...@wisdom-components/mqttview@1.2.6) (2021-04-09)
          **Note:** Version bump only for package @wisdom-components/mqttview **Note:** Version bump only for package @wisdom-components/mqttview
          ......
          packages/MqttView/package.json
          View file @ c19528b1
          { {
          "name": "@wisdom-components/mqttview", "name": "@wisdom-components/mqttview",
          "version": "1.2.6", "version": "1.2.7",
          "description": "> TODO: description", "description": "> TODO: description",
          "author": "lijiwen <961370825@qq.com>", "author": "lijiwen <961370825@qq.com>",
          "homepage": "", "homepage": "",
          ......
          packages/ParseForm/CHANGELOG.md
          View file @ c19528b1
          ...@@ -2,6 +2,10 @@ ...@@ -2,6 +2,10 @@
          All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
          ## [1.2.5](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/parseform@1.2.2...parseform@1.2.5) (2021-04-09)
          **Note:** Version bump only for package parseform
          ## [1.2.4](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/parseform@1.2.2...parseform@1.2.4) (2021-04-09) ## [1.2.4](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/parseform@1.2.2...parseform@1.2.4) (2021-04-09)
          **Note:** Version bump only for package parseform **Note:** Version bump only for package parseform
          ......
          packages/ParseForm/package.json
          View file @ c19528b1
          { {
          "name": "parseform", "name": "parseform",
          "version": "1.2.4", "version": "1.2.5",
          "description": "> TODO: description", "description": "> TODO: description",
          "author": "lijiwen <961370825@qq.com>", "author": "lijiwen <961370825@qq.com>",
          "homepage": "", "homepage": "",
          ......
          packages/QuotaSelect/CHANGELOG.md
          View file @ c19528b1
          ...@@ -2,6 +2,16 @@ ...@@ -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. All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
          # [1.6.0](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/quotaselect@1.3.2...@wisdom-components/quotaselect@1.6.0) (2021-04-09)
          ### Bug Fixes
          - update QuotaSelect ([4952245](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/49522451da39fdd98cc87bb59929c9e176d21012))
          ### Features
          - 新增标准表格组件 ([f0b0666](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/f0b0666a246761fd3debe0f3d8a3b3ca4df5a568))
          # [1.5.0](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/quotaselect@1.3.2...@wisdom-components/quotaselect@1.5.0) (2021-04-09) # [1.5.0](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/quotaselect@1.3.2...@wisdom-components/quotaselect@1.5.0) (2021-04-09)
          ### Bug Fixes ### Bug Fixes
          ......
          packages/QuotaSelect/package.json
          View file @ c19528b1
          { {
          "name": "@wisdom-components/quotaselect", "name": "@wisdom-components/quotaselect",
          "version": "1.5.0", "version": "1.6.0",
          "description": "> TODO: description", "description": "> TODO: description",
          "author": "tuqian <webtuqian@163.com>", "author": "tuqian <webtuqian@163.com>",
          "homepage": "", "homepage": "",
          ......
          packages/RealTimeInfo/CHANGELOG.md
          View file @ c19528b1
          ...@@ -2,6 +2,12 @@ ...@@ -2,6 +2,12 @@
          All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
          ## [1.2.5](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/realtimeinfo@1.2.2...@wisdom-components/realtimeinfo@1.2.5) (2021-04-09)
          ### Bug Fixes
          - update historyinfo and realtimeinfo ([d937324](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/d937324eb5daf4a55bea700f0c186b4ae95d98e2))
          ## [1.2.4](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/realtimeinfo@1.2.2...@wisdom-components/realtimeinfo@1.2.4) (2021-04-09) ## [1.2.4](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/realtimeinfo@1.2.2...@wisdom-components/realtimeinfo@1.2.4) (2021-04-09)
          ### Bug Fixes ### Bug Fixes
          ......
          packages/RealTimeInfo/package.json
          View file @ c19528b1
          { {
          "name": "@wisdom-components/realtimeinfo", "name": "@wisdom-components/realtimeinfo",
          "version": "1.2.4", "version": "1.2.5",
          "description": "> TODO: description", "description": "> TODO: description",
          "author": "tuqian <webtuqian@163.com>", "author": "tuqian <webtuqian@163.com>",
          "homepage": "", "homepage": "",
          ...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
          "test": "echo \"Error: run tests from root\" && exit 1" "test": "echo \"Error: run tests from root\" && exit 1"
          }, },
          "dependencies": { "dependencies": {
          "@wisdom-components/basictable": "1.2.0", "@wisdom-components/basictable": "1.3.0",
          "classnames": "^2.2.6" "classnames": "^2.2.6"
          } }
          } }
          packages/TimeRangePicker/CHANGELOG.md
          View file @ c19528b1
          ...@@ -2,6 +2,10 @@ ...@@ -2,6 +2,10 @@
          All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
          ## [1.3.5](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/timerangepicker@1.3.2...@wisdom-components/timerangepicker@1.3.5) (2021-04-09)
          **Note:** Version bump only for package @wisdom-components/timerangepicker
          ## [1.3.4](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/timerangepicker@1.3.2...@wisdom-components/timerangepicker@1.3.4) (2021-04-09) ## [1.3.4](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/timerangepicker@1.3.2...@wisdom-components/timerangepicker@1.3.4) (2021-04-09)
          **Note:** Version bump only for package @wisdom-components/timerangepicker **Note:** Version bump only for package @wisdom-components/timerangepicker
          ......
          packages/TimeRangePicker/package.json
          View file @ c19528b1
          { {
          "name": "@wisdom-components/timerangepicker", "name": "@wisdom-components/timerangepicker",
          "version": "1.3.4", "version": "1.3.5",
          "description": "> TODO: description", "description": "> TODO: description",
          "author": "tuqian <webtuqian@163.com>", "author": "tuqian <webtuqian@163.com>",
          "homepage": "", "homepage": "",
          ......
          Markdown is supported
          0% or
          You are about to add 0 people to the discussion. Proceed with caution.
          Finish editing this message first!
          Please register or to comment