diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c706bd2c555c856b5e97aae18f47393df5da7c9..dd17b256a7aeb5c43bbbcbda0c1b8dc7f62cad2e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -51,6 +51,7 @@ ### Change +- 更新标题栏样式,更新链接按钮样式,更新搜索栏高级搜索打开时,底部不自动弹出添加抽屉 - 移除搜索表单保存条件UI相关代码 - 更新多数据视图同时存在搜索表单和搜索栏时才会绘制搜索表单弹出按钮 - 更新直接内容轮播图和视频样式,更新树导航栏样式 diff --git a/src/control/caption-bar/caption-bar.scss b/src/control/caption-bar/caption-bar.scss index f4577887abe0d0739aba2c90842fc6f73e033858..cdf0cec586814c9a75c14c3071d62369a2391d2c 100644 --- a/src/control/caption-bar/caption-bar.scss +++ b/src/control/caption-bar/caption-bar.scss @@ -1,14 +1,21 @@ -$control-captionbar: (color: getCssVar('color', 'text', 0), - font-size: getCssVar('font-size', 'header-5'), - sub-main-font-size: getCssVar('font-size', 'header-6'), - font-weight: getCssVar('font-weight', 'bold'), - line-height: rem(26px), - text-align: center, - min-height: getCssVar('spacing', 'super-loose'), - sub-caption-font-size: getCssVar('font-size', 'regular'), - sub-caption-color: getCssVar('color', 'text', 2), - padding: getCssVar('spacing', 'tight') 0, - icon-width: rem(20px), +$control-captionbar: ( + // Color + color-page-caption: getCssVar('view-page-caption', 'color'), + color-sub-caption: getCssVar('color', 'text', 2), + // Font + font-page-caption: getCssVar('view-page-caption', 'font-size'), + font-sub-caption: getCssVar('font-size', 'regular'), + font-sub-main-size: getCssVar('font-size', 'header-6'), + font-weight: getCssVar('view-page-caption', 'font-weight'), + font-line-height: getCssVar('view-page-caption', 'line-height'), + font-text-align: getCssVar('view-page-caption', 'text-align'), + font-icon-width: rem(20px), + // Spacing + spacing-padding: getCssVar('spacing', 'tight') 0, + spacing-margin-right: getCssVar('spacing', 'tight') 0, + + // Height + height-min-height: getCssVar('spacing', 'super-loose') ); @include b(control-captionbar) { @@ -19,20 +26,18 @@ $control-captionbar: (color: getCssVar('color', 'text', 0), flex-direction: column; align-items: center; height: 100%; - min-height: getCssVar('control-captionbar', 'min-height'); - padding: getCssVar('control-captionbar', 'padding'); + min-height: getCssVar('control-captionbar', 'height-min-height'); + padding: getCssVar('control-captionbar', 'spacing-padding'); @include when(hasSub) { - @include b(control-captionbar-caption) { - font-size: getCssVar('control-captionbar', 'sub-main-font-size'); + font-size: getCssVar('control-captionbar', 'font-sub-main-size'); } } - @include e(icon) { display: inline; - margin-right: getCssVar(spacing, tight); + margin-right: getCssVar('control-captionbar', 'spacing-margin-right'); } @include b(control-captionbar-caption) { @@ -41,20 +46,20 @@ $control-captionbar: (color: getCssVar('color', 'text', 0), justify-content: center; width: 100%; height: 100%; - font-size: getCssVar('control-captionbar', 'font-size'); + font-size: getCssVar('control-captionbar', 'font-page-caption'); font-weight: getCssVar('control-captionbar', 'font-weight'); - line-height: getCssVar('control-captionbar', 'line-height'); - color: getCssVar('control-captionbar', 'color'); - text-align: getCssVar('control-captionbar', 'text-align'); + line-height: getCssVar('control-captionbar', 'font-line-height'); + color: getCssVar('control-captionbar', 'color-page-caption'); + text-align: getCssVar('control-captionbar', 'font-text-align'); - >span { + > span { @include utils-ellipsis; } @include b(icon) { flex-shrink: 0; - width: getCssVar('control-captionbar', 'icon-width'); - font-size: getCssVar('control-captionbar', 'icon-width'); + width: getCssVar('control-captionbar', 'font-icon-width'); + font-size: getCssVar('control-captionbar', 'font-icon-width'); } } @@ -67,8 +72,8 @@ $control-captionbar: (color: getCssVar('color', 'text', 0), justify-content: center; width: 100%; height: 100%; - font-size: getCssVar('control-captionbar', 'sub-caption-font-size'); - color: getCssVar('control-captionbar', 'sub-caption-color'); - text-align: getCssVar('control-captionbar', 'text-align'); + font-size: getCssVar('control-captionbar', 'font-sub-caption'); + color: getCssVar('control-captionbar', 'color-sub-caption'); + text-align: getCssVar('control-captionbar', 'font-text-align'); } -} \ No newline at end of file +} diff --git a/src/control/search-bar/filter-tree/filter-tree.tsx b/src/control/search-bar/filter-tree/filter-tree.tsx index 3552efb41b62e8954bc258ebae24fd8f228e0d1e..b4d49c9713ee5c20f96e8f72d869bb4aeaf708b2 100644 --- a/src/control/search-bar/filter-tree/filter-tree.tsx +++ b/src/control/search-bar/filter-tree/filter-tree.tsx @@ -14,7 +14,6 @@ import { computed, defineComponent, h, - onMounted, PropType, Ref, ref, @@ -404,13 +403,6 @@ export const FilterTreeControl = defineComponent({ closePopup(); }; - onMounted(() => { - const bol = hasFilter(); - if (!bol) { - addItem(); - } - }); - /** * @description 过滤项点击 * @param {MouseEvent} event diff --git a/src/panel-component/panel-button/panel-button.tsx b/src/panel-component/panel-button/panel-button.tsx index 2de315df3885b5b8c957c12c24a17192e4ab9076..0c6a8d95f0209961805419bc30e31fa3e88022cc 100644 --- a/src/panel-component/panel-button/panel-button.tsx +++ b/src/panel-component/panel-button/panel-button.tsx @@ -50,7 +50,7 @@ export const PanelButton = defineComponent({ }); const buttonType = computed(() => { - if (Object.is(renderMode, 'LINK')) return 'text'; + if (Object.is(renderMode, 'LINK')) return 'link'; return convertBtnType(props.modelData); });