feat: time util showMs default false

Author: modstart

changelog.md

@@ -1,14 +1,8 @@
-## v1.4.0
-
-- 新增：声音合成设备显存大小支持显示
-- 新增：声音合成模型失败增加继续尝试操作
-- 优化：模型连续运行速度优化，避免每次启动带来的损耗
-- 优化：自启动模型状态显示区分（蓝色未运行，绿色运行中）
-- 修复：模型服务自启动类型设置状态异常修复
-- 修复：模型删除重新加在配置缓存问题
 
 ## v1.3.0 直播支持384模型，文生图、图生图模型支持
 
+- 新增：声音合成设备显存大小支持显示
+- 新增：声音合成模型失败增加继续尝试操作
 - 新增：声音合成优化配置，支持声音合成时自动替换文字
 - 新增：设置支持大模型提示词自定义
 - 新增：直播模型支持选择不同版本
@@ -17,6 +11,10 @@
 - 新增：文生图、图生图模型
 - 新增：声音合成内容支持大模型直接生成
 - 优化：本地无可用模型时下拉选择提示
+- 优化：模型连续运行速度优化，避免每次启动带来的损耗
+- 优化：自启动模型状态显示区分（蓝色未运行，绿色运行中）
+- 修复：模型服务自启动类型设置状态异常修复
+- 修复：模型删除重新加在配置缓存问题
 - 修复：大模型请求地址异常问题
 - 修复：内置大模型开关不生效问题
 

src/components/common/ParamForm.vue

@@ -1,15 +1,21 @@
 <script setup lang="ts">
 import {cloneDeep} from "lodash-es";
-import {ref, watch} from "vue";
+import {nextTick, ref, watch} from "vue";
 import {t} from "../../lang";
 import {Dialog} from "../../lib/dialog";
 import SpeakerSelector from "./SpeakerSelector.vue";
