路由视图 - {viewData?.title || '未命名'}
+
+ {!isPage && }
diff --git a/web/src/app/studio/index.tsx b/web/src/app/studio/index.tsx
index 35c9bbe..47eed40 100644
--- a/web/src/app/studio/index.tsx
+++ b/web/src/app/studio/index.tsx
@@ -237,7 +237,7 @@ export const App = () => {
diff --git a/web/src/app/studio/store.ts b/web/src/app/studio/store.ts
index 29d4c23..a040651 100644
--- a/web/src/app/studio/store.ts
+++ b/web/src/app/studio/store.ts
@@ -1,14 +1,16 @@
'use client';
import { create } from 'zustand';
import { QueryProxy, RouterViewData, RouterViewItem, pickRouterViewData } from '@kevisual/api'
-import { query } from '@/modules/query.ts'
+import { getUrl, query } from '@/modules/query.ts'
import { toast } from 'react-toastify';
import { use } from '@kevisual/context'
-import { MyCache } from '@kevisual/cache'
+// import { MyCache } from '@kevisual/cache'
import { persist } from 'zustand/middleware';
import { app } from '@/agent/index.ts'
import { cloneDeep, random } from 'es-toolkit'
import { nanoid } from 'nanoid';
+import { filter } from '@kevisual/js-filter';
+import Fuse from 'fuse.js';
const historyReplace = (url: string) => {
if (window.history.replaceState) {
window.history.replaceState(null, '', url);
@@ -30,7 +32,7 @@ interface StudioState {
setLoading: (loading: boolean) => void;
routes: Array
;
searchRoutes: (keyword: string) => Promise;
- run: (route: RouteItem) => Promise;
+ run: (route: RouteItem, type?: 'normal' | 'custom') => Promise;
queryProxy?: QueryProxy;
init: (force?: boolean) => Promise<{ queryProxy: QueryProxy }>;
routeViewList: RouteViewList;
@@ -64,8 +66,20 @@ export const useStudioStore = create()(
searchRoutes: async (keyword: string) => {
const state = await get().init();
let queryProxy = state.queryProxy;
- const routes: any[] = await queryProxy.listRoutes(() => true, { query: keyword });
- set({ routes });
+ console.log('搜索路由', keyword);
+ // const routes: any[] = await queryProxy.listRoutes(() => true, { query: keyword });
+ if (keyword.toLocaleUpperCase().startsWith('WHERE')) {
+ const routes = filter(queryProxy.router.routes, keyword);
+ set({ routes });
+ } else {
+ const fuse = new Fuse(queryProxy.router.routes, {
+ keys: ['path', 'key', 'description'],
+ threshold: 0.4,
+ });
+ const result = fuse.search(keyword);
+ const routes = result.map(r => r.item) as any[];
+ set({ routes });
+ }
},
currentView: undefined,
queryRouteList: async () => {
@@ -152,10 +166,11 @@ export const useStudioStore = create()(
set({ routeViewList: [...newList] });
console.log('删除视图项', id, newList);
},
- run: async (route: RouteItem) => {
+ run: async (route: RouteItem, type?: 'normal' | 'custom') => {
const state = await get().init();
+ const isCustom = type === 'custom';
let queryProxy = state.queryProxy;
- const showRightPanel = get().showRightPanel;
+ let showRightPanel = get().showRightPanel;
const action = {
path: route.path,
key: route.key
@@ -164,7 +179,14 @@ export const useStudioStore = create()(
if (res.code !== 200) {
toast.error(`运行失败：${res.message || '未知错误'}`);
} else if (res.code === 200) {
- //
+ if (!showRightPanel) {
+ if (isCustom) {
+ showRightPanel = true;
+ set({ showRightPanel: true });
+ } else {
+ toast.success('运行成功');
+ }
+ }
}
if (showRightPanel) {
if (route.metadata && route.metadata?.viewItem) {
@@ -190,6 +212,14 @@ export const useStudioStore = create()(
return { queryProxy };
}
let currentView: RouterViewData | undefined = get().currentView;
+ let url = '/api/router';
+ const _url = new URL(location.href)
+ const pathname = _url.pathname
+ const [user, repo] = pathname.split('/').filter(Boolean)
+ if (repo === 'v1') {
+ url = pathname;
+ }
+ console.log('初始化 QueryProxy，URL:', url);
// @ts-ignore
const routerViewData: RouterViewData = currentView || {
_id: nanoid(16),
@@ -206,7 +236,7 @@ export const useStudioStore = create()(
description: '',
type: 'api',
api: {
- url: '/api/router'
+ url: url
}
}
]
diff --git a/web/src/app/view/components/DataItemForm.tsx b/web/src/app/view/components/DataItemForm.tsx
index 5ef1467..1977d96 100644
--- a/web/src/app/view/components/DataItemForm.tsx
+++ b/web/src/app/view/components/DataItemForm.tsx
@@ -2,7 +2,7 @@ import { Label } from "@/components/ui/label"
import { Input } from "@/components/ui/input"
import { Checkbox } from "@/components/ui/checkbox"
import { Query } from "@kevisual/query"
-import { QueryRouterServer } from "@kevisual/router"
+import { QueryRouterServer } from "@kevisual/router/browser"
import { nanoid } from "nanoid"
export type RouterViewItem = RouterViewApi | RouterViewContext | RouterViewWorker;
@@ -72,7 +72,7 @@ export const DataItemForm = ({ item, onChange, onRemove }: DataItemFormProps) =>
}
const handleNestedChange = (parent: string, field: string, value: any) => {
- const parentValue = item[parent as keyof RouterViewItem] as Record | undefined
+ const parentValue = item[parent as keyof RouterViewItem] as any
const newParentValue: Record = {
...(parentValue || {}),
[field]: value
@@ -81,7 +81,7 @@ export const DataItemForm = ({ item, onChange, onRemove }: DataItemFormProps) =>
}
const handleNestedDeepChange = (parent: string, nestedParent: string, field: string, value: any) => {
- const parentValue = item[parent as keyof RouterViewItem] as Record | undefined
+ const parentValue = item[parent as keyof RouterViewItem] as any
const nestedValue = parentValue?.[nestedParent] as Record | undefined
const newNestedValue: Record = {
...(nestedValue || {}),
diff --git a/web/src/components/ui/sonner.tsx b/web/src/components/ui/sonner.tsx
new file mode 100644
index 0000000..9b20afe
--- /dev/null
+++ b/web/src/components/ui/sonner.tsx
@@ -0,0 +1,40 @@
+"use client"
+
+import {
+ CircleCheckIcon,
+ InfoIcon,
+ Loader2Icon,
+ OctagonXIcon,
+ TriangleAlertIcon,
+} from "lucide-react"
+import { useTheme } from "next-themes"
+import { Toaster as Sonner, type ToasterProps } from "sonner"
+
+const Toaster = ({ ...props }: ToasterProps) => {
+ const { theme = "system" } = useTheme()
+
+ return (
+ ,
+ info: ,
+ warning: ,
+ error: ,
+ loading: ,
+ }}
+ style={
+ {
+ "--normal-bg": "var(--popover)",
+ "--normal-text": "var(--popover-foreground)",
+ "--normal-border": "var(--border)",
+ "--border-radius": "var(--radius)",
+ } as React.CSSProperties
+ }
+ {...props}
+ />
+ )
+}
+
+export { Toaster }
diff --git a/web/src/modules/query.ts b/web/src/modules/query.ts
index 1df7af3..c93b7d8 100644
--- a/web/src/modules/query.ts
+++ b/web/src/modules/query.ts
@@ -1,8 +1,9 @@
'use client';
import { QueryClient } from '@kevisual/query'
-const getUrl = () => {
- const _url = new URL(window.location.href)
+export const getUrl = () => {
+ if (typeof window === 'undefined') return '/client/router';
+ const _url = new URL(location.href)
const pathname = _url.pathname
const [user, repo] = pathname.split('/').filter(Boolean)
if (repo === 'v1') {
diff --git a/web/src/proxy.ts b/web/src/proxy.ts
index f0f4014..35ca497 100644
--- a/web/src/proxy.ts
+++ b/web/src/proxy.ts
@@ -46,12 +46,19 @@ async function proxyRequest(request: NextRequest, targetHost: string): Promise