Merge pull request #15581 in DESIGN/design from bugfix/11.0 to feature/x

* commit '2cf282d2d239b7da9b3c04f382ac6c6ebfd3a927':
  REPORT-142226 设计器支持越南语和印尼语更新升级
  REPORT-142093 【数据集替换】下拉树中，如果数据集存在依赖层级，字段没有替换

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;
         }
     }

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);