feat: 与主分支同步

This commit is contained in:
xlsea 2024-03-28 16:31:21 +08:00
parent 664eee4737
commit 20c28daa66
13 changed files with 311 additions and 278 deletions

13
.gitattributes vendored Normal file
View File

@ -0,0 +1,13 @@
"*.vue" eol=lf
"*.js" eol=lf
"*.ts" eol=lf
"*.jsx" eol=lf
"*.tsx" eol=lf
"*.mjs" eol=lf
"*.json" eol=lf
"*.html" eol=lf
"*.css" eol=lf
"*.scss" eol=lf
"*.md" eol=lf
"*.yaml" eol=lf
"*.yml" eol=lf

View File

@ -1,7 +1,7 @@
{ {
"name": "easy-retry", "name": "easy-retry",
"type": "module", "type": "module",
"version": "1.0.0-beta.1", "version": "1.0.0-beta.2",
"packageManager": "pnpm@8.15.5", "packageManager": "pnpm@8.15.5",
"description": "A flexible, reliable, and fast platform for distributed task retry and distributed task scheduling.", "description": "A flexible, reliable, and fast platform for distributed task retry and distributed task scheduling.",
"license": "MIT", "license": "MIT",
@ -57,40 +57,40 @@
"pinia": "2.1.7", "pinia": "2.1.7",
"ts-md5": "^1.3.1", "ts-md5": "^1.3.1",
"vue": "3.4.21", "vue": "3.4.21",
"vue-draggable-plus": "0.3.5", "vue-draggable-plus": "0.4.0",
"vue-i18n": "9.10.2", "vue-i18n": "9.10.2",
"vue-router": "4.3.0" "vue-router": "4.3.0"
}, },
"devDependencies": { "devDependencies": {
"@elegant-router/vue": "0.3.6", "@elegant-router/vue": "0.3.6",
"@iconify/json": "2.2.194", "@iconify/json": "2.2.196",
"@sa/scripts": "workspace:*", "@sa/scripts": "workspace:*",
"@sa/uno-preset": "workspace:*", "@sa/uno-preset": "workspace:*",
"@soybeanjs/eslint-config": "1.2.5", "@soybeanjs/eslint-config": "1.2.5",
"@types/lodash-es": "4.17.12", "@types/lodash-es": "4.17.12",
"@types/node": "20.11.30", "@types/node": "20.11.30",
"@types/nprogress": "0.2.3", "@types/nprogress": "0.2.3",
"@unocss/eslint-config": "0.58.6", "@unocss/eslint-config": "0.58.7",
"@unocss/preset-icons": "0.58.6", "@unocss/preset-icons": "0.58.7",
"@unocss/preset-uno": "0.58.6", "@unocss/preset-uno": "0.58.7",
"@unocss/transformer-directives": "0.58.6", "@unocss/transformer-directives": "0.58.7",
"@unocss/transformer-variant-group": "0.58.6", "@unocss/transformer-variant-group": "0.58.7",
"@unocss/vite": "0.58.6", "@unocss/vite": "0.58.7",
"@vitejs/plugin-vue": "5.0.4", "@vitejs/plugin-vue": "5.0.4",
"@vitejs/plugin-vue-jsx": "3.1.0", "@vitejs/plugin-vue-jsx": "3.1.0",
"eslint": "8.57.0", "eslint": "8.57.0",
"eslint-plugin-vue": "9.23.0", "eslint-plugin-vue": "9.24.0",
"lint-staged": "15.2.2", "lint-staged": "15.2.2",
"sass": "1.72.0", "sass": "1.72.0",
"simple-git-hooks": "2.11.0", "simple-git-hooks": "2.11.1",
"tsx": "4.7.1", "tsx": "4.7.1",
"typescript": "5.4.3", "typescript": "5.4.3",
"unplugin-icons": "0.18.5", "unplugin-icons": "0.18.5",
"unplugin-vue-components": "0.26.0", "unplugin-vue-components": "0.26.0",
"vite": "5.2.2", "vite": "5.2.6",
"vite-plugin-progress": "0.0.7", "vite-plugin-progress": "0.0.7",
"vite-plugin-svg-icons": "2.0.1", "vite-plugin-svg-icons": "2.0.1",
"vite-plugin-vue-devtools": "7.0.20", "vite-plugin-vue-devtools": "7.0.24",
"vue-eslint-parser": "9.4.2", "vue-eslint-parser": "9.4.2",
"vue-tsc": "2.0.7" "vue-tsc": "2.0.7"
}, },

View File

