From 952edee24d644125355f8f2ff8e8524105b91536 Mon Sep 17 00:00:00 2001 From: liamzi Date: Mon, 13 Jan 2025 18:29:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9env?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 6 ++++-- src/config/supabase.js | 4 ++-- src/hooks/aichat.jsx | 8 ++++---- src/hooks/resource/useResource.js | 7 +++++-- src/pages/resource/role/index.jsx | 7 +++++++ .../resource/team/components/ExpandedMemberships.jsx | 10 +++++++--- src/routes/routes.js | 7 +++++++ 7 files changed, 36 insertions(+), 13 deletions(-) create mode 100644 src/pages/resource/role/index.jsx diff --git a/.env b/.env index a573941..5bee461 100644 --- a/.env +++ b/.env @@ -1,6 +1,8 @@ VITE_SUPABASE_URL=https://base.uppmkt.com -VITE_SUPABASE_ANON_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyAgCiAgICAicm9sZSI6ICJzZXJ2aWNlX3JvbGUiLAogICAgImlzcyI6ICJzdXBhYmFzZS1kZW1vIiwKICAgICJpYXQiOiAxNjQxNzY5MjAwLAogICAgImV4cCI6IDE3OTk1MzU2MDAKfQ.DaYlNEoUrrEn2Ig7tqibS-PHK5vgusbcbo7X36XVt4Q VITE_DIFY_API_KEY=app-OK28lKfA6Ib82K0B4vwZcsXK - +# 前端用户 +VITE_SUPABASE_ANON_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyAgCiAgICAicm9sZSI6ICJhbm9uIiwKICAgICJpc3MiOiAic3VwYWJhc2UtZGVtbyIsCiAgICAiaWF0IjogMTY0MTc2OTIwMCwKICAgICJleHAiOiAxNzk5NTM1NjAwCn0.dc_X5iR_VP_qT0zsiyj_I_OZ2T9FtRU2BBNWN8Bu4GE +# 后端用户 +VITE_SUPABASE_ADMIN_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyAgCiAgICAicm9sZSI6ICJzZXJ2aWNlX3JvbGUiLAogICAgImlzcyI6ICJzdXBhYmFzZS1kZW1vIiwKICAgICJpYXQiOiAxNjQxNzY5MjAwLAogICAgImV4cCI6IDE3OTk1MzU2MDAKfQ.DaYlNEoUrrEn2Ig7tqibS-PHK5vgusbcbo7X36XVt4Q diff --git a/src/config/supabase.js b/src/config/supabase.js index 6a073da..d130c7a 100644 --- a/src/config/supabase.js +++ b/src/config/supabase.js @@ -5,8 +5,8 @@ let supabaseInstance = null; export const createSupabase = () => { if (!supabaseInstance) { const supabaseUrl = import.meta.env.VITE_SUPABASE_URL; + // const supabaseAnonKey = import.meta.env.VITE_SUPABASE_ADMIN_KEY; const supabaseAnonKey = import.meta.env.VITE_SUPABASE_ANON_KEY; - if (!supabaseUrl || !supabaseAnonKey) { throw new Error('Missing Supabase environment variables'); } @@ -21,7 +21,7 @@ export const createSupabase = () => { detectSessionInUrl: false, }, db: { - schema: 'limq_dev' + schema: 'limq_dev' } } ); diff --git a/src/hooks/aichat.jsx b/src/hooks/aichat.jsx index 0dc62ec..dd7a40d 100644 --- a/src/hooks/aichat.jsx +++ b/src/hooks/aichat.jsx @@ -84,7 +84,6 @@ export function useDifyChat() { if (line.startsWith('data: ')) { try { const data = JSON.parse(line.slice(6)); - switch (data.event) { case 'workflow_started': if (data.conversation_id) { @@ -102,12 +101,13 @@ export function useDifyChat() { break; case 'error': - throw new Error(data.data?.message || '未知错误'); - + const errorMessage = data.message || data.data?.message || '未知错误'; + message.error(errorMessage); + await reader.cancel(); + throw new Error(errorMessage); case 'done': console.log('Stream completed'); break; - default: break; } diff --git a/src/hooks/resource/useResource.js b/src/hooks/resource/useResource.js index 5ba1c5e..af7f50a 100644 --- a/src/hooks/resource/useResource.js +++ b/src/hooks/resource/useResource.js @@ -76,15 +76,18 @@ export const useResources = (initialPagination, initialSorter, type) => { const deleteResource = async (id) => { try { - await resourceService.deleteResource(id, type); + const data= await resourceService.deleteResource(id, type); + if(data?.length>0){ const newCurrent = resources.length === 1 && currentPagination.current > 1 ? currentPagination.current - 1 : currentPagination.current; await fetchResources({ current: newCurrent }); message.success("删除成功"); + }else{ + throw new Error("no level"); + } } catch (error) { - message.error("删除失败"); throw error; } }; diff --git a/src/pages/resource/role/index.jsx b/src/pages/resource/role/index.jsx new file mode 100644 index 0000000..90fbab8 --- /dev/null +++ b/src/pages/resource/role/index.jsx @@ -0,0 +1,7 @@ +import React from 'react' + +export default function index() { + return ( +
index
+ ) +} diff --git a/src/pages/resource/team/components/ExpandedMemberships.jsx b/src/pages/resource/team/components/ExpandedMemberships.jsx index b65ff88..92ea009 100644 --- a/src/pages/resource/team/components/ExpandedMemberships.jsx +++ b/src/pages/resource/team/components/ExpandedMemberships.jsx @@ -45,14 +45,18 @@ export const ExpandedMemberships = ({ teamId }) => { const handleUpdate = async (id, values) => { try { - await supabaseService.update('team_membership', + const data = await supabaseService.update('team_membership', { id }, { role: values.role } ); - message.success('成员角色已更新'); - await loadMemberships(); + if(data.length>0){ + message.success('成员角色已更新'); + loadMemberships() + }else{ + message.error('更新成员角色失败'); + } } catch (error) { message.error('更新成员角色失败'); console.error('Update failed:', error); diff --git a/src/routes/routes.js b/src/routes/routes.js index 4c191e3..5a02bb2 100644 --- a/src/routes/routes.js +++ b/src/routes/routes.js @@ -9,6 +9,13 @@ const resourceRoutes = [ icon: "team", roles: ["OWNER"], }, + { + path: "role", + component: lazy(() => import("@/pages/resource/role")), + name: "角色管理", + icon: "setting", + roles: ["OWNER"], + }, { path: "bucket", component: lazy(() => import("@/pages/resource/bucket")),