From 88cbd90779cd0a658a85fde28624c40c96398976 Mon Sep 17 00:00:00 2001 From: jianglinjun Date: Sun, 29 Sep 2024 10:25:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=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=B0REVERSECOLOR,=E7=94=A8?= =?UTF-8?q?=E4=BA=8E=E6=8E=A7=E5=88=B6=E4=BB=A3=E7=A0=81=E8=A1=A8=E9=A1=B9?= =?UTF-8?q?=E7=9A=84color=E6=98=AF=E5=90=A6=E7=94=A8=E4=BA=8E=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=A1=A8=E9=A1=B9=E7=9A=84=E8=83=8C=E6=99=AF=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/editor/span/span/span.scss | 13 ++++++++++++- src/editor/span/span/span.tsx | 5 ++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/editor/span/span/span.scss b/src/editor/span/span/span.scss index 77d091a0..d0f01012 100644 --- a/src/editor/span/span/span.scss +++ b/src/editor/span/span/span.scss @@ -14,4 +14,15 @@ @include m(readonly) { color: getCssVar('form-item', 'readonly-color'); } -} \ No newline at end of file + @include e('code-list') { + @include when('reverse-color') { + .#{bem('code-list','item')} { + padding: getCssVar(spacing-extra, tight) + getCssVar(spacing-base, tight); + border-radius: getCssVar(border-radius, large); + color: getCssVar(color, default); + background-color: getCssVar('code-list', 'item-color'); + } + } + } +} diff --git a/src/editor/span/span/span.tsx b/src/editor/span/span/span.tsx index 0c1d2c91..1f28b784 100644 --- a/src/editor/span/span/span.tsx +++ b/src/editor/span/span/span.tsx @@ -149,7 +149,10 @@ export const IBizSpan = defineComponent({ if (this.c.codeList && this.items.length > 0) { content = ( Date: Sun, 29 Sep 2024 10:26:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E6=A0=87=E9=A2=98=E6=94=AF=E6=8C=81=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E5=8F=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/control/caption-bar/caption-bar.tsx | 8 +++++++- src/mob-app/guard/auth-guard/auth-guard.ts | 4 ++++ .../nav-pos-index/nav-pos-index.controller.ts | 1 + src/view-engine/mob-mpickup-view-engine.ts | 4 ++++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/control/caption-bar/caption-bar.tsx b/src/control/caption-bar/caption-bar.tsx index 734190b5..c23b073d 100644 --- a/src/control/caption-bar/caption-bar.tsx +++ b/src/control/caption-bar/caption-bar.tsx @@ -1,5 +1,5 @@ import { useControlController, useNamespace } from '@ibiz-template/vue3-util'; -import { defineComponent, PropType } from 'vue'; +import { defineComponent, onActivated, PropType } from 'vue'; import { ICaptionBar } from '@ibiz/model-core'; import './caption-bar.scss'; import { CaptionBarController } from '@ibiz-template/runtime'; @@ -19,7 +19,13 @@ export const CaptionBarControl = defineComponent({ (...args) => new CaptionBarController(...args), ); const ns = useNamespace(`control-${c.model.controlType!.toLowerCase()}`); + // 初始手动调用一次，因为在控制器里在初始化监听视图onViewInfoChange事件时，视图控制器就已经先抛出了该事件，导致监听不到 + + c.setBrowserTabTitle(); + onActivated(() => { + c.setBrowserTabTitle(); + }); return { c, ns }; }, render() { diff --git a/src/mob-app/guard/auth-guard/auth-guard.ts b/src/mob-app/guard/auth-guard/auth-guard.ts index 8d5b900a..165754d5 100644 --- a/src/mob-app/guard/auth-guard/auth-guard.ts +++ b/src/mob-app/guard/auth-guard/auth-guard.ts @@ -133,6 +133,10 @@ async function initModel(permission: boolean = true): Promise { } else { await loadTheme(); } + // 设置浏览器标题 + if (app.model.title) { + ibiz.util.setBrowserTitle(''); + } } } diff --git a/src/panel-component/nav-pos-index/nav-pos-index.controller.ts b/src/panel-component/nav-pos-index/nav-pos-index.controller.ts index 9a9b9740..39f6424c 100644 --- a/src/panel-component/nav-pos-index/nav-pos-index.controller.ts +++ b/src/panel-component/nav-pos-index/nav-pos-index.controller.ts @@ -260,6 +260,7 @@ export class NavPosIndexController extends PanelItemController { }`; } this.router!.push(indexPath); + ibiz.util.setBrowserTitle(''); } } } diff --git a/src/view-engine/mob-mpickup-view-engine.ts b/src/view-engine/mob-mpickup-view-engine.ts index 435b488c..27e187c7 100644 --- a/src/view-engine/mob-mpickup-view-engine.ts +++ b/src/view-engine/mob-mpickup-view-engine.ts @@ -105,6 +105,10 @@ export class MobMPickupViewEngine extends MobPickupViewEngine { this.simpleList.setData(this.selectedData); this.simpleList.setSelection(this.selectedData); this.setOkButtonDisabled(); + // 隐藏simplelist + if (this.simpleList) { + this.view.layoutPanel!.panelItems.simplelist.state.visible = false; + } } /** -- Gitee From 1f07fdfc7e953d1fe464a691fa9bd2ca9c77c555 Mon Sep 17 00:00:00 2001 From: jianglinjun Date: Sun, 29 Sep 2024 10:27:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E5=A4=9A?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=80=89=E6=8B=A9=E8=A7=86=E5=9B=BE=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=88=97=E8=A1=A8=E7=9A=84=E9=80=89=E6=8B=A9=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 + src/control/list/list-render-util.tsx | 21 ++++++- src/control/list/md-ctrl/md-ctrl.scss | 58 +++++++++++-------- .../pickup-view-panel/pickup-view-panel.scss | 6 -- 4 files changed, 57 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8839be45..97521a16 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,9 @@ ### Change +- 新增标签编辑器支持编辑器参数REVERSECOLOR,用于控制代码表项的color是否用于代码表项的背景色 +- 新增标签标题支持动态变化 +- 更新多数据选择视图选择列表的选择样式 - 工具栏新增popper模式 - 支持视图数据看板视图 diff --git a/src/control/list/list-render-util.tsx b/src/control/list/list-render-util.tsx index cdc08033..10c3834a 100644 --- a/src/control/list/list-render-util.tsx +++ b/src/control/list/list-render-util.tsx @@ -75,7 +75,8 @@ export function useListRender( const renderPanelItem = (item: IData, modelData: ILayoutPanel): VNode => { const { context, params } = c; const itemClass = calcItemClass(item); - return ( + + const content = ( c.onRowClick(item)} > ); + + if (props.mode === 'SELECT') { + return ( +
+ c.onRowClick(item)} + > + {content} +
+ ); + } + + return content; }; // 绘制默认列表项 const renderItem = (row: IData): VNode | undefined => { const panel = c.model.itemLayoutPanel; - return props.modelData.name !== 'simplelist' && 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 bc6f8888..de10dd40 100644 --- a/src/control/list/md-ctrl/md-ctrl.scss +++ b/src/control/list/md-ctrl/md-ctrl.scss @@ -1,29 +1,36 @@ -$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), -simplelist-height: 250px, +$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), + simplelist-height: 250px, + select-item-padding-bottom: getCssVar(spacing,tight), + select-item-margin: getCssVar(spacing,tight) 0 0 getCssVar(spacing,tight), + select-item-check-padding: getCssVar(spacing,extra-tight), + select-item-gap: getCssVar(spacing,tight), ); @include b(control-mobmdctrl) { @include set-component-css-var(control-mobmdctrl, $control-mobmdctrl); - --van-cell-font-size:#{getCssVar(control-mobmdctrl, font-size)}; + --van-cell-font-size: #{getCssVar(control-mobmdctrl, font-size)}; height: 100%; .van-list { height: 100%; + overflow-y: auto; .van-cell { padding: getCssVar(control-mobmdctrl, padding); @@ -48,12 +55,6 @@ simplelist-height: 250px, } } -// 限制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); @@ -94,4 +95,15 @@ simplelist-height: 250px, border: 1px solid getCssVar(color, border); border-radius: getCssVar(border, radius, full); } -} \ No newline at end of file +} + +@include b(control-mobmdctrl-select-item) { + display: flex; + margin: getCssVar(control-mobmdctrl, select-item-margin); + gap: getCssVar(control-mobmdctrl, select-item-gap); + border-bottom: 1px solid getCssVar(color, border); + padding-bottom: getCssVar(control-mobmdctrl, select-item-padding-bottom); + > .van-checkbox { + padding: getCssVar(control-mobmdctrl, select-item-check-padding); + } +} diff --git a/src/control/pickup-view-panel/pickup-view-panel.scss b/src/control/pickup-view-panel/pickup-view-panel.scss index c0ce78ea..afd879e4 100644 --- a/src/control/pickup-view-panel/pickup-view-panel.scss +++ b/src/control/pickup-view-panel/pickup-view-panel.scss @@ -1,9 +1,3 @@ @include b(control-pickupviewpanel) { height: 100%; - // 控制列表选择样式 - .#{bem('control-mobmdctrl-item')}{ - @include when(active){ - background-color: getCssVar(control-mobmdctrl, active-bg-color); - } - } } -- Gitee