@nutui/nutui 4.1.0-beta.6 → 4.1.0

package/dist/packages/_es/Navbar.js

@@ -1,4 +1,4 @@
-import { toRefs, ref, computed, onMounted, nextTick, resolveComponent, openBlock, createElementBlock, createElementVNode, normalizeClass, normalizeStyle, renderSlot, createVNode, createCommentVNode, toDisplayString } from "vue";
+import { toRefs, ref, computed, onMounted, nextTick, resolveComponent, openBlock, createElementBlock, normalizeStyle, createElementVNode, normalizeClass, renderSlot, createVNode, createCommentVNode, toDisplayString } from "vue";
 import { c as createComponent } from "./component-0fbad28e.js";
 import { Left } from "@nutui/icons-vue";
 import { _ as _export_sfc } from "./_plugin-vue_export-helper-cc2b3d55.js";
@@ -41,10 +41,9 @@ const _sfc_main = create({
   },
   emits: ["on-click-back", "on-click-title", "on-click-icon", "on-click-right"],
   setup(props, { emit }) {
-    const { border, fixed, safeAreaInsetTop, placeholder, zIndex } = toRefs(props);
-    const navBarWrap = ref(null);
-    const navBarHtml = ref(null);
-    let navHeight = ref();
+    const { border, fixed, safeAreaInsetTop, placeholder } = toRefs(props);
+    const navHeight = ref("auto");
+    const navbarRef = ref();
     const classes = computed(() => {
       const prefixCls = componentName;
       return {
@@ -54,37 +53,44 @@ const _sfc_main = create({
         [`${prefixCls}--safe-area-inset-top`]: safeAreaInsetTop.value
       };
     });
-    const styles = computed(() => {
-      return {
-        zIndex: zIndex.value
-      };
+    const rootStyle = computed(() => {
+      if (fixed.value && placeholder.value) {
+        return {
+          height: navHeight.value
+        };
+      }
+      return {};
     });
+    const getNavHeight = () => {
+      if (navbarRef.value) {
+        const rect = navbarRef.value.getBoundingClientRect();
+        navHeight.value = `${rect.height}px`;
+      }
+    };
     onMounted(() => {
       if (fixed.value && placeholder.value) {
         nextTick(() => {
-          var _a;
-          navHeight.value = (_a = navBarHtml == null ? void 0 : navBarHtml.value) == null ? void 0 : _a.getBoundingClientRect().height;
-          navBarWrap.value.style.height = navHeight.value + "px";
+          getNavHeight();
         });
       }
     });
-    function handleLeft() {
+    const handleLeft = () => {
       emit("on-click-back");
-    }
-    function handleCenter() {
+    };
+    const handleCenter = () => {
       emit("on-click-title");
-    }
-    function handleCenterIcon() {
+    };
+    const handleCenterIcon = () => {
       emit("on-click-icon");
-    }
-    function handleRight() {
+    };
+    const handleRight = () => {
       emit("on-click-right");
-    }
+    };
     return {
-      navBarWrap,
-      navBarHtml,
+      navbarRef,
+      rootStyle,
       classes,
-      styles,
+      navHeight,
       handleLeft,
       handleCenter,
       handleCenterIcon,
@@ -93,35 +99,24 @@ const _sfc_main = create({
   }
 });
 const _hoisted_1 = {
-  key: 0,
-  class: "nut-navbar--placeholder",
-  ref: "navBarWrap"
-};
-const _hoisted_2 = {
-  key: 1,
-  class: "nut-navbar__text"
-};
-const _hoisted_3 = { class: "nut-navbar__title" };
-const _hoisted_4 = {
-  key: 0,
-  class: "nut-navbar__text"
-};
-const _hoisted_5 = {
   key: 1,
   class: "nut-navbar__text"
 };
-const _hoisted_6 = { class: "nut-navbar__title" };
-const _hoisted_7 = {
+const _hoisted_2 = { class: "nut-navbar__title" };
+const _hoisted_3 = {
   key: 0,
   class: "nut-navbar__text"
 };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Left = resolveComponent("Left");
-  return _ctx.fixed && _ctx.placeholder ? (openBlock(), createElementBlock("view", _hoisted_1, [
+  return openBlock(), createElementBlock("view", {
+    class: "nut-navbar--placeholder",
+    style: normalizeStyle(_ctx.rootStyle)
+  }, [
     createElementVNode("view", {
       class: normalizeClass(_ctx.classes),
-      style: normalizeStyle(_ctx.styles),
-      ref: "navBarHtml"
+      style: normalizeStyle({ zIndex: _ctx.zIndex }),
+      ref: "navbarRef"
     }, [
       createElementVNode("view", {
         class: "nut-navbar__left",
@@ -133,10 +128,10 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             color: "#979797"
           })
         ]) : createCommentVNode("", true),
-        _ctx.leftText ? (openBlock(), createElementBlock("view", _hoisted_2, toDisplayString(_ctx.leftText), 1)) : createCommentVNode("", true),
+        _ctx.leftText ? (openBlock(), createElementBlock("view", _hoisted_1, toDisplayString(_ctx.leftText), 1)) : createCommentVNode("", true),
         renderSlot(_ctx.$slots, "left")
       ]),
-      createElementVNode("view", _hoisted_3, [
+      createElementVNode("view", _hoisted_2, [
         _ctx.title ? (openBlock(), createElementBlock("view", {
           key: 0,
           class: "title",
@@ -157,53 +152,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         class: "nut-navbar__right",
         onClick: _cache[4] || (_cache[4] = (...args) => _ctx.handleRight && _ctx.handleRight(...args))
       }, [
-        _ctx.desc ? (openBlock(), createElementBlock("view", _hoisted_4, toDisplayString(_ctx.desc), 1)) : createCommentVNode("", true),
+        _ctx.desc ? (openBlock(), createElementBlock("view", _hoisted_3, toDisplayString(_ctx.desc), 1)) : createCommentVNode("", true),
         renderSlot(_ctx.$slots, "right")
       ])
     ], 6)
-  ], 512)) : (openBlock(), createElementBlock("view", {
-    key: 1,
-    class: normalizeClass(_ctx.classes),
-    style: normalizeStyle(_ctx.styles)
-  }, [
-    createElementVNode("view", {
-      class: "nut-navbar__left",
-      onClick: _cache[5] || (_cache[5] = (...args) => _ctx.handleLeft && _ctx.handleLeft(...args))
-    }, [
-      _ctx.leftShow ? renderSlot(_ctx.$slots, "left-show", { key: 0 }, () => [
-        createVNode(_component_Left, {
-          height: "12px",
-          color: "#979797"
-        })
-      ]) : createCommentVNode("", true),
-      _ctx.leftText ? (openBlock(), createElementBlock("view", _hoisted_5, toDisplayString(_ctx.leftText), 1)) : createCommentVNode("", true),
-      renderSlot(_ctx.$slots, "left")
-    ]),
-    createElementVNode("view", _hoisted_6, [
-      _ctx.title ? (openBlock(), createElementBlock("view", {
-        key: 0,
-        class: "title",
-        onClick: _cache[6] || (_cache[6] = (...args) => _ctx.handleCenter && _ctx.handleCenter(...args))
-      }, toDisplayString(_ctx.title), 1)) : createCommentVNode("", true),
-      _ctx.titleIcon ? (openBlock(), createElementBlock("view", {
-        key: 1,
-        class: "icon",
-        onClick: _cache[8] || (_cache[8] = (...args) => _ctx.handleCenterIcon && _ctx.handleCenterIcon(...args))
-      }, [
-        renderSlot(_ctx.$slots, "title-icon", {
-          onClick: _cache[7] || (_cache[7] = (...args) => _ctx.handleCenterIcon && _ctx.handleCenterIcon(...args))
-        })
-      ])) : createCommentVNode("", true),
-      renderSlot(_ctx.$slots, "content")
-    ]),
-    createElementVNode("view", {
-      class: "nut-navbar__right",
-      onClick: _cache[9] || (_cache[9] = (...args) => _ctx.handleRight && _ctx.handleRight(...args))
-    }, [
-      _ctx.desc ? (openBlock(), createElementBlock("view", _hoisted_7, toDisplayString(_ctx.desc), 1)) : createCommentVNode("", true),
-      renderSlot(_ctx.$slots, "right")
-    ])
-  ], 6));
+  ], 4);
 }
 const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 export {

package/dist/packages/_es/Sticky.js

@@ -34,6 +34,7 @@ const _sfc_main = create({
     const state = reactive({
       fixed: false,
       height: 0,
+      width: 0,
       transform: 0
     });
     const threshold = computed(() => {
@@ -49,6 +50,8 @@ const _sfc_main = create({
         return {};
       return {
         [props.position]: `${threshold.value}px`,
+        height: `${state.height}px`,
+        width: `${state.width}px`,
         transform: state.transform ? `translate3d(0, ${state.transform}px, 0)` : void 0,
         position: state.fixed ? "fixed" : void 0,
         zIndex: Number(props.zIndex)
@@ -63,6 +66,7 @@ const _sfc_main = create({
       const stickyRect = useRect(stCurrent);
       const containerRect = useRect(containerEle);
       state.height = rootRect.height;
+      state.width = rootRect.width;
       const getFixed = () => {
         let fixed = false;
         if (props.position === "top") {

package/dist/packages/_es/Uploader.js

@@ -4,7 +4,7 @@ var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
-import { reactive, computed, h, resolveComponent, openBlock, createElementBlock, normalizeClass, renderSlot, createBlock, resolveDynamicComponent, createCommentVNode, Fragment, renderList, createElementVNode, toDisplayString, createVNode } from "vue";
+import { ref, watch, computed, h, reactive, resolveComponent, openBlock, createElementBlock, normalizeClass, renderSlot, createBlock, resolveDynamicComponent, createCommentVNode, Fragment, renderList, createElementVNode, toDisplayString, createVNode } from "vue";
 import { c as createComponent } from "./component-0fbad28e.js";
 import { f as funInterceptor } from "./Interceptor-c05a39f2.js";
 import Progress from "./Progress.js";
@@ -151,8 +151,14 @@ const _sfc_main = create({
     "file-item-click"
   ],
   setup(props, { emit }) {
-    const fileList = reactive(props.fileList);
-    let uploadQueue = [];
+    const fileList = ref(props.fileList);
+    const uploadQueue = ref([]);
+    watch(
+      () => props.fileList,
+      () => {
+        fileList.value = props.fileList;
+      }
+    );
     const classes = computed(() => {
       const prefixCls = componentName;
       return {
@@ -213,7 +219,7 @@ const _sfc_main = create({
           option,
           fileItem
         });
-        emit("update:fileList", fileList);
+        emit("update:fileList", fileList.value);
       };
       uploadOption.onFailure = (responseText, option) => {
         fileItem.status = "error";
@@ -228,7 +234,7 @@ const _sfc_main = create({
       if (props.autoUpload) {
         task.upload();
       } else {
-        uploadQueue.push(
+        uploadQueue.value.push(
           new Promise((resolve) => {
             resolve(task);
           })
@@ -237,14 +243,15 @@ const _sfc_main = create({
     };
     const clearUploadQueue = (index2 = -1) => {
       if (index2 > -1) {
-        uploadQueue.splice(index2, 1);
+        uploadQueue.value.splice(index2, 1);
       } else {
-        uploadQueue = [];
-        fileList.splice(0, fileList.length);
+        uploadQueue.value = [];
+        fileList.value = [];
+        emit("update:fileList", fileList.value);
       }
     };
     const submit = () => {
-      Promise.all(uploadQueue).then((res) => {
+      Promise.all(uploadQueue.value).then((res) => {
         res.forEach((i) => i.upload());
       });
     };
@@ -266,11 +273,11 @@ const _sfc_main = create({
           const reader = new FileReader();
           reader.onload = (event) => {
             fileItem.url = event.target.result;
-            fileList.push(fileItem);
+            fileList.value.push(fileItem);
           };
           reader.readAsDataURL(file);
         } else {
-          fileList.push(fileItem);
+          fileList.value.push(fileItem);
         }
       });
     };
@@ -289,24 +296,24 @@ const _sfc_main = create({
       if (oversizes.length) {
         emit("oversize", oversizes);
       }
-      let currentFileLength = files.length + fileList.length;
+      let currentFileLength = files.length + fileList.value.length;
       if (currentFileLength > maximum) {
         files.splice(files.length - (currentFileLength - maximum));
       }
       return files;
     };
     const deleted = (file, index2) => {
-      fileList.splice(index2, 1);
+      fileList.value.splice(index2, 1);
       emit("delete", {
         file,
-        fileList,
+        fileList: fileList.value,
         index: index2
       });
     };
     const onDelete = (file, index2) => {
       clearUploadQueue(index2);
       funInterceptor(props.beforeDelete, {
-        args: [file, fileList],
+        args: [file, fileList.value],
         done: () => deleted(file, index2)
       });
     };
@@ -322,7 +329,7 @@ const _sfc_main = create({
         changeReadFile(files);
       }
       emit("change", {
-        fileList,
+        fileList: fileList.value,
         event
       });
       if (props.clearInput) {

package/dist/packages/navbar/index.scss

@@ -33,6 +33,7 @@
     width: 100%;
   }
   &--placeholder {
+    display: block;
     width: 100%;
   }
   &--safe-area-inset-top {

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.0-beta.6",
+  "version": "4.1.0",
   "contributions": {
     "html": {
       "tags": [
@@ -917,7 +917,7 @@
             {
               "name": "img-url",
               "default": "-",
-              "description": "左侧图片 `Url`",
+              "description": "左侧图片 `URL`",
               "value": {
                 "type": "string",
                 "kind": "expression"
@@ -2730,13 +2730,139 @@
           "events": [],
           "attributes": [
             {
-              "name": "src",
-              "default": "undefined",
-              "description": "预览图片链接",
+              "name": "show",
+              "default": "`false`",
+              "description": "是否展示预览图片",
+              "value": {
+                "type": "boolean",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "videos",
+              "default": "`[]`",
+              "description": "预览的视频数组（视频自动放到图片之前）",
+              "value": {
+                "type": "videoarray[]",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "images",
+              "default": "`[]`",
+              "description": "预览图片数组",
+              "value": {
+                "type": "imagearray[]",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "autoplay",
+              "default": "`3000`",
+              "description": "自动轮播时长，0 表示不会自动轮播",
+              "value": {
+                "type": "number | string",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "init-no",
+              "default": "`0`",
+              "description": "初始页码",
+              "value": {
+                "type": "number",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "pagination-visible",
+              "default": "`false`",
+              "description": "分页指示器是否展示",
+              "value": {
+                "type": "boolean",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "pagination-color",
+              "default": "`#fff`",
+              "description": "分页指示器选中的颜色",
               "value": {
                 "type": "string",
                 "kind": "expression"
               }
+            },
+            {
+              "name": "content-close",
+              "default": "`true`",
+              "description": "点击图片可以退出预览",
+              "value": {
+                "type": "boolean",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "show-index",
+              "default": "`true`",
+              "description": "是否显示页码",
+              "value": {
+                "type": "boolean",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "closeable",
+              "default": "`false`",
+              "description": "是否显示关闭图标",
+              "value": {
+                "type": "boolean",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "close-icon-position",
+              "default": "`top-right`",
+              "description": "关闭图标位置，可选值：`top-left`",
+              "value": {
+                "type": "string",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "before-close",
+              "default": "-",
+              "description": "关闭前的回调函数，返回 `false` 可阻止关闭，支持返回 `Promise`",
+              "value": {
+                "type": "(active: number) => boolean | promise<`boolean`>",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "max-zoom",
+              "default": "`3`",
+              "description": "手势缩放时，最大缩放比例",
+              "value": {
+                "type": "number",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "min-zoom",
+              "default": "`1/3`",
+              "description": "手势缩放时，最小缩放比例",
+              "value": {
+                "type": "number",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "is-loop",
+              "default": "`true`",
+              "description": "是否循环播放",
+              "value": {
+                "type": "boolean",
+                "kind": "expression"
+              }
             }
           ]
         },
@@ -5947,7 +6073,7 @@
             },
             {
               "name": "placeholder",
-              "default": "`'请输入内容'`",
+              "default": "`'请输入'`",
               "description": "设置占位提示文字",
               "value": {
                 "type": "string",