修复：模型多版本显示问题

modstart-lib · Oct 22, 2024 · b8503ee · b8503ee
1 parent 26ba277
commit b8503ee
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 7 deletions.
diff --git a/src/components/Server/ServerActionDelete.vue b/src/components/Server/ServerActionDelete.vue
@@ -16,7 +16,7 @@ const emit = defineEmits({
 
 const doDelete = async () => {
     const record = props.record
-    await Dialog.confirm(t('确定删除模型 {title} 吗？', {title: record.title}))
+    await Dialog.confirm(t('确定删除模型 {title} v{version} 吗？', {title: record.title, version: record.version}))
     Dialog.loadingOn(t('正在删除'))
     await sleep(500)
     await serverStore.delete(record)

diff --git a/src/components/Server/ServerImportLocalDialog.vue b/src/components/Server/ServerImportLocalDialog.vue
@@ -63,11 +63,12 @@ const doSubmit = async () => {
     isImporting.value = true
     logStatus.value = t('正在解压文件')
     try {
+        // console.log('unzip.start', modelInfo.value.path, target)
         await window.$mapi.misc.unzip(modelInfo.value.path, target, {
             process: (type: string, file: any) => {
                 switch (type) {
                     case 'start':
-                        // logAppend(t('正在解压 {name}', {name: file.fileName}))
+                        logStatus.value = t('正在解压 {name}', {name: file.fileName})
                         break
                     case 'end':
                         break
@@ -77,6 +78,7 @@ const doSubmit = async () => {
                 }
             },
         })
+        // console.log('unzip.end', modelInfo.value.path, target)
         // console.log('entry', modelInfo.value.entry)
         if (modelInfo.value.entry) {
             const executable = target + '/' + modelInfo.value.entry
@@ -210,7 +212,7 @@ const emit = defineEmits({
                                 {{ $t('重新选择') }}
                             </a-button>
                         </div>
-                        <div class="flex-grow pl-3">
+                        <div class="flex-grow pl-3 text-sm truncate">
                             {{ logStatus }}
                         </div>
                     </div>

diff --git a/src/lang/en-US.json b/src/lang/en-US.json
@@ -72,6 +72,7 @@
     "02261f68": "Cross language",
     "02286f86": "Connecting",
     "022cab31": "Running",
+    "03537548": "确定删除模型 {title} v{version} 吗？",
     "041806bc": "GPU Priority",
     "041b5a9a": "GPU Mode",
     "04e64feb": "USB Connection",

diff --git a/src/lang/source.json b/src/lang/source.json
@@ -133,6 +133,7 @@
     "直接退出": "379a84eb",
     "相同的种子可以确保每次生成结果数据一致": "5232d376",
     "确定": "000ef0ec",
+    "确定删除模型 {title} v{version} 吗？": "03537548",
     "确定删除模型 {title} 吗？": "702bab32",
     "确定裁剪": "382747b5",
     "确定退出软件？": "0b2004f2",

diff --git a/src/lang/zh-CN.json b/src/lang/zh-CN.json
@@ -72,6 +72,7 @@
     "02261f68": "跨语种",
     "02286f86": "连接中",
     "022cab31": "运行中",
+    "03537548": "确定删除模型 {title} v{version} 吗？",
     "041806bc": "GPU优先",
     "041b5a9a": "GPU模式",
     "04e64feb": "USB连接",

diff --git a/src/pages/Server.vue b/src/pages/Server.vue
@@ -122,6 +122,9 @@ const typeName = (type: string) => {
                                 </div>
                                 <div class="inline-block mr-4">
                                     {{ record.title }}
+                                    <div class="inline-block rounded-3xl bg-gray-100 px-3">
+                                        v{{ record.version }}
+                                    </div>
                                 </div>
                             </div>
                             <div>

diff --git a/src/store/modules/server.ts b/src/store/modules/server.ts
@@ -82,7 +82,7 @@ export const serverStore = defineStore("server", {
             }
             let changed = false
             for (let lr of localRecords) {
-                const record = this.records.find((record) => record.name === lr.name)
+                const record = this.records.find((record) => record.key === lr.key)
                 if (!record) {
                     lr.status = createServerStatus(lr)
                     lr.runtime = createServerRuntime(lr)
@@ -99,8 +99,11 @@ export const serverStore = defineStore("server", {
                 await this.sync()
             }
         },
+        findRecord(server: ServerRecord) {
+            return this.records.find((record) => record.key = server.key)
+        },
         async start(server: ServerRecord) {
-            const record = this.records.find((record) => record.name === server.name)
+            const record = this.findRecord(server)
             if (record?.status === EnumServerStatus.STOPPED || record?.status === EnumServerStatus.ERROR) {
             } else {
                 throw new Error('StatusError')
@@ -163,7 +166,7 @@ export const serverStore = defineStore("server", {
             serverRuntime.pingCheckTimer = setTimeout(pingCheck, 10 * 1000)
         },
         async stop(server: ServerRecord) {
-            const record = this.records.find((record) => record.name === server.name)
+            const record = this.findRecord(server)
             if (record?.status === EnumServerStatus.RUNNING) {
             } else {
                 throw new Error('StatusError')
@@ -188,7 +191,7 @@ export const serverStore = defineStore("server", {
             await this.sync()
         },
         async delete(server: ServerRecord) {
-            const index = this.records.findIndex((record) => record.name === server.name)
+            const index = this.records.findIndex((record) => record.key === server.key)
             if (index === -1) {
                 return
             }