Browse Source

style(style): style

1.toolbar style 2.chart resize bug 3.readme
master
lrz 5 years ago
parent
commit
67ddee3f9d
  1. 8
      README-zh.md
  2. 8
      README.md
  3. 6
      docs/guide/config.md
  4. 7
      docs/zh/guide/config.md
  5. 5
      src/controllers/filter.js
  6. 8
      src/controllers/freezen.js
  7. 8
      src/controllers/menuButton.js
  8. 16
      src/controllers/resize.js
  9. 4
      src/css/iconCustom.css
  10. 16
      src/css/luckysheet-core.css
  11. 2773
      src/demoData/sheetCell.js
  12. 2
      src/demoData/sheetComment.js
  13. 2
      src/demoData/sheetConditionFormat.js
  14. 579
      src/demoData/sheetDataVerification.js
  15. 1
      src/demoData/sheetFormula.js
  16. 159
      src/demoData/sheetPicture.js
  17. 2
      src/demoData/sheetPivotTable.js
  18. 2
      src/demoData/sheetPivotTableData.js
  19. 2
      src/demoData/sheetSparkline.js
  20. 2
      src/demoData/sheetTable.js
  21. 2
      src/expendPlugins/chart/plugin.js
  22. 4
      src/index.html
  23. 6
      src/store/index.js

8
README-zh.md

