paperclip-bot/labelmain-demo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(project): fix bug

Browse Source
This commit is contained in:
zhangheng
2026-02-24 15:34:05 +08:00
parent 8389a9bfcd
commit 52b1a627e1
12 changed files with 49 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/component/label/login/page.tsx
View File

@@ -7,7 +7,6 @@ import { Button } from "@mantine/core"
export default function ComponentLabelLoginPage() {
const { setUserInfo, setUserPassword } = usePermissionStore()
const user_id = usePermissionStore.getState().user_id
const token = usePermissionStore.getState().token
// 用户登录
const handleUserLoginBtnClick = async () => {
@@ -33,7 +32,6 @@ export default function ComponentLabelLoginPage() {
<>
<Button onClick={handleUserLoginBtnClick}>Login</Button>
user_id:{user_id}
token:{token}
</>
)
}

1
app/management/person/collection/detail/components/LabelSchemeContainer.tsx
View File

@@ -82,6 +82,7 @@ export default function LabelSchemeContainer(props: {
<DataTable<ProjectDetail.LabelSchemaList>
withTableBorder
withRowBorders
idAccessor="category_id"
records={schemas}
columns={columns}
minHeight={160}

3
app/management/person/collection/detail/components/SamplingPlanContainer.tsx
View File

@@ -53,7 +53,8 @@ export default function SamplingPlanContainer(props: {
C_frame: toPercent(grade.C?.frame),
})
form.resetDirty()
}, [info, form])
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [info])
const save = async () => {
try {

21
components/label/api/daily/index.ts
View File

@@ -1,5 +1,4 @@
import httpFetch from "@/api/fetch"
import { usePermissionStore } from "../../store/auth"
import { Daily } from "./typing"
import { BASE_LABEL_API } from "../const"
@@ -8,10 +7,6 @@ export const getDailyWorkList = (data: Daily.Request) => {
url: BASE_LABEL_API + "/api/v1/label_server/daily_work/list",
method: "POST",
body: JSON.stringify(data),
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -20,10 +15,6 @@ export const addDailyWorkData = (data: Daily.CreateProps) => {
url: BASE_LABEL_API + "/api/v1/label_server/daily_work/add",
method: "POST",
body: JSON.stringify(data),
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -32,10 +23,6 @@ export const editDailyWorkData = (data: Daily.CreateProps, id: number) => {
url: BASE_LABEL_API + `/api/v1/label_server/daily_work/edit/${id}`,
method: "put",
body: JSON.stringify(data),
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -43,10 +30,6 @@ export const deleteDailyWorkData = (id: number) => {
return httpFetch({
url: BASE_LABEL_API + `/api/v1/label_server/daily_work/delete/${id}`,
method: "delete",
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -55,9 +38,5 @@ export const lockDailyWorkData = (lock_status: boolean, id: number) => {
url: BASE_LABEL_API + `/api/v1/label_server/daily_work/lock/${id}`,
method: "put",
body: JSON.stringify({ lock_status }),
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}

13
components/label/api/label/index.ts
View File

@@ -1,5 +1,4 @@
import httpFetch from "@/api/fetch"
import { usePermissionStore } from "../../store/auth"
import {
LabelResult,
LoginInfo,
@@ -18,10 +17,6 @@ export const getLabelResult = (task_id: number) => {
BASE_LABEL_API +
`/api/v1/label_server/task/label_result?task_id=${task_id}`,
method: "GET",
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -47,10 +42,6 @@ export const getServerImage = async (data: {
url: BASE_LABEL_API + "/api/v1/label_server/data/list",
method: "POST",
body: JSON.stringify(data),
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
}).then((res) => {
if (res.proxy) {
reject({ proxy: res.proxy, params: data })
@@ -81,10 +72,6 @@ export const getServerImage = async (data: {
url: BASE_LABEL_API + "/api/v1/label_server/data/list",
method: "POST",
body: JSON.stringify({ ...params, flag: 1 }),
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
return res.data_list?.[0].image_data || ""
}

85
components/label/api/project/index.ts
View File

@@ -1,5 +1,4 @@
import httpFetch from "@/api/fetch"
import { usePermissionStore } from "../../store/auth"
import { Project, ProjectDetail, ReviewUsers } from "./typing"
import { BASE_LABEL_API } from "../const"
@@ -9,10 +8,6 @@ export const getProjectList = (data: Project.ListRequest) => {
url: BASE_LABEL_API + "/api/v1/label_server/project/list",
method: "POST",
body: JSON.stringify(data),
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -21,10 +16,6 @@ export const getProjectDetailById = (id: number) => {
return httpFetch<ProjectDetail.DataProps>({
url: BASE_LABEL_API + `/api/v1/label_server/project/detail/${id}`,
method: "GET",
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -34,10 +25,6 @@ export const checkLabelDataSource = (data: Project.CheckRequest) => {
url: BASE_LABEL_API + "/api/v1/label_server/project/check_data",
method: "POST",
body: JSON.stringify(data),
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -47,10 +34,6 @@ export const projectAdd = (data: Project.CreateProps) => {
url: BASE_LABEL_API + "/api/v1/label_server/project/add",
method: "POST",
body: JSON.stringify(data),
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -60,10 +43,6 @@ export const projectReview = (data: Project.CreateProps) => {
url: BASE_LABEL_API + "/api/v1/label_server/project/review",
method: "POST",
body: JSON.stringify(data),
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -73,10 +52,6 @@ export const projectConfig = (data: Project.ConfigProps) => {
url: BASE_LABEL_API + "/api/v1/label_server/project/config",
method: "POST",
body: JSON.stringify(data),
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -86,10 +61,6 @@ export const projectEditById = (data: any, id: number) => {
url: BASE_LABEL_API + `/api/v1/label_server/project/edit/${id}`,
method: "POST",
body: JSON.stringify(data),
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -99,10 +70,6 @@ export const projectPreLabelReview = (data: Project.PreLabelProps) => {
url: BASE_LABEL_API + "/api/v1/label_server/project/prototype_review",
method: "POST",
body: JSON.stringify(data),
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -112,10 +79,6 @@ export const projectDeliver = (data: { project_id: number }) => {
url: BASE_LABEL_API + "/api/v1/label_server/project/deliver",
method: "POST",
body: JSON.stringify(data),
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -125,10 +88,6 @@ export const projectAccept = (data: { project_id: number; pass: boolean }) => {
url: BASE_LABEL_API + "/api/v1/label_server/project/accept",
method: "POST",
body: JSON.stringify(data),
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -141,10 +100,6 @@ export const projectCollect = (data: {
url: BASE_LABEL_API + "/api/v1/label_server/project/collect",
method: "POST",
body: JSON.stringify(data),
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -154,10 +109,6 @@ export const getReviewScaleList = (params: { project_id: number }) => {
url: BASE_LABEL_API + "/api/v1/label_server/review_scale/list",
method: "GET",
data: params,
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -167,10 +118,6 @@ export const saveUserReviewScale = (data: Project.ReviewScaleProps) => {
url: BASE_LABEL_API + "/api/v1/label_server/review_scale/save",
method: "POST",
body: JSON.stringify(data),
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -178,10 +125,6 @@ export const getProjectDetail = (id: number) => {
return httpFetch<Project.DetailResponse>({
url: BASE_LABEL_API + `/api/v1/label_server/project/detail/${id}`,
method: "GET",
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -191,10 +134,6 @@ export const regenerateProjectEmbedding = (data: { project_id: number }) => {
url: BASE_LABEL_API + `/api/v1/label_server/project/regenerate_embedding`,
method: "POST",
body: JSON.stringify(data),
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -204,10 +143,6 @@ export const getPersonProjectDashBoard = () => {
url:
BASE_LABEL_API + `/api/v1/label_server/data_statistics/personal_project`,
method: "GET",
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -226,10 +161,6 @@ export const getCurrentPersonData = (params: { date: string }) => {
"/api/v1/label_server/data_statistics/personal_dashboard",
method: "GET",
data: params,
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -239,10 +170,6 @@ export const getProjectTypeList = () => {
return httpFetch<string[]>({
url: BASE_LABEL_API + "/api/v1/label_server/project/type_list",
method: "GET",
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -251,10 +178,6 @@ export const getProjectAdminList = () => {
return httpFetch<Array<{ label: string; value: number }>>({
url: BASE_LABEL_API + "/api/v1/label_server/project/admin_list",
method: "GET",
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -263,10 +186,6 @@ export const getProjectReviewers = () => {
return httpFetch<ReviewUsers>({
url: BASE_LABEL_API + "/api/v1/label_server/project/reviewer_map",
method: "GET",
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -275,9 +194,5 @@ export const getSelfProjectList = () => {
return httpFetch<Array<{ label: string; value: number }>>({
url: BASE_LABEL_API + "/api/v1/label_server/project/self",
method: "GET",
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}

25
components/label/api/scheme/index.ts
View File

@@ -1,5 +1,4 @@
import httpFetch from "@/api/fetch"
import { usePermissionStore } from "../../store/auth"
import { Scheme } from "./typing"
import { BASE_LABEL_API } from "../const"
@@ -9,10 +8,6 @@ export const getLabelSchemeList = (params: Scheme.ListRequest) => {
url: BASE_LABEL_API + "/api/v1/label_server/label_schema/list",
method: "GET",
data: params,
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -22,10 +17,6 @@ export const addNewPlan = (data: Scheme.CreateProps) => {
url: BASE_LABEL_API + "/api/v1/label_server/label_schema/add",
method: "POST",
body: JSON.stringify(data),
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -36,10 +27,6 @@ export const getAllVersionByName = (name: string) => {
BASE_LABEL_API +
`/api/v1/label_server/label_schema/version/list?name=${name}`,
method: "GET",
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -49,10 +36,6 @@ export const deleteLabelPlan = (data: { name: string; version?: string }) => {
url: BASE_LABEL_API + "/api/v1/label_server/label_schema/delete",
method: "delete",
body: JSON.stringify(data),
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -64,10 +47,6 @@ export const saveWrongWordList = (data: {
url: BASE_LABEL_API + "/api/v1/label_server/error_repository/save",
method: "POST",
body: JSON.stringify(data),
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -78,9 +57,5 @@ export const getWrongWordList = () => {
}>({
url: BASE_LABEL_API + "/api/v1/label_server/error_repository/query",
method: "GET",
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}

33
components/label/api/task/index.ts
View File

@@ -1,5 +1,4 @@
import httpFetch from "@/api/fetch"
import { usePermissionStore } from "../../store/auth"
import { Task } from "./typing"
import { BASE_LABEL_API } from "../const"
@@ -9,10 +8,6 @@ export const getTaskList = (data: Task.ListRequest) => {
url: BASE_LABEL_API + "/api/v1/label_server/task/list",
method: "POST",
body: JSON.stringify(data),
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -22,10 +17,6 @@ export const taskAcquire = (data: Task.AcquireReqProps) => {
url: BASE_LABEL_API + "/api/v1/label_server/task/acquire",
method: "POST",
body: JSON.stringify(data),
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -35,10 +26,6 @@ export const taskDispatch = (data: Task.DispatchReqProps) => {
url: BASE_LABEL_API + "/api/v1/label_server/task/dispatch",
method: "POST",
body: JSON.stringify(data),
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -48,10 +35,6 @@ export const taskRelease = (data: Task.ReleaseReqProps) => {
url: BASE_LABEL_API + "/api/v1/label_server/task/release",
method: "POST",
body: JSON.stringify(data),
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -61,10 +44,6 @@ export const getNextTaskId = (data: Task.NextReqProps) => {
url: BASE_LABEL_API + "/api/v1/label_server/task/next",
method: "POST",
body: JSON.stringify(data),
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -74,10 +53,6 @@ export const taskCommit = (data: Task.CommitReqProps) => {
url: BASE_LABEL_API + "/api/v1/label_server/task/commit",
method: "POST",
body: JSON.stringify(data),
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -86,10 +61,6 @@ export const getTaskWorkFlow = (id: number) => {
return httpFetch<any[]>({
url: BASE_LABEL_API + `/api/v1/label_server/task/workflow/${id}`,
method: "GET",
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}
@@ -102,9 +73,5 @@ export const getUserTaskList = (params: {
url: BASE_LABEL_API + `/api/v1/label_server/task/list_by_user`,
method: "GET",
data: params,
headerAttr: {
["Token"]: usePermissionStore.getState().token,
["Refresh-Token"]: usePermissionStore.getState().refresh_token,
},
})
}

14
components/label/store/auth.ts
View File

@@ -8,8 +8,6 @@ const initUserInfo = {
user_id: null,
user_name: null,
user_password: null,
token: null,
refresh_token: null,
detailInfo: null,
}
@@ -19,21 +17,11 @@ export const usePermissionStore = create(
user_id: null,
user_name: null,
user_password: null,
token: null,
refresh_token: null,
detailInfo: null,
setUserInfo: ({
user_id,
user_name,
token,
refresh_token,
detailInfo,
}: any) =>
setUserPermissionInfo: ({ user_id, user_name, detailInfo }: any) =>
set({
user_id,
user_name,
token,
refresh_token,
detailInfo,
user_password: usePermissionStore.getState().user_password,
}),

14
components/login/feishu/auto-login.tsx
View File

@@ -5,6 +5,7 @@ import { useRouter } from "next/navigation"
import { APP, PLATFORM, TENANT } from "@/components/login/libs/common"
import { APP_ID, APP_SECRECT } from "./util"
import { fetchFeishuLogin, getUserPermission } from "../api"
import { usePermissionStore } from "@/components/label/store/auth"
const HeaderIcon = DigitalIcon
@@ -21,6 +22,8 @@ const FeishuAutoLogin = ({ useUserStore }: { useUserStore: any }) => {
const { setUserInfo, refreshToken } = useUserStore()
const router = useRouter()
const { setUserPermissionInfo } = usePermissionStore()
const autoLogin = useCallback(
(
fingerprint: any,
@@ -60,8 +63,13 @@ const FeishuAutoLogin = ({ useUserStore }: { useUserStore: any }) => {
access_token: info.access_token || "",
refresh_token: info.refresh_token || "",
})
const permission = await getUserPermission()
console.log(permission)
const { message: permissionRes } = await getUserPermission()
const { uid, name } = permissionRes
setUserPermissionInfo({
user_id: uid,
user_name: name,
detailInfo: permissionRes,
})
window.location.href = "/"
} catch (err) {
console.log(err)
@@ -74,7 +82,7 @@ const FeishuAutoLogin = ({ useUserStore }: { useUserStore: any }) => {
})
})
},
[refreshToken]
[refreshToken, setUserPermissionInfo]
)
const isFeishu = useCallback(() => !!(window.h5sdk && window.tt), [])

20
components/login/feishu/qr-login.tsx
View File

@@ -10,6 +10,7 @@ import {
getQueryVariable,
} from "@/components/login/libs/common"
import { fetchFeishuLogin, getUserPermission } from "../api"
import { usePermissionStore } from "@/components/label/store/auth"
const QrLogin = ({ useUserStore }: { useUserStore: any }) => {
const fingerprint = useLoginStore.getState().fingerprint
@@ -38,6 +39,8 @@ const QrLogin = ({ useUserStore }: { useUserStore: any }) => {
const { setUserInfo, refreshToken } = useUserStore()
const { setUserPermissionInfo } = usePermissionStore()
const feishuLogin = useCallback(async () => {
try {
const params = {
@@ -57,13 +60,24 @@ const QrLogin = ({ useUserStore }: { useUserStore: any }) => {
access_token: info.access_token || "",
refresh_token: info.refresh_token || "",
})
const permission = await getUserPermission()
console.log(permission)
const { message: permissionRes } = await getUserPermission()
const { uid, name } = permissionRes
setUserPermissionInfo({
user_id: uid,
user_name: name,
detailInfo: permissionRes,
})
window.location.href = "/"
} catch (err) {
console.log(err)
}
}, [fingerprint, redirect_url, refreshToken, setUserInfo])
}, [
fingerprint,
redirect_url,
refreshToken,
setUserInfo,
setUserPermissionInfo,
])
useEffect(() => {
if (times === 1) {

21
components/login/index.tsx
View File

@@ -44,6 +44,7 @@ import LightBgImage from "./resource/images/light-login-bg.png"
import loginBg2Dark from "./resource/images/login-bg2-dark.png"
import loginBg2Light from "./resource/images/login-bg2-light.png"
import LogoDigImage from "./resource/images/logo-dig.png"
import { usePermissionStore } from "../label/store/auth"
const HeaderIcon = DigitalIcon
@@ -55,6 +56,8 @@ export default function LoginPage({ useUserStore }: { useUserStore: any }) {
const [loading, setLoading] = useState(false)
const [error, setError] = useState<string | null>(null)
const { setUserPermissionInfo } = usePermissionStore()
const [isClient, setIsClient] = useState(false)
useEffect(() => {
setIsClient(true)
@@ -209,8 +212,13 @@ export default function LoginPage({ useUserStore }: { useUserStore: any }) {
access_token: info.access_token || "",
refresh_token: info.refresh_token || "",
})
const permission = await getUserPermission()
console.log(permission)
const { message: permissionRes } = await getUserPermission()
const { uid, name } = permissionRes
setUserPermissionInfo({
user_id: uid,
user_name: name,
detailInfo: permissionRes,
})
window.location.href = "/"
} catch (error) {
if (error) {
@@ -302,8 +310,13 @@ export default function LoginPage({ useUserStore }: { useUserStore: any }) {
access_token: info.access_token || "",
refresh_token: info.refresh_token || "",
})
const permission = await getUserPermission()
console.log(permission)
const { message: permissionRes } = await getUserPermission()
const { uid, name } = permissionRes
setUserPermissionInfo({
user_id: uid,
user_name: name,
detailInfo: permissionRes,
})
window.location.href = "/"
} catch (err) {
const message = err instanceof Error ? err.message : "登录失败，请重试"