From 38b9cc298b114274e5877a2adb25c2ff8e3ca535 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E6=94=BF=E6=9D=83?= <1978141412@qq.com> Date: Sat, 28 Dec 2024 09:16:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?style:=20=E6=8F=90=E5=8F=96=E8=A1=8C?= =?UTF-8?q?=E4=B8=BA=E5=B7=A5=E5=85=B7=E6=A0=8F=E9=A1=B9padding=E5=8F=98?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/action-toolbar/action-toolbar.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/common/action-toolbar/action-toolbar.scss b/src/common/action-toolbar/action-toolbar.scss index 80d6cc0c5..1482acd6a 100644 --- a/src/common/action-toolbar/action-toolbar.scss +++ b/src/common/action-toolbar/action-toolbar.scss @@ -1,6 +1,7 @@ /* action-toolbar 界面行为组工具栏 start */ $action-toolbar: ( item-margin: getCssVar(spacing,none) getCssVar(spacing,extra-tight) getCssVar(spacing,none) getCssVar(spacing,none), + item-padding: getCssVar('spacing', 'extra-tight') getCssVar('spacing', 'none'), separator-height: getCssVar('spacing', 'base-loose'), separator-width: getCssVar('spacing', 'super-tight'), separator-color: getCssVar(color, border), @@ -19,7 +20,7 @@ $action-toolbar: ( flex-wrap: wrap; @include e(item) { - padding: getCssVar('spacing', 'extra-tight') getCssVar('spacing', 'none'); + padding: getCssVar(action-toolbar, item-padding); margin: getCssVar(action-toolbar, item-margin); @include m(icon) { -- Gitee From 3b280948cac135d8d8240aeada435155f68f2f8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E6=94=BF=E6=9D=83?= <1978141412@qq.com> Date: Sat, 28 Dec 2024 09:17:38 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=BC=96=E8=BE=91=E5=99=A8=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ibiz-picker-dropdown/ibiz-picker-dropdown.tsx | 10 +++++++--- .../data-picker/ibiz-picker-link/ibiz-picker-link.tsx | 6 +++++- src/editor/data-picker/ibiz-picker/ibiz-picker.tsx | 9 +++++++-- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/editor/data-picker/ibiz-picker-dropdown/ibiz-picker-dropdown.tsx b/src/editor/data-picker/ibiz-picker-dropdown/ibiz-picker-dropdown.tsx index 803b39022..1797bcf59 100644 --- a/src/editor/data-picker/ibiz-picker-dropdown/ibiz-picker-dropdown.tsx +++ b/src/editor/data-picker/ibiz-picker-dropdown/ibiz-picker-dropdown.tsx @@ -143,9 +143,13 @@ export const IBizPickerDropDown = defineComponent({ async (newVal, oldVal) => { // 值项发生变化选中值项对应文本值 if (newVal !== oldVal) { - // 没有加载过先加载数据 - if (!isLoaded.value && editorRef.value && isNil(props.value)) { - shouldLoad.value = true; + // 当只配置值项时，值项有值但文本没值需加载数据回显 + if ( + !isLoaded.value && + editorRef.value && + isNil(props.value) && + !isNil(newVal) + ) { await onSearch(''); } refValue.value = newVal; diff --git a/src/editor/data-picker/ibiz-picker-link/ibiz-picker-link.tsx b/src/editor/data-picker/ibiz-picker-link/ibiz-picker-link.tsx index bd42dd9d5..5a89917f1 100644 --- a/src/editor/data-picker/ibiz-picker-link/ibiz-picker-link.tsx +++ b/src/editor/data-picker/ibiz-picker-link/ibiz-picker-link.tsx @@ -25,6 +25,9 @@ export const IBizPickerLink = defineComponent({ // 实体数据集 const items: Ref = ref([]); + // 是否已加载过 + const isLoaded = ref(false); + const { useInFocusAndBlur, useInValueChange } = useAutoFocusBlur( props, emit, @@ -38,6 +41,7 @@ export const IBizPickerLink = defineComponent({ } const res = await c.getServiceData(trimQuery, props.data); if (res) { + isLoaded.value = true; items.value = res.data as IData[]; } } @@ -78,7 +82,7 @@ export const IBizPickerLink = defineComponent({ // 值项发生变化选中值项对应文本值 if (newVal !== oldVal) { // 没有加载过先加载数据 - if (isNil(props.value)) { + if (!isLoaded.value && isNil(props.value) && !isNil(newVal)) { await onSearch(''); } const curItem = items.value.find((item: IData) => diff --git a/src/editor/data-picker/ibiz-picker/ibiz-picker.tsx b/src/editor/data-picker/ibiz-picker/ibiz-picker.tsx index e6f67ceda..53f5ae0e2 100644 --- a/src/editor/data-picker/ibiz-picker/ibiz-picker.tsx +++ b/src/editor/data-picker/ibiz-picker/ibiz-picker.tsx @@ -228,8 +228,13 @@ export const IBizPicker = defineComponent({ async (newVal, oldVal) => { // 值项发生变化选中值项对应文本值 if (newVal !== oldVal) { - // 没有加载过先加载数据 - if (!isLoaded.value && editorRef.value && isNil(props.value)) { + // 当只配置值项时，值项有值但文本没值需加载数据回显 + if ( + !isLoaded.value && + editorRef.value && + isNil(props.value) && + !isNil(newVal) + ) { await onSearch(''); } const curItem = items.value.find((item: IData) => -- Gitee From b63236cc4837d5bf344543c31303f50643efbbc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E6=94=BF=E6=9D=83?= <1978141412@qq.com> Date: Sat, 28 Dec 2024 09:18:27 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=80=89=E6=8B=A9=EF=BC=88=E6=95=B0=E6=8D=AE=E9=93=BE?= =?UTF-8?q?=E6=8E=A5=EF=BC=89=E6=98=BE=E7=A4=BA=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 6 ++++++ src/editor/data-picker/picker-editor.provider.ts | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 66005b712..3407d48fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,12 @@ - 提取表格单元格padding变量 - 数据选择编辑器添加选中样式名 - 更新导航栏主题控制 +- 提取行为工具栏项padding变量 +- 调整数据选择（数据链接）显示模式 + +### Fixed + +- 修复数据选择编辑器默认加载异常 ## [0.7.38-alpha.40] - 2024-12-25 diff --git a/src/editor/data-picker/picker-editor.provider.ts b/src/editor/data-picker/picker-editor.provider.ts index 42a363aa5..1d62c6b41 100644 --- a/src/editor/data-picker/picker-editor.provider.ts +++ b/src/editor/data-picker/picker-editor.provider.ts @@ -25,7 +25,6 @@ export class DataPickerEditorProvider implements IEditorProvider { case 'PICKEREX_TRIGGER': componentName = 'IBizPickerDropDown'; break; - case 'PICKEREX_LINK': case 'PICKEREX_LINKONLY': componentName = 'IBizPickerLink'; break; -- Gitee