diff --git a/src/components/echarts/h-bar.tsx b/src/components/echarts/h-bar.tsx index 4fc3d481..52c1a79d 100644 --- a/src/components/echarts/h-bar.tsx +++ b/src/components/echarts/h-bar.tsx @@ -55,18 +55,17 @@ const BarChart: React.FC = (props) => { show: true, overflow: 'truncate', width: 75, - ellipsis: '...', - margin: 12, - formatter(value: string, index: number) { - return `{a|${index + 1}}`; - }, - rich: { - a: { - fontWeight: 500, - fontSize: 14, - color: token?.colorTextSecondary - } - } + ellipsis: '...' + // formatter(value: string, index: number) { + // return `{a|${index + 1}}`; + // }, + // rich: { + // a: { + // fontWeight: 500, + // fontSize: 14, + // color: token?.colorTextSecondary + // } + // } } }, legend: { @@ -82,9 +81,9 @@ const BarChart: React.FC = (props) => { type: 'bar', barWidth: 20, stack: 'Ad', - barGap: '20%', + barGap: '30%', label: { - show: true, + show: false, formatter(params: any) { if (params.seriesIndex === 0) { return `{value|${params.name}}`; @@ -173,7 +172,6 @@ const BarChart: React.FC = (props) => { ) : ( diff --git a/src/pages/playground/components/ground-images.tsx b/src/pages/playground/components/ground-images.tsx index 90893908..2c4cc6a2 100644 --- a/src/pages/playground/components/ground-images.tsx +++ b/src/pages/playground/components/ground-images.tsx @@ -141,9 +141,9 @@ const GroundImages: React.FC = forwardRef((props, ref) => { const generateParams = () => { const params = { ..._.omitBy(finalParameters, (value: string) => !value), - seed: - parameters.seed || - (parameters.random_seed ? generateRandomNumber() : null), + seed: parameters.random_seed + ? generateRandomNumber() + : parameters.seed || null, stream: false, prompt: currentPrompt }; diff --git a/src/pages/playground/components/image-edit.tsx b/src/pages/playground/components/image-edit.tsx index 5ec423ce..a5761c78 100644 --- a/src/pages/playground/components/image-edit.tsx +++ b/src/pages/playground/components/image-edit.tsx @@ -166,9 +166,9 @@ const GroundImages: React.FC = forwardRef((props, ref) => { const generateParams = () => { const params = { ..._.omitBy(finalParameters, (value: string) => !value), - seed: - parameters.seed || - (parameters.random_seed ? generateRandomNumber() : null), + seed: parameters.random_seed + ? generateRandomNumber() + : parameters.seed || null, stream: false, prompt: currentPrompt }; diff --git a/src/pages/playground/hooks/use-init-meta.ts b/src/pages/playground/hooks/use-init-meta.ts index cad71d0b..bf00f80b 100644 --- a/src/pages/playground/hooks/use-init-meta.ts +++ b/src/pages/playground/hooks/use-init-meta.ts @@ -10,6 +10,7 @@ import { } from '@/pages/playground/config/params-config'; import { generateRandomNumber } from '@/utils'; import { useSearchParams } from '@umijs/max'; +import { useMemoizedFn } from 'ahooks'; import _ from 'lodash'; import React, { useCallback, @@ -225,11 +226,12 @@ export const useInitImageMeta = ( const [basicParamsConfig, setBasicParamsConfig] = React.useState< ParamsSchema[] >([...ImageCountConfig, ...ImageSizeConfig]); + const initialSeed = generateRandomNumber(); const [initialValues, setInitialValues] = useState({ ...imgInitialValues, ...advancedFieldsDefaultValus, - seed: generateRandomNumber(), + seed: initialSeed, model: '' }); const [paramsConfig, setParamsConfig] = useState([ @@ -241,7 +243,7 @@ export const useInitImageMeta = ( const [parameters, setParams] = useState({ ...imgInitialValues, ...advancedFieldsDefaultValus, - seed: generateRandomNumber(), + seed: initialSeed, model: '' }); @@ -433,7 +435,7 @@ export const useInitImageMeta = ( [modelList, isOpenaiCompatible] ); - const handleOnValuesChange = useCallback( + const handleOnValuesChange = useMemoizedFn( (changeValues: Record, allValues: Record) => { console.log('changeValues', changeValues); // model change will reset all values @@ -470,7 +472,10 @@ export const useInitImageMeta = ( setParams(allValues); updateCacheFormData(changeValues); } else if (_.isBoolean(changeValues.random_seed)) { - const seed = changeValues.random_seed ? generateRandomNumber() : null; + const seed = changeValues.random_seed + ? generateRandomNumber() + : parameters.seed; + setParams({ ...allValues, seed: seed @@ -483,13 +488,7 @@ export const useInitImageMeta = ( setParams(allValues); updateCacheFormData(changeValues); } - }, - [ - handleOnModelChange, - parameters.size, - basicParamsConfig, - isOpenaiCompatible - ] + } ); useEffect(() => {