Skip to content

Commit

Permalink
fix: 解决类型检测报错
Browse files Browse the repository at this point in the history
  • Loading branch information
kailong321200875 committed Jul 26, 2023
1 parent 82245ee commit 28bf8be
Show file tree
Hide file tree
Showing 5 changed files with 259 additions and 259 deletions.
1 change: 1 addition & 0 deletions src/components/Form/src/types/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -620,6 +620,7 @@ export interface FormSchema {
| InputPasswordComponentProps
| TreeSelectComponentProps
| UploadComponentProps
| any

/**
* formItem组件属性,具体可以查看element-plus文档
Expand Down
4 changes: 2 additions & 2 deletions src/components/Infotip/src/Infotip.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { PropType } from 'vue'
import { Highlight } from '@/components/Highlight'
import { useDesign } from '@/hooks/web/useDesign'
import { propTypes } from '@/utils/propTypes'
import { TipSchema } from '@/types/infoTip'
import { InfoTipSchema } from './types'
const { getPrefixCls } = useDesign()
Expand All @@ -12,7 +12,7 @@ const prefixCls = getPrefixCls('infotip')
defineProps({
title: propTypes.string.def(''),
schema: {
type: Array as PropType<Array<string | TipSchema>>,
type: Array as PropType<Array<string | InfoTipSchema>>,
required: true,
default: () => []
},
Expand Down
141 changes: 71 additions & 70 deletions src/views/Authorization/Role.vue
Original file line number Diff line number Diff line change
@@ -1,90 +1,91 @@
<script setup lang="ts">
import { ContentWrap } from '@/components/ContentWrap'
import { useI18n } from '@/hooks/web/useI18n'
import { Table } from '@/components/Table'
import { getUserListApi } from '@/api/login'
import { UserType } from '@/api/login/types'
import { ref, h } from 'vue'
import { ElButton } from 'element-plus'
import { TableColumn, TableSlotDefault } from '@/types/table'
// import { ContentWrap } from '@/components/ContentWrap'
// import { useI18n } from '@/hooks/web/useI18n'
// import { Table } from '@/components/Table'
// import { getUserListApi } from '@/api/login'
// import { UserType } from '@/api/login/types'
// import { ref, h } from 'vue'
// import { ElButton } from 'element-plus'
// import { TableColumn, TableSlotDefault } from '@/types/table'
interface Params {
pageIndex?: number
pageSize?: number
}
// interface Params {
// pageIndex?: number
// pageSize?: number
// }
const { t } = useI18n()
// const { t } = useI18n()
const columns: TableColumn[] = [
{
field: 'index',
label: t('userDemo.index'),
type: 'index'
},
{
field: 'username',
label: t('userDemo.username')
},
{
field: 'password',
label: t('userDemo.password')
},
{
field: 'role',
label: t('userDemo.role')
},
{
field: 'remark',
label: t('userDemo.remark'),
formatter: (row: UserType) => {
return h(
'span',
row.username === 'admin' ? t('userDemo.remarkMessage1') : t('userDemo.remarkMessage2')
)
}
},
{
field: 'action',
label: t('userDemo.action')
}
]
// const columns: TableColumn[] = [
// {
// field: 'index',
// label: t('userDemo.index'),
// type: 'index'
// },
// {
// field: 'username',
// label: t('userDemo.username')
// },
// {
// field: 'password',
// label: t('userDemo.password')
// },
// {
// field: 'role',
// label: t('userDemo.role')
// },
// {
// field: 'remark',
// label: t('userDemo.remark'),
// formatter: (row: UserType) => {
// return h(
// 'span',
// row.username === 'admin' ? t('userDemo.remarkMessage1') : t('userDemo.remarkMessage2')
// )
// }
// },
// {
// field: 'action',
// label: t('userDemo.action')
// }
// ]
const loading = ref(true)
// const loading = ref(true)
let tableDataList = ref<UserType[]>([])
// let tableDataList = ref<UserType[]>([])
const getTableList = async (params?: Params) => {
const res = await getUserListApi({
params: params || {
pageIndex: 1,
pageSize: 10
}
})
// .catch(() => {})
// .finally(() => {
// loading.value = false
// })
if (res) {
tableDataList.value = res.data.list
loading.value = false
}
}
// const getTableList = async (params?: Params) => {
// const res = await getUserListApi({
// params: params || {
// pageIndex: 1,
// pageSize: 10
// }
// })
// // .catch(() => {})
// // .finally(() => {
// // loading.value = false
// // })
// if (res) {
// tableDataList.value = res.data.list
// loading.value = false
// }
// }
getTableList()
// getTableList()
const actionFn = (data: TableSlotDefault) => {
console.log(data)
}
// const actionFn = (data: TableSlotDefault) => {
// console.log(data)
// }
</script>

<template>
<ContentWrap :title="t('userDemo.title')" :message="t('userDemo.message')">
<div>role</div>
<!-- <ContentWrap :title="t('userDemo.title')" :message="t('userDemo.message')">
<Table :columns="columns" :data="tableDataList" :loading="loading" :selection="false">
<template #action="data">
<ElButton type="primary" @click="actionFn(data as TableSlotDefault)">
{{ t('tableDemo.action') }}
</ElButton>
</template>
</Table>
</ContentWrap>
</ContentWrap> -->
</template>
4 changes: 1 addition & 3 deletions src/views/Components/Table/TreeTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { reactive, unref } from 'vue'
import { ElTag, ElButton } from 'element-plus'
import { useTable } from '@/hooks/web/useTable'
const { tableRegister, tableState, tableMethods } = useTable({
const { tableRegister, tableState } = useTable({
fetchDataApi: async () => {
const { currentPage, pageSize } = tableState
const res = await getTreeTableListApi({
Expand All @@ -21,7 +21,6 @@ const { tableRegister, tableState, tableMethods } = useTable({
}
})
const { loading, dataList, total, currentPage, pageSize } = tableState
const { sortableChange } = tableMethods
const { t } = useI18n()
Expand Down Expand Up @@ -106,7 +105,6 @@ const actionFn = (data: TableSlotDefault) => {
total: total
}"
@register="tableRegister"
@sortable-change="sortableChange"
/>
</ContentWrap>
</template>
Expand Down
Loading

0 comments on commit 28bf8be

Please sign in to comment.