@opentinyvue/vue-calendar-view 2.25.0 → 2.27.0

package/lib/mobile-first.js

@@ -75,7 +75,7 @@ var __vue2_script = defineComponent({
     TinyDatePicker: DatePicker,
     TinyTooltip: Tooltip
   },
-  props: [].concat(props, ["_constants", "modelValue", "showMark", "showNewSchedule", "setDayBgColor", "disabled", "mode", "modes", "year", "month", "dayTimes", "events", "height", "mark-color", "multi-select", "showBackToday", "showTipTime"]),
+  props: [].concat(props, ["_constants", "modelValue", "showMark", "showNewSchedule", "setDayBgColor", "disabled", "mode", "modes", "year", "month", "day", "dayTimes", "events", "height", "mark-color", "multi-select", "showBackToday", "showTipTime"]),
   setup: function setup$1(props2, context) {
     return setup({
       props: props2,
@@ -98,7 +98,10 @@ var render = function render2() {
   var _h = _vm.$createElement;
   var _c = _vm._self._c || _h;
   return _c("div", {
-    staticClass: "w-full h-auto",
+    staticClass: "w-full h-auto overflow-auto",
+    style: {
+      "height": _vm.height ? parseInt(_vm.height) + "px" : "auto"
+    },
     attrs: {
       "data-tag": "tiny-calendar-view"
     }
@@ -137,9 +140,9 @@ var render = function render2() {
     class: [_vm.showBackToday ? "ml-5" : "", "shrink-0"],
     attrs: {
       "shape": "filter",
-      "type": "month",
+      "type": _vm.state.dateType,
       "clearable": false,
-      "format": _vm.t("ui.calendarView.dateFormat")
+      "format": _vm.day ? _vm.t("ui.calendarView.dateFormat") : _vm.t("ui.calendarView.monthFormat")
     },
     on: {
       "change": _vm.currentDateChange
@@ -403,16 +406,19 @@ var render = function render2() {
         return _c("li", {
           key: date.value + item.time,
           staticClass: "relative h-5 p-0.5 list-none border-b border-color-bg-2",
-          class: [i % 2 === 0 ? "border-dashed" : "border-solid"]
+          class: {
+            "border-dashed": i % 2 === 0,
+            "border-solid": i % 2 !== 0,
+            "overflow-hidden overflow-y-auto scrollbar-size-0": _vm.getEventByTime(date.value, item.time, _vm.state.dayTimes[i + 1] && _vm.state.dayTimes[i + 1].time).length > 1
+          }
         }, _vm._l(_vm.getEventByTime(date.value, item.time, _vm.state.dayTimes[i + 1] && _vm.state.dayTimes[i + 1].time), function(event, idx) {
           return _c("div", {
             key: idx,
-            staticClass: "w-11/12 flex items-center px-1.5 absolute top-0 left-0 z-10 leading-normal rounded-sm",
+            staticClass: "w-11/12 flex mb-0.5 items-center px-1.5 top-0 left-0 z-10 leading-normal rounded-sm",
             class: [_vm.gcls("theme-" + (event.theme || _vm.blue))],
             style: {
               "height": event.height + "px",
-              "left": event.left + "px",
-              "width": "calc(92% - " + event.left + "px)"
+              "width": "92%"
             }
           }, [_c("span", [_vm._v(_vm._s(event.title))])]);
         }), 0);
@@ -492,8 +498,8 @@ function __vue2_injectStyles(context) {
     this[o] = __cssModules[o];
   }
 }
-var mobileFirst = /* @__PURE__ */ function() {
+var mobileFirst = /* @__PURE__ */ (function() {
   return __component__.exports;
-}();
+})();
 
 export { mobileFirst as default };

package/lib/pc.js

@@ -44,7 +44,7 @@ var render = function render2() {
   return _c("div", {
     staticClass: "tiny-calendar-view",
     style: {
-      "height": typeof _vm.height === "number" ? _vm.height + "px" : _vm.height
+      "height": _vm.height ? parseInt(_vm.height) + "px" : "auto"
     }
   }, [_c("div", {
     staticClass: "tiny-calendar-view__header"
@@ -55,9 +55,9 @@ var render = function render2() {
   }, [_vm._v(_vm._s(_vm.t("ui.calendarView.backToday")))]) : _vm._e()], 1), _c("tiny-date-picker", {
     staticClass: "tiny-calendar-view__picker",
     attrs: {
-      "type": "month",
+      "type": _vm.state.dateType,
       "clearable": false,
-      "format": _vm.t("ui.calendarView.dateFormat")
+      "format": _vm.day ? _vm.t("ui.calendarView.dateFormat") : _vm.t("ui.calendarView.monthFormat")
     },
     on: {
       "change": _vm.currentDateChange
@@ -235,7 +235,10 @@ var render = function render2() {
       }, _vm._l(_vm.state.dayTimes, function(item, i) {
         return _c("li", {
           key: date.value + item.time,
-          class: i % 2 === 0 && "is-even-num"
+          class: {
+            "is-even-num": i % 2 === 0,
+            "is-scroll-list": _vm.getEventByTime(date.value, item.time, _vm.state.dayTimes[i + 1] && _vm.state.dayTimes[i + 1].time).length > 1
+          }
         }, _vm._l(_vm.getEventByTime(date.value, item.time, _vm.state.dayTimes[i + 1] && _vm.state.dayTimes[i + 1].time), function(event, idx) {
           return _c("div", {
             key: idx,
@@ -243,8 +246,7 @@ var render = function render2() {
             class: ["theme-" + (event.theme || "blue")],
             style: {
               "height": event.height + "px",
-              "left": event.left + "px",
-              "width": "calc(92% - " + event.left + "px)"
+              "width": "92%"
             }
           }, [_c("span", [_vm._v(_vm._s(event.title))])]);
         }), 0);
@@ -327,7 +329,7 @@ var __vue2_script = defineComponent({
     TinyDatePicker: DatePicker,
     TinyTooltip: Tooltip
   },
-  props: [].concat(props, ["modelValue", "showMark", "showNewSchedule", "setDayBgColor", "disabled", "mode", "modes", "year", "month", "dayTimes", "events", "height", "markColor", "multiSelect", "showBackToday", "showTipTime"]),
+  props: [].concat(props, ["modelValue", "showMark", "showNewSchedule", "setDayBgColor", "disabled", "mode", "modes", "year", "day", "month", "dayTimes", "events", "height", "markColor", "multiSelect", "showBackToday", "showTipTime"]),
   setup: function setup$1(props2, context) {
     return setup({
       props: props2,
@@ -351,8 +353,8 @@ function __vue2_injectStyles(context) {
     this[o] = __cssModules[o];
   }
 }
-var pc = /* @__PURE__ */ function() {
+var pc = /* @__PURE__ */ (function() {
   return __component__.exports;
-}();
+})();
 
 export { pc as default };

package/package.json

@@ -1,24 +1,24 @@
 {
   "name": "@opentinyvue/vue-calendar-view",
-  "version": "2.25.0",
+  "type": "module",
+  "version": "2.27.0",
   "description": "",
+  "license": "MIT",
+  "sideEffects": false,
   "main": "./lib/index.js",
   "module": "./lib/index.js",
-  "sideEffects": false,
-  "type": "module",
   "dependencies": {
-    "@opentinyvue/vue-common": "~2.25.0",
-    "@opentinyvue/vue-icon": "~2.25.0",
-    "@opentinyvue/vue-renderless": "~3.25.0",
-    "@opentinyvue/vue-tooltip": "~2.25.0",
-    "@opentinyvue/vue-button": "~2.25.0",
-    "@opentinyvue/vue-date-picker": "~2.25.0",
-    "@opentinyvue/vue-radio-button": "~2.25.0",
-    "@opentinyvue/vue-radio-group": "~2.25.0",
-    "@opentinyvue/vue-slider-button": "~2.25.0",
-    "@opentinyvue/vue-slider-button-group": "~2.25.0",
-    "@opentinyvue/vue-theme": "~3.25.0"
+    "@opentinyvue/vue-button": "~2.27.0",
+    "@opentinyvue/vue-common": "~2.27.0",
+    "@opentinyvue/vue-date-picker": "~2.27.0",
+    "@opentinyvue/vue-icon": "~2.27.0",
+    "@opentinyvue/vue-radio-button": "~2.27.0",
+    "@opentinyvue/vue-radio-group": "~2.27.0",
+    "@opentinyvue/vue-renderless": "~3.27.0",
+    "@opentinyvue/vue-slider-button": "~2.27.0",
+    "@opentinyvue/vue-slider-button-group": "~2.27.0",
+    "@opentinyvue/vue-theme": "~3.27.0",
+    "@opentinyvue/vue-tooltip": "~2.27.0"
   },
-  "license": "MIT",
   "types": "index.d.ts"
 }