diff --git a/designer_base/src/com/fr/design/locale/designer.properties b/designer_base/src/com/fr/design/locale/designer.properties index b70b141a9..83d7dbc8e 100644 --- a/designer_base/src/com/fr/design/locale/designer.properties +++ b/designer_base/src/com/fr/design/locale/designer.properties @@ -2104,3 +2104,4 @@ FR-Designer_Insert_Chart=Insert_Chart FR-Designer_Insert_Text=Insert_Text FR-Designer_Double=Double FR-Designer_Add_Event=Add Event +FR-Designer_Not_Support_Authority_Edit=this element does not support authority edit diff --git a/designer_base/src/com/fr/design/locale/designer_en_US.properties b/designer_base/src/com/fr/design/locale/designer_en_US.properties index 542ea4e74..915b1eac9 100644 --- a/designer_base/src/com/fr/design/locale/designer_en_US.properties +++ b/designer_base/src/com/fr/design/locale/designer_en_US.properties @@ -2105,3 +2105,4 @@ FR-Designer_Scale_Up=Scale_Up FR-Designer_Scale_Slider=Scale_Slider FR-Designer_Scale_Grade=Scale_Grade FR-Designer_Add_Event=Add Event +FR-Designer_Not_Support_Authority_Edit=this element does not support authority edit diff --git a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties index 4d9423cfe..0e6bbf7f3 100644 --- a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties +++ b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties @@ -2108,4 +2108,4 @@ FR-Designer-StyleAlignment_Style_PartSpacing= FR-Designer_Use_Params_Template= FR-Designer_Label_Name= FR-Designer_Insert_Formula= -FR-Designer_Add_Event= +FR-Designer_Not_Support_Authority_Edit=\u3053\u306E\u8981\u7D20\u306F\u6A29\u9650\u5236\u5FA1\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u305B\u3093 diff --git a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties index bab5eca97..d27bb8fd4 100644 --- a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties +++ b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties @@ -2108,3 +2108,4 @@ FR-Designer-StyleAlignment_Style_PartSpacing= FR-Designer_Use_Params_Template= FR-Designer_Label_Name= FR-Designer_Add_Event= +FR-Designer_Not_Support_Authority_Edit=\uD574\uB2F9\uC694\uC18C\uB294\uAD8C\uD55C\uCEE8\uD2B8\uB864\uC744\uC9C0\uC6D0\uD558\uC9C0\uC54A\uC2B5\uB2C8\uB2E4. diff --git a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties index d94854149..8f128d45a 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties @@ -2111,3 +2111,4 @@ FR-Designer_Scale_Down=\u7F29\u5C0F FR-Designer_Scale_Up=\u653E\u5927 FR-Designer_Scale_Slider=\u7F29\u653E\u6ED1\u5757 FR-Designer_Scale_Grade=\u7F29\u653E\u7EA7\u522B\uFF0C\u5355\u51FB\u540E\u8C03\u8282\u663E\u793A\u6BD4\u4F8B\u3002 +FR-Designer_Not_Support_Authority_Edit=\u8BE5\u5143\u7D20\u4E0D\u652F\u6301\u6743\u9650\u63A7\u5236 diff --git a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties index 72e78228a..d52583795 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties @@ -2108,3 +2108,4 @@ FR-Designer-StyleAlignment_Style_PartSpacing= FR-Designer_Use_Params_Template= FR-Designer_Label_Name= FR-Designer_Add_Event= +FR-Designer_Not_Support_Authority_Edit=\u8A72\u5143\u7D20\u4E0D\u652F\u63F4\u8A31\u53EF\u6B0A\u63A7\u5236 diff --git a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java index 4dcf2332f..386647114 100644 --- a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java +++ b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java @@ -48,7 +48,11 @@ public class EastRegionContainerPane extends UIEastResizableContainer { private static final String KEY_WIDGET_LIB = "widgetLib"; private static final String KEY_AUTHORITY_EDITION = "authorityEdition"; private static final String KEY_CONFIGURED_ROLES = "editedRoles"; - private static final String DEFAULT_PANE = "defaultPane"; // "无可用配置项"面板 + private static final String DEFAULT_PANE = "defaultPane"; + private static final String DEFAULT_AUTHORITY_PANE = "defaultAuthorityPane"; + + private JPanel defaultPane; // "无可用配置项"面板 + private JPanel defaultAuthorityPane; // "该元素不支持权限编辑" public enum PropertyMode { REPORT, // 报表 @@ -83,6 +87,8 @@ public class EastRegionContainerPane extends UIEastResizableContainer { super(); // setVerticalDragEnabled(false); initPropertyItemList(); + defaultPane = getDefaultPane(Inter.getLocText("FR-Designer_No_Settings_Available")); + defaultAuthorityPane = getDefaultPane(Inter.getLocText("FR-Designer_Not_Support_Authority_Edit")); switchMode(PropertyMode.REPORT); // initContentPane(); // super(leftPane, rightPane); @@ -140,9 +146,9 @@ public class EastRegionContainerPane extends UIEastResizableContainer { } // "无可用配置项"面板 - private JPanel getDefaultPane() { + private JPanel getDefaultPane(String prompt) { JPanel defaultPane = new JPanel(); - UILabel label = new UILabel(Inter.getLocText("FR-Designer_No_Settings_Available")); + UILabel label = new UILabel(prompt); label.setHorizontalAlignment(SwingConstants.CENTER); defaultPane.setLayout(new BorderLayout()); defaultPane.add(label, BorderLayout.CENTER); @@ -166,7 +172,8 @@ public class EastRegionContainerPane extends UIEastResizableContainer { } rightPane.add(item.getName(), item.getPropertyPanel()); } - rightPane.add(DEFAULT_PANE, getDefaultPane()); + rightPane.add(DEFAULT_PANE, defaultPane); + rightPane.add(DEFAULT_AUTHORITY_PANE, defaultAuthorityPane); replaceRightPane(rightPane); refreshRightPane(); @@ -363,16 +370,24 @@ public class EastRegionContainerPane extends UIEastResizableContainer { */ public void refreshRightPane() { boolean hasAvailableTab = false; + boolean hasEnabledTab = false; for (String name : propertyItemMap.keySet()) { PropertyItem propertyItem = propertyItemMap.get(name); - if (propertyItem.isVisible() && !propertyItem.isPoppedOut() && propertyItem.isEnabled()) { - propertyCard.show(rightPane, name); // 显示第一个可用tab - hasAvailableTab = true; - break; + if (propertyItem.isVisible() && propertyItem.isEnabled()) { + hasEnabledTab = true; + if (!propertyItem.isPoppedOut()) { + propertyCard.show(rightPane, name); // 显示第一个可用tab + hasAvailableTab = true; + break; + } } } if (!hasAvailableTab) { - propertyCard.show(rightPane, DEFAULT_PANE); + if (!hasEnabledTab && BaseUtils.isAuthorityEditing()) { + propertyCard.show(rightPane, DEFAULT_AUTHORITY_PANE); + } else { + propertyCard.show(rightPane, DEFAULT_PANE); + } } // if (this.getRightPane() instanceof DockingView) {