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

package/dist/packages/_es/Notify.js

@@ -1,13 +1,31 @@
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 /*!
-* @nutui/nutui v3.1.19-beta.1 Sat Apr 02 2022 16:26:37 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.19-beta.2 Thu Apr 07 2022 17:52:31 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */
-import { watch, openBlock, createBlock, Transition, withCtx, withDirectives, createElementVNode, normalizeClass, normalizeStyle, renderSlot, createElementBlock, Fragment, createTextVNode, toDisplayString, vShow } from "vue";
+import { reactive, onMounted, watch, openBlock, createBlock, Transition, withCtx, withDirectives, createElementVNode, normalizeClass, normalizeStyle, renderSlot, createElementBlock, Fragment, createTextVNode, toDisplayString, vShow, createVNode, render } from "vue";
 import { c as createComponent } from "./component.js";
 import Popup from "./Popup.js";
 import { _ as _export_sfc } from "./plugin-vue_export-helper.js";
-import "./use-lock-scroll.js";
 import "./OverLay.js";
 import "./Icon.js";
 import "./pxCheck.js";
@@ -30,16 +48,28 @@ const _sfc_main = create({
       type: String,
       default: "danger"
     },
-    visible: {
+    showPopup: {
       type: Boolean,
       default: false
-    }
+    },
+    position: {
+      type: String,
+      default: "top"
+    },
+    onClose: Function,
+    onClick: Function,
+    unmount: Function
   },
-  emits: ["update:visible", "closed", "click"],
-  setup(props, { emit }) {
+  setup(props, { slots }) {
     let timer = null;
-    const onClick = () => {
-      emit("click");
+    const state = reactive({
+      mounted: false
+    });
+    onMounted(() => {
+      state.mounted = true;
+    });
+    const clickCover = () => {
+      props.onClick && props.onClick();
     };
     const clearTimer = () => {
       if (timer) {
@@ -48,14 +78,8 @@ const _sfc_main = create({
       }
     };
     const hide = () => {
-      emit("update:visible", false);
-      emit("closed");
+      state.mounted = false;
     };
-    watch(() => props.visible, (value) => {
-      if (value) {
-        show();
-      }
-    });
     const show = () => {
       clearTimer();
       if (props.duration) {
@@ -64,35 +88,150 @@ const _sfc_main = create({
         }, props.duration);
       }
     };
-    const onAfterLeave = () => {
-      if (props.visible) {
-        clearTimer();
-        hide();
+    if (props.duration) {
+      show();
+    }
+    watch(() => props.duration, (val) => {
+      if (val) {
+        show();
       }
+    });
+    const onAfterLeave = () => {
+      clearTimer();
+      props.unmount && props.unmount(props.id);
+      props.onClose && props.onClose();
     };
-    return { hide, onAfterLeave, onClick };
+    return { state, hide, onAfterLeave, clickCover };
   }
 });
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createBlock(Transition, {
-    name: "nut-fade",
+    name: "toast-fade",
     onAfterLeave: _ctx.onAfterLeave
   }, {
     default: withCtx(() => [
       withDirectives(createElementVNode("view", {
-        class: normalizeClass(["popup-top", "nut-notify", `nut-notify--${_ctx.type}`, { className: _ctx.className }]),
+        class: normalizeClass([`popup-${_ctx.position}`, "nut-notify", `nut-notify--${_ctx.type}`, [_ctx.className]]),
         style: normalizeStyle({ color: _ctx.color, background: _ctx.background }),
-        onClick: _cache[0] || (_cache[0] = (...args) => _ctx.onClick && _ctx.onClick(...args))
+        onClick: _cache[0] || (_cache[0] = (...args) => _ctx.clickCover && _ctx.clickCover(...args))
       }, [
         _ctx.$slots.default ? renderSlot(_ctx.$slots, "default", { key: 0 }) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
           createTextVNode(toDisplayString(_ctx.msg), 1)
         ], 64))
       ], 6), [
-        [vShow, _ctx.visible]
+        [vShow, _ctx.state.mounted]
       ])
     ]),
     _: 3
   }, 8, ["onAfterLeave"]);
 }
