mirror of
https://github.com/the1812/Bilibili-Evolved.git
synced 2025-11-04 21:22:45 +08:00
Merge branch 'preview-features' into preview
This commit is contained in:
commit
fda874ed3c
@ -12,7 +12,7 @@
|
||||
"type": "tsc -p tsconfig.type-check.json --noEmit"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/core": "^7.9.6",
|
||||
"@babel/core": "7.17.9",
|
||||
"@babel/plugin-proposal-class-properties": "^7.8.3",
|
||||
"@babel/preset-env": "^7.9.6",
|
||||
"@babel/preset-typescript": "^7.9.0",
|
||||
@ -30,12 +30,12 @@
|
||||
"eslint": "^7.32.0",
|
||||
"eslint-config-airbnb-base": "^14.1.0",
|
||||
"eslint-plugin-import": "^2.20.1",
|
||||
"eslint-plugin-vue": "^7.1.0",
|
||||
"eslint-plugin-vue": "7.1.0",
|
||||
"fast-sass-loader": "^2.0.0",
|
||||
"html-webpack-plugin": "^5.0.0-alpha.7",
|
||||
"postcss": "^8.1.0",
|
||||
"postcss-loader": "^4.0.4",
|
||||
"postcss-preset-env": "^6.7.0",
|
||||
"postcss-preset-env": "^7.5.0",
|
||||
"sass": "^1.25.0",
|
||||
"serve": "^13.0.2",
|
||||
"style-loader": "^2.0.0",
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
import { createPopper, Instance as Popper } from '@popperjs/core'
|
||||
import { VueModule, Executable } from '@/core/common-types'
|
||||
import { getComponentSettings, addComponentListener } from '@/core/settings'
|
||||
import { createPopper, Instance as Popper } from '@popperjs/core'
|
||||
|
||||
export const CustomNavbarItems = 'customNavbar.items'
|
||||
export const CustomNavbarRenderedItems = 'customNavbar.renderedItems'
|
||||
|
||||
@ -82,6 +82,7 @@
|
||||
</VPopup>
|
||||
</template>
|
||||
<script lang="ts">
|
||||
import { SortableEvent } from 'sortablejs'
|
||||
import {
|
||||
VPopup,
|
||||
VIcon,
|
||||
@ -91,7 +92,6 @@ import {
|
||||
import { addComponentListener } from '@/core/settings'
|
||||
import { dqa } from '@/core/utils'
|
||||
import { SortableJSLibrary } from '@/core/runtime-library'
|
||||
import { SortableEvent } from 'sortablejs'
|
||||
import { getData } from '@/plugins/data'
|
||||
import {
|
||||
CustomNavbarItem,
|
||||
|
||||
@ -638,13 +638,13 @@ body:not(.simplify-comment) .panel-area .bb-comment {
|
||||
}
|
||||
}
|
||||
[class*='color-'][class*='-03'] {
|
||||
@include brightness(6 / 5);
|
||||
@include brightness(calc(6 / 5));
|
||||
// > * {
|
||||
// @include brightness(5 / 6);
|
||||
// }
|
||||
}
|
||||
[class*='color-'][class*='-04'] {
|
||||
@include brightness(4 / 3);
|
||||
@include brightness(calc(4 / 3));
|
||||
// > * {
|
||||
// @include brightness(3 / 4);
|
||||
// }
|
||||
|
||||
@ -331,12 +331,12 @@ export default Vue.extend({
|
||||
}
|
||||
}
|
||||
@function slides($index) {
|
||||
@return -10 * $index * $index / 9 + 40 * $index / 3 + 24
|
||||
@return calc(-10 * $index * $index / 9 + 40 * $index / 3 + 24)
|
||||
}
|
||||
@for $index from 6 through 12 {
|
||||
&-item:nth-child(#{$index}) {
|
||||
@include item-slides-y(#{slides($index)}px);
|
||||
animation-delay: #{(1 - (slides($index) - 24) / 40) * 0.2}s;
|
||||
animation-delay: #{calc((1 - (slides($index) - 24) / 40) * 0.2)}s;
|
||||
}
|
||||
}
|
||||
&-item {
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
import { DocSourceItem } from 'registry/lib/docs'
|
||||
import { componentsMap } from '@/components/component'
|
||||
import { installComponent } from '@/components/user-component'
|
||||
import { monkey } from '@/core/ajax'
|
||||
@ -10,7 +11,6 @@ import { logError } from '@/core/utils/log'
|
||||
import { getHook } from '@/plugins/hook'
|
||||
import { installPlugin, pluginsMap } from '@/plugins/plugin'
|
||||
import { UserStyle } from '@/plugins/style'
|
||||
import { DocSourceItem } from 'registry/lib/docs'
|
||||
|
||||
export const runMigrate = async (v1Settings: any) => {
|
||||
const toast = Toast.info('下载功能列表中', '导入 v1 设置')
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import { PluginMetadata } from '@/plugins/plugin'
|
||||
import { KeyBindingAction } from 'registry/lib/components/utils/keymap/bindings'
|
||||
import { PluginMetadata } from '@/plugins/plugin'
|
||||
|
||||
export const plugin: PluginMetadata = {
|
||||
name: 'keymap.actions.darkMode',
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import { PluginMetadata } from '@/plugins/plugin'
|
||||
import { KeyBindingAction } from 'registry/lib/components/utils/keymap/bindings'
|
||||
import { PluginMetadata } from '@/plugins/plugin'
|
||||
|
||||
export const plugin: PluginMetadata = {
|
||||
name: 'keymap.actions.empty',
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
import type { KeyBindingAction, KeyBindingActionContext } from 'registry/lib/components/utils/keymap/bindings'
|
||||
import { Toast } from '@/core/toast'
|
||||
import type { PluginMetadata } from '@/plugins/plugin'
|
||||
import type { KeyBindingAction, KeyBindingActionContext } from 'registry/lib/components/utils/keymap/bindings'
|
||||
import { getSpeedContext, SpeedContext } from '../../../../components/video/player/common/speed/context'
|
||||
import { formatSpeedText } from '../../../../components/video/player/common/speed/utils'
|
||||
import type { RememberSpeedComponent } from '../../../../components/video/player/remember-speed/component'
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import { languageNameToCode } from '@/core/utils/i18n'
|
||||
import marked from 'marked'
|
||||
import { languageNameToCode } from '@/core/utils/i18n'
|
||||
import { ComponentMetadata } from './component'
|
||||
import { getSelectedLanguage } from './i18n/helpers'
|
||||
|
||||
|
||||
@ -59,6 +59,7 @@
|
||||
</div>
|
||||
</template>
|
||||
<script lang="ts">
|
||||
import Fuse from 'fuse.js'
|
||||
import {
|
||||
VIcon,
|
||||
VLoading,
|
||||
@ -67,7 +68,6 @@ import {
|
||||
import { registerAndGetData } from '@/plugins/data'
|
||||
import { select } from '@/core/spin-query'
|
||||
import { matchUrlPattern } from '@/core/utils'
|
||||
import Fuse from 'fuse.js'
|
||||
import ActionItem from './ActionItem.vue'
|
||||
import {
|
||||
LaunchBarActionProviders,
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import { PluginMetadata } from '@/plugins/plugin'
|
||||
import { KeyBindingAction } from 'registry/lib/components/utils/keymap/bindings'
|
||||
import { PluginMetadata } from '@/plugins/plugin'
|
||||
|
||||
export const plugin: PluginMetadata = {
|
||||
name: 'launchBar.plugin',
|
||||
|
||||
@ -17,8 +17,8 @@
|
||||
</template>
|
||||
|
||||
<script lang="ts">
|
||||
import { getComponentSettings } from '@/core/settings'
|
||||
import marked from 'marked'
|
||||
import { getComponentSettings } from '@/core/settings'
|
||||
import SwitchBox from '@/ui/SwitchBox.vue'
|
||||
import VIcon from '@/ui/icon/VIcon.vue'
|
||||
import { languageNameToCode } from '@/core/utils/i18n'
|
||||
|
||||
@ -181,9 +181,10 @@ export default {
|
||||
this.selectedComponents = []
|
||||
this.componentDetailOpen = false
|
||||
},
|
||||
selectMultipleComponent({ name }: ComponentMetadata, listSelect = false) {
|
||||
selectMultipleComponent(component: ComponentMetadata, listSelect = false) {
|
||||
if (this.selectedComponent && listSelect) {
|
||||
// handle shift + click
|
||||
const { name } = component
|
||||
const { name: selectedComponentName } = this.selectedComponent as ComponentMetadata
|
||||
const list = this.renderedComponents as ComponentMetadata[]
|
||||
let startIdx = list.findIndex(c => c.name === selectedComponentName)
|
||||
@ -196,11 +197,11 @@ export default {
|
||||
return
|
||||
}
|
||||
const selectedList = this.selectedComponents as ComponentMetadata[]
|
||||
const component = selectedList.find(c => c.name === name)
|
||||
if (component) {
|
||||
selectedList.push(component)
|
||||
const selectedComponent = selectedList.find(c => c.name === component.name)
|
||||
if (selectedComponent) {
|
||||
deleteValue(selectedList, c => c.name === selectedComponent.name)
|
||||
} else {
|
||||
deleteValue(selectedList, c => c.name === component.name)
|
||||
selectedList.push(component)
|
||||
}
|
||||
},
|
||||
selectComponent(component: ComponentMetadata) {
|
||||
|
||||
@ -58,6 +58,8 @@
|
||||
</VPopup>
|
||||
</template>
|
||||
<script lang="ts">
|
||||
import Fuse from 'fuse.js'
|
||||
import { DocSourceItem } from 'registry/lib/docs'
|
||||
import { monkey } from '@/core/ajax'
|
||||
import { cdnRoots } from '@/core/cdn-types'
|
||||
import { meta } from '@/core/meta'
|
||||
@ -71,8 +73,6 @@ import {
|
||||
VLoading,
|
||||
VEmpty,
|
||||
} from '@/ui'
|
||||
import Fuse from 'fuse.js'
|
||||
import { DocSourceItem } from 'registry/lib/docs'
|
||||
import RegistryItem from './RegistryItem.vue'
|
||||
import { registryBranches } from './third-party'
|
||||
|
||||
|
||||
@ -45,6 +45,7 @@
|
||||
</MiniToast>
|
||||
</template>
|
||||
<script lang="ts">
|
||||
import { DocSourceItem } from 'registry/lib/docs'
|
||||
import { getDescriptionHTML } from '@/components/description'
|
||||
import { cdnRoots } from '@/core/cdn-types'
|
||||
import { installFeature } from '@/core/install-feature'
|
||||
@ -52,7 +53,6 @@ import { visibleInside } from '@/core/observer'
|
||||
import { getGeneralSettings, settings } from '@/core/settings'
|
||||
import { logError } from '@/core/utils/log'
|
||||
import { VIcon, VButton, MiniToast } from '@/ui'
|
||||
import { DocSourceItem } from 'registry/lib/docs'
|
||||
|
||||
const getFeatureUrl = (item: DocSourceItem, branch: string) => {
|
||||
const cdnRootFn = cdnRoots[getGeneralSettings().cdnRoot]
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import { TestPattern, Executable } from '@/core/common-types'
|
||||
import { VueConstructor } from 'vue'
|
||||
import { TestPattern, Executable } from '@/core/common-types'
|
||||
|
||||
/**
|
||||
* 小组件(v1中称为附加功能), 可在组件中定义, 也可以由插件注入
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
@mixin round-bar($height) {
|
||||
box-sizing: border-box;
|
||||
height: #{$height}px;
|
||||
border-radius: #{$height / 2}px;
|
||||
border-radius: #{$height * 0.5}px;
|
||||
}
|
||||
@mixin no-scrollbar {
|
||||
overflow: auto;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user