Merge branch 'master' of github.com:FightingDesign/fighting-design

FightingDesign · Nov 21, 2023 · 625e3ee · 625e3ee
2 parents ebbe4fc + 6f9ca93
commit 625e3ee
Show file tree

Hide file tree

Showing 22 changed files with 100 additions and 279 deletions.
diff --git a/.github/workflows/release-tag.yaml b/.github/workflows/release-tag.yaml
@@ -1,27 +1,27 @@
-name: Create Release Tag
+# name: Create Release Tag
 
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - 'packages/fighting-design/package.json'
+# on:
+#   push:
+#     branches:
+#       - master
+#     paths:
+#       - 'packages/fighting-design/package.json'
 
-jobs:
-  release-tag:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@master
+# jobs:
+#   release-tag:
+#     runs-on: ubuntu-latest
+#     steps:
+#       - name: Checkout code
+#         uses: actions/checkout@master
 
-      - name: Create Release Tag
-        id: release_tag
-        uses: yyx990803/release-tag@master
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ github.ref }}
-          body: |
-            详细更新日志请参考 [CHANGELOG.md](https://github.com/FightingDesign/fighting-design/blob/master/CHANGELOG.md)。
+#       - name: Create Release Tag
+#         id: release_tag
+#         uses: yyx990803/release-tag@master
+#         env:
+#           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#         with:
+#           tag_name: ${{ github.ref }}
+#           body: |
+#             详细更新日志请参考 [CHANGELOG.md](https://github.com/FightingDesign/fighting-design/blob/master/CHANGELOG.md)。
 
-            Please refer to [CHANGELOG.en-US.md](https://github.com/FightingDesign/fighting-design/blob/master/CHANGELOG.en-US.md) for details.
+#             Please refer to [CHANGELOG.en-US.md](https://github.com/FightingDesign/fighting-design/blob/master/CHANGELOG.en-US.md) for details.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 中文 | [英文](https://github.com/FightingDesign/fighting-design/blob/master/CHANGELOG.en-US.md)
 
+## 0.64.0 (2023-10-07)
+
+- Fixed `f-dialog` style details
+- Fix `f-watermark` removable issue
+
 ## 0.63.1 (2023-08-28)
 
 - 修复 `f-select` 组件多个不会触发滚动到选中元素问题

diff --git a/docs/docs/changelog.md b/docs/docs/changelog.md
@@ -2,6 +2,11 @@
 
 中文 | [英文](https://github.com/FightingDesign/fighting-design/blob/master/CHANGELOG.en-US.md)
 
+## 0.64.0 (2023-10-07)
+
+- Fixed `f-dialog` style details
+- Fix `f-watermark` removable issue
+
 ## 0.63.1 (2023-08-28)
 
 - 修复 `f-select` 组件多个不会触发滚动到选中元素问题

diff --git a/packages/fighting-design/_hooks/use-watermark/index.ts b/packages/fighting-design/_hooks/use-watermark/index.ts
@@ -2,31 +2,37 @@ import { computed } from 'vue'
 import type { WatermarkProps } from '../../watermark'
 import type { ComputedRef } from 'vue'
 
-export type UseWatermarkReturn = ComputedRef<{
+/**
+ * useWatermark 返回值类型接口
+ *
+ * @param { string } base64 base64 格式图片
+ * @param { number } size 图片尺寸
+ */
+export interface UseWatermarkReturn {
   base64: string
   size: number
-}>
+}
 
 /**
  * 生成水印图片
- * 
+ *
  * @param { Object } prop prop 参数
- * @returns 
+ * @returns
  */
-export const useWatermark = (prop: WatermarkProps): UseWatermarkReturn => {
-  return computed((): { base64: string; size: number } => {
+export const useWatermark = (prop: WatermarkProps): ComputedRef<UseWatermarkReturn> => {
+  return computed((): UseWatermarkReturn => {
     /**
-    * 创建一个 canvas
-    *
-    * @see Canvas https://developer.mozilla.org/zh-CN/docs/Web/API/Canvas_API
-    */
+     * 创建一个 canvas
+     *
+     * @see Canvas https://developer.mozilla.org/zh-CN/docs/Web/API/Canvas_API
+     */
     const canvas: HTMLCanvasElement = document.createElement('canvas')
 
     /**
-    * 设备像素比率
-    *
-    * @see Window.devicePixelRatio https://developer.mozilla.org/zh-CN/docs/Web/API/Window/devicePixelRatio
-    */
+     * 设备像素比率
+     *
+     * @see Window.devicePixelRatio https://developer.mozilla.org/zh-CN/docs/Web/API/Window/devicePixelRatio
+     */
     const devicePixeRatio: number = window.devicePixelRatio || 1
 
     /** 文字大小 */
@@ -41,24 +47,28 @@ export const useWatermark = (prop: WatermarkProps): UseWatermarkReturn => {
      */
     const ctx = canvas.getContext('2d') as CanvasRenderingContext2D
 
-    const { width } = ctx.measureText(prop.content)
+    if (ctx) {
+      const { width } = ctx.measureText(prop.content)
+
+      const cavasSize: number = Math.max(100, width) * devicePixeRatio + prop.gap
 
-    const cavasSize = Math.max(100, width) * devicePixeRatio + prop.gap
+      canvas.width = cavasSize
+      canvas.height = cavasSize
 
-    canvas.width = cavasSize
-    canvas.height = cavasSize
+      ctx.translate(canvas.width / 2, canvas.height / 2)
+      ctx.rotate((Math.PI / 190) * -45)
+      ctx.fillStyle = prop.fontColor
+      ctx.font = font
+      ctx.textAlign = 'center'
+      ctx.textBaseline = 'middle'
+      ctx.fillText(prop.content, 0, 0)
 
-    ctx.translate(canvas.width / 2, canvas.height / 2)
-    ctx.rotate((Math.PI / 190) * -45)
-    ctx.fillStyle = prop.fontColor
-    ctx.font = font
-    ctx.textAlign = 'center'
-    ctx.textBaseline = 'middle'
-    ctx.fillText(prop.content, 0, 0)
+      return {
+        base64: canvas.toDataURL(),
+        size: cavasSize / devicePixeRatio
+      } as const
+    }
 
-    return {
-      base64: canvas.toDataURL(),
-      size: cavasSize / devicePixeRatio
-    } as const
+    return { base64: '', size: 0 }
   })
 }
diff --git a/packages/fighting-design/avatar-group/index.ts b/packages/fighting-design/avatar-group/index.ts
@@ -4,6 +4,7 @@ import { install } from '../_utils'
 
 export const FAvatarGroup = install(AvatarGroup)
 
+/** avatar-group 组件实例类型 */
 export type AvatarGroupInstance = InstanceType<typeof AvatarGroup>
 
 export * from './src/interface'

diff --git a/packages/fighting-design/package.json b/packages/fighting-design/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fighting-design",
-  "version": "0.63.1",
+  "version": "0.64.0",
   "description": "Fighting design can quickly build interactive interfaces in vue3 applications, which looks good.",
   "keywords": [
     "fighting",
@@ -60,4 +60,4 @@
   },
   "homepage": "https://fighting.tianyuhao.cn",
   "repository": "https://github.com/FightingDesign/fighting-design"
-}
+}
diff --git a/packages/fighting-design/tabs-item/index.ts b/packages/fighting-design/tabs-item/index.ts
@@ -4,6 +4,7 @@ import { install } from '../_utils'
 
 export const FTabsItem = install(TabsItem)
 
+/** tabs-item 组件实例类型 */
 export type TabsItemInstance = InstanceType<typeof TabsItem>
 
 export * from './src/interface'

diff --git a/packages/fighting-design/watermark/index.ts b/packages/fighting-design/watermark/index.ts
@@ -7,6 +7,6 @@ export const FWatermark = install(Watermark)
 /** watermark 组件实例类型 */
 export type WatermarkInstance = InstanceType<typeof Watermark>
 
-export * from './src/interface.d'
+export * from './src/interface'
 
 export default FWatermark
diff --git a/...hting-design/watermark/src/interface.d.ts → ...ighting-design/watermark/src/interface.ts b/...hting-design/watermark/src/interface.d.ts → ...ighting-design/watermark/src/interface.ts
diff --git a/packages/fighting-design/watermark/src/props.ts b/packages/fighting-design/watermark/src/props.ts
@@ -1,8 +1,4 @@
-import {
-  setStringProp,
-  setNumberProp,
-  setStringNumberProp
-} from '../../_utils'
+import { setStringProp, setNumberProp, setStringNumberProp } from '../../_utils'
 import type { ExtractPropTypes } from 'vue'
 
 export const Props = {

diff --git a/packages/fighting-resolver/LICENSE b/packages/fighting-resolver/LICENSE
diff --git a/packages/fighting-resolver/README.md b/packages/fighting-resolver/README.md
diff --git a/packages/fighting-resolver/index.ts b/packages/fighting-resolver/index.ts
diff --git a/packages/fighting-resolver/package.json b/packages/fighting-resolver/package.json
diff --git a/packages/fighting-resolver/tsconfig.json b/packages/fighting-resolver/tsconfig.json
diff --git a/packages/fighting-theme/src/alert.scss b/packages/fighting-theme/src/alert.scss
@@ -55,10 +55,8 @@
   }
 
   // 居中
-  &.f-alert__center {
-    .f-alert__content {
-      justify-content: center;
-    }
+  &.f-alert__center .f-alert__content {
+    justify-content: center;
   }
 
   // 固定定位

diff --git a/packages/fighting-theme/src/button.scss b/packages/fighting-theme/src/button.scss
@@ -26,10 +26,7 @@
     content: '';
     display: inline-block;
     position: absolute;
-    top: 0;
-    right: 0;
-    left: 0;
-    bottom: 0;
+    inset: 0;
     opacity: 0;
     border-radius: inherit;
     transition: 0.3s;
@@ -96,10 +93,7 @@
   // 涟漪容器
   &__ripples-box {
     position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
+    inset: 0;
     overflow: hidden;
 
     // 涟漪效果