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

package/dist/RightContent/Search/Panel.js

@@ -1,10 +1,10 @@
 import { searchMenuItems, uniqueByField } from "../utils.js";
-import { Fragment, cloneVNode, createVNode, defineComponent, nextTick, onMounted, ref, unref, watch } from "vue";
-import { CloseOutlined } from "@antdv-next/icons";
-import { classNames, getPrefixCls, isArray, isString, isUrl } from "@gx-design-vue/pro-utils";
+import { Fragment, createVNode, defineComponent, nextTick, onMounted, ref, unref, watch } from "vue";
+import { GIcon } from "@gx-design-vue/icon";
+import { classNames, getPrefixCls, isString, isUrl } from "@gx-design-vue/pro-utils";
 import { onKeyStroke, useLocalStorage, useThrottleFn } from "@vueuse/core";
 import { Empty } from "antdv-next";
-import { useProAppContext } from "@gx-design-vue/pro-app";
+import { useProConfigContext } from "@gx-design-vue/pro-provider";
 import { cloneDeep } from "es-toolkit";
 import { useRouter } from "vue-router";
 //#region src/RightContent/Search/Panel.tsx
@@ -17,7 +17,7 @@ const NoResult = ({ className, value, locale }) => {
 };
 const GSearchPanel = /* @__PURE__ */ defineComponent((props) => {
 	const router = useRouter();
-	const { emptyText } = useProAppContext();
+	const { renderEmpty } = useProConfigContext();
 	const searchHistory = useLocalStorage(props.historyKey || getPrefixCls({
 		suffixCls: "search-history",
 		isPro: true
@@ -86,19 +86,16 @@ const GSearchPanel = /* @__PURE__ */ defineComponent((props) => {
 	}
 	const getClassNames = (name) => classNames(`${props.className}${name ? `-${name}` : ""}`, props.hashId);
 	return () => {
-		const emptyTextRender = isArray(emptyText.value) ? emptyText.value : [emptyText.value];
 		return createVNode(Fragment, null, [searchResults.value.length > 0 ? createVNode(Fragment, null, [searchHistory.value.length > 0 && !props.keyword && createVNode("div", { "class": getClassNames("panel-title") }, [props.locale.searchHistory]), createVNode("div", { "class": getClassNames("panel-list") }, [uniqueByField(searchResults.value, "name").map((item, index) => createVNode("div", {
 			"key": item.name,
 			"class": getClassNames(classNames("panel-item", index === activeIndex.value && "active")),
 			"data-search-item": index,
 			"onClick": () => handleEnter(),
 			"onMouseenter": () => handleMouseenter(index)
-		}, [createVNode("div", { "class": getClassNames("panel-item-left") }, [item.meta?.title]), searchHistory.value.length > 0 && !props.keyword && createVNode(CloseOutlined, { "onClick": (e) => removeItem(e, item) }, null)]))])]) : emptyText.value ? emptyTextRender.map((node) => {
-			return cloneVNode(node, {
-				...props.emptyProps,
-				text: props.keyword ? props.locale.noResult?.(props.keyword) : true
-			});
-		}) : createVNode(NoResult, {
+		}, [createVNode("div", { "class": getClassNames("panel-item-left") }, [item.meta?.title]), searchHistory.value.length > 0 && !props.keyword && createVNode(GIcon, {
+			"type": "CloseOutlined",
+			"onClick": (e) => removeItem(e, item)
+		}, null)]))])]) : renderEmpty.value?.() || createVNode(NoResult, {
 			"className": getClassNames("result"),
 			"value": props.keyword,
 			"locale": props.locale

package/dist/RightContent/Search/index.js

@@ -1,7 +1,7 @@
 import GSearchPanel from "./Panel.js";
 import style_default from "./style.js";
 import { Fragment, computed, createTextVNode, createVNode, defineComponent, mergeProps, nextTick, ref } from "vue";
-import { ArrowUpOutlined, EnterOutlined, SearchOutlined } from "@antdv-next/icons";
+import { GIcon } from "@gx-design-vue/icon";
 import { useInjectLayoutContext } from "@gx-design-vue/pro-layout";
 import { classNames, getLevelData, isWindowsOs } from "@gx-design-vue/pro-utils";
 import { useMagicKeys, whenever } from "@vueuse/core";
@@ -10,9 +10,12 @@ import { useBaseConfig } from "antdv-next/config-provider/context";
 import useCSSVarCls from "antdv-next/config-provider/hooks/useCSSVarCls";
 import { GProModal } from "@gx-design-vue/pro-modal";
 //#region src/RightContent/Search/index.tsx
-const ModalFooter = ({ className, hashId, locale }) => createVNode("div", { "class": classNames(`${className}-footer`, hashId) }, [createVNode("div", { "class": classNames(`${className}-footer-icon`, hashId) }, [createVNode(EnterOutlined, null, null), locale.selectLabel]), createVNode("div", { "class": classNames(`${className}-footer-icon`, hashId) }, [
-	createVNode(ArrowUpOutlined, null, null),
-	createVNode(ArrowUpOutlined, { "rotate": 180 }, null),
+const ModalFooter = ({ className, hashId, locale }) => createVNode("div", { "class": classNames(`${className}-footer`, hashId) }, [createVNode("div", { "class": classNames(`${className}-footer-icon`, hashId) }, [createVNode(GIcon, { "type": "EnterOutlined" }, null), locale.selectLabel]), createVNode("div", { "class": classNames(`${className}-footer-icon`, hashId) }, [
+	createVNode(GIcon, { "type": "ArrowUpOutlined" }, null),
+	createVNode(GIcon, {
+		"type": "ArrowUpOutlined",
+		"rotate": 180
+	}, null),
 	locale.navigateLabel
 ])]);
 const GSearchInput = /* @__PURE__ */ defineComponent((props) => {
@@ -55,7 +58,7 @@ const GSearchInput = /* @__PURE__ */ defineComponent((props) => {
 				open.value = true;
 			}
 		}, [
-			createVNode(SearchOutlined, null, null),
+			createVNode(GIcon, { "type": "SearchOutlined" }, null),
 			createVNode("span", { "class": classNames(`${prefixCls.value}-word`, hashId.value) }, [props.locale.searchLabel]),
 			createVNode("span", { "class": classNames(`${prefixCls.value}-word-icon`, hashId.value) }, [
 				createTextVNode("⌘"),
@@ -81,10 +84,11 @@ const GSearchInput = /* @__PURE__ */ defineComponent((props) => {
 				"size": "large",
 				"placeholder": props.locale.searchPlaceholder,
 				"value": keyword.value,
+				"prefix": createVNode(GIcon, { "type": "SearchOutlined" }, null),
 				"onUpdate:value": (val) => {
 					keyword.value = val;
 				}
-			}, { prefix: () => createVNode(SearchOutlined, null, null) }),
+			}, null),
 			"open": open.value,
 			"footer": createVNode(ModalFooter, {
 				"className": modalClass,

package/dist/RightContent/index.js

@@ -3,7 +3,6 @@ import GSearchInput from "./Search/index.js";
 import style_default from "./style.js";
 import { defaultThemeOptions } from "./themeOptions.js";
 import { Fragment, computed, createVNode, defineComponent, mergeProps, ref, watch } from "vue";
-import { CompressOutlined, ExpandOutlined, LockOutlined, LogoutOutlined, SettingOutlined, UserOutlined } from "@antdv-next/icons";
 import { useThemeContext } from "@gx-design-vue/context";
 import { GIcon } from "@gx-design-vue/icon";
 import { useInjectLayoutContext } from "@gx-design-vue/pro-layout";
@@ -59,14 +58,14 @@ const RightContent = /* @__PURE__ */ defineComponent((props, { emit, slots }) =>
 		if (actions.value.lock && slots.lock) {
 			items.push({
 				key: "lock",
-				icon: () => createVNode(LockOutlined, null, null),
+				icon: () => createVNode(GIcon, { "type": "LockOutlined" }, null),
 				label: mergedLocale.value.lockScreen
 			});
 			items.push({ type: "divider" });
 		}
 		items.push({
 			key: "logout",
-			icon: () => createVNode(LogoutOutlined, null, null),
+			icon: () => createVNode(GIcon, { "type": "LogoutOutlined" }, null),
 			label: mergedLocale.value.logout
 		});
 		return items;
@@ -83,7 +82,6 @@ const RightContent = /* @__PURE__ */ defineComponent((props, { emit, slots }) =>
 	}
 	return () => {
 		const actionClassNames = [`${prefixCls.value}-header-actions-item`, hashId.value];
-		const FullScreenIcon = isFullscreen.value ? CompressOutlined : ExpandOutlined;
 		return createVNode("div", {
 			"ref": containerRef,
 			"class": classNames(prefixCls.value, hashId.value, cssVarCls.value, rootCls.value),
@@ -112,17 +110,23 @@ const RightContent = /* @__PURE__ */ defineComponent((props, { emit, slots }) =>
 				}
 			}, { default: () => [createVNode(GIcon, {
 				"class": classNames(`${prefixCls.value}-header-actions-icon`, hashId.value),
-				"type": isDark.value ? "Moon" : "Sunny"
+				"type": isDark.value ? "Moon" : "Sun"
 			}, null)] })]),
-			actions.value.themeEditor && !isMobile.value && createVNode("div", { "class": classNames(actionClassNames) }, [createVNode(SettingOutlined, { "onClick": () => handleActionClick("themeEditor") }, null)]),
-			actions.value.fullScreen && !isMobile.value && createVNode("div", { "class": classNames(actionClassNames) }, [createVNode(FullScreenIcon, { "onClick": () => toggleFullscreen() }, null)]),
+			actions.value.themeEditor && !isMobile.value && createVNode("div", { "class": classNames(actionClassNames) }, [createVNode(GIcon, {
+				"type": "SettingOutlined",
+				"onClick": () => handleActionClick("themeEditor")
+			}, null)]),
+			actions.value.fullScreen && !isMobile.value && createVNode("div", { "class": classNames(actionClassNames) }, [createVNode(GIcon, {
+				"type": isFullscreen.value ? "CompressOutlined" : "ExpandOutlined",
+				"onClick": () => toggleFullscreen()
+			}, null)]),
 			slots.actionsRender?.(actionClassNames)
 		]), createVNode(Dropdown, mergeProps({ "placement": "bottomRight" }, props.dropdownProps, { "menu": slots.dropdownMenu ? void 0 : {
 			items: userMenuItems.value,
 			onClick: handleUserMenuClick
 		} }), { default: () => [slots.dropdownTrigger ? slots.dropdownTrigger() : createVNode("div", { "class": classNames(`${prefixCls.value}-header-actions-avatar`, hashId.value) }, [createVNode(Avatar, {
 			"size": 28,
-			"icon": createVNode(UserOutlined, null, null)
+			"icon": createVNode(GIcon, { "type": "UserOutlined" }, null)
 		}, null), props.name && createVNode("span", { "class": classNames(`${prefixCls.value}-header-actions-name`, hashId.value) }, [props.name])])] })])]), slots.lock?.({
 			open: lockOpen.value,
 			onOpenChange: handleLockOpenChange

package/dist/RightContent/themeOptions.js

@@ -1,5 +1,4 @@
 import { createVNode, h } from "vue";
-import { DesktopOutlined } from "@antdv-next/icons";
 import { GIcon } from "@gx-design-vue/icon";
 //#region src/RightContent/themeOptions.tsx
 const iconStyle = { fontSize: "15px" };
@@ -21,13 +20,16 @@ const defaultThemeOptions = [
 	{
 		value: "dark",
 		label: labelWithIcon(h(GIcon, {
-			type: "Sunny",
+			type: "Sun",
 			style: iconStyle
 		}), "深色")
 	},
 	{
 		value: "system",
-		label: labelWithIcon(h(DesktopOutlined, { style: iconStyle }), "自动")
+		label: labelWithIcon(h(GIcon, {
+			type: "DesktopOutlined",
+			style: iconStyle
+		}), "自动")
 	}
 ];
 //#endregion