Skip to content

W
wisdom-components
Commit c8aa9750 authored by 李纪文's avatar 李纪文
Browse files
Options

Merge branch 'release' into 'dev'

fix: Excel表格组件 See merge request !24
parents 7789cad8 f0a915aa
Pipeline #25553 failed with stages
          in 1 minute 31 seconds
          Hide whitespace changes
          Inline Side-by-side
          Showing with 69 additions and 15 deletions
          packages/BasicTools/CHANGELOG.md
          View file @ c8aa9750
          ...@@ -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.2](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/basictools@1.2.1...@wisdom-components/basictools@1.2.2) (2021-04-06)
          **Note:** Version bump only for package @wisdom-components/basictools
          ## [1.2.1](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/basictools@1.2.0...@wisdom-components/basictools@1.2.1) (2021-04-06) ## [1.2.1](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/basictools@1.2.0...@wisdom-components/basictools@1.2.1) (2021-04-06)
          **Note:** Version bump only for package @wisdom-components/basictools **Note:** Version bump only for package @wisdom-components/basictools
          ......
          packages/BasicTools/package.json
          View file @ c8aa9750
          { {
          "name": "@wisdom-components/basictools", "name": "@wisdom-components/basictools",
          "version": "1.2.1", "version": "1.2.2",
          "description": "> TODO: description", "description": "> TODO: description",
          "author": "tuqian <webtuqian@163.com>", "author": "tuqian <webtuqian@163.com>",
          "homepage": "", "homepage": "",
          ......
          packages/DeviceTree/CHANGELOG.md
          View file @ c8aa9750
          ...@@ -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.2](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/devicetree@1.3.1...@wisdom-components/devicetree@1.3.2) (2021-04-06)
          **Note:** Version bump only for package @wisdom-components/devicetree
          ## [1.3.1](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/devicetree@1.3.0...@wisdom-components/devicetree@1.3.1) (2021-04-06) ## [1.3.1](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/devicetree@1.3.0...@wisdom-components/devicetree@1.3.1) (2021-04-06)
          **Note:** Version bump only for package @wisdom-components/devicetree **Note:** Version bump only for package @wisdom-components/devicetree
          ......
          packages/DeviceTree/package.json
          View file @ c8aa9750
          { {
          "name": "@wisdom-components/devicetree", "name": "@wisdom-components/devicetree",
          "version": "1.3.1", "version": "1.3.2",
          "description": "> TODO: description", "description": "> TODO: description",
          "author": "tuqian <webtuqian@163.com>", "author": "tuqian <webtuqian@163.com>",
          "homepage": "", "homepage": "",
          ......
          packages/Empty/CHANGELOG.md
          View file @ c8aa9750
          ...@@ -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.2](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/empty@1.3.1...@wisdom-components/empty@1.3.2) (2021-04-06)
          **Note:** Version bump only for package @wisdom-components/empty
          ## [1.3.1](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/empty@1.3.0...@wisdom-components/empty@1.3.1) (2021-04-06) ## [1.3.1](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/empty@1.3.0...@wisdom-components/empty@1.3.1) (2021-04-06)
          **Note:** Version bump only for package @wisdom-components/empty **Note:** Version bump only for package @wisdom-components/empty
          ......
          packages/Empty/package.json
          View file @ c8aa9750
          { {
          "name": "@wisdom-components/empty", "name": "@wisdom-components/empty",
          "version": "1.3.1", "version": "1.3.2",
          "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 @ c8aa9750
          ...@@ -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.0.2](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/exportexcel@1.0.1...@wisdom-components/exportexcel@1.0.2) (2021-04-06)
          ### Bug Fixes
          - Excel 表格组件 ([b84f198](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/b84f198ee75a276c70a94f4977e22e79787a5af8))
          ## 1.0.1 (2021-04-06) ## 1.0.1 (2021-04-06)
          ### Bug Fixes ### Bug Fixes
          ......
          packages/ExportExcel/README.md
          View file @ c8aa9750
          ...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
          ## Usage ## Usage
          ``` ```
          const exportExcel = require('@wisdom-components/ExportExcel'); const {ExportExcel, ExportExcelZip} = require('@wisdom-components/ExportExcel');
          // TODO: DEMONSTRATE API // TODO: DEMONSTRATE API
          ``` ```
          packages/ExportExcel/package.json
          View file @ c8aa9750
          { {
          "name": "@wisdom-components/exportexcel", "name": "@wisdom-components/exportexcel",
          "version": "1.0.1", "version": "1.0.2",
          "description": "> TODO: description", "description": "> TODO: description",
          "author": "lijiwen <961370825@qq.com>", "author": "lijiwen <961370825@qq.com>",
          "homepage": "", "homepage": "",
          ......
          packages/ExportExcel/src/ExportExcel.md
          View file @ c8aa9750
          ...@@ -18,7 +18,7 @@ group: ...@@ -18,7 +18,7 @@ group:
          | name | Excel 表格名称 | string | 'excel' | | name | Excel 表格名称 | string | 'excel' |
          | content | Excel 表格内容，支持多个 sheet[{},{}] | array | [] | | content | Excel 表格内容，支持多个 sheet[{},{}] | array | [] |
          ## content 每一项内容 ## content
          | 名称 | 描述 | 类型 | | 名称 | 描述 | 类型 |
          | ------------ | ------------------- | ------- | | ------------ | ------------------- | ------- |
          ...@@ -27,3 +27,11 @@ group: ...@@ -27,3 +27,11 @@ group:
          | sheetFilter | 列过滤 | array[] | | sheetFilter | 列过滤 | array[] |
          | sheetHeader | 表头 | array[] | | sheetHeader | 表头 | array[] |
          | columnWidths | 列宽 需与列顺序对应 | array[] | | columnWidths | 列宽 需与列顺序对应 | array[] |
          ## 方法
          | 名称 | 描述 |
          | ----------------------------- | ------------------- |
          | {ExportExcel, ExportExcelZip} | -- |
          | ExportExcel | 导出 Excel 表格 |
          | ExportExcelZip | 导出压缩 Excel 文件 |
          packages/ExportExcel/src/demos/base.tsx
          View file @ c8aa9750
          import React, { useEffect } from 'react'; import React, { useEffect } from 'react';
          import { ExportExcel, ExportExcelZip } from '../ExportExcel'; import { ExportExcel, ExportExcelZip } from '../index';
          import { Button } from 'antd'; import { Button } from 'antd';
          const ExportExcelDemo = (props) => { const ExportExcelDemo = (props) => {
          const exportExcelBtn = () => { const exportExcelBtn = () => {
          ......
          packages/HistoryInfo/CHANGELOG.md
          View file @ c8aa9750
          ...@@ -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.4.2](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/historyinfo@1.4.1...@wisdom-components/historyinfo@1.4.2) (2021-04-06)
          **Note:** Version bump only for package @wisdom-components/historyinfo
          ## [1.4.1](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/historyinfo@1.4.0...@wisdom-components/historyinfo@1.4.1) (2021-04-06) ## [1.4.1](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/historyinfo@1.4.0...@wisdom-components/historyinfo@1.4.1) (2021-04-06)
          **Note:** Version bump only for package @wisdom-components/historyinfo **Note:** Version bump only for package @wisdom-components/historyinfo
          ......
          packages/HistoryInfo/package.json
          View file @ c8aa9750
          { {
          "name": "@wisdom-components/historyinfo", "name": "@wisdom-components/historyinfo",
          "version": "1.4.1", "version": "1.4.2",
          "description": "> TODO: description", "description": "> TODO: description",
          "author": "tuqian <webtuqian@163.com>", "author": "tuqian <webtuqian@163.com>",
          "homepage": "", "homepage": "",
          ...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
          }, },
          "dependencies": { "dependencies": {
          "@wisdom-components/Empty": "^1.2.0", "@wisdom-components/Empty": "^1.2.0",
          "@wisdom-components/timerangepicker": "1.3.1", "@wisdom-components/timerangepicker": "1.3.2",
          "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/ImageSelect/CHANGELOG.md
          View file @ c8aa9750
          ...@@ -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.2](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/imageselect@1.3.1...@wisdom-components/imageselect@1.3.2) (2021-04-06)
          **Note:** Version bump only for package @wisdom-components/imageselect
          ## [1.3.1](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/imageselect@1.3.0...@wisdom-components/imageselect@1.3.1) (2021-04-06) ## [1.3.1](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/imageselect@1.3.0...@wisdom-components/imageselect@1.3.1) (2021-04-06)
          **Note:** Version bump only for package @wisdom-components/imageselect **Note:** Version bump only for package @wisdom-components/imageselect
          ......
          packages/ImageSelect/package.json
          View file @ c8aa9750
          { {
          "name": "@wisdom-components/imageselect", "name": "@wisdom-components/imageselect",
          "version": "1.3.1", "version": "1.3.2",
          "description": "> TODO: description", "description": "> TODO: description",
          "author": "tuqian <webtuqian@163.com>", "author": "tuqian <webtuqian@163.com>",
          "homepage": "", "homepage": "",
          ......
          packages/MqttView/CHANGELOG.md
          View file @ c8aa9750
          ...@@ -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.4](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/mqttview@1.2.3...@wisdom-components/mqttview@1.2.4) (2021-04-06)
          **Note:** Version bump only for package @wisdom-components/mqttview
          ## [1.2.3](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/mqttview@1.2.2...@wisdom-components/mqttview@1.2.3) (2021-04-06) ## [1.2.3](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/mqttview@1.2.2...@wisdom-components/mqttview@1.2.3) (2021-04-06)
          **Note:** Version bump only for package @wisdom-components/mqttview **Note:** Version bump only for package @wisdom-components/mqttview
          ......
          packages/MqttView/package.json
          View file @ c8aa9750
          { {
          "name": "@wisdom-components/mqttview", "name": "@wisdom-components/mqttview",
          "version": "1.2.3", "version": "1.2.4",
          "description": "> TODO: description", "description": "> TODO: description",
          "author": "lijiwen <961370825@qq.com>", "author": "lijiwen <961370825@qq.com>",
          "homepage": "", "homepage": "",
          ......
          packages/ParseForm/CHANGELOG.md
          View file @ c8aa9750
          ...@@ -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.2](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/parseform@1.2.1...parseform@1.2.2) (2021-04-06)
          **Note:** Version bump only for package parseform
          ## [1.2.1](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/parseform@1.2.0...parseform@1.2.1) (2021-04-06) ## [1.2.1](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/parseform@1.2.0...parseform@1.2.1) (2021-04-06)
          **Note:** Version bump only for package parseform **Note:** Version bump only for package parseform
          ......
          packages/ParseForm/package.json
          View file @ c8aa9750
          { {
          "name": "parseform", "name": "parseform",
          "version": "1.2.1", "version": "1.2.2",
          "description": "> TODO: description", "description": "> TODO: description",
          "author": "lijiwen <961370825@qq.com>", "author": "lijiwen <961370825@qq.com>",
          "homepage": "", "homepage": "",
          ......
          packages/QuotaSelect/CHANGELOG.md
          View file @ c8aa9750
          ...@@ -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.2](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/quotaselect@1.3.1...@wisdom-components/quotaselect@1.3.2) (2021-04-06)
          **Note:** Version bump only for package @wisdom-components/quotaselect
          ## [1.3.1](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/quotaselect@1.3.0...@wisdom-components/quotaselect@1.3.1) (2021-04-06) ## [1.3.1](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/quotaselect@1.3.0...@wisdom-components/quotaselect@1.3.1) (2021-04-06)
          **Note:** Version bump only for package @wisdom-components/quotaselect **Note:** Version bump only for package @wisdom-components/quotaselect
          ......
          packages/QuotaSelect/package.json
          View file @ c8aa9750
          { {
          "name": "@wisdom-components/quotaselect", "name": "@wisdom-components/quotaselect",
          "version": "1.3.1", "version": "1.3.2",
          "description": "> TODO: description", "description": "> TODO: description",
          "author": "tuqian <webtuqian@163.com>", "author": "tuqian <webtuqian@163.com>",
          "homepage": "", "homepage": "",
          ......
          packages/RealTimeInfo/CHANGELOG.md
          View file @ c8aa9750
          ...@@ -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.2](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/realtimeinfo@1.2.1...@wisdom-components/realtimeinfo@1.2.2) (2021-04-06)
          **Note:** Version bump only for package @wisdom-components/realtimeinfo
          ## [1.2.1](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/realtimeinfo@1.2.0...@wisdom-components/realtimeinfo@1.2.1) (2021-04-06) ## [1.2.1](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/realtimeinfo@1.2.0...@wisdom-components/realtimeinfo@1.2.1) (2021-04-06)
          **Note:** Version bump only for package @wisdom-components/realtimeinfo **Note:** Version bump only for package @wisdom-components/realtimeinfo
          ......
          packages/RealTimeInfo/package.json
          View file @ c8aa9750
          { {
          "name": "@wisdom-components/realtimeinfo", "name": "@wisdom-components/realtimeinfo",
          "version": "1.2.1", "version": "1.2.2",
          "description": "> TODO: description", "description": "> TODO: description",
          "author": "tuqian <webtuqian@163.com>", "author": "tuqian <webtuqian@163.com>",
          "homepage": "", "homepage": "",
          ......
          packages/TimeRangePicker/CHANGELOG.md
          View file @ c8aa9750
          ...@@ -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.2](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/timerangepicker@1.3.1...@wisdom-components/timerangepicker@1.3.2) (2021-04-06)
          **Note:** Version bump only for package @wisdom-components/timerangepicker
          ## [1.3.1](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/timerangepicker@1.3.0...@wisdom-components/timerangepicker@1.3.1) (2021-04-06) ## [1.3.1](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/timerangepicker@1.3.0...@wisdom-components/timerangepicker@1.3.1) (2021-04-06)
          **Note:** Version bump only for package @wisdom-components/timerangepicker **Note:** Version bump only for package @wisdom-components/timerangepicker
          ......
          packages/TimeRangePicker/package.json
          View file @ c8aa9750
          { {
          "name": "@wisdom-components/timerangepicker", "name": "@wisdom-components/timerangepicker",
          "version": "1.3.1", "version": "1.3.2",
          "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