diff --git a/report-ui/src/views/bigscreenDesigner/designer/linkageLogic.js b/report-ui/src/views/bigscreenDesigner/designer/linkageLogic.js index bd966e90..3f81cdb0 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/linkageLogic.js +++ b/report-ui/src/views/bigscreenDesigner/designer/linkageLogic.js @@ -22,6 +22,11 @@ export const lickageParamsConfig = [ code: 'widget-form-time', paramsKey: ['startTime','endTime'] }, + { + name: '日历', + code: 'widget-calendar', + paramsKey: ['date'] + }, { name: '柱图', code: 'widget-barchart', diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-calendar.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-calendar.js index 0247fa91..07caf034 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-calendar.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-calendar.js @@ -112,6 +112,21 @@ export const widgetCalendar = { required: false, placeholder: '', value: 'rgb(0, 0, 0)' + },{ + type: 'vue-color', + label: '选中背景色', + name: 'selectedBackground', + required: false, + placeholder: '', + value: 'rgb(11, 180, 241)' + }, + { + type: 'vue-color', + label: '选中文字颜色', + name: 'selectedTextColor', + required: false, + placeholder: '', + value: 'rgb(0, 0, 0)' }, { type: 'el-switch', @@ -123,7 +138,19 @@ export const widgetCalendar = { }, ] } - ] + ], + [{ + name: '组件联动', + list: [ + { + type: 'componentLinkage', + label: '', + name: 'componentLinkage', + required: false, + value: [] + } + ] + }] ], data: [ { diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetCalendar.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetCalendar.vue index 4358c913..c5d1640d 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetCalendar.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetCalendar.vue @@ -18,9 +18,11 @@ :class="{ 'out-of-range': day.isOutOfRange, 'current-month': day.isCurrentMonth, - 'today': day.isToday + 'today': day.isToday, + 'selected': day.date === selectDayStr }" - :style="cellStyle(day.isToday)" + :style="cellStyle(day.isToday, day.date === selectDayStr)" + @click="selectDay(day)" >
{{ day.day }}
@@ -34,13 +36,17 @@