From fe724dc53c70bad54c33a18bd3d4b8c2e65140cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=9C=E7=8C=AB=E5=AD=90neko?= <815743831@qq.com>
Date: Thu, 18 Nov 2021 19:45:09 +0800
Subject: [PATCH 01/24] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BA=86?=
=?UTF-8?q?=E4=BF=9D=E6=8A=A4=E5=B7=A5=E4=BD=9C=E8=A1=A8=E7=9A=84=E6=8F=90?=
=?UTF-8?q?=E7=A4=BA=E8=AF=ADplaceHolder=E4=B8=BAundefined=E7=9A=84?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/controllers/protection.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/controllers/protection.js b/src/controllers/protection.js
index f0b6779..b987e29 100644
--- a/src/controllers/protection.js
+++ b/src/controllers/protection.js
@@ -555,7 +555,7 @@ function initialProtectionRIghtBar(file){
From 0629f29eb9599b12a44a9fd178249a9fcf8a5566 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=9C=E7=8C=AB=E5=AD=90neko?= <815743831@qq.com>
Date: Thu, 18 Nov 2021 19:49:57 +0800
Subject: [PATCH 02/24] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=8B=B1?=
=?UTF-8?q?=E8=AF=AD=E8=AF=AD=E7=A7=8D=E4=B8=8B=EF=BC=8C=E6=8F=92=E5=85=A5?=
=?UTF-8?q?=E9=93=BE=E6=8E=A5=E5=BC=B9=E7=AA=97=E7=9A=84=E9=93=BE=E6=8E=A5?=
=?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=A0=8F=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/css/luckysheet-core.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/css/luckysheet-core.css b/src/css/luckysheet-core.css
index de178ca..617ff50 100644
--- a/src/css/luckysheet-core.css
+++ b/src/css/luckysheet-core.css
@@ -7132,7 +7132,7 @@ fieldset[disabled] .btn-danger.focus {
}
#luckysheet-insertLink-dialog .box-item label{
display: inline-block;
- width: 80px;
+ width: 90px;
text-align: right;
margin-right: 10px;
}
From 64a51d37f56164ca0087b8906cb420fc5a99bf09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=9C=E7=8C=AB=E5=AD=90neko?= <815743831@qq.com>
Date: Fri, 19 Nov 2021 10:22:58 +0800
Subject: [PATCH 03/24] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=8B=B1?=
=?UTF-8?q?=E6=96=87=E4=B8=8B=EF=BC=8C=E5=90=88=E5=B9=B6=E5=8D=95=E5=85=83?=
=?UTF-8?q?=E6=A0=BC=E7=9A=84=E6=8B=93=E5=B1=95=E8=8F=9C=E5=8D=95UI?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/controllers/menuButton.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/controllers/menuButton.js b/src/controllers/menuButton.js
index 06566f3..f7edb8e 100644
--- a/src/controllers/menuButton.js
+++ b/src/controllers/menuButton.js
@@ -1292,7 +1292,7 @@ const menuButton = {
let menu = replaceHtml(_this.menu, { "id": "merge-menu", "item": itemset, "subclass": "", "sub": "" });
$("body").append(menu);
- $menuButton = $("#"+menuButtonId).width(110);
+ $menuButton = $("#"+menuButtonId);
_this.focus($menuButton);
$menuButton.find(".luckysheet-cols-menuitem").click(function(){
From bfc2aa99d28745d93f332f3ec7bf16416533ccd0 Mon Sep 17 00:00:00 2001
From: tong
Date: Fri, 19 Nov 2021 11:39:41 +0800
Subject: [PATCH 04/24] =?UTF-8?q?fix(functionimplementation.js):=20?=
=?UTF-8?q?=E8=A1=A5=E5=85=85=20luckysheet=5FcalcADPMM=20=E5=87=BD?=
=?UTF-8?q?=E6=95=B0=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/function/functionImplementation.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/function/functionImplementation.js b/src/function/functionImplementation.js
index f7b81f4..2ea9319 100644
--- a/src/function/functionImplementation.js
+++ b/src/function/functionImplementation.js
@@ -1,5 +1,5 @@
import luckysheetConfigsetting from '../controllers/luckysheetConfigsetting';
-import { luckysheet_getcelldata, luckysheet_parseData, luckysheet_getValue } from './func';
+import { luckysheet_getcelldata, luckysheet_parseData, luckysheet_getValue, luckysheet_calcADPMM } from './func';
import { inverse } from './matrix_methods';
import { getSheetIndex, getluckysheetfile,getRangetxt } from '../methods/get';
import menuButton from '../controllers/menuButton';
From 25626dedaa65ab797ec88da6fc069433d76a2adb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=9C=E7=8C=AB=E5=AD=90neko?= <815743831@qq.com>
Date: Fri, 19 Nov 2021 14:23:35 +0800
Subject: [PATCH 05/24] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DallowEdit?=
=?UTF-8?q?=E4=B8=BAfalse=E6=97=B6=EF=BC=8C=E9=BB=8F=E8=B4=B4=E4=BB=8D?=
=?UTF-8?q?=E7=84=B6=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9=E8=A1=A8=E6=A0=BC?=
=?UTF-8?q?=E5=86=85=E5=AE=B9=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/controllers/keyboard.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/controllers/keyboard.js b/src/controllers/keyboard.js
index ce2ac9d..496761a 100644
--- a/src/controllers/keyboard.js
+++ b/src/controllers/keyboard.js
@@ -587,7 +587,7 @@ export function keyboardInitial(){
$("#luckysheet-icon-italic").click();
}
else if (kcode == 86) {//Ctrl + V 粘贴
- if(isEditMode()){//此模式下禁用粘贴
+ if (isEditMode() || Store.allowEdit === false){//此模式下禁用粘贴
return;
}
From 25f743f9702fa930be18815367f710a42eb4c1c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=9C=E7=8C=AB=E5=AD=90neko?= <815743831@qq.com>
Date: Fri, 19 Nov 2021 14:36:12 +0800
Subject: [PATCH 06/24] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DallowEdit?=
=?UTF-8?q?=E4=B8=BAfalse=E6=97=B6=E8=BF=98=E5=85=81=E8=AE=B8=E6=A0=BC?=
=?UTF-8?q?=E5=BC=8F=E5=8C=96=E7=BC=96=E8=BE=91=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/controllers/menuButton.js | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/src/controllers/menuButton.js b/src/controllers/menuButton.js
index 06566f3..5aa8826 100644
--- a/src/controllers/menuButton.js
+++ b/src/controllers/menuButton.js
@@ -119,6 +119,11 @@ const menuButton = {
//格式刷
$("#luckysheet-icon-paintformat").click(function(e){
+ // *如果禁止前台编辑，则中止下一步操作
+ if(Store.allowEdit === false){
+ tooltip.info("", locale().pivotTable.errorNotAllowEdit);
+ return
+ }
e.stopPropagation();
let _locale = locale();
let locale_paint = _locale.paint;
@@ -174,6 +179,11 @@ const menuButton = {
_this.luckysheetPaintSingle = true;
});
$("#luckysheet-icon-paintformat").dblclick(function(){
+ // *如果禁止前台编辑，则中止下一步操作
+ if (Store.allowEdit === false) {
+ tooltip.info("", locale().pivotTable.errorNotAllowEdit);
+ return
+ }
let _locale = locale();
let locale_paint = _locale.paint;
if(Store.luckysheet_select_save == null || Store.luckysheet_select_save.length == 0){
From 723d6bfacc66f937c0c260acab137cf6e13b498f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=9C=E7=8C=AB=E5=AD=90neko?= <815743831@qq.com>
Date: Fri, 19 Nov 2021 14:42:19 +0800
Subject: [PATCH 07/24] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DallowEdit?=
=?UTF-8?q?=E4=B8=BAfalse=E6=97=B6=EF=BC=8C=E4=BA=A4=E6=9B=BF=E9=A2=9C?=
=?UTF-8?q?=E8=89=B2=E5=8F=AF=E4=BB=A5=E8=AE=BE=E7=BD=AE=E7=9A=84=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/controllers/menuButton.js | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/controllers/menuButton.js b/src/controllers/menuButton.js
index 5aa8826..b78c1d7 100644
--- a/src/controllers/menuButton.js
+++ b/src/controllers/menuButton.js
@@ -789,6 +789,11 @@ const menuButton = {
//交替颜色
$menuButton.find(".luckysheet-icon-alternateformat").click(function(){
+ // *如果禁止前台编辑，则中止下一步操作
+ if (Store.allowEdit === false) {
+ tooltip.info("", locale().pivotTable.errorNotAllowEdit);
+ return
+ }
$menuButton.hide();
luckysheetContainerFocus();
From 7b91004a31ce561f1bfd6b2b8f1f58695d8bf241 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=9C=E7=8C=AB=E5=AD=90neko?= <815743831@qq.com>
Date: Fri, 19 Nov 2021 14:57:05 +0800
Subject: [PATCH 08/24] =?UTF-8?q?feat:=20=E5=B0=81=E8=A3=85checkIsAllowEdi?=
=?UTF-8?q?t=E6=96=B9=E6=B3=95=E6=A3=80=E6=9F=A5=E6=98=AF=E5=90=A6?=
=?UTF-8?q?=E5=85=81=E8=AE=B8=E5=89=8D=E5=8F=B0=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/controllers/menuButton.js | 12 +++++++-----
src/global/validate.js | 15 +++++++++++++++
2 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/src/controllers/menuButton.js b/src/controllers/menuButton.js
index b78c1d7..18522a5 100644
--- a/src/controllers/menuButton.js
+++ b/src/controllers/menuButton.js
@@ -16,7 +16,7 @@ import {luckysheetupdateCell} from './updateCell';
import insertFormula from './insertFormula';
import sheetmanage from './sheetmanage';
import luckysheetPostil from './postil';
-import { isRealNum, isRealNull, isEditMode, hasPartMC } from '../global/validate';
+import { isRealNum, isRealNull, isEditMode, hasPartMC, checkIsAllowEdit } from '../global/validate';
import tooltip from '../global/tooltip';
import editor from '../global/editor';
import { genarate, update, is_date } from '../global/format';
@@ -120,7 +120,7 @@ const menuButton = {
//格式刷
$("#luckysheet-icon-paintformat").click(function(e){
// *如果禁止前台编辑，则中止下一步操作
- if(Store.allowEdit === false){
+ if (!checkIsAllowEdit()) {
tooltip.info("", locale().pivotTable.errorNotAllowEdit);
return
}
@@ -180,7 +180,7 @@ const menuButton = {
});
$("#luckysheet-icon-paintformat").dblclick(function(){
// *如果禁止前台编辑，则中止下一步操作
- if (Store.allowEdit === false) {
+ if (!checkIsAllowEdit()) {
tooltip.info("", locale().pivotTable.errorNotAllowEdit);
return
}
@@ -790,7 +790,7 @@ const menuButton = {
//交替颜色
$menuButton.find(".luckysheet-icon-alternateformat").click(function(){
// *如果禁止前台编辑，则中止下一步操作
- if (Store.allowEdit === false) {
+ if (!checkIsAllowEdit()) {
tooltip.info("", locale().pivotTable.errorNotAllowEdit);
return
}
@@ -3143,7 +3143,9 @@ const menuButton = {
return;
}
- if(Store.allowEdit===false){
+ // *如果禁止前台编辑，则中止下一步操作
+ if (!checkIsAllowEdit()) {
+ tooltip.info("", locale().pivotTable.errorNotAllowEdit);
return;
}
diff --git a/src/global/validate.js b/src/global/validate.js
index ddcd559..adbb91f 100644
--- a/src/global/validate.js
+++ b/src/global/validate.js
@@ -76,6 +76,20 @@ function isEditMode() {
}
}
+/**
+ * @description: 检查是否允许前台进行表格编辑
+ * @param {*}
+ * @return {Boolean} true:允许编辑 fasle:不允许
+ */
+function checkIsAllowEdit(){
+ if (Store.allowEdit) {
+ return true;
+ }
+ else {
+ return false;
+ }
+}
+
//范围是否只包含部分合并单元格
function hasPartMC(cfg, r1, r2, c1, c2) {
let hasPartMC = false;
@@ -200,6 +214,7 @@ export {
valueIsError,
hasChinaword,
isEditMode,
+ checkIsAllowEdit,
hasPartMC,
checkWordByteLength
}
\ No newline at end of file
From bf47a7f6201d2c483fd26b4bcb60163d686f17a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=9C=E7=8C=AB=E5=AD=90neko?= <815743831@qq.com>
Date: Fri, 19 Nov 2021 15:03:28 +0800
Subject: [PATCH 09/24] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3allowEdit?=
=?UTF-8?q?=E4=B8=BAfalse=E6=97=B6=E4=BB=8D=E7=84=B6=E5=85=81=E8=AE=B8?=
=?UTF-8?q?=E8=BF=9B=E8=A1=8C=E8=BE=B9=E6=A1=86=E7=BC=96=E8=BE=91=E7=9A=84?=
=?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/controllers/menuButton.js | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/controllers/menuButton.js b/src/controllers/menuButton.js
index 18522a5..aabc918 100644
--- a/src/controllers/menuButton.js
+++ b/src/controllers/menuButton.js
@@ -942,7 +942,11 @@ const menuButton = {
//边框设置
$("#luckysheet-icon-border-all").click(function(){
-
+ // *如果禁止前台编辑，则中止下一步操作
+ if (!checkIsAllowEdit()) {
+ tooltip.info("", locale().pivotTable.errorNotAllowEdit);
+ return
+ }
if(!checkProtectionFormatCells(Store.currentSheetIndex)){
return;
}
@@ -1100,6 +1104,11 @@ const menuButton = {
// border choose menu
$menuButton.find(".luckysheet-cols-menuitem").click(function(){
+ // *如果禁止前台编辑，则中止下一步操作
+ if (!checkIsAllowEdit()) {
+ tooltip.info("", locale().pivotTable.errorNotAllowEdit);
+ return
+ }
$menuButton.hide();
luckysheetContainerFocus();
From a52626a7c56a05406ce88ef577d51f1b4dcba2ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=9C=E7=8C=AB=E5=AD=90neko?= <815743831@qq.com>
Date: Fri, 19 Nov 2021 15:06:04 +0800
Subject: [PATCH 10/24] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3allowEdit?=
=?UTF-8?q?=E4=B8=BAfalse=E6=97=B6=E4=BB=8D=E7=84=B6=E5=8F=AF=E4=BB=A5?=
=?UTF-8?q?=E8=BF=9B=E8=A1=8C=E5=8D=95=E5=85=83=E6=A0=BC=E5=90=88=E5=B9=B6?=
=?UTF-8?q?=E6=8B=86=E5=88=86=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/controllers/menuButton.js | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/controllers/menuButton.js b/src/controllers/menuButton.js
index aabc918..018a71f 100644
--- a/src/controllers/menuButton.js
+++ b/src/controllers/menuButton.js
@@ -1250,7 +1250,6 @@ const menuButton = {
//合并单元格
$("#luckysheet-icon-merge-button").click(function(){
-
if(!checkProtectionNotEnable(Store.currentSheetIndex)){
return;
}
@@ -3201,6 +3200,11 @@ const menuButton = {
jfrefreshgrid(d, Store.luckysheet_select_save, allParam, false);
},
updateFormat_mc: function(d, foucsStatus){
+ // *如果禁止前台编辑，则中止下一步操作
+ if (!checkIsAllowEdit()) {
+ tooltip.info("", locale().pivotTable.errorNotAllowEdit);
+ return
+ }
let cfg = $.extend(true, {}, Store.config);
if(cfg["merge"] == null){
cfg["merge"] = {};
From 76194a38c040e8fe30343377dbaead97b5ef3114 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=9C=E7=8C=AB=E5=AD=90neko?= <815743831@qq.com>
Date: Fri, 19 Nov 2021 15:10:29 +0800
Subject: [PATCH 11/24] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3allowEdit?=
=?UTF-8?q?=E4=B8=BAfalse=E6=97=B6=E5=85=81=E8=AE=B8=E4=B8=8A=E4=BC=A0?=
=?UTF-8?q?=E5=9B=BE=E7=89=87=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/controllers/handler.js | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/controllers/handler.js b/src/controllers/handler.js
index 770df04..fadf2e7 100644
--- a/src/controllers/handler.js
+++ b/src/controllers/handler.js
@@ -45,7 +45,7 @@ import {
mouseposition
} from '../global/location';
import { rowlenByRange } from '../global/getRowlen';
-import { isRealNull, hasPartMC, isEditMode } from '../global/validate';
+import { isRealNull, hasPartMC, isEditMode, checkIsAllowEdit } from '../global/validate';
import { countfunc } from '../global/count';
import browser from '../global/browser';
import formula from '../global/formula';
@@ -4863,6 +4863,11 @@ export default function luckysheetHandler() {
//菜单栏 插入图片按钮
$("#luckysheet-insertImg-btn-title").click(function () {
+ // *如果禁止前台编辑，则中止下一步操作
+ if (!checkIsAllowEdit()) {
+ tooltip.info("", locale().pivotTable.errorNotAllowEdit);
+ return
+ }
if(!checkProtectionAuthorityNormal(Store.currentSheetIndex, "editObjects")){
return;
}
From 4636926fd8f76d98fc0ba98fe16179f74b1e7343 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=9C=E7=8C=AB=E5=AD=90neko?= <815743831@qq.com>
Date: Fri, 19 Nov 2021 15:42:39 +0800
Subject: [PATCH 12/24] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DallowEdit?=
=?UTF-8?q?=E4=B8=BAfalse=E6=97=B6=E4=BB=8D=E7=84=B6=E5=85=81=E8=AE=B8?=
=?UTF-8?q?=E6=8F=92=E5=85=A5=E8=B6=85=E9=93=BE=E6=8E=A5=E7=9A=84=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/controllers/handler.js | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/controllers/handler.js b/src/controllers/handler.js
index fadf2e7..c6bb6b6 100644
--- a/src/controllers/handler.js
+++ b/src/controllers/handler.js
@@ -4893,6 +4893,11 @@ export default function luckysheetHandler() {
//菜单栏 插入链接按钮
$("#luckysheet-insertLink-btn-title").click(function () {
+ // *如果禁止前台编辑，则中止下一步操作
+ if (!checkIsAllowEdit()) {
+ tooltip.info("", locale().pivotTable.errorNotAllowEdit);
+ return
+ }
if(!checkProtectionNotEnable(Store.currentSheetIndex)){
return;
}
From a4556f7e7b3f909cf0484b8138640974b5b87abd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=9C=E7=8C=AB=E5=AD=90neko?= <815743831@qq.com>
Date: Fri, 19 Nov 2021 16:00:39 +0800
Subject: [PATCH 13/24] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DallowEdit?=
=?UTF-8?q?=E4=B8=BAfalse=E6=97=B6=EF=BC=8C=E5=8F=AF=E4=BB=A5=E5=B1=95?=
=?UTF-8?q?=E5=BC=80=E8=A1=8C=E5=88=97=E7=9A=84=E5=8F=B3=E9=94=AE=E8=8F=9C?=
=?UTF-8?q?=E5=8D=95=E5=B9=B6=E4=B8=94=E8=BF=9B=E8=A1=8C=E6=93=8D=E4=BD=9C?=
=?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/controllers/rowColumnOperation.js | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/src/controllers/rowColumnOperation.js b/src/controllers/rowColumnOperation.js
index d881ae4..c091f69 100644
--- a/src/controllers/rowColumnOperation.js
+++ b/src/controllers/rowColumnOperation.js
@@ -21,7 +21,7 @@ import {
colLocationByIndex,
mouseposition
} from '../global/location';
-import { isRealNull, isRealNum, hasPartMC, isEditMode } from '../global/validate';
+import { isRealNull, isRealNum, hasPartMC, isEditMode, checkIsAllowEdit } from '../global/validate';
import { countfunc } from '../global/count';
import formula from '../global/formula';
import { luckysheetextendtable, luckysheetdeletetable, luckysheetDeleteCell } from '../global/extend';
@@ -381,6 +381,10 @@ export function rowColumnOperationInitial(){
$("#luckysheet-rows-change-size").css("opacity", 0);
}).mouseup(function (event) {
if (event.which == 3) {
+ // *如果禁止前台编辑，则中止下一步操作
+ if (!checkIsAllowEdit()) {
+ return
+ }
if(isEditMode()){ //非编辑模式下禁止右键功能框
return;
}
@@ -815,6 +819,10 @@ export function rowColumnOperationInitial(){
$("#luckysheet-cols-change-size").css("opacity", 0);
}).mouseup(function (event) {
if (event.which == 3) {
+ // *如果禁止前台编辑，则中止下一步操作
+ if (!checkIsAllowEdit()) {
+ return
+ }
if(isEditMode()){ //非编辑模式下禁止右键功能框
return;
}
@@ -996,6 +1004,11 @@ export function rowColumnOperationInitial(){
// 列标题的下拉箭头
$("#luckysheet-cols-menu-btn").click(function (event) {
+ // *如果禁止前台编辑，则中止下一步操作
+ if (!checkIsAllowEdit()) {
+ tooltip.info("", locale().pivotTable.errorNotAllowEdit);
+ return
+ }
let $menu = $("#luckysheet-rightclick-menu");
let offset = $(this).offset();
$("#luckysheet-cols-rows-shift").show();
From 26bef655c0946bba44201e0ff0c9897c3de2ca73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=9C=E7=8C=AB=E5=AD=90neko?= <815743831@qq.com>
Date: Fri, 19 Nov 2021 16:02:29 +0800
Subject: [PATCH 14/24] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9C=A8?=
=?UTF-8?q?=E7=A6=81=E6=AD=A2=E7=BC=96=E8=BE=91=E4=B8=8B=EF=BC=8C=E4=BB=8D?=
=?UTF-8?q?=E7=84=B6=E5=8F=AF=E4=BB=A5=E6=8B=96=E5=8A=A8=E8=A1=8C=E9=AB=98?=
=?UTF-8?q?=E5=88=97=E5=AE=BD=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/controllers/rowColumnOperation.js | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/controllers/rowColumnOperation.js b/src/controllers/rowColumnOperation.js
index c091f69..59c4af5 100644
--- a/src/controllers/rowColumnOperation.js
+++ b/src/controllers/rowColumnOperation.js
@@ -912,6 +912,10 @@ export function rowColumnOperationInitial(){
//表格行标题 改变行高按钮
$("#luckysheet-rows-change-size").mousedown(function (event) {
+ // *如果禁止前台编辑，则中止下一步操作
+ if (!checkIsAllowEdit()) {
+ return
+ }
//有批注在编辑时
luckysheetPostil.removeActivePs();
@@ -956,6 +960,10 @@ export function rowColumnOperationInitial(){
//表格列标题 改变列宽按钮
$("#luckysheet-cols-change-size").mousedown(function (event) {
+ // *如果禁止前台编辑，则中止下一步操作
+ if (!checkIsAllowEdit()) {
+ return
+ }
//有批注在编辑时
luckysheetPostil.removeActivePs();
From 035ebe51c394089db19401f68ddb3a7b8e1b02c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=9C=E7=8C=AB=E5=AD=90neko?= <815743831@qq.com>
Date: Fri, 19 Nov 2021 17:51:52 +0800
Subject: [PATCH 15/24] =?UTF-8?q?fix:=20=E5=AF=B9=E7=AC=AC=E8=A1=A8?=
=?UTF-8?q?=E6=A0=BC=E4=B8=80=E5=88=97=E7=9A=84=E5=B7=A6=E4=BE=A7=E6=B7=BB?=
=?UTF-8?q?=E5=8A=A0=E5=88=97=E6=97=B6=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=87=BA?=
=?UTF-8?q?=E6=9D=A5=E7=9A=84=E5=88=97=E6=95=B0=E6=8D=AE=E4=BC=9A=E5=90=8C?=
=?UTF-8?q?=E6=AD=A5=E7=9A=84=E9=97=AE=E9=A2=98.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/global/extend.js | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/global/extend.js b/src/global/extend.js
index ad8f182..f45277c 100644
--- a/src/global/extend.js
+++ b/src/global/extend.js
@@ -638,8 +638,9 @@ function luckysheetextendtable(type, index, value, direction, sheetIndex) {
let row = [],
curRow = [...d][index]
for(let c = 0; c < d[0].length; c++){
+ // *这个地方的Store.defaultCell不能使用引用.
let cell = curRow[c],
- templateCell = cell ? {...cell, v: '', m: ''} : Store.defaultCell;
+ templateCell = cell ? { ...cell, v: '', m: '' } : JSON.parse(JSON.stringify(Store.defaultCell));
delete templateCell.ps;
row.push(templateCell);
}
@@ -812,8 +813,9 @@ function luckysheetextendtable(type, index, value, direction, sheetIndex) {
let col = [],
curd= [...d];
for(let r = 0; r < d.length; r++){
+ // *这个地方的Store.defaultCell不能使用引用.
let cell = curd[r][index],
- templateCell = cell ? {...cell, v: '', m: ''} : Store.defaultCell;
+ templateCell = cell ? { ...cell, v: '', m: '' } : JSON.parse(JSON.stringify(Store.defaultCell));
delete templateCell.ps;
col.push(templateCell);
}
From 9132ef54afba7ef0d49a020b347fd4e8e8922ba7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=9C=E7=8C=AB=E5=AD=90neko?= <815743831@qq.com>
Date: Mon, 22 Nov 2021 15:29:24 +0800
Subject: [PATCH 16/24] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8F=B3?=
=?UTF-8?q?=E9=94=AE=E6=B7=BB=E5=8A=A0=E5=A4=9A=E5=88=97=E6=97=B6=EF=BC=8C?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=87=BA=E6=9D=A5=E7=9A=84cell=E5=8D=95?=
=?UTF-8?q?=E5=85=83=E6=A0=BC=E6=95=B0=E6=8D=AE=E4=BC=9A=E5=90=8C=E6=AD=A5?=
=?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/global/extend.js | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/global/extend.js b/src/global/extend.js
index ad8f182..6faccf0 100644
--- a/src/global/extend.js
+++ b/src/global/extend.js
@@ -917,16 +917,18 @@ function luckysheetextendtable(type, index, value, direction, sheetIndex) {
let row = d[r];
for(let i = 0; i < value; i++){
+ // *这里不能是引用,不然添加多列时添加的都是同一个引用,修改一个cell会同步到多个
+ const COLR = JSON.parse(JSON.stringify(col[r]))
if(direction == "lefttop"){
if(index == 0){
- row.unshift(col[r]);
+ row.unshift(COLR);
}
else{
- row.splice(index, 0, col[r]);
+ row.splice(index, 0, COLR);
}
}
else{
- row.splice((index + 1), 0, col[r]);
+ row.splice((index + 1), 0, COLR);
}
}
}
From b0a17b7f2d7b69584422e016db2d626482de3510 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=9C=E7=8C=AB=E5=AD=90neko?= <815743831@qq.com>
Date: Thu, 25 Nov 2021 11:07:47 +0800
Subject: [PATCH 17/24] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8D=8F?=
=?UTF-8?q?=E5=90=8C=E7=BC=96=E8=BE=91=E4=B8=8B=E7=9A=84=E6=8F=92=E5=85=A5?=
=?UTF-8?q?=E8=B6=85=E9=93=BE=E6=8E=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/controllers/hyperlinkCtrl.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/controllers/hyperlinkCtrl.js b/src/controllers/hyperlinkCtrl.js
index d02a29f..906d997 100644
--- a/src/controllers/hyperlinkCtrl.js
+++ b/src/controllers/hyperlinkCtrl.js
@@ -353,7 +353,7 @@ const hyperlinkCtrl = {
//共享编辑模式
if(server.allowUpdate){
server.saveParam("all", sheetIndex, currentHyperlink, { "k": "hyperlink" });
- server.historyParam(Store.flowdata, sheetIndex, range);
+ server.historyParam(Store.flowdata, sheetIndex, range[0]);
}
setTimeout(function () {
From efe7261df6749821ec66645544031d2ad8bb2ff7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=9C=E7=8C=AB=E5=AD=90neko?= <815743831@qq.com>
Date: Fri, 26 Nov 2021 16:53:29 +0800
Subject: [PATCH 18/24] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8D=8F?=
=?UTF-8?q?=E5=90=8C=E7=BC=96=E8=BE=91=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C?=
=?UTF-8?q?=E4=BB=96=E4=BA=BA=E6=AD=A3=E5=9C=A8=E7=BC=96=E8=BE=91=E6=97=B6?=
=?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=A1=8C=E9=AB=98=E5=88=97=E5=AE=BD?=
=?UTF-8?q?=E5=92=8C=E6=B7=BB=E5=8A=A0=E8=A1=8C=E5=88=97=E6=8A=A5=E9=94=99?=
=?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/controllers/server.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/controllers/server.js b/src/controllers/server.js
index 29897e5..cf16ce9 100644
--- a/src/controllers/server.js
+++ b/src/controllers/server.js
@@ -255,7 +255,7 @@ const server = {
if(flag) {
Store.cooperativeEdit.changeCollaborationSize.forEach(val => {
if(val.id == id) {
- val.v = item.v[0]
+ val.v = item.v[0] || item.range[0]
val.i = index
}
})
From b19d87775c4c53eadf59cef3baef6294178a2dd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=9C=E7=8C=AB=E5=AD=90neko?= <815743831@qq.com>
Date: Fri, 26 Nov 2021 17:01:54 +0800
Subject: [PATCH 19/24] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9C=A8?=
=?UTF-8?q?=E5=90=88=E5=B9=B6=E5=8D=95=E5=85=83=E6=A0=BC=E5=86=85=E5=8F=B3?=
=?UTF-8?q?=E9=94=AE=E6=B7=BB=E5=8A=A0=E8=A1=8C=E5=88=97=E6=8A=A5=E9=94=99?=
=?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/global/extend.js | 28 ++++++++++------------------
1 file changed, 10 insertions(+), 18 deletions(-)
diff --git a/src/global/extend.js b/src/global/extend.js
index f45277c..bf69544 100644
--- a/src/global/extend.js
+++ b/src/global/extend.js
@@ -634,16 +634,12 @@ function luckysheetextendtable(type, index, value, direction, sheetIndex) {
cfg["rowhidden"] = rowhidden_new;
}
- //空行模板
- let row = [],
- curRow = [...d][index]
- for(let c = 0; c < d[0].length; c++){
- // *这个地方的Store.defaultCell不能使用引用.
- let cell = curRow[c],
- templateCell = cell ? { ...cell, v: '', m: '' } : JSON.parse(JSON.stringify(Store.defaultCell));
- delete templateCell.ps;
- row.push(templateCell);
+ // *添加空行模板这里请保持为push null;
+ let row = [];
+ for (let c = 0; c < d[0].length; c++) {
+ row.push(null);
}
+
var cellBorderConfig = [];
//边框
if(cfg["borderInfo"] && cfg["borderInfo"].length > 0){
@@ -809,16 +805,12 @@ function luckysheetextendtable(type, index, value, direction, sheetIndex) {
cfg["colhidden"] = colhidden_new;
}
- //空列模板
- let col = [],
- curd= [...d];
- for(let r = 0; r < d.length; r++){
- // *这个地方的Store.defaultCell不能使用引用.
- let cell = curd[r][index],
- templateCell = cell ? { ...cell, v: '', m: '' } : JSON.parse(JSON.stringify(Store.defaultCell));
- delete templateCell.ps;
- col.push(templateCell);
+ // *添加空列模板这里请保持为push null;
+ let col = [];
+ for (let r = 0; r < d.length; r++) {
+ col.push(null);
}
+
var cellBorderConfig = [];
//边框
if(cfg["borderInfo"] && cfg["borderInfo"].length > 0){
From 3421f678db6c3a69d712270c0f3bc960c1a65171 Mon Sep 17 00:00:00 2001
From: cdswyda
Date: Wed, 1 Dec 2021 16:59:59 +0800
Subject: [PATCH 20/24] =?UTF-8?q?fix(freezen):=20=E4=BF=AE=E5=A4=8DPR#843?=
=?UTF-8?q?=E4=B8=AD=E4=BF=AE=E6=94=B9=E9=81=97=E6=BC=8F=E5=A4=84=E7=90=86?=
=?UTF-8?q?=E5=86=BB=E7=BB=93=E5=88=B0=E9=80=89=E5=8C=BA=E7=9A=84=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
补充处理冻结行到选区、冻结列到选区、冻结行列到选区
---
src/controllers/menuButton.js | 47 +++++++++++++++++++++++++----------
1 file changed, 34 insertions(+), 13 deletions(-)
diff --git a/src/controllers/menuButton.js b/src/controllers/menuButton.js
index 06566f3..ed0c298 100644
--- a/src/controllers/menuButton.js
+++ b/src/controllers/menuButton.js
@@ -1739,9 +1739,14 @@ const menuButton = {
if(row_st == -1){
row_st = 0;
}
-
- let top = Store.visibledatarow[row_st] - 2 - scrollTop + Store.columnHeaderHeight;
- let freezenhorizontaldata = [Store.visibledatarow[row_st], row_st + 1, scrollTop, luckysheetFreezen.cutVolumn(Store.visibledatarow, row_st + 1), top];
+ let top,freezenhorizontaldata;
+ if (luckysheetFreezen.freezenRealFirstRowColumn) {
+ top = Store.visibledatarow[row_st] - 2 + Store.columnHeaderHeight;
+ freezenhorizontaldata = [Store.visibledatarow[row_st], row_st + 1, 0, luckysheetFreezen.cutVolumn(Store.visibledatarow, row_st + 1), top];
+ } else {
+ top = Store.visibledatarow[row_st] - 2 - scrollTop + Store.columnHeaderHeight;
+ freezenhorizontaldata = [Store.visibledatarow[row_st], row_st + 1, scrollTop, luckysheetFreezen.cutVolumn(Store.visibledatarow, row_st + 1), top];
+ }
luckysheetFreezen.saveFreezen(freezenhorizontaldata, top, null, null);
if (luckysheetFreezen.freezenverticaldata != null) {
@@ -1783,9 +1788,14 @@ const menuButton = {
if(col_st == -1){
col_st = 0;
}
-
- let left = Store.visibledatacolumn[col_st] - 2 - scrollLeft + Store.rowHeaderWidth;
- let freezenverticaldata = [Store.visibledatacolumn[col_st], col_st + 1, scrollLeft, luckysheetFreezen.cutVolumn(Store.visibledatacolumn, col_st + 1), left];
+ let left,freezenverticaldata;
+ if (luckysheetFreezen.freezenRealFirstRowColumn) {
+ left = Store.visibledatacolumn[col_st] - 2 + Store.rowHeaderWidth;
+ freezenverticaldata = [Store.visibledatacolumn[col_st], col_st + 1, 0, luckysheetFreezen.cutVolumn(Store.visibledatacolumn, col_st + 1), left];
+ } else {
+ left = Store.visibledatacolumn[col_st] - 2 - scrollLeft + Store.rowHeaderWidth;
+ freezenverticaldata = [Store.visibledatacolumn[col_st], col_st + 1, scrollLeft, luckysheetFreezen.cutVolumn(Store.visibledatacolumn, col_st + 1), left];
+ }
luckysheetFreezen.saveFreezen(null, null, freezenverticaldata, left);
if (luckysheetFreezen.freezenhorizontaldata != null) {
@@ -1830,10 +1840,16 @@ const menuButton = {
if(row_st == -1){
row_st = 0;
}
-
- let top = Store.visibledatarow[row_st] - 2 - scrollTop + Store.columnHeaderHeight;
- let freezenhorizontaldata = [Store.visibledatarow[row_st], row_st + 1, scrollTop, luckysheetFreezen.cutVolumn(Store.visibledatarow, row_st + 1), top];
- luckysheetFreezen.saveFreezen(freezenhorizontaldata, top, null, null);
+ let top,freezenhorizontaldata;
+ if (luckysheetFreezen.freezenRealFirstRowColumn) {
+ top = Store.visibledatarow[row_st] - 2 + Store.columnHeaderHeight;
+ freezenhorizontaldata = [Store.visibledatarow[row_st], row_st + 1, 0, luckysheetFreezen.cutVolumn(Store.visibledatarow, row_st + 1), top];
+ luckysheetFreezen.saveFreezen(freezenhorizontaldata, top, null, null);
+ } else {
+ top = Store.visibledatarow[row_st] - 2 - scrollTop + Store.columnHeaderHeight;
+ freezenhorizontaldata = [Store.visibledatarow[row_st], row_st + 1, scrollTop, luckysheetFreezen.cutVolumn(Store.visibledatarow, row_st + 1), top];
+ luckysheetFreezen.saveFreezen(freezenhorizontaldata, top, null, null);
+ }
luckysheetFreezen.createFreezenHorizontal(freezenhorizontaldata, top);
@@ -1849,9 +1865,14 @@ const menuButton = {
if(col_st == -1){
col_st = 0;
}
-
- let left = Store.visibledatacolumn[col_st] - 2 - scrollLeft + Store.rowHeaderWidth;
- let freezenverticaldata = [Store.visibledatacolumn[col_st], col_st + 1, scrollLeft, luckysheetFreezen.cutVolumn(Store.visibledatacolumn, col_st + 1), left];
+ let left,freezenverticaldata;
+ if (luckysheetFreezen.freezenRealFirstRowColumn) {
+ left = Store.visibledatacolumn[col_st] - 2 + Store.rowHeaderWidth;
+ freezenverticaldata = [Store.visibledatacolumn[col_st], col_st + 1, 0, luckysheetFreezen.cutVolumn(Store.visibledatacolumn, col_st + 1), left];
+ } else {
+ left = Store.visibledatacolumn[col_st] - 2 - scrollLeft + Store.rowHeaderWidth;
+ freezenverticaldata = [Store.visibledatacolumn[col_st], col_st + 1, scrollLeft, luckysheetFreezen.cutVolumn(Store.visibledatacolumn, col_st + 1), left];
+ }
luckysheetFreezen.saveFreezen(null, null, freezenverticaldata, left);
luckysheetFreezen.createFreezenVertical(freezenverticaldata, left);
From 9eac6a9c93faaf16015fc0dcb753c9f7ed7736ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=9C=E7=8C=AB=E5=AD=90neko?= <815743831@qq.com>
Date: Fri, 3 Dec 2021 15:38:42 +0800
Subject: [PATCH 21/24] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=BD=93?=
=?UTF-8?q?=E5=90=88=E5=B9=B6=E5=8D=95=E5=85=83=E6=A0=BC=E5=8F=AA=E6=9C=89?=
=?UTF-8?q?=E4=B8=80=E8=A1=8C=E9=AB=98=E6=97=B6=EF=BC=8C=E5=90=91=E4=B8=8B?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A1=8C=E4=BC=9A=E8=AE=A9=E8=BF=99=E4=B8=AA?=
=?UTF-8?q?=E5=90=88=E5=B9=B6=E5=8D=95=E5=85=83=E6=A0=BC=E5=8A=A0=E9=AB=98?=
=?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/global/extend.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/global/extend.js b/src/global/extend.js
index bf69544..f8829f9 100644
--- a/src/global/extend.js
+++ b/src/global/extend.js
@@ -55,7 +55,8 @@ function luckysheetextendtable(type, index, value, direction, sheetIndex) {
if(index < r){
merge_new[(r + value) + "_" + c] = { "r": r + value, "c": c, "rs": rs, "cs": cs };
}
- else if(index == r){
+ // *这里要判断一下rs是否等于1,因为如果这个合并单元格的行数只有一行时r = r+ rs-1,这种情况不应该进行单元格的加高
+ else if (index == r && rs != 1) {
if(direction == "lefttop"){
merge_new[(r + value) + "_" + c] = { "r": r + value, "c": c, "rs": rs, "cs": cs };
}
From d3cdef4269a0a3d935a76d1b00ca7083201fb877 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=9C=E7=8C=AB=E5=AD=90neko?= <815743831@qq.com>
Date: Fri, 3 Dec 2021 15:42:08 +0800
Subject: [PATCH 22/24] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=BD=93?=
=?UTF-8?q?=E5=90=88=E5=B9=B6=E5=8D=95=E5=85=83=E6=A0=BC=E5=8F=AA=E6=9C=89?=
=?UTF-8?q?=E4=B8=80=E5=88=97=E5=AE=BD=E6=97=B6,=E5=9C=A8=E5=90=88?=
=?UTF-8?q?=E5=B9=B6=E5=8D=95=E5=85=83=E6=A0=BC=E5=86=85=E5=90=91=E5=8F=B3?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=97=E4=BC=9A=E5=AF=BC=E8=87=B4=E8=BF=99?=
=?UTF-8?q?=E4=B8=AA=E5=90=88=E5=B9=B6=E5=8D=95=E5=85=83=E6=A0=BC=E5=8A=A0?=
=?UTF-8?q?=E5=AE=BD=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/global/extend.js | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/global/extend.js b/src/global/extend.js
index f8829f9..163c04a 100644
--- a/src/global/extend.js
+++ b/src/global/extend.js
@@ -96,7 +96,12 @@ function luckysheetextendtable(type, index, value, direction, sheetIndex) {
}
else if(index == c + cs - 1){
if(direction == "lefttop"){
- merge_new[r + "_" + c] = { "r": r, "c": c, "rs": rs, "cs": cs + value };
+ // *这是要判断一下这个合并单元格的列宽是否=1,如果cs等于1的情况下,向左插入列，这个合并单元格会右移
+ if(cs == 1){
+ merge_new[r + "_" + (c + value)] = { "r": r, "c": c + value, "rs": rs, "cs": cs };
+ } else {
+ merge_new[r + "_" + c] = { "r": r, "c": c, "rs": rs, "cs": cs + value };
+ }
}
else{
merge_new[r + "_" + c] = { "r": r, "c": c, "rs": rs, "cs": cs };
From d8b4e7b269595c57a87280596ea5d18620a6e7f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=9C=E7=8C=AB=E5=AD=90neko?= <815743831@qq.com>
Date: Fri, 3 Dec 2021 15:48:33 +0800
Subject: [PATCH 23/24] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9C=A8?=
=?UTF-8?q?=E5=8F=AA=E6=9C=89=E4=B8=80=E5=88=97=E7=9A=84=E5=90=88=E5=B9=B6?=
=?UTF-8?q?=E5=8D=95=E5=85=83=E6=A0=BC=E5=86=85=E5=90=91=E5=B7=A6=E6=8F=92?=
=?UTF-8?q?=E5=85=A5=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/global/extend.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/global/extend.js b/src/global/extend.js
index 163c04a..4338539 100644
--- a/src/global/extend.js
+++ b/src/global/extend.js
@@ -83,7 +83,7 @@ function luckysheetextendtable(type, index, value, direction, sheetIndex) {
if(index < c){
merge_new[r + "_" + (c + value)] = { "r": r, "c": c + value, "rs": rs, "cs": cs };
}
- else if(index == c){
+ else if(index == c && cs != 1){
if(direction == "lefttop"){
merge_new[r + "_" + (c + value)] = { "r": r, "c": c + value, "rs": rs, "cs": cs };
}
From 7659707bc99c10431327db280a45d13ec2d4741e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=9C=E7=8C=AB=E5=AD=90neko?= <815743831@qq.com>
Date: Fri, 3 Dec 2021 15:50:27 +0800
Subject: [PATCH 24/24] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9C=A8?=
=?UTF-8?q?=E5=8F=AA=E6=9C=89=E4=B8=80=E8=A1=8C=E7=9A=84=E5=90=88=E5=B9=B6?=
=?UTF-8?q?=E5=8D=95=E5=85=83=E6=A0=BC=E5=86=85=E5=90=91=E4=B8=8A=E6=8F=92?=
=?UTF-8?q?=E5=85=A5=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/global/extend.js | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/global/extend.js b/src/global/extend.js
index 4338539..142faf5 100644
--- a/src/global/extend.js
+++ b/src/global/extend.js
@@ -69,7 +69,11 @@ function luckysheetextendtable(type, index, value, direction, sheetIndex) {
}
else if(index == r + rs - 1){
if(direction == "lefttop"){
- merge_new[r + "_" + c] = { "r": r, "c": c, "rs": rs + value, "cs": cs };
+ if(rs == 1){
+ merge_new[(r + value) + "_" + c] = { "r": r + value, "c": c, "rs": rs, "cs": cs };
+ } else {
+ merge_new[r + "_" + c] = { "r": r, "c": c, "rs": rs + value, "cs": cs };
+ }
}
else{
merge_new[r + "_" + c] = { "r": r, "c": c, "rs": rs, "cs": cs };