' +
'
' +
'
' +
@@ -507,10 +513,10 @@ const luckysheetPostil = {
let toX = col;
let toY = row_pre;
- let left = postil["left"] == null ? toX + 18 : postil["left"];
- let top = postil["top"] == null ? toY - 18 : postil["top"];
- let width = postil["width"] == null ? _this.defaultWidth : postil["width"];
- let height = postil["height"] == null ? _this.defaultHeight : postil["height"];
+ let left = postil["left"] == null ? toX + 18 * Store.zoomRatio : postil["left"] * Store.zoomRatio;
+ let top = postil["top"] == null ? toY - 18 * Store.zoomRatio : postil["top"] * Store.zoomRatio;
+ let width = postil["width"] == null ? _this.defaultWidth * Store.zoomRatio : postil["width"] * Store.zoomRatio;
+ let height = postil["height"] == null ? _this.defaultHeight * Store.zoomRatio : postil["height"] * Store.zoomRatio;
let value = postil["value"] == null ? "" : postil["value"];
if(top < 0){
@@ -609,10 +615,10 @@ const luckysheetPostil = {
let toX = col;
let toY = row_pre;
- let left = postil["left"] == null ? toX + 18 : postil["left"];
- let top = postil["top"] == null ? toY - 18 : postil["top"];
- let width = postil["width"] == null ? _this.defaultWidth : postil["width"];
- let height = postil["height"] == null ? _this.defaultHeight : postil["height"];
+ let left = postil["left"] == null ? toX + 18 * Store.zoomRatio : postil["left"] * Store.zoomRatio;
+ let top = postil["top"] == null ? toY - 18 * Store.zoomRatio : postil["top"] * Store.zoomRatio;
+ let width = postil["width"] == null ? _this.defaultWidth * Store.zoomRatio : postil["width"] * Store.zoomRatio;
+ let height = postil["height"] == null ? _this.defaultHeight * Store.zoomRatio : postil["height"] * Store.zoomRatio;
let value = postil["value"] == null ? "" : postil["value"];
if(top < 0){
@@ -723,10 +729,10 @@ const luckysheetPostil = {
let toX = col;
let toY = row_pre;
- let left = postil["left"] == null ? toX + 18 : postil["left"];
- let top = postil["top"] == null ? toY - 18 : postil["top"];
- let width = postil["width"] == null ? _this.defaultWidth : postil["width"];
- let height = postil["height"] == null ? _this.defaultHeight : postil["height"];
+ let left = postil["left"] == null ? toX + 18 * Store.zoomRatio : postil["left"] * Store.zoomRatio;
+ let top = postil["top"] == null ? toY - 18 * Store.zoomRatio : postil["top"] * Store.zoomRatio;
+ let width = postil["width"] == null ? _this.defaultWidth * Store.zoomRatio : postil["width"] * Store.zoomRatio;
+ let height = postil["height"] == null ? _this.defaultHeight * Store.zoomRatio : postil["height"] * Store.zoomRatio;
let value = postil["value"] == null ? "" : postil["value"];
if(top < 0){
diff --git a/src/controllers/zoom.js b/src/controllers/zoom.js
index 34d3569..711e395 100644
--- a/src/controllers/zoom.js
+++ b/src/controllers/zoom.js
@@ -5,6 +5,7 @@ import sheetmanage from './sheetmanage';
import {changeSheetContainerSize} from './resize';
import { jfrefreshgrid_rhcw } from '../global/refresh';
import server from './server';
+import luckysheetPostil from './postil';
import imageCtrl from './imageCtrl';
@@ -31,6 +32,9 @@ export function zoomChange(ratio){
let currentSheet = sheetmanage.getSheetByIndex();
+ //批注
+ luckysheetPostil.buildAllPs(currentSheet.data);
+
//图片
imageCtrl.images = currentSheet.images;
imageCtrl.allImagesShow();
diff --git a/src/demoData/demoFeature.js b/src/demoData/demoFeature.js
new file mode 100644
index 0000000..329c4b9
--- /dev/null
+++ b/src/demoData/demoFeature.js
@@ -0,0 +1,24 @@
+
+// Features specially written for demo
+
+(function() {
+
+ // language
+ function language(params) {
+
+ var lang = navigator.language||navigator.userLanguage;//常规浏览器语言和IE浏览器
+ lang = lang.substr(0, 2);//截取lang前2位字符
+
+ return lang;
+
+ }
+ // Tencent Forum Link Button
+ function supportButton() {
+ const text = language() === 'zh' ? '反馈' : 'Forum';
+
+ document.querySelector("body").insertAdjacentHTML('beforeend', `
${text}`);
+ }
+
+ supportButton()
+
+})()
\ No newline at end of file
diff --git a/src/global/api.js b/src/global/api.js
index f861cc4..ad26e8b 100644
--- a/src/global/api.js
+++ b/src/global/api.js
@@ -1,5 +1,5 @@
import Store from "../store";
-import { replaceHtml, getObjType, chatatABC } from "../utils/util";
+import { replaceHtml, getObjType, chatatABC, luckysheetactiveCell } from "../utils/util";
import { getSheetIndex, getluckysheet_select_save, getluckysheetfile } from "../methods/get";
import locale from "../locale/locale";
@@ -20,6 +20,7 @@ import { luckysheetDeleteCell, luckysheetextendtable, luckysheetdeletetable } fr
import { isRealNull, valueIsError, isRealNum, isEditMode, hasPartMC } from "./validate";
import { isdatetime, diff } from "./datecontroll";
import { getBorderInfoCompute } from './border';
+import { luckysheetDrawMain } from './draw';
import server from "../controllers/server";
import menuButton from '../controllers/menuButton';
@@ -31,8 +32,11 @@ import sheetmanage from '../controllers/sheetmanage';
import conditionformat from '../controllers/conditionformat';
import { luckysheet_searcharray } from "../controllers/sheetSearch";
import { selectHightlightShow, selectIsOverlap } from '../controllers/select';
-import { sheetHTML } from '../controllers/constant';
+import { sheetHTML, luckysheetdefaultstyle } from '../controllers/constant';
import { createFilterOptions } from '../controllers/filter';
+import controlHistory from '../controllers/controlHistory';
+import { zoomRefreshView, zoomNumberDomBind } from '../controllers/zoom';
+import dataVerificationCtrl from "../controllers/dataVerificationCtrl";
const IDCardReg = /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[12])(0[1-9]|[12]\d|3[01])\d{3}(\d|X)$/i;
@@ -1174,6 +1178,113 @@ export function showColumn(startIndex, endIndex, options = {}) {
showRowOrColumn('column', startIndex, endIndex, options);
}
+
+/**
+ * 设置指定行的高度
+ * @param {Object} rowInfo 行数和高度对应关系
+ * @param {Object} options 可选参数
+ * @param {Number} options.order 工作表索引；默认值为当前工作表索引
+ * @param {Function} options.success 操作结束的回调函数
+ */
+export function setRowHeight(rowInfo, options = {}) {
+ if(getObjType(rowInfo) != 'object'){
+ return tooltip.info("The rowInfo parameter is invalid.", "");
+ }
+
+ let {
+ order = getSheetIndex(Store.currentSheetIndex),
+ success
+ } = {...options}
+
+ let file = Store.luckysheetfile[order];
+
+ if(file == null){
+ return tooltip.info("The order parameter is invalid.", "");
+ }
+
+ let cfg = $.extend(true, {}, file.config);
+ if(cfg['rowlen'] == null){
+ cfg['rowlen'] = {};
+ }
+
+ for(let r in rowInfo){
+ if(parseInt(r) >= 0){
+ let len = rowInfo[r];
+
+ if(Number(len) >= 0){
+ cfg['rowlen'][parseInt(r)] = Number(len);
+ }
+ }
+ }
+
+ file.config = cfg;
+
+ server.saveParam("cg", file.index, cfg["rowlen"], { "k": "rowlen" });
+
+ if(file.index == Store.currentSheetIndex){
+ Store.config = cfg;
+ jfrefreshgrid_rhcw(Store.flowdata.length, Store.flowdata[0].length);
+ }
+
+ if (success && typeof success === 'function') {
+ success()
+ }
+}
+
+
+/**
+ * 设置指定列的宽度
+ * @param {Object} columnInfo 行数和高度对应关系
+ * @param {Object} options 可选参数
+ * @param {Number} options.order 工作表索引；默认值为当前工作表索引
+ * @param {Function} options.success 操作结束的回调函数
+ */
+export function setColumnWidth(columnInfo, options = {}) {
+ if(getObjType(columnInfo) != 'object'){
+ return tooltip.info("The columnInfo parameter is invalid.", "");
+ }
+
+ let {
+ order = getSheetIndex(Store.currentSheetIndex),
+ success
+ } = {...options}
+
+ let file = Store.luckysheetfile[order];
+
+ if(file == null){
+ return tooltip.info("The order parameter is invalid.", "");
+ }
+
+ let cfg = $.extend(true, {}, file.config);
+ if(cfg['columnlen'] == null){
+ cfg['columnlen'] = {};
+ }
+
+ for(let c in columnInfo){
+ if(parseInt(c) >= 0){
+ let len = columnInfo[c];
+
+ if(Number(len) >= 0){
+ cfg['columnlen'][parseInt(c)] = Number(len);
+ }
+ }
+ }
+
+ file.config = cfg;
+
+ server.saveParam("cg", file.index, cfg["columnlen"], { "k": "columnlen" });
+
+ if(file.index == Store.currentSheetIndex){
+ Store.config = cfg;
+ jfrefreshgrid_rhcw(Store.flowdata.length, Store.flowdata[0].length);
+ }
+
+ if (success && typeof success === 'function') {
+ success()
+ }
+}
+
+
/**
* 返回当前选区对象的数组，可能存在多个选区。
* 每个选区的格式为row/column信息组成的对象{row:[0,1],column:[0,1]}
@@ -4662,6 +4773,104 @@ export function setSheetMove(type, options = {}) {
}
+/**
+ * 重新排序所有工作表的位置，指定工作表顺序的数组。
+ * @param {Array} orderList 工作表顺序，设置工作表的index和order来指定位置
+ * @param {Object} options 可选参数
+ * @param {Function} options.success 操作结束的回调函数
+ */
+export function setSheetOrder(orderList, options = {}) {
+ if(orderList == null || orderList.length == 0){
+ return tooltip.info("Type orderList not available", "");
+ }
+
+ let orderListMap = {};
+ orderList.forEach((item) => {
+ orderListMap[item.index.toString()] = item.order;
+ })
+
+ Store.luckysheetfile.sort((x, y) => {
+ let order_x = orderListMap[x.index.toString()];
+ let order_y = orderListMap[y.index.toString()];
+
+ if(order_x != null && order_y != null){
+ return order_x - order_y;
+ }
+ else if(order_x != null){
+ return -1;
+ }
+ else if(order_y != null){
+ return 1;
+ }
+ else{
+ return 1;
+ }
+ })
+
+ let orders = {};
+
+ Store.luckysheetfile.forEach((item, i, arr) => {
+ arr[i].order = i;
+ orders[item.index.toString()] = i;
+
+ if(i > 0){
+ let preIndex = arr[i - 1].index;
+ $("#luckysheet-sheets-item" + item.index).insertAfter($("#luckysheet-sheets-item" + preIndex));
+ }
+ })
+
+ server.saveParam("shr", null, orders);
+
+ let {
+ success
+ } = {...options}
+
+ if (success && typeof success === 'function') {
+ success();
+ }
+}
+
+
+/**
+ * 设置工作表缩放比例
+ * @param {Number} zoom 工作表缩放比例，值范围为0.1 ~ 4；
+ * @param {Object} options 可选参数
+ * @param {Number} options.order 工作表下标；默认值为当前工作表下标
+ * @param {Function} options.success 操作结束的回调函数
+ */
+export function setSheetZoom(zoom, options = {}) {
+ if(getObjType(zoom) != 'number' && (zoom < 0.1 || zoom > 4)){
+ return tooltip.info("The zoom parameter is invalid.", "");
+ }
+
+ let {
+ order = getSheetIndex(Store.currentSheetIndex),
+ success
+ } = {...options}
+
+ let file = Store.luckysheetfile[order];
+
+ if(file == null){
+ return tooltip.info("The order parameter is invalid.", "");
+ }
+
+ file["zoomRatio"] = zoom;
+
+ server.saveParam("all", file.index, zoom, { "k": "zoomRatio" });
+
+ if(file.index == Store.currentSheetIndex){
+ Store.zoomRatio = zoom;
+
+ zoomNumberDomBind();
+ zoomRefreshView();
+ }
+
+ if (success && typeof success === 'function') {
+ success();
+ }
+}
+
+
/**
* 显示指定下标工作表的网格线，返回操作的工作表对象
* @param {Object} options 可选参数
@@ -4738,6 +4947,24 @@ export function hideGridLines(options = {}){
}
+/**
+ * 刷新canvas
+ * @param {Object} options 可选参数
+ * @param {Function} options.success 操作结束的回调函数
+ */
+export function refresh(options = {}) {
+ luckysheetrefreshgrid();
+
+ let {
+ success
+ } = {...options}
+
+ if (success && typeof success === 'function') {
+ success();
+ }
+}
+
+
/**
* 滚动当前工作表位置
* @param {Object} options 可选参数
@@ -4801,7 +5028,6 @@ export function scroll(options = {}){
/**
* 根据窗口大小自动resize画布
- *
* @param {Object} options 可选参数
* @param {Function} options.success 操作结束的回调函数
*/
@@ -4818,6 +5044,200 @@ export function resize(options = {}){
}
+/**
+ * 返回指定选区截图后生成的base64格式的图片
+ * @param {Object} options 可选参数
+ * @param {Object | String} options.range 选区范围，只能为单个选区；默认为当前选区
+ */
+export function getScreenshot(options = {}) {
+ let {
+ range = Store.luckysheet_select_save[Store.luckysheet_select_save.length - 1],
+ } = {...options}
+
+ if(getObjType(range) == 'string'){
+ if(!formula.iscelldata(range)){
+ return tooltip.info("The range parameter is invalid.", "");
+ }
+
+ let cellrange = formula.getcellrange(range);
+ range = {
+ "row": cellrange.row,
+ "column": cellrange.column
+ };
+ }
+
+ if(getObjType(range) != 'object' || range.row == null || range.column == null){
+ return tooltip.info("The range parameter is invalid.", "");
+ }
+
+ let str = range.row[0],
+ edr = range.row[1],
+ stc = range.column[0],
+ edc = range.column[1];
+
+ let has_PartMC = hasPartMC(Store.config, str, edr, stc, edc);
+
+ if(has_PartMC){
+ return tooltip.info('Cannot perform this operation on partially merged cells', '');
+ }
+
+ let visibledatarow = Store.visibledatarow;
+ let visibledatacolumn = Store.visibledatacolumn;
+
+ let scrollHeight, rh_height;
+ if (str - 1 < 0) {
+ scrollHeight = 0;
+ rh_height = visibledatarow[edr];
+ }
+ else {
+ scrollHeight = visibledatarow[str - 1];
+ rh_height = visibledatarow[edr] - visibledatarow[str - 1];
+ }
+
+ let scrollWidth, ch_width;
+ if (stc - 1 < 0) {
+ scrollWidth = 0;
+ ch_width = visibledatacolumn[edc];
+ }
+ else {
+ scrollWidth = visibledatacolumn[stc - 1];
+ ch_width = visibledatacolumn[edc] - visibledatacolumn[stc - 1];
+ }
+
+ let newCanvas = $("