@ -1,6 +1,6 @@
{ {
"name": "@sa/axios", "name": "@sa/axios",
"version": "1.0.0-beta.1", "version": "1.0.0-beta.2",
"exports": { "exports": {
".": "./src/index.ts" ".": "./src/index.ts"
}, },

View File

@ -1,6 +1,6 @@
{ {
"name": "@sa/color-palette", "name": "@sa/color-palette",
"version": "1.0.0-beta.1", "version": "1.0.0-beta.2",
"exports": { "exports": {
".": "./src/index.ts" ".": "./src/index.ts"
}, },

View File

@ -1,6 +1,6 @@
{ {
"name": "@sa/hooks", "name": "@sa/hooks",
"version": "1.0.0-beta.1", "version": "1.0.0-beta.2",
"exports": { "exports": {
".": "./src/index.ts" ".": "./src/index.ts"
}, },

View File

@ -1,6 +1,6 @@
{ {
"name": "@sa/materials", "name": "@sa/materials",
"version": "1.0.0-beta.1", "version": "1.0.0-beta.2",
"exports": { "exports": {
".": "./src/index.ts" ".": "./src/index.ts"
}, },

View File

@ -1,6 +1,6 @@
{ {
"name": "@sa/fetch", "name": "@sa/fetch",
"version": "1.0.0-beta.1", "version": "1.0.0-beta.2",
"exports": { "exports": {
".": "./src/index.ts" ".": "./src/index.ts"
}, },
@ -10,6 +10,6 @@
} }
}, },
"dependencies": { "dependencies": {
"ofetch": "1.3.3" "ofetch": "1.3.4"
} }
} }

View File

@ -1,6 +1,6 @@
{ {
"name": "@sa/scripts", "name": "@sa/scripts",
"version": "1.0.0-beta.1", "version": "1.0.0-beta.2",
"bin": { "bin": {
"sa": "./bin.ts" "sa": "./bin.ts"
}, },
@ -21,7 +21,7 @@
"enquirer": "2.4.1", "enquirer": "2.4.1",
"execa": "8.0.1", "execa": "8.0.1",
"kolorist": "1.8.0", "kolorist": "1.8.0",
"npm-check-updates": "16.14.17", "npm-check-updates": "16.14.18",
"rimraf": "5.0.5" "rimraf": "5.0.5"
} }
} }

View File

@ -1,6 +1,6 @@
{ {
"name": "@sa/uno-preset", "name": "@sa/uno-preset",
"version": "1.0.0-beta.1", "version": "1.0.0-beta.2",
"exports": { "exports": {
".": "./src/index.ts" ".": "./src/index.ts"
}, },

View File

@ -1,6 +1,6 @@
{ {
"name": "@sa/utils", "name": "@sa/utils",
"version": "1.0.0-beta.1", "version": "1.0.0-beta.2",
"exports": { "exports": {
".": "./src/index.ts" ".": "./src/index.ts"
}, },

File diff suppressed because it is too large Load Diff

View File

@ -17,7 +17,7 @@ const icon = computed(() => (props.pin ? 'mdi-pin-off' : 'mdi-pin'));
<ButtonIcon <ButtonIcon
:tooltip-content="pin ? $t('icon.pin') : $t('icon.unpin')" :tooltip-content="pin ? $t('icon.pin') : $t('icon.unpin')"
tooltip-placement="bottom-start" tooltip-placement="bottom-start"
trigger-parent :z-index="100"
> >
<SvgIcon :icon="icon" /> <SvgIcon :icon="icon" />
</ButtonIcon> </ButtonIcon>

View File

@ -17,13 +17,15 @@ interface Props {
tooltipContent?: string; tooltipContent?: string;
/** Tooltip placement */ /** Tooltip placement */
tooltipPlacement?: PopoverPlacement; tooltipPlacement?: PopoverPlacement;
zIndex?: number;
} }
const props = withDefaults(defineProps<Props>(), { const props = withDefaults(defineProps<Props>(), {
class: 'h-36px text-icon', class: 'h-36px text-icon',
icon: '', icon: '',
tooltipContent: '', tooltipContent: '',
tooltipPlacement: 'bottom' tooltipPlacement: 'bottom',
zIndex: 98
}); });
interface ButtonProps { interface ButtonProps {
@ -58,7 +60,7 @@ const cls = computed(() => {
</DefineButton> </DefineButton>
<!-- define component end: Button --> <!-- define component end: Button -->
<NTooltip v-if="tooltipContent" :placement="tooltipPlacement" :z-index="98"> <NTooltip v-if="tooltipContent" :placement="tooltipPlacement" :z-index="zIndex">
<template #trigger> <template #trigger>
<Button :class-name="cls" v-bind="$attrs"> <Button :class-name="cls" v-bind="$attrs">
<slot> <slot>