-
}
+ spinning={true}
class={[
`${prefixCls}-image`,
- imgState.status === StatueEnum.LOADING ? '' : 'hidden',
+ {
+ hidden: imgState.status !== StatueEnum.LOADING,
+ },
]}
/>
![]()
) => {
+ if (!key) return '';
return t(getKey(key), ...arg);
},
};
diff --git a/src/layouts/default/content/index.less b/src/layouts/default/content/index.less
index 42bd51b6..6912f98d 100644
--- a/src/layouts/default/content/index.less
+++ b/src/layouts/default/content/index.less
@@ -14,10 +14,6 @@
position: absolute;
z-index: @page-loading-z-index;
- &.fill {
- background: rgba(240, 242, 245) !important;
- }
-
> .basic-loading {
margin-bottom: 15%;
}
diff --git a/src/layouts/default/content/index.tsx b/src/layouts/default/content/index.tsx
index 03544998..464e58f5 100644
--- a/src/layouts/default/content/index.tsx
+++ b/src/layouts/default/content/index.tsx
@@ -1,31 +1,25 @@
import './index.less';
-import { defineComponent, unref, computed } from 'vue';
-import { FullLoading } from '/@/components/Loading/index';
+import { defineComponent, unref } from 'vue';
+import { Loading } from '/@/components/Loading';
import { RouterView } from 'vue-router';
import { useRootSetting } from '/@/hooks/setting/useRootSetting';
import { useTransitionSetting } from '/@/hooks/setting/useTransitionSetting';
-import { useMultipleTabSetting } from '/@/hooks/setting/useMultipleTabSetting';
export default defineComponent({
name: 'LayoutContent',
setup() {
const { getOpenPageLoading } = useTransitionSetting();
- const { getShowMultipleTab } = useMultipleTabSetting();
const { getLayoutContentMode, getPageLoading } = useRootSetting();
- const getLoadingClass = computed(() => {
- return [
- `layout-content__loading`,
- { fill: unref(getShowMultipleTab), hidden: !unref(getPageLoading) },
- ];
- });
return () => {
return (
- {unref(getOpenPageLoading) && }
+ {unref(getOpenPageLoading) && (
+
+ )}
);
diff --git a/src/layouts/page/index.tsx b/src/layouts/page/index.tsx
index f94a02e5..24e8551f 100644
--- a/src/layouts/page/index.tsx
+++ b/src/layouts/page/index.tsx
@@ -22,6 +22,7 @@ export default defineComponent({
name: 'PageLayout',
setup() {
const { getShowMenu } = useMenuSetting();
+
const { getOpenKeepAlive, getCanEmbedIFramePage } = useRootSetting();
const { getBasicTransition, getEnableTransition } = useTransitionSetting();
diff --git a/src/locales/lang/en/routes/demo/comp.ts b/src/locales/lang/en/routes/demo/comp.ts
index 029d7287..4099ef12 100644
--- a/src/locales/lang/en/routes/demo/comp.ts
+++ b/src/locales/lang/en/routes/demo/comp.ts
@@ -24,4 +24,6 @@ export default {
qrcode: 'QR code',
strength: 'Password strength',
upload: 'Upload',
+
+ loading: 'Loading',
};
diff --git a/src/locales/lang/zh_CN/routes/demo/comp.ts b/src/locales/lang/zh_CN/routes/demo/comp.ts
index 13d8345a..cf49f6c4 100644
--- a/src/locales/lang/zh_CN/routes/demo/comp.ts
+++ b/src/locales/lang/zh_CN/routes/demo/comp.ts
@@ -24,4 +24,6 @@ export default {
qrcode: '二维码组件',
strength: '密码强度组件',
upload: '上传组件',
+
+ loading: 'Loading',
};
diff --git a/src/router/menus/modules/demo/comp.ts b/src/router/menus/modules/demo/comp.ts
index 81858a4f..6b467693 100644
--- a/src/router/menus/modules/demo/comp.ts
+++ b/src/router/menus/modules/demo/comp.ts
@@ -44,6 +44,10 @@ const menu: MenuModule = {
path: 'upload',
name: 'routes.demo.comp.upload',
},
+ {
+ path: 'loading',
+ name: 'routes.demo.comp.loading',
+ },
{
path: 'scroll',
name: 'routes.demo.comp.scroll',
diff --git a/src/router/routes/modules/demo/comp.ts b/src/router/routes/modules/demo/comp.ts
index 8cc0e577..b5dc6271 100644
--- a/src/router/routes/modules/demo/comp.ts
+++ b/src/router/routes/modules/demo/comp.ts
@@ -178,6 +178,14 @@ const comp: AppRouteModule = {
title: 'routes.demo.comp.upload',
},
},
+ {
+ path: '/loading',
+ name: 'LoadingDemo',
+ component: () => import('/@/views/demo/comp/loading/index.vue'),
+ meta: {
+ title: 'routes.demo.comp.loading',
+ },
+ },
],
};
diff --git a/src/setup/ant-design-vue/index.ts b/src/setup/ant-design-vue/index.ts
index 15ee4a64..d16f7cc8 100644
--- a/src/setup/ant-design-vue/index.ts
+++ b/src/setup/ant-design-vue/index.ts
@@ -12,8 +12,6 @@ import {
} from 'ant-design-vue';
import 'ant-design-vue/dist/antd.css';
-import './spin';
-
export function setupAntd(app: App
) {
// need
// Here are the components required before registering and logging in
diff --git a/src/setup/ant-design-vue/spin.tsx b/src/setup/ant-design-vue/spin.tsx
deleted file mode 100644
index 5cfae8b1..00000000
--- a/src/setup/ant-design-vue/spin.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Spin } from 'ant-design-vue';
-import svgImg from '/@/assets/images/loading.svg';
-
-Spin.setDefaultIndicator({
- indicator: () => {
- return (
-
-
-
+
+
全屏 Loading
+
容器内 Loading
+
+
+
+
+
全屏 Loading
+
容器内 Loading
+
+
+
+ 打开指令Loading
+
+
- 
- 
- {{ tip }}
-