+import SoundPromptSelector from "../../pages/Sound/components/SoundPromptSelector.vue";
 
 type FieldBasicType = {
     name: string;
     title: string;
     icon: string;
-    type: "select" | "input" | "inputNumber" | "switch" | "slider" | "speaker";
+    type: "select"
+        | "input"
+        | "inputNumber"
+        | "switch"
+        | "slider"
+        | "speaker";
     defaultValue: any;
     placeholder: string;
     required: boolean;
@@ -42,10 +48,10 @@ watch(
     value => {
         formData.value = value?.map(item => {
             const itemClone = cloneDeep(item);
-            if (itemClone.type === "speaker") {
-                itemClone["speakerParam"] = [];
-                itemClone["speakerParamValue"] = {};
-            }
+            // if (itemClone.type === "speaker") {
+            //     itemClone["speakerParam"] = [];
+            //     itemClone["speakerParamValue"] = {};
+            // }
             let value = itemClone.defaultValue;
             if (item.opt) {
                 if (item.opt.includes('randomValue')) {
@@ -70,16 +76,21 @@ watch(
         deep: true,
     }
 );
+watch(() => formData.value, () => {
+    nextTick(() => {
+        emit('change', getValue());
+    })
+}, {immediate: false, deep: true});
 
 const getValue = () => {
     const result = {};
     formData.value.forEach(item => {
         result[item.name] = item.value;
         result['_' + item.name] = item.title;
         if (item.type === "speaker") {
-            for (const k in item["speakerParamValue"]) {
-                result[k] = item["speakerParamValue"][k];
-            }
+            // for (const k in item["speakerParamValue"]) {
+            //     result[k] = item["speakerParamValue"][k];
+            // }
             result[`__${item.name}`] = item["speaker"]?.["title"] || item.value;
         }
     });
@@ -104,24 +115,26 @@ const validate = () => {
     return true;
 };
 
-const onSpeakerDataUpdate = (name, data) => {
-    const {param, speaker} = data;
-    const item = formData.value.find(item => item.name === name);
-    if (item) {
-        item["speaker"] = speaker;
-        item["speakerParam"] = param;
-        const value = {};
-        param.forEach(paramItem => {
-            value[paramItem.name] = null;
-            if (!paramItem.type || paramItem.type === "select") {
-                if (paramItem.option && paramItem.option.length > 0) {
-                    value[paramItem.name] = paramItem.option[0].value;
-                }
-            }
-        });
-        item["speakerParamValue"] = value;
-    }
-};
+const emit = defineEmits(['change']);
+
+// const onSpeakerDataUpdate = (name, data) => {
+//     const {param, speaker} = data;
+//     const item = formData.value.find(item => item.name === name);
+//     if (item) {
+//         item["speaker"] = speaker;
+//         item["speakerParam"] = param;
+//         const value = {};
+//         param.forEach(paramItem => {
+//             value[paramItem.name] = null;
+//             if (!paramItem.type || paramItem.type === "select") {
+//                 if (paramItem.option && paramItem.option.length > 0) {
+//                     value[paramItem.name] = paramItem.option[0].value;
+//                 }
+//             }
+//         });
+//         item["speakerParamValue"] = value;
+//     }
+// };
 
 defineExpose({
     getValue,
@@ -183,10 +196,15 @@ defineExpose({
             <a-slider v-model="item.value" :marks="item.sliderMarks" show-tooltip :min="item.min" :max="item.max"
                       :disabled="props.disabled" :step="item.step"/>
         </div>
-        <div v-else-if="item.type === 'speaker'" class="w-48 mr-3">
+        <div v-else-if="item.type === 'speaker'" class="mr-3">
             <SpeakerSelector v-model="item.value" :speakers="item['speakers']" :disabled="props.disabled"
-                             @on-data-update="onSpeakerDataUpdate(item.name, $event)"/>
+            />
+            <!-- @on-data-update="onSpeakerDataUpdate(item.name, $event)" -->
+        </div>
+        <div v-else-if="item.type === 'soundPromptId'">
+            <SoundPromptSelector v-model="item.value" :disabled="props.disabled"/>
         </div>
+        <!--
         <div v-for="speakerParam in item['speakerParam']">
             <div v-if="!speakerParam.type || speakerParam.type === 'select'" class="mr-3">
                 <a-select size="small" :disabled="props.disabled"
@@ -197,6 +215,7 @@ defineExpose({
                 </a-select>
             </div>
         </div>
+        -->
     </div>
 </template>
 

src/lib/util.ts

@@ -103,7 +103,7 @@ export const TimeUtil = {
     datetimeString() {
         return dayjs().format("YYYYMMDD_HHmmss");
     },
-    secondsToTime(seconds: number, alwaysShowMs: boolean = false) {
+    secondsToTime(seconds: number, showMs: boolean = false) {
         const sec = Math.floor(seconds);
         const ms = Math.floor((seconds - sec) * 1000);
         let h: any = Math.floor(sec / 3600);
@@ -113,7 +113,7 @@ export const TimeUtil = {
         if (m < 10) m = "0" + m;
         if (s < 10) s = "0" + s;
         const result = "00" == h ? `${m}:${s}` : `${h}:${m}:${s}`;
-        if (ms > 0 || alwaysShowMs) {
+        if (showMs) {
             let f: any = ms;
             if (f < 10) f = "00" + f;
             else if (f < 100) f = "0" + f;

src/pages/Sound/components/SoundPromptSelector.vue

@@ -18,18 +18,30 @@ const props = defineProps({
         required: true,
         default: 0,
     },
+    disabled: {
+        type: Boolean,
+        default: false,
+    },
 });
 const emit = defineEmits(["update:modelValue"]);
 const onSelect = (id: number) => {
     emit("update:modelValue", id);
 };
+const doSelect = () => {
+    if (props.disabled) {
+        return;
+    }
+    soundPromptDialog.value?.show();
+};
 </script>
 
 <template>
     <div class="flex items-center">
         <div
-            @click="soundPromptDialog?.show()"
-            class="mr-1 h-8 leading-8 px-3 rounded-lg cursor-pointer truncate bg-gray-100 hover:bg-gray-200 min-w-64">
+            @click="doSelect()"
+            class="mr-1 h-8 leading-8 px-3 rounded-lg cursor-pointer truncate bg-gray-100 hover:bg-gray-200 min-w-64"
+            :class="disabled ? 'cursor-not-allowed bg-gray-50 hover:bg-gray-50 text-gray-400' : ''"
+        >
             {{ records.find(s => s.id === props.modelValue)?.title || "选择音色" }}
         </div>
         <AudioPlayerButton

src/store/modules/live.ts

@@ -14,7 +14,7 @@ import {mapError} from "../../lib/error";
 const serverStore = useServerStore();
 
 export const liveModels = [
-    {value: "wav2lip256", title: "Wav2Lip标准版"},
+    {value: "wav2lip", title: "Wav2Lip标准版"},
     {value: "wav2lip384", title: "Wav2Lip清晰版"},
 ]
 
@@ -91,7 +91,7 @@ export const liveStore = defineStore("live", {
             }[],
         },
         localConfig: {
-            model: "wav2lip256" as typeof liveModels[number]["value"],
+            model: "wav2lip" as typeof liveModels[number]["value"],
             mode: "avatar" as "avatar" | "audio",
             avatar: {
                 width: 720,