From 93bc3f8d986bc574d4e9790cd9168e2742b22618 Mon Sep 17 00:00:00 2001 From: lijianxiong <1518062161@qq.com> Date: Thu, 9 Oct 2025 20:51:33 +0800 Subject: [PATCH 01/13] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E4=B8=8B?= =?UTF-8?q?=E6=8B=89=E5=88=97=E8=A1=A8=E6=A1=86=E6=98=BE=E7=A4=BA=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=A1=A8=E9=A1=B9=E6=95=B0=E6=8D=AE=EF=BC=8C=E9=80=82?= =?UTF-8?q?=E9=85=8D=E4=BB=A3=E7=A0=81=E8=A1=A8=E9=85=8D=E7=BD=AE=E4=BA=86?= =?UTF-8?q?=E6=95=B0=E5=80=BC=E4=BB=A3=E7=A0=81=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.tsx b/src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.tsx index 9670dba9..6d59d738 100644 --- a/src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.tsx +++ b/src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.tsx @@ -212,7 +212,7 @@ export const IBizDropdown = defineComponent({ > {item.text} - {item.value && item.value === curValue.value && ( + {item.value === curValue.value && ( Date: Thu, 9 Oct 2025 20:51:51 +0800 Subject: [PATCH 02/13] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E4=B8=8B?= =?UTF-8?q?=E6=8B=89=E5=88=97=E8=A1=A8=E6=A1=86=E6=9C=AA=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=97=B6=EF=BC=8C=E4=BC=9A=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=80=89=E4=B8=AD=E6=95=B0=E6=8D=AE=EF=BC=8C=E9=80=82=E9=85=8D?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A1=A8=E9=85=8D=E7=BD=AE=E4=BA=86=E6=95=B0?= =?UTF-8?q?=E5=80=BC=E4=BB=A3=E7=A0=81=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.tsx b/src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.tsx index 6d59d738..8b58dbac 100644 --- a/src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.tsx +++ b/src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.tsx @@ -90,7 +90,7 @@ export const IBizDropdown = defineComponent({ const index = items.value.findIndex( // 不匹配类型 兼容数值属性配置字符串代码表 // eslint-disable-next-line eqeqeq - (item: IData) => item.value == curValue.value, + (item: IData) => item.value === curValue.value, ); if (index !== -1) { return items.value[index].text; -- Gitee From 55c05ee5aeb32a3668097b6e27e7ab0ba580e8e4 Mon Sep 17 00:00:00 2001 From: lijianxiong <1518062161@qq.com> Date: Thu, 9 Oct 2025 20:53:17 +0800 Subject: [PATCH 03/13] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=A4=9A?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=80=89=E6=8B=A9=E7=BC=96=E8=BE=91=E5=99=A8?= =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E7=AE=AD=E5=A4=B4=E6=B2=A1=E6=9C=89=E5=9E=82?= =?UTF-8?q?=E7=9B=B4=E5=AF=B9=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/editor/data-picker/ibiz-mpicker/ibiz-mpicker.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/editor/data-picker/ibiz-mpicker/ibiz-mpicker.scss b/src/editor/data-picker/ibiz-mpicker/ibiz-mpicker.scss index d2e263e7..e5d53b1c 100644 --- a/src/editor/data-picker/ibiz-mpicker/ibiz-mpicker.scss +++ b/src/editor/data-picker/ibiz-mpicker/ibiz-mpicker.scss @@ -9,6 +9,7 @@ } .van-field__right-icon { + align-items: center; button { color: var(--van-field-right-icon-color); border: none; -- Gitee From 4890e4e8d0dd247832abeff74ed413d062c88608 Mon Sep 17 00:00:00 2001 From: lijianxiong <1518062161@qq.com> Date: Thu, 9 Oct 2025 20:55:27 +0800 Subject: [PATCH 04/13] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=80=89=E6=8B=A9=E7=BC=96=E8=BE=91=E5=99=A8=E7=9A=84?= =?UTF-8?q?=E9=80=89=E4=B8=AD=E6=95=B0=E6=8D=AE=E5=9C=A8=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E6=A1=86=E4=B8=AD=E6=9C=AA=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/editor/data-picker/ibiz-picker/ibiz-picker.tsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/editor/data-picker/ibiz-picker/ibiz-picker.tsx b/src/editor/data-picker/ibiz-picker/ibiz-picker.tsx index 4ef00b8f..869a9ece 100644 --- a/src/editor/data-picker/ibiz-picker/ibiz-picker.tsx +++ b/src/editor/data-picker/ibiz-picker/ibiz-picker.tsx @@ -285,6 +285,13 @@ export const IBizPicker = defineComponent({ {items.value.length !== 0 && items.value.map((item: IData) => { if (item[c.textName]?.indexOf(searchValue.value) < 0) return; + + let selected = + (item[c.textName] || item.srfmajortext) === curValue.value; + if (c.valueItem) { + selected = + (item[c.keyName] || item.srfkey) === props.data[c.valueItem]; + } return (
{item[c.textName]}
- {item.srfkey && item.srfkey === props.data[c.valueItem] && ( + {selected && ( Date: Thu, 9 Oct 2025 20:57:02 +0800 Subject: [PATCH 05/13] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=80=89=E6=8B=A9=E7=BC=96=E8=BE=91=E5=99=A8=E7=9A=84?= =?UTF-8?q?=E9=80=89=E4=B8=AD=E6=95=B0=E6=8D=AE=E5=9C=A8=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E8=A7=86=E5=9B=BE=E4=B8=AD=E6=9C=AA=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-picker/ibiz-picker/ibiz-picker.tsx | 32 ++++++++++++++++++- .../data-picker/picker-editor.controller.ts | 2 +- src/view-engine/mob-mpickup-view-engine.ts | 6 +++- 3 files changed, 37 insertions(+), 3 deletions(-) diff --git a/src/editor/data-picker/ibiz-picker/ibiz-picker.tsx b/src/editor/data-picker/ibiz-picker/ibiz-picker.tsx index 869a9ece..48a69b83 100644 --- a/src/editor/data-picker/ibiz-picker/ibiz-picker.tsx +++ b/src/editor/data-picker/ibiz-picker/ibiz-picker.tsx @@ -98,13 +98,43 @@ export const IBizPicker = defineComponent({ emit('change', targetData[c.textName]); }; + /** + * @description 计算选中项数据 + * @returns {*} {IData[]} + */ + const calcSelectItem = (): IData[] => { + const selectItems: IData[] = []; + if (curValue.value) { + const selectItem = { + srfkey: props.data[c.valueItem], + srfmajortext: curValue.value, + ...(c.model.valueType === 'OBJECT' && + props.value && + c.objectValueField + ? (props.value as IData)[c.objectValueField as string] + : {}), + }; + if (c.deACMode && c.dataItems.length) + c.dataItems.forEach((item: IData) => + Object.assign(selectItem, { + [item.appDEFieldId]: props.data[item.id], + }), + ); + selectItems.push(selectItem); + } + return selectItems; + }; + // 打开数据选择视图 const openPickUpView = async (e: MouseEvent) => { e.stopPropagation(); if (props.disabled || props.readonly) { return; } - const res = await c.openPickUpView(props.data); + const res = await c.openPickUpView( + props.data, + JSON.stringify(calcSelectItem()), + ); if (res && res[0]) { await handleDataSelect(res[0]); } diff --git a/src/editor/data-picker/picker-editor.controller.ts b/src/editor/data-picker/picker-editor.controller.ts index a29343bb..684fe527 100644 --- a/src/editor/data-picker/picker-editor.controller.ts +++ b/src/editor/data-picker/picker-editor.controller.ts @@ -242,7 +242,7 @@ export class PickerEditorController extends EditorController { this.params, ); if (selectedData) { - params.selectedData = selectedData; + params.selecteddata = selectedData; } if (!this.pickupView) { throw new RuntimeModelError( diff --git a/src/view-engine/mob-mpickup-view-engine.ts b/src/view-engine/mob-mpickup-view-engine.ts index 1b894f1b..51b3b63d 100644 --- a/src/view-engine/mob-mpickup-view-engine.ts +++ b/src/view-engine/mob-mpickup-view-engine.ts @@ -21,7 +21,7 @@ import { MobPickupViewEngine } from './mob-pickup-view.engine'; * @extends {MobViewBaseEngine} */ export class MobMPickupViewEngine extends MobPickupViewEngine { - protected declare view: ViewController< + declare protected view: ViewController< IAppDEMobPickupView, IMPickupViewState, IMPickupViewEvent @@ -68,6 +68,10 @@ export class MobMPickupViewEngine extends MobPickupViewEngine { this.selectedData = JSON.parse(this.view.params.selectedData); delete this.view.params.selectedData; } + if (this.view.params.selecteddata) { + this.selectedData = JSON.parse(this.view.params.selecteddata); + delete this.view.params.selecteddata; + } if (!this.view.slotProps.simplelist) { this.view.slotProps.simplelist = {}; } -- Gitee From 89d09cf78131f2c3dea1926f79a89b53049e7799 Mon Sep 17 00:00:00 2001 From: lijianxiong <1518062161@qq.com> Date: Thu, 9 Oct 2025 20:59:00 +0800 Subject: [PATCH 06/13] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E9=80=89=E6=8B=A9=E5=99=A8=E5=8F=8A=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=E9=80=89=E6=8B=A9=E5=99=A8=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=BC=96=E8=BE=91=E5=99=A8=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../date-picker-editor.controller.ts | 17 +++++++++++++++++ .../date-range/date-range-editor.controller.ts | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/src/editor/date-picker/date-picker-editor.controller.ts b/src/editor/date-picker/date-picker-editor.controller.ts index 1884fa14..0106610b 100644 --- a/src/editor/date-picker/date-picker-editor.controller.ts +++ b/src/editor/date-picker/date-picker-editor.controller.ts @@ -58,4 +58,21 @@ export class DatePickerEditorController extends EditorController { return 'YYYY-MM-DD hh:mm:ss'; } } + + /** + * 值格式化 + * + * @readonly + * @type {(string | undefined)} + * @memberof DatePickerEditorController + */ + get valueFormat(): string | undefined { + if (super.valueFormat) { + return super.valueFormat; + } + if (this.model.dateTimeFormat) { + return this.model.dateTimeFormat; + } + return this.getFormatByType(this.model.editorType); + } } diff --git a/src/editor/date-range/date-range-editor.controller.ts b/src/editor/date-range/date-range-editor.controller.ts index babcf8b2..f6f12803 100644 --- a/src/editor/date-range/date-range-editor.controller.ts +++ b/src/editor/date-range/date-range-editor.controller.ts @@ -59,4 +59,21 @@ export class DateRangeEditorController extends EditorController { return 'YYYY-MM-DD hh:mm:ss'; } } + + /** + * 值格式化 + * + * @readonly + * @type {(string | undefined)} + * @memberof DateRangeEditorController + */ + get valueFormat(): string | undefined { + if (this.model.dateTimeFormat) { + return this.model.dateTimeFormat; + } + if (super.valueFormat) { + return super.valueFormat; + } + return this.getFormatByType(); + } } -- Gitee From f0311be6d1e18a0bd1878e1619a445de72daef04 Mon Sep 17 00:00:00 2001 From: lijianxiong <1518062161@qq.com> Date: Thu, 9 Oct 2025 21:00:53 +0800 Subject: [PATCH 07/13] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E9=80=89=E6=8B=A9=E5=99=A8=E5=8F=8A=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=E9=80=89=E6=8B=A9=E5=99=A8=E5=9C=A8=E6=B5=8F?= =?UTF-8?q?=E8=A7=88=E5=99=A8=E8=B7=AF=E5=BE=84=E5=9B=9E=E9=80=80=E6=97=B6?= =?UTF-8?q?=E6=9C=AA=E9=94=80=E6=AF=81=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ibiz-date-picker/ibiz-date-picker.tsx | 13 +++++++++- .../ibiz-date-range-picker.tsx | 24 ++++++++++++++++--- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/src/editor/date-picker/ibiz-date-picker/ibiz-date-picker.tsx b/src/editor/date-picker/ibiz-date-picker/ibiz-date-picker.tsx index a830d03b..77dc43fc 100644 --- a/src/editor/date-picker/ibiz-date-picker/ibiz-date-picker.tsx +++ b/src/editor/date-picker/ibiz-date-picker/ibiz-date-picker.tsx @@ -1,5 +1,12 @@ /* eslint-disable no-nested-ternary */ -import { ref, watch, defineComponent, onMounted, Ref } from 'vue'; +import { + ref, + watch, + defineComponent, + onMounted, + Ref, + onBeforeUnmount, +} from 'vue'; import { getDatePickerProps, getEditorEmits, @@ -154,6 +161,10 @@ export const IBizDatePicker = defineComponent({ } }); + onBeforeUnmount(() => { + closeDrawer(); + }); + return { ns, c, diff --git a/src/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.tsx b/src/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.tsx index 439c4db6..aa1ddb8b 100644 --- a/src/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.tsx +++ b/src/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.tsx @@ -1,5 +1,12 @@ /* eslint-disable no-new */ -import { computed, defineComponent, onMounted, Ref, ref } from 'vue'; +import { + computed, + defineComponent, + onBeforeUnmount, + onMounted, + Ref, + ref, +} from 'vue'; import { getEditorEmits, getDateRangeProps, @@ -46,6 +53,11 @@ export const IBizDateRangePicker = defineComponent({ // 分钟按指定数分隔 const minStep = 1; + + // 时间选择器实例 + const startRollDateInstance: Ref = ref(null); + const endRollDateInstance: Ref = ref(null); + // 数据 let items: string[] = []; // 时间选择器文本 @@ -214,7 +226,7 @@ export const IBizDateRangePicker = defineComponent({ }; const el = startEditorRef.value; if (el) { - new RollDate({ + startRollDateInstance.value = new RollDate({ el, value: startFormatValue.value, confirm: (value: string) => { @@ -229,7 +241,7 @@ export const IBizDateRangePicker = defineComponent({ } const el2 = endEditorRef.value; if (el2) { - new RollDate({ + endRollDateInstance.value = new RollDate({ el: el2, value: endFormatValue.value, confirm: (value: string) => { @@ -247,6 +259,8 @@ export const IBizDateRangePicker = defineComponent({ const closeDrawer = () => { startEditorRef.value?.hide?.(); endEditorRef.value?.hide?.(); + startRollDateInstance.value?.hide?.(); + endRollDateInstance.value?.hide?.(); }; // 监听popstate事件 @@ -269,6 +283,10 @@ export const IBizDateRangePicker = defineComponent({ show.value = false; }; + onBeforeUnmount(() => { + closeDrawer(); + }); + // 绘制模态打开 const renderCalendarMode = () => { return ( -- Gitee From 5ebdc28f9e6c56b86576cc7a165f53dbe762d2a6 Mon Sep 17 00:00:00 2001 From: lijianxiong <1518062161@qq.com> Date: Thu, 9 Oct 2025 21:02:12 +0800 Subject: [PATCH 08/13] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=80=89=E6=8B=A9=E7=BC=96=E8=BE=91=E5=99=A8=E7=9A=84?= =?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=A1=86=E5=85=B3=E9=97=AD=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=90=8E=E6=9C=AA=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/editor/data-picker/ibiz-picker/ibiz-picker.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/editor/data-picker/ibiz-picker/ibiz-picker.tsx b/src/editor/data-picker/ibiz-picker/ibiz-picker.tsx index 48a69b83..4daf1254 100644 --- a/src/editor/data-picker/ibiz-picker/ibiz-picker.tsx +++ b/src/editor/data-picker/ibiz-picker/ibiz-picker.tsx @@ -260,7 +260,7 @@ export const IBizPicker = defineComponent({ // 点击关闭 const onClose = () => { - showPicker.value = true; + showPicker.value = false; }; // 点击清除按钮 -- Gitee From 8fa5fe5d0f2e5bd2c574da5f1549646938e94ace Mon Sep 17 00:00:00 2001 From: lijianxiong <1518062161@qq.com> Date: Thu, 9 Oct 2025 21:03:23 +0800 Subject: [PATCH 09/13] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=A4=9A?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=80=89=E6=8B=A9=E7=BC=96=E8=BE=91=E5=99=A8?= =?UTF-8?q?=E7=9A=84placeholder=E9=85=8D=E7=BD=AE=E5=90=8E=E6=9C=AA?= =?UTF-8?q?=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/editor/data-picker/ibiz-mpicker/ibiz-mpicker.scss | 4 ++++ src/editor/data-picker/ibiz-mpicker/ibiz-mpicker.tsx | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/src/editor/data-picker/ibiz-mpicker/ibiz-mpicker.scss b/src/editor/data-picker/ibiz-mpicker/ibiz-mpicker.scss index e5d53b1c..cd0bc8c0 100644 --- a/src/editor/data-picker/ibiz-mpicker/ibiz-mpicker.scss +++ b/src/editor/data-picker/ibiz-mpicker/ibiz-mpicker.scss @@ -31,6 +31,10 @@ -webkit-text-fill-color: getCssVar(form-item, disabled-color); } + @include e('placeholder') { + color: getCssVar(color, text, 3); + } + @include e('pickup-search-icon'){ font-size: getCssVar(font-size,header,5); display: flex; diff --git a/src/editor/data-picker/ibiz-mpicker/ibiz-mpicker.tsx b/src/editor/data-picker/ibiz-mpicker/ibiz-mpicker.tsx index 5a6e8617..2f8b7063 100644 --- a/src/editor/data-picker/ibiz-mpicker/ibiz-mpicker.tsx +++ b/src/editor/data-picker/ibiz-mpicker/ibiz-mpicker.tsx @@ -373,6 +373,13 @@ export const IBizMPicker = defineComponent({ > {{ input: () => { + if (!this.selectItems.length) { + return ( +
+ {this.c.placeHolder} +
+ ); + } return this.selectItems.map((item: IData) => { return (
-- Gitee From 45a0ab642612029e44bac029682a73cfdcff5fdd Mon Sep 17 00:00:00 2001 From: lijianxiong <1518062161@qq.com> Date: Thu, 9 Oct 2025 21:05:14 +0800 Subject: [PATCH 10/13] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8DHTML?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8=E7=9A=84=E7=BC=96=E8=BE=91=E5=99=A8?= =?UTF-8?q?=E5=8F=82=E6=95=B0modules=E9=85=8D=E7=BD=AE=E5=90=8E=E6=9C=AA?= =?UTF-8?q?=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/editor/html/html-editor.controller.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/editor/html/html-editor.controller.ts b/src/editor/html/html-editor.controller.ts index afa2f8b1..ad79f975 100644 --- a/src/editor/html/html-editor.controller.ts +++ b/src/editor/html/html-editor.controller.ts @@ -164,12 +164,18 @@ export class HtmlEditorController extends EditorController { this.modules = ScriptFactory.execScriptFn( { controller: this }, MODULES, + { + isAsync: false, + }, ) as IData; } if (modules) { this.modules = ScriptFactory.execScriptFn( { controller: this }, modules, + { + isAsync: false, + }, ) as IData; } if (DEFAULTHEIGHT) { -- Gitee From d88c1b77119cb883cb59e79f77421cec0a3f3a26 Mon Sep 17 00:00:00 2001 From: lijianxiong <1518062161@qq.com> Date: Thu, 9 Oct 2025 21:06:40 +0800 Subject: [PATCH 11/13] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E7=94=B5?= =?UTF-8?q?=E5=AD=90=E7=AD=BE=E5=90=8D=E7=BC=96=E8=BE=91=E5=99=A8=E7=AD=BE?= =?UTF-8?q?=E5=90=8D=E5=90=8E=E6=9C=AA=E6=98=BE=E7=A4=BA=E7=AD=BE=E5=90=8D?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=8F=8A=E8=B0=83=E6=95=B4=E5=8F=AA=E8=AF=BB?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/editor/text-box/signature/signature.scss | 1 + src/editor/text-box/signature/signature.tsx | 1 + 2 files changed, 2 insertions(+) diff --git a/src/editor/text-box/signature/signature.scss b/src/editor/text-box/signature/signature.scss index 2e929113..fbdda502 100644 --- a/src/editor/text-box/signature/signature.scss +++ b/src/editor/text-box/signature/signature.scss @@ -60,6 +60,7 @@ $signature-overlay: ( @include e('content') { width: 100%; height: 100%; + min-height: getCssVar('signature', 'min-height'); background-repeat: no-repeat; background-position: center center; background-size: contain; diff --git a/src/editor/text-box/signature/signature.tsx b/src/editor/text-box/signature/signature.tsx index 99c762ea..3d0f076c 100644 --- a/src/editor/text-box/signature/signature.tsx +++ b/src/editor/text-box/signature/signature.tsx @@ -224,6 +224,7 @@ export const IBizSignature = defineComponent({ * @return {*} */ const handleModalClick = (): void => { + if ((props.disabled || props.readonly) && !currentDataURL.value) return; fullScreen.value = true; restCavans(); }; -- Gitee From 6cd73961a94fffb11dfe7da7233cb9a24e7f7a16 Mon Sep 17 00:00:00 2001 From: lijianxiong <1518062161@qq.com> Date: Thu, 9 Oct 2025 21:07:16 +0800 Subject: [PATCH 12/13] =?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 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 194e224d..beecd46d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,20 @@ ## [Unreleased] +### Fixed + +- 修复下拉列表框显示代码表项数据，适配代码表配置了数值代码项 +- 修复下拉列表框未选择数据时，会显示选中数据，适配代码表配置了数值代码项 +- 修复多数据选择编辑器右侧箭头没有垂直对齐 +- 修复数据选择编辑器的选中数据在下拉框中未回显 +- 修复数据选择编辑器的选中数据在选择视图中未回显 +- 修复时间选择器及时间范围选择器没有根据编辑器类型格式化时间 +- 修复时间选择器及时间范围选择器在浏览器路径回退时未销毁弹窗 +- 修复数据选择编辑器的弹出框关闭按钮点击后未生效 +- 修复多数据选择编辑器的placeholder配置后未生效 +- 修复HTML编辑器的编辑器参数modules配置后未生效 +- 修复电子签名编辑器签名后未显示签名内容及调整只读逻辑 + ## [0.7.41-alpha.18] - 2025-09-30 ### Fixed -- Gitee From f4e1aba25f6dc7b55e1b206612cec671180a322e Mon Sep 17 00:00:00 2001 From: lijianxiong <1518062161@qq.com> Date: Thu, 9 Oct 2025 21:12:50 +0800 Subject: [PATCH 13/13] =?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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index beecd46d..159dd648 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,8 +14,8 @@ - 修复多数据选择编辑器右侧箭头没有垂直对齐 - 修复数据选择编辑器的选中数据在下拉框中未回显 - 修复数据选择编辑器的选中数据在选择视图中未回显 -- 修复时间选择器及时间范围选择器没有根据编辑器类型格式化时间 -- 修复时间选择器及时间范围选择器在浏览器路径回退时未销毁弹窗 +- 修复时间选择编辑器及时间范围选择编辑器没有根据编辑器类型格式化时间 +- 修复时间选择编辑器及时间范围选择编辑器在浏览器路径回退时未销毁弹窗 - 修复数据选择编辑器的弹出框关闭按钮点击后未生效 - 修复多数据选择编辑器的placeholder配置后未生效 - 修复HTML编辑器的编辑器参数modules配置后未生效 -- Gitee