JS-4022: fix

anyproto · Apr 21, 2024 · c6837a9 · c6837a9
1 parent 8450b25
commit c6837a9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/ts/component/menu/block/action.tsx b/src/ts/component/menu/block/action.tsx
@@ -186,6 +186,7 @@ class MenuBlockAction extends React.Component<I.Menu, State> {
 
 		const { align, content, bgColor, type } = block;
 		const { color, style, targetObjectId } = content;
+		const checkFlag = this.checkFlagByObject(targetObjectId);
 
 		let sections: any[] = [];
 
@@ -222,8 +223,9 @@ class MenuBlockAction extends React.Component<I.Menu, State> {
 					continue;
 				};
 
-				hasBookmark = block.isBookmark() ? this.checkFlagByObject(targetObjectId) : false;
-				hasDataview = block.isDataview() ? this.checkFlagByObject(targetObjectId) : false;
+				hasBookmark = block.isBookmark() ? checkFlag : false;
+				hasDataview = block.isDataview() ? checkFlag : false;
+				hasFile = block.isFile() ? checkFlag : false;
 
 				if (!block.canTurnText())		 hasTurnText = false;
 				if (!block.canTurnPage())		 hasTurnObject = false;
@@ -234,7 +236,6 @@ class MenuBlockAction extends React.Component<I.Menu, State> {
 				if (!block.canHaveAlign())		 hasAlign = false;
 				if (!block.canHaveColor())		 hasColor = false;
 				if (!block.canHaveBackground())	 hasBg = false;
-				if (!block.isFile())			 hasFile = false;
 				if (!block.isLink())			 hasLink = false;
 				if (!block.isDataview())		 hasDataview = false;
 
@@ -287,8 +288,9 @@ class MenuBlockAction extends React.Component<I.Menu, State> {
 					continue;
 				};
 
-				hasBookmark = block.isBookmark() ? this.checkFlagByObject(targetObjectId) : false;
-				hasDataview = block.isDataview() ? this.checkFlagByObject(targetObjectId) : false;
+				hasBookmark = block.isBookmark() ? checkFlag : false;
+				hasDataview = block.isDataview() ? checkFlag : false;
+				hasFile = block.isFile() ? checkFlag : false;
 
 				if (!block.canTurnText() || block.isDiv()) {
 					hasTurnText = false;
@@ -298,7 +300,6 @@ class MenuBlockAction extends React.Component<I.Menu, State> {
 				};
 				if (!block.canTurnPage())		 hasTurnObject = false;
 				if (!block.isText())			 hasText = false;
-				if (!block.isFile())			 hasFile = false;
 				if (!block.isLink())			 hasLink = false;
 				if (!block.isDataview())		 hasDataview = false;
 				if (!block.canHaveAlign())		 hasAlign = false;

diff --git a/src/ts/lib/util/menu.ts b/src/ts/lib/util/menu.ts
@@ -201,7 +201,6 @@ class UtilMenu {
 		if (hasFile) {
 			items = items.concat([
 				{ id: 'download', icon: 'download', name: translate('commonDownload') },
-				{ id: 'openAsObject', icon: 'expand', name: translate('commonOpenObject') },
 				//{ id: 'rename', icon: 'rename', name: translate('libMenuRename') ),
 				//{ id: 'replace', icon: 'replace', name: translate('libMenuReplace') },
 			]);