Merge branch 'master' of https://github.com/mengshukeji/Luckysheet

docs/guide/api.md

@@ -1220,7 +1220,7 @@ Use note:
 					}
 				]
 			]
-		luckysheet.setRangeValue(data)
+		luckysheet.setRangeValue(data,{range:"A1:B2"})
 		```
 
 ------------

docs/zh/guide/README.md

@@ -10,7 +10,7 @@ Luckysheet ，一款纯前端类似excel的在线表格，功能强大、配置
 
 ## 在线案例
 
-- [协同编辑Demo](http://luckysheet.lashuju.com/demo/)（注意：官方Java后台待整理后也会开源，采用OT算法。请大家别操作频繁，防止搞崩服务器）
+- [协同编辑Demo](http://luckysheet.lashuju.com/demo/)
 
 ## 特性
 

docs/zh/guide/api.md

@@ -1201,7 +1201,7 @@ Luckysheet针对常用的数据操作需求，开放了主要功能的API，开
 					}
 				]
 			]
-		luckysheet.setRangeValue(data)
+		luckysheet.setRangeValue(data,{range:"A1:B2"})
 		```
 
 ------------

package.json

@@ -1,6 +1,6 @@
 {
   "name": "luckysheet",
-  "version": "2.1.10",
+  "version": "2.1.11",
   "main": "dist/luckysheet.cjs.js",
   "module": "dist/luckysheet.esm.js",
   "browser": "dist/luckysheet.umd.js",

src/controllers/sheetmanage.js

@@ -1135,7 +1135,8 @@ const sheetmanage = {
             server.multipleIndex = 0;
         }
         
-
+        // 钩子函数
+        method.createHookFunction('sheetActivate', index, isPivotInitial, isNewSheet);
 
         $('#luckysheet-filter-selected-sheet' + Store.currentSheetIndex + ', #luckysheet-filter-options-sheet' + Store.currentSheetIndex).hide();
         $('#luckysheet-filter-selected-sheet' + index + ', #luckysheet-filter-options-sheet' + index).show();
@@ -1454,8 +1455,6 @@ const sheetmanage = {
         return null;
     },
     changeSheetExec: function(index, isPivotInitial, isNewSheet) {
-        // 钩子函数
-        method.createHookFunction('sheetActivate', index, isPivotInitial, isNewSheet);
         
         let $sheet = $("#luckysheet-sheets-item" + index);
 

src/global/api.js

@@ -2204,7 +2204,7 @@ export function getRangeArray(dimensional, options = {}) {
  * @param {Number} options.order 工作表索引；默认值为当前工作表索引
  */
 export function getRangeJson(isFirstRowTitle, options = {}) {
-    let curRange = Store.luckysheet_select_save;
+    let curRange = Store.luckysheet_select_save[0];
     let curSheetOrder = getSheetIndex(Store.currentSheetIndex);
     let {
         range = curRange,
@@ -2229,10 +2229,10 @@ export function getRangeJson(isFirstRowTitle, options = {}) {
     //复制范围内包含部分合并单元格，提示
     if(config["merge"] != null) {
         let has_PartMC = false;
-        let r1 = range[0].row[0],
-        r2 = range[0].row[1],
-        c1 = range[0].column[0],
-        c2 = range[0].column[1];
+        let r1 = range.row[0],
+        r2 = range.row[1],
+        c1 = range.column[0],
+        c2 = range.column[1];
         has_PartMC = hasPartMC(config, r1, r2, c1, c2);
 
         if(has_PartMC){
@@ -2270,7 +2270,7 @@ export function getRangeJson(isFirstRowTitle, options = {}) {
             }
         }
     } else {
-        let st = range[0]["column"][0];
+        let st = range["column"][0];
         for (let r = 0; r < getdata.length; r++) {
             let obj = {};
             for (let c = 0; c < getdata[0].length; c++) {
@@ -2279,7 +2279,8 @@ export function getRangeJson(isFirstRowTitle, options = {}) {
             arr.push(obj);
         }
     }
-    selection.copybyformat(new Event(), JSON.stringify(arr));
+    // selection.copybyformat(new Event('click'), JSON.stringify(arr));
+    return arr;
 }
 
 /**

src/index.html

@@ -136,7 +136,7 @@
 							// console.info('cellUpdated',r,c,oldValue, newValue, isRefresh)
 						},
 						sheetActivate:function(index, isPivotInitial, isNewSheet){
-							console.info('sheetActive-----',index, isPivotInitial, isNewSheet)
+							// console.info(index, isPivotInitial, isNewSheet)
 						},
 						rangeSelect:function(index, sheet){
 							// console.info(index, sheet)