Skip to content
This repository has been archived by the owner on Mar 28, 2024. It is now read-only.

Commit

Permalink
feat: d
Browse files Browse the repository at this point in the history 
d
  • Loading branch information
@Dushusir
Dushusir committed Jul 30, 2020
1 parent 6c09a5d commit 07d004f
Show file tree
Hide file tree
Showing 30 changed files with 150,272 additions and 48 deletions.
14 changes: 7 additions & 7 deletions src/controllers/server.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -795,12 +795,12 @@ const server = {
$.post(_this.updateUrl, { compress: iscommpress, gridKey: _this.gridKey, data: params }, function (data) {
let re = eval('('+ data +')')
if(re.status){
$("#jfgrid_info_detail_update").html("最近存档时间:"+ moment().format("M-D H:m:s"));
$("#jfgrid_info_detail_save").html("同步成功");
$("#luckysheet_info_detail_update").html("最近存档时间:"+ moment().format("M-D H:m:s"));
$("#luckysheet_info_detail_save").html("同步成功");
_this.clearcachelocaldata();
}
else{
$("#jfgrid_info_detail_save").html("<span style='color:#ff2121'>同步失败</span>");
$("#luckysheet_info_detail_save").html("<span style='color:#ff2121'>同步失败</span>");
_this.restorecachelocaldata();
}
_this.requestlast = moment();
Expand All @@ -815,9 +815,9 @@ const server = {
imageRequest: function(){
let _this = this;

html2canvas($("#" + container).find(".jfgrid-grid-window").get(0), {
html2canvas($("#" + container).find(".luckysheet-grid-window").get(0), {
onrendered: function(canvas) {
//let imgcut = $("#jfgrid-cell-main").find(".jfgrid-grid-window");
//let imgcut = $("#luckysheet-cell-main").find(".luckysheet-grid-window");
//document.body.appendChild(canvas);
let old = $(canvas).appendTo("body");
old.hide();
Expand All @@ -844,7 +844,7 @@ const server = {
//console.log(base64);
//console.log("压缩：", pako.gzip(base64, { to: "string" }));
//console.log("imageRequest");
let curindex = jfgrid.sheetmanage.getCurSheetnoset();
let curindex = luckysheet.sheetmanage.getCurSheetnoset();
_this.imageRequestLock =true;
// let data1 = pako.gzip(encodeURIComponent(JSON.stringify({"t":"thumb", "img": base64, "curindex":curindex })), { to: "string" });
let data1 = encodeURIComponent(JSON.stringify({"t":"thumb", "img": base64, "curindex":curindex }));
Expand All @@ -858,7 +858,7 @@ const server = {
imageRequestLast = moment();
}
else{
$("#jfgrid_info_detail_save").html("<span style='color:#ff2121'>网络不稳定</span>");
$("#luckysheet_info_detail_save").html("<span style='color:#ff2121'>网络不稳定</span>");
}
_this.imageRequestLock =true;
});
Expand Down
56 changes: 28 additions & 28 deletions src/css/luckysheet-core.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6139,7 +6139,7 @@ fieldset[disabled] a.btn {
}


.jfgrid-modal-dialog {
.luckysheet-modal-dialog {
-webkit-box-shadow: 0 4px 16px rgba(0,0,0,.2);
-moz-box-shadow: 0 4px 16px rgba(0,0,0,.2);
box-shadow: 0 4px 16px rgba(0,0,0,.2);
Expand All @@ -6154,7 +6154,7 @@ fieldset[disabled] a.btn {
z-index: 100002;
}

.jfgrid-modal-dialog-mask {
.luckysheet-modal-dialog-mask {
position: absolute;
height: 100%;
width: 100%;
Expand All @@ -6168,7 +6168,7 @@ fieldset[disabled] a.btn {



.jfgrid-modal-dialog-title {
.luckysheet-modal-dialog-title {
background-color: #fff;
color: #000;
cursor: default;
Expand All @@ -6178,7 +6178,7 @@ fieldset[disabled] a.btn {
margin: 0 0 16px;
}

.jfgrid-modal-dialog-title-close {
.luckysheet-modal-dialog-title-close {
height: 11px;
opacity: 0.7;
padding: 17px;
Expand All @@ -6190,46 +6190,46 @@ fieldset[disabled] a.btn {
outline: 0;
}

.jfgrid-modal-dialog-chart {
.luckysheet-modal-dialog-chart {
padding: 20px 10px;
webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}

/* .jfgrid-modal-dialog-chart .jfgrid-modal-dialog-title{
/* .luckysheet-modal-dialog-chart .luckysheet-modal-dialog-title{
line-height:0px;
margin: 0px;
font-size: 12px;
}
.jfgrid-modal-dialog-chart .jfgrid-modal-dialog-title-close,.jfgrid-modal-dialog-chart .jfgrid-modal-dialog-title-max,.jfgrid-modal-dialog-chart .jfgrid-modal-dialog-title-min,.jfgrid-modal-dialog-chart .jfgrid-modal-dialog-title-restore, .jfgrid-modal-dialog-chart .jfgrid-modal-dialog-title-update {
.luckysheet-modal-dialog-chart .luckysheet-modal-dialog-title-close,.luckysheet-modal-dialog-chart .luckysheet-modal-dialog-title-max,.luckysheet-modal-dialog-chart .luckysheet-modal-dialog-title-min,.luckysheet-modal-dialog-chart .luckysheet-modal-dialog-title-restore, .luckysheet-modal-dialog-chart .luckysheet-modal-dialog-title-update {
height: 5px;
opacity: 0.7;
padding: 12px;
}
.jfgrid-modal-dialog-title-update {
.luckysheet-modal-dialog-title-update {
right: 105px;
color:#FC6666;
font-size:14px;
padding-top: 9px;
}
.jfgrid-modal-dialog-title-min {
.luckysheet-modal-dialog-title-min {
right: 70px;
padding-top: 9px;
}
.jfgrid-modal-dialog-title-max, .jfgrid-modal-dialog-title-restore {
.luckysheet-modal-dialog-title-max, .luckysheet-modal-dialog-title-restore {
right: 35px;
}
.jfgrid-modal-dialog-title-restore{
.luckysheet-modal-dialog-title-restore{
display: none;
}*/

.jfgrid-modal-dialog-resize {
.luckysheet-modal-dialog-resize {
position: absolute;
border: 2px solid #FC6666;
margin: 0px;
Expand All @@ -6241,7 +6241,7 @@ fieldset[disabled] a.btn {
pointer-events: none;
}

.jfgrid-modal-dialog-resize-item {
.luckysheet-modal-dialog-resize-item {
position: absolute;
height: 6px;
width: 6px;
Expand All @@ -6251,60 +6251,60 @@ fieldset[disabled] a.btn {
border-radius: 6px;
}

.jfgrid-modal-dialog-resize-item-lt {
.luckysheet-modal-dialog-resize-item-lt {
left: -6px;
top: -6px;
cursor: se-resize;
}

.jfgrid-modal-dialog-resize-item-mt {
.luckysheet-modal-dialog-resize-item-mt {
left: 50%;
top: -6px;
margin-left: -4px;
cursor: s-resize;
}

.jfgrid-modal-dialog-resize-item-rt {
.luckysheet-modal-dialog-resize-item-rt {
right: -6px;
top: -6px;
cursor: ne-resize;
}

.jfgrid-modal-dialog-resize-item-lm {
.luckysheet-modal-dialog-resize-item-lm {
top: 50%;
left: -6px;
margin-top: -4px;
cursor: w-resize;
}

.jfgrid-modal-dialog-resize-item-rm {
.luckysheet-modal-dialog-resize-item-rm {
top: 50%;
right: -6px;
margin-top: -4px;
cursor: w-resize;
}

.jfgrid-modal-dialog-resize-item-lb {
.luckysheet-modal-dialog-resize-item-lb {
left: -6px;
bottom: -6px;
cursor: ne-resize;
}

.jfgrid-modal-dialog-resize-item-mb {
.luckysheet-modal-dialog-resize-item-mb {
left: 50%;
bottom: -6px;
margin-left: -4px;
cursor: s-resize;
}

.jfgrid-modal-dialog-resize-item-rb {
.luckysheet-modal-dialog-resize-item-rb {
right: -6px;
bottom: -6px;
cursor: se-resize;
}


.jfgrid-modal-dialog-controll {
.luckysheet-modal-dialog-controll {
position: absolute;
margin: 0px;
padding: 0px;
Expand All @@ -6314,7 +6314,7 @@ fieldset[disabled] a.btn {
top: 0px;
}

.jfgrid-modal-controll-btn {
.luckysheet-modal-controll-btn {
height: 13px;
/* opacity: 0.7; */
padding: 8px;
Expand All @@ -6335,22 +6335,22 @@ fieldset[disabled] a.btn {
-o-transition: all 0.2s;
}

.jfgrid-modal-controll-btn:hover {
.luckysheet-modal-controll-btn:hover {
border: 1px solid #A1A1A1;
color: #FC6666;
}

.jfgrid-modal-controll-btn:active {
.luckysheet-modal-controll-btn:active {
border: 1px solid #BBBBBB;
background: #EFEFEF;
color: #FC6666;
}

.jfgrid-modal-controll-del {
.luckysheet-modal-controll-del {
font-size: 16px;
}

.jfgrid-modal-controll-max-close {
.luckysheet-modal-controll-max-close {
font-size: 22px;
width: 42px;
height: 42px;
Expand All @@ -6368,7 +6368,7 @@ fieldset[disabled] a.btn {
text-align: center;
}

.jfgrid-modal-controll-max-close:hover {
.luckysheet-modal-controll-max-close:hover {
background: #FC6666;
cursor: pointer;
}
1 change: 1 addition & 0 deletions src/expendPlugins/chart/chartmix.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 07d004f

Please sign in to comment.