@nutui/nutui 4.1.2 → 4.1.3

package/dist/packages/_es/{index-3a5098e4.js → index-66fff386.js}

@@ -230,7 +230,10 @@ const _sfc_main = create({
   },
   emits: ["choose", "update", "close", "select"],
   setup(props, { emit, slots }) {
-    const weekdays = translate("weekdays");
+    const weekdays = translate("weekdays").map((day, index) => ({
+      day,
+      weekend: index === 0 || index === 6
+    }));
     const weeks = ref([...weekdays.slice(props.firstDayOfWeek, 7), ...weekdays.slice(0, props.firstDayOfWeek)]);
     const months = ref(null);
     const monthsPanel = ref(null);
@@ -301,22 +304,25 @@ const _sfc_main = create({
     const getCurrDate = (day, month) => {
       return month.curData[0] + "-" + month.curData[1] + "-" + Utils.getNumTwoBit(+day.day);
     };
-    const getClass = (day, month) => {
+    const getClass = (day, month, index) => {
+      const res = [];
+      if (typeof index === "number" && ((index + 1 + props.firstDayOfWeek) % 7 === 0 || (index + props.firstDayOfWeek) % 7 === 0)) {
+        res.push("weekend");
+      }
       const currDate = getCurrDate(day, month);
       const { type } = props;
       if (day.type == "curr") {
         if (Utils.isEqual(state.currDate, currDate) || (type == "range" || type == "week") && (isStart(currDate) || isEnd(currDate)) || type == "multiple" && isMultiple(currDate)) {
-          return `${state.dayPrefix}--active`;
+          res.push(`${state.dayPrefix}--active`);
         } else if (state.propStartDate && Utils.compareDate(currDate, state.propStartDate) || state.propEndDate && Utils.compareDate(state.propEndDate, currDate)) {
-          return `${state.dayPrefix}--disabled`;
+          res.push(`${state.dayPrefix}--disabled`);
         } else if ((type == "range" || type == "week") && Array.isArray(state.currDate) && Object.values(state.currDate).length == 2 && Utils.compareDate(state.currDate[0], currDate) && Utils.compareDate(currDate, state.currDate[1])) {
-          return `${state.dayPrefix}--choose`;
-        } else {
-          return null;
+          res.push(`${state.dayPrefix}--choose`);
         }
       } else {
-        return `${state.dayPrefix}--disabled`;
+        res.push(`${state.dayPrefix}--disabled`);
       }
+      return res;
     };
     const confirm = () => {
       const { type } = props;
@@ -335,7 +341,7 @@ const _sfc_main = create({
     };
     const chooseDay = (day, month, isFirst = false) => {
       var _a, _b;
-      if (getClass(day, month) != `${state.dayPrefix}--disabled`) {
+      if (!getClass(day, month).includes(`${state.dayPrefix}--disabled`)) {
         const { type } = props;
         let [y, m] = month.curData;
         let days = [...month.curData];
@@ -710,7 +716,7 @@ const _sfc_main = create({
       state.translateY = defaultScrollTop;
     };
     const isActive = (day, month) => {
-      return (props.type == "range" || props.type == "week") && day.type == "curr" && getClass(day, month) == "nut-calendar__day--active";
+      return (props.type == "range" || props.type == "week") && day.type == "curr" && getClass(day, month).includes("nut-calendar__day--active");
     };
     const isStartTip = (day, month) => {
       return isActive(day, month) && isStart(getCurrDate(day, month));
@@ -865,9 +871,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       createElementVNode("view", _hoisted_5, [
         (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.weeks, (item, index) => {
           return openBlock(), createElementBlock("view", {
-            class: "nut-calendar__weekday",
+            class: normalizeClass(["nut-calendar__weekday", { weekend: item.weekend }]),
             key: index
-          }, toDisplayString(item), 1);
+          }, toDisplayString(item.day), 3);
         }), 128))
       ], 512)
     ]),
@@ -895,7 +901,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                   (openBlock(true), createElementBlock(Fragment, null, renderList(month.monthData, (day, i) => {
                     return openBlock(), createElementBlock("view", {
                       key: i,
-                      class: normalizeClass(["nut-calendar__day", _ctx.getClass(day, month)]),
+                      class: normalizeClass(["nut-calendar__day", _ctx.getClass(day, month, i)]),
                       onClick: ($event) => _ctx.chooseDay(day, month)
                     }, [
                       createElementVNode("view", _hoisted_10, [

package/dist/packages/_es/{index-5ffbc437.js → index-7fe29a2f.js}

@@ -17,10 +17,10 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-import { c as createComponent } from "./component-0fbad28e.js";
 import { reactive, computed, watch, watchEffect, toRefs, resolveComponent, openBlock, createBlock, Teleport, mergeProps, createCommentVNode, createVNode, Transition, withCtx, withDirectives, createElementVNode, normalizeClass, normalizeStyle, renderSlot, createElementBlock, vShow } from "vue";
-import Overlay from "./Overlay.js";
 import { Close } from "@nutui/icons-vue";
+import Overlay from "./Overlay.js";
+import { c as createComponent } from "./component-0fbad28e.js";
 import { _ as _export_sfc } from "./_plugin-vue_export-helper-cc2b3d55.js";
 const popupProps = {
   visible: {
@@ -53,7 +53,7 @@ const popupProps = {
   },
   style: {
     type: Object,
-    default: {}
+    default: () => ({})
   },
   popClass: {
     type: String,
@@ -101,110 +101,105 @@ const popupProps = {
   },
   overlayStyle: {
     type: Object,
-    default: {}
+    default: () => ({})
   }
 };
+const { componentName, create } = createComponent("popup");
 const initIndex = 2e3;
 let _zIndex = initIndex;
-const component = (componentName2, components) => {
-  return {
-    components,
-    props: __spreadValues({}, popupProps),
-    emits: ["click-pop", "click-close-icon", "open", "close", "opened", "closed", "click-overlay", "update:visible"],
-    setup(props, { emit }) {
-      const state = reactive({
-        zIndex: props.zIndex,
-        showSlot: true,
-        closed: props.closeable
-      });
-      const classes = computed(() => {
-        const prefixCls = componentName2;
-        return {
-          [prefixCls]: true,
-          ["round"]: props.round,
-          [`nut-popup--${props.position}`]: true,
-          [`nut-popup--${props.position}--safebottom`]: props.position === "bottom" && props.safeAreaInsetBottom,
-          [props.popClass]: true
-        };
-      });
-      const popStyle = computed(() => {
-        return __spreadValues({
-          zIndex: state.zIndex,
-          transitionDuration: `${props.duration}s`
-        }, props.style);
-      });
-      const transitionName = computed(() => {
-        return props.transition ? props.transition : `nut-popup-slide-${props.position}`;
-      });
-      const open = () => {
-        if (props.zIndex !== initIndex) {
-          _zIndex = Number(props.zIndex);
-        }
-        emit("update:visible", true);
-        state.zIndex = ++_zIndex;
-        if (props.destroyOnClose) {
-          state.showSlot = true;
-        }
-        emit("open");
-      };
-      const close = () => {
-        emit("update:visible", false);
-        emit("close");
-        if (props.destroyOnClose) {
-          setTimeout(() => {
-            state.showSlot = false;
-          }, +props.duration * 1e3);
-        }
-      };
-      const onClick = (e) => {
-        emit("click-pop", e);
-      };
-      const onClickCloseIcon = (e) => {
-        e.stopPropagation();
-        emit("click-close-icon", e);
-        emit("update:visible", false);
-      };
-      const onClickOverlay = (e) => {
-        emit("click-overlay", e);
-        if (props.closeOnClickOverlay) {
-          emit("update:visible", false);
-        }
-      };
-      const onOpened = (el) => {
-        emit("opened", el);
-      };
-      const onClosed = (el) => {
-        emit("closed", el);
-      };
-      watch(
-        () => props.visible,
-        () => {
-          props.visible ? open() : close();
-        }
-      );
-      watchEffect(() => {
-        state.closed = props.closeable;
-      });
-      return __spreadProps(__spreadValues({}, toRefs(state)), {
-        popStyle,
-        transitionName,
-        classes,
-        onClick,
-        onClickCloseIcon,
-        onClickOverlay,
-        onOpened,
-        onClosed
-      });
-    }
-  };
-};
-const { componentName, create } = createComponent("popup");
-const _sfc_main = create(
-  component(componentName, {
+const _sfc_main = create({
+  components: {
     [Overlay.name]: Overlay,
     Close
-  })
-);
+  },
+  props: popupProps,
+  emits: ["click-pop", "click-close-icon", "open", "close", "opened", "closed", "click-overlay", "update:visible"],
+  setup(props, { emit }) {
+    const state = reactive({
+      zIndex: props.zIndex,
+      showSlot: true,
+      closed: props.closeable
+    });
+    const classes = computed(() => {
+      const prefixCls = componentName;
+      return {
+        [prefixCls]: true,
+        ["round"]: props.round,
+        [`nut-popup--${props.position}`]: true,
+        [`nut-popup--${props.position}--safebottom`]: props.position === "bottom" && props.safeAreaInsetBottom,
+        [props.popClass]: true
+      };
+    });
+    const popStyle = computed(() => {
+      return __spreadValues({
+        zIndex: state.zIndex,
+        transitionDuration: `${props.duration}s`
+      }, props.style);
+    });
+    const transitionName = computed(() => {
+      return props.transition ? props.transition : `nut-popup-slide-${props.position}`;
+    });
+    const open = () => {
+      if (props.zIndex !== initIndex) {
+        _zIndex = Number(props.zIndex);
+      }
+      emit("update:visible", true);
+      state.zIndex = ++_zIndex;
+      if (props.destroyOnClose) {
+        state.showSlot = true;
+      }
+      emit("open");
+    };
+    const close = () => {
+      emit("update:visible", false);
+      emit("close");
+      if (props.destroyOnClose) {
+        setTimeout(() => {
+          state.showSlot = false;
+        }, +props.duration * 1e3);
+      }
+    };
+    const onClick = (e) => {
+      emit("click-pop", e);
+    };
+    const onClickCloseIcon = (e) => {
+      e.stopPropagation();
+      emit("click-close-icon", e);
+      emit("update:visible", false);
+    };
+    const onClickOverlay = (e) => {
+      emit("click-overlay", e);
+      if (props.closeOnClickOverlay) {
+        emit("update:visible", false);
+      }
+    };
+    const onOpened = (el) => {
+      emit("opened", el);
+    };
+    const onClosed = (el) => {
+      emit("closed", el);
+    };
+    watch(
+      () => props.visible,
+      () => {
+        props.visible ? open() : close();
+      }
+    );
+    watchEffect(() => {
+      state.closed = props.closeable;
+    });
+    return __spreadProps(__spreadValues({}, toRefs(state)), {
+      popStyle,
+      transitionName,
+      classes,
+      onClick,
+      onClickCloseIcon,
+      onClickOverlay,
+      onOpened,
+      onClosed
+    });
+  }
+});
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_nut_overlay = resolveComponent("nut-overlay");
   const _component_Close = resolveComponent("Close");

package/dist/packages/calendar/index.scss

@@ -85,8 +85,7 @@
       box-shadow: 0px 4px 10px 0px rgba($color: #000000, $alpha: 0.06);
 
       .nut-calendar__weekday {
-        &:first-of-type,
-        &:last-of-type {
+        &.weekend {
           color: $calendar-day67-font-color;
         }
       }
@@ -140,12 +139,6 @@
 
       .nut-calendar__days {
         overflow: hidden;
-        .nut-calendar__days-item {
-          .nut-calendar__day:nth-child(7n + 0),
-          .nut-calendar__day:nth-child(7n + 1) {
-            color: $calendar-day67-font-color;
-          }
-        }
         .nut-calendar__day {
           float: left;
           width: 14.28%;
@@ -157,6 +150,10 @@
           flex-direction: column;
           position: relative;
 
+          &.weekend {
+            color: $calendar-day67-font-color;
+          }
+
           .nut-calendar__day-tips {
             position: absolute;
             width: 100%;

package/dist/smartips/web-types.json

@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/JetBrains/web-types/master/schema/web-types.json",
   "framework": "vue",
   "name": "NutUI",
-  "version": "4.1.2",
+  "version": "4.1.3",
   "contributions": {
     "html": {
       "tags": [
@@ -3515,7 +3515,7 @@
             {
               "name": "z-index",
               "default": "-",
-              "description": "导航栏 `z-index `",
+              "description": "导航栏 `z-index`",
               "value": {
                 "type": "number ｜ string",
                 "kind": "expression"