@ -180,12 +180,20 @@ npm run build
[英文社群](./README.md)
## 贡献者和感谢
### 团队成员
- [@wbfsa](https://github.com/wbfsa)
- [@wpxp123456](https://github.com/wpxp123456)
- [@swen-xiong](https://github.com/swen-xiong)
- [@tonytonychopper123](https://github.com/tonytonychopper123)
- [@Dushusir](https://github.com/Dushusir)
### 活跃成员
- [@danielcai1987](https://github.com/danielcai1987)
- [@qq6690876](https://github.com/qq6690876)
- [@javahuang](https://github.com/javahuang)
- [@gsw945](https://github.com/gsw945)
## 版权信息
[MIT](http://opensource.org/licenses/MIT)

8
README.md

@ -178,12 +178,20 @@ Create a table
[Chinese community](./README-zh.md)
## Authors and acknowledgment
### Team
- [@wbfsa](https://github.com/wbfsa)
- [@wpxp123456](https://github.com/wpxp123456)
- [@swen-xiong](https://github.com/swen-xiong)
- [@tonytonychopper123](https://github.com/tonytonychopper123)
- [@Dushusir](https://github.com/Dushusir)
### Active participants
- [@danielcai1987](https://github.com/danielcai1987)
- [@qq6690876](https://github.com/qq6690876)
- [@javahuang](https://github.com/javahuang)
- [@gsw945](https://github.com/gsw945)
## License
[MIT](http://opensource.org/licenses/MIT)

6
docs/guide/config.md

@ -47,12 +47,6 @@
- Default: []
- Usage: Plug-in configuration, support chart: "chart"
------------
## fullscreenmode
- Type: Boolean
- Default: true
- Usage: Whether full-screen mode. In non-full-screen mode, the marker box is not forced to be selected
------------
## autoFormatw
- Type: Boolean

7
docs/zh/guide/config.md

@ -72,7 +72,6 @@ Luckysheet开放了更细致的自定义配置选项,分别有
- 功能按钮 [functionButton](#functionButton)
- 自动缩进界面 [showConfigWindowResize](#showConfigWindowResize)
- 加载下一页 [enablePage](#enablePage)
- 全屏模式 [fullscreenmode](#fullscreenmode)
- 刷新公式 [forceCalculation](#forceCalculation)
- 自定义单元格右键菜单 [cellRightClickConfig](#cellRightClickConfig)
- 自定义sheet页右击菜单 [sheetRightClickConfig](#sheetRightClickConfig)
@ -354,12 +353,6 @@ Luckysheet开放了更细致的自定义配置选项,分别有
- 默认值:false
- 作用:允许加载下一页
------------
### fullscreenmode
- 类型:Boolean
- 默认值:true
- 作用:是否全屏模式。非全屏模式下,标记框不会强制选中
------------
### forceCalculation
- 类型:Boolean

5
src/controllers/filter.js

@ -965,7 +965,10 @@ function initialFilterHandler(){
if(checksCF != null && checksCF["cellColor"] != null){//若单元格有条件格式
bg = checksCF["cellColor"];
}
// bg maybe null
bg = bg == null ? '#ffffff' : bg;
if(bg.indexOf("rgb") > -1){
bg = rgbTohex(bg);
}

8
src/controllers/freezen.js

@ -493,7 +493,13 @@ const luckysheetFreezen = {
//有冻结时 图表框 滚动适应
if($("#luckysheet-cell-main .luckysheet-data-visualization-chart").length > 0){
_this.scrollAdaptOfchart();
// 当前sheet有图表才需要滚动适应
const chart = Store.luckysheetfile[getSheetIndex(Store.currentSheetIndex)]["chart"];
if(chart != null && chart.length > 0){
_this.scrollAdaptOfchart();
}
}
//有冻结时 批注框 滚动适应

8
src/controllers/menuButton.js

@ -585,7 +585,9 @@ const menuButton = {
}
let oldcolor = null;
$("#luckysheet-icon-text-color .luckysheet-color-menu-button-indicator").css("border-bottom-color", color);
// $("#luckysheet-icon-text-color .luckysheet-color-menu-button-indicator").css("border-bottom-color", color);
// 下边框换成了一个DIV
$("#luckysheet-icon-text-color .text-color-bar").css("background-color", color);
$("#luckysheet-icon-text-color").attr("color", color);
let d = editor.deepCopyFlowData(Store.flowdata);
@ -723,7 +725,9 @@ const menuButton = {
}
let oldcolor = null;
$("#luckysheet-icon-cell-color .luckysheet-color-menu-button-indicator").css("border-bottom-color", color);
// $("#luckysheet-icon-cell-color .luckysheet-color-menu-button-indicator").css("border-bottom-color", color);
// 下边框换成了一个DIV
$("#luckysheet-icon-cell-color .text-color-bar").css("background-color", color);
$("#luckysheet-icon-cell-color").attr("color", color);
let d = editor.deepCopyFlowData(Store.flowdata);

16
src/controllers/resize.js

@ -4,6 +4,7 @@ import { luckysheetrefreshgrid } from '../global/refresh';
import Store from '../store';
import locale from '../locale/locale';
import sheetmanage from './sheetmanage';
import tooltip from '../global/tooltip'
let gridW = 0,
gridH = 0;
@ -14,8 +15,9 @@ export default function luckysheetsizeauto(isRefreshCanvas=true) {
$("#luckysheet_info_detail").hide();
}
else {
Store.infobarHeight = 56;
$("#luckysheet_info_detail").show();
// Store.infobarHeight = 56;
Store.infobarHeight = document.querySelector('#luckysheet_info_detail').offsetHeight;
}
if (!luckysheetConfigsetting.showtoolbar) {
@ -24,7 +26,8 @@ export default function luckysheetsizeauto(isRefreshCanvas=true) {
}
else {
$("#" + Store.container).find(".luckysheet-wa-editor, .luckysheet-share-logo").show();
Store.toolbarHeight = 72;
// Store.toolbarHeight = 72;
Store.toolbarHeight = document.querySelector('#' + Store.container +' .luckysheet-wa-editor').offsetHeight;
}
if (!luckysheetConfigsetting.showsheetbar) {
@ -45,6 +48,9 @@ export default function luckysheetsizeauto(isRefreshCanvas=true) {
Store.statisticBarHeight = 23;
}
// 公式栏
Store.calculatebarHeight = document.querySelector('#luckysheet-wa-calculate').offsetHeight;
$("#" + Store.container).find(".luckysheet-grid-container").css("top", Store.toolbarHeight + Store.infobarHeight + Store.calculatebarHeight);
gridW = $("#" + Store.container).width(), gridH = $("#" + Store.container).height();
@ -86,7 +92,8 @@ export default function luckysheetsizeauto(isRefreshCanvas=true) {
</div>
</div>
</div>`,
morediv = '<div id="luckysheet-icon-morebtn-div" class="luckysheet-wa-editor" style="position:absolute;top:'+ (Store.infobarHeight + Store.toolbarHeight + 3 + $("#" + Store.container).offset().top + $("body").scrollTop() - $("#luckysheet-functionbox-container").height() ) +'px; right:0px;z-index:1003;padding:8px;display:none;height:auto;white-space:initial;"></div>';
// morediv = '<div id="luckysheet-icon-morebtn-div" class="luckysheet-wa-editor" style="position:absolute;top:'+ (Store.infobarHeight + Store.toolbarHeight + 3 + $("#" + Store.container).offset().top + $("body").scrollTop() - $("#luckysheet-functionbox-container").height() ) +'px; right:0px;z-index:1003;padding:8px;display:none;height:auto;white-space:initial;"></div>';
morediv = '<div id="luckysheet-icon-morebtn-div" class="luckysheet-wa-editor" style="position:absolute;top:'+ (Store.infobarHeight + Store.toolbarHeight + $("#" + Store.container).offset().top + $("body").scrollTop()) +'px; right:0px;z-index:1003;padding:5.5px;display:none;height:auto;white-space:initial;"></div>';
if($("#luckysheet-icon-morebtn-div").length == 0){
$("body").append(morediv);
@ -199,6 +206,9 @@ export default function luckysheetsizeauto(isRefreshCanvas=true) {
}, function(){
$(this).prev(".luckysheet-toolbar-button-split-left").removeClass("luckysheet-toolbar-button-hover");
});
// tooltip
tooltip.createHoverTip("#luckysheet-icon-morebtn-div" ,".luckysheet-toolbar-menu-button, .luckysheet-toolbar-button, .luckysheet-toolbar-combo-button");
}
$("#"+ Store.container + " .luckysheet-wa-editor .luckysheet-toolbar-button-split-left").off("hover").hover(function(){

4
src/css/iconCustom.css

@ -60,7 +60,7 @@
background-color: #E1E4E8;
}
/* more button border */
#luckysheet-icon-morebtn-div{
border-left: 1px solid rgb(212, 212, 212);
border-right: 1px solid rgb(212, 212, 212);
border: 1px solid rgb(212, 212, 212);
}

16
src/css/luckysheet-core.css

@ -126,13 +126,13 @@
}
.luckysheet-wa-editor {
height: 34px;
height: 32px;
/* background: #f7f7f7; */
background: #fafafc;
position: relative;
/* padding-left: 15px; */
/* padding: 0px 0px 10px 15px; */
padding: 7px 0px 3px 15px;;
padding: 5px 0px 3px 15px;;
border-bottom: 1px solid #d4d4d4;
white-space: nowrap;
transition: all 0.2s;
@ -6597,7 +6597,7 @@ fieldset[disabled] .btn-danger.focus {
.luckysheet-modal-dialog-title-update {
right: 105px;
color:#FC6666;
color: #85c0fc;
font-size:14px;
padding-top: 9px;
}
@ -6617,7 +6617,7 @@ fieldset[disabled] .btn-danger.focus {
.luckysheet-modal-dialog-resize {
position: absolute;
border: 2px solid #FC6666;
border: 2px solid #85c0fc;
margin: 0px;
padding: 0px;
top: -2px;
@ -6632,7 +6632,7 @@ fieldset[disabled] .btn-danger.focus {
height: 6px;
width: 6px;
background: #ffffff;
border: 2px solid #FC6666;
border: 2px solid #85c0fc;
pointer-events: all;
border-radius: 6px;
}
@ -6723,13 +6723,13 @@ fieldset[disabled] .btn-danger.focus {
.luckysheet-modal-controll-btn:hover {
border: 1px solid #A1A1A1;
color: #FC6666;
color: #85c0fc;
}
.luckysheet-modal-controll-btn:active {
border: 1px solid #BBBBBB;
background: #EFEFEF;
color: #FC6666;
color: #85c0fc;
}
.luckysheet-modal-controll-del {
@ -6755,7 +6755,7 @@ fieldset[disabled] .btn-danger.focus {
}
.luckysheet-modal-controll-max-close:hover {
background: #FC6666;
background: #85c0fc;
cursor: pointer;
}

2773
src/demoData/sheetCell.js

File diff suppressed because one or more lines are too long

2
src/demoData/sheetComment.js

@ -8,7 +8,7 @@ const sheetComment = {
},
"index": "5",
"chart": [],
"status": "0",
"status": 0,
"order": "5",
"column": 18,
"row": 36,

2
src/demoData/sheetConditionFormat.js

@ -156,7 +156,7 @@ const sheetConditionFormat = {
},
"index": "2",
"chart": [],
"status": "0",
"status": 0,
"order": "2",
"column": 18,
"row": 36,

579
src/demoData/sheetDataVerification.js

@ -0,0 +1,579 @@
const sheetDataVerification = {
"name": "Data Verification",
"index": "Sheet_pdolzzie5xwi_1600927444446",
"celldata": [{"r":0,"c":0,"v":{"ct":{"fa":"General","t":"g"},"m":"Drop Down List","v":"Drop Down List","bl":1}},{"r":0,"c":1,"v":{"m":"Checkbox","ct":{"fa":"General","t":"g"},"v":"Checkbox","bl":1}},{"r":0,"c":2,"v":{"ct":{"fa":"General","t":"g"},"v":"Number between 1-10","bl":1,"m":"Number between 1-10"}},{"r":0,"c":3,"v":{"m":"Text content include Luckysheet","ct":{"fa":"General","t":"g"},"v":"Text content include Luckysheet","bl":1}},{"r":0,"c":4,"v":{"ct":{"fa":"General","t":"g"},"v":"Text length between 1-5","m":"Text length between 1-5","bl":1}},{"r":0,"c":5,"v":{"m":"Date","ct":{"fa":"General","t":"g"},"v":"Date","bl":1}},{"r":0,"c":6,"v":{"m":"Identification Number","ct":{"fa":"General","t":"g"},"v":"Identification Number","bl":1}},{"r":0,"c":7,"v":{"m":"Phone Number","ct":{"fa":"General","t":"g"},"v":"Phone Number","bl":1}},{"r":1,"c":0,"v":{"ct":{"fa":"General","t":"g"},"v":"Fix","m":"Fix"}},{"r":1,"c":1,"v":{"m":"Fail","ct":{"fa":"General","t":"g"},"v":"Fail"}},{"r":1,"c":2,"v":{"v":1,"ct":{"fa":"General","t":"n"},"m":"1"}},{"r":1,"c":3,"v":{"m":"Luckysheet is good","ct":{"fa":"General","t":"g"},"v":"Luckysheet is good"}},{"r":1,"c":4,"v":{"m":"Welcome","ct":{"fa":"General","t":"g"},"v":"Welcome"}},{"r":1,"c":5,"v":{"m":"2020-09-24","ct":{"fa":"yyyy-MM-dd","t":"d"},"v":44098}},{"r":1,"c":6,"v":{"v":"311414199009138910","ct":{"fa":"@","t":"s"},"m":"311414199009138910"}},{"r":1,"c":7,"v":{"v":13678765439,"ct":{"fa":"General","t":"n"},"m":"13678765439"}},{"r":2,"c":0,"v":{"ct":{"fa":"General","t":"g"},"v":"Done","m":"Done"}},{"r":2,"c":1,"v":{"m":"Pass","ct":{"fa":"General","t":"g"},"v":"Pass"}},{"r":2,"c":2,"v":{"v":2,"ct":{"fa":"General","t":"n"},"m":"2"}},{"r":2,"c":3,"v":{"m":"I am Luckysheet","ct":{"fa":"General","t":"g"},"v":"I am Luckysheet"}},{"r":2,"c":4,"v":{"m":"Good","ct":{"fa":"General","t":"g"},"v":"Good"}},{"r":2,"c":5,"v":{"ct":{"fa":"General","t":"g"},"v":"Time","m":"Time"}},{"r":2,"c":6,"v":{"v":"31141419900913891","ct":{"fa":"@","t":"s"},"m":"31141419900913891"}},{"r":2,"c":7,"v":{"v":1367876544,"ct":{"fa":"General","t":"n"},"m":"1367876544"}},{"r":3,"c":0,"v":{"ct":{"fa":"General","t":"g"},"v":"Develop","m":"Develop"}},{"r":3,"c":1,"v":{"m":"Fail","ct":{"fa":"General","t":"g"},"v":"Fail"}},{"r":3,"c":2,"v":{"v":5,"ct":{"fa":"General","t":"n"},"m":"5"}},{"r":3,"c":3,"v":{"ct":{"fa":"General","t":"g"},"v":"I am luckyDemo","m":"I am luckyDemo"}},{"r":3,"c":4,"v":{"m":"Nice","ct":{"fa":"General","t":"g"},"v":"Nice"}},{"r":3,"c":5,"v":{"m":"2020-09-26","ct":{"fa":"yyyy-MM-dd","t":"d"},"v":44100}},{"r":3,"c":6,"v":{"v":"3114141990091389102","ct":{"fa":"@","t":"s"},"m":"3114141990091389102"}},{"r":3,"c":7,"v":{"v":136787654412,"ct":{"fa":"##0","t":"n"},"m":"136787654412"}},{"r":4,"c":0,"v":{"ct":{"fa":"General","t":"g"},"v":"Doing","m":"Doing"}},{"r":4,"c":1,"v":{"m":"Fail","ct":{"fa":"General","t":"g"},"v":"Fail"}},{"r":4,"c":2,"v":{"v":11,"ct":{"fa":"General","t":"n"},"m":"11"}},{"r":4,"c":3,"v":{"ct":{"fa":"General","t":"g"},"v":"Luckysheet Documentation","m":"Luckysheet Documentation"}},{"r":4,"c":4,"v":{"ct":{"fa":"General","t":"g"},"v":"Morning","m":"Morning"}},{"r":4,"c":5,"v":{"m":"2020-09-27","ct":{"fa":"yyyy-MM-dd","t":"d"},"v":44101}},{"r":4,"c":6,"v":{"v":"31141419900913891X","ct":{"fa":"@","t":"s"},"m":"31141419900913891X"}},{"r":4,"c":7,"v":{"v":49865342456,"ct":{"fa":"General","t":"n"},"m":"49865342456"}},{"r":5,"c":0,"v":{"ct":{"fa":"General","t":"g"},"v":"Develop","m":"Develop"}},{"r":5,"c":1,"v":{"m":"Fail","ct":{"fa":"General","t":"g"},"v":"Fail"}},{"r":5,"c":2,"v":{"v":3,"ct":{"fa":"General","t":"n"},"m":"3"}},{"r":5,"c":3,"v":{"m":"Luckyexcel","ct":{"fa":"General","t":"g"},"v":"Luckyexcel"}},{"r":5,"c":4,"v":{"ct":{"fa":"General","t":"g"},"v":"Tomorrow","m":"Tomorrow"}},{"r":5,"c":5,"v":{"ct":{"fa":"yyyy-MM-dd","t":"d"},"v":44071,"m":"2020-08-28"}},{"r":5,"c":6,"v":{"v":"Number","ct":{"fa":"@","t":"s"},"m":"Number"}},{"r":5,"c":7,"v":{"v":"Number","ct":{"fa":"General","t":"g"},"m":"Number"}},{"r":6,"c":0,"v":{"ct":{"fa":"General","t":"g"},"v":"Done","m":"Done"}},{"r":6,"c":1,"v":{"m":"Pass","ct":{"fa":"General","t":"g"},"v":"Pass"}},{"r":6,"c":2,"v":{"v":0,"ct":{"fa":"General","t":"n"},"m":"0"}},{"r":6,"c":3,"v":{"m":"Luckysheet Online","ct":{"fa":"General","t":"g"},"v":"Luckysheet Online"}},{"r":6,"c":4,"v":{"m":"Three","ct":{"fa":"General","t":"g"},"v":"Three"}},{"r":6,"c":5,"v":{"m":"2020-09-29","ct":{"fa":"yyyy-MM-dd","t":"d"},"v":44103}},{"r":6,"c":6,"v":{"v":"311414199301118910","ct":{"fa":"@","t":"s"},"m":"311414199301118910"}},{"r":6,"c":7,"v":{"v":23309873564,"ct":{"fa":"General","t":"n"},"m":"23309873564"}},{"r":7,"c":8,"v":{"v":null,"ct":{"fa":"General","t":"g"},"bl":1}}],
"row": 84,
"column": 60,
"config": {
"merge": {},
"rowlen": {},
"columnlen": {
"0": 109,
"2": 143,
"3": 200,
"4": 180,
"6": 178,
"7": 125
},
"customWidth": {
"2": 1,
"3": 1,
"4": 1,
"6": 1,
"7": 1
}
},
"luckysheet_select_save": [
{
"left": 963,
"width": 125,
"top": 240,
"height": 19,
"left_move": 963,
"width_move": 125,
"top_move": 240,
"height_move": 19,
"row": [
12,
12
],
"column": [
7,
7
],
"row_focus": 12,
"column_focus": 7
}
],
"dataVerification": {
"1_0": {
"type": "dropdown",
"type2": null,
"value1": "Develop,Fix,Done",
"value2": "",
"checked": false,
"remote": false,
"prohibitInput": false,
"hintShow": false,
"hintText": ""
},
"2_0": {
"type": "dropdown",
"type2": null,
"value1": "Develop,Fix,Done",
"value2": "",
"checked": false,
"remote": false,
"prohibitInput": false,
"hintShow": false,
"hintText": ""
},
"3_0": {
"type": "dropdown",
"type2": null,
"value1": "Develop,Fix,Done",
"value2": "",
"checked": false,
"remote": false,
"prohibitInput": false,
"hintShow": false,
"hintText": ""
},
"4_0": {
"type": "dropdown",
"type2": null,
"value1": "Develop,Fix,Done",
"value2": "",
"checked": false,
"remote": false,
"prohibitInput": false,
"hintShow": false,
"hintText": ""
},
"5_0": {
"type": "dropdown",
"type2": null,
"value1": "Develop,Fix,Done",
"value2": "",
"checked": false,
"remote": false,
"prohibitInput": false,
"hintShow": false,
"hintText": ""
},
"6_0": {
"type": "dropdown",
"type2": null,
"value1": "Develop,Fix,Done",
"value2": "",
"checked": false,
"remote": false,
"prohibitInput": false,
"hintShow": false,
"hintText": ""
},
"1_1": {
"type": "checkbox",
"type2": null,
"value1": "Pass",
"value2": "Fail",
"checked": false,
"remote": true,
"prohibitInput": false,
"hintShow": false,
"hintText": ""
},
"2_1": {
"type": "checkbox",
"type2": null,
"value1": "Pass",
"value2": "Fail",
"checked": true,
"remote": true,
"prohibitInput": false,
"hintShow": false,
"hintText": ""
},
"3_1": {
"type": "checkbox",
"type2": null,
"value1": "Pass",
"value2": "Fail",
"checked": false,
"remote": true,
"prohibitInput": false,
"hintShow": false,
"hintText": ""
},
"4_1": {
"type": "checkbox",
"type2": null,
"value1": "Pass",
"value2": "Fail",
"checked": false,
"remote": true,
"prohibitInput": false,
"hintShow": false,
"hintText": ""
},
"5_1": {
"type": "checkbox",
"type2": null,
"value1": "Pass",
"value2": "Fail",
"checked": false,
"remote": true,
"prohibitInput": false,
"hintShow": false,
"hintText": ""
},
"6_1": {
"type": "checkbox",
"type2": null,
"value1": "Pass",
"value2": "Fail",
"checked": true,
"remote": true,
"prohibitInput": false,
"hintShow": false,
"hintText": ""
},
"1_2": {
"type": "number",
"type2": "bw",
"value1": "1",
"value2": "10",
"checked": false,
"remote": false,
"prohibitInput": true,
"hintShow": false,
"hintText": ""
},
"2_2": {
"type": "number",
"type2": "bw",
"value1": "1",
"value2": "10",
"checked": false,
"remote": false,
"prohibitInput": true,
"hintShow": false,
"hintText": ""
},
"3_2": {
"type": "number",
"type2": "bw",
"value1": "1",
"value2": "10",
"checked": false,
"remote": false,
"prohibitInput": true,
"hintShow": false,
"hintText": ""
},
"4_2": {
"type": "number",
"type2": "bw",
"value1": "1",
"value2": "10",
"checked": false,
"remote": false,
"prohibitInput": true,
"hintShow": false,
"hintText": ""
},
"5_2": {
"type": "number",
"type2": "bw",
"value1": "1",
"value2": "10",
"checked": false,
"remote": false,
"prohibitInput": true,
"hintShow": false,
"hintText": ""
},
"6_2": {
"type": "number",
"type2": "bw",
"value1": "1",
"value2": "10",
"checked": false,
"remote": false,
"prohibitInput": true,
"hintShow": false,
"hintText": ""
},
"1_3": {
"type": "text_content",
"type2": "include",
"value1": "Luckysheet",
"value2": "",
"checked": false,
"remote": false,
"prohibitInput": false,
"hintShow": true,
"hintText": "include Luckysheet"
},
"2_3": {
"type": "text_content",
"type2": "include",
"value1": "Luckysheet",
"value2": "",
"checked": false,
"remote": false,
"prohibitInput": false,
"hintShow": true,
"hintText": "include Luckysheet"
},
"3_3": {
"type": "text_content",
"type2": "include",
"value1": "Luckysheet",
"value2": "",
"checked": false,
"remote": false,
"prohibitInput": false,
"hintShow": true,
"hintText": "include Luckysheet"
},
"4_3": {
"type": "text_content",
"type2": "include",
"value1": "Luckysheet",
"value2": "",
"checked": false,
"remote": false,
"prohibitInput": false,
"hintShow": true,
"hintText": "include Luckysheet"
},
"5_3": {
"type": "text_content",
"type2": "include",
"value1": "Luckysheet",
"value2": "",
"checked": false,
"remote": false,
"prohibitInput": false,
"hintShow": true,
"hintText": "include Luckysheet"
},
"6_3": {
"type": "text_content",
"type2": "include",
"value1": "Luckysheet",
"value2": "",
"checked": false,
"remote": false,
"prohibitInput": false,
"hintShow": true,
"hintText": "include Luckysheet"
},
"1_4": {
"type": "text_length",
"type2": "bw",
"value1": "1",
"value2": "5",
"checked": false,
"remote": false,
"prohibitInput": true,
"hintShow": false,
"hintText": ""
},
"2_4": {
"type": "text_length",
"type2": "bw",
"value1": "1",
"value2": "5",
"checked": false,
"remote": false,
"prohibitInput": true,
"hintShow": false,
"hintText": ""
},
"3_4": {
"type": "text_length",
"type2": "bw",
"value1": "1",
"value2": "5",
"checked": false,
"remote": false,
"prohibitInput": true,
"hintShow": false,
"hintText": ""
},
"4_4": {
"type": "text_length",
"type2": "bw",
"value1": "1",
"value2": "5",
"checked": false,
"remote": false,
"prohibitInput": true,
"hintShow": false,
"hintText": ""
},
"5_4": {
"type": "text_length",
"type2": "bw",
"value1": "1",
"value2": "5",
"checked": false,
"remote": false,
"prohibitInput": true,
"hintShow": false,
"hintText": ""
},
"6_4": {
"type": "text_length",
"type2": "bw",
"value1": "1",
"value2": "5",
"checked": false,
"remote": false,
"prohibitInput": true,
"hintShow": false,
"hintText": ""
},
"1_5": {
"type": "date",
"type2": "bw",
"value1": "2020-09-23",
"value2": "2020-10-10",
"checked": false,
"remote": false,
"prohibitInput": false,
"hintShow": false,
"hintText": ""
},
"2_5": {
"type": "date",
"type2": "bw",
"value1": "2020-09-23",
"value2": "2020-10-10",
"checked": false,
"remote": false,
"prohibitInput": false,
"hintShow": false,
"hintText": ""
},
"3_5": {
"type": "date",
"type2": "bw",
"value1": "2020-09-23",
"value2": "2020-10-10",
"checked": false,
"remote": false,
"prohibitInput": false,
"hintShow": false,
"hintText": ""
},
"4_5": {
"type": "date",
"type2": "bw",
"value1": "2020-09-23",
"value2": "2020-10-10",
"checked": false,
"remote": false,
"prohibitInput": false,
"hintShow": false,
"hintText": ""
},
"5_5": {
"type": "date",
"type2": "bw",
"value1": "2020-09-23",
"value2": "2020-10-10",
"checked": false,
"remote": false,
"prohibitInput": false,
"hintShow": false,
"hintText": ""
},
"6_5": {
"type": "date",
"type2": "bw",
"value1": "2020-09-23",
"value2": "2020-10-10",
"checked": false,
"remote": false,
"prohibitInput": false,
"hintShow": false,
"hintText": ""
},
"1_6": {
"type": "validity",
"type2": "card",
"value1": "",
"value2": "",
"checked": false,
"remote": false,
"prohibitInput": false,
"hintShow": false,
"hintText": ""
},
"2_6": {
"type": "validity",
"type2": "card",
"value1": "",
"value2": "",
"checked": false,
"remote": false,
"prohibitInput": false,
"hintShow": false,
"hintText": ""
},
"3_6": {
"type": "validity",
"type2": "card",
"value1": "",
"value2": "",
"checked": false,
"remote": false,
"prohibitInput": false,
"hintShow": false,
"hintText": ""
},
"4_6": {
"type": "validity",
"type2": "card",
"value1": "",
"value2": "",
"checked": false,
"remote": false,
"prohibitInput": false,
"hintShow": false,
"hintText": ""
},
"5_6": {
"type": "validity",
"type2": "card",
"value1": "",
"value2": "",
"checked": false,
"remote": false,
"prohibitInput": false,
"hintShow": false,
"hintText": ""
},
"6_6": {
"type": "validity",
"type2": "card",
"value1": "",
"value2": "",
"checked": false,
"remote": false,
"prohibitInput": false,
"hintShow": false,
"hintText": ""
},
"1_7": {
"type": "validity",
"type2": "phone",
"value1": "",
"value2": "",
"checked": false,
"remote": false,
"prohibitInput": false,
"hintShow": false,
"hintText": ""
},
"2_7": {
"type": "validity",
"type2": "phone",
"value1": "",
"value2": "",
"checked": false,
"remote": false,
"prohibitInput": false,
"hintShow": false,
"hintText": ""
},
"3_7": {
"type": "validity",
"type2": "phone",
"value1": "",
"value2": "",
"checked": false,
"remote": false,
"prohibitInput": false,
"hintShow": false,
"hintText": ""
},
"4_7": {
"type": "validity",
"type2": "phone",
"value1": "",
"value2": "",
"checked": false,
"remote": false,
"prohibitInput": false,
"hintShow": false,
"hintText": ""
},
"5_7": {
"type": "validity",
"type2": "phone",
"value1": "",
"value2": "",
"checked": false,
"remote": false,
"prohibitInput": false,
"hintShow": false,
"hintText": ""
},
"6_7": {
"type": "validity",
"type2": "phone",
"value1": "",
"value2": "",
"checked": false,
"remote": false,
"prohibitInput": false,
"hintShow": false,
"hintText": ""
}
}
}
export default sheetDataVerification;

1
src/demoData/sheetFormula.js

@ -86,7 +86,6 @@ const sheetFormula = {
},
"index": "1",
"chart": [],
"status": 1,
"order": "1",
"column": 18,
"row": 45,

159
src/demoData/sheetPicture.js

File diff suppressed because one or more lines are too long

2
src/demoData/sheetPivotTable.js

@ -4,7 +4,7 @@ const sheetPivotTable = {
"config": {},
"index": "7",
"chart": [],
"status": "0",
"status": 0,
"order": "7",
"column": 18,
"row": 36,

2
src/demoData/sheetPivotTableData.js

@ -6,7 +6,7 @@ const sheetPivotTableData = {
},
"index": "6",
"chart": [],
"status": "0",
"status": 0,
"order": "6",
"hide": 0,
"column": 18,

2
src/demoData/sheetSparkline.js

@ -445,7 +445,7 @@ const sheetSparkline = {
},
"index": "4",
"chart": [],
"status": 1,
"status": 0,
"order": "4",
"column": 18,
"row": 36,

2
src/demoData/sheetTable.js

@ -43,7 +43,7 @@ const sheetTable = {
},
"index": "3",
"chart": [],
"status": "0",
"status": 0,
"order": "3",
"column": 18,
"row": 36,

2
src/expendPlugins/chart/plugin.js

@ -431,7 +431,7 @@ function chart_selection() {
'<div class="luckysheet-chart-rangeShow-move" data-type="left" style="width: 2px;border-left: 2px solid #fff;border-right: 2px solid #fff;background: ' +
color +
';position: absolute;top: 0;bottom: 0;left: -2px;z-index: 18;opacity: 0.9;cursor: move;"></div>' +
'<div style="border: 2px solid #FC6666;background: ' +
'<div style="border: 2px solid #85c0fc;background: ' +
color +
';position: absolute;top: 0;right: 0;bottom: 0;left: 0;z-index: 15;opacity: 0.1;"></div>' +
'<div class="luckysheet-chart-rangeShow-resize" data-type="lt" style="width: 6px;height: 6px;border: 1px solid #fff;background: ' +

4
src/index.html

@ -30,6 +30,8 @@
import sheetPivotTable from './demoData/sheetPivotTable.js'
import sheetSparkline from './demoData/sheetSparkline.js'
import sheetChart from './demoData/sheetChart.js'
import sheetPicture from './demoData/sheetPicture.js'
import sheetDataVerification from './demoData/sheetDataVerification.js'
$(function () {
// [sheetCell,sheetFormula,sheetConditionFormat,sheetSparkline,sheetTable,sheetComment,sheetPivotTableData,sheetPivotTable,sheetChart]
// [{"name":"Sheet1","config":{"columnlen":{"0":241},"rowlen":{"0":81}},"index":"1","status":"1","order":"0","luckysheet_select_save":[{"row":[0,0],"column":[4,4],"sheetIndex":1}],"zoomRatio":1,"showGridLines":"1","defaultColWidth":72,"defaultRowHeight":18,"celldata":[
@ -79,7 +81,7 @@
forceCalculation:false,
plugins: ['chart'],
data:
[sheetCell,sheetFormula,sheetConditionFormat,sheetSparkline,sheetTable,sheetComment,sheetPivotTableData,sheetPivotTable,sheetChart]
[sheetCell,sheetFormula,sheetConditionFormat,sheetSparkline,sheetTable,sheetComment,sheetPivotTableData,sheetPivotTable,sheetChart,sheetPicture,sheetDataVerification]
// [{"name":"Sheet1","config":{"columnlen":{"0":241},"rowlen":{"0":81}},"index":"1","status":"1","order":"0","luckysheet_select_save":[{"row":[0,0],"column":[4,4],"sheetIndex":1}],"zoomRatio":1,"showGridLines":"1","defaultColWidth":72,"defaultRowHeight":18,"celldata":[
// {"r":0,"c":0,
// "v":{

6
src/store/index.js

@ -17,9 +17,9 @@ const Store = {
cellmainWidth: 0,
cellmainHeight: 0,
toolbarHeight: 72,
infobarHeight: 56,
calculatebarHeight: 3,
toolbarHeight: 0,
infobarHeight: 0,
calculatebarHeight: 0,
rowHeaderWidth: 46,
columeHeaderHeight: 20,
cellMainSrollBarSize: 12,

Loading…
Cancel
Save