@touchvue/ui 1.0.0-beta.53 → 1.0.0-beta.55

package/lib/packages/components/calendar/src/calendar.vue2.js

@@ -121,9 +121,9 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
         const startVal = start.value.day || start.value.month ? getStringValue(start.value) : "";
         const endVal = end.value.day || end.value.month ? getStringValue(end.value) : "";
         return `${startVal},${endVal}`;
-      } else if (props.type === "months") {
+      } else if (props.type === "month" && props.multiple) {
         return monthsRangeData.value.join(",");
-      } else if (props.type === "dates") {
+      } else if (props.type === "date" && props.multiple) {
         return daysRangeData.value.join(",");
       } else {
         return getStringValue();
@@ -235,7 +235,7 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
     vue.watch(
       () => props.modelValue,
       (val) => {
-        if (props.type !== "dates") {
+        if (!(props.type === "date" && props.multiple)) {
           setData();
         }
         if (changeFrom.value === "out") {
@@ -279,7 +279,7 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
       { deep: true }
     );
     const commonSetDayVal = () => {
-      if (props.type === "dates") {
+      if (props.type === "date" && props.multiple) {
         const mValue = props.modelValue;
         const mArray = mValue.split(",");
         if (!mArray.length)
@@ -350,7 +350,7 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
       const imonth = `${yearVal}-${addZero(monthVal)}`;
       const iday = dayVal !== null && dayVal !== void 0 ? `${addZero(dayVal)}` : "01";
       const itime = `${hourVal}:${minuteVal}:${secondVal}`;
-      if (props.type === "month" || props.type === "months") {
+      if (props.type === "month") {
         return imonth;
       } else if (props.type === "datetime" || props.type === "time") {
         return `${imonth}-${iday} ${itime}`;
@@ -402,7 +402,7 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
         if (props.rangeType === "end") {
           year.value = year.value || (/* @__PURE__ */ new Date()).getFullYear();
           if ((end.value.day || end.value.month) && isAnyDate(getStringValue(end.value))) {
-            if (props.type === "month" || props.type === "months") {
+            if (props.type === "month") {
               if (start.value.year === end.value.year) {
                 year.value = end.value.year + 1;
               } else {
@@ -438,8 +438,8 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
           }
         }
       } else {
-        if (props.modelValue && (!isNaN(new Date(props.modelValue).getTime()) || props.type === "months" || props.type === "dates")) {
-          if (props.type === "months" || props.type === "dates") {
+        if (props.modelValue && (!isNaN(new Date(props.modelValue).getTime()) || props.type === "month" && props.multiple || props.type === "date" && props.multiple)) {
+          if (props.type === "month" && props.multiple || props.type === "date" && props.multiple) {
             const mValue = props.modelValue;
             const mArray = mValue.split(",");
             if (!mArray.length)
@@ -450,13 +450,13 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
             hour.value = String(new Date(mArray[mArray.length - 1]).getHours());
             minute.value = String(new Date(mArray[mArray.length - 1]).getMinutes());
             second.value = String(new Date(mArray[mArray.length - 1]).getSeconds());
-            if (props.type === "months") {
+            if (props.type === "month" && props.multiple) {
               monthsRangeData.value = mArray;
               if (monthsRangeData.value.length > 0) {
                 setMonthsData();
               }
             }
-            if (props.type === "dates") {
+            if (props.type === "date" && props.multiple) {
               daysRangeData.value = mArray;
               if (daysRangeData.value.length > 0) {
                 setDaysData();
@@ -535,9 +535,9 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
           if ((i + emptyLength) % 7 === 0) {
             obj.sat = true;
           }
-          const point = props.point.filter((item) => {
+          const point = Array.isArray(props.point) ? props.point.filter((item) => {
             return item.day === `${year.value}-${addZero(month.value)}-${addZero(i)}`;
-          });
+          }) : [];
           obj.point = point;
           arr.push(obj);
         }
@@ -577,7 +577,7 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
     };
     const selectMonth = (item) => {
       if (item) {
-        if (props.range && (props.type === "month" || props.type === "months")) {
+        if (props.range && props.type === "month") {
           let startVal = {};
           let endVal = {};
           if (!start.value.month && !end.value.month) {
@@ -613,7 +613,7 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
           end.value = JSON.parse(JSON.stringify(endVal));
           submitValue.value = iValue.value;
         } else {
-          if (props.type === "month" || props.type === "months") {
+          if (props.type === "month") {
             emit(
               "beforeChange",
               getStringValue({
@@ -696,14 +696,14 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
     };
     const selectMonthAction = (item) => {
       month.value = item;
-      if (props.type === "month" || props.type === "months") {
+      if (props.type === "month") {
         const str = `${year.value || curYear}-${addZero(month.value)}`;
         monthsRangeData.value = toggleString(monthsRangeData.value, str);
         setMonthsData();
       }
       monthLayer.value = false;
       setDayData();
-      if (props.type === "month" || props.type === "months") {
+      if (props.type === "month") {
         day.value = 1;
         submitValue.value = iValue.value;
       }
@@ -749,7 +749,7 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
           let val = getStringValue({
             day: item.value
           });
-          if (!props.type || props.type === "date" || props.type === "dates") {
+          if (!props.type || props.type === "date" || props.type === "date" && props.multiple) {
             emit("beforeChange", val);
             beforeChange.handleBeforeChange(
               props.beforeChange,
@@ -823,8 +823,7 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const setYearClass = (item) => {
       return {
         "is-cur": curYear.value === item,
-        "is-on": year.value === item,
-        "is-checked": (props.type === "months" || props.type === "dates") && yearsData.value.includes(item)
+        "is-on": year.value === item || (props.type === "month" && props.multiple || props.type === "date" && props.multiple) && yearsData.value.includes(item)
       };
     };
     const setMonthClass = (item) => {
@@ -832,7 +831,7 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
       if (year.value === curYear.value && curMonth.value === item) {
         arr.push("is-cur");
       }
-      if (props.range && (props.type === "month" || props.type === "months")) {
+      if (props.range && props.type === "month") {
         if (year.value === start.value.year && item === start.value.month) {
           if (end.value.month) {
             arr.push("is-start");
@@ -860,12 +859,9 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
         if (month.value === item && (props.type === "month" || props.type === "date" || !props.type)) {
           arr.push("is-on");
         }
-        if ((props.type === "months" || props.type === "dates") && yearsData.value.length > 0) {
+        if ((props.type === "month" && props.multiple || props.type === "date" && props.multiple) && yearsData.value.length > 0) {
           if (yearsData.value.includes(year.value) && years.value.includes(year.value) && monthsRangeData.value.includes(`${year.value}-${addZero(item)}`)) {
-            arr.push("is-checked");
-            if (month.value === item) {
-              arr.push("is-on");
-            }
+            arr.push("is-on");
           }
         }
       }
@@ -933,14 +929,11 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
           arr.push("is-range");
         }
       } else {
-        if (day.value === item.value && props.type !== "dates") {
+        if (day.value === item.value && !(props.type === "date" && props.multiple)) {
           arr.push("is-on");
-        } else if (props.type === "dates") {
+        } else if (props.type === "date" && props.multiple) {
           if (yearsData.value.includes(year.value) && monthsData.value.includes(addZero(month.value)) && daysRangeData.value.includes(`${year.value}-${addZero(month.value)}-${addZero(item.value)}`)) {
-            arr.push("is-checked");
-            if (day.value === item.value) {
-              arr.push("is-on");
-            }
+            arr.push("is-on");
           }
         }
       }
@@ -1109,7 +1102,7 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
               vue.createElementVNode(
                 "div",
                 {
-                  class: vue.normalizeClass(["to-calendar-header-content", { "is-unfold": _ctx.type !== "month" && _ctx.type !== "months" }]),
+                  class: vue.normalizeClass(["to-calendar-header-content", { "is-unfold": _ctx.type !== "month" }]),
                   onClick: vue.withModifiers(toggleMonthSelector, ["stop"])
                 },
                 [
@@ -1369,10 +1362,10 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
               512
               /* NEED_PATCH */
             ), [
-              [vue.vShow, monthLayer.value || _ctx.type === "month" || _ctx.type === "months"]
+              [vue.vShow, monthLayer.value || _ctx.type === "month"]
             ]),
             vue.createCommentVNode(" \u5468 "),
-            _ctx.type !== "month" && _ctx.type !== "months" ? vue.withDirectives((vue.openBlock(), vue.createElementBlock(
+            _ctx.type !== "month" ? vue.withDirectives((vue.openBlock(), vue.createElementBlock(
               "div",
               {
                 key: 0,
@@ -1432,10 +1425,10 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
               512
               /* NEED_PATCH */
             )), [
-              [vue.vShow, !(monthLayer.value || _ctx.type === "month" || _ctx.type === "months")]
+              [vue.vShow, !(monthLayer.value || _ctx.type === "month")]
             ]) : vue.createCommentVNode("v-if", true),
             vue.createCommentVNode(" \u65E5 "),
-            _ctx.type !== "month" && _ctx.type !== "months" ? vue.withDirectives((vue.openBlock(), vue.createElementBlock(
+            _ctx.type !== "month" ? vue.withDirectives((vue.openBlock(), vue.createElementBlock(
               "div",
               {
                 key: 1,
@@ -1509,7 +1502,7 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
               512
               /* NEED_PATCH */
             )), [
-              [vue.vShow, !(monthLayer.value || _ctx.type === "month" || _ctx.type === "months")]
+              [vue.vShow, !(monthLayer.value || _ctx.type === "month")]
             ]) : vue.createCommentVNode("v-if", true),
             vue.createCommentVNode(" \u56FE\u4F8B "),
             _ctx.legend ? vue.withDirectives((vue.openBlock(), vue.createElementBlock(
@@ -1526,7 +1519,7 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
               512
               /* NEED_PATCH */
             )), [
-              [vue.vShow, !(monthLayer.value || _ctx.type === "month" || _ctx.type === "months")]
+              [vue.vShow, !(monthLayer.value || _ctx.type === "month")]
             ]) : vue.createCommentVNode("v-if", true)
           ])) : vue.createCommentVNode("v-if", true),
           vue.createCommentVNode(" \u65F6\u95F4 "),