+
人物：
import { ref, h, onMounted, defineComponent, toRaw, watch } from 'vue'
-import { NImage, useMessage, NButton, useDialog, NInput, NTag, NSelect, NIcon } from 'naive-ui'
+import {
+ NImage,
+ useMessage,
+ NButton,
+ useDialog,
+ NInput,
+ NTag,
+ NSelect,
+ NIcon,
+ NPopover
+} from 'naive-ui'
import { DEFINE_STRING } from '../../../../../define/define_string'
import { cloneDeep, debounce, get, once } from 'lodash'
-import { Refresh, Reload } from '@vicons/ionicons5'
+import { Refresh, ReloadCircle, ExtensionPuzzle } from '@vicons/ionicons5'
+import ProgressDialog from '../../Components/ProgressDialog.vue'
export default defineComponent({
components: {
@@ -92,7 +130,9 @@ export default defineComponent({
NTag,
NSelect,
NIcon,
- Reload
+ ReloadCircle,
+ ExtensionPuzzle,
+ NPopover
},
props: ['type', 'row', 'characterSelectModel', 'tags', 'func'],
setup(props) {
@@ -103,6 +143,7 @@ export default defineComponent({
let character_tags = ref([])
let scene_tags = ref([])
let tags = ref(props.tags)
+ let dialog = useDialog()
let characterData = ref([])
@@ -114,7 +155,6 @@ export default defineComponent({
watch(
() => props.characterSelectModel,
(value) => {
- debugger
// InitData(value);
if (value.value == 'drop') {
select_character_tags.value = []
@@ -149,7 +189,7 @@ export default defineComponent({
)
onMounted(async () => {
- // debugger
+ //
// await InitCharacterAndSceneData()
await window.mj.GetTagSelectModel((value) => {
characterSelectMoedlOptions.value = value.data
@@ -220,14 +260,24 @@ export default defineComponent({
* @param {*} tags
*/
async function InitCharacterAndSceneData() {
- debugger
// if (!tags) return
character_tags.value = cloneDeep(tags.value.character_tags)
- character_tags.value.forEach((item) => {
- item.children = null
- })
+ for (let i = 0; i < character_tags.value.length; i++) {
+ let item = character_tags.value[i]
+ character_tags.value[i].children = null
+ if (!item.hasOwnProperty('isShow') || item.isShow == false) {
+ character_tags.value.splice(i, 1)
+ i--
+ }
+ }
scene_tags.value = cloneDeep(tags.value.scene_tags)
-
+ for (let i = 0; i < scene_tags.value.length; i++) {
+ let item = scene_tags.value[i]
+ if (!item.hasOwnProperty('isShow') || item.isShow == false) {
+ scene_tags.value.splice(i, 1)
+ i--
+ }
+ }
select_character_tags.value = []
select_scene_tags.value = []
// 初始化数据（选择为true）
@@ -304,6 +354,47 @@ export default defineComponent({
}
}
+ let dp = null
+ /**
+ * 开始人物匹配
+ */
+ async function MatchUser() {
+ // 先监听对应的方法
+ window.api.setEventListen([DEFINE_STRING.MJ.MACTH_USER_RETURN], (value) => {
+ // 返回的数据都是有效的
+ // 获取指定
+ let temp_data = props.func.getData(null)
+ // 调用方法，然后，传递一个回调函数
+ props.func.modifyData(() => {
+
+ console.log(temp_data)
+ // 修改当前指定ID的data行
+ let index = temp_data.findIndex((x) => x.id == value.id)
+ if (index >= 0) {
+ temp_data[index].character_tags = value.match_character
+ }
+ return temp_data
+ })
+ })
+ // 拿到现在所有的数据
+ let da = props.func.getData(null)
+ // 开始调用方法
+ await window.mj.AutoMatchUser(JSON.stringify(da), async (value) => {
+ setTimeout(() => {
+ if (dp) {
+ dp.destroy()
+ }
+ }, 1000)
+ await RefreshTagData()
+ if (value.code == 0) {
+ message.error(value.message)
+ window.api.showGlobalMessageDialog(value)
+ return
+ }
+ window.api.showGlobalMessageDialog(value)
+ })
+ }
+
return {
characterData,
row,
@@ -321,7 +412,8 @@ export default defineComponent({
title_character_select_model,
RefreshTagData,
UpdateCharacterSelect,
- UpdateSceneSelect
+ UpdateSceneSelect,
+ MatchUser
}
}
})
diff --git a/src/renderer/src/components/Original/Components/DataTableGptPromptRow.vue b/src/renderer/src/components/Original/Components/DataTableGptPromptRow.vue
index 5b4e4c4..0d6a0c5 100644
--- a/src/renderer/src/components/Original/Components/DataTableGptPromptRow.vue
+++ b/src/renderer/src/components/Original/Components/DataTableGptPromptRow.vue
@@ -142,7 +142,7 @@ export default defineComponent({
message.error('当前翻译的数据里面没有中文')
}
} else if (key == 'chinese') {
- debugger
+
let t = [[toRaw(row.value)], 'en', 'zh', false, false]
await window.mj.TranslateReturnNowTask(JSON.stringify(t), (value) => {
if (value.code == 0) {
diff --git a/src/renderer/src/components/Original/Components/DataTableParameterRow.vue b/src/renderer/src/components/Original/Components/DataTableParameterRow.vue
index 70d63dd..8845b73 100644
--- a/src/renderer/src/components/Original/Components/DataTableParameterRow.vue
+++ b/src/renderer/src/components/Original/Components/DataTableParameterRow.vue
@@ -66,7 +66,7 @@ export default defineComponent({
});
async function onUpdateChecked(v) {
- debugger;
+
row.adetailer = v;
}
diff --git a/src/renderer/src/components/Original/Components/DataTablePromptRow.vue b/src/renderer/src/components/Original/Components/DataTablePromptRow.vue
index 3e30ed2..b153280 100644
--- a/src/renderer/src/components/Original/Components/DataTablePromptRow.vue
+++ b/src/renderer/src/components/Original/Components/DataTablePromptRow.vue
@@ -1,10 +1,23 @@
-
+
提示词命令
+
+
+
+
+
+
+
+
+
+ 设置合并排序模式
+
- 合并命令
+ 合并命令
- 敏感词检查
@@ -24,6 +37,10 @@
粘贴MJ里面的图片链接。自动下载到对应的行。并分割。
+
单句合并
+
import { ref, h, onMounted, defineComponent, toRaw, watch } from 'vue'
-import { NButton, NInput, NPopover, useMessage, useDialog, NDropdown } from 'naive-ui'
+import { NButton, NInput, NPopover, useMessage, useDialog, NDropdown, NIcon } from 'naive-ui'
import { DEFINE_STRING } from '../../../../../define/define_string'
import InputDialogContent from './InputDialogContent.vue'
+import { Construct } from '@vicons/ionicons5'
+import DynamicTagsSelect from '../../Components/DynamicTagsSelect.vue'
+import { usePromptStore } from '../../../../../stores/prompt'
export default defineComponent({
components: {
NButton,
NInput,
NPopover,
- NDropdown
+ NDropdown,
+ NIcon,
+ Construct,
+ NPopover
},
props: ['type', 'row', 'index', 'func'],
setup(props) {
@@ -56,10 +79,7 @@ export default defineComponent({
let row = ref(props.row)
let input_status = ref('default')
let image_url_ref = ref(null)
-
- // let input_image_
-
- // 重新计算命令
+ let promptStore = usePromptStore()
// 监听数据变化
watch(
@@ -140,10 +160,15 @@ export default defineComponent({
}
/**
- * 合并提示词
+ * 合并命令
+ * @param {*} key
*/
- async function MergePrompt() {
- props.func.mergePrompt(null)
+ async function MergePrompt(key) {
+ if (row.value.id) {
+ props.func.mergePrompt(row.value.id, key)
+ } else {
+ props.func.mergePrompt(null, key)
+ }
}
/**
@@ -167,7 +192,6 @@ export default defineComponent({
style: `width : ${dialogWidth}px; min-height : ${dialogHeight}px`,
maskClosable: false,
onClose: async () => {
- debugger
let row_image_url = image_url_ref.value.data
// 下载指定的图片地址并且分割
@@ -196,7 +220,62 @@ export default defineComponent({
* @param key
*/
async function MergePromptSelect(key) {
- props.func.mergePrompt(key)
+ MergePrompt(key)
+ }
+
+ async function SaveFunction(value, options) {
+ // 开始保存
+
+ // 判断当前的数据是不是options中的数据数量是不是相同
+ if (value.length != options.length) {
+ message.error('要保存的数据量和下拉选择的的数据量不一致')
+ return
+ }
+ promptStore.InitPromptSort(value)
+
+ // 开始保存
+ await window.pmpt.SavePromptSort(value, (value) => {
+ if (value.code == 0) {
+ message.error(value.message)
+ reutrn
+ }
+ message.success(value.message)
+ // 保存成功，修改store
+ })
+ }
+
+ /**
+ * 设置合并的模式
+ */
+ async function SetMergeModel() {
+ // 获取当前的排序数据
+ await window.pmpt.GetPromptSortOptions((value) => {
+ let options = value.data
+
+ dialog.create({
+ name: 'setMergeModel',
+ title: '设置合并排序模式',
+ content: () =>
+ h(DynamicTagsSelect, {
+ options: options,
+ tagType: 'success',
+ placeholder: '选择当前的prompt排序方式',
+ SaveFunction: SaveFunction,
+ initData: promptStore.GetPromptSort,
+ max: 4
+ }),
+ style: `width : 500px; `,
+ maskClosable: false,
+ onPositiveClick: async () => {}
+ })
+ })
+ }
+
+ /**
+ * 单句合并
+ */
+ async function SingleMergePrompt() {
+ MergePrompt(null)
}
return {
@@ -213,7 +292,9 @@ export default defineComponent({
MergePromptOptions: [
{ label: 'SD模式合并', key: 'sd_merge' },
{ label: 'MJ模式合并', key: 'mj_merge' }
- ]
+ ],
+ SetMergeModel,
+ SingleMergePrompt
}
}
})
diff --git a/src/renderer/src/components/Original/Components/DataTableShowGenerateImage.vue b/src/renderer/src/components/Original/Components/DataTableShowGenerateImage.vue
index aca0be6..80bd700 100644
--- a/src/renderer/src/components/Original/Components/DataTableShowGenerateImage.vue
+++ b/src/renderer/src/components/Original/Components/DataTableShowGenerateImage.vue
@@ -104,6 +104,8 @@ import {
NPopover,
NTag
} from 'naive-ui'
+import { usePromptStore } from '../../../../../stores/prompt'
+import { useImageStore } from '../../../../../stores/image'
export default defineComponent({
components: {
@@ -117,6 +119,8 @@ export default defineComponent({
},
props: ['initData', 'type', 'image_generate_category', 'func'],
setup(props) {
+ let imageStore = useImageStore()
+ let promptStore = usePromptStore()
let message = useMessage()
let data = ref(props.initData)
let type = ref(props.type)
@@ -167,7 +171,7 @@ export default defineComponent({
onMounted(async () => {
await window.api.InitSDConfig((value) => {
- debugger
+
if (value.code == 0) {
message.error(value.message)
return
@@ -210,23 +214,24 @@ export default defineComponent({
e.dataTransfer.effectAllowed = 'move'
console.log('move', e.target)
dragTarget = e.target
+ imageStore.SetDragTarget(e.target)
}
// 图片拖拽结束事件
async function imageDragDrop(e) {
- debugger
+
console.log('end', e.target, dragTarget)
// 判断原始数据是不是为空
- if (dragTarget == null) {
- message.error('只能拖拽到当前行的图片上')
- return
- }
+ // if (dragTarget == null) {
+ // message.error('只能拖拽到当前行的图片上')
+ // return
+ // }
// 判断结束位置是不是主图片
if (e.target.getAttribute('mainImage') != '1') {
message.error('图片只能拖拽到主图片上')
return
}
- let source_img = dragTarget.src
+ let source_img = imageStore.GetDragTarget.src
.split('?')[0]
.replace(/^file:\/\/\//, '')
.replace(/^\//, '')
@@ -253,6 +258,7 @@ export default defineComponent({
async function UpdateImageGenerateCategory(value, option) {
// 更新配置文件和缓存
window.config.image_generate_category = value
+ promptStore.UpdateImageGenerateCategory(value)
// 保存文件
await window.api.ModifySampleSetting(
JSON.stringify({
diff --git a/src/renderer/src/components/Original/Components/EditWord.vue b/src/renderer/src/components/Original/Components/EditWord.vue
index 552aa2a..c8dfd44 100644
--- a/src/renderer/src/components/Original/Components/EditWord.vue
+++ b/src/renderer/src/components/Original/Components/EditWord.vue
@@ -16,7 +16,7 @@
合并
+ 一键复制内容
-
+
@@ -25,6 +19,7 @@ import { NImage, useMessage } from 'naive-ui'
import { DEFINE_STRING } from '../../../../define/define_string'
import MenuButton from './MenuButton.vue'
import DataTable from './DataTable.vue'
+import { usePromptStore } from '../../../../stores/prompt'
export default defineComponent({
components: {
@@ -33,16 +28,16 @@ export default defineComponent({
MenuButton
},
setup() {
+ let promptStore = usePromptStore()
let message = useMessage()
let data = ref([])
let tags = ref({})
let AnalyzeCharacter = ref('')
let TagTreeData = ref([])
- let suffix_prompt = ref(null)
- let prefix_prompt = ref(null)
let promptError = true
async function InitData() {
+
// 加载
// 初始化加载项目下面的分镜好的文案
// 并判断是不是有洗稿后的文件。一并加载
@@ -65,20 +60,18 @@ export default defineComponent({
// 判断是不是有前缀
await window.api.GetConfigJson(JSON.stringify([null, {}]), async (value) => {
- debugger
if (value.code == 0) {
message.error(value.message)
return
}
- suffix_prompt.value = value.data.suffix_prompt
- prefix_prompt.value = value.data.prefix_prompt
+ promptStore.UpdateSuffix(value.data.suffix_prompt)
+ promptStore.UpdatePrefix(value.data.prefix_prompt)
})
// 读取data数据对应的prompt文件
for (let i = 0; i < data.value.length; i++) {
const item = data.value[i]
await window.api.GetPromptJson(item.name, (value) => {
- debugger
console.log(value)
if (value.code == 0 && promptError) {
message.error(value.message)
@@ -98,7 +91,7 @@ export default defineComponent({
message.error(value.message)
return
}
- debugger
+
tags.value = value.data
// 加载完毕之后，需要刷新当前的data中的tag数据
console.log(data, tags)
@@ -112,7 +105,9 @@ export default defineComponent({
// 循环判断当前的character_tags对应的key在tags.character_tags中是否存在,存在覆盖，不存在删除
for (let j = element.character_tags.length - 1; j >= 0; j--) {
const item = element.character_tags[j]
- let index = tags.value.character_tags.findIndex((tag) => tag.key == item.key)
+ let index = tags.value.character_tags.findIndex(
+ (tag) => tag.key == item.key && tag.isShow == true
+ )
if (index != -1) {
element.character_tags[j] = tags.value.character_tags[index]
} else {
@@ -126,17 +121,30 @@ export default defineComponent({
})
}
+ /**
+ * 初始化数据
+ */
+ async function InItPromptSort() {
+
+ await window.pmpt.GetPromptSort((value) => {
+ if (value.code == 0) {
+ message.error(value.message)
+ return
+ }
+ promptStore.InitPromptSort(value.data)
+ })
+ }
+
onMounted(async () => {
await InitData()
await InitTags()
+ await InItPromptSort()
})
return {
data,
AnalyzeCharacter,
TagTreeData,
- prefix_prompt,
- suffix_prompt,
InitData,
InitTags,
tags
diff --git a/src/renderer/src/components/Original/MenuButton.vue b/src/renderer/src/components/Original/MenuButton.vue
index 0ad3fc3..8355fb9 100644
--- a/src/renderer/src/components/Original/MenuButton.vue
+++ b/src/renderer/src/components/Original/MenuButton.vue
@@ -324,7 +324,7 @@ export default defineComponent({
)
} else if (value == 'resetPrompt') {
// 重置提示词
- debugger
+
console.log(data)
await ResetPrompt()
} else if (value == 'resetImage') {
@@ -349,7 +349,7 @@ export default defineComponent({
auto_save,
railStyle,
AutoSaveUpdate: (value) => {
- debugger
+
auto_save.value = value
window.config.auto_save = value
},
diff --git a/src/renderer/src/components/Setting/ClipSetting.vue b/src/renderer/src/components/Setting/ClipSetting.vue
index f4d35fc..85530b0 100644
--- a/src/renderer/src/components/Setting/ClipSetting.vue
+++ b/src/renderer/src/components/Setting/ClipSetting.vue
@@ -191,7 +191,7 @@ export default defineComponent({
* 获取温馨提示列表（右上角）
*/
async function getFriendlyReminderList() {
- debugger;
+
friendlyReminderData.value = [];
await window.api.getFriendlyReminderList((value) => {
friendlyReminderData.value = value.value.filter(item => item.id != "0" && item.id != "1")
@@ -203,7 +203,7 @@ export default defineComponent({
*/
async function GetFriendlyReminder() {
let friendlyReminderSelectDraft_name = friendlyReminderSelectDraft.value.draf_name;
- debugger;
+
console.log(friendlyReminderSelectDraft_name);
if (friendlyReminderTextName.value == "" || friendlyReminderTextName.value == null || friendlyReminderSelectDraft_name == "" || friendlyReminderSelectDraft_name == null) {
message.error("请选择草稿地址和名称");
diff --git a/src/renderer/src/components/Setting/Components/AddGptPrompts.vue b/src/renderer/src/components/Setting/Components/AddGptPrompts.vue
index 5230b1c..b1c9253 100644
--- a/src/renderer/src/components/Setting/Components/AddGptPrompts.vue
+++ b/src/renderer/src/components/Setting/Components/AddGptPrompts.vue
@@ -120,7 +120,7 @@ export default defineComponent({
return;
}
await window.api.GenerateGptExampleOut(JSON.stringify(toRaw(prompt_data.value)), (value) => {
- debugger;
+
console.log(value);
if (value.code == 0) {
message.error(value.message);
@@ -134,7 +134,7 @@ export default defineComponent({
* 添加提示词案例输出数据
*/
async function AddExamplePrompt() {
- debugger;
+
let last_data = prompt_data.value.prompt_example[prompt_data.value.prompt_example.length - 1];
if (last_data != null) {
if (isEmpty(last_data.user_content)) {
@@ -156,7 +156,7 @@ export default defineComponent({
// 删除案例输出
async function DeleteExampleOut(example, index) {
- debugger;
+
if (index > prompt_data.value.prompt_example.length - 1) {
message.error("删除的案例不存在");
return;
diff --git a/src/renderer/src/components/Setting/MJSetting.vue b/src/renderer/src/components/Setting/MJSetting.vue
index 5a9644b..41279b7 100644
--- a/src/renderer/src/components/Setting/MJSetting.vue
+++ b/src/renderer/src/components/Setting/MJSetting.vue
@@ -241,7 +241,7 @@ export default defineComponent({
let mj_api_options = ref([])
let image_suffix = computed(() => {
- debugger
+
let text = image_model_options.value.findIndex((item) => {
return item.value == mjSetting.value.image_model
})
@@ -262,7 +262,7 @@ export default defineComponent({
await window.api.GetDefineConfigJsonByProperty(
JSON.stringify(['img_base', 'mj_config', false, null]),
(value) => {
- debugger
+
console.log(value)
if (value.code == 0) {
message.error(value.message)
@@ -393,7 +393,7 @@ export default defineComponent({
)
.then((response) => response.json())
.then((data) => {
- debugger
+
// 修改配置信息(判断是不是niji或者是mj)
// 填充mj，niji数据
if (data.applications && data.application_commands) {
@@ -447,7 +447,7 @@ export default defineComponent({
await window.api.SaveDefineConfigJsonByProperty(
JSON.stringify(['img_base', 'mj_config', toRaw(mjSetting.value), false]),
(value) => {
- debugger
+
console.log(value)
if (value.code == 0) {
message.error(value.message)
@@ -520,7 +520,7 @@ export default defineComponent({
* 打开购买GPT的地址
*/
async function openGptBuyUrl() {
- debugger
+
let tmp_gb = mj_api_options.value.filter((item) => item.value == mjSetting.value.mj_api_url)
if (tmp_gb.length == 0) {
message.error('当前选择的服务商没有购买地址！')
diff --git a/src/renderer/src/components/Setting/SDSetting.vue b/src/renderer/src/components/Setting/SDSetting.vue
index 8c64a4d..fea16e2 100644
--- a/src/renderer/src/components/Setting/SDSetting.vue
+++ b/src/renderer/src/components/Setting/SDSetting.vue
@@ -167,7 +167,7 @@ export default defineComponent({
onMounted(async () => {
await window.api.InitSDConfig((value) => {
- debugger
+
if (value.code == 0) {
message.error(value.message)
return
@@ -231,7 +231,7 @@ export default defineComponent({
*/
async function LoadSDServiceData() {
await window.sd.LoadSDServiceData(toRaw(formValue.value).webui_api_url, (value) => {
- debugger
+
if (value.code == 0) {
message.error(value.message)
return
diff --git a/src/renderer/src/components/Setting/Setting.vue b/src/renderer/src/components/Setting/Setting.vue
index 950fc80..5fa8857 100644
--- a/src/renderer/src/components/Setting/Setting.vue
+++ b/src/renderer/src/components/Setting/Setting.vue
@@ -245,7 +245,7 @@ export default defineComponent({
* 加载GPT的配置信息
*/
async function InitGptOptions() {
- debugger
+
await window.api.getGptBusinessOption('all', (value) => {
if (value.code == 0) {
message.error(value.message)
@@ -368,7 +368,7 @@ export default defineComponent({
* 打开购买GPT的地址
*/
async function openGptBuyUrl() {
- debugger
+
let tmp_gb = gpt_options.value.filter((item) => item.value == formValue.value.gpt_business)
if (tmp_gb.length == 0) {
message.error('当前选择的服务商没有购买地址！')
@@ -387,7 +387,7 @@ export default defineComponent({
* @param {*} value 主题名称
*/
async function ChangeMode(value) {
- debugger
+
console.log(value)
const isDarkMode = await window.darkMode.toggle(value)
}
diff --git a/src/renderer/src/components/Setting/VideoGenerateSetting.vue b/src/renderer/src/components/Setting/VideoGenerateSetting.vue
index 54e33df..fc2ad04 100644
--- a/src/renderer/src/components/Setting/VideoGenerateSetting.vue
+++ b/src/renderer/src/components/Setting/VideoGenerateSetting.vue
@@ -1,29 +1,58 @@
- 注意：
所有的配置都是基于1440 * 1080。会根据分辨率自动计算匹配
-
-
-
-
-
- *
-
-
+ 注意：
所有的配置都是基于1440 * 1080。会根据分辨率自动计算匹配
+
+
+
+
+
+ *
+
+
-
-
-
-
- 上下：
-
- 左右：
-
-
+
+
+
+ 设置的值越大，图片移动的速度越快（若是图片的尺寸不够，也会被放的越大）
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
设置的值越大，图片移动的速度越快（若是图片的尺寸不够，也会被放的越大）
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 保存
-
-
-
-
-
- 注意： 当前有些字体读取不能准确获取。可以在后面的下面的编辑列表中进行简单的修改
-
-
-
-
- 更新字体列表
-
+
+
+
+
+ 保存
+
+
+
+
+
+ 注意： 当前有些字体读取不能准确获取。可以在后面的下面的编辑列表中进行简单的修改
+
+
+
+
+
+
+ 更新字体列表
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
- 保存信息
-
+
+
+
+
+
+
+ 保存信息
+
-
-
+
+
-
- 注意： 当前有些字体读取不能准确获取。可以在后面的下面的编辑列表中进行简单的修改
-
-
-
-
-
-
-
- 更新字体列表
-
+
+
+ 注意： 当前有些字体读取不能准确获取。可以在后面的下面的编辑列表中进行简单的修改
+
+
+
+
+
+
+
+
+
+ 更新字体列表
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
- 保存信息
-
+
+
+
+
+
+
+ 保存信息
+
-
-
+
+
-
-
- 注意：
-
设置背景乐对应的文件夹,选择对应的分类,可以随机匹配音乐
-
-
+
+
+ 注意：
+
设置背景乐对应的文件夹,选择对应的分类,可以随机匹配音乐
+
+
\ No newline at end of file
+
diff --git a/src/renderer/src/components/Watermark/GetWaterMask.vue b/src/renderer/src/components/Watermark/GetWaterMask.vue
index 6bce69a..76040cc 100644
--- a/src/renderer/src/components/Watermark/GetWaterMask.vue
+++ b/src/renderer/src/components/Watermark/GetWaterMask.vue
@@ -174,7 +174,7 @@ export default defineComponent({
* @param image
*/
function getCurrentWidthHeight(image) {
- debugger
+
let image_width = 512
let image_height = 512
// 设置图片的大小
@@ -212,7 +212,7 @@ export default defineComponent({
* 停止画
*/
function stopDrawing() {
- debugger
+
isDrawing = false
canvasHistory.push(imageCanvas.value.toDataURL('image/png'))
console.log(canvasHistory)
@@ -294,7 +294,7 @@ export default defineComponent({
* 回撤
*/
async function undo() {
- debugger
+
if (step <= 0) {
// 如果没有可以撤销的步骤，就清空画布
imageContext.value.clearRect(
@@ -388,7 +388,7 @@ export default defineComponent({
message.error(value.message)
return
}
- debugger
+
const arrayBuffer = value.data
const blob = new Blob([arrayBuffer], { type: 'image/png' })
const reader = new FileReader()
@@ -406,7 +406,7 @@ export default defineComponent({
}
async function SaveMask() {
- debugger
+
// 判断当前是不是又蒙板
if (canvasHistory.length <= 1) {
message.error('请先绘制蒙板')
@@ -418,7 +418,7 @@ export default defineComponent({
await window.img.Base64ToFile(
JSON.stringify([base64, `data/mask/mask_${new Date().getTime()}.png`]),
async (value) => {
- debugger
+
if (value.code == 0) {
message.error(value.message)
return
@@ -486,7 +486,7 @@ export default defineComponent({
})
// 提交处理任务，默认处理文件夹下面的所有的PNG图片
await window.img.BatchProcessImage('tmp/input_crop', (value) => {
- debugger
+
// 不管返回什么，这边都关掉
setTimeout(() => {
if (dp) {
@@ -496,6 +496,7 @@ export default defineComponent({
if (value.code == 0) {
message.error(value.message)
+ window.api.showGlobalMessageDialog(value)
return
}
window.api.showGlobalMessageDialog(value)
diff --git a/src/renderer/src/main.js b/src/renderer/src/main.js
index c1b07a3..7354213 100644
--- a/src/renderer/src/main.js
+++ b/src/renderer/src/main.js
@@ -3,6 +3,8 @@ import { createRouter, createWebHashHistory } from 'vue-router';
import App from './App.vue'
import { Home } from '@vicons/ionicons5';
const app = createApp(App);
+import { createPinia } from 'pinia'
+const pinia = createPinia()
const routes = [
{
@@ -33,5 +35,6 @@ const router = createRouter({
routes
})
app.use(router);
+app.use(pinia)
app.mount('#app')
diff --git a/src/stores/image.js b/src/stores/image.js
new file mode 100644
index 0000000..c51b77a
--- /dev/null
+++ b/src/stores/image.js
@@ -0,0 +1,18 @@
+import { defineStore } from "pinia";
+
+export const useImageStore = defineStore('image', {
+ state: () => ({
+ dragTarget: null
+ }),
+ getters: {
+ GetDragTarget() {
+ return this.dragTarget;
+ }
+
+ },
+ actions: {
+ SetDragTarget(target) {
+ this.dragTarget = target;
+ }
+ }
+});
\ No newline at end of file
diff --git a/src/stores/prompt.js b/src/stores/prompt.js
new file mode 100644
index 0000000..156fad7
--- /dev/null
+++ b/src/stores/prompt.js
@@ -0,0 +1,68 @@
+import { defineStore } from "pinia";
+
+export const usePromptStore = defineStore('prompt', {
+ state: () => ({
+ // 提示词排序
+ prompt_sort: [],
+ selectStyle: [],
+ suffix: null, // 后缀
+ prefix: null, // 前缀
+ image_generate_category: null, // 选择生图的分类（sd,mj,d3)
+
+ isInit: false
+ }),
+ getters: {
+ // 获取提示词排序
+ GetPromptSort() {
+ return this.prompt_sort;
+ },
+ // 获取选中的风格
+ GetSelectStyle() {
+ return this.selectStyle
+ },
+
+ // 获取前缀
+ GetPrefix() {
+ return this.prefix;
+ },
+
+ // 获取后缀
+ GetSuffix() {
+ return this.suffix;
+ },
+
+ // 获取生图分类
+ GetImageGenerateCategory() {
+ return this.image_generate_category;
+ }
+ },
+ actions: {
+
+ // 更新提示词排序
+ InitPromptSort(value) {
+
+ this.prompt_sort = value;
+ },
+
+ // 更新
+ UpdateSelectStyleSort(value) {
+ this.selectStyle = value;
+ },
+
+ // 更新前缀
+ UpdatePrefix(value) {
+ this.prefix = value;
+ },
+
+ // 更新后缀
+ UpdateSuffix(value) {
+ this.suffix = value;
+ },
+
+ // 更新生图分类
+ UpdateImageGenerateCategory(value) {
+ this.image_generate_category = value;
+ }
+
+ }
+});
\ No newline at end of file