Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

队列优化 #229

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open
9 changes: 7 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,17 @@
"element-plus": "^2.2.6",
"fuse.js": "^6.5.3",
"is-electron": "^2.2.0",
"localforage": "^1.10.0",
"lodash": "^4.17.21",
"monaco-editor": "^0.33.0",
"object-hash": "^2.2.0",
"pinia": "^2.0.14",
"ua-parser-js": "^1.0.2",
"vue": "^3.2.36",
"vue": "^3.2.41",
"vue-echarts": "^6.1.0",
"vue-i18n": "9",
"vue-router": "4"
"vue-router": "4",
"vuedraggable": "^4.1.0"
},
"devDependencies": {
"@babel/core": "^7.16.10",
Expand All @@ -47,6 +50,8 @@
"@iconify-json/fa6-regular": "^1.1.3",
"@iconify-json/fa6-solid": "^1.1.4",
"@tauri-apps/cli": "^1.0.0-rc.8",
"@types/events": "^3.0.0",
"@types/object-hash": "^2.2.1",
"@typescript-eslint/eslint-plugin": "^5.4.0",
"@typescript-eslint/parser": "^5.4.0",
"@vue/cli-plugin-babel": "~5.0.0",
Expand Down
4 changes: 4 additions & 0 deletions src/components.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ declare module '@vue/runtime-core' {
IEpArrowRight: typeof import('~icons/ep/arrow-right')['default']
IEpCheck: typeof import('~icons/ep/check')['default']
IEpCpu: typeof import('~icons/ep/cpu')['default']
IEpFolderChecked: typeof import('~icons/ep/folder-checked')['default']
IEpFolderRemove: typeof import('~icons/ep/folder-remove')['default']
IEpHelpFilled: typeof import('~icons/ep/help-filled')['default']
IEpHistogram: typeof import('~icons/ep/histogram')['default']
IEpHomeFilled: typeof import('~icons/ep/home-filled')['default']
Expand All @@ -83,6 +85,8 @@ declare module '@vue/runtime-core' {
IEpQuestionFilled: typeof import('~icons/ep/question-filled')['default']
IEpSearch: typeof import('~icons/ep/search')['default']
IEpSetting: typeof import('~icons/ep/setting')['default']
IEpSort: typeof import('~icons/ep/sort')['default']
IEpUser: typeof import('~icons/ep/user')['default']
IFa6SolidCircleQuestion: typeof import('~icons/fa6-solid/circle-question')['default']
IFa6SolidLink: typeof import('~icons/fa6-solid/link')['default']
IFa6SolidTerminal: typeof import('~icons/fa6-solid/terminal')['default']
Expand Down
6 changes: 3 additions & 3 deletions src/components/display/PresetItem.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="item br-3" @click="$emit('click')">
<div class="item br-3">
<div class="header">
<span class="fs-12">{{ props.name }}</span>
<div v-if="toolbar" class="buttons flex-row">
Expand Down Expand Up @@ -156,7 +156,7 @@ const tfData = computed(() => {
}
}
}

}

.c-avatar, .w-avatar, .tf-avatar {
Expand All @@ -165,4 +165,4 @@ const tfData = computed(() => {
width: 64px;
border: 1px solid #e9e9e9;
}
</style>
</style>
23 changes: 16 additions & 7 deletions src/components/misc/ClickEditLabel.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<template>
<div class="root">
<input
:value="value"
:value="content"
@input.stop="onInput"
@click="edit = true"
@blur="onBlur"
:style="inputStyle"
Expand All @@ -15,20 +16,28 @@
export default {
name: "ClickEditLabel",
props: {
"value": {},
"fontsize": {},
value: {},
fontsize: {},
editable: { default: true }
},
data() {
return {
edit: false,
content: this.value,
}
},
watch: {
value(newValue) {
this.content = newValue
}
},
methods: {
onInput(e) {
this.content = e.target.value
},
onBlur(e) {
let text = e.target.value;
this.edit = false;
this.$emit("input", text);
this.edit = false
this.$emit("input", this.content)
}
},
computed: {
Expand Down Expand Up @@ -89,4 +98,4 @@ export default {
}


</style>
</style>
38 changes: 37 additions & 1 deletion src/i18n/locales/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,13 @@ export default {
nav: "Navigation",
home: "Home",
repo: "My Repo",
account: "Account",
artifact: "Artifact",
kumi: "Artifact Group",
preset: "Preset",
compute: "Computation",
calculate: "Calculator",
sequenceOptimize: "Sequence Optimize",
teamOptimize: "Team Optimize",
potential: "Artifact Potential",
monaDB: "Mona DB",
Expand Down Expand Up @@ -1267,6 +1269,22 @@ export default {
Physical: "Physical",
None: "None",
},
accountPage: {
title: "Accounts and Syncing",
syncButton: "Sync with a local directory",
syncedButton: "Synced with the local directory",
addAccount: "Add an account",
chooseSyncBase: "Choose sync target",
browserBase: "Based on the browser storage",
fileBase: "Based on the local directory",
lastModifiedAt: "last modified at ",
confirmDelete: "Sure to delete?",
delete: "delete",
newAccountName: "New Account",
deletingAccount: "Deleting the account",
switchingAccount: "Switching accounts",
cancelSyncing: "Synchronization canceled",
},
artPage: {
shareDesc: "Use share link to import artifacts, expires in 1 day",
deleteUnseen: "delete unseen artifacts",
Expand Down Expand Up @@ -1847,6 +1865,24 @@ export default {
Geo: "Geo Res",
Physical: "Physical Res",
},
sequencePage: {
applyPresetDialogTitle: "Apply Preset",
selectArtifact: "Select Artifact",
importSequence: "Import Sequence",
saveSequence: "Save Sequence",
startCalculation: "Start Calc.",
stopCalculation: "Stop Calc.",
saveToDirectory: "Save to Directory",
import: "Import",
compare: "Compare",
comparing: "Comparing",
cancel: "Cancel",
member: "Member",
details: "Details",
calculateThis: "Calculate This",
calculateThisAndBelow: "Calculate This and Below",
addMember: "Add Member",
},
teamPage: {
start: "Start",
add: "Add Member",
Expand Down Expand Up @@ -2100,4 +2136,4 @@ export default {
Resonance: "Resonance",
Common: "Custom",
}
}
}
38 changes: 37 additions & 1 deletion src/i18n/locales/zh-cn.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,13 @@ export default {
nav: "导航",
home: "首页",
repo: "我的仓库",
account: "账号",
artifact: "圣遗物",
kumi: "圣遗物套装",
preset: "计算预设",
compute: "计算",
calculate: "计算器",
sequenceOptimize: "队列优化",
teamOptimize: "多人优化",
potential: "圣遗物潜力",
monaDB: "莫娜数据库",
Expand Down Expand Up @@ -1267,6 +1269,22 @@ export default {
advanced: "进阶属性",
ele: "元素属性",
},
accountPage: {
title: "账号与同步",
syncButton: "同步本地目录",
syncedButton: "已同步本地目录",
addAccount: "添加账号",
chooseSyncBase: "选择同步基准",
browserBase: "以浏览器存储为准",
fileBase: "以本地目录为准",
lastModifiedAt: "最后修改于",
confirmDelete: "确定删除吗?",
delete: "删除",
newAccountName: "新账号",
deletingAccount: "删除账号中",
switchingAccount: "切换账号中",
cancelSyncing: "取消同步",
},
artPage: {
shareDesc: "通过分享链接可以快速导入圣遗物,有效期为一天",
deleteUnseen: "删除不存在的圣遗物",
Expand Down Expand Up @@ -1849,6 +1867,24 @@ export default {
Geo: "岩抗",
Physical: "物抗",
},
sequencePage: {
applyPresetDialogTitle: "导入预设",
selectArtifact: "选择圣遗物",
importSequence: "导入序列",
saveSequence: "保存序列",
startCalculation: "开始计算",
stopCalculation: "中止计算",
saveToDirectory: "存至收藏夹",
import: "导入",
compare: "对比",
comparing: "对比中",
cancel: "取消",
member: "成员",
details: "角色详情",
calculateThis: "计算这个",
calculateThisAndBelow: "计算这个及以下",
addMember: "添加成员",
},
teamPage: {
start: "开始计算",
add: "添加成员",
Expand Down Expand Up @@ -2102,4 +2138,4 @@ export default {
Resonance: "元素共鸣",
Common: "自定义",
}
}
}
Loading