Merge pull request #1081 from ruanhan/hotfix_0704

fix share edit permission ctrl
edp963 · Jul 4, 2019 · 784ac33 · 784ac33
2 parents 098aea5 + 4863efd
commit 784ac33
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/webapp/app/containers/Account/components/checkShareDownloadPermission.tsx b/webapp/app/containers/Account/components/checkShareDownloadPermission.tsx
@@ -13,7 +13,7 @@ export default function<T> (project?: IProject, type?: string) {
           const projectPermission = project.permission
           for (const attr in projectPermission) {
             if (`${type}Permission` === attr) {
-              permission = projectPermission [attr]
+              permission = projectPermission[attr]
               break
             }
           }

diff --git a/webapp/app/containers/Dashboard/components/DashboardItem.tsx b/webapp/app/containers/Dashboard/components/DashboardItem.tsx
@@ -728,7 +728,7 @@ export class DashboardItem extends React.PureComponent<IDashboardItemProps, IDas
         </Tooltip>
       )
 
-      const ShareButton = ShareDownloadPermission<IconProps>(currentProject, 'download')(Icon)
+      const ShareButton = ShareDownloadPermission<IconProps>(currentProject, 'share')(Icon)
       shareButton = (
         <Tooltip title="分享">
           <Popover
@@ -753,9 +753,13 @@ export class DashboardItem extends React.PureComponent<IDashboardItemProps, IDas
         </Tooltip>
       )
 
+      const EditButton = ModulePermission<React.DetailedHTMLProps<React.HTMLAttributes<HTMLSpanElement>, HTMLSpanElement>>(currentProject, 'viz', false)(Span)
       widgetButton = (
         <Tooltip title="编辑widget">
-          <i className="iconfont icon-edit-2" onClick={this.toWorkbench} />
+          {/* <i className="iconfont icon-edit-2" onClick={this.toWorkbench} /> */}
+          <i>
+            <EditButton className="iconfont icon-edit-2" onClick={this.toWorkbench} />
+          </i>
         </Tooltip>
       )
     }