Browse Source

Merge pull request #851 in BA/design from ~YAOH.WU/design_0407:release to release

* commit '1f9e12a5e6f8c58eb2fd1e0cf0c551a78cf51d4e':
  无任务,line separator
  REPORT-2537
master
superman 8 years ago
parent
commit
29351a19a1
  1. 252
      designer/src/com/fr/design/mainframe/AuthorityEditToolBarPane.java
  2. 831
      designer/src/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java
  3. 4
      designer_base/src/com/fr/design/locale/designer.properties
  4. 4
      designer_base/src/com/fr/design/locale/designer_en_US.properties
  5. 4
      designer_base/src/com/fr/design/locale/designer_zh_CN.properties
  6. 4
      designer_base/src/com/fr/design/locale/designer_zh_TW.properties

252
designer/src/com/fr/design/mainframe/AuthorityEditToolBarPane.java

File diff suppressed because one or more lines are too long

831
designer/src/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java

File diff suppressed because one or more lines are too long

4
designer_base/src/com/fr/design/locale/designer.properties

@ -607,3 +607,7 @@ FR-Designer_Remove_Button_ToolBar=
FR-Designer_Get-CubeGetting=
FR-Designer_Oracle=
FR-Designer_Validate=
FR-Designer_Role=Role
FR-Designer_Permissions=Permissions
FR-Designer_Form_Button=Button
FR-Designer_WF_Name=Name

4
designer_base/src/com/fr/design/locale/designer_en_US.properties

@ -609,3 +609,7 @@ FR-Designer_Remove_Button_ToolBar=Remove Button ToolBar
FR-Designer_Get-CubeGetting=
FR-Designer_DoubleLayer_Report=
FR-Designer_Get-Cube=
FR-Designer_Role=Role
FR-Designer_Permissions=Permissions
FR-Designer_Form_Button=Button
FR-Designer_WF_Name=Name

4
designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@ -602,3 +602,7 @@ FR-Designer_Border=\u8FB9\u6846
FR-Designer_Background-Pattern=\u56FE\u6848
FR-Designer_Edit_Button_ToolBar=\u7F16\u8F91\u6309\u94AE\u6240\u5728\u5DE5\u5177\u680F
FR-Designer_Remove_Button_ToolBar=\u79FB\u9664\u6309\u94AE\u6240\u5728\u5DE5\u5177\u680F
FR-Designer_Role=\u89D2\u8272
FR-Designer_Permissions=\u6743\u9650
FR-Designer_Form_Button=\u6309\u94AE
FR-Designer_WF_Name=\u540D\u79F0

4
designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@ -600,3 +600,7 @@ FR-Designer_Delete_Template=
FR-Designer_Download_Template=
FR-Designer_DoubleLayer_Report=
FR-Designer_Validate=
FR-Designer_Role=\u89D2\u8272
FR-Designer_Permissions=\u6B0A\u9650
FR-Designer_Form_Button=\u6309\u9215
FR-Designer_WF_Name=\u540D\u7A31
Loading…
Cancel
Save