Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vue，i18n升级到最新 #5250

Closed
wants to merge 3 commits into from
Closed

vue，i18n升级到最新 #5250

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
518f95b
vue，i18n升级到最新
lijian3828940 Dec 27, 2024
032608b
## Description
lijian3828940 Dec 27, 2024
f337a71
Merge branch 'v2' of https://github.com/lijian3828940/vue-vben-admin …
lijian3828940 Dec 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@
"tinymce": "^5.10.9",
"unocss": "^0.59.4",
"vditor": "^3.10.4",
"vue": "^3.4.25",
"vue-i18n": "^9.13.1",
"vue": "^3.5.13",
"vue-i18n": "^11.0.1",
"vue-json-pretty": "^2.4.0",
"vue-router": "^4.3.2",
"vue-types": "^5.1.1",
Expand Down
5 changes: 4 additions & 1 deletion src/components/Form/src/components/ApiSelect.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
@dropdown-visible-change="handleFetch"
v-bind="$attrs"
@change="handleChange"
:show-search="true"
@search="debounceSearchFn"
:options="getOptions"
v-model:value="state"
Expand Down Expand Up @@ -84,7 +85,7 @@
},
});

const emit = defineEmits(['options-change', 'change', 'update:value']);
const emit = defineEmits(['options-change', 'change', 'update:value', 'asearch']);
lijian3828940 marked this conversation as resolved.
Show resolved Hide resolved

const optionsRef = ref<OptionsItem[]>([]);

Expand Down Expand Up @@ -195,6 +196,8 @@
let debounceSearchFn = useDebounceFn(handleSearch, 500);

async function handleSearch(value: any) {
emit('asearch', value);

if (!props.apiSearch) {
return;
}
Expand Down
12 changes: 6 additions & 6 deletions src/components/VxeTable/src/css/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import './common';
@import './variable';
@import './toolbar';
@import './component';
@import 'vxe-table/styles/all';
@import 'vxe-pc-ui/styles/all';
@use './common' as *;
@use './variable' as *;
@use './toolbar' as *;
@use './component' as *;
@use 'vxe-table/styles/all' as *;
@use 'vxe-pc-ui/styles/all' as *;
2 changes: 1 addition & 1 deletion src/router/routes/basic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { REDIRECT_NAME, LAYOUT, EXCEPTION_COMPONENT, PAGE_NOT_FOUND_NAME } from
// 404 on a page
export const PAGE_NOT_FOUND_ROUTE: AppRouteRecordRaw = {
path: '/:path(.*)*',
name: PAGE_NOT_FOUND_NAME,
name: 'PageNotFound1',
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

vue-router最新版本下，路由的name不能重复
image

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#5181

component: LAYOUT,
meta: {
title: 'ErrorPage',
Expand Down
2 changes: 1 addition & 1 deletion src/views/demo/form/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
labelField="name"
valueField="id"
:params="searchParams"
@search="debounceOptionsFn"
@asearch="debounceOptionsFn"
/>
</template>
</BasicForm>
Expand Down