-var index_taro = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
-export { index_taro as default };
+var Notify = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+const defaultOptions = {
+  type: "base",
+  showPopup: false,
+  msg: "",
+  color: void 0,
+  background: void 0,
+  duration: 3e3,
+  className: "",
+  onClosed: null,
+  onClick: null,
+  onOpened: null,
+  textTimer: null,
+  unmount: null
+};
+let idsMap = [];
+let optsMap = [];
+const clearNotify = (id) => {
+  if (id) {
+    const container = document.getElementById(id);
+    optsMap = optsMap.filter((item) => item.id !== id);
+    idsMap = idsMap.filter((item) => item !== id);
+    if (container) {
+      document.body.removeChild(container);
+    }
+  } else {
+    idsMap.forEach((item) => {
+      const container = document.getElementById(item);
+      if (container) {
+        document.body.removeChild(container);
+      }
+    });
+    optsMap = [];
+    idsMap = [];
+  }
+};
+const updateNotify = (opts) => {
+  const container = document.getElementById(opts.id);
+  if (container) {
+    const currentOpt = optsMap.find((item) => item.id === opts.id);
+    if (currentOpt) {
+      opts = __spreadValues(__spreadValues(__spreadValues({}, defaultOptions), currentOpt), opts);
+    } else {
+      opts = __spreadValues(__spreadValues({}, defaultOptions), opts);
+    }
+    const instance = createVNode(Notify, opts);
+    render(instance, container);
+    return instance.component.ctx;
+  }
+};
+const mountNotify = (opts) => {
+  opts.unmount = clearNotify;
+  let _id;
+  if (opts.id) {
+    _id = opts.id;
+    if (idsMap.find((item) => item === opts.id)) {
+      return updateNotify(opts);
+    }
+  } else {
+    _id = new Date().getTime() + "";
+  }
+  opts = __spreadValues(__spreadValues({}, defaultOptions), opts);
+  opts.id = _id;
+  idsMap.push(opts.id);
+  optsMap.push(opts);
+  const container = document.createElement("view");
+  container.id = opts.id;
+  const instance = createVNode(Notify, opts);
+  render(instance, container);
+  document.body.appendChild(container);
+  setTimeout(() => {
+    instance.showPopup = true;
+  }, 0);
+  return instance.component.ctx;
+};
+const errorMsg = (msg) => {
+  if (!msg) {
+    console.warn("[NutUI Notify]: msg\u4E0D\u80FD\u4E3A\u7A7A");
+    return;
+  }
+};
+const NotifyFunction = {
+  text(msg, obj = {}) {
+    errorMsg(msg);
+    return mountNotify(__spreadProps(__spreadValues({}, obj), { msg }));
+  },
+  primary(msg, obj = {}) {
+    errorMsg(msg);
+    return mountNotify(__spreadProps(__spreadValues({}, obj), { msg, type: "primary" }));
+  },
+  success(msg, obj = {}) {
+    errorMsg(msg);
+    return mountNotify(__spreadProps(__spreadValues({}, obj), { msg, type: "success" }));
+  },
+  danger(msg, obj = {}) {
+    errorMsg(msg);
+    return mountNotify(__spreadProps(__spreadValues({}, obj), { msg, type: "danger" }));
+  },
+  warn(msg, obj = {}) {
+    errorMsg(msg);
+    return mountNotify(__spreadProps(__spreadValues({}, obj), { msg, type: "warning" }));
+  },
+  hide() {
+    clearNotify();
+  },
+  install(app) {
+    app.config.globalProperties.$notify = NotifyFunction;
+  }
+};
+export { Notify, NotifyFunction, NotifyFunction as default };

package/dist/packages/_es/NumberKeyboard.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.1.19-beta.1 Sat Apr 02 2022 16:26:37 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.19-beta.2 Thu Apr 07 2022 17:52:31 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */
@@ -9,6 +9,10 @@ import { _ as _export_sfc } from "./plugin-vue_export-helper.js";
 const { create } = createComponent("numberkeyboard");
 const _sfc_main = create({
   props: {
+    confirmText: {
+      type: String,
+      default: "\u5B8C\u6210"
+    },
     title: {
       type: String,
       default: ""
@@ -40,6 +44,10 @@ const _sfc_main = create({
     overlay: {
       type: Boolean,
       default: true
+    },
+    isWrapTeleport: {
+      type: Boolean,
+      default: true
     }
   },
   emits: ["input", "delete", "close", "update:value"],
@@ -117,7 +125,8 @@ const _sfc_main = create({
     function onTouchMove(id, event) {
       event.stopPropagation();
     }
-    function onTouchEnd() {
+    function onTouchEnd(event) {
+      event.preventDefault();
       clickKeyIndex.value = void 0;
     }
     function closeBoard() {
@@ -177,6 +186,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     position: "bottom",
     overlay: _ctx.overlay,
     onClickOverlay: _cache[7] || (_cache[7] = ($event) => _ctx.closeBoard()),
+    isWrapTeleport: _ctx.isWrapTeleport,
     "overlay-class": "nut-numberkeyboard-overlay"
   }, {
     default: withCtx(() => [
@@ -209,7 +219,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                   ]),
                   onTouchstart: (event) => _ctx.onTouchstart(item, event),
                   onTouchmove: (event) => _ctx.onTouchMove(item, event),
-                  onTouchend: _cache[1] || (_cache[1] = (...args) => _ctx.onTouchEnd && _ctx.onTouchEnd(...args))
+                  onTouchend: _cache[1] || (_cache[1] = (event) => _ctx.onTouchEnd(event))
                 }, [
                   item.type == "number" || item.type == "custom" ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
                     createTextVNode(toDisplayString(item.id), 1)
@@ -231,19 +241,19 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             ]),
             _ctx.title == "" ? (openBlock(), createElementBlock("div", {
               key: 0,
-              class: "key-board-wrapper",
+              class: "key-board-wrapper key-board-finish",
               onClick: _cache[5] || (_cache[5] = ($event) => _ctx.closeBoard())
             }, [
               createElementVNode("div", {
                 class: normalizeClass(["key", "finish", { activeFinsh: _ctx.clickKeyIndex == "finish" }])
-              }, " \u5B8C\u6210 ", 2)
+              }, toDisplayString(_ctx.confirmText), 3)
             ])) : createCommentVNode("", true)
           ])) : createCommentVNode("", true)
         ])
       ], 512)
     ]),
     _: 1
-  }, 8, ["visible", "overlay"]);
+  }, 8, ["visible", "overlay", "isWrapTeleport"]);
 }
-var index_taro = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
-export { index_taro as default };
+var index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+export { index as default };