Skip to content

Commit

Permalink
fix(market): clean override with bulk mode
Browse files Browse the repository at this point in the history
  • Loading branch information
shigma committed Jan 21, 2024
1 parent f86a75e commit 0efd20b
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 12 deletions.
7 changes: 6 additions & 1 deletion plugins/market/client/components/install.vue
Expand Up @@ -101,7 +101,11 @@ function installDep(version: string, checkConfig = false, removeConfig = false)
if (!target) return
// workspace packages don't need to be installed
if (config.value.bulk && !workspace.value) {
config.value.override[target] = version
if (dep.value?.resolved === version || !version && !dep.value) {
delete config.value.override[target]
} else {
config.value.override[target] = version
}
active.value = ''
return
}
Expand Down Expand Up @@ -139,6 +143,7 @@ const unchanged = computed(() => {
|| version.value === store.dependencies?.[active.value]?.request && !!store.dependencies?.[active.value]?.resolved
})
const dep = computed(() => store.dependencies?.[active.value])
const current = computed(() => store.dependencies?.[active.value]?.resolved)
const local = computed(() => store.packages?.[active.value])
const versions = computed(() => store.registry?.[active.value])
Expand Down
20 changes: 10 additions & 10 deletions plugins/market/client/components/package.vue
Expand Up @@ -3,10 +3,10 @@
<td class="text-left pl-8">{{ name }}</td>

<td class="current">
<template v-if="!local">-</template>
<template v-else-if="local.workspace">工作区</template>
<template v-if="!dep">-</template>
<template v-else-if="dep.workspace">工作区</template>
<template v-else>
{{ local.resolved }}
{{ dep.resolved }}
<template v-if="compare">
({{ compare }})
</template>
Expand All @@ -18,15 +18,15 @@
<el-option value="">移除依赖</el-option>
<el-option v-for="({ result }, version) in data" :key="version" :value="version">
{{ version }}
<template v-if="version === local?.resolved">(当前)</template>
<template v-if="version === dep?.resolved">(当前)</template>
<span :class="[result, 'theme-color', 'dot-hint']"></span>
</el-option>
</el-select>
</td>
<td>
<template v-if="local?.invalid">暂不支持</template>
<el-button v-else-if="local?.workspace || data" @click="active = name">修改</el-button>
<template v-if="dep?.invalid">暂不支持</template>
<el-button v-else-if="dep?.workspace || data" @click="active = name">修改</el-button>
<template v-else>版本获取失败</template>
</td>
</tr>
Expand All @@ -43,7 +43,7 @@ const props = defineProps({
name: String,
})
const local = computed(() => store.dependencies?.[props.name])
const dep = computed(() => store.dependencies?.[props.name])
const compare = computed(() => {
const result = hasUpdate(props.name)
Expand All @@ -54,14 +54,14 @@ const compare = computed(() => {
const version = computed({
get() {
const value = config.value.override[props.name]
if (local.value?.resolved === value) {
if (dep.value?.resolved === value) {
return
} else {
return value === '' ? '移除依赖' : value
}
},
set(value) {
if (local.value?.resolved === value || !value && !local.value) {
if (dep.value?.resolved === value || !value && !dep.value) {
delete config.value.override[props.name]
} else {
config.value.override[props.name] = value
Expand All @@ -70,7 +70,7 @@ const version = computed({
})
const data = computed(() => {
if (local.value?.workspace || local.value?.invalid) return
if (dep.value?.workspace || dep.value?.invalid) return
return analyzeVersions(props.name, true)
})
Expand Down
2 changes: 1 addition & 1 deletion plugins/market/package.json
@@ -1,7 +1,7 @@
{
"name": "@koishijs/plugin-market",
"description": "Manage your bots and plugins with console",
"version": "2.9.3",
"version": "2.9.4",
"main": "lib/node/index.js",
"types": "lib/index.d.ts",
"exports": {
Expand Down

0 comments on commit 0efd20b

Please sign in to comment.