",
+ "
",
+ "",
+ ],
+ },
+ "vue-computed": {
+ "scope": "javascript,typescript,vue",
+ "prefix": "com",
+ "body": ["computed(() => { $1 })"],
+ },
+}
diff --git a/apps/vben5/.vscode/launch.json b/apps/vben5/.vscode/launch.json
new file mode 100644
index 000000000..d868ef52b
--- /dev/null
+++ b/apps/vben5/.vscode/launch.json
@@ -0,0 +1,51 @@
+{
+ "$schema": "https://json.schemastore.org/launchsettings.json",
+ "version": "0.2.0",
+ "configurations": [
+ {
+ "type": "chrome",
+ "name": "vben admin playground dev",
+ "request": "launch",
+ "url": "http://localhost:5555",
+ "env": { "NODE_ENV": "development" },
+ "sourceMaps": true,
+ "webRoot": "${workspaceFolder}/playground"
+ },
+ {
+ "type": "chrome",
+ "name": "vben abp antd dev",
+ "request": "launch",
+ "url": "http://localhost:5666",
+ "env": { "NODE_ENV": "development" },
+ "sourceMaps": true,
+ "webRoot": "${workspaceFolder}/apps/app-antd"
+ },
+ {
+ "type": "chrome",
+ "name": "vben admin antd dev",
+ "request": "launch",
+ "url": "http://localhost:5666",
+ "env": { "NODE_ENV": "development" },
+ "sourceMaps": true,
+ "webRoot": "${workspaceFolder}/apps/web-antd"
+ },
+ {
+ "type": "chrome",
+ "name": "vben admin ele dev",
+ "request": "launch",
+ "url": "http://localhost:5777",
+ "env": { "NODE_ENV": "development" },
+ "sourceMaps": true,
+ "webRoot": "${workspaceFolder}/apps/web-ele"
+ },
+ {
+ "type": "chrome",
+ "name": "vben admin naive dev",
+ "request": "launch",
+ "url": "http://localhost:5888",
+ "env": { "NODE_ENV": "development" },
+ "sourceMaps": true,
+ "webRoot": "${workspaceFolder}/apps/web-naive"
+ }
+ ]
+}
diff --git a/apps/vben5/.vscode/settings.json b/apps/vben5/.vscode/settings.json
new file mode 100644
index 000000000..f38c42781
--- /dev/null
+++ b/apps/vben5/.vscode/settings.json
@@ -0,0 +1,241 @@
+{
+ "tailwindCSS.experimental.configFile": "internal/tailwind-config/src/index.ts",
+ // workbench
+ "workbench.list.smoothScrolling": true,
+ "workbench.startupEditor": "newUntitledFile",
+ "workbench.tree.indent": 10,
+ "workbench.editor.highlightModifiedTabs": true,
+ "workbench.editor.closeOnFileDelete": true,
+ "workbench.editor.limit.enabled": true,
+ "workbench.editor.limit.perEditorGroup": true,
+ "workbench.editor.limit.value": 5,
+
+ // editor
+ "editor.tabSize": 2,
+ "editor.detectIndentation": false,
+ "editor.cursorBlinking": "expand",
+ "editor.largeFileOptimizations": true,
+ "editor.accessibilitySupport": "off",
+ "editor.cursorSmoothCaretAnimation": "on",
+ "editor.guides.bracketPairs": "active",
+ "editor.inlineSuggest.enabled": true,
+ "editor.suggestSelection": "recentlyUsedByPrefix",
+ "editor.acceptSuggestionOnEnter": "smart",
+ "editor.suggest.snippetsPreventQuickSuggestions": false,
+ "editor.stickyScroll.enabled": true,
+ "editor.hover.sticky": true,
+ "editor.suggest.insertMode": "replace",
+ "editor.bracketPairColorization.enabled": true,
+ "editor.autoClosingBrackets": "beforeWhitespace",
+ "editor.autoClosingDelete": "always",
+ "editor.autoClosingOvertype": "always",
+ "editor.autoClosingQuotes": "beforeWhitespace",
+ "editor.wordSeparators": "`~!@#%^&*()=+[{]}\\|;:'\",.<>/?",
+ "editor.codeActionsOnSave": {
+ "source.fixAll.eslint": "explicit",
+ "source.fixAll.stylelint": "explicit",
+ "source.organizeImports": "never"
+ },
+ "editor.defaultFormatter": "esbenp.prettier-vscode",
+ "[html]": {
+ "editor.defaultFormatter": "esbenp.prettier-vscode"
+ },
+ "[css]": {
+ "editor.defaultFormatter": "esbenp.prettier-vscode"
+ },
+ "[scss]": {
+ "editor.defaultFormatter": "esbenp.prettier-vscode"
+ },
+ "[javascript]": {
+ "editor.defaultFormatter": "esbenp.prettier-vscode"
+ },
+ "[typescript]": {
+ "editor.defaultFormatter": "esbenp.prettier-vscode"
+ },
+ "[json]": {
+ "editor.defaultFormatter": "esbenp.prettier-vscode"
+ },
+ "[markdown]": {
+ "editor.defaultFormatter": "esbenp.prettier-vscode"
+ },
+ "[jsonc]": {
+ "editor.defaultFormatter": "esbenp.prettier-vscode"
+ },
+ "[vue]": {
+ "editor.defaultFormatter": "esbenp.prettier-vscode"
+ },
+ // extensions
+ "extensions.ignoreRecommendations": true,
+
+ // terminal
+ "terminal.integrated.cursorBlinking": true,
+ "terminal.integrated.persistentSessionReviveProcess": "never",
+ "terminal.integrated.tabs.enabled": true,
+ "terminal.integrated.scrollback": 10000,
+ "terminal.integrated.stickyScroll.enabled": true,
+
+ // files
+ "files.eol": "\n",
+ "files.insertFinalNewline": true,
+ "files.simpleDialog.enable": true,
+ "files.associations": {
+ "*.ejs": "html",
+ "*.art": "html",
+ "**/tsconfig.json": "jsonc",
+ "*.json": "jsonc",
+ "package.json": "json"
+ },
+
+ "files.exclude": {
+ "**/.eslintcache": true,
+ "**/bower_components": true,
+ "**/.turbo": true,
+ "**/.idea": true,
+ "**/.vitepress": true,
+ "**/tmp": true,
+ "**/.git": true,
+ "**/.svn": true,
+ "**/.hg": true,
+ "**/CVS": true,
+ "**/.stylelintcache": true,
+ "**/.DS_Store": true,
+ "**/vite.config.mts.*": true,
+ "**/tea.yaml": true
+ },
+ "files.watcherExclude": {
+ "**/.git/objects/**": true,
+ "**/.git/subtree-cache/**": true,
+ "**/.vscode/**": true,
+ "**/node_modules/**": true,
+ "**/tmp/**": true,
+ "**/bower_components/**": true,
+ "**/dist/**": true,
+ "**/yarn.lock": true
+ },
+
+ "typescript.tsserver.exclude": ["**/node_modules", "**/dist", "**/.turbo"],
+
+ // search
+ "search.searchEditor.singleClickBehaviour": "peekDefinition",
+ "search.followSymlinks": false,
+ // 在使用搜索功能时，将这些文件夹/文件排除在外
+ "search.exclude": {
+ "**/node_modules": true,
+ "**/*.log": true,
+ "**/*.log*": true,
+ "**/bower_components": true,
+ "**/dist": true,
+ "**/elehukouben": true,
+ "**/.git": true,
+ "**/.github": true,
+ "**/.gitignore": true,
+ "**/.svn": true,
+ "**/.DS_Store": true,
+ "**/.vitepress/cache": true,
+ "**/.idea": true,
+ "**/.vscode": false,
+ "**/.yarn": true,
+ "**/tmp": true,
+ "*.xml": true,
+ "out": true,
+ "dist": true,
+ "node_modules": true,
+ "CHANGELOG.md": true,
+ "**/pnpm-lock.yaml": true,
+ "**/yarn.lock": true
+ },
+
+ "debug.onTaskErrors": "debugAnyway",
+ "diffEditor.ignoreTrimWhitespace": false,
+ "npm.packageManager": "pnpm",
+
+ "css.validate": false,
+ "less.validate": false,
+ "scss.validate": false,
+
+ // extension
+ "emmet.showSuggestionsAsSnippets": true,
+ "emmet.triggerExpansionOnTab": false,
+
+ "errorLens.enabledDiagnosticLevels": ["warning", "error"],
+ "errorLens.excludeBySource": ["cSpell", "Grammarly", "eslint"],
+
+ "stylelint.enable": true,
+ "stylelint.packageManager": "pnpm",
+ "stylelint.validate": ["css", "less", "postcss", "scss", "vue"],
+ "stylelint.customSyntax": "postcss-html",
+ "stylelint.snippet": ["css", "less", "postcss", "scss", "vue"],
+
+ "typescript.inlayHints.enumMemberValues.enabled": true,
+ "typescript.preferences.preferTypeOnlyAutoImports": true,
+ "typescript.preferences.includePackageJsonAutoImports": "on",
+
+ "eslint.validate": [
+ "javascript",
+ "typescript",
+ "javascriptreact",
+ "typescriptreact",
+ "vue",
+ "html",
+ "markdown",
+ "json",
+ "jsonc",
+ "json5"
+ ],
+
+ "tailwindCSS.experimental.classRegex": [
+ ["cva\\(([^)]*)\\)", "[\"'`]([^\"'`]*).*?[\"'`]"]
+ ],
+
+ "github.copilot.enable": {
+ "*": true,
+ "markdown": true,
+ "plaintext": false,
+ "yaml": false
+ },
+
+ "cssVariables.lookupFiles": ["packages/core/base/design/src/**/*.css"],
+
+ "i18n-ally.localesPaths": [
+ "packages/locales/src/langs",
+ "playground/src/locales/langs",
+ "apps/*/src/locales/langs"
+ ],
+ "i18n-ally.pathMatcher": "{locale}/{namespace}.{ext}",
+ "i18n-ally.enabledParsers": ["json"],
+ "i18n-ally.sourceLanguage": "en",
+ "i18n-ally.displayLanguage": "zh-CN",
+ "i18n-ally.enabledFrameworks": ["vue", "react"],
+ "i18n-ally.keystyle": "nested",
+ "i18n-ally.sortKeys": true,
+ "i18n-ally.namespace": true,
+
+ // 控制相关文件嵌套展示
+ "explorer.fileNesting.enabled": true,
+ "explorer.fileNesting.expand": false,
+ "explorer.fileNesting.patterns": {
+ "*.ts": "$(capture).test.ts, $(capture).test.tsx, $(capture).spec.ts, $(capture).spec.tsx, $(capture).d.ts",
+ "*.tsx": "$(capture).test.ts, $(capture).test.tsx, $(capture).spec.ts, $(capture).spec.tsx,$(capture).d.ts",
+ "*.env": "$(capture).env.*",
+ "README.md": "README*,CHANGELOG*,LICENSE,CNAME",
+ "package.json": "pnpm-lock.yaml,pnpm-workspace.yaml,.gitattributes,.gitignore,.gitpod.yml,.npmrc,.browserslistrc,.node-version,.git*,.tazerc.json",
+ "eslint.config.mjs": ".eslintignore,.prettierignore,.stylelintignore,.commitlintrc.*,.prettierrc.*,stylelint.config.*,.lintstagedrc.mjs,cspell.json,lefthook.yml",
+ "tailwind.config.mjs": "postcss.*"
+ },
+ "commentTranslate.hover.enabled": false,
+ "commentTranslate.multiLineMerge": true,
+ "vue.server.hybridMode": true,
+ "typescript.tsdk": "node_modules/typescript/lib",
+ "oxc.enable": false,
+ "cSpell.words": [
+ "archiver",
+ "axios",
+ "dotenv",
+ "isequal",
+ "jspm",
+ "napi",
+ "nolebase",
+ "rollup",
+ "vitest"
+ ]
+}
diff --git a/apps/vben5/apps/app-antd/package.json b/apps/vben5/apps/app-antd/package.json
index 03fa292ee..6b1852596 100644
--- a/apps/vben5/apps/app-antd/package.json
+++ b/apps/vben5/apps/app-antd/package.json
@@ -28,6 +28,7 @@
"dependencies": {
"@abp/account": "workspace:*",
"@abp/auditing": "workspace:*",
+ "@abp/components": "workspace:*",
"@abp/core": "workspace:*",
"@abp/data-protection": "workspace:*",
"@abp/demo": "workspace:*",
@@ -46,6 +47,7 @@
"@abp/text-templating": "workspace:*",
"@abp/ui": "workspace:*",
"@abp/webhooks": "workspace:*",
+ "@abp/wechat": "workspace:*",
"@vben-core/shadcn-ui": "workspace:*",
"@vben/access": "workspace:*",
"@vben/common-ui": "workspace:*",
@@ -66,6 +68,7 @@
"dayjs": "catalog:",
"pinia": "catalog:",
"vue": "catalog:",
- "vue-router": "catalog:"
+ "vue-router": "catalog:",
+ "vue3-colorpicker": "catalog:"
}
}
diff --git a/apps/vben5/apps/app-antd/src/adapter/component/index.ts b/apps/vben5/apps/app-antd/src/adapter/component/index.ts
index 4ab140011..e98ba7f61 100644
--- a/apps/vben5/apps/app-antd/src/adapter/component/index.ts
+++ b/apps/vben5/apps/app-antd/src/adapter/component/index.ts
@@ -31,6 +31,12 @@ const Button = defineAsyncComponent(() => import('ant-design-vue/es/button'));
const Checkbox = defineAsyncComponent(
() => import('ant-design-vue/es/checkbox'),
);
+const ColorPicker = defineAsyncComponent(() =>
+ import('vue3-colorpicker').then((res) => {
+ import('vue3-colorpicker/style.css');
+ return res.ColorPicker;
+ }),
+);
const CheckboxGroup = defineAsyncComponent(() =>
import('ant-design-vue/es/checkbox').then((res) => res.CheckboxGroup),
);
@@ -117,6 +123,7 @@ export type ComponentType =
| 'AutoComplete'
| 'Checkbox'
| 'CheckboxGroup'
+ | 'ColorPicker'
| 'DatePicker'
| 'DefaultButton'
| 'Divider'
@@ -182,6 +189,7 @@ async function initComponentAdapter() {
AutoComplete,
Checkbox,
CheckboxGroup,
+ ColorPicker,
DatePicker,
// 自定义默认按钮
DefaultButton: (props, { attrs, slots }) => {
diff --git a/apps/vben5/apps/app-antd/src/adapter/request/index.ts b/apps/vben5/apps/app-antd/src/adapter/request/index.ts
index e0c13d6a5..1fe3242a1 100644
--- a/apps/vben5/apps/app-antd/src/adapter/request/index.ts
+++ b/apps/vben5/apps/app-antd/src/adapter/request/index.ts
@@ -37,7 +37,8 @@ export function initRequestClient() {
async function doRefreshToken() {
const authStore = useAuthStore();
try {
- return await authStore.refreshSession();
+ const token = await authStore.refreshSession();
+ return token ?? '';
} catch {
console.warn('The refresh token has expired or is unavailable.');
}
@@ -60,6 +61,9 @@ export function initRequestClient() {
if (abpStore.tenantId) {
config.headers.__tenant = abpStore.tenantId;
}
+ if (abpStore.xsrfToken) {
+ config.headers.RequestVerificationToken = abpStore.xsrfToken;
+ }
return config;
},
});
diff --git a/apps/vben5/apps/app-antd/src/layouts/basic.vue b/apps/vben5/apps/app-antd/src/layouts/basic.vue
index 99d4b38f8..a9059508d 100644
--- a/apps/vben5/apps/app-antd/src/layouts/basic.vue
+++ b/apps/vben5/apps/app-antd/src/layouts/basic.vue
@@ -5,14 +5,8 @@ import { computed, ref, watch } from 'vue';
import { useRouter } from 'vue-router';
import { AuthenticationLoginExpiredModal } from '@vben/common-ui';
-import { VBEN_DOC_URL, VBEN_GITHUB_URL } from '@vben/constants';
import { useWatermark } from '@vben/hooks';
-import {
- BookOpenText,
- CircleHelp,
- createIconifyIcon,
- MdiGithub,
-} from '@vben/icons';
+import { createIconifyIcon } from '@vben/icons';
import {
BasicLayout,
LockScreen,
@@ -21,7 +15,6 @@ import {
} from '@vben/layouts';
import { preferences } from '@vben/preferences';
import { useAccessStore, useUserStore } from '@vben/stores';
-import { openWindow } from '@vben/utils';
import { useAbpStore } from '@abp/core';
@@ -32,36 +25,7 @@ import LoginForm from '#/views/_core/authentication/login.vue';
const UserSettingsIcon = createIconifyIcon('tdesign:user-setting');
-const notifications = ref
+
+
+
+
+
+
+
-
-
- 早安, {{ userStore.userInfo?.realName }}, 开始您一天的工作吧！
-
- 今日晴，20℃ - 32℃！
-
-
-
+
-
-
-
-
-
-
-
- -
+
+ ![]()
+
+
+
diff --git a/apps/vben5/packages/@abp/components/src/cropper/CropperAvatar.vue b/apps/vben5/packages/@abp/components/src/cropper/CropperAvatar.vue
new file mode 100644
index 000000000..c420f8d9b
--- /dev/null
+++ b/apps/vben5/packages/@abp/components/src/cropper/CropperAvatar.vue
@@ -0,0 +1,159 @@
+
+
+
+
+
+
+
+
diff --git a/apps/vben5/packages/@abp/components/src/cropper/CropperModal.vue b/apps/vben5/packages/@abp/components/src/cropper/CropperModal.vue
new file mode 100644
index 000000000..f8e263e56
--- /dev/null
+++ b/apps/vben5/packages/@abp/components/src/cropper/CropperModal.vue
@@ -0,0 +1,309 @@
+
+
+
+
+ ![avatar]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
{{ row.device }}
= {
{
field: 'isActive',
slots: { default: 'active' },
+ sortable: true,
title: $t('AbpIdentity.DisplayName:IsActive'),
},
{
field: 'userName',
minWidth: '100px',
+ sortable: true,
title: $t('AbpIdentity.DisplayName:UserName'),
},
{
@@ -108,14 +110,24 @@ const gridOptions: VxeGridProps = {
field: 'email',
minWidth: '120px',
slots: { default: 'email' },
+ sortable: true,
title: $t('AbpIdentity.DisplayName:Email'),
},
- { field: 'surname', title: $t('AbpIdentity.DisplayName:Surname') },
- { field: 'name', title: $t('AbpIdentity.DisplayName:Name') },
+ {
+ field: 'surname',
+ sortable: true,
+ title: $t('AbpIdentity.DisplayName:Surname'),
+ },
+ {
+ field: 'name',
+ sortable: true,
+ title: $t('AbpIdentity.DisplayName:Name'),
+ },
{
align: 'left',
field: 'phoneNumber',
slots: { default: 'phoneNumber' },
+ sortable: true,
title: $t('AbpIdentity.DisplayName:PhoneNumber'),
},
{
@@ -123,6 +135,7 @@ const gridOptions: VxeGridProps = {
formatter: ({ cellValue }) => {
return cellValue ? formatToDateTime(cellValue) : '';
},
+ sortable: true,
title: $t('AbpIdentity.LockoutEnd'),
},
{
@@ -137,8 +150,10 @@ const gridOptions: VxeGridProps = {
keepSource: true,
proxyConfig: {
ajax: {
- query: async ({ page }, formValues) => {
+ query: async ({ page, sort }, formValues) => {
+ const sorting = sort.order ? `${sort.field} ${sort.order}` : undefined;
return await getPagedListApi({
+ sorting,
maxResultCount: page.pageSize,
skipCount: (page.currentPage - 1) * page.pageSize,
...formValues,
@@ -153,14 +168,18 @@ const gridOptions: VxeGridProps = {
toolbarConfig: {
custom: true,
export: true,
- // import: true,
- refresh: true,
+ refresh: {
+ code: 'query',
+ },
zoom: true,
},
};
const gridEvents: VxeGridListeners = {
cellClick: () => {},
+ sortChange: () => {
+ gridApi.query();
+ },
};
const [UserEditModal, userModalApi] = useVbenModal({
connectedComponent: UserModal,
@@ -188,7 +207,7 @@ const [UserSessionDrawer, userSessionDrawerApi] = useVbenDrawer({
() => import('./UserSessionDrawer.vue'),
),
});
-const [Grid, { query }] = useVbenVxeGrid({
+const [Grid, gridApi] = useVbenVxeGrid({
formOptions,
gridEvents,
gridOptions,
@@ -214,7 +233,7 @@ const handleDelete = (row: IdentityUserDto) => {
onOk: async () => {
await deleteApi(row.id);
message.success($t('AbpUi.DeletedSuccessfully'));
- query();
+ await gridApi.query();
},
title: $t('AbpUi.AreYouSure'),
});
@@ -222,7 +241,7 @@ const handleDelete = (row: IdentityUserDto) => {
const handleUnlock = async (row: IdentityUserDto) => {
await unLockApi(row.id);
- await query();
+ await gridApi.query();
};
const handleMenuClick = async (row: IdentityUserDto, info: MenuInfo) => {
@@ -436,10 +455,10 @@ const handleMenuClick = async (row: IdentityUserDto, info: MenuInfo) => {
-
+
{{ $t('AbpIdentity.CurrentSession') }}
diff --git a/apps/vben5/packages/@abp/identity/src/components/users/UserTable.vue b/apps/vben5/packages/@abp/identity/src/components/users/UserTable.vue
index 7d68dcf17..520e3d659 100644
--- a/apps/vben5/packages/@abp/identity/src/components/users/UserTable.vue
+++ b/apps/vben5/packages/@abp/identity/src/components/users/UserTable.vue
@@ -96,11 +96,13 @@ const gridOptions: VxeGridProps
+
+
diff --git a/apps/vben5/packages/@abp/platform/src/components/workbench/components/WorkbenchQuickNav.vue b/apps/vben5/packages/@abp/platform/src/components/workbench/components/WorkbenchQuickNav.vue
new file mode 100644
index 000000000..8479356db
--- /dev/null
+++ b/apps/vben5/packages/@abp/platform/src/components/workbench/components/WorkbenchQuickNav.vue
@@ -0,0 +1,124 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('workbench.header.notifier.title') }}
+
+ {{
+ $t('workbench.header.notifier.count', [notifierCount])
+ }}
+
+
+
+
+
+
+ -
+
-
+ ++
+ +++ {{ item.title }} +
+ + ++ + {{ item.date }} + ++
+
-
+
-
+ ++
+ +++ {{ item.title }} +
+ + ++ + {{ item.date }} + ++
+
+
+
+ {{ getWelcomeTitle }}
+
+ 今日晴，20℃ - 32℃！
+
+
+
+
+
+
diff --git a/apps/vben5/packages/@abp/platform/src/components/workbench/types.ts b/apps/vben5/packages/@abp/platform/src/components/workbench/types.ts
new file mode 100644
index 000000000..13dea780f
--- /dev/null
+++ b/apps/vben5/packages/@abp/platform/src/components/workbench/types.ts
@@ -0,0 +1,10 @@
+interface FavoriteMenu {
+ color?: string;
+ displayName: string;
+ icon?: string;
+ id: string;
+ isDefault: boolean;
+ path?: string;
+}
+
+export type { FavoriteMenu };
diff --git a/apps/vben5/packages/@abp/platform/src/hooks/useMenuTransform.ts b/apps/vben5/packages/@abp/platform/src/hooks/useMenuTransform.ts
index a7fdb9177..8c6ffc0b3 100644
--- a/apps/vben5/packages/@abp/platform/src/hooks/useMenuTransform.ts
+++ b/apps/vben5/packages/@abp/platform/src/hooks/useMenuTransform.ts
@@ -2,9 +2,12 @@ import type { RouteRecordStringComponent } from '@vben/types';
import type { MenuDto } from '../types';
+import { useUserStore } from '@vben/stores';
+
import { listToTree } from '@abp/core';
export function useMenuTransform() {
+ const userStore = useUserStore();
function mapMetaString(meta: Record
+
+
+
+
+
+
+
+
+
+
+
+