mirror/naive-ui
2
0
Fork 0
mirror of https://github.com/tusen-ai/naive-ui.git synced 2025-03-07 13:48:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: type error caused by vue

Browse Source
This commit is contained in:
07akioni 2021-09-06 10:26:12 +08:00
parent 95703aa04e
commit 5b7935e336
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -79,7 +79,7 @@
"@vue/compiler-sfc": "^3.0.10",
"@vue/eslint-config-standard": "^6.0.0",
"@vue/eslint-config-typescript": "^7.0.0",
"@vue/server-renderer": "^3.0.11",
"@vue/server-renderer": "3.2.8",
"@vue/test-utils": "^2.0.0-rc.9",
"autoprefixer": "^10.2.6",
"babel-eslint": "^10.1.0",
@ -109,7 +109,7 @@
"superagent": "^6.1.0",
"typescript": "^4.4.2",
"vite": "^2.1.3",
"vue": "^3.2.8",
"vue": "3.2.8",
"vue-router": "^4.0.5"
},
"peerDependencies": {

1
src/cascader/src/interface.ts
View File

@ -16,6 +16,7 @@ export interface BaseOption {
value?: ValueAtom
disabled?: boolean
children?: BaseOption[]
[key: string]: unknown
}
export type ExpandTrigger = 'hover' | 'click'

10
src/data-table/src/TableParts/Body.tsx
View File

@ -452,12 +452,12 @@ export default defineComponent({
// virtual list should have a fast path
const { rowSpan, colSpan } = column
const mergedColSpan = isSummary
? (rowInfo.rawNode as SummaryRowData)[colKey].colSpan || 1
? rowInfo.rawNode[colKey].colSpan || 1
: colSpan
? colSpan(rowData, rowIndex)
: 1
const mergedRowSpan = isSummary
? (rowInfo.rawNode as SummaryRowData)[colKey].rowSpan || 1
? rowInfo.rawNode[colKey].rowSpan || 1
: rowSpan
? rowSpan(rowData, rowIndex)
: 1
@ -528,13 +528,13 @@ export default defineComponent({
{hasChildren && colIndex === firstContentfulColIndex
? [
repeat(
isSummary ? 0 : (rowInfo as TmNode).level,
isSummary ? 0 : rowInfo.level,
<div
class={`${mergedClsPrefix}-data-table-indent`}
style={indentStyle}
/>
),
isSummary || !(rowInfo as TmNode).children ? (
isSummary || !rowInfo.children ? (
<div
class={`${mergedClsPrefix}-data-table-expand-placeholder`}
/>
@ -624,7 +624,7 @@ export default defineComponent({
]}
colspan={colCount}
>
{renderExpand!(rowData, rowIndex)}
{renderExpand(rowData, rowIndex)}
</td>
</tr>
)