Browse Source

update: dayjs

master
zhangchen 5 years ago
parent
commit
9d95b14467
  1. 2
      package.json
  2. 2
      src/controllers/conditionformat.js
  3. 1
      src/plugins/js/pako.min.js

2
package.json

@ -29,7 +29,7 @@
}, },
"dependencies": { "dependencies": {
"@babel/runtime": "^7.12.1", "@babel/runtime": "^7.12.1",
"dayjs": "^1.9.4", "dayjs": "^1.9.6",
"flatpickr": "^4.6.6", "flatpickr": "^4.6.6",
"jquery": "^2.2.4", "jquery": "^2.2.4",
"jspdf": "^2.1.1", "jspdf": "^2.1.1",

2
src/controllers/conditionformat.js

@ -1528,7 +1528,7 @@ const conditionformat = {
"content": content, "content": content,
"botton": `<button id="luckysheet-conditionformat-dialog-confirm" class="btn btn-primary">${conditionformat_Text.confirm}</button> "botton": `<button id="luckysheet-conditionformat-dialog-confirm" class="btn btn-primary">${conditionformat_Text.confirm}</button>
<button class="btn btn-default luckysheet-model-close-btn">${conditionformat_Text.cancel}</button>`, <button class="btn btn-default luckysheet-model-close-btn">${conditionformat_Text.cancel}</button>`,
"style": "z-index:100003" "style": "z-index:9999"
})); }));
let $t = $("#luckysheet-conditionformat-dialog") let $t = $("#luckysheet-conditionformat-dialog")
.find(".luckysheet-modal-dialog-content") .find(".luckysheet-modal-dialog-content")

1
src/plugins/js/pako.min.js

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save