diff --git a/package.json b/package.json
index 9a3707ab..6976a7c2 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
"event-source-polyfill": "^1.0.31",
"global": "^4.4.0",
"jetlinks-store": "^0.0.3",
- "jetlinks-ui-components": "^1.0.34-3",
+ "jetlinks-ui-components": "^1.0.34-4",
"js-cookie": "^3.0.1",
"jsencrypt": "^3.3.2",
"less": "^4.1.3",
diff --git a/src/components/Layout/BasicLayoutPage.vue b/src/components/Layout/BasicLayoutPage.vue
index d3be17e0..dbabb304 100644
--- a/src/components/Layout/BasicLayoutPage.vue
+++ b/src/components/Layout/BasicLayoutPage.vue
@@ -25,9 +25,11 @@
-
-
-
+
+
+
+
+
@@ -40,6 +42,7 @@ import { clearMenuItem } from 'jetlinks-ui-components/es/ProLayout/util';
import { AccountMenu } from '@/router/menu'
import { useSystem } from '@/store/system';
import { storeToRefs } from 'pinia';
+import { useSlots } from 'vue'
type StateType = {
collapsed: boolean;
@@ -55,7 +58,7 @@ const menu = useMenuStore();
const system = useSystem();
const {configInfo,layout, basicLayout} = storeToRefs(system);
-
+const slots = useSlots()
const layoutConf = reactive({
theme: DefaultSetting.layout.theme,
siderWidth: layout.value.siderWidth,
diff --git a/src/hook/index.ts b/src/hook/index.ts
new file mode 100644
index 00000000..f222b03e
--- /dev/null
+++ b/src/hook/index.ts
@@ -0,0 +1 @@
+export * from './useRequest'
diff --git a/src/hook/useRequest.ts b/src/hook/useRequest.ts
new file mode 100644
index 00000000..6d2d9c03
--- /dev/null
+++ b/src/hook/useRequest.ts
@@ -0,0 +1,92 @@
+import {onUnmounted, ref} from 'vue'
+import type { Ref } from 'vue'
+import {isFunction, get, isArray} from 'lodash-es'
+import type { AxiosResponseRewrite } from '@/utils/request'
+
+interface RequestOptions {
+ immediate: boolean
+ /**
+ * 成功回调
+ * @param data
+ * @returns
+ */
+ onSuccess: (data: AxiosResponseRewrite) => S | void
+ /**
+ * 返回参数处理
+ * @returns
+ */
+ formatName: string | [string]
+ onError: (e: any) => void
+
+ defaultParams: S | any | any[]
+
+ handleResponse: (data: any) => any
+}
+
+const defaultOptions: any = {
+ immediate: true,
+ formatName: 'result'
+}
+
+type Run = (...args: any[]) => void
+
+export const useRequest = (
+ request: (...args: any[]) => Promise>,
+ options: Partial> = defaultOptions,
+): {
+ data: Ref,
+ loading: Ref,
+ run: Run
+} => {
+ const data = ref()
+ const loading = ref(false)
+ const _options = {
+ ...defaultOptions,
+ ...options
+ }
+
+ async function run(...arg: any[]) {
+ if (request && isFunction(request)) {
+ loading.value = true
+ try {
+ // @ts-ignore
+ const resp = await request.apply(this, arg)
+
+ loading.value = false
+
+ if (resp?.success) {
+ const successData = await _options.onSuccess?.(resp)
+ data.value = successData || get(resp, _options.formatName!)
+ // console.log(data.value)
+ } else {
+ _options.onError?.(resp)
+ }
+ } catch (e) {
+ loading.value = false
+ _options.onError?.(e)
+ }
+ }
+ }
+
+ if (_options.immediate) { // 主动触发
+ if (_options.defaultParams) {
+ isArray(_options.defaultParams) ? run(..._options.defaultParams) : run(_options.defaultParams)
+ } else {
+ run()
+ }
+ }
+
+ onUnmounted(() => {
+ // 销毁时，撤销该请求
+ if (request && isFunction(request)) {
+
+ }
+ // request()
+ })
+
+ return {
+ data,
+ loading,
+ run
+ }
+}
diff --git a/src/store/menu.ts b/src/store/menu.ts
index 4de3f268..60d12fb0 100644
--- a/src/store/menu.ts
+++ b/src/store/menu.ts
@@ -12,7 +12,7 @@ import router from '@/router'
import { onlyMessage } from '@/utils/comm'
import { AccountMenu, NotificationRecordCode, NotificationSubscriptionCode } from '@/router/menu'
import { USER_CENTER_MENU_CODE } from '@/utils/consts'
-import { isNoCommunity } from "@/utils/utils";
+import {isNoCommunity} from "@/utils/utils";
const defaultOwnParams = [
{
@@ -139,4 +139,4 @@ export const useMenuStore = defineStore({
})
}
}
-})
\ No newline at end of file
+})
diff --git a/src/utils/menu.ts b/src/utils/menu.ts
index d36f7dbb..80ad2814 100644
--- a/src/utils/menu.ts
+++ b/src/utils/menu.ts
@@ -1,7 +1,7 @@
import { BlankLayoutPage, BasicLayoutPage, SinglePage } from 'components/Layout'
import { isNoCommunity } from '@/utils/utils'
import Iframe from '../views/iframe/index.vue'
-import { h } from 'vue'
+import { shallowRef, defineAsyncComponent, h } from 'vue'
const pagesComponent = import.meta.glob('../views/**/*.vue');
@@ -156,192 +156,6 @@ const extraRouteObj = {
}
};
-//
-// const resolveComponent = (name: any) => {
-// const importPage = pagesComponent[`../views/${name}/index.vue`];
-// console.log(importPage)
-// if (!importPage) {
-// return undefined
-// } else {
-// const res = () => importPage()
-// return res
-// }
-// //@ts-ignore
-// }
-//
-// const findChildrenRoute = (code: string, url: string, routes: any[] = []): MenuItem[] => {
-// if (extraRouteObj[code]) {
-// const extraRoutes = extraRouteObj[code].children.map((route: MenuItem) => {
-// return {
-// url: `${url}/${route.code}`,
-// code: `${code}/${route.code}`,
-// name: route.name,
-// isShow: false
-// }
-// })
-// return [...routes, ...extraRoutes]
-// }
-// return routes
-// }
-//
-// const findDetailRouteItem = (code: string, url: string): Partial