Merge pull request #193 from one-zen/master

fix: Correct spelling of words(tigger →trigger)
This commit is contained in:
Archer 2022-10-18 09:54:27 +08:00 committed by GitHub
commit a4c46efc82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 22 additions and 21 deletions

View File

@ -23,7 +23,8 @@
"lint:style": "stylelint --fix \"**/*.{vue,less,postcss,css,scss}\" --cache --cache-location node_modules/.cache/stylelint/", "lint:style": "stylelint --fix \"**/*.{vue,less,postcss,css,scss}\" --cache --cache-location node_modules/.cache/stylelint/",
"lint:lint-staged": "lint-staged -c ./.husky/lintstagedrc.js", "lint:lint-staged": "lint-staged -c ./.husky/lintstagedrc.js",
"prepare": "husky install", "prepare": "husky install",
"p": "plop" "p": "plop",
"analysis": "windicss-analysis"
}, },
"dependencies": { "dependencies": {
"@iconify/iconify": "^3.0.0", "@iconify/iconify": "^3.0.0",

View File

@ -48,25 +48,25 @@ export default defineComponent({
{layout.value !== 'top' ? ( {layout.value !== 'top' ? (
<div class="h-full flex items-center"> <div class="h-full flex items-center">
{hamburger.value && layout.value !== 'cutMenu' ? ( {hamburger.value && layout.value !== 'cutMenu' ? (
<Collapse class="hover-tigger" color="var(--top-header-text-color)"></Collapse> <Collapse class="hover-trigger" color="var(--top-header-text-color)"></Collapse>
) : undefined} ) : undefined}
{breadcrumb.value ? <Breadcrumb class="<md:hidden"></Breadcrumb> : undefined} {breadcrumb.value ? <Breadcrumb class="<md:hidden"></Breadcrumb> : undefined}
</div> </div>
) : undefined} ) : undefined}
<div class="h-full flex items-center"> <div class="h-full flex items-center">
{screenfull.value ? ( {screenfull.value ? (
<Screenfull class="hover-tigger" color="var(--top-header-text-color)"></Screenfull> <Screenfull class="hover-trigger" color="var(--top-header-text-color)"></Screenfull>
) : undefined} ) : undefined}
{size.value ? ( {size.value ? (
<SizeDropdown class="hover-tigger" color="var(--top-header-text-color)"></SizeDropdown> <SizeDropdown class="hover-trigger" color="var(--top-header-text-color)"></SizeDropdown>
) : undefined} ) : undefined}
{locale.value ? ( {locale.value ? (
<LocaleDropdown <LocaleDropdown
class="hover-tigger" class="hover-trigger"
color="var(--top-header-text-color)" color="var(--top-header-text-color)"
></LocaleDropdown> ></LocaleDropdown>
) : undefined} ) : undefined}
<UserInfo class="hover-tigger"></UserInfo> <UserInfo class="hover-trigger"></UserInfo>
</div> </div>
</div> </div>
) )

View File

@ -110,7 +110,7 @@ export const useRenderLayout = () => {
return ( return (
<> <>
<div class="flex items-center bg-[var(--top-header-bg-color)] border-bottom-1 border-solid border-[var(--top-tool-border-color)] dark:border-[var(--el-border-color)]"> <div class="flex items-center bg-[var(--top-header-bg-color)] border-bottom-1 border-solid border-[var(--top-tool-border-color)] dark:border-[var(--el-border-color)]">
{logo.value ? <Logo class="hover-tigger !pr-15px"></Logo> : undefined} {logo.value ? <Logo class="hover-trigger !pr-15px"></Logo> : undefined}
<ToolHeader class="flex-1"></ToolHeader> <ToolHeader class="flex-1"></ToolHeader>
</div> </div>
@ -167,7 +167,7 @@ export const useRenderLayout = () => {
return ( return (
<> <>
<div class="flex items-center justify-between bg-[var(--top-header-bg-color)] border-bottom-1 border-solid border-[var(--top-tool-border-color)] dark:border-[var(--el-border-color)]"> <div class="flex items-center justify-between bg-[var(--top-header-bg-color)] border-bottom-1 border-solid border-[var(--top-tool-border-color)] dark:border-[var(--el-border-color)]">
{logo.value ? <Logo class="hover-tigger"></Logo> : undefined} {logo.value ? <Logo class="hover-trigger"></Logo> : undefined}
<Menu class="flex-1 px-10px h-[var(--top-tool-height)]"></Menu> <Menu class="flex-1 px-10px h-[var(--top-tool-height)]"></Menu>
<ToolHeader></ToolHeader> <ToolHeader></ToolHeader>
</div> </div>
@ -204,7 +204,7 @@ export const useRenderLayout = () => {
return ( return (
<> <>
<div class="flex items-center bg-[var(--top-header-bg-color)] border-bottom-1 border-solid border-[var(--top-tool-border-color)] dark:border-[var(--el-border-color)]"> <div class="flex items-center bg-[var(--top-header-bg-color)] border-bottom-1 border-solid border-[var(--top-tool-border-color)] dark:border-[var(--el-border-color)]">
{logo.value ? <Logo class="hover-tigger !pr-15px"></Logo> : undefined} {logo.value ? <Logo class="hover-trigger !pr-15px"></Logo> : undefined}
<ToolHeader class="flex-1"></ToolHeader> <ToolHeader class="flex-1"></ToolHeader>
</div> </div>

View File

@ -71,7 +71,7 @@ const getTableList = async (params?: Params) => {
getTableList() getTableList()
const acitonFn = (data: TableSlotDefault) => { const actionFn = (data: TableSlotDefault) => {
console.log(data) console.log(data)
} }
</script> </script>
@ -80,7 +80,7 @@ const acitonFn = (data: TableSlotDefault) => {
<ContentWrap :title="t('userDemo.title')" :message="t('userDemo.message')"> <ContentWrap :title="t('userDemo.title')" :message="t('userDemo.message')">
<Table :columns="columns" :data="tableDataList" :loading="loading" :selection="false"> <Table :columns="columns" :data="tableDataList" :loading="loading" :selection="false">
<template #action="data"> <template #action="data">
<ElButton type="primary" @click="acitonFn(data as TableSlotDefault)"> <ElButton type="primary" @click="actionFn(data as TableSlotDefault)">
{{ t('tableDemo.action') }} {{ t('tableDemo.action') }}
</ElButton> </ElButton>
</template> </template>

View File

@ -71,7 +71,7 @@ const getTableList = async (params?: Params) => {
getTableList() getTableList()
const acitonFn = (data: TableSlotDefault) => { const actionFn = (data: TableSlotDefault) => {
console.log(data) console.log(data)
} }
</script> </script>
@ -80,7 +80,7 @@ const acitonFn = (data: TableSlotDefault) => {
<ContentWrap :title="t('userDemo.title')" :message="t('userDemo.message')"> <ContentWrap :title="t('userDemo.title')" :message="t('userDemo.message')">
<Table :columns="columns" :data="tableDataList" :loading="loading" :selection="false"> <Table :columns="columns" :data="tableDataList" :loading="loading" :selection="false">
<template #action="data"> <template #action="data">
<ElButton type="primary" @click="acitonFn(data as TableSlotDefault)"> <ElButton type="primary" @click="actionFn(data as TableSlotDefault)">
{{ t('tableDemo.action') }} {{ t('tableDemo.action') }}
</ElButton> </ElButton>
</template> </template>

View File

@ -83,7 +83,7 @@ const getTableList = async (params?: Params) => {
getTableList() getTableList()
const acitonFn = (data: TableSlotDefault) => { const actionFn = (data: TableSlotDefault) => {
console.log(data) console.log(data)
} }
</script> </script>
@ -92,7 +92,7 @@ const acitonFn = (data: TableSlotDefault) => {
<ContentWrap :title="t('tableDemo.table')" :message="t('tableDemo.tableDes')"> <ContentWrap :title="t('tableDemo.table')" :message="t('tableDemo.tableDes')">
<Table :columns="columns" :data="tableDataList" :loading="loading"> <Table :columns="columns" :data="tableDataList" :loading="loading">
<template #action="data"> <template #action="data">
<ElButton type="primary" @click="acitonFn(data as TableSlotDefault)"> <ElButton type="primary" @click="actionFn(data as TableSlotDefault)">
{{ t('tableDemo.action') }} {{ t('tableDemo.action') }}
</ElButton> </ElButton>
</template> </template>

View File

@ -80,7 +80,7 @@ getList()
const tableRef = ref<TableExpose>() const tableRef = ref<TableExpose>()
const acitonFn = (data: TableSlotDefault) => { const actionFn = (data: TableSlotDefault) => {
console.log(data) console.log(data)
} }
@ -165,7 +165,7 @@ const selectAllNone = () => {
@register="register" @register="register"
> >
<template #action="data"> <template #action="data">
<ElButton type="primary" @click="acitonFn(data as TableSlotDefault)"> <ElButton type="primary" @click="actionFn(data as TableSlotDefault)">
{{ t('tableDemo.action') }} {{ t('tableDemo.action') }}
</ElButton> </ElButton>
</template> </template>

View File

@ -75,7 +75,7 @@ const columns = reactive<TableColumn[]>([
} }
]) ])
const acitonFn = (data: TableSlotDefault) => { const actionFn = (data: TableSlotDefault) => {
console.log(data) console.log(data)
} }
@ -164,7 +164,7 @@ const selectAllNone = () => {
@register="register" @register="register"
> >
<template #action="data"> <template #action="data">
<ElButton type="primary" @click="acitonFn(data as TableSlotDefault)"> <ElButton type="primary" @click="actionFn(data as TableSlotDefault)">
{{ t('tableDemo.action') }} {{ t('tableDemo.action') }}
</ElButton> </ElButton>
</template> </template>

View File

@ -53,7 +53,7 @@ export default defineConfig({
} }
}) })
addComponents({ addComponents({
'.hover-tigger': { '.hover-trigger': {
display: 'flex', display: 'flex',
height: '100%', height: '100%',
padding: '1px 10px 0', padding: '1px 10px 0',
@ -64,7 +64,7 @@ export default defineConfig({
backgroundColor: 'var(--top-header-hover-color)' backgroundColor: 'var(--top-header-hover-color)'
} }
}, },
'.dark .hover-tigger': { '.dark .hover-trigger': {
'&:hover': { '&:hover': {
backgroundColor: 'var(--el-bg-color-overlay)' backgroundColor: 'var(--el-bg-color-overlay)'
} }