jiangyc/ruoyi-plus-soybean
1
0
Fork 0
mirror of https://github.com/m-xlsea/ruoyi-plus-soybean.git synced 2025-09-24 07:49:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'soybean/main' into dev

Browse Source 
# Conflicts:
#	CHANGELOG.md
#	README.en_US.md
#	README.md
#	package.json
#	pnpm-lock.yaml
#	src/App.vue
#	src/theme/settings.ts
#	src/views/_builtin/iframe-page/[url].vue
This commit is contained in:
xlsea
2025-06-25 11:17:46 +08:00
parent 62e6c7763c 87a675bf62
commit 1680ce4e26
42 changed files with 1234 additions and 1978 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/typings/app.d.ts vendored
View File

@ -112,6 +112,8 @@ declare namespace App {
visible: boolean;
/** Watermark text */
text: string;
/** Whether to use user name as watermark text */
enableUserName: boolean;
};
table: {
/** Whether to show the table border */
@ -446,6 +448,7 @@ declare namespace App {
watermark: {
visible: string;
text: string;
enableUserName: string;
};
tablePropsTitle: string;
table: {