From 2d03454a09569c60ac1e658bacccd2bf0e2d0dfd Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期一, 25 九月 2023 11:08:23 +0800 Subject: [PATCH] Merge branch 'wjc' into Dev-Branch --- 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