diff --git a/src/assets/images/copy-token.png b/src/assets/images/copy-token.png deleted file mode 100644 index 2c8ea551..00000000 Binary files a/src/assets/images/copy-token.png and /dev/null differ diff --git a/src/assets/images/quick-config.png b/src/assets/images/quick-config.png deleted file mode 100644 index fba01fb1..00000000 Binary files a/src/assets/images/quick-config.png and /dev/null differ diff --git a/src/components/delete-modal/index.tsx b/src/components/delete-modal/index.tsx index dbe62e02..3f1d92cd 100644 --- a/src/components/delete-modal/index.tsx +++ b/src/components/delete-modal/index.tsx @@ -33,6 +33,7 @@ const useStyles = createStyles(({ css }) => ({ padding-left: 30px; color: var(--ant-color-text-secondary); white-space: pre-line; + word-break: break-all; span { color: var(--ant-color-text); display: flex; diff --git a/src/config/global.d.ts b/src/config/global.d.ts index e6cd0273..f6f4b77e 100644 --- a/src/config/global.d.ts +++ b/src/config/global.d.ts @@ -38,7 +38,7 @@ declare namespace Global { interface HintOptions { label: string; value: string; - opts?: Array>; + opts?: Array>; } type SearchParams = Pagination & { search?: string }; diff --git a/src/locales/en-US/resources.ts b/src/locales/en-US/resources.ts index 805f3cd8..5ba40848 100644 --- a/src/locales/en-US/resources.ts +++ b/src/locales/en-US/resources.ts @@ -74,7 +74,7 @@ export default { 'resources.modelfiles.copy.tips': 'Copy Full Path', 'resources.filter.path': 'Filter by path', 'resources.register.worker.step1': - 'Click the Copy token menu.', + 'Click the Copy Token menu.', 'resources.register.worker.step2': 'Click the Quick Config menu.', 'resources.register.worker.step3': diff --git a/src/locales/ja-JP/resources.ts b/src/locales/ja-JP/resources.ts index 4d174227..49ab8b12 100644 --- a/src/locales/ja-JP/resources.ts +++ b/src/locales/ja-JP/resources.ts @@ -75,7 +75,7 @@ export default { 'resources.modelfiles.copy.tips': 'フルパスをコピー', 'resources.filter.path': 'パスでフィルタ', 'resources.register.worker.step1': - 'Click the Copy token menu.', + 'Click the Copy Token menu.', 'resources.register.worker.step2': 'Click the Quick Config menu.', 'resources.register.worker.step3': @@ -93,7 +93,7 @@ export default { }; // ========== To-Do: Translate Keys (Remove After Translation) ========== -// 1. 'resources.register.worker.step1': 'Click the Copy token menu.', +// 1. 'resources.register.worker.step1': 'Click the Copy Token menu.', // 2. 'resources.register.worker.step2': 'Click the Quick Config menu.', // 3. 'resources.register.worker.step3': 'Click the General tab.', // 4. 'resources.register.worker.step4': 'Select Worker as the service role.', diff --git a/src/locales/ru-RU/resources.ts b/src/locales/ru-RU/resources.ts index 03d74be0..da08943a 100644 --- a/src/locales/ru-RU/resources.ts +++ b/src/locales/ru-RU/resources.ts @@ -73,7 +73,7 @@ export default { 'resources.modelfiles.copy.tips': 'Скопировать полный путь', 'resources.filter.path': 'Фильтрация по пути', 'resources.register.worker.step1': - 'Click the Copy token menu.', + 'Click the Copy Token menu.', 'resources.register.worker.step2': 'Click the Quick Config menu.', 'resources.register.worker.step3': @@ -91,7 +91,7 @@ export default { }; // ========== To-Do: Translate Keys (Remove After Translation) ========== -// 1. 'resources.register.worker.step1': 'Click the Copy token menu.', +// 1. 'resources.register.worker.step1': 'Click the Copy Token menu.', // 2. 'resources.register.worker.step2': 'Click the Quick Config menu.', // 3. 'resources.register.worker.step3': 'Click the General tab.', // 4. 'resources.register.worker.step4': 'Select Worker as the service role.', diff --git a/src/locales/zh-CN/resources.ts b/src/locales/zh-CN/resources.ts index ab5ce449..dc4ac9b6 100644 --- a/src/locales/zh-CN/resources.ts +++ b/src/locales/zh-CN/resources.ts @@ -72,7 +72,7 @@ export default { 'resources.modelfiles.copy.tips': '复制完整路径', 'resources.filter.path': '路径查询', 'resources.register.worker.step1': - '点击菜单 Copy token。', + '点击菜单 Copy Token。', 'resources.register.worker.step2': '点击菜单 Quick Config。', 'resources.register.worker.step3': diff --git a/src/pages/llmodels/components/deploy-modal.tsx b/src/pages/llmodels/components/deploy-modal.tsx index 95470662..111ca62a 100644 --- a/src/pages/llmodels/components/deploy-modal.tsx +++ b/src/pages/llmodels/components/deploy-modal.tsx @@ -299,6 +299,7 @@ const AddModal: FC = (props) => { ) { return; } + console.log('isgguf==================> select 1', item.isGGUF); console.log('handleOnSelectModel:', item, selectedModel); setIsGGUF(item.isGGUF); clearCahceFormValues(); @@ -343,6 +344,7 @@ const AddModal: FC = (props) => { if (manual) { form.current?.resetFields(resetFields); } + console.log('isgguf==================> select 2', item.isGGUF); // If the item is empty setIsGGUF(item.isGGUF); updateSelectedModel(item); @@ -398,6 +400,7 @@ const AddModal: FC = (props) => { }; const handleSetIsGGUF = async (flag: boolean) => { + console.log('isgguf==================>', flag); setIsGGUF(flag); }; diff --git a/src/pages/llmodels/components/search-model.tsx b/src/pages/llmodels/components/search-model.tsx index 3cf3b8dc..ecc9ead6 100644 --- a/src/pages/llmodels/components/search-model.tsx +++ b/src/pages/llmodels/components/search-model.tsx @@ -40,6 +40,14 @@ const PaginationMain = styled(Pagination)` } `; +const IconFontWrapper = styled.div` + .ant-pagination-item-link { + display: flex !important; + align-items: center; + justify-content: center; + } +`; + interface SearchInputProps { hasLinuxWorker?: boolean; modelSource: string; @@ -499,6 +507,7 @@ const SearchModel: React.FC = (props) => { if (model.id === currentRef.current) { return; } + setRquestId(); handleOnSelectModel(model, true); }; diff --git a/src/pages/llmodels/config/mindie-config.ts b/src/pages/llmodels/config/mindie-config.ts index 1987f1d4..7c6fadfe 100644 --- a/src/pages/llmodels/config/mindie-config.ts +++ b/src/pages/llmodels/config/mindie-config.ts @@ -200,7 +200,7 @@ const resultList = options.map((option) => { value: option.value, opts: option.options?.map((opt) => { return { - label: opt, + label: `${opt}`, value: opt }; }) diff --git a/src/pages/resources/components/add-worker-macos.tsx b/src/pages/resources/components/add-worker-macos.tsx index 7ef54aba..915dd6c7 100644 --- a/src/pages/resources/components/add-worker-macos.tsx +++ b/src/pages/resources/components/add-worker-macos.tsx @@ -1,7 +1,5 @@ -import CopyToken from '@/assets/images/copy-token.png'; -import QuickConfig from '@/assets/images/quick-config.png'; import { useIntl } from '@umijs/max'; -import { Image, Space, Typography } from 'antd'; +import { Space, Typography } from 'antd'; import React, { useMemo } from 'react'; const { Text } = Typography; @@ -12,7 +10,7 @@ interface AddWorkerMacOSProps { const registerWorkerSteps = [ 'resources.register.worker.step2', - `resources.register.worker.step3`, + // `resources.register.worker.step3`, `resources.register.worker.step4`, 'resources.register.worker.step5', 'resources.register.worker.step6', @@ -48,10 +46,7 @@ const AddWorkerMacOS: React.FC = () => {
- + = () => { }} > -

@@ -75,7 +69,7 @@ const AddWorkerMacOS: React.FC = () => {

- + {registerWorkerSteps.map((step, index) => ( {index + 1}.{' '} @@ -87,7 +81,6 @@ const AddWorkerMacOS: React.FC = () => { ))} -

4. {labels.step3}

diff --git a/src/pages/resources/components/add-worker-windows.tsx b/src/pages/resources/components/add-worker-windows.tsx index 8f2a15ff..3628ee09 100644 --- a/src/pages/resources/components/add-worker-windows.tsx +++ b/src/pages/resources/components/add-worker-windows.tsx @@ -1,11 +1,91 @@ -import React from 'react'; +import { useIntl } from '@umijs/max'; +import { Space, Typography } from 'antd'; +import React, { useMemo } from 'react'; -interface AddWorkerWindowsProps { +const { Text } = Typography; + +interface AddWorkerProps { token?: string; } -const AddWorkerWindows: React.FC = () => { - return
add worker in windows
; +const registerWorkerSteps = [ + 'resources.register.worker.step2', + // `resources.register.worker.step3`, + `resources.register.worker.step4`, + 'resources.register.worker.step5', + 'resources.register.worker.step6', + `resources.register.worker.step7` +]; + +const AddWorkerWindows: React.FC = () => { + const intl = useIntl(); + 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.register.install.title' })} +

+ + + +

+ 2. +

+ +
+ + + +
+
+

+ 3. {labels.step2}{' '} + +

+ +
+ + {registerWorkerSteps.map((step, index) => ( + + {index + 1}.{' '} + + + ))} + +
+
+

4. {labels.step3}

+
+ ); }; export default AddWorkerWindows; diff --git a/src/pages/resources/components/add-worker.tsx b/src/pages/resources/components/add-worker.tsx index 7b16725b..89505c77 100644 --- a/src/pages/resources/components/add-worker.tsx +++ b/src/pages/resources/components/add-worker.tsx @@ -30,13 +30,13 @@ const AddWorker: React.FC = (props) => { }, { key: 'macos', - label: 'macOS(M series 14+)', + label: 'macOS', icon: , children: }, { key: 'windows', - label: 'Windows(win 10, win 11)', + label: 'Windows', icon: , children: } @@ -46,16 +46,19 @@ const AddWorker: React.FC = (props) => {