@nutui/nutui 4.3.15-beta.1 → 4.3.15-beta.2

package/dist/packages/toast/index.mjs

@@ -1,3 +1,2 @@
 import Toast from './Toast.js';
-import { showToast } from './Toast.js';
-export { Toast, showToast, Toast as default };
+export { Toast, Toast as default };

package/dist/packages/tour/Tour.js

@@ -17,10 +17,30 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-import { reactive, ref, computed, onMounted, watch, toRefs, nextTick, resolveComponent, openBlock, createElementBlock, normalizeClass, withDirectives, createElementVNode, vShow, Fragment, renderList, normalizeStyle, createCommentVNode, createVNode, withCtx, renderSlot, toDisplayString } from "vue";
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import { reactive, ref, computed, onMounted, watch, toRefs, resolveComponent, openBlock, createElementBlock, normalizeClass, createCommentVNode, createTextVNode, Fragment, renderList, normalizeStyle, createVNode, withCtx, renderSlot, createElementVNode, toDisplayString } from "vue";
 import { c as createComponent } from "../component-DQf3CENX.js";
-import { u as useRect } from "../index-B1qsj2XR.js";
-import { Close } from "@nutui/icons-vue";
+import { a as useTaroRectById } from "../index-m0Wcof-q.js";
+import { Close } from "@nutui/icons-vue-taro";
 import NutPopover from "../popover/Popover.js";
 import { _ as _export_sfc } from "../_plugin-vue_export-helper-1tPrXgE0.js";
 const { create } = createComponent("tour");
