From bdaec4791b08d1e7f88cac8e72d2744b1ff45b16 Mon Sep 17 00:00:00 2001 From: Zhao Zuohong Date: Wed, 22 Nov 2023 15:18:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E9=AB=98=E6=8B=BC=E9=9F=B3=E5=8C=B9?= =?UTF-8?q?=E9=85=8D=E7=B2=BE=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/components.d.ts | 1 + ui/src/components/PlanEditor.vue | 4 ++-- ui/src/pages/Plan.vue | 12 ++++++------ ui/src/pages/Settings.vue | 4 ++-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ui/components.d.ts b/ui/components.d.ts index f0a900ac4..e14d4e1ad 100644 --- a/ui/components.d.ts +++ b/ui/components.d.ts @@ -21,6 +21,7 @@ declare module '@vue/runtime-core' { MaaWeekly: typeof import('./src/components/MaaWeekly.vue')['default'] MaaWeeklyNew: typeof import('./src/components/MaaWeeklyNew.vue')['default'] MaaWeeklypartly: typeof import('./src/components/MaaWeeklypartly.vue')['default'] + NA: typeof import('naive-ui')['NA'] NAvatar: typeof import('naive-ui')['NAvatar'] NButton: typeof import('naive-ui')['NButton'] NCard: typeof import('naive-ui')['NCard'] diff --git a/ui/src/components/PlanEditor.vue b/ui/src/components/PlanEditor.vue index 82fa9c405..189a86070 100644 --- a/ui/src/components/PlanEditor.vue +++ b/ui/src/components/PlanEditor.vue @@ -378,7 +378,7 @@ import { match } from 'pinyin-pro' :options="operators_with_free" class="operator-select" v-model:value="plan[facility].plans[i - 1].agent" - :filter="(p, o) => match(o.label, p, { precision: 'any' })" + :filter="(p, o) => match(o.label, p)" :render-label="render_op_label" /> @@ -399,7 +399,7 @@ import { match } from 'pinyin-pro' :options="operators_with_free" class="replacement-select" v-model:value="plan[facility].plans[i - 1].replacement" - :filter="(p, o) => match(o.label, p, { precision: 'any' })" + :filter="(p, o) => match(o.label, p)" :render-label="render_op_label" :render-tag="render_op_tag" /> diff --git a/ui/src/pages/Plan.vue b/ui/src/pages/Plan.vue index 5592954fd..7a9c2921f 100644 --- a/ui/src/pages/Plan.vue +++ b/ui/src/pages/Plan.vue @@ -277,7 +277,7 @@ import { match } from 'pinyin-pro' filterable :options="operators" v-model:value="current_conf.rest_in_full" - :filter="(p, o) => match(o.label, p, { precision: 'any' })" + :filter="(p, o) => match(o.label, p)" :render-label="render_op_label" :render-tag="render_op_tag" /> @@ -292,7 +292,7 @@ import { match } from 'pinyin-pro' filterable :options="operators" v-model:value="current_conf.exhaust_require" - :filter="(p, o) => match(o.label, p, { precision: 'any' })" + :filter="(p, o) => match(o.label, p)" :render-label="render_op_label" :render-tag="render_op_tag" /> @@ -306,7 +306,7 @@ import { match } from 'pinyin-pro' filterable :options="operators" v-model:value="current_conf.workaholic" - :filter="(p, o) => match(o.label, p, { precision: 'any' })" + :filter="(p, o) => match(o.label, p)" :render-label="render_op_label" :render-tag="render_op_tag" /> @@ -320,7 +320,7 @@ import { match } from 'pinyin-pro' filterable :options="operators" v-model:value="current_conf.resting_priority" - :filter="(p, o) => match(o.label, p, { precision: 'any' })" + :filter="(p, o) => match(o.label, p)" :render-label="render_op_label" :render-tag="render_op_tag" /> @@ -334,7 +334,7 @@ import { match } from 'pinyin-pro' filterable :options="operators" v-model:value="current_conf.refresh_trading" - :filter="(p, o) => match(o.label, p, { precision: 'any' })" + :filter="(p, o) => match(o.label, p)" :render-label="render_op_label" :render-tag="render_op_tag" /> @@ -351,7 +351,7 @@ import { match } from 'pinyin-pro' filterable :options="operators" v-model:value="current_conf.free_blacklist" - :filter="(p, o) => match(o.label, p, { precision: 'any' })" + :filter="(p, o) => match(o.label, p)" :render-label="render_op_label" :render-tag="render_op_tag" /> diff --git a/ui/src/pages/Settings.vue b/ui/src/pages/Settings.vue index 3a528599f..f5cde96a9 100644 --- a/ui/src/pages/Settings.vue +++ b/ui/src/pages/Settings.vue @@ -194,7 +194,7 @@ import { render_op_label, render_op_tag } from '@/utils/op_select' v-model:value="free_blacklist" :render-source-label="(o) => render_op_label(o.option)" :render-target-label="(o) => render_op_label(o.option)" - :filter="(p, o) => (p ? match(o.label, p, { precision: 'any' }) : true)" + :filter="(p, o) => (p ? match(o.label, p) : true)" />