@gx-design-vue/pro-layout 0.1.0-alpha.5 → 0.1.0-alpha.6

package/dist/ProLayout.js

@@ -399,12 +399,11 @@ const GProLayout = /* @__PURE__ */ defineComponent((props, { emit, expose, slots
 		headerRightExtra: {
 			type: [
 				Function,
-				Object,
 				String,
 				Number,
-				Boolean,
 				null,
-				Array
+				Object,
+				Boolean
 			],
 			required: false,
 			default: void 0
@@ -420,12 +419,11 @@ const GProLayout = /* @__PURE__ */ defineComponent((props, { emit, expose, slots
 		siderExtra: {
 			type: [
 				Function,
-				Object,
 				String,
 				Number,
-				Boolean,
 				null,
-				Array
+				Object,
+				Boolean
 			],
 			required: false,
 			default: void 0
@@ -457,12 +455,11 @@ const GProLayout = /* @__PURE__ */ defineComponent((props, { emit, expose, slots
 		footer: {
 			type: [
 				Function,
-				Object,
 				String,
 				Number,
-				Boolean,
 				null,
-				Array
+				Object,
+				Boolean
 			],
 			required: false,
 			default: void 0
@@ -470,12 +467,11 @@ const GProLayout = /* @__PURE__ */ defineComponent((props, { emit, expose, slots
 		copyright: {
 			type: [
 				Function,
-				Object,
 				String,
 				Number,
-				Boolean,
 				null,
-				Array
+				Object,
+				Boolean
 			],
 			required: false,
 			default: void 0

package/dist/components/AppPage/index.d.ts

@@ -1,7 +1,7 @@
 import { AppPageSpinning } from "../../interface.js";
 import * as _$vue from "vue";
 import { CSSProperties, PropType, SlotsType } from "vue";
-import * as _$_gx_design_vue_pro_utils0 from "@gx-design-vue/pro-utils";
+import { CustomRender } from "@gx-design-vue/pro-utils";
 import * as _$vue_jsx_runtime0 from "vue/jsx-runtime";
 
 //#region src/components/AppPage/index.d.ts
@@ -12,65 +12,34 @@ import * as _$vue_jsx_runtime0 from "vue/jsx-runtime";
  * ③ 经 GProApp context 向后代下发 emptyText / indicator（供 pro-table 等空态/加载态复用）。
  */
 declare const ProAppPage: _$vue.DefineComponent<_$vue.ExtractPropTypes<{
+  class: PropType<string>;
+  style: PropType<CSSProperties>;
+  prefixCls: PropType<string>;
   spinning: {
     type: PropType<AppPageSpinning>;
     default: () => {};
   };
-  class: {
-    type: StringConstructor;
-    default: any;
-  };
-  prefixCls: {
-    type: StringConstructor;
-    default: any;
-  };
-  style: {
-    type: PropType<CSSProperties>;
-    default: any;
-  };
-  emptyText: {
-    type: PropType<_$_gx_design_vue_pro_utils0.WithFalse<_$_gx_design_vue_pro_utils0.CustomRender>>;
-    default: any;
-  };
   indicator: {
-    type: PropType<_$_gx_design_vue_pro_utils0.WithFalse<_$_gx_design_vue_pro_utils0.CustomRender>>;
+    type: PropType<CustomRender>;
     default: any;
   };
 }>, () => _$vue_jsx_runtime0.JSX.Element, {}, {}, {}, _$vue.ComponentOptionsMixin, _$vue.ComponentOptionsMixin, {}, string, _$vue.PublicProps, Readonly<_$vue.ExtractPropTypes<{
+  class: PropType<string>;
+  style: PropType<CSSProperties>;
+  prefixCls: PropType<string>;
   spinning: {
     type: PropType<AppPageSpinning>;
     default: () => {};
   };
-  class: {
-    type: StringConstructor;
-    default: any;
-  };
-  prefixCls: {
-    type: StringConstructor;
-    default: any;
-  };
-  style: {
-    type: PropType<CSSProperties>;
-    default: any;
-  };
-  emptyText: {
-    type: PropType<_$_gx_design_vue_pro_utils0.WithFalse<_$_gx_design_vue_pro_utils0.CustomRender>>;
-    default: any;
-  };
   indicator: {
-    type: PropType<_$_gx_design_vue_pro_utils0.WithFalse<_$_gx_design_vue_pro_utils0.CustomRender>>;
+    type: PropType<CustomRender>;
     default: any;
   };
 }>> & Readonly<{}>, {
-  emptyText: _$_gx_design_vue_pro_utils0.CustomRender;
-  indicator: _$_gx_design_vue_pro_utils0.CustomRender;
-  prefixCls: string;
+  indicator: CustomRender;
   spinning: AppPageSpinning;
-  class: string;
-  style: CSSProperties;
 }, SlotsType<{
   default: () => any;
-  emptyText: () => any;
   indicator: () => any;
 }>, {}, {}, string, _$vue.ComponentProvideOptions, true, {}, any>;
 //#endregion

package/dist/components/AppPage/index.js

@@ -1,13 +1,11 @@
-import { APP_PAGE_SLOT_KEYS } from "../../interface.js";
 import { provideAppPageContext } from "./context.js";
 import style_default from "./style.js";
 import { computed, createVNode, defineComponent } from "vue";
-import { classNames } from "@gx-design-vue/pro-utils";
+import { useProConfigContext } from "@gx-design-vue/pro-provider";
+import { classNames, getSlotVNode } from "@gx-design-vue/pro-utils";
 import { useBaseConfig } from "antdv-next/config-provider/context";
 import useCSSVarCls from "antdv-next/config-provider/hooks/useCSSVarCls";
 import { GIcon } from "@gx-design-vue/icon";
-import { GProApp, proAppProps } from "@gx-design-vue/pro-app";
-import { useSlotsProps } from "@gx-design-vue/pro-hooks";
 import { GScrollbar } from "@gx-design-vue/scrollbar";
 //#region src/components/AppPage/index.tsx
 const SCROLLBAR_BAR_STYLE = {
@@ -29,10 +27,22 @@ const ProAppPage = /* @__PURE__ */ defineComponent({
 	name: "GProAppPage",
 	inheritAttrs: false,
 	props: {
-		...proAppProps,
+		class: String,
+		style: Object,
+		prefixCls: String,
 		spinning: {
 			type: Object,
 			default: () => ({})
+		},
+		indicator: {
+			type: [
+				Object,
+				Function,
+				Boolean,
+				Array,
+				String
+			],
+			default: void 0
 		}
 	},
 	slots: Object,
@@ -40,37 +50,38 @@ const ProAppPage = /* @__PURE__ */ defineComponent({
 		const { prefixCls } = useBaseConfig("pro-app-page", props);
 		const rootCls = useCSSVarCls(prefixCls);
 		const [hashId, cssVarCls] = style_default(prefixCls, rootCls);
-		const slotRenders = useSlotsProps({
-			slots,
-			props,
-			keys: APP_PAGE_SLOT_KEYS,
-			render: true
-		});
+		const configContext = useProConfigContext();
 		const loading = computed(() => props.spinning?.loading ?? false);
 		provideAppPageContext({ spinning: computed(() => props.spinning?.loading) });
-		const resolvedIndicator = computed(() => slotRenders.value.indicator ?? createVNode(GIcon, {
-			"type": "Spinning",
-			"spin": true,
-			"class": `${prefixCls.value}-spin-dot ${hashId.value}`
-		}, null));
+		const resolvedIndicator = computed(() => {
+			const indicator = getSlotVNode({
+				slots,
+				key: "indicator",
+				props
+			});
+			if (indicator) return indicator;
+			return typeof configContext?.indicator?.value === "function" ? configContext?.indicator?.value?.() : configContext?.indicator?.value || createVNode(GIcon, {
+				"type": "Spinning",
+				"spin": true,
+				"class": `${prefixCls.value}-spin-dot ${hashId.value}`
+			}, null);
+		});
 		const rootClassNames = computed(() => classNames(prefixCls.value, hashId.value, cssVarCls.value, rootCls.value, loading.value && `${prefixCls.value}-loading`, props.class));
 		const maskStyle = computed(() => ({
 			zIndex: props.spinning?.blur ? 999 : void 0,
 			backgroundColor: props.spinning?.blur ? void 0 : "unset",
 			...props.spinning?.style || {}
 		}));
-		return () => createVNode(GProApp, {
+		return () => createVNode("div", {
 			"class": rootClassNames.value,
-			"style": props.style,
-			"emptyText": slotRenders.value.emptyText,
-			"indicator": resolvedIndicator.value
-		}, { default: () => [createVNode(GScrollbar, {
+			"style": props.style
+		}, [createVNode(GScrollbar, {
 			"barStyle": SCROLLBAR_BAR_STYLE,
 			"viewStyle": SCROLLBAR_VIEW_STYLE
 		}, { default: () => [slots.default?.()] }), loading.value && createVNode("div", {
 			"class": classNames(`${prefixCls.value}-blur`, hashId.value),
 			"style": maskStyle.value
-		}, [createVNode("div", { "class": `${prefixCls.value}-spin` }, [resolvedIndicator.value])])] });
+		}, [createVNode("div", { "class": `${prefixCls.value}-spin` }, [resolvedIndicator.value])])]);
 	}
 });
 //#endregion

package/dist/components/Footer/index.js

@@ -41,12 +41,11 @@ const LayoutFooter = /* @__PURE__ */ defineComponent((props, { slots }) => {
 		footer: {
 			type: [
 				Function,
-				Object,
 				String,
 				Number,
-				Boolean,
 				null,
-				Array
+				Object,
+				Boolean
 			],
 			required: false,
 			default: void 0
@@ -54,12 +53,11 @@ const LayoutFooter = /* @__PURE__ */ defineComponent((props, { slots }) => {
 		copyrightRender: {
 			type: [
 				Function,
-				Object,
 				String,
 				Number,
-				Boolean,
 				null,
-				Array
+				Object,
+				Boolean
 			],
 			required: false,
 			default: void 0

package/dist/components/FooterToolbar/index.js

@@ -66,12 +66,11 @@ const GFooterToolbar = /* @__PURE__ */ defineComponent((props, { slots }) => {
 		extra: {
 			type: [
 				Function,
-				Object,
 				String,
 				Number,
-				Boolean,
 				null,
-				Array
+				Object,
+				Boolean
 			],
 			required: false,
 			default: void 0

package/dist/components/PageContainer/index.js

@@ -241,12 +241,11 @@ const ProPageContainer = /* @__PURE__ */ defineComponent((props, { slots, emit }
 		header: {
 			type: [
 				Function,
-				Object,
 				String,
 				Number,
-				Boolean,
 				null,
-				Array
+				Object,
+				Boolean
 			],
 			required: false,
 			default: void 0
@@ -254,12 +253,11 @@ const ProPageContainer = /* @__PURE__ */ defineComponent((props, { slots, emit }
 		headerContent: {
 			type: [
 				Function,
-				Object,
 				String,
 				Number,
-				Boolean,
 				null,
-				Array
+				Object,
+				Boolean
 			],
 			required: false,
 			default: void 0
@@ -267,12 +265,11 @@ const ProPageContainer = /* @__PURE__ */ defineComponent((props, { slots, emit }
 		extra: {
 			type: [
 				Function,
-				Object,
 				String,
 				Number,
-				Boolean,
 				null,
-				Array
+				Object,
+				Boolean
 			],
 			required: false,
 			default: void 0
@@ -284,12 +281,11 @@ const ProPageContainer = /* @__PURE__ */ defineComponent((props, { slots, emit }
 		footer: {
 			type: [
 				Function,
-				Object,
 				String,
 				Number,
-				Boolean,
 				null,
-				Array
+				Object,
+				Boolean
 			],
 			required: false,
 			default: void 0

package/dist/hooks/useLayoutBase.d.ts

@@ -38,13 +38,13 @@ declare function useLayoutBase(props?: {
   selectedKeys: _$vue.ComputedRef<string[]>;
   openKeys: _$vue.ComputedRef<string[]>;
   proClasses: _$vue.ComputedRef<{
+    header?: string;
+    sider?: string;
+    content?: string;
     siderHeader?: string;
     siderFooter?: string;
     breadcrumb?: string;
     footer?: string;
-    header?: string;
-    content?: string;
-    sider?: string;
     root?: string;
     siderChildren?: string;
     logo?: string;
@@ -53,13 +53,13 @@ declare function useLayoutBase(props?: {
     tabs?: string;
   }>;
   proStyles: _$vue.ComputedRef<{
+    header?: _$vue.CSSProperties;
+    sider?: _$vue.CSSProperties;
+    content?: _$vue.CSSProperties;
     siderHeader?: _$vue.CSSProperties;
     siderFooter?: _$vue.CSSProperties;
     breadcrumb?: _$vue.CSSProperties;
     footer?: _$vue.CSSProperties;
-    header?: _$vue.CSSProperties;
-    content?: _$vue.CSSProperties;
-    sider?: _$vue.CSSProperties;
     root?: _$vue.CSSProperties;
     siderChildren?: _$vue.CSSProperties;
     logo?: _$vue.CSSProperties;