@@ -100,17 +120,19 @@ const _sfc_main = create({
   setup(props, { emit }) {
     const state = reactive({
       showTour: props.modelValue,
-      showPopup: false,
       active: 0
     });
-    const maskRect = ref({});
+    const showPopup = ref([false]);
+    let maskRect = [];
+    let maskStyles = ref([]);
     const classes = computed(() => {
       const prefixCls = "nut-tour";
       return `${prefixCls}`;
     });
-    const maskStyle = computed(() => {
+    const maskStyle = (index) => {
       const { offset, maskWidth, maskHeight } = props;
-      const { width, height, left, top } = maskRect.value;
+      if (!maskRect[index]) return {};
+      const { width, height, left, top } = maskRect[index];
       const center = [left + width / 2, top + height / 2];
       const w = Number(maskWidth ? maskWidth : width);
       const h = Number(maskHeight ? maskHeight : height);
@@ -120,29 +142,38 @@ const _sfc_main = create({
         top: `${center[1] - h / 2 - +offset[0]}px`,
         left: `${center[0] - w / 2 - +offset[1]}px`
       };
-      return styles;
-    });
+      maskStyles.value[index] = styles;
+    };
     const changeStep = (type) => {
+      const current = state.active;
+      let next = current;
       if (type == "next") {
-        state.active = state.active + 1;
+        next = current + 1;
       } else {
-        state.active = state.active - 1;
+        next = current - 1;
       }
-      state.showPopup = false;
-      nextTick(() => {
-        state.showPopup = true;
-        getRootPosition();
-      });
+      showPopup.value[current] = false;
+      setTimeout(() => {
+        showPopup.value[next] = true;
+        state.active = next;
+      }, 300);
       emit("change", state.active);
     };
     const getRootPosition = () => {
-      const el = document.querySelector(`#${props.steps[state.active].target}`);
-      const rect = useRect(el);
-      maskRect.value = rect;
+      props.steps.forEach((item, i) => __async(this, null, function* () {
+        useTaroRectById(item.target).then(
+          (rect) => {
+            maskRect[i] = rect;
+            maskStyle(i);
+          },
+          () => {
+          }
+        );
+      }));
     };
     const close = () => {
       state.showTour = false;
-      state.showPopup = false;
+      showPopup.value[state.active] = false;
       emit("close", state.active);
       emit("update:modelValue", false);
     };
@@ -150,130 +181,145 @@ const _sfc_main = create({
       props.closeOnClickOverlay && close();
     };
     onMounted(() => {
-      state.active = 0;
-      getRootPosition();
+      setTimeout(() => {
+        getRootPosition();
+      }, 500);
     });
     watch(
       () => props.modelValue,
       (val) => {
         if (val) {
+          state.active = 0;
           getRootPosition();
         }
-        state.active = 0;
         state.showTour = val;
-        state.showPopup = val;
+        showPopup.value[state.active] = val;
       }
     );
+    const refRandomId = Math.random().toString(36).slice(-8);
     return __spreadProps(__spreadValues({}, toRefs(state)), {
       classes,
       maskStyle,
       changeStep,
+      showPopup,
       close,
-      handleClickMask
+      handleClickMask,
+      maskStyles,
+      refRandomId
     });
   }
 });
-const _hoisted_1 = {
+const _hoisted_1 = ["id"];
+const _hoisted_2 = {
   key: 0,
   class: "nut-tour-content"
 };
-const _hoisted_2 = {
+const _hoisted_3 = {
   key: 0,
   class: "nut-tour-content-top"
 };
-const _hoisted_3 = { class: "nut-tour-content-inner" };
-const _hoisted_4 = { class: "nut-tour-content-bottom" };
-const _hoisted_5 = { class: "nut-tour-content-bottom-init" };
-const _hoisted_6 = { class: "nut-tour-content-bottom-operate" };
-const _hoisted_7 = {
+const _hoisted_4 = { class: "nut-tour-content-inner" };
+const _hoisted_5 = { class: "nut-tour-content-bottom" };
+const _hoisted_6 = { class: "nut-tour-content-bottom-init" };
+const _hoisted_7 = { class: "nut-tour-content-bottom-operate" };
+const _hoisted_8 = {
   key: 1,
   class: "nut-tour-content nut-tour-content-tile"
 };
-const _hoisted_8 = { class: "nut-tour-content-inner" };
+const _hoisted_9 = { class: "nut-tour-content-inner" };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Close = resolveComponent("Close");
   const _component_nut_popover = resolveComponent("nut-popover");
-  return openBlock(), createElementBlock("div", {
+  return openBlock(), createElementBlock("view", {
     class: normalizeClass(_ctx.classes)
   }, [
-    withDirectives(createElementVNode("div", {
+    _ctx.showTour ? (openBlock(), createElementBlock("view", {
+      key: 0,
       class: "nut-tour-masked",
       onClick: _cache[0] || (_cache[0] = (...args) => _ctx.handleClickMask && _ctx.handleClickMask(...args))
-    }, null, 512), [
-      [vShow, _ctx.showTour]
-    ]),
+    })) : createCommentVNode("", true),
+    _cache[12] || (_cache[12] = createTextVNode()),
     (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.steps, (step, i) => {
-      return openBlock(), createElementBlock("div", {
+      return openBlock(), createElementBlock("view", {
         key: i,
         style: { "height": "0" }
       }, [
-        i == _ctx.active ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
-          _ctx.showTour ? (openBlock(), createElementBlock("div", {
-            key: 0,
-            id: "nut-tour-popid",
-            class: normalizeClass(["nut-tour-mask", [_ctx.mask ? "" : "nut-tour-mask-none"]]),
-            style: normalizeStyle(_ctx.maskStyle)
-          }, null, 6)) : createCommentVNode("", true),
-          createVNode(_component_nut_popover, {
-            visible: _ctx.showPopup,
-            "onUpdate:visible": _cache[5] || (_cache[5] = ($event) => _ctx.showPopup = $event),
-            location: step.location || _ctx.location,
-            "target-id": "nut-tour-popid",
-            "bg-color": _ctx.bgColor,
-            theme: _ctx.theme,
-            "close-on-click-outside": false,
-            offset: step.popoverOffset || [0, 12],
-            "arrow-offset": step.arrowOffset || 0
-          }, {
-            content: withCtx(() => [
-              renderSlot(_ctx.$slots, "default", {}, () => [
-                _ctx.type == "step" ? (openBlock(), createElementBlock("div", _hoisted_1, [
-                  _ctx.showTitleBar ? (openBlock(), createElementBlock("div", _hoisted_2, [
-                    createElementVNode("div", {
-                      onClick: _cache[1] || (_cache[1] = (...args) => _ctx.close && _ctx.close(...args))
-                    }, [
-                      createVNode(_component_Close, { class: "nut-tour-content-top-close" })
-                    ])
-                  ])) : createCommentVNode("", true),
-                  createElementVNode("div", _hoisted_3, toDisplayString(step.content), 1),
-                  createElementVNode("div", _hoisted_4, [
-                    createElementVNode("div", _hoisted_5, toDisplayString(_ctx.active + 1) + "/" + toDisplayString(_ctx.steps.length), 1),
-                    createElementVNode("div", _hoisted_6, [
-                      renderSlot(_ctx.$slots, "prev-step", {}, () => [
-                        _ctx.active != 0 && _ctx.showPrevStep ? (openBlock(), createElementBlock("div", {
-                          key: 0,
-                          class: "nut-tour-content-bottom-operate-btn",
-                          onClick: _cache[2] || (_cache[2] = ($event) => _ctx.changeStep("prev"))
-                        }, toDisplayString(_ctx.prevStepTxt), 1)) : createCommentVNode("", true)
-                      ]),
-                      _ctx.steps.length - 1 == _ctx.active ? (openBlock(), createElementBlock("div", {
+        _ctx.showTour ? (openBlock(), createElementBlock("view", {
+          key: 0,
+          id: `nut-tour-popid${i}${_ctx.refRandomId}`,
+          class: normalizeClass(["nut-tour-mask", [_ctx.mask ? _ctx.showPopup[i] ? "" : "nut-tour-mask-hidden" : "nut-tour-mask-none"]]),
+          style: normalizeStyle(_ctx.maskStyles[i])
+        }, null, 14, _hoisted_1)) : createCommentVNode("", true),
+        _cache[11] || (_cache[11] = createTextVNode()),
+        createVNode(_component_nut_popover, {
+          visible: _ctx.showPopup[i],
+          "onUpdate:visible": ($event) => _ctx.showPopup[i] = $event,
+          location: step.location || _ctx.location,
+          "target-id": `nut-tour-popid${i}${_ctx.refRandomId}`,
+          "bg-color": _ctx.bgColor,
+          theme: _ctx.theme,
+          "close-on-click-outside": false,
+          offset: step.popoverOffset || [0, 12],
+          "arrow-offset": step.arrowOffset || 0,
+          duration: 0.2
+        }, {
+          content: withCtx(() => [
+            renderSlot(_ctx.$slots, "default", {}, () => [
+              _ctx.type == "step" ? (openBlock(), createElementBlock("view", _hoisted_2, [
+                _ctx.showTitleBar ? (openBlock(), createElementBlock("view", _hoisted_3, [
+                  createElementVNode("view", {
+                    onClick: _cache[1] || (_cache[1] = (...args) => _ctx.close && _ctx.close(...args))
+                  }, [
+                    createVNode(_component_Close, {
+                      class: "nut-tour-content-top-close",
+                      size: "10px"
+                    })
+                  ])
+                ])) : createCommentVNode("", true),
+                _cache[8] || (_cache[8] = createTextVNode()),
+                createElementVNode("view", _hoisted_4, toDisplayString(step.content), 1),
+                _cache[9] || (_cache[9] = createTextVNode()),
+                createElementVNode("view", _hoisted_5, [
+                  createElementVNode("view", _hoisted_6, toDisplayString(_ctx.active + 1) + "/" + toDisplayString(_ctx.steps.length), 1),
+                  _cache[7] || (_cache[7] = createTextVNode()),
+                  createElementVNode("view", _hoisted_7, [
+                    renderSlot(_ctx.$slots, "prev-step", {}, () => [
+                      _ctx.active != 0 && _ctx.showPrevStep ? (openBlock(), createElementBlock("view", {
+                        key: 0,
+                        class: "nut-tour-content-bottom-operate-btn",
+                        onClick: _cache[2] || (_cache[2] = ($event) => _ctx.changeStep("prev"))
+                      }, toDisplayString(_ctx.prevStepTxt), 1)) : createCommentVNode("", true)
+                    ]),
+                    _cache[5] || (_cache[5] = createTextVNode()),
+                    _ctx.steps.length - 1 == _ctx.active ? (openBlock(), createElementBlock("view", {
+                      key: 0,
+                      class: "nut-tour-content-bottom-operate-btn active",
+                      onClick: _cache[3] || (_cache[3] = (...args) => _ctx.close && _ctx.close(...args))
+                    }, toDisplayString(_ctx.completeTxt), 1)) : createCommentVNode("", true),
+                    _cache[6] || (_cache[6] = createTextVNode()),
+                    renderSlot(_ctx.$slots, "next-step", {}, () => [
+                      _ctx.steps.length - 1 != _ctx.active ? (openBlock(), createElementBlock("view", {
                         key: 0,
                         class: "nut-tour-content-bottom-operate-btn active",
-                        onClick: _cache[3] || (_cache[3] = (...args) => _ctx.close && _ctx.close(...args))
-                      }, toDisplayString(_ctx.completeTxt), 1)) : createCommentVNode("", true),
-                      renderSlot(_ctx.$slots, "next-step", {}, () => [
-                        _ctx.steps.length - 1 != _ctx.active ? (openBlock(), createElementBlock("div", {
-                          key: 0,
-                          class: "nut-tour-content-bottom-operate-btn active",
-                          onClick: _cache[4] || (_cache[4] = ($event) => _ctx.changeStep("next"))
-                        }, toDisplayString(_ctx.nextStepTxt), 1)) : createCommentVNode("", true)
-                      ])
+                        onClick: _cache[4] || (_cache[4] = ($event) => _ctx.changeStep("next"))
+                      }, toDisplayString(_ctx.nextStepTxt), 1)) : createCommentVNode("", true)
                     ])
                   ])
-                ])) : createCommentVNode("", true),
-                _ctx.type == "tile" ? (openBlock(), createElementBlock("div", _hoisted_7, [
-                  createElementVNode("div", _hoisted_8, toDisplayString(step.content), 1)
-                ])) : createCommentVNode("", true)
-              ])
-            ]),
-            _: 2
-          }, 1032, ["visible", "location", "bg-color", "theme", "offset", "arrow-offset"])
-        ], 64)) : createCommentVNode("", true)
+                ])
+              ])) : createCommentVNode("", true),
+              _cache[10] || (_cache[10] = createTextVNode()),
+              _ctx.type == "tile" ? (openBlock(), createElementBlock("view", _hoisted_8, [
+                createElementVNode("view", _hoisted_9, toDisplayString(step.content), 1)
+              ])) : createCommentVNode("", true)
+            ])
+          ]),
+          _: 2
+        }, 1032, ["visible", "onUpdate:visible", "location", "target-id", "bg-color", "theme", "offset", "arrow-offset"])
       ]);
     }), 128))
   ], 2);
 }
-const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+const index_taro = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 export {
-  index as default
+  index_taro as default
 };

package/dist/packages/trendarrow/TrendArrow.js

@@ -17,15 +17,15 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-import { defineComponent, computed, openBlock, createElementBlock, normalizeStyle, toDisplayString, createCommentVNode, renderSlot, createVNode, unref } from "vue";
-import { m as myFixed } from "../util-D1pvnUYu.js";
-import { TriangleUp, TriangleDown } from "@nutui/icons-vue";
+import { defineComponent, computed, openBlock, createElementBlock, normalizeStyle, toDisplayString, createCommentVNode, createTextVNode, renderSlot, createVNode, unref } from "vue";
+import { m as myFixed } from "../util-2G3mRQeF.js";
+import { TriangleUp, TriangleDown } from "@nutui/icons-vue-taro";
 import { w as withInstall } from "../with-install-Ch3FF0uS.js";
 const _hoisted_1 = { class: "nut-trend-arrow" };
 const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({}, {
   name: "NutTrendArrow"
 }), {
-  __name: "trend-arrow",
+  __name: "trend-arrow.taro",
   props: {
     rate: { default: 0 },
     digits: { default: 2 },
@@ -65,12 +65,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
           class: "nut-trend-arrow-icon-before nut-trend-arrow-rate",
           style: normalizeStyle(calcStyle.value)
         }, toDisplayString(calcRate.value), 5)) : createCommentVNode("", true),
+        _cache[0] || (_cache[0] = createTextVNode()),
         Number(_ctx.rate) !== 0 && isPositive.value ? renderSlot(_ctx.$slots, "up-icon", { key: 1 }, () => [
           createVNode(unref(TriangleUp), { color: _ctx.riseColor }, null, 8, ["color"])
         ]) : createCommentVNode("", true),
+        _cache[1] || (_cache[1] = createTextVNode()),
         Number(_ctx.rate) !== 0 && !isPositive.value ? renderSlot(_ctx.$slots, "down-icon", { key: 2 }, () => [
           createVNode(unref(TriangleDown), { color: _ctx.dropColor }, null, 8, ["color"])
         ]) : createCommentVNode("", true),
+        _cache[2] || (_cache[2] = createTextVNode()),
         _ctx.arrowLeft ? (openBlock(), createElementBlock("span", {
           key: 3,
           class: "nut-trend-arrow-icon-after nut-trend-arrow-rate",