From 4423915685b5602069e2ed0813b63cf9d4420e0f Mon Sep 17 00:00:00 2001 From: zhf <1204297681@qq.com> Date: Wed, 30 Aug 2023 19:05:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E8=BE=93=E5=85=A5=E6=A1=86?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8=E8=AF=86=E5=88=AB=E5=AE=BD=E5=BA=A6?= =?UTF-8?q?=E5=92=8C=E9=AB=98=E5=BA=A6=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/editor/text-box/input/input.tsx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/editor/text-box/input/input.tsx b/src/editor/text-box/input/input.tsx index 71abd1c5e..8b72dfc76 100644 --- a/src/editor/text-box/input/input.tsx +++ b/src/editor/text-box/input/input.tsx @@ -130,6 +130,7 @@ export const IBizInput = defineComponent({ }, render() { const { unitName } = this.c.parent; + const { editorWidth, editorHeight } = this.c.model; let content = null; if (this.readonly) { @@ -178,6 +179,10 @@ export const IBizInput = defineComponent({ this.disabled ? this.ns.m('disabled') : '', this.readonly ? this.ns.m('readonly') : '', ]} + style={{ + width: editorWidth ? `${editorWidth}px` : '', + height: editorHeight ? `${editorHeight}px` : '', + }} > {content} -- Gitee From 2f04eacb9b2ec18473d41a97e1f89ad7857208b7 Mon Sep 17 00:00:00 2001 From: zhf <1204297681@qq.com> Date: Wed, 30 Aug 2023 19:09:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20markdown=E7=BC=96=E8=BE=91=E5=99=A8?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=A4=84=E4=BA=8E=E7=BA=AF=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E5=92=8C=E9=BB=98=E8=AE=A4=E4=B8=8Dfocus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../markdown/ibiz-markdown-editor/ibiz-markdown-editor.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/editor/markdown/ibiz-markdown-editor/ibiz-markdown-editor.tsx b/src/editor/markdown/ibiz-markdown-editor/ibiz-markdown-editor.tsx index 610b214e4..bc33627e9 100644 --- a/src/editor/markdown/ibiz-markdown-editor/ibiz-markdown-editor.tsx +++ b/src/editor/markdown/ibiz-markdown-editor/ibiz-markdown-editor.tsx @@ -51,7 +51,7 @@ const IBizMarkDown: any = defineComponent({ const theme = ref(UIStore.theme); // 编辑器模式 - const defaultModel = ref('edit&preview'); + const defaultModel = ref('editOnly'); // data响应式变更基础路径 watch( @@ -156,6 +156,10 @@ const IBizMarkDown: any = defineComponent({ // editOnly: 纯编辑模式（没有预览，可通过toolbar切换成双栏或预览模式） // previewOnly: 预览模式（没有编辑框，toolbar只显示“返回编辑”按钮，可通过toolbar切换成编辑模式） defaultModel: defaultModel.value, + codemirror: { + // 是否自动focus 默认为true + autofocus: false, + }, }, toolbars: { theme: theme.value, -- Gitee From e615661ced243793ac78a5d86f69550a8e3a871e Mon Sep 17 00:00:00 2001 From: zhf <1204297681@qq.com> Date: Wed, 30 Aug 2023 19:20:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E8=A1=A8=E5=8D=95=E5=92=8C=E5=88=86=E7=BB=84=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 +++ .../form-group-panel/form-group-panel.scss | 22 +++++++++++++++++++ .../form-item-container.scss | 4 ++-- src/control/form/search-form/search-form.scss | 3 ++- 4 files changed, 29 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 34a69f11c..a5f825f65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - 编辑器样式变量统一 - searchBar支持快速分组 +- input输入框编辑器识别宽度和高度配置 ### Fixed @@ -22,6 +23,8 @@ - 界面关闭操作确认，确认按钮改为异常色 - 门户部件标题头部样式调整 - 表单分页tabs头底部margin调整 +- markdown编辑器默认处于纯编辑模式和默认不focus +- 搜索表单和分组面板样式调整 ## [0.1.13] - 2023-08-29 diff --git a/src/control/form/form-detail/form-group-panel/form-group-panel.scss b/src/control/form/form-detail/form-group-panel/form-group-panel.scss index 56e5a5422..0ef3ef96f 100644 --- a/src/control/form/form-detail/form-group-panel/form-group-panel.scss +++ b/src/control/form/form-detail/form-group-panel/form-group-panel.scss @@ -2,12 +2,14 @@ $form-group: ( 'bg-color': transparent, 'footer-padding': getCssVar(spacing, tight) getCssVar(spacing, base), 'show-more-color': getCssVar('color-primary'), + 'footer-height': 35px, ); $form-group-header: ( 'bg-color': transparent, 'padding': getCssVar(spacing, base, tight), 'border-color': getCssVar('color', 'border'), + 'height': 49px, ); $form-group-caption: ( @@ -63,6 +65,7 @@ $form-group-content: ( @include b(form-group-header) { @include flex; + height: getCssVar('form-group-header', 'height'); padding: getCssVar('form-group-header', 'padding'); margin: getCssVar('form-group-header', 'margin'); border-bottom: 1px solid getCssVar('form-group-header', 'border-color'); @@ -77,14 +80,33 @@ $form-group-content: ( } } +@include b(form-group-content) { + height: 100%; +} + .#{bem('form-group', '', 'show-header')} { > .#{bem('form-group-content')} { + height: calc(100% - getCssVar('form-group-header', 'height')); padding: getCssVar('form-group-content', 'padding'); background-color: getCssVar('form-group-content', 'bg-color'); } } +.#{bem('form-group', '', 'show-more')} { + > .#{bem('form-group-content')} { + height: calc(100% - getCssVar('form-group', 'footer-height')); + } +} + +.#{bem('form-group', '', 'show-header')}.#{bem('form-group', '', 'show-more')} { + > .#{bem('form-group-content')} { + height: calc(100% - getCssVar('form-group-header', 'height') - getCssVar('form-group', 'footer-height')); + } +} + + @include b(form-group-footer) { + height: getCssVar('form-group', 'footer-height'); padding: getCssVar('form-group', 'footer-padding'); @include e(show-more-button) { 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 bfb084d85..7a6affd34 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 @@ -4,7 +4,7 @@ $form-item-container: ( 'require-mark-color': getCssVar(color, danger), 'label-left-padding': 6px getCssVar(spacing, base-tight) 6px 0, 'label-right-padding': 6px 0 6px getCssVar(spacing, base-tight), - 'padding': 0 0 getCssVar(font-size, regular) 0, + 'padding': 0 getCssVar('spacing', 'extra-tight') getCssVar('spacing', 'base') getCssVar('spacing', 'extra-tight'), 'font-size': getCssVar(font-size, regular), 'label-color': getCssVar(color, text, 1), 'error-font-size': getCssVar(font-size, regular), @@ -107,8 +107,8 @@ $form-item-container: ( top: 100%; width: 100%; font-size: getCssVar('form-item-container', 'error-font-size'); + line-height: calc(getCssVar('form-item-container', 'error-font-size') + 2px); color: getCssVar('form-item-container', 'error-color'); - line-height: getCssVar('form-item-container', 'error-font-size'); word-wrap: break-word; } diff --git a/src/control/form/search-form/search-form.scss b/src/control/form/search-form/search-form.scss index 306025507..006c8ca2e 100644 --- a/src/control/form/search-form/search-form.scss +++ b/src/control/form/search-form/search-form.scss @@ -7,8 +7,9 @@ $control-searchform: ( @include b(control-searchform-buttons) { @include flex(row, flex-end, center); - height: 100%; flex-shrink: 0; + height: 100%; + margin-left: getCssVar(spacing, tight); text-align: right; } -- Gitee