From e93e98d0a1c0ef289664482ce81d70087ae89dfc Mon Sep 17 00:00:00 2001
From: hufeixiong <hufeixiong@sto.cn>
Date: Fri, 21 Jan 2022 13:43:57 +0800
Subject: [PATCH] update 0.11.10

---
 CHANGELOG.md                                  |   3 +
 package.json                                  |   9 +-
 .../docs/ChangeLog/index.en.md                |   4 +-
 .../dooringx-dumi-doc/docs/ChangeLog/index.md |   3 +
 packages/dooringx-lib/package.json            |   2 +-
 .../src/components/colorPicker/index.tsx      |   4 +-
 .../src/components/control/settings.tsx       |  44 +++++-
 .../dooringx-lib/src/core/markline/index.tsx  |   7 +-
 .../src/core/markline/marklineConfig.ts       |   6 +-
 packages/dooringx-lib/src/locale/en.ts        |   4 +-
 packages/dooringx-lib/src/locale/zh-CN.ts     |   4 +-
 .../dooringx-plugin-template/package.json     |   2 +-
 .../template/template.json                    |   2 +-
 yarn.lock                                     | 146 ++++++++++--------
 14 files changed, 154 insertions(+), 86 deletions(-)

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 (
 		<>
-			<div style={{ position: 'relative' }}>
+			<div style={{ position: 'relative', display: 'flex' }}>
 				<div
 					onClick={() => {
 						setColorPickerVisible((pre) => !pre);
diff --git a/packages/dooringx-lib/src/components/control/settings.tsx b/packages/dooringx-lib/src/components/control/settings.tsx
index e7cd251..be80499 100644
--- a/packages/dooringx-lib/src/components/control/settings.tsx
+++ b/packages/dooringx-lib/src/components/control/settings.tsx
@@ -2,16 +2,18 @@
  * @Author: yehuozhili
  * @Date: 2022-01-13 09:58:05
  * @LastEditors: yehuozhili
- * @LastEditTime: 2022-01-13 13:44:42
+ * @LastEditTime: 2022-01-21 10:57:39
  * @FilePath: \dooringx\packages\dooringx-lib\src\components\control\settings.tsx
  */
 
-import { Modal, Form, InputNumber, Radio } from 'antd';
+import { Modal, Form, InputNumber, Radio, Select } from 'antd';
 import { MessageInstance } from 'antd/lib/message';
-import React from 'react';
+import React, { useState } from 'react';
 import { memo } from 'react';
-import { UserConfig } from '../..';
+import { UserConfig } from '../../config/index';
+import { rgba2Obj } from '../../core/utils/index';
 import { replaceLocale, zhCN } from '../../locale';
+import ColorPicker from '../colorPicker';
 
 export interface SettingsModalPropsType {
 	visible: boolean;
@@ -31,6 +33,7 @@ const formItemLayout = {
 
 function SettingsModal(props: SettingsModalPropsType) {
 	const [form] = Form.useForm();
+	const [color, setColor] = useState(rgba2Obj(props.config.marklineConfig.borderColor));
 
 	return (
 		<Modal
@@ -42,7 +45,7 @@ function SettingsModal(props: SettingsModalPropsType) {
 			onCancel={() => props.onCancel()}
 			onOk={() => {
 				const res = form.getFieldsValue();
-				const { min, max } = res;
+				const { min, max, borderStyle } = res;
 				if (max < min) {
 					props.message.error(replaceLocale('error.minmax', zhCN['error.minmax'], props.config));
 					return;
@@ -52,6 +55,8 @@ function SettingsModal(props: SettingsModalPropsType) {
 				if (currentScale < min || currentScale > max) {
 					props.config.scaleState.value = min;
 				}
+				props.config.marklineConfig.borderColor = `rgba(${color.r}, ${color.g}, ${color.b}, ${color.a})`;
+				props.config.marklineConfig.borderStyle = borderStyle;
 				props.onOk(res);
 				return;
 			}}
@@ -64,6 +69,7 @@ function SettingsModal(props: SettingsModalPropsType) {
 					min: props.config.scaleState.minValue,
 					max: props.config.scaleState.maxValue,
 					autofocus: props.config.timelineConfig.autoFocus,
+					borderStyle: props.config.marklineConfig.borderStyle,
 				}}
 				form={form}
 			>
@@ -86,6 +92,34 @@ function SettingsModal(props: SettingsModalPropsType) {
 				>
 					<InputNumber<number> min={0.1}></InputNumber>
 				</Form.Item>
+				<Form.Item
+					label={replaceLocale(
+						'settings.marklineColor',
+						zhCN['settings.marklineColor'],
+						props.config
+					)}
+				>
+					<ColorPicker
+						initColor={rgba2Obj(props.config.marklineConfig.borderColor)}
+						onChange={(v) => {
+							setColor(v);
+						}}
+					></ColorPicker>
+				</Form.Item>
+				<Form.Item
+					name="borderStyle"
+					label={replaceLocale(
+						'settings.marklineStyle',
+						zhCN['settings.marklineStyle'],
+						props.config
+					)}
+				>
+					<Select style={{ width: 88 }}>
+						<Select.Option value="dotted">dotted</Select.Option>
+						<Select.Option value="solid">solid</Select.Option>
+						<Select.Option value="dashed">dashed</Select.Option>
+					</Select>
+				</Form.Item>
 				<Form.Item
 					name="min"
 					// 最小值要大于0.1否则tiker计算有问题
diff --git a/packages/dooringx-lib/src/core/markline/index.tsx b/packages/dooringx-lib/src/core/markline/index.tsx
index e52d89a..94a206b 100644
--- a/packages/dooringx-lib/src/core/markline/index.tsx
+++ b/packages/dooringx-lib/src/core/markline/index.tsx
@@ -2,20 +2,21 @@
  * @Author: yehuozhili
  * @Date: 2021-03-14 04:29:09
  * @LastEditors: yehuozhili
- * @LastEditTime: 2021-07-27 15:14:34
+ * @LastEditTime: 2022-01-21 09:28:53
  * @FilePath: \dooringx\packages\dooringx-lib\src\core\markline\index.tsx
  */
 import React from 'react';
 import { useMemo } from 'react';
 import UserConfig from '../../config';
 import { marklineCalRender } from './calcRender';
+import { marklineConfig } from './marklineConfig';
 
 export function MarklineX(props: any) {
 	return (
 		<div
 			className="yh-markline"
 			style={{
-				borderTop: '1px dotted #2196f3',
+				borderTop: `1px ${marklineConfig.borderStyle} ${marklineConfig.borderColor}`,
 				position: 'absolute',
 				width: '100%',
 				top: props.top,
@@ -30,7 +31,7 @@ export function MarklineY(props: any) {
 		<div
 			className="yh-markline"
 			style={{
-				borderLeft: '1px dotted #2196f3',
+				borderLeft: `1px ${marklineConfig.borderStyle} ${marklineConfig.borderColor}`,
 				position: 'absolute',
 				height: '100%',
 				left: props.left,
diff --git a/packages/dooringx-lib/src/core/markline/marklineConfig.ts b/packages/dooringx-lib/src/core/markline/marklineConfig.ts
index c0b8232..094f6b9 100644
--- a/packages/dooringx-lib/src/core/markline/marklineConfig.ts
+++ b/packages/dooringx-lib/src/core/markline/marklineConfig.ts
@@ -2,7 +2,7 @@
  * @Author: yehuozhili
  * @Date: 2021-03-14 11:49:13
  * @LastEditors: yehuozhili
- * @LastEditTime: 2021-07-27 15:09:33
+ * @LastEditTime: 2022-01-21 10:44:50
  * @FilePath: \dooringx\packages\dooringx-lib\src\core\markline\marklineConfig.ts
  */
 import { IBlockType } from '../store/storetype';
@@ -14,6 +14,8 @@ export interface MarklineConfigType {
 	gridIndent: number;
 	resizeIndent: number;
 	marklineUnfocus: null | IBlockType[];
+	borderColor: string;
+	borderStyle: 'dotted' | 'solid' | 'dashed';
 }
 
 // 间隔距离执行吸附
@@ -24,4 +26,6 @@ export const marklineConfig: MarklineConfigType = {
 	gridIndent: 50,
 	resizeIndent: 0,
 	marklineUnfocus: null,
+	borderColor: 'rgba( 33 , 150 , 243, 1 )',
+	borderStyle: 'dotted',
 };
diff --git a/packages/dooringx-lib/src/locale/en.ts b/packages/dooringx-lib/src/locale/en.ts
index 576640b..5fc0ecd 100644
--- a/packages/dooringx-lib/src/locale/en.ts
+++ b/packages/dooringx-lib/src/locale/en.ts
@@ -2,7 +2,7 @@
  * @Author: yehuozhili
  * @Date: 2021-08-27 10:20:23
  * @LastEditors: yehuozhili
- * @LastEditTime: 2022-01-13 13:43:20
+ * @LastEditTime: 2022-01-21 10:56:25
  * @FilePath: \dooringx\packages\dooringx-lib\src\locale\en.ts
  */
 
@@ -47,4 +47,6 @@ export const en: typeof zhCN = {
 	'settings.max': 'Canvas zoom max',
 	'settings.autofocus': 'Auto scroll focus on the animation panel',
 	'error.minmax': 'The maximum value should be greater than or equal to the minimum value',
+	'settings.marklineColor': 'Markline color',
+	'settings.marklineStyle': 'Markline style',
 };
diff --git a/packages/dooringx-lib/src/locale/zh-CN.ts b/packages/dooringx-lib/src/locale/zh-CN.ts
index 1a14454..5185cbb 100644
--- a/packages/dooringx-lib/src/locale/zh-CN.ts
+++ b/packages/dooringx-lib/src/locale/zh-CN.ts
@@ -2,7 +2,7 @@
  * @Author: yehuozhili
  * @Date: 2021-08-27 10:20:15
  * @LastEditors: yehuozhili
- * @LastEditTime: 2022-01-13 13:42:51
+ * @LastEditTime: 2022-01-21 10:55:56
  * @FilePath: \dooringx\packages\dooringx-lib\src\locale\zh-CN.ts
  */
 export const zhCN = {
@@ -44,4 +44,6 @@ export const zhCN = {
 	'settings.max': '画布缩放最大值',
 	'settings.autofocus': '动画面板点击自动滚动聚焦',
 	'error.minmax': '最大值应大于等于最小值',
+	'settings.marklineColor': '辅助线颜色',
+	'settings.marklineStyle': '辅助线样式',
 };
diff --git a/packages/dooringx-plugin-template/package.json b/packages/dooringx-plugin-template/package.json
index b088b52..4e3468c 100644
--- a/packages/dooringx-plugin-template/package.json
+++ b/packages/dooringx-plugin-template/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dooringx-plugin-template",
-  "version": "0.11.9",
+  "version": "0.11.10",
   "description": "> TODO: description",
   "author": "yehuozhili <673632758@qq.com>",
   "homepage": "https://github.com/H5-Dooring/dooringx#readme",
diff --git a/packages/dooringx-plugin-template/template/template.json b/packages/dooringx-plugin-template/template/template.json
index 62df5ba..6a45ec4 100644
--- a/packages/dooringx-plugin-template/template/template.json
+++ b/packages/dooringx-plugin-template/template/template.json
@@ -40,7 +40,7 @@
 		"@rollup/plugin-node-resolve": "^13.0.4",
 		"@rollup/plugin-url": "^6.1.0",
 		"@svgr/rollup": "^5.5.0",
-		"dooringx-lib": "^0.11.9",
+		"dooringx-lib": "^0.11.10",
 		"postcss": "^8.3.6",
 		"rollup-plugin-peer-deps-external": "^2.2.4",
 		"rollup-plugin-postcss": "^4.0.1",
diff --git a/yarn.lock b/yarn.lock
index e16fa44..56117ee 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3959,11 +3959,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/eslint-visitor-keys@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d"
-  integrity sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==
-
 "@types/estree@*":
   version "0.0.50"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83"
@@ -4069,7 +4064,7 @@
     jest-diff "^25.2.1"
     pretty-format "^25.2.1"
 
-"@types/json-schema@^7.0.3", "@types/json-schema@^7.0.7":
+"@types/json-schema@^7.0.7":
   version "7.0.8"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.8.tgz#edf1bf1dbf4e04413ca8e5b17b3b7d7d54b59818"
   integrity sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg==
@@ -4350,48 +4345,75 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/eslint-plugin@^2.12.0":
-  version "2.34.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.34.0.tgz#6f8ce8a46c7dea4a6f1d171d2bb8fbae6dac2be9"
-  integrity sha512-4zY3Z88rEE99+CNvTbXSyovv2z9PNOVffTWD2W8QF5s2prBQtwN2zadqERcrHpcR7O/+KMI3fcTAmUUhK/iQcQ==
+"@typescript-eslint/eslint-plugin@^2.12.0", "@typescript-eslint/eslint-plugin@^4.11.1":
+  version "4.33.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz#c24dc7c8069c7706bc40d99f6fa87edcb2005276"
+  integrity sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==
   dependencies:
-    "@typescript-eslint/experimental-utils" "2.34.0"
+    "@typescript-eslint/experimental-utils" "4.33.0"
+    "@typescript-eslint/scope-manager" "4.33.0"
+    debug "^4.3.1"
     functional-red-black-tree "^1.0.1"
-    regexpp "^3.0.0"
-    tsutils "^3.17.1"
+    ignore "^5.1.8"
+    regexpp "^3.1.0"
+    semver "^7.3.5"
+    tsutils "^3.21.0"
 
-"@typescript-eslint/experimental-utils@2.34.0":
-  version "2.34.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.34.0.tgz#d3524b644cdb40eebceca67f8cf3e4cc9c8f980f"
-  integrity sha512-eS6FTkq+wuMJ+sgtuNTtcqavWXqsflWcfBnlYhg/nS4aZ1leewkXGbvBhaapn1q6qf4M71bsR1tez5JTRMuqwA==
+"@typescript-eslint/experimental-utils@4.33.0":
+  version "4.33.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.33.0.tgz#6f2a786a4209fa2222989e9380b5331b2810f7fd"
+  integrity sha512-zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q==
   dependencies:
-    "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/typescript-estree" "2.34.0"
-    eslint-scope "^5.0.0"
-    eslint-utils "^2.0.0"
+    "@types/json-schema" "^7.0.7"
+    "@typescript-eslint/scope-manager" "4.33.0"
+    "@typescript-eslint/types" "4.33.0"
+    "@typescript-eslint/typescript-estree" "4.33.0"
+    eslint-scope "^5.1.1"
+    eslint-utils "^3.0.0"
 
-"@typescript-eslint/parser@^2.12.0":
-  version "2.34.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.34.0.tgz#50252630ca319685420e9a39ca05fe185a256bc8"
-  integrity sha512-03ilO0ucSD0EPTw2X4PntSIRFtDPWjrVq7C3/Z3VQHRC7+13YB55rcJI3Jt+YgeHbjUdJPcPa7b23rXCBokuyA==
+"@typescript-eslint/parser@^2.12.0", "@typescript-eslint/parser@^4.11.1":
+  version "4.33.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.33.0.tgz#dfe797570d9694e560528d18eecad86c8c744899"
+  integrity sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==
   dependencies:
-    "@types/eslint-visitor-keys" "^1.0.0"
-    "@typescript-eslint/experimental-utils" "2.34.0"
-    "@typescript-eslint/typescript-estree" "2.34.0"
-    eslint-visitor-keys "^1.1.0"
+    "@typescript-eslint/scope-manager" "4.33.0"
+    "@typescript-eslint/types" "4.33.0"
+    "@typescript-eslint/typescript-estree" "4.33.0"
+    debug "^4.3.1"
 
-"@typescript-eslint/typescript-estree@2.34.0":
-  version "2.34.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.34.0.tgz#14aeb6353b39ef0732cc7f1b8285294937cf37d5"
-  integrity sha512-OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg==
+"@typescript-eslint/scope-manager@4.33.0":
+  version "4.33.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz#d38e49280d983e8772e29121cf8c6e9221f280a3"
+  integrity sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ==
   dependencies:
-    debug "^4.1.1"
-    eslint-visitor-keys "^1.1.0"
-    glob "^7.1.6"
+    "@typescript-eslint/types" "4.33.0"
+    "@typescript-eslint/visitor-keys" "4.33.0"
+
+"@typescript-eslint/types@4.33.0":
+  version "4.33.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.33.0.tgz#a1e59036a3b53ae8430ceebf2a919dc7f9af6d72"
+  integrity sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==
+
+"@typescript-eslint/typescript-estree@4.33.0":
+  version "4.33.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz#0dfb51c2908f68c5c08d82aefeaf166a17c24609"
+  integrity sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==
+  dependencies:
+    "@typescript-eslint/types" "4.33.0"
+    "@typescript-eslint/visitor-keys" "4.33.0"
+    debug "^4.3.1"
+    globby "^11.0.3"
     is-glob "^4.0.1"
-    lodash "^4.17.15"
-    semver "^7.3.2"
-    tsutils "^3.17.1"
+    semver "^7.3.5"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/visitor-keys@4.33.0":
+  version "4.33.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz#2a22f77a41604289b7a186586e9ec48ca92ef1dd"
+  integrity sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg==
+  dependencies:
+    "@typescript-eslint/types" "4.33.0"
+    eslint-visitor-keys "^2.0.0"
 
 "@umijs/ast@3.5.20":
   version "3.5.20"
@@ -8334,7 +8356,7 @@ eslint-plugin-react@^7.14.3:
     resolve "^2.0.0-next.3"
     string.prototype.matchall "^4.0.5"
 
-eslint-scope@^5.0.0:
+eslint-scope@^5.0.0, eslint-scope@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
   integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
@@ -8349,18 +8371,23 @@ eslint-utils@^1.4.3:
   dependencies:
     eslint-visitor-keys "^1.1.0"
 
-eslint-utils@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
-  integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
+eslint-utils@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672"
+  integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==
   dependencies:
-    eslint-visitor-keys "^1.1.0"
+    eslint-visitor-keys "^2.0.0"
 
 eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
   integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
 
+eslint-visitor-keys@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
+  integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
+
 eslint@^6.1.0:
   version "6.8.0"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb"
@@ -16496,7 +16523,7 @@ regexpp@^2.0.1:
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
   integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
 
-regexpp@^3.0.0:
+regexpp@^3.1.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
@@ -17329,7 +17356,7 @@ semver@7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-semver@^7.1.1, semver@^7.3.2, semver@^7.3.4:
+semver@^7.1.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
   version "7.3.5"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
   integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
@@ -18693,7 +18720,7 @@ tslib@^2.0.3, tslib@^2.1.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
   integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
 
-tsutils@^3.17.1:
+tsutils@^3.21.0:
   version "3.21.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
   integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
@@ -18776,25 +18803,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@^3.7.3:
-  version "3.9.10"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.10.tgz#70f3910ac7a51ed6bef79da7800690b19bf778b8"
-  integrity sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==
-
-typescript@^4.0.5:
-  version "4.5.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.2.tgz#8ac1fba9f52256fdb06fb89e4122fa6a346c2998"
-  integrity sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw==
-
-typescript@^4.1.2:
-  version "4.3.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4"
-  integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==
-
-typescript@^4.3.2:
-  version "4.5.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.4.tgz#a17d3a0263bf5c8723b9c52f43c5084edf13c2e8"
-  integrity sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg==
+typescript@^3.7.3, typescript@^4.0.5, typescript@^4.1.2, typescript@^4.1.3, typescript@^4.3.2:
+  version "4.5.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3"
+  integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==
 
 ua-parser-js@^0.7.18:
   version "0.7.28"