From 1c6e44c0f0bd4706b5d16f713d2199e361df1915 Mon Sep 17 00:00:00 2001 From: cdswyda Date: Wed, 15 Sep 2021 15:08:19 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8D=A2=E8=A1=8C?= =?UTF-8?q?=E5=8D=95=E5=85=83=E6=A0=BC=E5=9C=A8mergecell=E6=97=B6=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E4=B8=A2=E5=A4=B1=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/menuButton.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/controllers/menuButton.js b/src/controllers/menuButton.js index c6baa41..b5d8e8c 100644 --- a/src/controllers/menuButton.js +++ b/src/controllers/menuButton.js @@ -32,7 +32,7 @@ import { countfunc } from '../global/count'; import { hideMenuByCancel } from '../global/cursorPos'; import { getSheetIndex, getRangetxt, getluckysheetfile } from '../methods/get'; import { setluckysheetfile } from '../methods/set'; -import {isInlineStringCell,updateInlineStringFormat,convertCssToStyleList,inlineStyleAffectAttribute,updateInlineStringFormatOutside} from './inlineString'; +import {isInlineStringCell,isInlineStringCT,updateInlineStringFormat,convertCssToStyleList,inlineStyleAffectAttribute,updateInlineStringFormatOutside} from './inlineString'; import { replaceHtml, getObjType, rgbTohex, mouseclickposition, luckysheetfontformat,luckysheetContainerFocus } from '../utils/util'; import {openProtectionModal,checkProtectionFormatCells,checkProtectionNotEnable} from './protection'; import Store from '../store'; @@ -3269,7 +3269,7 @@ const menuButton = { for(let c = c1; c <= c2; c++){ let cell = d[r][c]; - if(cell != null && (!isRealNull(cell.v) || cell.f != null) && !isfirst){ + if(cell != null && (isInlineStringCT(cell.ct) || !isRealNull(cell.v) || cell.f != null) && !isfirst){ fv = $.extend(true, {}, cell); isfirst = true; }