优化标签显示

lixiaojun

2024-10-10 19542281826dbf98a7e4ebf9e7dd4a0c31247c7f

优化标签显示

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/00-core/HydroParterInfoUpdateExtensions.cs

@@ -30,7 +30,7 @@
            rhs.ModelType = propertyViewModel.ModelType;
            rhs.DbId = propertyViewModel.DbId;
            rhs.DbLocked = propertyViewModel.DbLocked;
            rhs.Flags = propertyViewModel.Flags?.ToList();
            rhs.Flags = Yw.Untity.FlagsHelper.ToList(propertyViewModel.Flags);
            rhs.Description = propertyViewModel.Description;

            //节点

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/00-core/HydroParterPropertyViewModel.cs

@@ -24,7 +24,7 @@
            this.Code = rhs.Code;
            this.ModelType = rhs.ModelType;
            this.DbId = rhs.DbId;
            this.Flags = rhs.Flags?.ToList();
            this.Flags = Yw.Untity.FlagsHelper.ToString(rhs.Flags);
            this.Description = rhs.Description;
        }

@@ -100,7 +100,7 @@
        [PropertyOrder(8)]
        [IsHydroFlagsPro(true)]
        [Browsable(true)]
        public virtual List<string> Flags { get; set; }
        public virtual string Flags { get; set; }

        /// <summary>
        /// 说明
@@ -126,7 +126,7 @@
            this.ModelType = rhs.ModelType;
            this.DbId = rhs.DbId;
            this.DbLocked = rhs.DbLocked;
            this.Flags = rhs.Flags?.ToList();
            this.Flags = Yw.Untity.FlagsHelper.ToString(rhs.Flags);
            this.Description = rhs.Description;
        }


 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/HydroParterPropertyCtrl.cs

@@ -135,19 +135,7 @@
                        e.CellText = e.Properties.Value.ToString() + " " + displayUnit.Unit;
                    }
                }

                var flagsPro = (IsHydroFlagsProAttribute)descriptor.Attributes[typeof(IsHydroFlagsProAttribute)];
                if (flagsPro != null)
                {
                    if (flagsPro.FlagsPro)
                    {
                        var flags = e.Properties.Value as List<string>;
                        e.CellText = Yw.Untity.FlagsHelper.ToString(flags);
                    }
                }
            }


        }

        //自定义属性描述
@@ -408,10 +396,10 @@
                    var flagVmoList = await BLLFactory<Yw.BLL.SysFlag>.Instance.GetBySysType(Yw.Hydro.DataType.HydroParter);
                    var dbFlagList = flagVmoList?.Select(x => x.Name).Distinct().ToList();
                    var dlg = new SetFlagsDlg();
                    dlg.SetBindingData(dbFlagList, vm.Flags);
                    dlg.SetBindingData(dbFlagList, Yw.Untity.FlagsHelper.ToList(vm.Flags));
                    dlg.ReloadDataEvent += (flags) =>
                    {
                        vm.Flags = flags;
                        vm.Flags = Yw.Untity.FlagsHelper.ToString(flags);
                        UpdateRows();
                    };
                    dlg.ShowDialog();