diff --git a/CHANGELOG.md b/CHANGELOG.md index 00b99e68f90aabbc19bb96a8de4516ce37da0dde..b0e01e48e1fab1a27bad60071bb7e81bb6afec1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,16 @@ ## [Unreleased] +### Change + +- 优化drbar、drtab部件样式,规范其样式变量 +- 优化搜索栏、工具栏、分页导航面板、向导面板部件样式,规范其样式变量 + +### Fixed + +- 修复数组编辑器、富文本编辑器、滑动输入框、文件上传响应式样式异常 +- 修复数据选择(下拉)点击取消按钮未清空数据 + ## [0.7.41-alpha.21] - 2025-11-28 ### Added diff --git a/src/control/drbar/drbar.scss b/src/control/drbar/drbar.scss index 994b3bbf5edf52ae24be78307093152f84a0a090..4e36fd6ba2c883241adf67bbe6ce0c5a542bdc9d 100644 --- a/src/control/drbar/drbar.scss +++ b/src/control/drbar/drbar.scss @@ -1,6 +1,25 @@ +$control-drbar: ( + max-width: rem(100px), + width-icon: getCssVar(width-icon, medium), + height-popover-item: var(--van-popover-action-height), + color: getCssVar(color, text-2), + color-bg: getCssVar(view, bg-color), + color-active: getCssVar(color, primary), + color-disabled-text: getCssVar(color, disabled, text), + color-disabled-bg: getCssVar(color, disabled, bg), + spacing-padding: getCssVar(spacing, tight), + spacing-gap: getCssVar(spacing, tight), + spacing-group-gap: getCssVar(spacing, extra-tight), + spacing-group-padding: getCssVar(spacing, tight), + spacing-popover-padding: 0 getCssVar(spacing, base-loose), + font-fontSize: getCssVar(font-size, header-4), + font-popover-fontSize: getCssVar(font-size, header-5), +); + @include b(control-drbar) { - padding: getCssVar(spacing, tight); - background-color: getCssVar(view, bg-color); + @include set-component-css-var(control-drbar, $control-drbar); + padding: getCssVar(control-drbar, spacing-padding); + background-color: getCssVar(control-drbar, color-bg); .van-button { border: none; @@ -10,50 +29,51 @@ .van-button__text { display: flex; align-items: center; - line-height: getCssVar(font-size, header-4); - font-size: getCssVar(font-size, header-4); - gap: getCssVar(spacing, extra-tight); + line-height: getCssVar(control-drbar, font-fontSize); + font-size: getCssVar(control-drbar, font-fontSize); + gap: getCssVar(control-drbar, spacing-gap); } } @include e(default) { width: auto; - max-width: rem(100px); + max-width: getCssVar(control-drbar, max-width); .#{bem(icon)} { @include flex(row, center, center); - width: getCssVar(width-icon, medium); - height: getCssVar(width-icon, medium); - font-size: getCssVar(width-icon, medium); + width: getCssVar(control-drbar, width-icon); + height: getCssVar(control-drbar, width-icon); + font-size: getCssVar(control-drbar, width-icon); } @include m(group) { - color: getCssVar(color, text-2); - padding: getCssVar(spacing, tight); + color: getCssVar(control-drbar, color); + padding: getCssVar(control-drbar, spacing-group-padding); } @include m(group-title) { display: flex; align-items: center; - gap: getCssVar(spacing, tight); + gap: getCssVar(control-drbar, spacing-group-gap); } @include m(item-title) { display: flex; align-items: center; - gap: getCssVar(spacing, tight); + gap: getCssVar(control-drbar, spacing-group-gap); } } @include e(popover) { + @include set-component-css-var(control-drbar, $control-drbar); @include m(group) { display: flex; cursor: pointer; position: relative; align-items: center; box-sizing: border-box; - height: var(--van-popover-action-height); - padding: 0 getCssVar(spacing, base-loose); - font-size: getCssVar(font-size, header-5); - gap: getCssVar(spacing, tight); - color: getCssVar(color, text-2); + height: getCssVar(control-drbar, height-popover-action); + padding: getCssVar(control-drbar, spacing-popover-padding); + font-size: getCssVar(control-drbar, font-popover-fontSize); + gap: getCssVar(control-drbar, spacing-gap); + color: getCssVar(control-drbar, color); } @include m(item) { display: flex; @@ -61,35 +81,35 @@ position: relative; align-items: center; box-sizing: border-box; - height: var(--van-popover-action-height); - padding: 0 getCssVar(spacing, base-loose); - font-size: getCssVar(font-size, header-5); - gap: getCssVar(spacing, tight); + height: getCssVar(control-drbar, height-popover-item); + padding: getCssVar(control-drbar, spacing-popover-padding); + font-size: getCssVar(control-drbar, font-popover-fontSize); + gap: getCssVar(control-drbar, spacing-gap); .#{bem(icon)} { @include flex(row, center, center); - width: getCssVar(width-icon, medium); - height: getCssVar(width-icon, medium); - font-size: getCssVar(width-icon, medium); + width: getCssVar(control-drbar, width-icon); + height: getCssVar(control-drbar, width-icon); + font-size: getCssVar(control-drbar, width-icon); } .caption { flex-grow: 1; display: flex; align-items: center; - gap: getCssVar(spacing, tight); + gap: getCssVar(control-drbar, spacing-gap); } ion-icon { - color: getCssVar(color, primary); + color: getCssVar(control-drbar, color-active); } @include when(disabled) { cursor: not-allowed; pointer-events: none; - color: getCssVar(color, disabled-text); - background-color: getCssVar(color, disabled-bg); + color: getCssVar(color, color-disabled-text); + background-color: getCssVar(color, color-disabled-bg); } } } diff --git a/src/control/drtab/drtab.scss b/src/control/drtab/drtab.scss index a0ad0528d41d49deb0702c65af4073eb5619a30b..c33e4ee86e9e2233bc293e6d5aafd9faed528e31 100644 --- a/src/control/drtab/drtab.scss +++ b/src/control/drtab/drtab.scss @@ -1,9 +1,7 @@ $control-drtab: ( - // Color color-tab-text: getCssVar('color', 'text', 0), color-tab-text-active: getCssVar('color', 'primary'), - // Font - font-tab-font-size: getCssVar('font-size', 'regular') + font-tab-fontSize: getCssVar('font-size', 'regular') ); @include b(control-drtab) { @@ -18,9 +16,9 @@ $control-drtab: ( control-drtab, color-tab-text-active ); - #{getCssVarName('tab-layout', 'font-tab-font-size')}: getCssVar( + #{getCssVarName('tab-layout', 'font-tab-fontSize')}: getCssVar( control-drtab, - font-tab-font-size + font-tab-fontSize ); } } diff --git a/src/control/search-bar/filter-tree/filter-tree.scss b/src/control/search-bar/filter-tree/filter-tree.scss index 01f364f34a0394407ead043b43c4480431df331a..e60a4940afe74e5431f86b3040a6faf424a0df1a 100644 --- a/src/control/search-bar/filter-tree/filter-tree.scss +++ b/src/control/search-bar/filter-tree/filter-tree.scss @@ -1,11 +1,28 @@ $filter-tree: ( - header-height: rem(42px), - font-size: getCssVar(font-size, header, 5), - font-weight: getCssVar(font-weight, bold), - line-height: 1.625rem, - icon-size: getCssVar(width-icon, extra-large), + width-type-popper: rem(80px), + color-readonly: getCssVar(color, text, 2), + spacing-header-padding: getCssVar(spacing, base), + spacing-content-padding: 0 getCssVar(spacing, base) 0 calc(getCssVar(spacing, base) + getCssVar(spacing, super, loose)), + spacing-footer-padding: getCssVar(spacing, base), + spacing-popup-padding: getCssVar(spacing, base), + spacing-item-padding: getCssVar(spacing, base), + spacing-footer-gap: getCssVar(spacing, super, loose), + spacing-type-offset: getCssVar(spacing, tight), + spacing-type-left-gap: calc(-1 * getCssVar(spacing, super, loose)), + spacing-type-item-padding: getCssVar(spacing, tight) getCssVar(spacing, base), + font-fontSize: getCssVar(font-size, header, 5), + font-icon-fontSize: getCssVar(width-icon, extra-large), + font-lineHeight: getCssVar(font-size, header, 2), + font-fontWeight: getCssVar(font-weight, bold), + border: getCssVar('border-thickness', 'control') solid getCssVar(color, border), + radius: getCssVar(border-radius, medium), ); +@include b(filter-tree) { + @include e(popup) { + @include set-component-css-var('filter-tree', $filter-tree); + } +} @include b(filter-tree) { @include set-component-css-var('filter-tree', $filter-tree); display: flex; @@ -16,11 +33,9 @@ $filter-tree: ( flex: none; align-items: center; justify-content: center; - height: getCssVar(filter-tree, header-height); - font-size: getCssVar(filter-tree, font-size); - font-weight: getCssVar(filter-tree, font-weight); - line-height: getCssVar(filter-tree, line-height); - padding: 0 var(--van-popup-close-icon-margin); + font-size: getCssVar(filter-tree, font-fontSize); + font-weight: getCssVar(filter-tree, font-fontWeight); + padding: getCssVar(filter-tree, spacing-header-padding); } @include e(title) { width: 100%; @@ -31,54 +46,48 @@ $filter-tree: ( display: flex; align-items: center; ion-icon { - font-size: getCssVar(filter-tree, icon-size); + font-size: getCssVar(filter-tree, font-icon-fontSize); } } @include e(content) { height: 100%; flex: auto; - padding-right: getCssVar(spacing, base); - padding-left: calc(getCssVar(spacing, base) + getCssVar(spacing, super, loose)); + padding: getCssVar(filter-tree, spacing-content-padding); } @include e(footer) { flex: none; - padding: getCssVar(spacing, base); + padding: getCssVar(filter-tree, spacing-footer-padding); display: flex; justify-content: space-between; .van-button { width: 48%; } } - @include e(popup) { - } @include e(popup-content) { height: 100%; display: flex; flex-direction: column; - padding: getCssVar(spacing, base); + padding: getCssVar(filter-tree, spacing-popup-padding); } @include e(popup-caption) { - height: getCssVar(filter-tree, header-height); - font-size: getCssVar(filter-tree, font-size); - font-weight: getCssVar(filter-tree, font-weight); - line-height: getCssVar(filter-tree, line-height); + font-size: getCssVar(filter-tree, font-fontSize); + font-weight: getCssVar(filter-tree, font-fontWeight); text-align: center; } @include e(editor) { - padding: getCssVar(spacing, base); + padding: getCssVar(filter-tree, spacing-item-padding); display: flex; justify-content: space-between; - #{getCssVarName(form-item-container, editor-align)}: right; } @include e(group) { position: relative; } @include e(type) { position: absolute; - top: getCssVar(spacing, base); - left: rem(-40px); + top: getCssVar(filter-tree, spacing-item-padding); + left: getCssVar(filter-tree, spacing-type-left-gap); @include when (readonly) { - color: getCssVar(color, disabled, text); + color: getCssVar(filter-tree, color-readonly); } .van-dropdown-menu__bar { box-shadow: none; @@ -89,37 +98,37 @@ $filter-tree: ( padding-left: 0; } .van-dropdown-item__content { - width: 80px; - left: getCssVar(spacing, base); - border: 1px solid getCssVar(color, border); - border-radius: getCssVar(border-radius, medium); + width: getCssVar(filter-tree, width-type-popper);; + left: getCssVar(filter-tree, spacing-type-offset); + border: getCssVar(filter-tree, border); + border-radius: getCssVar(filter-tree, radius); .van-dropdown-item__option { - padding: getCssVar(spacing, tight) getCssVar(spacing, base); + padding: getCssVar(filter-tree, spacing-type-item-padding); } } } @include e(item) { display: flex; - padding: getCssVar(spacing, base) 0; + padding: getCssVar(filter-tree, spacing-item-padding) 0; flex-direction: column; - line-height: getCssVar(font-size, header, 2); - border-bottom: 1px solid getCssVar(color, border); + line-height: getCssVar(filter-tree, font-lineHeight); + border-bottom: getCssVar(filter-tree, border); } @include e(field) { - padding-right: getCssVar(spacing, base); + padding-right: getCssVar(filter-tree, spacing-item-padding); } @include e(condop) { flex: auto; } @include e(value) { - padding-right: getCssVar(spacing, base); + padding-right: getCssVar(filter-tree, spacing-item-padding); } @include e(item-header) { display: flex; } @include e(item-footer) { display: flex; - gap: getCssVar(spacing, super, loose); + gap: getCssVar(filter-tree, spacing-footer-gap); .van-button { width: 100%; } @@ -127,13 +136,13 @@ $filter-tree: ( } @include b(filter-field-select) { - padding: rem(16px); + padding: getCssVar(filter-tree, spacing-item-padding); .van-field__control { text-align: right; } } @include b(filter-mode-select) { - padding: rem(16px); + padding: getCssVar(filter-tree, spacing-item-padding); .van-field__control { text-align: right; } diff --git a/src/control/search-bar/search-bar.scss b/src/control/search-bar/search-bar.scss index 5465dffa5d2edb256f4c2a72c0ee6d9a6fac3a64..7976d5325be54bdc43c4b509ab9158c82873376d 100644 --- a/src/control/search-bar/search-bar.scss +++ b/src/control/search-bar/search-bar.scss @@ -1,12 +1,13 @@ $control-searchbar: ( - bg-color: getCssVar(color, bg, 1), - margin: getCssVar(spacing, tight), - padding: getCssVar(spacing, tight) getCssVar(spacing, base), - filter-btn-margin: 0 0 0 getCssVar('spacing', 'tight'), - filter-btn-font-size: getCssVar('font-size', 'header-4'), - filter-btn-height: getCssVar('height-control', 'default'), - enable-filter-padding: getCssVar(spacing, tight) getCssVar(spacing, tight) + color-bg: getCssVar(color, bg, 1), + spacing-margin: getCssVar(spacing, tight), + spacing-padding: getCssVar(spacing, tight) getCssVar(spacing, base), + spacing-filter-margin: 0 0 0 getCssVar('spacing', 'tight'), + font-filter-fontSize: getCssVar('font-size', 'header-4'), + height-filter: getCssVar('height-control', 'default'), + spacing-filter-padding: getCssVar(spacing, tight) getCssVar(spacing, tight) getCssVar(spacing, tight) getCssVar(spacing, base), + spacing-icon-gap: getCssVar(spacing, extra-tight), // 快速分组 color-group-item-text: getCssVar(color, text, 1), color-group-item-bg: getCssVar(color, fill, 1), @@ -14,43 +15,33 @@ $control-searchbar: ( color-group-item-selected-text: getCssVar(color, white), spacing-group-item-padding: getCssVar(spacing, tight) getCssVar(spacing, base), spacing-group-item-gap: getCssVar(spacing, tight), - spacing-group-more-gap: getCssVar(spacing, extra-tight), spacing-group-item-margin: getCssVar(spacing, extra-tight) getCssVar(spacing, tight) 0 0, - spacing-group-container-padding: getCssVar(spacing, base), radius-group-item: getCssVar(border-radius, full), - footer-item-padding: getCssVar(spacing, base), - footer-item-gap: getCssVar(spacing, base, tight), - footer-group-padding: 0 getCssVar(spacing, base), - footer-more-color: getCssVar(color, link), - footer-item-shadow: getCssVar(shadow, elevated), - footer-item-border-radius: getCssVar(border, radius, small), - footer-reset-color: getCssVar(color, text), - footer-reset-bg-color: transparent, - footer-confirm-color: getCssVar(color, default), - footer-confirm-bg-color: getCssVar(color, primary), ); $control-searchbar-quick-search: ( height: getCssVar('height-control', 'default'), - border-radius: getCssVar(border-radius, small), - left-icon: 0 getCssVar('spacing', 'tight') 0 0, + radius: getCssVar(border-radius, small), + spacing-icon: 0 getCssVar('spacing', 'tight') 0 0, ); -$dropdown-popover: ( - color-popover-bg: getCssVar(color, bg, 1), +$control-searchbar-dropdown: ( + color-bg: getCssVar(color, bg, 1), // 历史搜索 - color-history-item-bg: getCssVar(color, fill, 1), - spacing-dropdown-popover-padding: getCssVar(spacing, base), - spacing-history-header-padding: getCssVar(spacing, tight), - spacing-history-header-clear-gap: getCssVar(spacing, extra-tight), - spacing-history-footer-padding: getCssVar(spacing, tight), + color-item-bg: getCssVar(color, fill, 1), + spacing-padding: getCssVar(spacing, base), + spacing-gap: getCssVar(spacing, tight), + spacing-history-header-padding: getCssVar(spacing, tight) 0, + spacing-clear-gap: getCssVar(spacing, extra-tight), + spacing-history-footer-padding: getCssVar(spacing, tight) getCssVar(spacing, tight) 0, spacing-history-item-padding: getCssVar(spacing, extra-tight) getCssVar(spacing, base), spacing-history-item-margin: getCssVar(spacing, extra-tight), spacing-history-item-gap: getCssVar(spacing, tight), font-history-item-line-height: getCssVar(spacing, loose), radius-history-item: getCssVar(border-radius, full), + border: getCssVar('border-thickness', 'control') solid getCssVar(color, border), ); // 搜索输入框样式 @@ -65,10 +56,10 @@ $dropdown-popover: ( padding: 0; .van-search__content { - border-radius: getCssVar(control-searchbar-quick-search, border-radius); + border-radius: getCssVar(control-searchbar-quick-search, radius); } .van-field__left-icon { - margin: getCssVar(control-searchbar-quick-search, left-icon); + margin: getCssVar(control-searchbar-quick-search, spacing-icon); } } @@ -76,16 +67,16 @@ $dropdown-popover: ( @include set-component-css-var(control-searchbar, $control-searchbar); display: flex; align-items: center; - background-color: getCssVar(control-searchbar, bg-color); - padding: getCssVar(control-searchbar, padding); + background-color: getCssVar(control-searchbar, color-bg); + padding: getCssVar(control-searchbar, spacing-padding); // 高级搜索按钮 @include e(filter) { flex: none; border: none; - font-size: getCssVar(control-searchbar, filter-btn-font-size); - height: getCssVar(control-searchbar, filter-btn-height); - margin: getCssVar(control-searchbar, filter-btn-margin); + font-size: getCssVar(control-searchbar, font-filter-fontSize); + height: getCssVar(control-searchbar, height-filter); + margin: getCssVar(control-searchbar, spacing-filter-margin); .van-button__text { display: flex; @@ -94,9 +85,6 @@ $dropdown-popover: ( } @include e('action-sheet') { - --van-action-sheet-cancel-padding-color: #{getCssVar(color, fill, 0)}; - --van-action-sheet-cancel-text-color: #{getCssVar(color, text, 0)}; - --van-active-color: #{getCssVar(color, fill, 0)}; @include m('item') { @include when('selected') { color: getCssVar(color, primary); @@ -106,7 +94,7 @@ $dropdown-popover: ( // 适配高级搜索按钮需调整边距 @include when(enable-filter) { - padding: getCssVar(control-searchbar, enable-filter-padding); + padding: getCssVar(control-searchbar, spacing-filter-padding); } } @@ -118,20 +106,20 @@ $dropdown-popover: ( } @include b('control-searchbar-dropdown') { - @include set-component-css-var(dropdown-popover, $dropdown-popover); - background-color: getCssVar(dropdown-popover, color-popover-bg); + @include set-component-css-var(control-searchbar-dropdown, $control-searchbar-dropdown); + background-color: getCssVar(control-searchbar-dropdown, color-bg); flex-direction: column; position: fixed; left: 0; - gap: 8px; + gap: getCssVar(control-searchbar-dropdown, spacing-gap);; width: 100vw; z-index: 999; - padding: getCssVar(dropdown-popover, spacing-dropdown-popover-padding); - border-top: 1px solid var(--ibiz-color-border); - border-bottom: 1px solid var(--ibiz-color-border); + padding: getCssVar(control-searchbar-dropdown, spacing-padding); + border-top: getCssVar(control-searchbar-dropdown, border); + border-bottom: getCssVar(control-searchbar-dropdown, border); } -@include b('control-searchbar-history') { +@include b('control-searchbar-dropdown') { flex: 1; display: flex; flex-direction: column; @@ -141,14 +129,14 @@ $dropdown-popover: ( flex-shrink: 0; display: flex; justify-content: space-between; - padding: getCssVar(dropdown-popover, spacing-history-header-padding) 0; + padding: getCssVar(control-searchbar-dropdown, spacing-history-header-padding); @include m('title') { font-weight: bold; } @include m('clear') { display: flex; align-items: center; - gap: getCssVar(dropdown-popover, spacing-history-header-clear-gap); + gap: getCssVar(control-searchbar-dropdown, spacing-clear-gap); } } @include e('content') { @@ -157,7 +145,7 @@ $dropdown-popover: ( display: flex; flex-flow: wrap; overflow: auto; - gap: getCssVar(dropdown-popover, spacing-history-item-gap); + gap: getCssVar(control-searchbar-dropdown, spacing-history-item-gap); @include m('item') { flex-shrink: 0; display: inline-flex; @@ -166,14 +154,14 @@ $dropdown-popover: ( } @include m('item-text') { max-width: 100%; - background-color: getCssVar(dropdown-popover, color-history-item-bg); - border-radius: getCssVar(dropdown-popover, radius-history-item); - padding: getCssVar(dropdown-popover, spacing-history-item-padding); + background-color: getCssVar(control-searchbar-dropdown, color-item-bg); + border-radius: getCssVar(control-searchbar-dropdown, radius-history-item); + padding: getCssVar(control-searchbar-dropdown, spacing-history-item-padding); white-space: nowrap; overflow: hidden; text-overflow: ellipsis; - margin-top: getCssVar(dropdown-popover, spacing-history-item-margin); - line-height: getCssVar(dropdown-popover, font-history-item-line-height); + margin-top: getCssVar(control-searchbar-dropdown, spacing-history-item-margin); + line-height: getCssVar(control-searchbar-dropdown, font-history-item-line-height); } @include m('item-remove') { position: absolute; @@ -185,14 +173,12 @@ $dropdown-popover: ( --van-divider-margin: 0; flex-shrink: 0; text-align: center; - padding: getCssVar(dropdown-popover, spacing-history-footer-padding) - getCssVar(dropdown-popover, spacing-history-footer-padding) 0 - getCssVar(dropdown-popover, spacing-history-footer-padding); + padding: getCssVar(control-searchbar-dropdown, spacing-history-footer-padding); } } @include b('control-searchbar-quick-group') { - padding: getCssVar(control-searchbar, padding); + padding: getCssVar(control-searchbar, spacing-padding); display: flex; gap: getCssVar(control-searchbar, spacing-group-item-gap); flex-flow: wrap; @@ -203,14 +189,14 @@ $dropdown-popover: ( overflow: hidden; display: inline-block; height: max-content; - margin-top: getCssVar(control-searchbar, margin); + margin-top: getCssVar(control-searchbar, spacing-margin); color: getCssVar(control-searchbar, color-group-item-text); background-color: getCssVar(control-searchbar, color-group-item-bg); padding: getCssVar(control-searchbar, spacing-group-item-padding); border-radius: getCssVar(control-searchbar, radius-group-item); ion-icon { vertical-align: text-top; - margin-right: getCssVar(control-searchbar, spacing-group-more-gap); + margin-right: getCssVar(control-searchbar, spacing-icon-gap); } @include when('selected') { color: getCssVar(control-searchbar, color-group-item-selected-text); @@ -221,53 +207,3 @@ $dropdown-popover: ( } } } - -@include b('control-searchbar-quick-group-popup') { - width: 100%; - height: 100%; - max-width: 100%; - padding: getCssVar(control-searchbar, spacing-group-container-padding); -} - -@include b('control-searchbar-quick-group-container') { - @include set-component-css-var(control-searchbar, $control-searchbar); - display: flex; - flex-direction: column; - width: 100%; - height: 100%; - @include e('content') { - flex: 1; - overflow: auto; - @include m('item') { - margin: getCssVar(control-searchbar, spacing-group-item-margin); - } - } - @include e('footer') { - @include flex(row, flex-start, center); - display: flex; - flex-shrink: 0; - gap: getCssVar(control-searchbar, footer-item-gap); - padding: getCssVar(control-searchbar, footer-padding); - @include m('reset') { - flex: 1; - padding: getCssVar(control-searchbar, footer-item-padding); - box-shadow: getCssVar(control-searchbar, footer-item-shadow); - background-color: getCssVar(control-searchbar, footer-reset-bg-color); - color: getCssVar(control-searchbar, text-color); - width: 100%; - text-align: center; - border-radius: getCssVar(control-searchbar, footer-item-border-radius); - } - @include m('search') { - flex: 1; - padding: getCssVar(control-searchbar, footer-item-padding); - box-shadow: getCssVar(control-searchbar, footer-item-shadow); - background-color: getCssVar(control-searchbar, footer-confirm-bg-color); - color: getCssVar(control-searchbar, footer-confirm-color); - width: 100%; - text-align: center; - opacity: 0.9; - border-radius: getCssVar(control-searchbar, footer-item-border-radius); - } - } -} diff --git a/src/control/tab-exp-panel/tab-exp-panel.scss b/src/control/tab-exp-panel/tab-exp-panel.scss index 4d875328ab4ad39213e297c8c94e092b98140c27..33931ce664636f7ff22692fb4022326e3ff8c592 100644 --- a/src/control/tab-exp-panel/tab-exp-panel.scss +++ b/src/control/tab-exp-panel/tab-exp-panel.scss @@ -1,9 +1,7 @@ $control-tabexppanel: ( - // Color - color-tab-text: getCssVar('color', 'text', 0), - color-tab-text-active: getCssVar('color', 'primary'), - // Font - font-tab-font-size: getCssVar('font-size', 'regular') + color-text: getCssVar('color', 'text', 0), + color-active: getCssVar('color', 'primary'), + font-fontSize: getCssVar('font-size', 'regular') ); @include b(control-tabexppanel) { @include set-component-css-var('control-tabexppanel', $control-tabexppanel); @@ -14,15 +12,15 @@ $control-tabexppanel: ( &.#{bem(tab-layout)} { #{getCssVarName('tab-layout', 'color-tab-text')}: getCssVar( control-tabexppanel, - color-tab-text + color-text ); #{getCssVarName('tab-layout', 'color-tab-text-active')}: getCssVar( control-tabexppanel, - color-tab-text-active + color-active ); #{getCssVarName('tab-layout', 'font-tab-font-size')}: getCssVar( control-tabexppanel, - font-tab-font-size + font-fontSize ); } } diff --git a/src/control/toolbar/toolbar.scss b/src/control/toolbar/toolbar.scss index b460d76716ae37790ec99b04a096eef1086b4d91..9fbfecaef9153701822b0b88af185d9aa1a286ea 100644 --- a/src/control/toolbar/toolbar.scss +++ b/src/control/toolbar/toolbar.scss @@ -1,20 +1,15 @@ $control-toolbar: ( - // Color + width-icon-min-width: 1em, + height-bottom-item: getCssVar('height-control', 'large'), color-disabled-text: getCssVar(color, disabled, text), color-disabled-bg: getCssVar(color, disabled, bg), - // Width/Height - height: 100%, - width-icon-min-width: 1em, - height-bottom-toolbar-item: getCssVar('height-control', 'large'), - // Spacing spacing-gap: getCssVar('spacing', 'tight'), - spacing-item-badge-margin: 0 0 0 getCssVar('spacing', 'extra-tight'), - spacing-bottom-toolbar-padding: getCssVar('spacing', 'base-tight') + spacing-badge-margin: 0 0 0 getCssVar('spacing', 'extra-tight'), + spacing-bottom-padding: getCssVar('spacing', 'base-tight') getCssVar('spacing', 'base'), - // Font - font-item-font-size: getCssVar('font-size', 'regular'), - font-left-toolbar-item-font-size: getCssVar('font-size', 'header-6'), - font-right-toolbar-item-font-size: getCssVar('font-size', 'header-6') + font-fontSize: getCssVar('font-size', 'regular'), + font-left-fontSize: getCssVar('font-size', 'header-6'), + font-right-fontSize: getCssVar('font-size', 'header-6') ); @include b('control-toolbar') { @@ -23,7 +18,7 @@ $control-toolbar: ( display: flex; flex-wrap: wrap; gap: getCssVar('control-toolbar', 'spacing-gap'); - height: getCssVar('control-toolbar', 'height'); + height: 100%; // 项容器样式 @include e('item') { @@ -64,9 +59,9 @@ $control-toolbar: ( .#{bem(control-toolbar-item)} { #{getCssVarName('info-item', 'spacing-badge-margin')}: getCssVar( 'control-toolbar', - 'spacing-item-badge-margin' + 'spacing-badge-margin' ); - font-size: getCssVar('control-toolbar', 'font-item-font-size'); + font-size: getCssVar('control-toolbar', 'font-fontSize'); white-space: nowrap; // fontawesome图标由自己撑开宽度 @@ -85,7 +80,7 @@ $control-toolbar: ( border: none; } .#{bem(control-toolbar-item)} { - font-size: getCssVar('control-toolbar', 'font-left-toolbar-item-font-size'); + font-size: getCssVar('control-toolbar', 'font-left-fontSize'); } } @@ -100,7 +95,7 @@ $control-toolbar: ( .#{bem(control-toolbar-item)} { font-size: getCssVar( 'control-toolbar', - 'font-right-toolbar-item-font-size' + 'font-right-fontSize' ); } } @@ -108,7 +103,7 @@ $control-toolbar: ( // 底部工具栏样式 @include b('control-toolbar-bottom') { display: flex; - padding: getCssVar('control-toolbar', 'spacing-bottom-toolbar-padding'); + padding: getCssVar('control-toolbar', 'spacing-bottom-padding'); .#{bem(control-toolbar, item)} { flex: 1; @@ -119,7 +114,7 @@ $control-toolbar: ( .van-button { width: 100%; - height: getCssVar('control-toolbar', 'height-bottom-toolbar-item'); + height: getCssVar('control-toolbar', 'height-bottom-item'); } } } diff --git a/src/control/wizard-panel/wizard-panel.scss b/src/control/wizard-panel/wizard-panel.scss index 788546d05a549248c2389004906cff0f1aa1ab79..c845b38fcec3be2da30d0551c368d2aba78771d1 100644 --- a/src/control/wizard-panel/wizard-panel.scss +++ b/src/control/wizard-panel/wizard-panel.scss @@ -1,7 +1,7 @@ $control-wizard-panel: ( - 'footer-margin': getCssVar('spacing', 'loose') getCssVar('spacing', 'tight'), - 'footer-gap': getCssVar('spacing', 'tight'), - 'active-color': getCssVar('color', 'primary'), + 'spacing-footer-margin': getCssVar('spacing', 'loose') getCssVar('spacing', 'tight'), + 'spacing-footer-gap': getCssVar('spacing', 'tight'), + 'color-active': getCssVar('color', 'primary'), ); @include b(control-wizardpanel) { @@ -15,7 +15,7 @@ $control-wizard-panel: ( flex: none; } .van-step--process { - color: getCssVar('control-wizard-panel', 'active-color'); + color: getCssVar('control-wizard-panel', 'color-active'); } @include e(form) { @@ -28,8 +28,8 @@ $control-wizard-panel: ( @include b(control-wizardpanel-footer) { @include flex(row, flex-end, center); - gap: getCssVar('control-wizard-panel', 'footer-gap'); - margin: getCssVar('control-wizard-panel', 'footer-margin'); + gap: getCssVar('control-wizard-panel', 'spacing-footer-gap'); + margin: getCssVar('control-wizard-panel', 'spacing-footer-margin'); button { flex-grow: 1; diff --git a/src/editor/array/ibiz-array/ibiz-array.scss b/src/editor/array/ibiz-array/ibiz-array.scss index 5f0fdfcce74707b36ee4f17d677053cceb1e8a58..f0fa82a7b8d352370cf0719d2e2a08593d4fe30d 100644 --- a/src/editor/array/ibiz-array/ibiz-array.scss +++ b/src/editor/array/ibiz-array/ibiz-array.scss @@ -12,7 +12,7 @@ $array: ( font-lineHeight: getCssVar(editor, default, line-height), font-textAlign: getCssVar(editor, default, text-align), // 其他 - border-item: getCssVarName('border-thickness', 'control') solid getCssVar(color, border), + border-item: getCssVar('border-thickness', 'control') solid getCssVar(color, border), ); @include b(array) { diff --git a/src/editor/data-picker/picker-editor.controller.ts b/src/editor/data-picker/picker-editor.controller.ts index 684fe527c5261fbd2b44860e785ae5d7a7d889c4..8abe7a914b5f0c82ca52db02e2646ba89033e256 100644 --- a/src/editor/data-picker/picker-editor.controller.ts +++ b/src/editor/data-picker/picker-editor.controller.ts @@ -260,7 +260,7 @@ export class PickerEditorController extends EditorController { params, { openMode }, ); - if (res && res.ok && res.data) { + if (res && res.data) { return res.data; } ibiz.log.debug('模态取消或关闭异常', res); diff --git a/src/editor/html/quill-editor-preview/quill-editor-preview.scss b/src/editor/html/quill-editor-preview/quill-editor-preview.scss index 7a88ff5e63033793639b8fdf5835b03bc1258b2c..8d01487f8fb7ade9dfbb8486d2cbd1b909171a9f 100644 --- a/src/editor/html/quill-editor-preview/quill-editor-preview.scss +++ b/src/editor/html/quill-editor-preview/quill-editor-preview.scss @@ -6,6 +6,8 @@ $quill-preview: ( color-btn: getCssVar(color, primary), // 字体大小 font-fontSize: getCssVar(font-size, header-4), + font-more-lineHeight: getCssVar(font-size, header-4), + font-more-fontSize: getCssVar(font-size, header-4), // 间距 spacing-editor-padding-top: getCssVar('spacing', 'base-tight'), spacing-editor-padding-right: getCssVar('spacing', 'base'), @@ -60,6 +62,10 @@ $quill-preview: ( .ql-editor { overflow: hidden; } + .ql-container { + height: calc(100% - getCssVar(quill-preview, font-more-fontSize)); + line-height: 1; + } } } } @@ -67,4 +73,5 @@ $quill-preview: ( display: flex; align-items: center; color: getCssVar(quill-preview, color-btn); + font-size: getCssVar(quill-preview, font-more-fontSize); } diff --git a/src/editor/html/quill-editor/quill-editor.scss b/src/editor/html/quill-editor/quill-editor.scss index 2578b28f8888dc05d279ec35b421894e212ccf9f..9031d59dbbbb9c09a8034f2462b6db7076cc456f 100644 --- a/src/editor/html/quill-editor/quill-editor.scss +++ b/src/editor/html/quill-editor/quill-editor.scss @@ -1,14 +1,11 @@ $quill: ( - // 颜色 color: getCssVar(editor, default, text-color), color-toolbar-bg: getCssVar(color, bg, 2), color-modal-bg: getCssVar(color, bg, 0), color-border: getCssVar(color, border), color-active: getCssVar(editor, default, active-text-color), - // 宽度 - width-picker: rem(60px), - - // 间距 + // 工具栏字体宽度,固定宽度 + width-picker: 60px, spacing-footer-padding: getCssVar(spacing, tight), spacing-btn-gap: getCssVar(spacing, tight), ); diff --git a/src/editor/slider/ibiz-slider/ibiz-slider.scss b/src/editor/slider/ibiz-slider/ibiz-slider.scss index 63be4d2d176f54fd7be3219b41eb10a8200b6ba4..2bb28e6c4312d5141494d639e30621a1af4ca1b0 100644 --- a/src/editor/slider/ibiz-slider/ibiz-slider.scss +++ b/src/editor/slider/ibiz-slider/ibiz-slider.scss @@ -3,10 +3,10 @@ $slider: ( color-text: getCssVar(color, white), color-bg: getCssVar(color, primary), spacing-padding: 0 getCssVar(spacing, base-tight), - spacing-button-padding: 0 getCssVar(spacing, tight), + // 此处4px为固定值,防止未垂直居中 + spacing-button-padding: rem(4px) getCssVar(spacing, base-tight), font-fontSize: getCssVar(font-size, regular), font-button-fontSize: getCssVar(font-size, small), - font-button-lineHeight: getCssVar('font-size', 'header-5'), radius-button: rem(100px), ); @@ -40,7 +40,6 @@ $slider: ( @include b(slider-button) { padding: getCssVar(slider, spacing-button-padding); font-size: getCssVar(slider, font-button-fontSize); - line-height: getCssVar(slider, font-button-lineHeight); color: getCssVar(slider, color-text); text-align: center; background-color: getCssVar(slider, color-bg); diff --git a/src/editor/upload/ibiz-file-upload/ibiz-file-upload.scss b/src/editor/upload/ibiz-file-upload/ibiz-file-upload.scss index 12582564698f7d6492b21a02dce687092f882dc1..997bd7a1d9c23402fba2061f2a457a8671701445 100644 --- a/src/editor/upload/ibiz-file-upload/ibiz-file-upload.scss +++ b/src/editor/upload/ibiz-file-upload/ibiz-file-upload.scss @@ -149,6 +149,15 @@ $file-upload: ( } } + // 单文件上传且存在值时,只显示文件 + @include when(single) { + .van-uploader { + display: none; + } + .#{bem(file-upload-preview)} { + margin: 0; + } + } } @include b(form-item-container) { diff --git a/src/editor/upload/ibiz-file-upload/ibiz-file-upload.tsx b/src/editor/upload/ibiz-file-upload/ibiz-file-upload.tsx index 3c6b772c9d71a26cb60b4f034ab3516cd3c39988..7064860a8cffaaa63a72333c25432810cb0a4901 100644 --- a/src/editor/upload/ibiz-file-upload/ibiz-file-upload.tsx +++ b/src/editor/upload/ibiz-file-upload/ibiz-file-upload.tsx @@ -107,6 +107,7 @@ export const IBizFileUpload = defineComponent({