Merge remote-tracking branch 'soybeanjs/main' into ruoyi

# Conflicts:
#	CHANGELOG.md
#	README.md
#	build/config/proxy.ts
#	build/plugins/index.ts
#	package.json
#	src/plugins/loading.ts
#	src/service/request/index.ts
#	src/store/modules/auth/index.ts
#	src/store/modules/route/index.ts
#	src/typings/vite-env.d.ts
#	src/views/_builtin/login/modules/pwd-login.vue
This commit is contained in:
xlsea
2025-04-23 15:18:24 +08:00
70 changed files with 1652 additions and 2152 deletions

View File

@ -1,6 +1,6 @@
{
"name": "@sa/alova",
"version": "1.3.11",
"version": "1.3.13",
"exports": {
".": "./src/index.ts",
"./fetch": "./src/fetch.ts",
@ -13,8 +13,8 @@
}
},
"dependencies": {
"@alova/mock": "2.0.11",
"@alova/mock": "2.0.12",
"@sa/utils": "workspace:*",
"alova": "3.2.8"
"alova": "3.2.10"
}
}

View File

@ -1,6 +1,6 @@
{
"name": "@sa/axios",
"version": "1.3.11",
"version": "1.3.13",
"exports": {
".": "./src/index.ts"
},
@ -11,7 +11,7 @@
},
"dependencies": {
"@sa/utils": "workspace:*",
"axios": "1.7.9",
"axios": "1.8.3",
"axios-retry": "4.5.0",
"qs": "6.14.0"
},

View File

@ -1,6 +1,6 @@
{
"name": "@sa/color",
"version": "1.3.11",
"version": "1.3.13",
"exports": {
".": "./src/index.ts"
},

View File

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

View File

@ -1,5 +1,5 @@
import { computed, reactive, ref } from 'vue';
import type { Ref } from 'vue';
import type { Ref, VNodeChild } from 'vue';
import { jsonClone } from '@sa/utils';
import useBoolean from './use-boolean';
import useLoading from './use-loading';
@ -8,9 +8,11 @@ export type MaybePromise<T> = T | Promise<T>;
export type ApiFn = (args: any) => Promise<unknown>;
export type TableColumnCheckTitle = string | ((...args: any) => VNodeChild);
export type TableColumnCheck = {
key: string;
title: string;
title: TableColumnCheckTitle;
checked: boolean;
};

View File

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

View File

@ -63,7 +63,7 @@ function handleClose() {
<slot></slot>
<template #suffix>
<slot name="suffix">
<SvgClose v-if="closable" :class="[style['svg-close']]" @click.stop="handleClose" />
<SvgClose v-if="closable" :class="[style['svg-close']]" @pointerdown.stop="handleClose" />
</slot>
</template>
</component>

View File

@ -1,6 +1,6 @@
{
"name": "@sa/fetch",
"version": "1.3.11",
"version": "1.3.13",
"exports": {
".": "./src/index.ts"
},

View File

@ -1,6 +1,6 @@
{
"name": "@sa/scripts",
"version": "1.3.11",
"version": "1.3.13",
"bin": {
"sa": "./bin.ts"
},
@ -14,14 +14,14 @@
},
"devDependencies": {
"@soybeanjs/changelog": "0.3.24",
"bumpp": "10.0.3",
"c12": "2.0.2",
"bumpp": "10.1.0",
"c12": "3.0.2",
"cac": "6.7.14",
"consola": "3.4.0",
"consola": "3.4.2",
"enquirer": "2.4.1",
"execa": "9.5.2",
"kolorist": "1.8.0",
"npm-check-updates": "17.1.14",
"npm-check-updates": "17.1.15",
"rimraf": "6.0.1"
}
}

View File

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

View File

@ -1,6 +1,6 @@
{
"name": "@sa/utils",
"version": "1.3.11",
"version": "1.3.13",
"exports": {
".": "./src/index.ts"
},
@ -14,7 +14,7 @@
"crypto-js": "4.2.0",
"klona": "2.0.6",
"localforage": "1.10.0",
"nanoid": "5.0.9"
"nanoid": "5.1.5"
},
"devDependencies": {
"@types/crypto-js": "4.2.2"