Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(Pagination): 极简模式下合并快速跳转与页码跳转控制器 #1256

Merged
merged 2 commits into from
Aug 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/_common
Submodule _common updated 88 files
+2 −1 .stylelintrc
+8 −6 docs/web/api/table.md
+3 −3 package.json
+32 −16 style/web/_variables.less
+3 −110 style/web/components/alert/_index.less
+1 −2 style/web/components/badge/_index.less
+1 −2 style/web/components/badge/_var.less
+2 −3 style/web/components/breadcrumb/_index.less
+1 −2 style/web/components/breadcrumb/_mixin.less
+1 −4 style/web/components/breadcrumb/_var.less
+1 −1 style/web/components/button/_mixin.less
+3 −3 style/web/components/button/_var.less
+10 −15 style/web/components/calendar/_index.less
+12 −14 style/web/components/calendar/_var.less
+3 −4 style/web/components/card/_index.less
+13 −7 style/web/components/cascader/_index.less
+4 −2 style/web/components/cascader/_var.less
+1 −2 style/web/components/checkbox/_index.less
+4 −2 style/web/components/checkbox/_var.less
+1 −1 style/web/components/collapse/_index.less
+1 −1 style/web/components/collapse/_var.less
+5 −7 style/web/components/color-picker/_index.less
+7 −4 style/web/components/color-picker/_var.less
+6 −7 style/web/components/comment/_index.less
+4 −8 style/web/components/comment/_var.less
+2 −13 style/web/components/dialog/_index.less
+3 −9 style/web/components/dialog/_var.less
+1 −1 style/web/components/divider/_index.less
+1 −1 style/web/components/divider/_var.less
+3 −5 style/web/components/drawer/_index.less
+2 −4 style/web/components/drawer/_var.less
+1 −0 style/web/components/dropdown/_index.less
+2 −1 style/web/components/dropdown/_var.less
+2 −3 style/web/components/form/_index.less
+2 −2 style/web/components/form/_var.less
+0 −2 style/web/components/input-number/_var.less
+9 −7 style/web/components/input/_index.less
+1 −1 style/web/components/input/_mixin.less
+8 −9 style/web/components/input/_var.less
+2 −4 style/web/components/list/_index.less
+5 −5 style/web/components/list/_var.less
+3 −4 style/web/components/loading/_index.less
+3 −5 style/web/components/loading/_var.less
+2 −2 style/web/components/menu/_index-v2.less
+2 −3 style/web/components/menu/_index.less
+12 −9 style/web/components/menu/_var.less
+2 −3 style/web/components/message/_mixin.less
+1 −2 style/web/components/message/_var.less
+3 −10 style/web/components/notification/_index.less
+1 −1 style/web/components/notification/_mixin.less
+5 −9 style/web/components/notification/_var.less
+4 −5 style/web/components/pagination/_index.less
+6 −7 style/web/components/pagination/_var.less
+3 −4 style/web/components/popconfirm/_index.less
+0 −4 style/web/components/popconfirm/_var.less
+1 −1 style/web/components/progress/_var.less
+4 −5 style/web/components/radio/_index.less
+7 −16 style/web/components/radio/_var.less
+6 −5 style/web/components/range-input/_index.less
+1 −1 style/web/components/range-input/_mixin.less
+9 −8 style/web/components/range-input/_var.less
+4 −7 style/web/components/select/_index.less
+5 −4 style/web/components/select/_var.less
+1 −2 style/web/components/slider/_index.less
+1 −4 style/web/components/slider/_var.less
+1 −1 style/web/components/switch/_index.less
+13 −1 style/web/components/table/_index.less
+6 −6 style/web/components/table/_var.less
+6 −8 style/web/components/tabs/_index.less
+6 −2 style/web/components/tabs/_var.less
+1 −1 style/web/components/tag-input/_index.less
+6 −9 style/web/components/tag/_index.less
+5 −10 style/web/components/tag/_var.less
+3 −6 style/web/components/textarea/_index.less
+4 −8 style/web/components/textarea/_var.less
+4 −4 style/web/components/time-picker/_index.less
+4 −8 style/web/components/time-picker/_var.less
+6 −3 style/web/components/tooltip/_index.less
+9 −4 style/web/components/tooltip/_var.less
+1 −2 style/web/components/transfer/_index.less
+7 −4 style/web/components/transfer/_var.less
+19 −28 style/web/components/tree/_index.less
+9 −11 style/web/components/tree/_var.less
+8 −13 style/web/components/upload/_index.less
+12 −17 style/web/components/upload/_var.less
+1 −3 style/web/mixins/_reset.less
+75 −0 style/web/theme/_font.less
+2 −0 style/web/theme/_index.less
53 changes: 24 additions & 29 deletions src/pagination/pagination.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import mixins from '../utils/mixins';
import getConfigReceiverMixins, { PaginationConfig } from '../config-provider/config-receiver';
import TInputNumber from '../input-number';
import { Select, Option } from '../select';
import TInputAdornment from '../input-adornment';
import CLASSNAMES from '../utils/classnames';
import { renderTNodeJSX } from '../utils/render-tnode';
import props from './props';
Expand All @@ -39,6 +40,7 @@ export default mixins(getConfigReceiverMixins<Vue, PaginationConfig>('pagination
ChevronLeftDoubleIcon,
EllipsisIcon,
TInputNumber,
TInputAdornment,
TSelect: Select,
TOption: Option,
},
Expand Down Expand Up @@ -304,6 +306,25 @@ export default mixins(getConfigReceiverMixins<Vue, PaginationConfig>('pagination
},

render() {
const Jumper = (
<div class={this.jumperClass}>
{this.t(this.global.jumpTo)}
<t-input-adornment append={`/ ${this.pageCount} ${this.t(this.global.page)}`}>
<t-input-number
class={this.jumperInputClass}
v-model={this.jumpIndex}
onBlur={this.onJumperChange}
onEnter={this.onJumperChange}
max={this.pageCount}
min={min}
size={this.size}
theme="normal"
placeholder=""
/>
</t-input-adornment>
</div>
);

return (
<div class={this.paginationClass}>
{/* 数据统计区 */}
Expand Down Expand Up @@ -380,17 +401,7 @@ export default mixins(getConfigReceiverMixins<Vue, PaginationConfig>('pagination
</ul>
) : null}
{/* 极简版 */}
{this.showPageNumber && this.theme === 'simple' ? (
<t-select
size={this.size}
value={this.current}
disabled={this.disabled}
class={this.simpleClass}
onChange={this.toPage}
options={this.pageCountOption}
autoWidth={true}
/>
) : null}
{this.theme === 'simple' && Jumper}
{/* 向后按钮 */}
{this.showPreviousAndNextBtn ? (
<div
Expand All @@ -411,24 +422,8 @@ export default mixins(getConfigReceiverMixins<Vue, PaginationConfig>('pagination
<page-last-icon />
</div>
) : null}
{/* 跳转 */}
{this.showJumper ? (
<div class={this.jumperClass}>
{this.t(this.global.jumpTo)}
<t-input-number
class={this.jumperInputClass}
v-model={this.jumpIndex}
onBlur={this.onJumperChange}
onEnter={this.onJumperChange}
max={this.pageCount}
min={min}
size={this.size}
theme="normal"
placeholder=""
/>
{this.t(this.global.page)}
</div>
) : null}
{/* 快速跳转 */}
{this.theme === 'default' && this.showJumper && Jumper}
</div>
);
},
Expand Down
4 changes: 2 additions & 2 deletions src/transfer/components/transfer-operations.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export default Vue.extend({
return (
<div class={`${prefix}-transfer__operations`}>
<TButton
variant={rightDisabled ? 'outline' : 'base'}
variant="outline"
key={rightDisabled ? 'right-outline' : 'right-base'}
disabled={rightDisabled}
onClick={this.moveToRight}
Expand All @@ -88,7 +88,7 @@ export default Vue.extend({
{this._renderButton(h, 'right')}
</TButton>
<TButton
variant={leftDisabled ? 'outline' : 'base'}
variant="outline"
key={leftDisabled ? 'left-outline' : 'left-base'}
disabled={leftDisabled}
onClick={this.moveToLeft}
Expand Down
112 changes: 66 additions & 46 deletions test/ssr/__snapshots__/ssr.test.js.snap

Large diffs are not rendered by default.

31 changes: 20 additions & 11 deletions test/unit/config-provider/__snapshots__/demo.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -3311,24 +3311,33 @@ exports[`ConfigProvider ConfigProvider paginationVue demo works fine 1`] = `
>
jump to
<div
class="t-input-number t-size-m t-input-number--normal t-pagination__input"
class="t-input-adornment t-input-adornment--append"
>
<div
class="t-input__wrap"
class="t-input-number t-size-m t-input-number--normal t-pagination__input"
>
<div
class="t-input t-size-m t-is-default"
ref="refInputElem"
class="t-input__wrap"
>
<input
autocomplete="off"
class="t-input__inner"
placeholder=""
type="text"
unselectable="off"
/>
<div
class="t-input t-size-m t-is-default"
ref="refInputElem"
>
<input
autocomplete="off"
class="t-input__inner"
placeholder=""
type="text"
unselectable="off"
/>
</div>
</div>
</div>
<span
class="t-input-adornment__append"
>
/ 4
</span>
</div>
</div>
</div>
Expand Down
Loading