diff --git a/src/components/Button/index.vue b/src/components/Button/index.vue
index d16dbf74e..80b72375b 100644
--- a/src/components/Button/index.vue
+++ b/src/components/Button/index.vue
@@ -4,9 +4,9 @@
-->
-
+
-
+
@@ -18,10 +18,11 @@
// import { extendSlots } from '/@/utils/helper/tsxHelper';
import { useThrottle } from '/@/hooks/core/useThrottle';
import { isFunction } from '/@/utils/is';
+ import Icon from '/@/components/Icon';
export default defineComponent({
name: 'AButton',
inheritAttrs: false,
- components: { Button },
+ components: { Button, Icon },
props: {
// 按钮类型
type: {
diff --git a/src/design/transition/fade.less b/src/design/transition/fade.less
index a3fbdb737..609da4596 100644
--- a/src/design/transition/fade.less
+++ b/src/design/transition/fade.less
@@ -1,6 +1,6 @@
.fade-enter-active,
.fade-leave-active {
- transition: opacity 0.1s ease-in-out;
+ transition: opacity 0.2s ease-in-out;
}
.fade-enter-from,
@@ -8,18 +8,18 @@
opacity: 0;
}
-/* fade-transform */
-.slide-fade-leave-active,
-.slide-fade-enter-active {
- transition: all 0.3s;
+/* fade-slide */
+.fade-slide-leave-active,
+.fade-slide-enter-active {
+ transition: all 0.5s;
}
-.slide-fade-enter-from {
+.fade-slide-enter-from {
opacity: 0;
transform: translateX(-30px);
}
-.slide-fade-leave-to {
+.fade-slide-leave-to {
opacity: 0;
transform: translateX(30px);
}
diff --git a/src/enums/appEnum.ts b/src/enums/appEnum.ts
index f424bdcfb..8bbd28447 100644
--- a/src/enums/appEnum.ts
+++ b/src/enums/appEnum.ts
@@ -29,7 +29,7 @@ export enum PermissionModeEnum {
export enum RouterTransitionEnum {
ZOOM_FADE = 'zoom-fade',
ZOOM_OUT = 'zoom-out',
- SIDE_FADE = 'slide-fade',
+ FADE_SIDE = 'fade-slide',
FADE = 'fade',
FADE_BOTTOM = 'fade-bottom',
}
diff --git a/src/layouts/default/multitabs/TabContent.tsx b/src/layouts/default/multitabs/TabContent.tsx
index e3020932a..85db75dfe 100644
--- a/src/layouts/default/multitabs/TabContent.tsx
+++ b/src/layouts/default/multitabs/TabContent.tsx
@@ -60,7 +60,7 @@ export default defineComponent({
if (!tabItem) return;
const icon = tabItem.meta && tabItem.meta.icon;
if (!icon || !unref(getProjectConfigRef).multiTabsSetting.showIcon) return null;
- return ;
+ return ;
}
function renderTabContent() {
const { tabItem: { meta } = {} } = props;
diff --git a/src/layouts/default/setting/SettingDrawer.tsx b/src/layouts/default/setting/SettingDrawer.tsx
index d8087be36..ad880b8e1 100644
--- a/src/layouts/default/setting/SettingDrawer.tsx
+++ b/src/layouts/default/setting/SettingDrawer.tsx
@@ -65,7 +65,7 @@ const routerTransitionOptions = [
RouterTransitionEnum.ZOOM_FADE,
RouterTransitionEnum.FADE,
RouterTransitionEnum.ZOOM_OUT,
- RouterTransitionEnum.SIDE_FADE,
+ RouterTransitionEnum.FADE_SIDE,
RouterTransitionEnum.FADE_BOTTOM,
].map((item) => {
return {
diff --git a/src/settings/projectSetting.ts b/src/settings/projectSetting.ts
index e38d80979..e5f19efa3 100644
--- a/src/settings/projectSetting.ts
+++ b/src/settings/projectSetting.ts
@@ -104,7 +104,7 @@ const setting: ProjectConfig = {
openRouterTransition: true,
// 路由切换动画
- routerTransition: RouterTransitionEnum.ZOOM_FADE,
+ routerTransition: RouterTransitionEnum.FADE_SIDE,
// 是否开启登录安全校验
openLoginVerify: true,
diff --git a/src/views/demo/feat/msg/index.vue b/src/views/demo/feat/msg/index.vue
index 0819762f3..de1765b9d 100644
--- a/src/views/demo/feat/msg/index.vue
+++ b/src/views/demo/feat/msg/index.vue
@@ -55,7 +55,7 @@
function handleLoading() {
createMessage.loading('Loading...');
}
- function handleConfirm(type: 'warning' | 'error' | 'success') {
+ function handleConfirm(type: 'warning' | 'error' | 'success' | 'info') {
createConfirm({
iconType: type,
title: 'Tip',