From 1fa13087ee7be5502e2e42cbd07cf185cbc69a9c Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期四, 12 十月 2023 13:57:23 +0800 Subject: [PATCH] Merge branch 'wxr-2.1' into wxr-2.2 --- HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs index 4080a14..97c64ec 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs @@ -526,7 +526,12 @@ Radius = (uint)Application.GetRealWidth(22), BackgroundColor = CSS_Color.MainBackgroundColor, }; - contentView.AddChidren(delTextBtn); + //濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳� + if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare) + { + contentView.AddChidren(delTextBtn); + } + EventHandler<MouseEventArgs> ClickEvent = (sener, e) => { -- Gitblit v1.8.0