diff --git a/src/assets/styles/common.less b/src/assets/styles/common.less index fe0b4012..87331088 100644 --- a/src/assets/styles/common.less +++ b/src/assets/styles/common.less @@ -188,6 +188,10 @@ font-size: var(--font-size-base); } +.font-size-13 { + font-size: 13px; +} + .font-size-14 { font-size: var(--font-size-middle); } diff --git a/src/components/icon-font/index.tsx b/src/components/icon-font/index.tsx index 87543e2c..bf7779b6 100644 --- a/src/components/icon-font/index.tsx +++ b/src/components/icon-font/index.tsx @@ -2,7 +2,7 @@ import { createFromIconfontCN } from '@ant-design/icons'; // import './iconfont/iconfont.js'; const IconFont = createFromIconfontCN({ - scriptUrl: '//at.alicdn.com/t/c/font_4613488_f316s64919m.js' + scriptUrl: '//at.alicdn.com/t/c/font_4613488_hlvsvytu57b.js' }); export default IconFont; diff --git a/src/components/image-editor/hooks/use-drawing.ts b/src/components/image-editor/hooks/use-drawing.ts index c1e8cdc6..e70637b2 100644 --- a/src/components/image-editor/hooks/use-drawing.ts +++ b/src/components/image-editor/hooks/use-drawing.ts @@ -1,5 +1,5 @@ import _ from 'lodash'; -import { useCallback, useMemo, useRef } from 'react'; +import React, { useCallback, useMemo, useRef } from 'react'; type Point = { x: number; y: number; lineWidth: number }; type Stroke = Point[]; @@ -130,6 +130,7 @@ export default function useDrawing(props: { const getTransformedPoint = useCallback( (offsetX: number, offsetY: number) => { const { current: scale } = autoScale; + console.log('lineWidth:----------', lineWidth, autoScale.current); const { x: translateX, y: translateY } = translatePos.current; @@ -146,6 +147,7 @@ export default function useDrawing(props: { const getTransformLineWidth = useCallback( (w = 1) => { + console.log('lineWidth:', lineWidth, autoScale.current); const width = w || lineWidth; return width / autoScale.current; }, diff --git a/src/components/image-editor/index.tsx b/src/components/image-editor/index.tsx index a89e870e..e481ce42 100644 --- a/src/components/image-editor/index.tsx +++ b/src/components/image-editor/index.tsx @@ -196,6 +196,7 @@ const CanvasImageEditor: React.FC = forwardRef( const onReset = useCallback(() => { clearOverlayCanvas(); setStrokes([]); + setMaskStrokes([]); saveImage(); currentStroke.current = []; console.log('Resetting strokes', currentStroke.current); @@ -513,9 +514,9 @@ const CanvasImageEditor: React.FC = forwardRef( void; undo: () => void; - onReset: () => void; + onClear: () => void; handleFitView: () => void; } @@ -30,7 +30,7 @@ const ToolsBar: React.FC = (props) => { lineWidth, handleBrushSizeChange, undo, - onReset, + onClear, uploadButton, handleFitView } = props; @@ -83,7 +83,7 @@ const ToolsBar: React.FC = (props) => { - diff --git a/src/global.less b/src/global.less index e14bade3..740d22f7 100644 --- a/src/global.less +++ b/src/global.less @@ -336,6 +336,10 @@ body { .ant-pro-sider .ant-layout-sider-children { background-color: var(--color-fill-sider); + // box-shadow: + // 0px 1px 2px 0px rgb(0 0 0 / 30%), + // 0px 2px 6px 2px rgb(0 0 0 / 15%); + // border-radius: 0 16px 16px 0; } } diff --git a/src/pages/llmodels/components/advance-config.tsx b/src/pages/llmodels/components/advance-config.tsx index 9243a7f0..e4527962 100644 --- a/src/pages/llmodels/components/advance-config.tsx +++ b/src/pages/llmodels/components/advance-config.tsx @@ -443,7 +443,10 @@ const AdvanceConfig: React.FC = (props) => { { key: '1', label: ( - + {intl.formatMessage({ id: 'resources.form.advanced' })} ), diff --git a/src/pages/resources/components/container-install.tsx b/src/pages/resources/components/container-install.tsx index 21eed440..90b26346 100644 --- a/src/pages/resources/components/container-install.tsx +++ b/src/pages/resources/components/container-install.tsx @@ -80,13 +80,15 @@ const AddWorker: React.FC = (props) => { -

1. {intl.formatMessage({ id: 'resources.worker.add.step1' })}

+

+ 1. {intl.formatMessage({ id: 'resources.worker.add.step1' })} +

-

+

2. {intl.formatMessage({ id: 'resources.worker.add.step2' })}{' '} = (props) => { > )} -

+

3. {intl.formatMessage({ id: 'resources.worker.add.step3' })}

diff --git a/src/pages/resources/components/model-files.tsx b/src/pages/resources/components/model-files.tsx index f943eb56..981a67ea 100644 --- a/src/pages/resources/components/model-files.tsx +++ b/src/pages/resources/components/model-files.tsx @@ -417,7 +417,9 @@ const ModelFiles = () => { render: (text: string, record: ListItem) => ( {record.source === modelSourceMap.local_path_value ? ( - intl.formatMessage({ id: 'models.form.localPath' }) + + {intl.formatMessage({ id: 'models.form.localPath' })} + ) : ( {generateSource(record)} )} diff --git a/src/pages/resources/components/script-install.tsx b/src/pages/resources/components/script-install.tsx index b89b1885..fcd1e584 100644 --- a/src/pages/resources/components/script-install.tsx +++ b/src/pages/resources/components/script-install.tsx @@ -1,6 +1,6 @@ import HighlightCode from '@/components/highlight-code'; import { useIntl } from '@umijs/max'; -import React from 'react'; +import React, { useMemo } from 'react'; import { addWorkerGuide } from '../config'; type ViewModalProps = { token: string }; @@ -10,32 +10,41 @@ const AddWorker: React.FC = (props) => { const origin = window.location.origin; + const labels = useMemo( + () => ({ + step1: intl.formatMessage({ id: 'resources.worker.add.step1' }), + step2: intl.formatMessage({ id: 'resources.worker.add.step2' }), + step2Tips: intl.formatMessage({ id: 'resources.worker.add.step2.tips' }), + step3: intl.formatMessage({ id: 'resources.worker.add.step3' }), + linuxOrMac: intl.formatMessage({ id: 'resources.worker.linuxormaxos' }) + }), + [intl] + ); + return (
-

1. {intl.formatMessage({ id: 'resources.worker.add.step1' })}

-

{intl.formatMessage({ id: 'resources.worker.linuxormaxos' })}

+

1. {labels.step1}

+

{labels.linuxOrMac}

-

Windows

+

Windows

-

- 2. {intl.formatMessage({ id: 'resources.worker.add.step2' })}{' '} +

+ 2. {labels.step2}{' '}

-

{intl.formatMessage({ id: 'resources.worker.linuxormaxos' })}

+

{labels.linuxOrMac}

= (props) => { })} theme="dark" > -

Windows

+

Windows

= (props) => { token: '${mytoken}' })} > -

- 3. {intl.formatMessage({ id: 'resources.worker.add.step3' })} -

+

3. {labels.step3}

); };