@nutui/nutui 4.0.1-beta.2 → 4.0.1-beta.3

package/dist/packages/_es/{index-4f2972bc.js → index-0432a798.js}

@@ -4,23 +4,27 @@ import { r as requestAniFrame } from "./raf-729dad54.js";
 import { u as useExpose } from "./index-79c5dc33.js";
 import { _ as _export_sfc } from "./_plugin-vue_export-helper-cc2b3d55.js";
 const Utils = {
+  /**
+   * 是否为闫年
+   * @return {Boolse} true|false
+   */
   isLeapYear: function(y) {
     return y % 4 == 0 && y % 100 != 0 || y % 400 == 0;
   },
+  /**
+   * 返回星期数
+   * @return {String}
+   */
   getWhatDay: function(year, month, day) {
     const date = new Date(year + "/" + month + "/" + day);
     const index = date.getDay();
-    const dayNames = [
-      "星期日",
-      "星期一",
-      "星期二",
-      "星期三",
-      "星期四",
-      "星期五",
-      "星期六"
-    ];
+    const dayNames = ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"];
     return dayNames[index];
   },
+  /**
+   * 返回星期数
+   * @return {Number}
+   */
   getMonthPreDay: function(year, month) {
     const date = new Date(year + "/" + month + "/01");
     let day = date.getDay();
@@ -29,30 +33,28 @@ const Utils = {
     }
     return day;
   },
+  /**
+   * 返回月份天数
+   * @return {Number}
+   */
   getMonthDays: function(year, month) {
     if (/^0/.test(month)) {
       month = month.split("")[1];
     }
-    return [
-      0,
-      31,
-      this.isLeapYear(Number(year)) ? 29 : 28,
-      31,
-      30,
-      31,
-      30,
-      31,
-      31,
-      30,
-      31,
-      30,
-      31
-    ][month];
+    return [0, 31, this.isLeapYear(Number(year)) ? 29 : 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month];
   },
+  /**
+   * 补齐数字位数
+   * @return {string}
+   */
   getNumTwoBit: function(n) {
     n = Number(n);
     return (n > 9 ? "" : "0") + n;
   },
+  /**
+   * 日期对象转成字符串
+   * @return {string}
+   */
   date2Str: function(date, split) {
     split = split || "-";
     const y = date.getFullYear();
@@ -60,6 +62,11 @@ const Utils = {
     const d = this.getNumTwoBit(date.getDate());
     return [y, m, d].join(split);
   },
+  /**
+   * 返回日期格式字符串
+   * @param {Number} 0返回今天的日期、1返回明天的日期，2返回后天得日期，依次类推
+   * @return {string} '2014-12-31'
+   */
   getDay: function(i) {
     i = i || 0;
     let date = new Date();
@@ -67,6 +74,10 @@ const Utils = {
     date = new Date(date.getTime() + diff);
     return this.date2Str(date);
   },
+  /**
+   * 时间比较
+   * @return {Boolean}
+   */
   compareDate: function(date1, date2) {
     const startTime = new Date(date1.replace("-", "/").replace("-", "/"));
     const endTime = new Date(date2.replace("-", "/").replace("-", "/"));
@@ -75,6 +86,10 @@ const Utils = {
     }
     return true;
   },
+  /**
+   * 时间是否相等
+   * @return {Boolean}
+   */
   isEqual: function(date1, date2) {
     const startTime = new Date(date1).getTime();
     const endTime = new Date(date2).getTime();
@@ -82,6 +97,51 @@ const Utils = {
       return true;
     }
     return false;
+  },
+  getMonthWeek: function(year, month, date, firstDayOfWeek = 0) {
+    const dateNow = new Date(Number(year), parseInt(month) - 1, Number(date));
+    let w = dateNow.getDay();
+    let d = dateNow.getDate();
+    let remainder = 6 - w;
+    if (firstDayOfWeek !== 0) {
+      w = w == 0 ? 7 : w;
+      remainder = 7 - w;
+    }
+    return Math.ceil((d + remainder) / 7);
+  },
+  getYearWeek: function(year, month, date, firstDayOfWeek = 0) {
+    const dateNow = new Date(Number(year), parseInt(month) - 1, Number(date));
+    const dateFirst = new Date(Number(year), 0, 1);
+    const dataNumber = Math.round((dateNow.valueOf() - dateFirst.valueOf()) / 864e5);
+    return Math.ceil((dataNumber + (dateFirst.getDay() + 1 - 1)) / 7);
+  },
+  getWeekDate: function(year, month, date, firstDayOfWeek = 0) {
+    const dateNow = new Date(Number(year), parseInt(month) - 1, Number(date));
+    const nowTime = dateNow.getTime();
+    let day = dateNow.getDay();
+    if (firstDayOfWeek === 0) {
+      const oneDayTime = 24 * 60 * 60 * 1e3;
+      const SundayTime = nowTime - day * oneDayTime;
+      const SaturdayTime = nowTime + (6 - day) * oneDayTime;
+      const sunday = this.date2Str(new Date(SundayTime));
+      const saturday = this.date2Str(new Date(SaturdayTime));
+      return [sunday, saturday];
+    } else {
+      day = day == 0 ? 7 : day;
+      const oneDayTime = 24 * 60 * 60 * 1e3;
+      const MondayTime = nowTime - (day - 1) * oneDayTime;
+      const SundayTime = nowTime + (7 - day) * oneDayTime;
+      const monday = this.date2Str(new Date(MondayTime));
+      const sunday = this.date2Str(new Date(SundayTime));
+      return [monday, sunday];
+    }
+  },
+  formatResultDate: function(date) {
+    let days = [...date.split("-")];
+    days[2] = Utils.getNumTwoBit(Number(days[2]));
+    days[3] = `${days[0]}-${days[1]}-${days[2]}`;
+    days[4] = Utils.getWhatDay(+days[0], +days[1], +days[2]);
+    return days;
   }
 };
 const { create, translate } = createComponent("calendar-item");
@@ -224,11 +284,11 @@ const _sfc_main = create({
       const currDate = getCurrDate(day, month);
       const { type } = props;
       if (day.type == "curr") {
-        if (Utils.isEqual(state.currDate, currDate) || type == "range" && (isStart(currDate) || isEnd(currDate)) || type == "multiple" && isMultiple(currDate)) {
+        if (Utils.isEqual(state.currDate, currDate) || (type == "range" || type == "week") && (isStart(currDate) || isEnd(currDate)) || type == "multiple" && isMultiple(currDate)) {
           return `${state.dayPrefix}--active`;
         } else if (state.propStartDate && Utils.compareDate(currDate, state.propStartDate) || state.propEndDate && Utils.compareDate(state.propEndDate, currDate)) {
           return `${state.dayPrefix}--disabled`;
-        } else if (type == "range" && Array.isArray(state.currDate) && Object.values(state.currDate).length == 2 && Utils.compareDate(state.currDate[0], currDate) && Utils.compareDate(currDate, state.currDate[1])) {
+        } 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;
@@ -240,8 +300,13 @@ const _sfc_main = create({
     const confirm = () => {
       const { type } = props;
       if (type == "range" && state.chooseData.length == 2 || type != "range") {
-        let chooseData = state.chooseData.slice(0);
-        emit("choose", chooseData);
+        let selectData = state.chooseData.slice(0);
+        if (type == "week") {
+          selectData = {
+            weekDate: [handleWeekDate(state.chooseData[0]), handleWeekDate(state.chooseData[1])]
+          };
+        }
+        emit("choose", selectData);
         if (props.poppable) {
           emit("update");
         }
@@ -251,6 +316,7 @@ const _sfc_main = create({
       if (getClass(day, month) != `${state.dayPrefix}--disabled`) {
         const { type } = props;
         let days = [...month.curData];
+        let [y, m] = month.curData;
         days[2] = Utils.getNumTwoBit(Number(day.day));
         days[3] = `${days[0]}-${days[1]}-${days[2]}`;
         days[4] = Utils.getWhatDay(+days[0], +days[1], +days[2]);
@@ -297,18 +363,46 @@ const _sfc_main = create({
               state.chooseData = [[...days], ...state.chooseData];
             }
           }
+        } else if (type == "week") {
+          let weekArr = Utils.getWeekDate(y, m, day.day, props.firstDayOfWeek);
+          if (state.propStartDate && Utils.compareDate(weekArr[0], state.propStartDate)) {
+            weekArr.splice(0, 1, state.propStartDate);
+          }
+          if (state.propEndDate && Utils.compareDate(state.propEndDate, weekArr[1])) {
+            weekArr.splice(1, 1, state.propEndDate);
+          }
+          state.currDate = weekArr;
+          state.chooseData = [Utils.formatResultDate(weekArr[0]), Utils.formatResultDate(weekArr[1])];
         } else {
           state.currDate = days[3];
           state.chooseData = [...days];
         }
         if (!isFirst) {
-          emit("select", state.chooseData);
+          let selectData = state.chooseData;
+          if (type == "week") {
+            selectData = {
+              weekDate: [
+                handleWeekDate(state.chooseData[0]),
+                handleWeekDate(state.chooseData[1])
+              ]
+            };
+          }
+          emit("select", selectData);
           if (props.isAutoBackFill || !props.poppable) {
             confirm();
           }
         }
       }
     };
+    const handleWeekDate = (weekDate) => {
+      let [y, m, d] = weekDate;
+      let obj = {
+        date: weekDate,
+        monthWeekNum: Utils.getMonthWeek(y, m, d, props.firstDayOfWeek),
+        yearWeekNum: Utils.getYearWeek(y, m, d, props.firstDayOfWeek)
+      };
+      return obj;
+    };
     const getCurrData = (type) => {
       const monthData = type == "prev" ? state.monthsData[0] : state.monthsData[state.monthsData.length - 1];
       let year = parseInt(monthData.curData[0]);
@@ -464,6 +558,19 @@ const _sfc_main = create({
           state.currDate = [...defaultArr];
           state.defaultData = [...splitDate(defaultArr[0])];
         }
+      } else if (props.type == "week" && Array.isArray(state.currDate)) {
+        if (state.currDate.length > 0) {
+          let [y, m, d] = splitDate(state.currDate[0]);
+          let weekArr = Utils.getWeekDate(y, m, d, props.firstDayOfWeek);
+          state.currDate = weekArr;
+          if (propStartDate && Utils.compareDate(state.currDate[0], propStartDate)) {
+            state.currDate.splice(0, 1, propStartDate);
+          }
+          if (propEndDate && Utils.compareDate(propEndDate, state.currDate[1])) {
+            state.currDate.splice(1, 1, propEndDate);
+          }
+          state.defaultData = [...splitDate(state.currDate[0]), ...splitDate(state.currDate[1])];
+        }
       } else {
         if (state.currDate) {
           if (propStartDate && Utils.compareDate(state.currDate, propStartDate)) {
@@ -481,7 +588,7 @@ const _sfc_main = create({
           if (item.title == translate("monthTitle", state.defaultData[0], state.defaultData[1])) {
             current = index;
           }
-          if (props.type == "range") {
+          if (props.type == "range" || props.type == "week") {
             if (item.title == translate("monthTitle", state.defaultData[3], state.defaultData[4])) {
               lastCurrent = index;
             }
@@ -495,6 +602,8 @@ const _sfc_main = create({
         if (props.type == "range") {
           chooseDay({ day: state.defaultData[2], type: "curr" }, state.monthsData[state.currentIndex], true);
           chooseDay({ day: state.defaultData[5], type: "curr" }, state.monthsData[lastCurrent], true);
+        } else if (props.type == "week") {
+          chooseDay({ day: state.defaultData[2], type: "curr" }, state.monthsData[state.currentIndex], true);
         } else if (props.type == "multiple") {
           [...state.currDate].forEach((item) => {
             let dateArr = splitDate(item);
@@ -554,8 +663,14 @@ const _sfc_main = create({
         }
       });
     };
+    const initPosition = () => {
+      if (months == null ? void 0 : months.value) {
+        months.value.scrollTop = state.monthsData[state.currentIndex].cssScrollHeight;
+      }
+    };
     useExpose({
-      scrollToDate
+      scrollToDate,
+      initPosition
     });
     const setDefaultRange = (monthsNum, current) => {
       if (monthsNum >= 3) {
@@ -573,7 +688,7 @@ const _sfc_main = create({
       state.translateY = defaultScrollTop;
     };
     const isActive = (day, month) => {
-      return props.type == "range" && day.type == "curr" && getClass(day, month) == "nut-calendar__day--active";
+      return (props.type == "range" || props.type == "week") && day.type == "curr" && getClass(day, month) == "nut-calendar__day--active";
     };
     const isStartTip = (day, month) => {
       return isActive(day, month) && isStart(getCurrDate(day, month));

package/dist/packages/_es/{index.vue_vue_type_script_lang-ee936659.js → index.vue_vue_type_script_lang-0725f0ae.js}

@@ -10,6 +10,7 @@ const _sfc_main = create({
     direction: {
       type: String,
       default: "vertical"
+      //horizontal
     },
     textPosition: {
       type: String,

package/dist/packages/_es/{index.vue_vue_type_script_lang-8b9f3de5.js → index.vue_vue_type_script_lang-9c679f64.js}

@@ -16,6 +16,7 @@ const _sfc_main = create({
     shape: {
       type: String,
       default: "round"
+      // button
     },
     label: {
       type: [String, Number, Boolean],

package/dist/packages/badge/index.scss

@@ -41,5 +41,8 @@
       border-radius: $badge-dot-border-radius;
       padding: $badge-dot-padding;
     }
+    &--bubble {
+      border-bottom-left-radius: 0;
+    }
   }
 }

package/dist/packages/checkbox/index.scss

@@ -6,6 +6,14 @@
         color: $checkbox-label-disable-color;
       }
     }
+    &__button {
+      background: $dark-background;
+      color: $dark-color;
+      &--disabled {
+        color: $checkbox-label-disable-color;
+        border: 1px solid $checkbox-label-disable-color;
+      }
+    }
   }
 }
 .nut-checkbox {
@@ -18,6 +26,39 @@
       margin-left: 0;
     }
   }
+  &__button {
+    display: inline-flex;
+    align-items: center;
+    padding: $checkbox-button-padding;
+    font-size: $checkbox-button-font-size;
+    background: $checkbox-button-background;
+    border-radius: $checkbox-button-border-radius;
+    color: $checkbox-label-color;
+    box-sizing: border-box;
+    border: 1px solid $checkbox-button-border-color;
+    &--active {
+      background: transparent;
+      color: $checkbox-button-font-color-active;
+      border: 1px solid $checkbox-button-border-color-active;
+      position: relative;
+      &::after {
+        position: absolute;
+        top: 0;
+        right: 0;
+        bottom: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        background-color: $checkbox-button-background-active;
+        opacity: 0.05;
+        content: '';
+      }
+    }
+    &--disabled {
+      color: $checkbox-label-disable-color;
+      border: none;
+    }
+  }
   &__label {
     flex: 1;
     margin-left: $checkbox-label-margin-left;

package/dist/packages/input/index.scss

@@ -77,6 +77,7 @@ textarea {
     position: relative;
     width: 100%;
     display: flex;
+    flex: 1;
   }
   &-disabled-mask {
     position: absolute;
@@ -95,17 +96,16 @@ textarea {
     // margin-top: -50%;
     // line-height: var(--van-field-word-limit-line-height);
   }
-  &-left-icon,
-  &-right-icon {
+  &-left-box,
+  &-right-box {
     display: flex;
     align-items: center;
     font-size: 0;
   }
-  &-clear,
-  &-right-icon {
+  &-right-box {
     margin-left: 4px;
   }
-  &-left-icon {
+  &-left-box {
     margin-right: 4px;
   }
   &-clear-box {
@@ -119,9 +119,7 @@ textarea {
     height: 16px;
     color: #c8c9cc;
     cursor: pointer;
-  }
-  .nut-button {
-    margin-left: 10px;
+    margin: 0 4px;
   }
   &--required {
     &::before {

package/dist/packages/noticebar/index.scss

@@ -121,6 +121,10 @@
     }
   }
 
+  .nut-noticebar-custom-item {
+    position: absolute;
+    top: 999999px;
+  }
   .go {
     margin: $noticebar-righticon-margin;
     align-self: center;

package/dist/packages/uploader/index.scss

@@ -117,6 +117,10 @@
       position: relative;
       width: $uploader-picture-width;
       height: $uploader-picture-height;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border-radius: 6px;
       .close {
         position: absolute;
         right: 0;
@@ -141,8 +145,9 @@
         @include oneline-ellipsis();
       }
       &__c {
-        height: 100%;
-        width: 100%;
+        max-width: 100%;
+        max-height: 100%;
+        border-radius: 6px;
       }
       &__file {
         height: 100%;

package/dist/resolver/index.d.ts

@@ -0,0 +1,6 @@
+import type { ComponentResolver } from 'unplugin-vue-components/types';
+export interface NutUIResolverOptions {
+    taro?: boolean;
+    autoImport?: boolean;
+}
+export default function NutUIResolver(options?: NutUIResolverOptions): ComponentResolver;

package/dist/resolver/index.js

@@ -0,0 +1 @@
+"use strict";const i=["showToast","showNotify","showDialog","showImagePreview"];function u(t,s){const{taro:e=!1,autoImport:r=!1}=s,o=e?"@nutui/nutui-taro":"@nutui/nutui",n=r?t.slice(4):t,c=`${o}/dist/packages/${n.toLowerCase()}/style`;return{name:t,from:o,sideEffects:c}}function a(t={}){return{type:"component",resolve:s=>{const{autoImport:e=!1}=t;if(e&&i.includes(s))return u(s,t);if(s.startsWith("Nut"))return u(s.slice(3),t)}}}module.exports=a;

package/dist/resolver/index.mjs

@@ -0,0 +1,24 @@
+const i = ["showToast", "showNotify", "showDialog", "showImagePreview"];
+function u(t, e) {
+  const { taro: o = !1, autoImport: n = !1 } = e, s = o ? "@nutui/nutui-taro" : "@nutui/nutui", r = n ? t.slice(4) : t, c = `${s}/dist/packages/${r.toLowerCase()}/style`;
+  return {
+    name: t,
+    from: s,
+    sideEffects: c
+  };
+}
+function a(t = {}) {
+  return {
+    type: "component",
+    resolve: (e) => {
+      const { autoImport: o = !1 } = t;
+      if (o && i.includes(e))
+        return u(e, t);
+      if (e.startsWith("Nut"))
+        return u(e.slice(3), t);
+    }
+  };
+}
+export {
+  a as default
+};

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.0.1-beta.2",
+  "version": "4.0.1-beta.3",
   "contributions": {
     "html": {
       "tags": [
@@ -562,6 +562,15 @@
                 "kind": "expression"
               }
             },
+            {
+              "name": "bubble()",
+              "default": "`false`",
+              "description": "是否为气泡形状",
+              "value": {
+                "type": "boolean",
+                "kind": "expression"
+              }
+            },
             {
               "name": "hidden",
               "default": "`false`",
@@ -757,7 +766,7 @@
             {
               "name": "type",
               "default": "'`one`'",
-              "description": "类型，日期单择`one`，区间选择`range`,日期多选`multiple`",
+              "description": "类型，日期单择`one`，区间选择`range`,日期多选`multiple`,周选择`week`(`v4.0.1`)",
               "value": {
                 "type": "string",
                 "kind": "expression"
@@ -1202,6 +1211,15 @@
                 "type": "boolean",
                 "kind": "expression"
               }
+            },
+            {
+              "name": "shape",
+              "default": "`round`",
+              "description": "形状，可选值：`button`、`round`",
+              "value": {
+                "type": "string",
+                "kind": "expression"
+              }
             }
           ]
         },