From 559d5198486691ea0957057598500b0062f31105 Mon Sep 17 00:00:00 2001 From: lijisanxiong <1518062161@qq.com> Date: Tue, 10 Jun 2025 10:58:55 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E8=A1=A8=E5=8D=95=E9=A1=B9?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=A1=86=E8=AF=86=E5=88=AB=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E6=A1=86=E4=BF=A1=E6=81=AF=E7=BB=98=E5=88=B6=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E5=8F=82=E6=95=B0(tooltiprendermode)=EF=BC=8C=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E5=86=85=E5=AE=B9=E9=BB=98=E8=AE=A4=E6=98=BE=E7=A4=BA?= =?UTF-8?q?markdown=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 4 ++ .../form-item-container.scss | 56 +++++++++++++++++++ .../form-item-container.tsx | 25 +++++++-- 3 files changed, 80 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7af863d66..e64a3a780 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ ## [Unreleased] +### Added + +- 表单项提示框识别提示框信息绘制模式参数(tooltiprendermode),提示内容默认显示markdown格式 + ## [0.7.41-alpha.1] - 2025-06-06 ### Added diff --git a/src/control/form/form-detail/form-item/form-item-container/form-item-container.scss b/src/control/form/form-detail/form-item/form-item-container/form-item-container.scss index 51955c44c..1b527131e 100644 --- a/src/control/form/form-detail/form-item/form-item-container/form-item-container.scss +++ b/src/control/form/form-detail/form-item/form-item-container/form-item-container.scss @@ -80,6 +80,62 @@ $form-item-container: ( min-width: 50px; min-height: 20px; } + + // 适配提示框信息markdown绘制模式 + @include when('md') { + // 调整容器间距 + &.el-popper.el-popper { + padding: 0; + .#{bem('form-item-container__popper--content')} { + padding: 0; + } + } + .#{bem('markdown')} { + max-height: 100vh; + padding: 0 calc(#{getCssVar(spacing, extra-tight)} + #{getCssVar(spacing, extra-tight)}); + overflow: auto; + } + + .#{bem('form-item-container__popper--tooltip')}{ + padding: calc(#{getCssVar(spacing, extra-tight)} + #{getCssVar(spacing, extra-tight)}) 0; + } + + .#{bem('markdown-cherry')} { + width: auto !important; + } + + .cherry-previewer { + p:only-child { + margin: 0; + } + + &>p:first-child { + margin-top: 0; + } + } + + // 隐藏冗余元素 + .cherry-toolbar, + .cherry-toolbar-button, + .cherry-sidebar { + display: none; + } + + // 设置字体大小及行高 + .cherry { + font-size: inherit; + line-height: inherit; + } + + // 隐藏背景颜色及边框 + .cherry, + .cherry .cherry-previewer { + padding: 0; + background-color: transparent; + border: none !important; + box-shadow: none; + } + } } @include m((left, right)) { diff --git a/src/control/form/form-detail/form-item/form-item-container/form-item-container.tsx b/src/control/form/form-detail/form-item/form-item-container/form-item-container.tsx index dd290151f..bf8113480 100644 --- a/src/control/form/form-detail/form-item/form-item-container/form-item-container.tsx +++ b/src/control/form/form-detail/form-item/form-item-container/form-item-container.tsx @@ -27,12 +27,28 @@ export const IBizFormItemContainer = defineComponent({ onUnmounted(() => c.clearTipsCache()); + const renderTipContent = () => { + const { inputTip } = c.state; + switch (ibiz.config.tooltiprendermode) { + case 'none': + return {inputTip}; + case 'html': + return
; + case 'md': + default: + return ; + } + }; + const renderInputTip = () => { return ( @@ -64,10 +80,9 @@ export const IBizFormItemContainer = defineComponent({ content: () => { return (
-
+
+ {renderTipContent()} +
{c.state.inputTipUrl && (