From 6d591719e24ca02d8e4d9e957ae668eb647c5c11 Mon Sep 17 00:00:00 2001 From: timongh <46739861+timongh@users.noreply.github.com> Date: Tue, 20 Sep 2022 22:19:15 +0800 Subject: [PATCH 1/2] Change feeds to define api --- registry/lib/components/feeds/copy-link/index.ts | 6 +++--- registry/lib/components/feeds/disable-details/index.ts | 6 +++--- registry/lib/components/feeds/extend-live/index.ts | 6 +++--- registry/lib/components/feeds/filter/index.ts | 7 ++++--- registry/lib/components/feeds/fixed-sidebars/index.ts | 6 +++--- registry/lib/components/feeds/fold-comments/index.ts | 6 +++--- registry/lib/components/feeds/full-content/index.ts | 6 +++--- registry/lib/components/feeds/full-title/index.ts | 6 +++--- registry/lib/components/feeds/unfold/index.ts | 6 +++--- 9 files changed, 28 insertions(+), 27 deletions(-) diff --git a/registry/lib/components/feeds/copy-link/index.ts b/registry/lib/components/feeds/copy-link/index.ts index 1fc8a2d8f..767d1db89 100644 --- a/registry/lib/components/feeds/copy-link/index.ts +++ b/registry/lib/components/feeds/copy-link/index.ts @@ -1,4 +1,4 @@ -import { ComponentMetadata } from '@/components/types' +import { defineComponentMetadata } from '@/components/define' import { FeedsCard } from '@/components/feeds/api' import { feedsUrls } from '@/core/utils/urls' @@ -17,7 +17,7 @@ const entry = async () => { added: addCopyLinkButton, }) } -export const component: ComponentMetadata = { +export const component = defineComponentMetadata({ name: 'copyFeedsLink', displayName: '复制动态链接', description: { @@ -29,4 +29,4 @@ export const component: ComponentMetadata = { componentsTags.feeds, componentsTags.utils, ], -} +}) diff --git a/registry/lib/components/feeds/disable-details/index.ts b/registry/lib/components/feeds/disable-details/index.ts index 4fa0e215b..598bf5fa8 100644 --- a/registry/lib/components/feeds/disable-details/index.ts +++ b/registry/lib/components/feeds/disable-details/index.ts @@ -1,4 +1,4 @@ -import { ComponentMetadata } from '@/components/types' +import { defineComponentMetadata } from '@/components/define' import { FeedsCard, feedsCardTypes } from '@/components/feeds/api' import { feedsUrls } from '@/core/utils/urls' @@ -73,7 +73,7 @@ const entry = async () => { added: disableDetails, }) } -export const component: ComponentMetadata = { +export const component = defineComponentMetadata({ name: 'disableFeedsDetails', displayName: '禁止跳转动态详情', tags: [ @@ -92,4 +92,4 @@ export const component: ComponentMetadata = { addStyle() enabled = true }, -} +}) diff --git a/registry/lib/components/feeds/extend-live/index.ts b/registry/lib/components/feeds/extend-live/index.ts index 0988bb399..abbec8a6d 100644 --- a/registry/lib/components/feeds/extend-live/index.ts +++ b/registry/lib/components/feeds/extend-live/index.ts @@ -1,4 +1,4 @@ -import { ComponentMetadata } from '@/components/types' +import { defineComponentMetadata } from '@/components/define' import { styledComponentEntry } from '@/components/styled-component' interface LiveInfo { @@ -63,7 +63,7 @@ const entry = async () => { console.log(presented, extend) } -export const component: ComponentMetadata = { +export const component = defineComponentMetadata({ name: 'extendFeedsLive', displayName: '直播信息扩充', description: { @@ -77,4 +77,4 @@ export const component: ComponentMetadata = { urlInclude: [ /^https:\/\/t\.bilibili\.com\/$/, ], -} +}) diff --git a/registry/lib/components/feeds/filter/index.ts b/registry/lib/components/feeds/filter/index.ts index 4dea62775..c4895ce46 100644 --- a/registry/lib/components/feeds/filter/index.ts +++ b/registry/lib/components/feeds/filter/index.ts @@ -1,5 +1,6 @@ +import { defineComponentMetadata } from '@/components/define' import { feedsCardsManager } from '@/components/feeds/api' -import { ComponentMetadata, ComponentOptions } from '@/components/types' +import { ComponentOptions } from '@/components/types' import { feedsFilterPlugin } from './plugin' const entry = async () => { @@ -50,7 +51,7 @@ export type FeedsFilterOptions = { sideCards: number[] specialTypes: number[] } -export const component: ComponentMetadata = { +export const component = defineComponentMetadata({ name: 'feedsFilter', displayName: '动态过滤器', description: { @@ -68,4 +69,4 @@ export const component: ComponentMetadata = { /^https:\/\/t\.bilibili\.com\/$/, ], plugin: feedsFilterPlugin, -} +}) diff --git a/registry/lib/components/feeds/fixed-sidebars/index.ts b/registry/lib/components/feeds/fixed-sidebars/index.ts index ee10bf626..3c188b9c1 100644 --- a/registry/lib/components/feeds/fixed-sidebars/index.ts +++ b/registry/lib/components/feeds/fixed-sidebars/index.ts @@ -1,4 +1,4 @@ -import { ComponentMetadata } from '@/components/types' +import { defineComponentMetadata } from '@/components/define' const id = 'fixed-sidebars-style' const entry = async () => { @@ -6,7 +6,7 @@ const entry = async () => { disableProfilePopup() } -export const component: ComponentMetadata = { +export const component = defineComponentMetadata({ name: 'fixedFeedsSidebars', instantStyles: [ { @@ -26,4 +26,4 @@ export const component: ComponentMetadata = { urlInclude: [ /^https:\/\/t\.bilibili\.com\/$/, ], -} +}) diff --git a/registry/lib/components/feeds/fold-comments/index.ts b/registry/lib/components/feeds/fold-comments/index.ts index f016ec09f..ee268faf8 100644 --- a/registry/lib/components/feeds/fold-comments/index.ts +++ b/registry/lib/components/feeds/fold-comments/index.ts @@ -1,4 +1,4 @@ -import { ComponentMetadata } from '@/components/types' +import { defineComponentMetadata } from '@/components/define' import { styledComponentEntry } from '@/components/styled-component' import { feedsUrlsWithoutDetail } from '@/core/utils/urls' import { feedsCardsManager } from '@/components/feeds/api' @@ -76,7 +76,7 @@ const entry = async () => { }) } -export const component: ComponentMetadata = { +export const component = defineComponentMetadata({ name: 'foldComments', displayName: '快速收起评论', description: { @@ -87,4 +87,4 @@ export const component: ComponentMetadata = { componentsTags.feeds, ], entry: styledComponentEntry(() => import('./fold-comment.scss'), entry), -} +}) diff --git a/registry/lib/components/feeds/full-content/index.ts b/registry/lib/components/feeds/full-content/index.ts index f76b6e6a3..27062a026 100644 --- a/registry/lib/components/feeds/full-content/index.ts +++ b/registry/lib/components/feeds/full-content/index.ts @@ -1,8 +1,8 @@ -import { ComponentMetadata } from '@/components/types' +import { defineComponentMetadata } from '@/components/define' import { toggleStyle } from '@/components/styled-component' import { feedsUrlsWithoutDetail } from '@/core/utils/urls' -export const component: ComponentMetadata = { +export const component = defineComponentMetadata({ ...toggleStyle('fullFeedsContent', () => import('./full-content.scss')), displayName: '展开动态内容', description: { @@ -13,4 +13,4 @@ export const component: ComponentMetadata = { componentsTags.feeds, ], urlInclude: feedsUrlsWithoutDetail, -} +}) diff --git a/registry/lib/components/feeds/full-title/index.ts b/registry/lib/components/feeds/full-title/index.ts index 144890292..eec89dbf7 100644 --- a/registry/lib/components/feeds/full-title/index.ts +++ b/registry/lib/components/feeds/full-title/index.ts @@ -1,11 +1,11 @@ +import { defineComponentMetadata } from '@/components/define' import { toggleStyle } from '@/components/styled-component' -import { ComponentMetadata } from '@/components/types' -export const component: ComponentMetadata = { +export const component = defineComponentMetadata({ ...toggleStyle('fullFeedsTitle', () => import('./full-feeds-title.scss')), displayName: '展开动态标题', description: { 'zh-CN': '在顶栏的视频动态中, 无论标题多长总是完全展开.', }, tags: [componentsTags.feeds, componentsTags.style], -} +}) diff --git a/registry/lib/components/feeds/unfold/index.ts b/registry/lib/components/feeds/unfold/index.ts index 4e9132771..f30face4b 100644 --- a/registry/lib/components/feeds/unfold/index.ts +++ b/registry/lib/components/feeds/unfold/index.ts @@ -1,7 +1,7 @@ -import { ComponentMetadata } from '@/components/types' +import { defineComponentMetadata } from '@/components/define' import { feedsUrlsWithoutDetail } from '@/core/utils/urls' -export const component: ComponentMetadata = { +export const component = defineComponentMetadata({ name: 'unfoldFeeds', displayName: '动态反折叠', tags: [componentsTags.feeds], @@ -25,4 +25,4 @@ export const component: ComponentMetadata = { }, }) }, -} +}) From 9b44fe09f5804652126c56a6f6f7d8163f143782 Mon Sep 17 00:00:00 2001 From: timongh <46739861+timongh@users.noreply.github.com> Date: Tue, 20 Sep 2022 23:30:09 +0800 Subject: [PATCH 2/2] Change options definition of `feedsFilter` to define api --- registry/lib/components/feeds/filter/index.ts | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/registry/lib/components/feeds/filter/index.ts b/registry/lib/components/feeds/filter/index.ts index c4895ce46..0eae5fc24 100644 --- a/registry/lib/components/feeds/filter/index.ts +++ b/registry/lib/components/feeds/filter/index.ts @@ -1,6 +1,5 @@ -import { defineComponentMetadata } from '@/components/define' +import { defineOptionsMetadata, defineComponentMetadata, OptionsOfMetadata } from '@/components/define' import { feedsCardsManager } from '@/components/feeds/api' -import { ComponentOptions } from '@/components/types' import { feedsFilterPlugin } from './plugin' const entry = async () => { @@ -22,35 +21,33 @@ const entry = async () => { const { mountVueComponent } = await import('@/core/utils') leftPanel.insertAdjacentElement('afterbegin', mountVueComponent(FeedsFilterCard).$el) } -const options: ComponentOptions = { + +const options = defineOptionsMetadata({ types: { - defaultValue: [], + defaultValue: [] as number[], displayName: '过滤动态类型', hidden: true, }, patterns: { - defaultValue: [], + defaultValue: [] as string[], displayName: '过滤关键词', hidden: true, }, sideCards: { - defaultValue: [], + /** FIXME: 虽然代码里按照`number[]`, 但其实存进去的是`string[]`? */ + defaultValue: [] as number[], displayName: '过滤侧边栏', hidden: true, }, specialTypes: { - defaultValue: [], + defaultValue: [] as number[], displayName: '过滤特殊动态类型', hidden: true, }, -} -export type FeedsFilterOptions = { - types: number[] - patterns: string[] - /** FIXME: 虽然代码里按照`number[]`, 但其实存进去的是`string[]`? */ - sideCards: number[] - specialTypes: number[] -} +}) + +export type FeedsFilterOptions = OptionsOfMetadata + export const component = defineComponentMetadata({ name: 'feedsFilter', displayName: '动态过滤器',