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 @@ -
-