From c2457a1a6fc4bcd6f33090876cdff9906c798c9b Mon Sep 17 00:00:00 2001 From: lijianxiong <1518062161@qq.com> Date: Fri, 14 Nov 2025 10:31:16 +0800 Subject: [PATCH 1/7] =?UTF-8?q?feat=EF=BC=9A=E5=9C=B0=E5=9B=BE=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E7=BC=96=E8=BE=91=E5=99=A8=E5=A2=9E=E5=8A=A0=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=9B=BE=E6=A0=87=E5=8F=8A=E5=A4=84=E7=90=86=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=8F=B0=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/editor/map-picker/ibiz-map-picker/ibiz-map-picker.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/editor/map-picker/ibiz-map-picker/ibiz-map-picker.tsx b/src/editor/map-picker/ibiz-map-picker/ibiz-map-picker.tsx index 088650189..bdc38d206 100644 --- a/src/editor/map-picker/ibiz-map-picker/ibiz-map-picker.tsx +++ b/src/editor/map-picker/ibiz-map-picker/ibiz-map-picker.tsx @@ -7,6 +7,7 @@ import { } from '@ibiz-template/vue3-util'; import AMapLoader from '@amap/amap-jsapi-loader'; import { MapPickerEditorController } from '../map-picker-editor.controller'; +import { IBizCommonRightIcon } from '../../common'; import './ibiz-map-picker.scss'; /** @@ -344,7 +345,7 @@ export const IBizMapPicker: ReturnType = = if (this.readonly || !this.value) return; return ; }, + 'right-icon': () => { + if (this.readonly) return; + return ; + }, }} , Date: Fri, 14 Nov 2025 10:32:04 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E6=95=B0?= =?UTF-8?q?=E5=80=BC=E8=8C=83=E5=9B=B4=E7=BC=96=E8=BE=91=E5=99=A8=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E5=80=BC=E6=97=B6=E6=9C=80=E5=A4=A7=E6=9C=80=E5=B0=8F?= =?UTF-8?q?=E5=80=BC=E4=BC=9A=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ibiz-number-range-picker/ibiz-number-range-picker.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/editor/number-range/ibiz-number-range-picker/ibiz-number-range-picker.tsx b/src/editor/number-range/ibiz-number-range-picker/ibiz-number-range-picker.tsx index adf50db15..3ccbd6c4c 100644 --- a/src/editor/number-range/ibiz-number-range-picker/ibiz-number-range-picker.tsx +++ b/src/editor/number-range/ibiz-number-range-picker/ibiz-number-range-picker.tsx @@ -135,8 +135,9 @@ export const IBizNumberRangePicker = defineComponent({ ) { emit('change', [minValue.value, maxValue.value].join(valueSeparator)); } - if (refFormItem.value) { - const valueName = refFormItem.value[index]; + + const valueName = refFormItem.value[index]; + if (valueName) { emit('change', value, valueName); } }; -- Gitee From 43dd9658a6d071c0c999137d8223fd18ef6c544e Mon Sep 17 00:00:00 2001 From: lijianxiong <1518062161@qq.com> Date: Fri, 14 Nov 2025 10:32:27 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E8=87=AA=E5=AE=9A=E4=B9=89=E9=85=8D=E7=BD=AE=E5=90=8E?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../custom-menu-design/custom-menu-design.tsx | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/control/app-menu/custom-menu-design/custom-menu-design.tsx b/src/control/app-menu/custom-menu-design/custom-menu-design.tsx index 96d55638d..5cfa8b01b 100644 --- a/src/control/app-menu/custom-menu-design/custom-menu-design.tsx +++ b/src/control/app-menu/custom-menu-design/custom-menu-design.tsx @@ -85,20 +85,25 @@ export const MenuDesign = defineComponent({ // 保存 const onSave = async () => { - const curMenuItems = Array.from(menuMap.value.values()).map(item => { - return allMenuMap.get(item.id); - }); + const curMenuItems = Array.from(menuMap.value.values()) + .map(item => { + return allMenuMap.get(item.id); + }) + .filter(item => !!item); + c.saveCustomMenusModel(curMenuItems as IAppMenuItem[]); onClose(); }; // 处理节点项点击 const handleItemClick = (item: IAppMenuItem, checked: boolean) => { + if (!item.id) return; + // 处理选中状态 if (checked) { - menuMap.value.delete(item.id || ''); + menuMap.value.delete(item.id); } else { - menuMap.value.set(item.id || '', item); + menuMap.value.set(item.id, item); } }; -- Gitee From 60ae1b3c046a6aa198ed0dd377eb24b0fcce4951 Mon Sep 17 00:00:00 2001 From: lijianxiong <1518062161@qq.com> Date: Fri, 14 Nov 2025 10:36:20 +0800 Subject: [PATCH 4/7] =?UTF-8?q?feat=EF=BC=9A=E4=BC=98=E5=8C=96=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E8=8C=83=E5=9B=B4=E9=80=89=E6=8B=A9=E3=80=81html?= =?UTF-8?q?=E3=80=81markdown=E3=80=81=E4=BA=8C=E7=BB=B4=E7=A0=81=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=99=A8=E6=A0=B7=E5=BC=8F=EF=BC=8C=E9=80=82=E9=85=8D?= =?UTF-8?q?=E6=9A=97=E8=89=B2=E4=B8=BB=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ibiz-date-range-picker.scss | 21 ++----- .../quill-editor-preview.scss | 4 ++ .../html/quill-editor/quill-editor.scss | 55 +++++++++++++++++++ .../ibiz-markdown-editor.scss | 53 ++++++++++++++++-- .../qrcode/ibiz-qrcode/ibiz-qrcode.scss | 6 ++ 5 files changed, 117 insertions(+), 22 deletions(-) diff --git a/src/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.scss b/src/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.scss index 375468b7f..4965f7f0c 100644 --- a/src/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.scss +++ b/src/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.scss @@ -40,24 +40,13 @@ $date-range-picker: ( flex: 1; align-items: center; min-height: getCssVar(date-range-picker, min-height); - white-space: nowrap; - @include when('start') { - .van-field { - input { - text-align: left; - } - } - } - @include when(end) { - min-width: 0; + input { overflow: hidden; text-overflow: ellipsis; - - input { - overflow: hidden; - text-overflow: ellipsis; - } - + white-space: nowrap; + min-width: 0; + } + @include when(end) { .van-field { input { text-align: right; 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 4bcbb80b7..89864ce2d 100644 --- a/src/editor/html/quill-editor-preview/quill-editor-preview.scss +++ b/src/editor/html/quill-editor-preview/quill-editor-preview.scss @@ -3,6 +3,9 @@ $quill-preview: ( placeholder-color: getCssVar(editor, default, placeholder-color), btn-color: getCssVar(color, primary), + // 高度 + height-min-height: rem(100px), + // 字体大小 font-size: getCssVar(font-size, header-4), @@ -16,6 +19,7 @@ $quill-preview: ( @include set-component-css-var(quill-preview, $quill-preview); position: relative; + min-height: getCssVar(quill-preview, height-min-height); @include e(edit) { position: absolute; top: rem(12px); diff --git a/src/editor/html/quill-editor/quill-editor.scss b/src/editor/html/quill-editor/quill-editor.scss index 2863a54e3..32e0f00b7 100644 --- a/src/editor/html/quill-editor/quill-editor.scss +++ b/src/editor/html/quill-editor/quill-editor.scss @@ -1,4 +1,10 @@ $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), // 宽度 picker-width: rem(60px), @@ -44,6 +50,55 @@ $quill: ( height: 0; } } + + &.van-popup { + // 编辑框背景色 + background-color: getCssVar(quill, color-modal-bg); + + .ql-toolbar { + // 工具栏背景色 + background-color: getCssVar(quill, color-toolbar-bg); + + // 工具栏文字与图标默认颜色 + .ql-picker, + button:hover:not(.ql-active) { + color: getCssVar(quill, color); + } + + .ql-stroke, + button:hover:not(.ql-active) .ql-stroke { + stroke: getCssVar(quill, color); + } + + .ql-fill, + button:hover:not(.ql-active) .ql-fill { + fill: getCssVar(quill, color); + } + + // 工具栏文字与图标激活主题色 + button:hover, + button:focus, + button.ql-active, + .ql-picker-label:hover, + .ql-picker-label.ql-active, + .ql-picker-item:hover, + .ql-picker-item.ql-selected { + color: getCssVar(quill, color-active); + } + + // 工具栏下拉框样式 + .ql-picker-options { + background-color: getCssVar(quill, color-toolbar-bg); + } + } + + // 工具栏及内容区边框样式 + .ql-snow.ql-toolbar, + .ql-snow.ql-container { + border: none; + border-bottom: 1px solid getCssVar(quill, color-border); + } + } } @include e(header) { flex: none; diff --git a/src/editor/markdown/ibiz-markdown-editor/ibiz-markdown-editor.scss b/src/editor/markdown/ibiz-markdown-editor/ibiz-markdown-editor.scss index b94c4502a..6f43c870a 100644 --- a/src/editor/markdown/ibiz-markdown-editor/ibiz-markdown-editor.scss +++ b/src/editor/markdown/ibiz-markdown-editor/ibiz-markdown-editor.scss @@ -1,14 +1,15 @@ $markdown: ( // 颜色 color: getCssVar(editor, default, text-color), + color-md-toolbar-bg: getCssVar(color, bg, 2), + color-previewer-bg: getCssVar(color, bg, 1), + color-active: getCssVar(editor, default, active-text-color), disabled-color: getCssVar(editor, disabled, text-color), readonly-color: getCssVar(editor, readonly, text-color), - // 宽度 - width: 100%, + width: 100% ); - @include b(markdown) { @include set-component-css-var('markdown', $markdown); @include b(markdown-cherry) { @@ -18,14 +19,19 @@ $markdown: ( .cherry { width: 100%; + color: getCssVar('markdown', 'color'); + } + + .cherry-previewer { + background-color: getCssVar(markdown, color-previewer-bg); } - @include when('hidden'){ + @include when('hidden') { display: hidden; } } - @include b(markdown-image-popup){ + @include b(markdown-image-popup) { overflow: visible; background-color: transparent; } @@ -40,11 +46,46 @@ $markdown: ( height: 100%; margin: 0; border-radius: 0; + text-align: left; .van-dialog__content { flex-grow: 1; height: calc(100% - #{rem(48px)}); } + + // 重置背景颜色与边框颜色 + .cherry, + .cherry-editor, + .cherry-toolbar, + .cherry-editor .CodeMirror, + .cherry-toolbar .cherry-toolbar-button:hover, + .cherry-floatmenu .cherry-toolbar-button:hover, + .cherry-dropdown .cherry-dropdown-item:hover { + background-color: transparent; + border: none; + } + + // 工具栏及下拉框背景颜色 + .cherry-floatmenu, + .cherry-toolbar, + .cherry-dropdown { + background-color: getCssVar(markdown, color-md-toolbar-bg); + } + + // 工具栏与内容区的字体颜色 + .cherry-toolbar .cherry-toolbar-button, + .cherry-editor .CodeMirror, + .cherry-editor .CodeMirror .CodeMirror-scroll span, + .cherry-dropdown .cherry-dropdown-item { + color: getCssVar('markdown', 'color'); + } + + // 工具栏激活颜色 + .cherry-toolbar .cherry-toolbar-button:hover, + .cherry-floatmenu .cherry-toolbar-button:hover, + .cherry-dropdown .cherry-dropdown-item:hover { + color: getCssVar('markdown', 'color-active') !important; + } } @include when(disabled) { @@ -114,4 +155,4 @@ $markdown: ( color: getCssVar('markdown', 'readonly-color'); } } -} \ No newline at end of file +} diff --git a/src/editor/qrcode/ibiz-qrcode/ibiz-qrcode.scss b/src/editor/qrcode/ibiz-qrcode/ibiz-qrcode.scss index e42f0fffe..7e38d154a 100644 --- a/src/editor/qrcode/ibiz-qrcode/ibiz-qrcode.scss +++ b/src/editor/qrcode/ibiz-qrcode/ibiz-qrcode.scss @@ -1,6 +1,7 @@ $qrcode: ( // 颜色 color: getCssVar(color, disabled, text), + width: rem(300px), ); @include b(qrcode) { @@ -12,6 +13,11 @@ $qrcode: ( width: 100%; height: 100%; + @include e('img') { + width: getCssVar(qrcode, width); + max-width: 100%; + } + @include e('no-img') { color: getCssVar(qrcode, color); } -- Gitee From bfa9ef0ffe9cf44b366f325a35b00cdc414c6eaf Mon Sep 17 00:00:00 2001 From: lijianxiong <1518062161@qq.com> Date: Fri, 14 Nov 2025 10:37:06 +0800 Subject: [PATCH 5/7] =?UTF-8?q?feat=EF=BC=9A=E4=BC=98=E5=8C=96=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E8=8F=9C=E5=8D=95=E3=80=81=E8=8F=9C=E5=8D=95=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F=EF=BC=8C?= =?UTF-8?q?=E9=80=82=E9=85=8D=E6=9A=97=E8=89=B2=E4=B8=BB=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/control/app-menu-list-view/app-menu-list-view.scss | 2 ++ .../app-menu/custom-menu-design/custom-menu-design.scss | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/control/app-menu-list-view/app-menu-list-view.scss b/src/control/app-menu-list-view/app-menu-list-view.scss index a12391635..49b3e00de 100644 --- a/src/control/app-menu-list-view/app-menu-list-view.scss +++ b/src/control/app-menu-list-view/app-menu-list-view.scss @@ -1,5 +1,6 @@ $control-appmenu-listview: ( // Color + color-item-bg: getCssVar(color, bg, 2), color-item-text: getCssVar(color, text, 0), // 菜单项文字颜色 color-nodata-ph-item-text: getCssVar('color', 'text', 0), // 菜单分组项无子数据时占位项文字颜色 // Spacing @@ -41,6 +42,7 @@ $control-appmenu-listview: ( padding: getCssVar(control-appmenu-listview, spacing-item-padding); font-size: getCssVar(control-appmenu-listview, font-item-font-size); color: getCssVar(control-appmenu-listview, color-item-text); + background-color: getCssVar(control-appmenu-listview, color-item-bg); &:last-child { border-width: 0; diff --git a/src/control/app-menu/custom-menu-design/custom-menu-design.scss b/src/control/app-menu/custom-menu-design/custom-menu-design.scss index 05b4cfb95..6b2e96f50 100644 --- a/src/control/app-menu/custom-menu-design/custom-menu-design.scss +++ b/src/control/app-menu/custom-menu-design/custom-menu-design.scss @@ -9,7 +9,7 @@ $menu-design: ( 'spacing-header-padding': 0 0 getCssVar('spacing', 'tight'), // 当前组件头部内间距 'spacing-item-padding': 0 getCssVar('spacing', 'base'), // 树节点项内间距 'spacing-item-margin': getCssVar('spacing', 'tight') 0, // 树节点项外间距 - 'spacing-item-caption-margin': 0 0 0 getCssVar('spacing', 'extra-tight'), // 树节点项主文本外间距 + 'spacing-item-caption-margin': 0 0 0 getCssVar('spacing', 'tight'), // 树节点项主文本外间距 'spacing-item-checkbox-margin': 0 0 0 getCssVar('spacing', 'extra-tight'), // 树节点项复选框外间距 'spacing-node-item-margin-left': rem(20px), // 树节点项左侧间距，用于缩进区分父节点与子节点 // Radius @@ -61,6 +61,7 @@ $menu-design: ( font-size: getCssVar(menu-design, font-item-font-size); background-color: getCssVar(menu-design, color-item-bg); border-radius: getCssVar(menu-design, radius-item-circle); + line-height: getCssVar(menu-design, height-item); @include m(icon) { display: flex; -- Gitee From d51d446a08f8e43606e9822e0e5ba42d15c7fc14 Mon Sep 17 00:00:00 2001 From: lijianxiong <1518062161@qq.com> Date: Fri, 14 Nov 2025 10:37:22 +0800 Subject: [PATCH 6/7] =?UTF-8?q?feat=EF=BC=9A=E6=9B=B4=E6=96=B0CHANGELOG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4aedd7d8a..5fe1b2983 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -125,6 +125,9 @@ - 优化分页导航引擎的视图刷新逻辑，使其与pc端视图刷新保持一致 - 修改数据看板自定义布局逻辑 - 修改移动端多数据选择编辑器的选择逻辑 +- 地图选择编辑器增加选择图标及处理控制台报错 +- 优化列表菜单、菜单自定义组件样式，适配暗色主题 +- 优化时间范围选择、html、markdown、二维码编辑器样式，适配暗色主题 ### Fixed @@ -154,6 +157,8 @@ - 修复数据关系分页隐藏编辑项逻辑计算异常及计数器禁用未生效 - 修复表单锚点未固定在视口异常 - 修复表单错误提示显示样式不正确异常 +- 修复菜单自定义配置后无法保存 +- 修复数值范围编辑器输入值时最大最小值会同步 ## [0.7.41-alpha.19] - 2025-10-16 -- Gitee From e23cc142d90a8e3efaffa226bccdda1904aea65d Mon Sep 17 00:00:00 2001 From: lijianxiong <1518062161@qq.com> Date: Fri, 14 Nov 2025 14:51:09 +0800 Subject: [PATCH 7/7] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E8=8F=9C=E5=8D=95=E4=B8=BB=E6=96=87=E6=9C=AC=E8=B6=85?= =?UTF-8?q?=E5=87=BA=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app-menu-list-view/app-menu-list-view.scss | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/control/app-menu-list-view/app-menu-list-view.scss b/src/control/app-menu-list-view/app-menu-list-view.scss index 49b3e00de..603a29cad 100644 --- a/src/control/app-menu-list-view/app-menu-list-view.scss +++ b/src/control/app-menu-list-view/app-menu-list-view.scss @@ -72,6 +72,21 @@ $control-appmenu-listview: ( margin-right: getCssVar(control-appmenu-listview, icon-text-margin); } } + + // 主文本样式 + .van-cell__title { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + + } + + // 计数器样式 + .van-cell__value { + width: auto; + flex: unset; + margin-left: auto; + } } } -- Gitee