revert: 发布新版本 0.19.0 (2023-01-12) 🎉🎉🎉

FightingDesign · Jan 12, 2023 · 3bc2b48 · 3bc2b48
1 parent 9147ed0
commit 3bc2b48
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 5 deletions.
diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
@@ -4,6 +4,20 @@
 
 English | [Chinese](https://github.com/FightingDesign/fighting-design/blob/master/CHANGELOG.md)
 
+## 0.19.0 (2023-01-12)
+
+**Optimization**
+
+- Optimize `f-tag` style details
+- Optimize `f-button` style details
+- Optimize `f-alert` style details
+
+**Fix**
+
+- Fix the problem of reactive failure of `f-tipple` components
+- Fix `f-text` component reactive failure
+- Fix `f-button` ripple failure
+
 ## 0.18.0 (2023-01-12)
 
 **Fix**

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 中文 | [英文](https://github.com/FightingDesign/fighting-design/blob/master/CHANGELOG.en-US.md)
 
+## 0.19.0 (2023-01-12)
+
 **优化**
 
 - 优化 `f-tag` 样式细节
@@ -12,6 +14,7 @@
 
 - 修复 `f-ripple` 组件响应式失效问题
 - 修复 `f-text` 组件响应式失效问题
+- 修复 `f-button` 涟漪失效问题
 
 ## 0.18.0 (2023-01-12)
 

diff --git a/docs/docs/changelog.md b/docs/docs/changelog.md
@@ -2,6 +2,20 @@
 
 中文 | [英文](https://github.com/FightingDesign/fighting-design/blob/master/CHANGELOG.en-US.md)
 
+## 0.19.0 (2023-01-12)
+
+**优化**
+
+- 优化 `f-tag` 样式细节
+- 优化 `f-button` 样式细节
+- 优化 `f-alert` 样式细节
+
+**修复**
+
+- 修复 `f-ripple` 组件响应式失效问题
+- 修复 `f-text` 组件响应式失效问题
+- 修复 `f-button` 涟漪失效问题
+
 ## 0.18.0 (2023-01-12)
 
 **修复**

diff --git a/packages/fighting-design/_hooks/use-button/index.ts b/packages/fighting-design/_hooks/use-button/index.ts
@@ -34,7 +34,7 @@ export const useButton = (prop: ButtonProps): UseButtonReturn => {
     ...toRefs(prop),
     ...customColor.value,
     size: getSize('middle', parentInject),
-    type: getType() && !prop.color,
+    type: !prop.color && getType(),
     disabled: prop.disabled || prop.loading,
     simple: prop.simple && !prop.color,
     text: prop.text && !prop.color,

diff --git a/packages/fighting-design/button/__test__/button.spec.ts b/packages/fighting-design/button/__test__/button.spec.ts
@@ -129,7 +129,7 @@ describe('FButton', () => {
     const wrapper = mount(FButton, {
       props: { shadow: '7px 7px 15px #dcdcdc,-7px -7px 15px #e4e4e4' }
     })
-    expect(wrapper.attributes('style')).toContain('--f-button-box-shadow: 7px 7px 15px #dcdcdc,-7px -7px 15px #e4e4e4')
+    expect(wrapper.attributes('style')).toContain('--f-button-shadow: 7px 7px 15px #dcdcdc,-7px -7px 15px #e4e4e4')
   })
 
   test('text', () => {

diff --git a/packages/fighting-design/package.json b/packages/fighting-design/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fighting-design",
-  "version": "0.18.0",
+  "version": "0.19.0",
   "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
@@ -1,6 +1,15 @@
 <script setup lang="ts"></script>
 
 <template>
-  <f-button font-color="#fff" color="#ff0de5" round ripples>自定义颜色</f-button>
-  <f-button font-color="#fff" color="#22c1c3" loading>loading</f-button>
+  <f-button type="default">默认按钮</f-button>
+  <f-button type="primary">主要按钮</f-button>
+  <f-button type="success">成功按钮</f-button>
+  <f-button type="danger">危险按钮</f-button>
+  <f-button type="warning">警告按钮</f-button>
+
+  <f-button simple type="default">默认按钮</f-button>
+  <f-button simple type="primary">主要按钮</f-button>
+  <f-button simple type="success">成功按钮</f-button>
+  <f-button simple type="danger">危险按钮</f-button>
+  <f-button simple type="warning">警告按钮</f-button>
 </template>