diff --git a/package.json b/package.json index 8d2addf36..bed3bc26a 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "stylus-loader": "^7.1.0", "tinymce": "^5.10.3", "tui-calendar-hi": "^1.15.1-5", - "view-design-hi": "^4.7.0-55", + "view-design-hi": "^4.7.0-56", "vite": "^2.9.15", "vite-plugin-file-copy": "^1.0.0", "vite-plugin-require": "^1.1.10", @@ -72,7 +72,7 @@ "vue-resize-observer": "^2.0.16", "vue-router": "^3.6.5", "vue-template-compiler": "~2.6.14", - "vue-virtual-scroll-list-hi": "^2.3.5-10", + "vue-virtual-scroll-list-hi": "^2.3.5-12", "vuedraggable": "^2.24.3", "vuex": "^3.6.2" }, diff --git a/resources/assets/js/App.vue b/resources/assets/js/App.vue index c8032be9a..d190948ca 100755 --- a/resources/assets/js/App.vue +++ b/resources/assets/js/App.vue @@ -49,7 +49,7 @@ export default { return { routePath: null, appInter: null, - countDown: Math.min(30, 60 - $A.Date().getSeconds()), + countDown: Math.min(30, 60 - $A.Date(true).getSeconds()), } }, @@ -167,7 +167,7 @@ export default { // this.countDown-- if (this.countDown <= 0) { - this.countDown = Math.min(30, 60 - $A.Date().getSeconds()) + this.countDown = Math.min(30, 60 - $A.Date(true).getSeconds()) this.$store.dispatch("todayAndOverdue") } }, diff --git a/resources/assets/js/functions/common.js b/resources/assets/js/functions/common.js index dd7f4c2bb..302aa0003 100755 --- a/resources/assets/js/functions/common.js +++ b/resources/assets/js/functions/common.js @@ -289,16 +289,16 @@ const localforage = require("localforage"); /** * 返回 时间对象|时间戳 - * @param v 支持时间戳|时间格式字符串|时间对象|空 + * @param v 支持时间戳|时间格式字符串|时间对象|boolean(当前时间) * @param timestamp 是否返回时间戳 * @returns {Date|number} * @constructor */ - Date(v = undefined, timestamp = false) { + Date(v, timestamp = false) { if (typeof v === "string" && this.strExists(v, "-")) { v = v.replace(/-/g, '/'); } - const d = v === undefined || v === null ? new Date() : new Date(v); + const d = typeof v === "boolean" ? new Date() : new Date(v); if (timestamp === true) { return Math.round(d.getTime() / 1000) }