From 4fe2c97f1c79e74cd63cf5d85c0e7cfe528facdd Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Wed, 27 Nov 2024 14:09:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-142093=20=E3=80=90=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E6=9B=BF=E6=8D=A2=E3=80=91=E4=B8=8B=E6=8B=89=E6=A0=91?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E4=BE=9D=E8=B5=96=E5=B1=82=E7=BA=A7=EF=BC=8C?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=B2=A1=E6=9C=89=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/actions/replace/utils/ReplaceUtils.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/utils/ReplaceUtils.java b/designer-realize/src/main/java/com/fr/design/actions/replace/utils/ReplaceUtils.java index 8d62f3c18d..b99f7ae363 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/utils/ReplaceUtils.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/utils/ReplaceUtils.java @@ -39,6 +39,7 @@ import com.fr.form.ui.TreeEditor; import com.fr.form.ui.Widget; import com.fr.form.ui.concept.data.ValueInitializer; import com.fr.form.ui.tree.LayerConfig; +import com.fr.form.ui.tree.LayerDependence; import com.fr.general.ComparatorUtils; import com.fr.general.data.Condition; import com.fr.general.data.TableDataColumn; @@ -629,6 +630,9 @@ public class ReplaceUtils { layerConfig.setTableData(new NameTableData(entity.getNewName())); layerConfig.setViewColumn(entity.getTargetIndex(layerConfig.getViewColumn())); layerConfig.setModelColumn(entity.getTargetIndex(layerConfig.getModelColumn())); + for (LayerDependence dependence : layerConfig.getDependenceList()) { + dependence.setThisColumnIndex(entity.getTargetIndex(dependence.getThisColumnIndex())); + } } } ElementCaseHelper.replaceTableDataDictionary(layerConfig.getDictionary(), (NameTableData) layerConfig.getDictionary().getTableData(), entities); From dffea59479116d54f1c73872e26c71e791a9d141 Mon Sep 17 00:00:00 2001 From: obo Date: Wed, 27 Nov 2024 18:40:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-142226=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=B6=8A=E5=8D=97=E8=AF=AD=E5=92=8C=E5=8D=B0?= =?UTF-8?q?=E5=B0=BC=E8=AF=AD=E6=9B=B4=E6=96=B0=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/locale/impl/SupportLocaleImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/designer-base/src/main/java/com/fr/design/locale/impl/SupportLocaleImpl.java b/designer-base/src/main/java/com/fr/design/locale/impl/SupportLocaleImpl.java index 0373dad033..afb14633b5 100644 --- a/designer-base/src/main/java/com/fr/design/locale/impl/SupportLocaleImpl.java +++ b/designer-base/src/main/java/com/fr/design/locale/impl/SupportLocaleImpl.java @@ -1,5 +1,6 @@ package com.fr.design.locale.impl; +import com.fr.general.locale.LocaleConstants; import com.fr.general.locale.SupportLocale; import java.util.HashSet; @@ -169,6 +170,8 @@ public enum SupportLocaleImpl implements SupportLocale { set.add(Locale.KOREA); set.add(Locale.CHINA); set.add(Locale.TAIWAN); + set.add(LocaleConstants.IN_ID); + set.add(LocaleConstants.VI); return set; } }