V 3.2.5(2025.02.26)

1. 修复新用户合并MJ设置初始化问题
2. 修复原创MJ设置数据缺失
This commit is contained in:
2025-02-26 12:03:01 +08:00
parent 03d3ff7e9d
commit 77ee38d302
10 changed files with 85 additions and 66 deletions
@@ -157,6 +157,9 @@ import {
import { DEFINE_STRING } from '../../../../../define/define_string'
import InputDialogContent from './InputDialogContent.vue'
import { v4 as uuidv4 } from 'uuid'
import MJDefine from '@/main/Service/MJ/mjDefine'
import { OptionKeyName, OptionType } from '@/define/enum/option'
import { ValidateJson } from '@/define/Tools/validate'
export default defineComponent({
components: {
@@ -230,35 +233,28 @@ export default defineComponent({
character_select_model_options.value = value.data
})
}
let mj_globalSetting
/**
* 初始化MJ的option
*/
async function InitMjOptions() {
// 获取当前mj配置信息,加载基础信息
let res = await window.setting.GetMjSetting()
if (res.code == 0) {
message.error(res.message)
return
let mjSettingData = await window.options.GetOptionByKey(OptionKeyName.MJ_GlobalSetting)
if (mjSettingData.code == 0) {
throw new Error('加载MJ设置失败,失败原因如下:' + mjSettingData.message)
}
if (mjSettingData.data == null) {
throw new Error('加载MJ设置失败,失败原因如下:没有找到对应的MJ设置,请先去MJ设置中设置')
}
if (!ValidateJson(mjSettingData.data.value)) {
throw new Error('MJ设置的数据格式不正确,请检查数据格式')
}
if (res.data.length <= 0) {
message.error('当前没有MJ配置信息,请先配置MJ信息')
return
}
mj_globalSetting = JSON.parse(mjSettingData.data.value)
let mjSimpleSetting = mj_globalSetting.mj_simpleSetting
mjSetting.value = Object.assign(mjSetting.value, res.data[0])
mjSetting.value = Object.assign(mjSetting.value, mjSimpleSetting)
await window.mj.GetMJGenerateCategory((value) => {
if (value.code == 0) {
message.error(value.message)
return
}
request_model_options.value = value.data.filter((item) => !item.disable)
if (request_model_options.value.length > 0 && mjSetting.value.request_model == null) {
mjSetting.value.request_model = request_model_options.value[0].value
}
})
request_model_options.value = MJDefine.GetMJRequestModelOptions()
mj_speed_options.value = [
{
@@ -324,8 +320,13 @@ export default defineComponent({
}
})
debugger
// 保存MJ的基础设置
let saveMjRes = await window.setting.UpdateMJSetting(toRaw(mjSetting.value))
let saveMjRes = await window.options.ModifyOptionByKey(
OptionKeyName.MJ_GlobalSetting,
JSON.stringify({ ...mj_globalSetting, mj_simpleSetting: mjSetting.value }),
OptionType.JSON
)
if (saveMjRes.code == 0) {
throw new Error(saveMjRes.message)
}