Browse Source

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

* commit '8ce956556f22a5fc2390b193beb095a74c6ad4fa':
  无任务,pmd
  REPORT-2537 多层次部门工具栏权限细粒度设置不生效
master
superman 8 years ago
parent
commit
7008f3f381
  1. 252
      designer/src/com/fr/design/mainframe/AuthorityEditToolBarPane.java
  2. 830
      designer/src/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java
  3. 6
      designer_base/src/com/fr/design/locale/designer.properties
  4. 6
      designer_base/src/com/fr/design/locale/designer_en_US.properties
  5. 6
      designer_base/src/com/fr/design/locale/designer_zh_CN.properties
  6. 6
      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

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

File diff suppressed because one or more lines are too long

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

@ -1986,4 +1986,8 @@ FR-Designer_Edit_String_To_Formula=
FR-Base_UnSignIn=
Every=
CellWrite-Preview_Cell_Content=Preview Content of Cell
FormulaD-Data_Fields=Data Fields
FormulaD-Data_Fields=Data Fields
FR-Designer_Role=Role
FR-Designer_Permissions=Permissions
FR-Designer_Form_Button=Button
FR-Designer_WF_Name=Name

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

@ -1987,4 +1987,8 @@ FR-Designer_Edit_String_To_Formula=Edit String To Formula
FR-Base_UnSignIn=\ Not Logged In
Every=Every
CellWrite-Preview_Cell_Content=Content of Cell
FormulaD-Data_Fields=Data Items
FormulaD-Data_Fields=Data Items
FR-Designer_Role=Role
FR-Designer_Permissions=Permissions
FR-Designer_Form_Button=Button
FR-Designer_WF_Name=Name

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

@ -1982,4 +1982,8 @@ FR-Designer_Edit_String_To_Formula=\u662F\u5426\u5C06\u5B57\u7B26\u4E32\u7F16\u8
FR-Base_UnSignIn=\ \u672A\u767B\u5F55
Every=\u6BCF
CellWrite-Preview_Cell_Content=\u9884\u89C8\u5355\u5143\u683C\u5185\u5BB9
FormulaD-Data_Fields=\u6570\u636E\u9879
FormulaD-Data_Fields=\u6570\u636E\u9879
FR-Designer_Role=\u89D2\u8272
FR-Designer_Permissions=\u6743\u9650
FR-Designer_Form_Button=\u6309\u94AE
FR-Designer_WF_Name=\u540D\u79F0

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

@ -1982,4 +1982,8 @@ FR-Designer_Edit_String_To_Formula=\u662F\u5426\u5C07\u5B57\u5143\u4E32\u7DE8\u8
FR-Base_UnSignIn=\u672A\u767B\u9304
Every=\u6BCF
CellWrite-Preview_Cell_Content=\u9810\u89BD\u5132\u5B58\u683C\u5167\u5BB9
FormulaD-Data_Fields=\u8CC7\u6599\u9805
FormulaD-Data_Fields=\u8CC7\u6599\u9805
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