From a876f8875af0623bf3288237e9e05a1d345ebf70 Mon Sep 17 00:00:00 2001
From: tyh2001 <1469442737@qq.com>
Date: Tue, 7 Feb 2023 11:42:56 +0800
Subject: [PATCH] =?UTF-8?q?revert:=20=E5=8F=91=E5=B8=83=E6=96=B0=E7=89=88?=
=?UTF-8?q?=E6=9C=AC=200.22.1=20(2023-02-07)=20=F0=9F=A6=9E=F0=9F=A6=9E?=
=?UTF-8?q?=F0=9F=A6=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.prettierrc | 1 -
CHANGELOG.en-US.md | 6 ++++++
CHANGELOG.md | 4 ++++
docs/docs/changelog.md | 6 ++++++
packages/fighting-design/_hooks/use-color/index.ts | 6 ++----
packages/fighting-design/package.json | 2 +-
start/src/App.vue | 12 +++---------
7 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/.prettierrc b/.prettierrc
index 475951982b..7958a168df 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -4,7 +4,6 @@
"tabWidth": 2,
"singleQuote": true,
"trailingComma": "none",
- "jsxBracketSameLine": true,
"arrowParens": "avoid",
"bracketSameLine": false,
"bracketSpacing": true,
diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
index 9c5d025586..b24569c64b 100644
--- a/CHANGELOG.en-US.md
+++ b/CHANGELOG.en-US.md
@@ -4,6 +4,12 @@
English | [Chinese](https://github.com/FightingDesign/fighting-design/blob/master/CHANGELOG.md)
+## 0.22.1 (2023-02-07)
+
+- `f-calendar` component abolishes `memorandum` configuration item
+- Optimize the priority display status of the `f-calendar` component lunar calendar description
+- Substantially optimize internal code implementation
+
## 0.22.0 (2023-02-03)
- `f-button` `f-alert` `f-bag` `f-tag` The new type of the component is info optional
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75e93fa2f6..d69a2df0a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,11 @@
中文 | [英文](https://github.com/FightingDesign/fighting-design/blob/master/CHANGELOG.en-US.md)
+## 0.22.1 (2023-02-07)
+
- `f-calendar` 组件废除 `memorandum` 配置项
+- 优化 `f-calendar` 组件农历描述的优先级展示状态
+- 大幅度优化内部代码实现
## 0.22.0 (2023-02-03)
diff --git a/docs/docs/changelog.md b/docs/docs/changelog.md
index c5f33405e2..d69a2df0a8 100644
--- a/docs/docs/changelog.md
+++ b/docs/docs/changelog.md
@@ -2,6 +2,12 @@
中文 | [英文](https://github.com/FightingDesign/fighting-design/blob/master/CHANGELOG.en-US.md)
+## 0.22.1 (2023-02-07)
+
+- `f-calendar` 组件废除 `memorandum` 配置项
+- 优化 `f-calendar` 组件农历描述的优先级展示状态
+- 大幅度优化内部代码实现
+
## 0.22.0 (2023-02-03)
- `f-button` `f-alert` `f-badge` `f-tag` 组件新增 type 为 info 可选项
diff --git a/packages/fighting-design/_hooks/use-color/index.ts b/packages/fighting-design/_hooks/use-color/index.ts
index 3ff1894504..cd6fe319d0 100644
--- a/packages/fighting-design/_hooks/use-color/index.ts
+++ b/packages/fighting-design/_hooks/use-color/index.ts
@@ -10,7 +10,6 @@ export * from './interface.d'
* @returns { Object } 加深原色 减淡颜色
*/
export const useColor = (color: string): UseColorReturn => {
-
/** 十六进制色号正则检测条件 */
const r = /^\#?[0-9A-Fa-f]{6}$/
@@ -25,17 +24,16 @@ export const useColor = (color: string): UseColorReturn => {
* @returns { string[] } rgb 色号数组
*/
const toRgb = (): string[] => {
-
/**
* 色号编码
- *
+ *
* @see String.prototype.replace() https://developer.mozilla.org/zh-CN/docs/Web/JavaScript/Reference/Global_Objects/String/replace
*/
const code: string = color.replace('#', '')
/**
* 将字符串分隔成为数组
- *
+ *
* @see String.prototype.match() https://developer.mozilla.org/zh-CN/docs/Web/JavaScript/Reference/Global_Objects/String/match
*/
const hex: string[] = code.match(/../g) as string[]
diff --git a/packages/fighting-design/package.json b/packages/fighting-design/package.json
index aa91db5c34..35a9bb5199 100644
--- a/packages/fighting-design/package.json
+++ b/packages/fighting-design/package.json
@@ -1,6 +1,6 @@
{
"name": "fighting-design",
- "version": "0.22.0",
+ "version": "0.22.1",
"description": "Fighting design can quickly build interactive interfaces in vue3 applications, which looks good.",
"keywords": [
"fighting",
diff --git a/start/src/App.vue b/start/src/App.vue
index fbece50cf7..8470873421 100644
--- a/start/src/App.vue
+++ b/start/src/App.vue
@@ -1,11 +1,5 @@
-
- const { getDark } = useColor('#333333')
+
- console.log(getDark())
-
-
-
-
-
+