From 71b28ca6f855447f201e25ada7af287007e9fbc7 Mon Sep 17 00:00:00 2001 From: lrz <1414556676@qq.com> Date: Sun, 27 Sep 2020 17:37:07 +0800 Subject: [PATCH] style(style): style 1.style:right click menu arrow icon and background color 2.api:transToCellData, getLuckysheetfile --- docs/guide/api.md | 10 -------- docs/zh/guide/api.md | 10 -------- src/controllers/conditionformat.js | 10 ++++---- src/controllers/constant.js | 38 +++++++++++++++--------------- src/controllers/menuButton.js | 7 ++++-- src/controllers/postil.js | 10 ++++---- src/css/iconCustom.css | 8 +++++++ src/css/luckysheet-core.css | 3 ++- src/global/api.js | 33 +++++++++++++++++++++++++- 9 files changed, 76 insertions(+), 53 deletions(-) diff --git a/docs/guide/api.md b/docs/guide/api.md index 081ab9d..e3b46a6 100644 --- a/docs/guide/api.md +++ b/docs/guide/api.md @@ -1673,13 +1673,6 @@ Use note: ### getLuckysheetfile() -[todo] - -- **Parameter**： - - - {PlainObject} [setting]: optional parameters - + {Function} [success]: callback function for the end of the operation - - **Explanation**： Returns a one-dimensional array `luckysheetfile` of all table data structures. Unlike the `getAllSheets` method, the worksheet parameters obtained by this method will contain many internal variables. The most obvious difference is that the table data operation will maintain `luckysheetfile[i]. data`, and the initialization data uses `options.data[i].celldata`, so `luckysheetfile` can be used for debugging, but the initialization table is not applicable. @@ -2209,9 +2202,6 @@ Use note: ### transToCellData(data [,setting])
-[todo] - - - **Parameter**： - {Array} [data]: data diff --git a/docs/zh/guide/api.md b/docs/zh/guide/api.md index a7df429..eb33e54 100644 --- a/docs/zh/guide/api.md +++ b/docs/zh/guide/api.md @@ -1675,13 +1675,6 @@ Luckysheet针对常用的数据操作需求，开放了主要功能的API，开 ### getLuckysheetfile() -[todo] - -- **参数**： - - - {PlainObject} [setting]: 可选参数 - + {Function} [success]: 操作结束的回调函数 - - **说明**： 返回所有表格数据结构的一维数组`luckysheetfile`，不同于`getAllSheets`方法，此方法得到的工作表参数会包含很多内部使用变量，最明显的区别是表格数据操作会维护`luckysheetfile[i].data`，而初始化数据采用的是`options.data[i].celldata`，所以`luckysheetfile`可用于调试使用，但是不适用初始化表格。 @@ -2212,9 +2205,6 @@ Luckysheet针对常用的数据操作需求，开放了主要功能的API，开 ### transToCellData(data [,setting])
-[todo] - - - **参数**： - {Array} [data]: data数据 diff --git a/src/controllers/conditionformat.js b/src/controllers/conditionformat.js index 657d50a..e5ff88a 100644 --- a/src/controllers/conditionformat.js +++ b/src/controllers/conditionformat.js @@ -22,23 +22,23 @@ const conditionformat = { return `
- ► + ${conditionformat_Text.ruleTypeItem1}
- ► + ${conditionformat_Text.ruleTypeItem2}
- ► + ${conditionformat_Text.ruleTypeItem3}
- ► + ${conditionformat_Text.ruleTypeItem4}
- ► + ${conditionformat_Text.ruleTypeItem5}
`; diff --git a/src/controllers/constant.js b/src/controllers/constant.js index 4ee640a..7901821 100644 --- a/src/controllers/constant.js +++ b/src/controllers/constant.js @@ -256,7 +256,7 @@ function rightclickHTML(){
- ${rightclick.copyAs}► + ${rightclick.copyAs}
@@ -266,22 +266,22 @@ function rightclickHTML(){
- ${rightclick.insert}► + ${rightclick.insert}
- ${rightclick.delete}► + ${rightclick.delete}
- ${rightclick.hide}► + ${rightclick.hide}
- ${rightclick.deleteCell}► + ${rightclick.deleteCell}
@@ -292,7 +292,7 @@ function rightclickHTML(){ ${rightclick.to} ${rightclick.left} ${rightclick.add} - + ${rightclick.column} @@ -302,7 +302,7 @@ function rightclickHTML(){ ${rightclick.to} ${rightclick.right} ${rightclick.add} - + ${rightclick.column} @@ -317,7 +317,7 @@ function rightclickHTML(){
${rightclick.column} ${rightclick.width} - + px
@@ -339,7 +339,7 @@ function rightclickHTML(){
- ${rightclick.matrix}► + ${rightclick.matrix}
@@ -377,9 +377,9 @@ function rightclickHTML(){
${rightclick.array3}
- + × - +
@@ -394,7 +394,7 @@ function rightclickHTML(){
${rightclick.diagonalOffset} - + ${rightclick.column}
@@ -407,7 +407,7 @@ function rightclickHTML(){
${rightclick.to}${rightclick.top}${rightclick.add} - + ${rightclick.row}
@@ -415,7 +415,7 @@ function rightclickHTML(){
${rightclick.to}${rightclick.bottom}${rightclick.add} - + ${rightclick.row}
@@ -423,7 +423,7 @@ function rightclickHTML(){
${rightclick.to}${rightclick.left}${rightclick.add} - + ${rightclick.column}
@@ -431,7 +431,7 @@ function rightclickHTML(){
${rightclick.to}${rightclick.right}${rightclick.add} - + ${rightclick.column}
@@ -515,7 +515,7 @@ function rightclickHTML(){ - +
@@ -579,7 +579,7 @@ function sheetconfigHTML(){
- ${sheetconfig.changeColor} ► + ${sheetconfig.changeColor}
@@ -650,7 +650,7 @@ function filtermenuHTML() { const _locale = locale(); const locale_filter = _locale.filter; - return `
${locale_filter.sortByAsc}
${locale_filter.sortByDesc}
${locale_filter.filterByColor}►
${locale_filter.filterByCondition}
${locale_filter.filterByValues}
${locale_filter.filterValueByAllBtn} - ${locale_filter.filterValueByClearBtn} - ${locale_filter.filterValueByInverseBtn}
${locale_filter.filterConform}
${locale_filter.filterCancel}
${locale_filter.clearFilter}
` + return `
${locale_filter.sortByAsc}
${locale_filter.sortByDesc}
${locale_filter.filterByColor}
${locale_filter.filterByCondition}
${locale_filter.filterByValues}
${locale_filter.filterValueByAllBtn} - ${locale_filter.filterValueByClearBtn} - ${locale_filter.filterValueByInverseBtn}
${locale_filter.filterConform}
${locale_filter.filterCancel}
${locale_filter.clearFilter}
` } function filtersubmenuHTML() { diff --git a/src/controllers/menuButton.js b/src/controllers/menuButton.js index 455c05e..610fc9b 100644 --- a/src/controllers/menuButton.js +++ b/src/controllers/menuButton.js @@ -38,7 +38,8 @@ import locale from '../locale/locale'; const menuButton = { "menu": '
${item}
', - "item": '
${name} ${example}
', + // "item": '
${name} ${example}
', + "item": '
${name}
', "split": '', "color": '
${resetColor}
${coloritem}
', "coloritem": '
${name}
', @@ -66,7 +67,9 @@ const menuButton = { } else{ if(item.example=="more"){ - itemset += replaceHtml(_this.item, {"value": item.value, "name": item.text, "example": "►", "sub": "luckysheet-cols-submenu"}); + // itemset += replaceHtml(_this.item, {"value": item.value, "name": item.text, "example": "►", "sub": "luckysheet-cols-submenu"}); + itemset += replaceHtml(_this.item, {"value": item.value, "name": item.text, "sub": "luckysheet-cols-submenu", "iconClass": "iconfont icon-youjiantou"}); + } else{ itemset += replaceHtml(_this.item, {"value": item.value, "name": item.text, "example": item.example, "sub": ""}); diff --git a/src/controllers/postil.js b/src/controllers/postil.js index cac84b3..1206ea9 100644 --- a/src/controllers/postil.js +++ b/src/controllers/postil.js @@ -368,7 +368,7 @@ const luckysheetPostil = { '
' + '
' + '
' + - '
' + + '
' + value + '
' + '
' + @@ -431,7 +431,7 @@ const luckysheetPostil = { '
' + '
' + '
' + - '
' + + '
' + '
' + '
' + '
' + @@ -519,7 +519,7 @@ const luckysheetPostil = { '
' + '
' + '
' + - '
' + + '
' + value + '
' + '
' + @@ -617,7 +617,7 @@ const luckysheetPostil = { '
' + '
' + '
' + - '
' + + '
' + value + '
' + '
' + @@ -731,7 +731,7 @@ const luckysheetPostil = { '
' + '
' + '
' + - '
' + + '
' + value + '
' + '
' + diff --git a/src/css/iconCustom.css b/src/css/iconCustom.css index 1f10947..f707385 100644 --- a/src/css/iconCustom.css +++ b/src/css/iconCustom.css @@ -76,4 +76,12 @@ /* sheet bar left/right scroll */ #luckysheet-sheets-leftscroll , #luckysheet-sheets-rightscroll{ padding:6px 10px; +} + +input.luckysheet-mousedown-cancel{ + border:1px solid #A1A1A1; +} +input.luckysheet-mousedown-cancel:focus{ + border: 1px solid rgb(1, 136, 251); + outline: none; } \ No newline at end of file diff --git a/src/css/luckysheet-core.css b/src/css/luckysheet-core.css index f6f8e7e..f9c6ba1 100644 --- a/src/css/luckysheet-core.css +++ b/src/css/luckysheet-core.css @@ -2272,9 +2272,10 @@ body:not(.ewa-ipad) .luckysheet-rows-h-cell-sel:hover { user-select: none; } +/* 右击菜单项目 hover背景色 */ .luckysheet-cols-menu .luckysheet-cols-menuitem:hover, .luckysheet-cols-menu .luckysheet-cols-menuitem-hover { - background: #E1E1E1; + background: #EFEFEF; } .luckysheet-cols-menu .luckysheet-cols-menuitem .luckysheet-cols-menuitem-content { diff --git a/src/global/api.js b/src/global/api.js index fbb26d6..69a019f 100644 --- a/src/global/api.js +++ b/src/global/api.js @@ -1,6 +1,6 @@ import Store from "../store"; import { replaceHtml, getObjType, chatatABC } from "../utils/util"; -import { getSheetIndex, getluckysheet_select_save } from "../methods/get"; +import { getSheetIndex, getluckysheet_select_save, getluckysheetfile } from "../methods/get"; import locale from "../locale/locale"; import formula from './formula'; @@ -3498,3 +3498,34 @@ export function getSheet(options = {}){ return sheetmanage.getSheetByIndex(); } + +/** + * 返回所有表格数据结构的一维数组luckysheetfile + */ +export function getLuckysheetfile(){ + return getluckysheetfile(); +} + +/** + * data => celldata ，data二维数组数据转化成 {r, c, v}格式一维数组 + * + * @param {Array} data 二维数组数据 + * @param {Object} options 可选参数 + * @param {Function} options.success 操作结束的回调函数 + */ +export function transToCellData(data, options = {}){ + + let { + success + } = {...options} + + setTimeout(()=>{ + + if (success && typeof success === 'function') { + success(); + } + + },0) + + return sheetmanage.getGridData(data) +}