Skip to content

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

Merge branch 'fix/package' into 'dev'

Fix/package See merge request !28
parents f8b5b157 bbc5dcc3
Pipeline #26201 failed with stages
          in 15 seconds
          Hide whitespace changes
          Inline Side-by-side
          Showing with 132 additions and 34 deletions
          packages/BasicTable/CHANGELOG.md
          View file @ be9730ba
          # Change Log # Change Log
          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.1](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/basictable@1.4.0...@wisdom-components/basictable@1.4.1) (2021-04-20)
          ### Bug Fixes
          * package ([98cc2ff](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/98cc2ffae8f7ea2f90eceaa842a2a46a9bf143da))
          * update empty ([9ff070a](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/9ff070a95febbd04726b2e330828b7a184d1ba21))
          # 1.4.0 (2021-04-09) # 1.4.0 (2021-04-09)
          ......
          packages/BasicTable/package.json
          View file @ be9730ba
          { {
          "name": "@wisdom-components/basictable", "name": "@wisdom-components/basictable",
          "version": "1.4.0", "version": "1.4.1",
          "description": "> TODO: description", "description": "> TODO: description",
          "author": "tuqian <webtuqian@163.com>", "author": "tuqian <webtuqian@163.com>",
          "homepage": "", "homepage": "",
          ...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
          "test": "echo \"Error: run tests from root\" && exit 1" "test": "echo \"Error: run tests from root\" && exit 1"
          }, },
          "dependencies": { "dependencies": {
          "@wisdom-components/Empty": "^1.3.4",
          "classnames": "^2.2.6" "classnames": "^2.2.6"
          } }
          } }
          packages/DeviceTree/CHANGELOG.md
          View file @ be9730ba
          # Change Log # Change Log
          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.7](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/devicetree@1.3.6...@wisdom-components/devicetree@1.3.7) (2021-04-20)
          ### Bug Fixes
          * package ([98cc2ff](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/98cc2ffae8f7ea2f90eceaa842a2a46a9bf143da))
          * update empty ([9ff070a](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/9ff070a95febbd04726b2e330828b7a184d1ba21))
          ## [1.3.6](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/devicetree@1.3.2...@wisdom-components/devicetree@1.3.6) (2021-04-09) ## [1.3.6](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/devicetree@1.3.2...@wisdom-components/devicetree@1.3.6) (2021-04-09)
          ......
          packages/DeviceTree/package.json
          View file @ be9730ba
          { {
          "name": "@wisdom-components/devicetree", "name": "@wisdom-components/devicetree",
          "version": "1.3.6", "version": "1.3.7",
          "description": "> TODO: description", "description": "> TODO: description",
          "author": "tuqian <webtuqian@163.com>", "author": "tuqian <webtuqian@163.com>",
          "homepage": "", "homepage": "",
          ...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
          "test": "echo \"Error: run tests from root\" && exit 1" "test": "echo \"Error: run tests from root\" && exit 1"
          }, },
          "dependencies": { "dependencies": {
          "@wisdom-components/Empty": "^1.3.3",
          "classnames": "^2.2.6" "classnames": "^2.2.6"
          } }
          } }
          packages/Empty/CHANGELOG.md
          View file @ be9730ba
          # Change Log # Change Log
          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.8](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/empty@1.3.6...@wisdom-components/empty@1.3.8) (2021-04-20)
          ### Bug Fixes
          * update empty ([9ff070a](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/9ff070a95febbd04726b2e330828b7a184d1ba21))
          ## [1.3.7](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/empty@1.3.6...@wisdom-components/empty@1.3.7) (2021-04-09) ## [1.3.7](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/empty@1.3.6...@wisdom-components/empty@1.3.7) (2021-04-09)
          ......
          packages/Empty/package.json
          View file @ be9730ba
          { {
          "name": "@wisdom-components/empty", "name": "@wisdom-components/empty",
          "version": "1.3.7", "version": "1.3.8",
          "description": "@wisdom-components/empty", "description": "@wisdom-components/empty",
          "author": "tuqian <webtuqian@163.com>", "author": "tuqian <webtuqian@163.com>",
          "homepage": "", "homepage": "",
          ......
          packages/HistoryInfo/CHANGELOG.md
          View file @ be9730ba
          # Change Log # Change Log
          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.7](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/historyinfo@1.4.6...@wisdom-components/historyinfo@1.4.7) (2021-04-20)
          ### Bug Fixes
          * package ([98cc2ff](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/98cc2ffae8f7ea2f90eceaa842a2a46a9bf143da))
          * update empty ([9ff070a](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/9ff070a95febbd04726b2e330828b7a184d1ba21))
          ## [1.4.6](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/historyinfo@1.4.2...@wisdom-components/historyinfo@1.4.6) (2021-04-09) ## [1.4.6](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/historyinfo@1.4.2...@wisdom-components/historyinfo@1.4.6) (2021-04-09)
          ......
          packages/HistoryInfo/package.json
          View file @ be9730ba
          { {
          "name": "@wisdom-components/historyinfo", "name": "@wisdom-components/historyinfo",
          "version": "1.4.6", "version": "1.4.7",
          "description": "> TODO: description", "description": "> TODO: description",
          "author": "tuqian <webtuqian@163.com>", "author": "tuqian <webtuqian@163.com>",
          "homepage": "", "homepage": "",
          ...@@ -24,9 +24,6 @@ ...@@ -24,9 +24,6 @@
          "test": "echo \"Error: run tests from root\" && exit 1" "test": "echo \"Error: run tests from root\" && exit 1"
          }, },
          "dependencies": { "dependencies": {
          "@wisdom-components/Empty": "^1.3.3",
          "@wisdom-components/basictable": "1.4.0",
          "@wisdom-components/timerangepicker": "1.3.6",
          "classnames": "^2.2.6", "classnames": "^2.2.6",
          "highcharts": "^9.0.1", "highcharts": "^9.0.1",
          "highcharts-react-official": "^3.0.0", "highcharts-react-official": "^3.0.0",
          ......
          packages/HistoryInfo/src/HistoryInfo.md
          View file @ be9730ba
          ...@@ -28,11 +28,12 @@ group: ...@@ -28,11 +28,12 @@ group:
          api 参考 Antd Table 组件 https://ant.design/components/table-cn/#API api 参考 Antd Table 组件 https://ant.design/components/table-cn/#API
          | 参数 | 说明 | 类型 | 默认值 | | 参数 | 说明 | 类型 | 默认值 |
          | ------------ | ---------------------------------------------- | ------------------ | -------- | | -------------- | ---------------------------------------------- | ------------------ | -------- |
          | title | 标题 | string | 指标曲线 | | title | 标题 | string | 指标曲线 |
          | columns | 表格列的配置描述 | array | [ ] | | defaultChecked | 默认选中自定义时间 key | string | oneHour |
          | dataSource | 表格数据源 | array | [ ] | | columns | 表格列的配置描述 | array | [ ] |
          | tableProps | 表格其他 props | object | { } | | dataSource | 表格数据源 | array | [ ] |
          | chartOptions | 曲线的 options | object | { } | | tableProps | 表格其他 props | object | { } |
          | onChange | 选择时间设置或曲线设置的回调，会返回修改后的值 | function(value){ } | - | | chartOptions | 曲线的 options | object | { } |
          | onChange | 选择时间设置或曲线设置的回调，会返回修改后的值 | function(value){ } | - |
          packages/HistoryInfo/src/demos/Basic.tsx
          View file @ be9730ba
          ...@@ -99,6 +99,7 @@ const Demo = () => { ...@@ -99,6 +99,7 @@ const Demo = () => {
          chartOptions={{ series }} chartOptions={{ series }}
          tableProps={{ bordered: true }} tableProps={{ bordered: true }}
          onChange={onChangeParams} onChange={onChangeParams}
          defaultChecked={'roundClock'}
          /> />
          ); );
          }; };
          ......
          packages/HistoryInfo/src/index.js
          View file @ be9730ba
          ...@@ -107,7 +107,7 @@ const HistoryInfo = (props) => { ...@@ -107,7 +107,7 @@ const HistoryInfo = (props) => {
          const [timeValue, setTimeValue] = useState('customer'); const [timeValue, setTimeValue] = useState('customer');
          const [contrastOption, setContrastOption] = useState('day'); const [contrastOption, setContrastOption] = useState('day');
          const [customerChecked, setCustomerChecked] = useState(null); const [customerChecked, setCustomerChecked] = useState(props.defaultChecked || 'oneHour');
          const [customerTime, setCustomerTime] = useState(null); const [customerTime, setCustomerTime] = useState(null);
          const [datePickerArr, setDatePickerArr] = useState(DataPickerArr); const [datePickerArr, setDatePickerArr] = useState(DataPickerArr);
          const [checkboxData, setCheckboxData] = useState(CheckboxData); const [checkboxData, setCheckboxData] = useState(CheckboxData);
          ...@@ -486,6 +486,7 @@ const HistoryInfo = (props) => { ...@@ -486,6 +486,7 @@ const HistoryInfo = (props) => {
          HistoryInfo.defaultProps = { HistoryInfo.defaultProps = {
          title: '指标曲线', title: '指标曲线',
          defaultChecked: 'oneHour',
          columns: [], columns: [],
          dataSource: [], dataSource: [],
          tableProps: {}, tableProps: {},
          ...@@ -495,6 +496,7 @@ HistoryInfo.defaultProps = { ...@@ -495,6 +496,7 @@ HistoryInfo.defaultProps = {
          HistoryInfo.propTypes = { HistoryInfo.propTypes = {
          title: PropTypes.string, title: PropTypes.string,
          defaultChecked: PropTypes.string,
          columns: PropTypes.array, columns: PropTypes.array,
          dataSource: PropTypes.array, dataSource: PropTypes.array,
          tableProps: PropTypes.object, tableProps: PropTypes.object,
          ......
          packages/ImageSelect/CHANGELOG.md
          View file @ be9730ba
          # Change Log # Change Log
          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.7](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/imageselect@1.3.6...@wisdom-components/imageselect@1.3.7) (2021-04-20)
          ### Bug Fixes
          * package ([98cc2ff](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/98cc2ffae8f7ea2f90eceaa842a2a46a9bf143da))
          * update empty ([9ff070a](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/9ff070a95febbd04726b2e330828b7a184d1ba21))
          ## [1.3.6](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/imageselect@1.3.2...@wisdom-components/imageselect@1.3.6) (2021-04-09) ## [1.3.6](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/imageselect@1.3.2...@wisdom-components/imageselect@1.3.6) (2021-04-09)
          ......
          packages/ImageSelect/package.json
          View file @ be9730ba
          { {
          "name": "@wisdom-components/imageselect", "name": "@wisdom-components/imageselect",
          "version": "1.3.6", "version": "1.3.7",
          "description": "> TODO: description", "description": "> TODO: description",
          "author": "tuqian <webtuqian@163.com>", "author": "tuqian <webtuqian@163.com>",
          "homepage": "", "homepage": "",
          ...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
          "test": "echo \"Error: run tests from root\" && exit 1" "test": "echo \"Error: run tests from root\" && exit 1"
          }, },
          "dependencies": { "dependencies": {
          "@wisdom-components/Empty": "^1.3.3",
          "classnames": "^2.2.6" "classnames": "^2.2.6"
          } }
          } }
          packages/QuotaSelect/CHANGELOG.md
          View file @ be9730ba
          # Change Log # Change Log
          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.7.1](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/quotaselect@1.7.0...@wisdom-components/quotaselect@1.7.1) (2021-04-20)
          ### Bug Fixes
          * package ([98cc2ff](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/98cc2ffae8f7ea2f90eceaa842a2a46a9bf143da))
          * update empty ([9ff070a](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/9ff070a95febbd04726b2e330828b7a184d1ba21))
          # [1.7.0](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/quotaselect@1.3.2...@wisdom-components/quotaselect@1.7.0) (2021-04-09) # [1.7.0](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/quotaselect@1.3.2...@wisdom-components/quotaselect@1.7.0) (2021-04-09)
          ......
          packages/QuotaSelect/package.json
          View file @ be9730ba
          { {
          "name": "@wisdom-components/quotaselect", "name": "@wisdom-components/quotaselect",
          "version": "1.7.0", "version": "1.7.1",
          "description": "> TODO: description", "description": "> TODO: description",
          "author": "tuqian <webtuqian@163.com>", "author": "tuqian <webtuqian@163.com>",
          "homepage": "", "homepage": "",
          ...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
          "test": "echo \"Error: run tests from root\" && exit 1" "test": "echo \"Error: run tests from root\" && exit 1"
          }, },
          "dependencies": { "dependencies": {
          "@wisdom-components/Empty": "^1.3.3",
          "classnames": "^2.2.6" "classnames": "^2.2.6"
          } }
          } }
          packages/RealTimeInfo/CHANGELOG.md
          View file @ be9730ba
          # Change Log # Change Log
          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/realtimeinfo@1.2.6...@wisdom-components/realtimeinfo@1.2.7) (2021-04-20)
          ### Bug Fixes
          * package ([98cc2ff](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/98cc2ffae8f7ea2f90eceaa842a2a46a9bf143da))
          * update empty ([9ff070a](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/9ff070a95febbd04726b2e330828b7a184d1ba21))
          ## [1.2.6](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/realtimeinfo@1.2.2...@wisdom-components/realtimeinfo@1.2.6) (2021-04-09) ## [1.2.6](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/realtimeinfo@1.2.2...@wisdom-components/realtimeinfo@1.2.6) (2021-04-09)
          ......
          packages/RealTimeInfo/package.json
          View file @ be9730ba
          { {
          "name": "@wisdom-components/realtimeinfo", "name": "@wisdom-components/realtimeinfo",
          "version": "1.2.6", "version": "1.2.7",
          "description": "> TODO: description", "description": "> TODO: description",
          "author": "tuqian <webtuqian@163.com>", "author": "tuqian <webtuqian@163.com>",
          "homepage": "", "homepage": "",
          ...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
          "test": "echo \"Error: run tests from root\" && exit 1" "test": "echo \"Error: run tests from root\" && exit 1"
          }, },
          "dependencies": { "dependencies": {
          "@wisdom-components/basictable": "1.4.0",
          "classnames": "^2.2.6" "classnames": "^2.2.6"
          } }
          } }
          packages/TimeRangePicker/CHANGELOG.md
          View file @ be9730ba
          # Change Log # Change Log
          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.7](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/timerangepicker@1.3.6...@wisdom-components/timerangepicker@1.3.7) (2021-04-20)
          ### Bug Fixes
          * package ([98cc2ff](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/98cc2ffae8f7ea2f90eceaa842a2a46a9bf143da))
          * update empty ([9ff070a](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/9ff070a95febbd04726b2e330828b7a184d1ba21))
          ## [1.3.6](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/timerangepicker@1.3.2...@wisdom-components/timerangepicker@1.3.6) (2021-04-09) ## [1.3.6](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/timerangepicker@1.3.2...@wisdom-components/timerangepicker@1.3.6) (2021-04-09)
          ......
          packages/TimeRangePicker/package.json
          View file @ be9730ba
          { {
          "name": "@wisdom-components/timerangepicker", "name": "@wisdom-components/timerangepicker",
          "version": "1.3.6", "version": "1.3.7",
          "description": "> TODO: description", "description": "> TODO: description",
          "author": "tuqian <webtuqian@163.com>", "author": "tuqian <webtuqian@163.com>",
          "homepage": "", "homepage": "",
          ...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
          "test": "echo \"Error: run tests from root\" && exit 1" "test": "echo \"Error: run tests from root\" && exit 1"
          }, },
          "dependencies": { "dependencies": {
          "@wisdom-components/Empty": "^1.3.3",
          "classnames": "^2.2.6" "classnames": "^2.2.6"
          } }
          } }
          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