From 393fdea8badb956c28219f7c578eeec026276ecb Mon Sep 17 00:00:00 2001 From: pengYYY Date: Wed, 14 Dec 2022 13:01:23 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20demo=20=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/_common | 2 +- .../__snapshots__/index.test.jsx.snap | 54 +- src/calendar/_example/cell.vue | 10 +- src/calendar/_example/controller-config.vue | 4 +- src/calendar/_example/slot-props-api.vue | 8 +- src/calendar/calendar.tsx | 1 + src/card/_example/footer-actions.vue | 41 +- src/card/_example/footer-content-actions.vue | 2 +- src/card/_example/footer.vue | 34 +- src/card/_example/header-footer-actions.vue | 41 +- .../header-subtitle-footer-actions.vue | 30 +- src/collapse/_example/base.vue | 2 +- src/form/_example/validator-status.vue | 4 +- src/image-viewer/image-viewer.tsx | 2 +- src/image/_example/placeholder.vue | 4 +- src/list/_example/base.vue | 12 +- src/list/_example/operation.vue | 12 +- src/select-input/_example/autocomplete.vue | 13 +- .../_example/autowidth-multiple.vue | 68 +- src/select-input/_example/autowidth.vue | 19 +- .../_example/borderless-multiple.vue | 64 +- src/select-input/_example/borderless.vue | 12 +- src/select-input/_example/collapsed-items.vue | 24 +- src/select-input/_example/custom-tag.vue | 23 +- .../_example/excess-tags-display-type.vue | 17 +- src/select-input/_example/label-suffix.vue | 14 +- src/select-input/_example/multiple.vue | 52 +- src/select-input/_example/single.vue | 12 +- src/select-input/_example/status.vue | 22 +- src/select-input/_example/width.vue | 7 +- src/select/_example/collapsed.vue | 8 +- src/select/_example/custom-options.vue | 8 +- src/select/_example/panel.vue | 15 +- src/transfer/_example/custom.vue | 12 +- .../components/transfer-operations.tsx | 4 + src/upload/themes/dragger-file.tsx | 26 +- src/upload/themes/multiple-flow-list.tsx | 12 +- test/snap/__snapshots__/csr.test.js.snap | 1549 ++++++++--------- test/snap/__snapshots__/ssr.test.js.snap | 84 +- 39 files changed, 1141 insertions(+), 1187 deletions(-) diff --git a/src/_common b/src/_common index fa261d62b..c40866aaf 160000 --- a/src/_common +++ b/src/_common @@ -1 +1 @@ -Subproject commit fa261d62b1cb4b08266c9cbeadc80b6377157c3b +Subproject commit c40866aaf0c84fb50f1914970578f84174c8d3d6 diff --git a/src/calendar/__tests__/__snapshots__/index.test.jsx.snap b/src/calendar/__tests__/__snapshots__/index.test.jsx.snap index 397503661..777b664b3 100644 --- a/src/calendar/__tests__/__snapshots__/index.test.jsx.snap +++ b/src/calendar/__tests__/__snapshots__/index.test.jsx.snap @@ -177,7 +177,7 @@ exports[`Calendar > :props > :cell 1`] = ` class="t-calendar__control-section-cell" > 隐藏周末 @@ -638,7 +638,7 @@ exports[`Calendar > :props > :cell 1`] = ` class="t-calendar__control-section-cell" > 隐藏周末 @@ -1174,7 +1174,7 @@ exports[`Calendar > :props > :cellAppend 1`] = ` class="t-calendar__control-section-cell" > 隐藏周末 @@ -2020,7 +2020,7 @@ exports[`Calendar > :props > :cellAppend 1`] = ` class="t-calendar__control-section-cell" > 隐藏周末 @@ -4378,7 +4378,7 @@ exports[`Calendar > :props > :fillWithZero 1`] = ` class="t-calendar__control-section-cell" > 隐藏周末 @@ -5224,7 +5224,7 @@ exports[`Calendar > :props > :fillWithZero 1`] = ` class="t-calendar__control-section-cell" > 隐藏周末 @@ -6074,7 +6074,7 @@ exports[`Calendar > :props > :firstDayOfWeek 1`] = ` class="t-calendar__control-section-cell" > 隐藏周末 @@ -7039,7 +7039,7 @@ exports[`Calendar > :props > :format 1`] = ` class="t-calendar__control-section-cell" > 隐藏周末 @@ -7891,7 +7891,7 @@ exports[`Calendar > :props > :head 1`] = ` class="t-calendar__control-section-cell" > 隐藏周末 @@ -8741,7 +8741,7 @@ exports[`Calendar > :props > :head 1`] = ` class="t-calendar__control-section-cell" > 隐藏周末 @@ -9592,7 +9592,7 @@ exports[`Calendar > :props > :isShowWeekendDefault 1`] = ` class="t-calendar__control-section-cell" > 隐藏周末 @@ -10438,7 +10438,7 @@ exports[`Calendar > :props > :isShowWeekendDefault 1`] = ` class="t-calendar__control-section-cell" > 显示周末 @@ -11115,7 +11115,7 @@ exports[`Calendar > :props > :mode 1`] = ` class="t-calendar__control-section-cell" > 隐藏周末 @@ -12314,7 +12314,7 @@ exports[`Calendar > :props > :multiple 1`] = ` class="t-calendar__control-section-cell" > 隐藏周末 @@ -13164,7 +13164,7 @@ exports[`Calendar > :props > :preventCellContextmenu 1`] = ` class="t-calendar__control-section-cell" > 隐藏周末 @@ -14010,7 +14010,7 @@ exports[`Calendar > :props > :preventCellContextmenu 1`] = ` class="t-calendar__control-section-cell" > 隐藏周末 @@ -14860,7 +14860,7 @@ exports[`Calendar > :props > :range 1`] = ` class="t-calendar__control-section-cell" > 隐藏周末 @@ -16533,7 +16533,7 @@ exports[`Calendar > :props > :theme 1`] = ` class="t-calendar__control-section-cell" > 隐藏周末 @@ -17383,7 +17383,7 @@ exports[`Calendar > :props > :value 1`] = ` class="t-calendar__control-section-cell" > 隐藏周末 @@ -18233,7 +18233,7 @@ exports[`Calendar > :props > :week 1`] = ` class="t-calendar__control-section-cell" > 隐藏周末 @@ -19065,7 +19065,7 @@ exports[`Calendar > :props > :week 1`] = ` class="t-calendar__control-section-cell" > 隐藏周末 @@ -19916,7 +19916,7 @@ exports[`Calendar > :props > :year:month 1`] = ` class="t-calendar__control-section-cell" > 隐藏周末 @@ -20762,7 +20762,7 @@ exports[`Calendar > :props > :year:month 1`] = ` class="t-calendar__control-section-cell" > 隐藏周末 @@ -21612,7 +21612,7 @@ exports[`Calendar > > 1`] = ` class="t-calendar__control-section-cell" > 隐藏周末 @@ -22461,7 +22461,7 @@ exports[`Calendar > > 1`] = ` class="t-calendar__control-section-cell" > 隐藏周末 @@ -23310,7 +23310,7 @@ exports[`Calendar > > 1`] = ` class="t-calendar__control-section-cell" > 隐藏周末 @@ -24159,7 +24159,7 @@ exports[`Calendar > > 1`] = ` class="t-calendar__control-section-cell" > 隐藏周末 diff --git a/src/calendar/_example/cell.vue b/src/calendar/_example/cell.vue index 2d0108fe7..f131c3231 100644 --- a/src/calendar/_example/cell.vue +++ b/src/calendar/_example/cell.vue @@ -60,22 +60,24 @@ export default { .shadow { position: absolute; width: 100%; - height: 12px; + height: 22px; bottom: 0; background: linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, #ffffff 100%); } .number { - font-weight: bold; + font-weight: 600; position: absolute; - top: 3px; - right: 5px; + right: 0; font-size: 14px; + line-height: 22px; } .item { position: relative; display: flex; align-items: center; color: var(--td-text-color-secondary); + font-size: 14px; + line-height: 22px; span { display: block; left: 1px; diff --git a/src/calendar/_example/controller-config.vue b/src/calendar/_example/controller-config.vue index ab3713746..e40f5ffea 100644 --- a/src/calendar/_example/controller-config.vue +++ b/src/calendar/_example/controller-config.vue @@ -94,13 +94,13 @@ export default { showWeekendButtonProps: { // 用于透传props给显示周末按钮组件 disabled: false, - size: 'small', + size: 'medium', }, hideWeekendButtonProps: { // 用于透传props给隐藏周末按钮组件 disabled: false, variant: 'base', - size: 'small', + size: 'medium', }, }, // “今天\本月”按钮组件相关设置 diff --git a/src/calendar/_example/slot-props-api.vue b/src/calendar/_example/slot-props-api.vue index 2be28040b..898827348 100644 --- a/src/calendar/_example/slot-props-api.vue +++ b/src/calendar/_example/slot-props-api.vue @@ -80,7 +80,7 @@ export default { position: relative; display: flex; align-items: center; - color: rgba(0, 0, 0, 0.6); + color: var(--td-text-color-secondary); span { display: block; left: 1px; @@ -91,13 +91,13 @@ export default { } } .error { - background: #e34d59; + background: var(--td-error-color); } .warning { - background: #ed7b2f; + background: var(--td-warning-color); } .success { - background: #00a870; + background: var(--td-success-color); } } .calendar-slot-props-api-demo-slot-wrapper { diff --git a/src/calendar/calendar.tsx b/src/calendar/calendar.tsx index 33ce168c9..ef771c50e 100644 --- a/src/calendar/calendar.tsx +++ b/src/calendar/calendar.tsx @@ -617,6 +617,7 @@ export default mixins(getConfigReceiverMixins('calendar')). defaultChecked={!this.isShowWeekend} disabled={this.isWeekendToggleDisabled} onClick={this.onWeekendToggleClick} + size="large" props={{ ...this.weekendBtnVBind }} > {this.weekendBtnText} diff --git a/src/card/_example/footer-actions.vue b/src/card/_example/footer-actions.vue index f58ce248e..3a7174e9b 100644 --- a/src/card/_example/footer-actions.vue +++ b/src/card/_example/footer-actions.vue @@ -2,50 +2,47 @@ -
-