From c360c4af2d79a69eead3dbc2ba29535d082fbada Mon Sep 17 00:00:00 2001 From: jianglinjun Date: Wed, 25 Sep 2024 20:34:58 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E6=8A=BD=E5=B1=89?= =?UTF-8?q?=E5=92=8C=E5=A4=9A=E9=A1=B9=E9=80=89=E6=8B=A9=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=E6=89=93=E5=BC=80=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?span=E7=BC=96=E8=BE=91=E5=99=A8=E6=94=AF=E6=8C=81=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=99=A8=E5=8F=82=E6=95=B0SHOWMODE=E7=94=A8=E4=BA=8E?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E4=BB=A3=E7=A0=81=E8=A1=A8=E9=A1=B9=E7=9A=84?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 5 +++ src/control/list/list-render-util.tsx | 6 ++-- src/control/list/md-ctrl/md-ctrl.scss | 33 +++++++++++-------- .../pickup-view-panel/pickup-view-panel.scss | 6 ++++ src/editor/span/span/span.tsx | 1 + src/util/app-drawer/app-drawer-component.tsx | 22 +++++++------ src/view-engine/mob-mpickup-view-engine.ts | 10 +++--- 7 files changed, 54 insertions(+), 29 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 902435b2cb..edb77af407 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,8 +7,13 @@ ## [Unreleased] +### Fixed + +- 修复抽屉和多项选择视图打开异常问题 + ### Change +- span编辑器支持编辑器参数SHOWMODE用于控制代码表项的显示模式 - 工作流启动时静默保存，不弹出成功提示 - 修改BackTop回到顶部按钮的位置 diff --git a/src/control/list/list-render-util.tsx b/src/control/list/list-render-util.tsx index d89304751c..cdc0803304 100644 --- a/src/control/list/list-render-util.tsx +++ b/src/control/list/list-render-util.tsx @@ -42,7 +42,7 @@ export function useListRender( const renderRightSlot = (row: IData) => { const select = isSelect(row); - return ; + return ; }; const renderIcon = (row: IData) => { @@ -74,9 +74,11 @@ export function useListRender( // 绘制项布局面板 const renderPanelItem = (item: IData, modelData: ILayoutPanel): VNode => { const { context, params } = c; + const itemClass = calcItemClass(item); return ( { const panel = c.model.itemLayoutPanel; - return panel ? renderPanelItem(row, panel) : renderItemContent(row); + return props.modelData.name !== 'simplelist' && panel ? renderPanelItem(row, panel) : renderItemContent(row); }; const renderNoData = (): VNode | undefined => { diff --git a/src/control/list/md-ctrl/md-ctrl.scss b/src/control/list/md-ctrl/md-ctrl.scss index 378be3883f..bc6f888872 100644 --- a/src/control/list/md-ctrl/md-ctrl.scss +++ b/src/control/list/md-ctrl/md-ctrl.scss @@ -1,17 +1,18 @@ $control-mobmdctrl: (text-color: getCssVar(color, text, 0), - hover-bg-color: getCssVar(color, primary), - active-bg-color: #D1D1D5, - active-color: getCssVar(color, bg, 1), - img-width: getCssVar(width-icon, extra-large), - img-radius: getCssVar(border-radius, extra-small), - padding: getCssVar(spacing, base) 0 getCssVar(spacing, base) getCssVar(spacing, base), - group-padding: getCssVar(spacing, tight) getCssVar(spacing, base), - group-font: getCssVar(font-size, regular), - icon-color:#A0A5AA, - group-caption-color:#9A9B9F, - load-more-font-size: getCssVar(font-size, small), - font-size:getCssVar(font-size, header-5), - right-icon-margin-right:rem(21px), +hover-bg-color: getCssVar(color, primary), +active-bg-color: #D1D1D5, +active-color: getCssVar(color, bg, 1), +img-width: getCssVar(width-icon, extra-large), +img-radius: getCssVar(border-radius, extra-small), +padding: getCssVar(spacing, base) 0 getCssVar(spacing, base) getCssVar(spacing, base), +group-padding: getCssVar(spacing, tight) getCssVar(spacing, base), +group-font: getCssVar(font-size, regular), +icon-color:#A0A5AA, +group-caption-color:#9A9B9F, +load-more-font-size: getCssVar(font-size, small), +font-size:getCssVar(font-size, header-5), +right-icon-margin-right:rem(21px), +simplelist-height: 250px, ); @include b(control-mobmdctrl) { @@ -47,6 +48,12 @@ $control-mobmdctrl: (text-color: getCssVar(color, text, 0), } } +// 限制simplelist在选择视图时的高度 +@include b(control--simplelist){ + max-height: getCssVar(control-mobmdctrl,simplelist-height); + overflow: auto +} + @include b(control-mobmdctrl-item) { @include set-component-css-var(control-mobmdctrl, $control-mobmdctrl); diff --git a/src/control/pickup-view-panel/pickup-view-panel.scss b/src/control/pickup-view-panel/pickup-view-panel.scss index afd879e4cb..c0ce78ea3f 100644 --- a/src/control/pickup-view-panel/pickup-view-panel.scss +++ b/src/control/pickup-view-panel/pickup-view-panel.scss @@ -1,3 +1,9 @@ @include b(control-pickupviewpanel) { height: 100%; + // 控制列表选择样式 + .#{bem('control-mobmdctrl-item')}{ + @include when(active){ + background-color: getCssVar(control-mobmdctrl, active-bg-color); + } + } } diff --git a/src/editor/span/span/span.tsx b/src/editor/span/span/span.tsx index 006125bbc1..0c1d2c9110 100644 --- a/src/editor/span/span/span.tsx +++ b/src/editor/span/span/span.tsx @@ -152,6 +152,7 @@ export const IBizSpan = defineComponent({ class={this.ns.e('code-list')} codeListItems={this.items} codeList={this.c.codeList} + showMode={this.c.editorParams?.SHOWMODE} value={this.text} > ); diff --git a/src/util/app-drawer/app-drawer-component.tsx b/src/util/app-drawer/app-drawer-component.tsx index 4eb4eb4314..9a2780315f 100644 --- a/src/util/app-drawer/app-drawer-component.tsx +++ b/src/util/app-drawer/app-drawer-component.tsx @@ -57,16 +57,16 @@ export const AppDrawerComponent = defineComponent({ switch (props.opts.placement) { case 'left': - direction = 'ltr'; + direction = 'left'; break; case 'top': - direction = 'ttb'; + direction = 'top'; break; case 'bottom': - direction = 'btt'; + direction = 'bottom'; break; default: - direction = 'rtl'; + direction = 'right'; } return { @@ -82,18 +82,20 @@ export const AppDrawerComponent = defineComponent({ }, render() { return ( - {this.$slots.default?.(this.modal)} - + ); }, }); diff --git a/src/view-engine/mob-mpickup-view-engine.ts b/src/view-engine/mob-mpickup-view-engine.ts index e92ccaf2c6..435b488cec 100644 --- a/src/view-engine/mob-mpickup-view-engine.ts +++ b/src/view-engine/mob-mpickup-view-engine.ts @@ -103,6 +103,7 @@ export class MobMPickupViewEngine extends MobPickupViewEngine { }); // 默认回显选中数据 this.simpleList.setData(this.selectedData); + this.simpleList.setSelection(this.selectedData); this.setOkButtonDisabled(); } @@ -169,6 +170,7 @@ export class MobMPickupViewEngine extends MobPickupViewEngine { */ public pickupViewPanelSelectionChange(data: IData[]): void { this.simpleList.setData(data); + this.simpleList.setSelection(data); } /** @@ -307,11 +309,11 @@ export class MobMPickupViewEngine extends MobPickupViewEngine { * @return {*} {boolean} */ protected calcViewFooterVisible(): boolean { - let showFooter: boolean = false; + const showFooter: boolean = true; // 工具栏 - if (this.simpleList) { - showFooter = true; - } + // if (this.simpleList) { + // showFooter = true; + // } return showFooter; } } -- Gitee