Merge branch 'Dev-Branch' into wxr-2.0

wxr

2023-09-14 8f9f20698e1256a58ee6894a9bc168a9dfb37861

 HDL_ON/UI/UI2/2-Classification/FunctionPage.cs

@@ -30,6 +30,7 @@
        List<Function> functionList;
        int titleId;

        public Action DelAction;
        public FunctionPage()
        {
            bodyView = this;
@@ -185,7 +186,9 @@
            }
            else if (titleId == StringId.Electric)
            {
               
                functionList.AddRange(FunctionList.List.GetElectricals());

            }
            else if (titleId == StringId.EnvironmentalScience)
            {
@@ -320,6 +323,7 @@
                                    functionListView.RemoveAll();
                                    showList.Remove(function);//先移除
                                    ShowFunctionRow(showList,isAppend);
                                    this.DelAction?.Invoke();

                                };
                                var functionDiv = new FunctionControlZone(function, deviceDelAction)