Skip to content

Commit f38a4fc

Browse files
committed
Merge branch 'dev' of github.com:opentiny/tiny-vue into fix-action-publish-erro-0113
2 parents 0fa329d + 8f1b566 commit f38a4fc

File tree

3 files changed

+7
-11
lines changed

3 files changed

+7
-11
lines changed

examples/sites/demos/pc/webdoc/import-components-en.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,7 @@ For more information about automatic on-demand imports, please refer to [unplugi
4545
## Multi-component introduction
4646

4747
<div class="tip custom-block">
48-
<br />
49-
Warm reminder: Exporting components with Tiny prefix is ​​supported since 3.17.0. If using previous versions, you need to use aliases.
50-
<br />
48+
<p>Warm reminder: Exporting components with Tiny prefix is ​​supported since 3.17.0. If using previous versions, you need to use aliases.</p>
5149
<p>For example:<code>import { Button as TinyButton } from '@opentiny/vue'</code></p>
5250
</div>
5351

examples/sites/demos/pc/webdoc/import-components.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,7 @@ module.exports = defineConfig({
133133
## 多组件引入
134134

135135
<div class="tip custom-block">
136-
<br />
137-
温馨提示:带有 Tiny 前缀的组件导出自 3.17.0 开始支持。若使用之前版本,需使用别名。
138-
<br />
136+
<p>温馨提示:带有 Tiny 前缀的组件导出自 3.17.0 开始支持。若使用之前版本,需使用别名。</p>
139137
<p>例如:<code>import { Button as TinyButton } from '@opentiny/vue'</code></p>
140138
</div>
141139

packages/renderless/types/pager.type.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ import type {
2929
setTotal,
3030
clickSizes,
3131
watchInternalCurrentPage,
32-
watchPageSizes,
3332
watchCurrentPage,
3433
watchInternalPageCount,
35-
watchPageSize,
3634
watchTotal,
37-
watchShowSizes
35+
watchShowSizes,
36+
watchInternalPageSize,
37+
getInternalPageSize
3838
} from '../src/pager'
3939

4040
export type IPagerProps = ExtractPropTypes<typeof pagerProps>
@@ -89,12 +89,12 @@ export interface IPagerApi {
8989
setTotal: ReturnType<typeof setTotal>
9090
clickSizes: ReturnType<typeof clickSizes>
9191
watchInternalCurrentPage: ReturnType<typeof watchInternalCurrentPage>
92-
watchPageSizes: ReturnType<typeof watchPageSizes>
9392
watchCurrentPage: ReturnType<typeof watchCurrentPage>
9493
watchInternalPageCount: ReturnType<typeof watchInternalPageCount>
95-
watchPageSize: ReturnType<typeof watchPageSize>
9694
watchTotal: ReturnType<typeof watchTotal>
9795
watchShowSizes: ReturnType<typeof watchShowSizes>
96+
watchInternalPageSize: ReturnType<typeof watchInternalPageSize>
97+
getInternalPageSize: ReturnType<typeof getInternalPageSize>
9898
}
9999
export type IPagerRenderlessParams = ISharedRenderlessFunctionParams<never> & {
100100
api: IPagerApi

0 commit comments

Comments
 (0)