diff --git a/CHANGELOG.md b/CHANGELOG.md index 8293e99..2eccc84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 0.11.10 + +新增对markline颜色样式设置 ## 0.11.9 diff --git a/package.json b/package.json index 40baf2c..77a3c5e 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "prettier": "^2.2.0", "rimraf": "^3.0.2", "tslib": "^2.1.0", - "typescript": "^4.1.2" + "typescript": "^4.1.3" }, "husky": { "hooks": { @@ -41,5 +41,10 @@ "git add ." ] }, - "dependencies": {} + "dependencies": {}, + "resolutions": { + "**/@typescript-eslint/eslint-plugin": "^4.11.1", + "**/@typescript-eslint/parser": "^4.11.1", + "**/typescript": "^4.1.3" + } } diff --git a/packages/dooringx-dumi-doc/docs/ChangeLog/index.en.md b/packages/dooringx-dumi-doc/docs/ChangeLog/index.en.md index fca8d56..0b06d68 100644 --- a/packages/dooringx-dumi-doc/docs/ChangeLog/index.en.md +++ b/packages/dooringx-dumi-doc/docs/ChangeLog/index.en.md @@ -5,10 +5,12 @@ nav: title: change log order: 6 --- +## 0.11.10 +Add color and style settings for markline ## 0.11.9 A new setting panel is added to control adsorption scaling and other behaviors. Fixed pop up button style issue. -Fixed the problem that some prompts do not display. +Fix the problem that some prompts do not display. ## 0.11.8 Timeline adds auto focus function. ## 0.11.7 diff --git a/packages/dooringx-dumi-doc/docs/ChangeLog/index.md b/packages/dooringx-dumi-doc/docs/ChangeLog/index.md index e95f3da..342b90b 100644 --- a/packages/dooringx-dumi-doc/docs/ChangeLog/index.md +++ b/packages/dooringx-dumi-doc/docs/ChangeLog/index.md @@ -5,6 +5,9 @@ nav: title: 变更日志 order: 6 --- +## 0.11.10 + +新增对markline颜色样式设置 ## 0.11.9 diff --git a/packages/dooringx-lib/package.json b/packages/dooringx-lib/package.json index 3fd0b66..91acc61 100644 --- a/packages/dooringx-lib/package.json +++ b/packages/dooringx-lib/package.json @@ -1,5 +1,5 @@ { - "version": "0.11.9", + "version": "0.11.10", "license": "MIT", "main": "dist/index.js", "module": "dist/dooringx-lib.esm.js", diff --git a/packages/dooringx-lib/src/components/colorPicker/index.tsx b/packages/dooringx-lib/src/components/colorPicker/index.tsx index a319ffe..0ecfec2 100644 --- a/packages/dooringx-lib/src/components/colorPicker/index.tsx +++ b/packages/dooringx-lib/src/components/colorPicker/index.tsx @@ -2,7 +2,7 @@ * @Author: yehuozhili * @Date: 2022-01-20 11:04:15 * @LastEditors: yehuozhili - * @LastEditTime: 2022-01-20 12:18:54 + * @LastEditTime: 2022-01-21 13:40:19 * @FilePath: \dooringx\packages\dooringx-lib\src\components\colorPicker\index.tsx */ import React, { memo, useState } from 'react'; @@ -18,7 +18,7 @@ function ColorPicker(props: ColorPickerProps) { const [colorPickerVisible, setColorPickerVisible] = useState(false); return ( <> -