@nutui/nutui 4.3.0 → 4.3.2

package/dist/packages/form/Form.js

@@ -1,6 +1,22 @@
+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));
 var __objRest = (source, exclude) => {
   var target = {};
   for (var prop in source)
@@ -33,178 +49,168 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-import { c as createComponent } from "../component-TCzwHGVq.js";
-import { computed, reactive, provide, watch, resolveComponent, openBlock, createElementBlock, withModifiers, createVNode, withCtx, renderSlot } from "vue";
-import { g as getPropByPath, f as isPromise } from "../util-4Jkyw4BJ.js";
-import { F as FORM_KEY } from "../types-Ynmct7na.js";
+import { defineComponent, computed, reactive, provide, watch, openBlock, createElementBlock, withModifiers, createVNode, withCtx, renderSlot } from "vue";
 import { u as useChildren } from "../useChildren-GU_NVfD8.js";
+import { g as getPropByPath, f as isPromise } from "../util-4Jkyw4BJ.js";
 import NutCellGroup from "../cellgroup/CellGroup.js";
-import { _ as _export_sfc } from "../_plugin-vue_export-helper-yVxbj29m.js";
-const component = (components) => {
-  return {
-    props: {
-      modelValue: {
-        type: Object,
-        default: () => ({})
-      },
-      rules: {
-        type: Object,
-        default: () => ({})
-      },
-      labelPosition: {
-        type: String,
-        default: "left"
+import { F as FORM_KEY, a as FORM_DISABLED_KEY } from "../common-FZL3qC99.js";
+import { w as withInstall } from "../with-install-p59gYYU_.js";
+const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({}, {
+  name: "NutForm"
+}), {
+  __name: "form",
+  props: {
+    modelValue: { default: () => ({}) },
+    rules: { default: () => ({}) },
+    disabled: { type: Boolean, default: false },
+    labelPosition: { default: "left" },
+    starPosition: { default: "left" }
+  },
+  emits: ["validate"],
+  setup(__props, { expose: __expose, emit: __emit }) {
+    const props = __props;
+    const emit = __emit;
+    const { children, linkChildren } = useChildren(FORM_KEY);
+    linkChildren({ props });
+    const { linkChildren: linkChildren2 } = useChildren(FORM_DISABLED_KEY);
+    linkChildren2({ props });
+    const formErrorTip = computed(() => reactive({}));
+    provide("formErrorTip", formErrorTip);
+    const clearErrorTips = () => {
+      Object.keys(formErrorTip.value).forEach((item) => {
+        formErrorTip.value[item] = "";
+      });
+    };
+    const reset = () => {
+      clearErrorTips();
+    };
+    watch(
+      () => props.modelValue,
+      () => {
+        clearErrorTips();
       },
-      starPosition: {
-        type: String,
-        default: "left"
-      }
-    },
-    components,
-    emits: ["validate"],
-    setup(props, { emit }) {
-      const { children, linkChildren } = useChildren(FORM_KEY);
-      linkChildren({ props });
-      const formErrorTip = computed(() => reactive({}));
-      provide("formErrorTip", formErrorTip);
-      const clearErrorTips = () => {
-        Object.keys(formErrorTip.value).forEach((item) => {
-          formErrorTip.value[item] = "";
+      { immediate: true }
+    );
+    const getTaskFromChildren = () => {
+      const task = [];
+      children.forEach((item) => {
+        task.push({
+          prop: item == null ? void 0 : item["prop"],
+          rules: (item == null ? void 0 : item["rules"]) || []
         });
-      };
-      const reset = () => {
-        clearErrorTips();
-      };
-      watch(
-        () => props.modelValue,
-        () => {
-          clearErrorTips();
-        },
-        { immediate: true }
-      );
-      const getTaskFromChildren = () => {
-        const task = [];
-        children.forEach((item) => {
-          task.push({
-            prop: item == null ? void 0 : item["prop"],
-            rules: (item == null ? void 0 : item["rules"]) || []
-          });
+      });
+      return task;
+    };
+    const tipMessage = (errorMsg) => {
+      if (errorMsg.message) {
+        emit("validate", errorMsg);
+      }
+      formErrorTip.value[errorMsg.prop] = errorMsg.message;
+    };
+    const checkRule = (item) => __async(this, null, function* () {
+      const { rules = [], prop } = item;
+      const _Promise = (errorMsg) => {
+        return new Promise((resolve, reject) => {
+          try {
+            tipMessage(errorMsg);
+            resolve(errorMsg);
+          } catch (error) {
+            reject(error);
+          }
         });
-        return task;
       };
-      const tipMessage = (errorMsg) => {
-        if (errorMsg.message) {
-          emit("validate", errorMsg);
+      if (!prop) {
+        console.warn("[NutUI] <FormItem> 使用 rules 校验规则时 , 必须设置 prop 参数");
+      }
+      const value = getPropByPath(props.modelValue, prop || "");
+      tipMessage({ prop, message: "" });
+      const formRules = props.rules || {};
+      const _rules = [...(formRules == null ? void 0 : formRules[prop]) || [], ...rules];
+      while (_rules.length) {
+        const rule = _rules.shift();
+        const _a = rule, { validator } = _a, ruleWithoutValidator = __objRest(_a, ["validator"]);
+        const { required, regex, message } = ruleWithoutValidator;
+        const errorMsg = { prop, message: message || "" };
+        if (required) {
+          if (!value && value !== 0) {
+            return _Promise(errorMsg);
+          }
         }
-        formErrorTip.value[errorMsg.prop] = errorMsg.message;
-      };
-      const checkRule = (item) => __async(this, null, function* () {
-        const { rules, prop } = item;
-        const _Promise = (errorMsg) => {
-          return new Promise((resolve, reject) => {
+        if (regex && !regex.test(String(value))) {
+          return _Promise(errorMsg);
+        }
+        if (validator) {
+          const result = validator(value, ruleWithoutValidator);
+          if (isPromise(result)) {
             try {
-              tipMessage(errorMsg);
-              resolve(errorMsg);
+              const value2 = yield result;
+              if (value2 === false) {
+                return _Promise(errorMsg);
+              }
             } catch (error) {
-              reject(error);
+              const validateErrorMsg = { prop, message: error };
+              return _Promise(validateErrorMsg);
             }
-          });
-        };
-        if (!prop) {
-          console.warn("[NutUI] <FormItem> 使用 rules 校验规则时 , 必须设置 prop 参数");
-        }
-        const value = getPropByPath(props.modelValue, prop || "");
-        tipMessage({ prop, message: "" });
-        const formRules = props.rules || {};
-        const _rules = [...(formRules == null ? void 0 : formRules[prop]) || [], ...rules];
-        while (_rules.length) {
-          const rule = _rules.shift();
-          const _a = rule, { validator } = _a, ruleWithoutValidator = __objRest(_a, ["validator"]);
-          const { required, regex, message } = ruleWithoutValidator;
-          const errorMsg = { prop, message: message || "" };
-          if (required) {
-            if (!value && value !== 0) {
+          } else {
+            if (!result) {
               return _Promise(errorMsg);
             }
           }
-          if (regex && !regex.test(String(value))) {
-            return _Promise(errorMsg);
-          }
-          if (validator) {
-            const result = validator(value, ruleWithoutValidator);
-            if (isPromise(result)) {
-              try {
-                const value2 = yield result;
-                if (value2 === false) {
-                  return _Promise(errorMsg);
-                }
-              } catch (error) {
-                const validateErrorMsg = { prop, message: error };
-                return _Promise(validateErrorMsg);
-              }
-            } else {
-              if (!result) {
-                return _Promise(errorMsg);
-              }
+        }
+      }
+      return Promise.resolve(true);
+    });
+    const validate = (customProp = "") => {
+      return new Promise((resolve, reject) => {
+        try {
+          const task = getTaskFromChildren();
+          const errors = task.map((item) => {
+            if (customProp && customProp !== item.prop) {
+              return Promise.resolve(true);
             }
-          }
+            return checkRule(item);
+          });
+          Promise.all(errors).then((errorRes) => {
+            errorRes = errorRes.filter((item) => item !== true);
+            const res = { valid: true, errors: [] };
+            if (errorRes.length) {
+              res.valid = false;
+              res.errors = errorRes;
+            }
+            resolve(res);
+          });
+        } catch (error) {
+          reject(error);
         }
-        return Promise.resolve(true);
       });
-      const validate = (customProp = "") => {
-        return new Promise((resolve, reject) => {
-          try {
-            const task = getTaskFromChildren();
-            const errors = task.map((item) => {
-              if (customProp && customProp !== item.prop) {
-                return Promise.resolve(true);
-              }
-              return checkRule(item);
-            });
-            Promise.all(errors).then((errorRes) => {
-              errorRes = errorRes.filter((item) => item !== true);
-              const res = { valid: true, errors: [] };
-              if (errorRes.length) {
-                res.valid = false;
-                res.errors = errorRes;
-              }
-              resolve(res);
-            });
-          } catch (error) {
-            reject(error);
-          }
-        });
-      };
-      const submit = () => {
-        validate();
-        return false;
-      };
-      return { validate, reset, submit, formErrorTip };
-    }
-  };
-};
-const { create } = createComponent("form");
-const _sfc_main = create(
-  component({
-    NutCellGroup
-  })
-);
-function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  const _component_nut_cell_group = resolveComponent("nut-cell-group");
-  return openBlock(), createElementBlock("form", {
-    class: "nut-form",
-    action: "#",
-    onSubmit: withModifiers(() => false, ["prevent"])
-  }, [
-    createVNode(_component_nut_cell_group, null, {
-      default: withCtx(() => [
-        renderSlot(_ctx.$slots, "default")
-      ]),
-      _: 3
-    })
-  ], 32);
-}
-const NutForm = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+    };
+    const submit = () => {
+      validate();
+      return false;
+    };
+    __expose({
+      submit,
+      reset,
+      validate
+    });
+    return (_ctx, _cache) => {
+      return openBlock(), createElementBlock("form", {
+        class: "nut-form",
+        action: "#",
+        onSubmit: withModifiers(() => false, ["prevent"])
+      }, [
+        createVNode(NutCellGroup, null, {
+          default: withCtx(() => [
+            renderSlot(_ctx.$slots, "default")
+          ]),
+          _: 3
+        })
+      ], 32);
+    };
+  }
+}));
+withInstall(_sfc_main);
 export {
-  NutForm as default
+  _sfc_main as Form,
+  _sfc_main as default
 };

package/dist/packages/formitem/FormItem.js

@@ -1,69 +1,50 @@
+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));
+import { defineComponent, computed, inject, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createElementBlock, renderSlot, createTextVNode, toDisplayString, createCommentVNode, createElementVNode } from "vue";
 import { p as pxCheck } from "../pxCheck-OnXlN1NC.js";
-import { computed, inject, resolveComponent, openBlock, createBlock, normalizeClass, normalizeStyle, withCtx, createElementBlock, renderSlot, createTextVNode, toDisplayString, createCommentVNode, createElementVNode } from "vue";
-import { c as createComponent } from "../component-TCzwHGVq.js";
 import NutCell from "../cell/Cell.js";
-import { F as FORM_KEY } from "../types-Ynmct7na.js";
+import { F as FORM_KEY } from "../common-FZL3qC99.js";
 import { u as useParent } from "../useParent-KIxqkovs.js";
-import { _ as _export_sfc } from "../_plugin-vue_export-helper-yVxbj29m.js";
-import "../index-Ii9XdkPy.js";
-import "@nutui/icons-vue";
-const { create } = createComponent("form-item");
-const _sfc_main = create({
-  inheritAttrs: false,
+import { w as withInstall } from "../with-install-p59gYYU_.js";
+const _hoisted_1 = { class: "nut-cell__value nut-form-item__body" };
+const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({}, {
+  name: "NutFormItem",
+  inheritAttrs: false
+}), {
+  __name: "form-item",
   props: {
-    prop: {
-      type: String,
-      default: ""
-    },
-    label: {
-      type: String,
-      default: ""
-    },
-    rules: {
-      type: Array,
-      default: () => []
-    },
-    required: {
-      type: Boolean,
-      default: false
-    },
-    showErrorMessage: {
-      type: Boolean,
-      default: true
-    },
-    showErrorLine: {
-      type: Boolean,
-      default: true
-    },
-    labelWidth: {
-      type: [String, Number],
-      default: ""
-    },
-    labelAlign: {
-      type: String,
-      default: ""
-    },
-    errorMessageAlign: {
-      type: String,
-      default: ""
-    },
-    bodyAlign: {
-      type: String,
-      default: ""
-    },
-    labelPosition: {
-      type: String,
-      default: ""
-    },
-    starPosition: {
-      type: String,
-      default: ""
-    }
-  },
-  components: {
-    NutCell
+    prop: { default: "" },
+    label: { default: "" },
+    rules: { default: () => [] },
+    required: { type: Boolean, default: false },
+    showErrorMessage: { type: Boolean, default: true },
+    showErrorLine: { type: Boolean, default: true },
+    labelWidth: {},
+    labelAlign: {},
+    errorMessageAlign: {},
+    bodyAlign: {},
+    labelPosition: {},
+    starPosition: {}
   },
-  setup(props, { slots }) {
+  setup(__props) {
+    const props = __props;
     const { parent: parentObj } = useParent(FORM_KEY);
     const isRequired = computed(() => {
       var _a;
@@ -103,54 +84,42 @@ const _sfc_main = create({
         textAlign: props.errorMessageAlign
       };
     });
-    const getSlots = (name) => slots[name];
-    return {
-      parent,
-      labelStyle,
-      bodyStyle,
-      errorMessageStyle,
-      getSlots,
-      isRequired,
-      labelPositionClass,
-      starPositionClass
+    return (_ctx, _cache) => {
+      return openBlock(), createBlock(NutCell, {
+        class: normalizeClass(["nut-form-item", [{ error: unref(parent)[_ctx.prop], line: _ctx.showErrorLine }, _ctx.$attrs.class, labelPositionClass.value]]),
+        style: normalizeStyle(_ctx.$attrs.style)
+      }, {
+        default: withCtx(() => [
+          _ctx.label || _ctx.$slots.label ? (openBlock(), createElementBlock("view", {
+            key: 0,
+            class: normalizeClass(["nut-cell__title nut-form-item__label", { required: isRequired.value, [starPositionClass.value]: starPositionClass.value }]),
+            style: normalizeStyle(labelStyle.value)
+          }, [
+            renderSlot(_ctx.$slots, "label", {}, () => [
+              createTextVNode(toDisplayString(_ctx.label), 1)
+            ])
+          ], 6)) : createCommentVNode("", true),
+          createElementVNode("view", _hoisted_1, [
+            createElementVNode("view", {
+              class: "nut-form-item__body__slots",
+              style: normalizeStyle(bodyStyle.value)
+            }, [
+              renderSlot(_ctx.$slots, "default")
+            ], 4),
+            unref(parent)[_ctx.prop] && _ctx.showErrorMessage ? (openBlock(), createElementBlock("view", {
+              key: 0,
+              class: "nut-form-item__body__tips",
+              style: normalizeStyle(errorMessageStyle.value)
+            }, toDisplayString(unref(parent)[_ctx.prop]), 5)) : createCommentVNode("", true)
+          ])
+        ]),
+        _: 3
+      }, 8, ["class", "style"]);
     };
   }
-});
-const _hoisted_1 = { class: "nut-cell__value nut-form-item__body" };
-function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  const _component_nut_cell = resolveComponent("nut-cell");
-  return openBlock(), createBlock(_component_nut_cell, {
-    class: normalizeClass(["nut-form-item", [{ error: _ctx.parent[_ctx.prop], line: _ctx.showErrorLine }, _ctx.$attrs.class, _ctx.labelPositionClass]]),
-    style: normalizeStyle(_ctx.$attrs.style)
-  }, {
-    default: withCtx(() => [
-      _ctx.label || _ctx.getSlots("label") ? (openBlock(), createElementBlock("view", {
-        key: 0,
-        class: normalizeClass(["nut-cell__title nut-form-item__label", { required: _ctx.isRequired, [_ctx.starPositionClass]: _ctx.starPositionClass }]),
-        style: normalizeStyle(_ctx.labelStyle)
-      }, [
-        renderSlot(_ctx.$slots, "label", {}, () => [
-          createTextVNode(toDisplayString(_ctx.label), 1)
-        ])
-      ], 6)) : createCommentVNode("", true),
-      createElementVNode("view", _hoisted_1, [
-        createElementVNode("view", {
-          class: "nut-form-item__body__slots",
-          style: normalizeStyle(_ctx.bodyStyle)
-        }, [
-          renderSlot(_ctx.$slots, "default")
-        ], 4),
-        _ctx.parent[_ctx.prop] && _ctx.showErrorMessage ? (openBlock(), createElementBlock("view", {
-          key: 0,
-          class: "nut-form-item__body__tips",
-          style: normalizeStyle(_ctx.errorMessageStyle)
-        }, toDisplayString(_ctx.parent[_ctx.prop]), 5)) : createCommentVNode("", true)
-      ])
-    ]),
-    _: 3
-  }, 8, ["class", "style"]);
-}
-const NutFormItem = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+}));
+withInstall(_sfc_main);
 export {
-  NutFormItem as default
+  _sfc_main as FormItem,
+  _sfc_main as default
 };

package/dist/packages/grid/Grid.js

@@ -1,7 +1,6 @@
 import { c as createComponent } from "../component-TCzwHGVq.js";
 import "vue";
 import { c as component } from "../common-4inKawxR.js";
-import "../pxCheck-OnXlN1NC.js";
 const { create } = createComponent("grid");
 const _sfc_main = create(component);
 export {

package/dist/packages/imagepreview/ImagePreview.js

@@ -31,15 +31,11 @@ import NutVideo from "../video/Video.js";
 import NutSwiperItem from "../swiperitem/SwiperItem.js";
 import { _ as _export_sfc } from "../_plugin-vue_export-helper-yVxbj29m.js";
 import { CircleClose } from "@nutui/icons-vue";
-import { N as NutPopup } from "../index-wY4t0zYt.js";
+import { N as NutPopup } from "../index-BqB5dTeo.js";
 import NutSwiper from "../swiper/Swiper.js";
 import { f as funInterceptor } from "../Interceptor-WYVtGbGC.js";
 import { C as CreateComponent } from "../mountComponent-uInXoTMp.js";
 import NutOverlay from "../overlay/Overlay.js";
-import "../index-s3RgMhc7.js";
-import "@nutui/nutui/dist/packages/locale/lang";
-import "../types-9wCQwtH3.js";
-import "../raf-MQjoO-Ag.js";
 const baseProps = {
   show: { type: Boolean, default: false },
   initNo: { type: Number, default: 0 },

package/dist/packages/{index-wY4t0zYt.js → index-BqB5dTeo.js}

@@ -111,6 +111,7 @@ const _sfc_main = create({
   props: popupProps,
   emits: ["clickPop", "clickCloseIcon", "open", "close", "opened", "closed", "clickOverlay", "update:visible"],
   setup(props, { emit }) {
+    let opened;
     const state = reactive({
       zIndex: props.zIndex,
       showSlot: true,
@@ -136,23 +137,29 @@ const _sfc_main = create({
       return props.transition ? props.transition : `nut-popup-slide-${props.position}`;
     });
     const open = () => {
-      if (props.zIndex !== initIndex) {
-        _zIndex = Number(props.zIndex);
+      if (!opened) {
+        opened = true;
+        if (props.zIndex !== initIndex) {
+          _zIndex = Number(props.zIndex);
+        }
+        emit("update:visible", true);
+        state.zIndex = ++_zIndex;
+        if (props.destroyOnClose) {
+          state.showSlot = true;
+        }
+        emit("open");
       }
-      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);
+      if (opened) {
+        opened = false;
+        emit("update:visible", false);
+        emit("close");
+        if (props.destroyOnClose) {
+          setTimeout(() => {
+            state.showSlot = false;
+          }, +props.duration * 1e3);
+        }
       }
     };
     const onClick = (e) => {
@@ -161,12 +168,12 @@ const _sfc_main = create({
     const onClickCloseIcon = (e) => {
       e.stopPropagation();
       emit("clickCloseIcon", e);
-      emit("update:visible", false);
+      close();
     };
     const onClickOverlay = (e) => {
       emit("clickOverlay", e);
       if (props.closeOnClickOverlay) {
-        emit("update:visible", false);
+        close();
       }
     };
     const onOpened = (el) => {
@@ -178,7 +185,12 @@ const _sfc_main = create({
     watch(
       () => props.visible,
       () => {
-        props.visible ? open() : close();
+        if (props.visible && !opened) {
+          open();
+        }
+        if (!props.visible && opened) {
+          close();
+        }
       }
     );
     watchEffect(() => {