From 6a2d2dfdafeea20c6638d3983d94651878c69b6e Mon Sep 17 00:00:00 2001 From: jialin Date: Tue, 6 May 2025 17:41:18 +0800 Subject: [PATCH] fix: ignore the fields when compare data --- src/pages/llmodels/components/update-modal.tsx | 10 ++++++++-- src/pages/llmodels/config/index.ts | 3 +++ src/pages/playground/components/upload-img.tsx | 4 +++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/pages/llmodels/components/update-modal.tsx b/src/pages/llmodels/components/update-modal.tsx index eff82cde..572a1572 100644 --- a/src/pages/llmodels/components/update-modal.tsx +++ b/src/pages/llmodels/components/update-modal.tsx @@ -20,7 +20,8 @@ import { localPathTipsList, modelSourceMap, ollamaModelOptions, - sourceOptions + sourceOptions, + updateIgnoreFields } from '../config'; import { FormContext } from '../config/form-context'; import { FormData, ListItem } from '../config/types'; @@ -115,8 +116,13 @@ const UpdateModal: React.FC = (props) => { } const originalData = _.pick(originFormData.current, Object.keys(alldata)); + console.log('alldata:', alldata, originalData); - const isEqual = _.isEqualWith(alldata, originalData, customizer); + const isEqual = _.isEqualWith( + _.omit(alldata, updateIgnoreFields), + _.omit(originalData, updateIgnoreFields), + customizer + ); if (isEqual) { setWarningStatus({ show: false, diff --git a/src/pages/llmodels/config/index.ts b/src/pages/llmodels/config/index.ts index 92be2f38..bdf89f2b 100644 --- a/src/pages/llmodels/config/index.ts +++ b/src/pages/llmodels/config/index.ts @@ -477,6 +477,9 @@ export const excludeFields = [ 'gpu_selector' ]; +// ingore fields when compare old and new data +export const updateIgnoreFields = ['categories', 'replicas', 'description']; + // if some fields need to trigger manual check, add them here export const updateExcludeFields = [ 'repo_id', diff --git a/src/pages/playground/components/upload-img.tsx b/src/pages/playground/components/upload-img.tsx index ddc35e6e..6cb7679d 100644 --- a/src/pages/playground/components/upload-img.tsx +++ b/src/pages/playground/components/upload-img.tsx @@ -6,6 +6,8 @@ import { RcFile } from 'antd/es/upload'; import { debounce, round } from 'lodash'; import React, { useCallback, useRef } from 'react'; +const acceptImageType = ['image/png', 'image/jpg', 'image/jpeg']; + interface UploadImgProps { size?: 'small' | 'middle' | 'large'; height?: number; @@ -34,7 +36,7 @@ const UploadImg: React.FC = ({ children, icon, title, - accept = 'image/*', + accept = acceptImageType.join(','), size = 'small' }) => { const intl = useIntl();