报表优化

duheng

2025-02-19 bb7165071ee890cfac760dbb15cd921e6f6e3096

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/01-parter/HydroParterViewModel.cs

@@ -26,6 +26,7 @@
            this.ModelType = rhs.ModelType;
            this.DbId = rhs.DbId;
            this.DbLocked = rhs.DbLocked;
            this.BeginGroup = rhs.BeginGroup;
            this.Flags = Yw.Untity.FlagsHelper.ToString(rhs.Flags);
            this.Description = rhs.Description;
            this.Paras = new DictionaryPropertyAdapter(rhs.Paras);
@@ -92,11 +93,20 @@
        }

        /// <summary>
        /// 分组
        /// </summary>
        [Category("基础信息")]
        [DisplayName("分组")]
        [PropertyOrder(6)]
        [Browsable(true)]
        public virtual string BeginGroup { get; set; }

        /// <summary>
        /// 标签
        /// </summary>
        [Category("基础信息")]
        [DisplayName("标签")]
        [PropertyOrder(6)]
        [PropertyOrder(7)]
        [HydroFlagsPro]
        [Browsable(true)]
        public virtual string Flags { get; set; }
@@ -107,17 +117,16 @@
        [Category("基础信息")]
        [DisplayName("参数")]
        [HydroParasPro]
        [PropertyOrder(7)]
        [PropertyOrder(8)]
        [Browsable(true)]
        public virtual DictionaryPropertyAdapter Paras { get; set; }


        /// <summary>
        /// 说明
        /// </summary>
        [Category("基础信息")]
        [DisplayName("说明")]
        [PropertyOrder(8)]
        [PropertyOrder(9)]
        [MultiText]
        [Browsable(true)]
        public virtual string Description { get; set; }
@@ -127,7 +136,7 @@
        /// </summary>
        [Category("基础信息")]
        [DisplayName("锁定")]
        [PropertyOrder(8)]
        [PropertyOrder(10)]
        [Browsable(true)]
        public virtual bool DbLocked { get; set; }

@@ -171,6 +180,7 @@
            this.Catalog = HydroParterCatalogHelper.GetName(this.Vmo.Catalog);
            this.ModelType = this.Vmo.ModelType;
            this.DbId = this.Vmo.DbId;
            this.BeginGroup = this.Vmo.BeginGroup;
            this.Flags = Yw.Untity.FlagsHelper.ToString(this.Vmo.Flags);
            this.Paras = new DictionaryPropertyAdapter(this.Vmo.Paras);
            this.Description = this.Vmo.Description;
@@ -188,6 +198,7 @@
            this.Vmo.ModelType = this.ModelType;
            this.Vmo.DbId = this.DbId;
            this.Vmo.DbLocked = this.DbLocked;
            this.Vmo.BeginGroup = this.BeginGroup;
            this.Vmo.Flags = Yw.Untity.FlagsHelper.ToList(this.Flags);
            this.Vmo.Paras = (Dictionary<string, string>)this.Paras?.Dictionary;
            this.Vmo.Description = this.Description;