@opentiny/vue-renderless 3.10.7 → 3.11.0

package/common/deps/vue-popup.js

@@ -1,13 +1,21 @@
 import {
   __spreadValues
-} from "../../chunk-PKUHTIDK.js";
+} from "../../chunk-G2ADBYYC.js";
 import { merge } from "../object";
 import PopupManager from "./popup-manager";
-import { addClass, removeClass } from "./dom";
+import { addClass } from "./dom";
 let idSeed = 1;
 const isServer = typeof window === "undefined";
-const popLockClass = "popup-parent--hidden";
-const setWatchFn = ({ onMounted, onBeforeUnmount, watch, vm, api, props, state, nextTick }) => {
+const setWatchFn = ({
+  onMounted,
+  onBeforeUnmount,
+  watch,
+  vm,
+  api,
+  props,
+  state,
+  nextTick
+}) => {
   onMounted(() => {
     vm._popupId = `popup-${idSeed++}`;
     PopupManager.register(vm._popupId, vm);
@@ -15,7 +23,6 @@ const setWatchFn = ({ onMounted, onBeforeUnmount, watch, vm, api, props, state,
   onBeforeUnmount(() => {
     PopupManager.deregister(vm._popupId);
     PopupManager.closeModal(vm._popupId);
-    api.restoreBodyStyle();
   });
   watch(
     () => props.visible,
@@ -38,7 +45,7 @@ const setWatchFn = ({ onMounted, onBeforeUnmount, watch, vm, api, props, state,
     }
   );
 };
-const openFn = (state, vm, api) => (options) => {
+const openFn = ({ state, vm }) => (options) => {
   if (!state.rendered) {
     state.rendered = true;
   }
@@ -48,106 +55,83 @@ const openFn = (state, vm, api) => (options) => {
     vm._closeTimer = null;
   }
   clearTimeout(vm._openTimer);
+  const doOpen = () => {
+    if (isServer || state.opened) {
+      return;
+    }
+    vm._opening = true;
+    const dom = vm.$el;
+    const modal = props.modal;
+    const zIndex = props.zIndex;
+    if (zIndex) {
+      PopupManager.zIndex = zIndex;
+    }
+    if (modal) {
+      if (vm._closing) {
+        PopupManager.closeModal(vm._popupId);
+        vm._closing = false;
+      }
+      PopupManager.openModal(
+        vm._popupId,
+        PopupManager.nextZIndex(),
+        props.modalAppendToBody ? void 0 : dom,
+        props.modalClass,
+        props.modalFade
+      );
+      if (props.lockScroll) {
+        PopupManager.fixBodyBorder();
+        addClass(document.body, PopupManager.popLockClass);
+      }
+    }
+    if (getComputedStyle(dom).position === "static") {
+      dom.style.position = "absolute";
+    }
+    dom.style.zIndex = PopupManager.nextZIndex().toString();
+    state.opened = true;
+    vm._opening = false;
+  };
   const openDelay = Number(props.openDelay);
   if (openDelay > 0) {
     vm._openTimer = setTimeout(() => {
       vm._openTimer = null;
-      api.doOpen(props);
+      doOpen();
     }, openDelay);
   } else {
-    api.doOpen(props);
+    doOpen();
   }
 };
-const doOpenFn = (vm, state, props, api) => (properties) => {
-  if (isServer || vm.willOpen && !vm.willOpen() || state.opened) {
-    return;
-  }
-  vm._opening = true;
-  const dom = vm.$el;
-  const modal = properties.modal;
-  const zIndex = properties.zIndex;
-  if (zIndex) {
-    PopupManager.zIndex = zIndex;
-  }
-  if (modal) {
-    if (vm._closing) {
-      PopupManager.closeModal(vm._popupId);
-      vm._closing = false;
-    }
-    PopupManager.openModal(
-      vm._popupId,
-      PopupManager.nextZIndex(),
-      props.modalAppendToBody ? void 0 : dom,
-      properties.modalClass,
-      properties.modalFade
-    );
-    if (properties.lockScroll) {
-      addClass(document.body, popLockClass);
-    }
-  }
-  if (getComputedStyle(dom).position === "static") {
-    dom.style.position = "absolute";
-  }
-  dom.style.zIndex = PopupManager.nextZIndex();
-  state.opened = true;
-  api.onOpen && api.onOpen();
-  api.doAfterOpen();
-};
-const closeFn = (api, vm) => () => {
-  if (api.willClose && !api.willClose()) {
-    return;
-  }
+const closeFn = ({ state, vm }) => () => {
   if (vm._openTimer !== null) {
     clearTimeout(vm._openTimer);
     vm._openTimer = null;
   }
   clearTimeout(vm._closeTimer);
+  const doClose = () => {
+    vm._closing = true;
+    state.opened = false;
+    PopupManager.closeModal(vm._popupId);
+    vm._closing = false;
+  };
   const closeDelay = Number(vm.closeDelay);
   if (closeDelay > 0) {
     vm._closeTimer = setTimeout(() => {
       vm._closeTimer = null;
-      api.doClose();
+      doClose();
     }, closeDelay);
   } else {
-    api.doClose();
+    doClose();
   }
 };
-var vue_popup_default = ({ api, nextTick, onBeforeUnmount, onMounted, props, reactive, toRefs, vm, watch }) => {
+var vue_popup_default = (options) => {
+  const { api, nextTick, onBeforeUnmount, onMounted, props, reactive, toRefs, vm, watch } = options;
   const state = reactive({
     opened: false,
-    rendered: false,
-    bodyPaddingRight: null,
-    withoutHiddenClass: true,
-    computedBodyPaddingRight: 0
+    rendered: false
   });
   setWatchFn({ onMounted, onBeforeUnmount, watch, vm, api, props, state, nextTick });
-  const open = openFn(state, vm, api);
-  const doOpen = doOpenFn(vm, state, props, api);
-  const doAfterOpen = () => {
-    vm._opening = false;
-  };
-  const close = closeFn(api, vm);
-  const doClose = () => {
-    vm._closing = true;
-    api.onClose && api.onClose();
-    if (props.lockScroll) {
-      setTimeout(api.restoreBodyStyle, 200);
-    }
-    state.opened = false;
-    api.doAfterClose();
-  };
-  const doAfterClose = () => {
-    PopupManager.closeModal(vm._popupId);
-    vm._closing = false;
-  };
-  const restoreBodyStyle = () => {
-    if (props.modal && state.withoutHiddenClass) {
-      document.body.style.paddingRight = state.bodyPaddingRight;
-      removeClass(document.body, popLockClass);
-    }
-    state.withoutHiddenClass = true;
-  };
-  return __spreadValues({ open, close, doOpen, doClose, doAfterOpen, doAfterClose, PopupManager, restoreBodyStyle }, toRefs(state));
+  const open = openFn({ state, vm });
+  const close = closeFn({ state, vm });
+  return __spreadValues({ open, close, PopupManager }, toRefs(state));
 };
 export {
   vue_popup_default as default

package/common/event.js

@@ -1,4 +1,4 @@
-import "../chunk-PKUHTIDK.js";
+import "../chunk-G2ADBYYC.js";
 const emitEvent = (emit, name, ...args) => {
   let cancel = false;
   if (typeof emit === "function" && typeof name === "string") {
@@ -13,6 +13,13 @@ const emitEvent = (emit, name, ...args) => {
   }
   return !cancel;
 };
+const getActualTarget = (e) => {
+  if (!e || !e.target) {
+    return null;
+  }
+  return e.target.shadowRoot && e.composed ? e.composedPath()[0] || e.target : e.target;
+};
 export {
-  emitEvent
+  emitEvent,
+  getActualTarget
 };

package/common/index.js

@@ -1,4 +1,4 @@
-import "../chunk-PKUHTIDK.js";
+import "../chunk-G2ADBYYC.js";
 import { log as uLog, xss } from "./xss.js";
 const KEY_CODE = {
   Backspace: 8,
@@ -224,7 +224,7 @@ const CASCADER = {
   PropsHover: "hoverThreshold",
   MenuConnector: "cascader-menu-"
 };
-const version = "3.10.0";
+const version = "3.11.0";
 const log = (data, type = "log") => {
   uLog.logger[type](data);
 };

package/common/object.js

@@ -1,4 +1,4 @@
-import "../chunk-PKUHTIDK.js";
+import "../chunk-G2ADBYYC.js";
 import { hasOwn, typeOf, isObject, isPlainObject, isNull } from "./type";
 const each = (obj, handle) => {
   if (typeof handle !== "function") {
@@ -17,36 +17,36 @@ const getObj = (data, names, isExceptRoot) => {
   if (!data || !isPlainObject(data) || !names || typeof names !== "string") {
     return;
   }
-  names = names.split(".");
+  const nameArr = names.split(".");
   let obj = data;
-  const len = names.length;
+  const len = nameArr.length;
   if (len > 1) {
     const startIndex = isExceptRoot ? 1 : 0;
     for (let i = startIndex; i < len; i++) {
-      obj = obj[names[i]];
+      obj = obj[nameArr[i]];
       if (isNull(obj)) {
         return obj;
       }
     }
     return obj;
   } else {
-    return obj[names[0]];
+    return obj[nameArr[0]];
   }
 };
 const setObj = (data, names, value, isMerge) => {
   if (!data || !isPlainObject(data) || !names || typeof names !== "string") {
     return data;
   }
-  names = names.split(".");
+  const nameArr = names.split(".");
   const obj = data;
-  let len = names.length;
-  let item = names[0];
+  let len = nameArr.length;
+  let item = nameArr[0];
   if (len > 1) {
     len--;
     let tmpl = obj;
     let name, target;
     for (let i = 0; i < len; i++) {
-      name = names[i];
+      name = nameArr[i];
       target = tmpl[name];
       if (target === null || !isPlainObject(target)) {
         tmpl[name] = {};
@@ -54,7 +54,7 @@ const setObj = (data, names, value, isMerge) => {
       }
       tmpl = target;
     }
-    item = names[len];
+    item = nameArr[len];
     isMerge ? isPlainObject(tmpl[item]) ? extend(true, tmpl[item], value) : tmpl[item] = value : tmpl[item] = value;
   } else {
     isMerge ? isPlainObject(obj[item]) ? extend(true, obj[item], value) : obj[item] = value : obj[item] = value;
@@ -70,10 +70,11 @@ const copyField = (data, fields, isMerge, isExclude) => {
       if (name !== key) {
         each(getObj(obj, name), (field) => {
           setValue(obj, result, `${name}.${field}`, key);
+          return true;
         });
       }
     } else {
-      if (!fields.includes(name)) {
+      if (fields && !fields.includes(name)) {
         setObj(result, name, getObj(obj, name), isMerge2);
       }
     }
@@ -92,7 +93,9 @@ const copyField = (data, fields, isMerge, isExclude) => {
   }
   return data;
 };
-const copyArray = (arr) => Array.isArray(arr) ? arr.map((item) => copyField(item)) : arr;
+const copyArray = (arr) => {
+  return Array.isArray(arr) ? arr.map((item) => copyField(item)) : arr;
+};
 const deepCopy = (target, name, deep, copy, src) => {
   let copyIsArray;
   if (deep && copy && (isPlainObject(copy) || (copyIsArray = Array.isArray(copy)))) {
@@ -110,8 +113,7 @@ const deepCopy = (target, name, deep, copy, src) => {
     }
   }
 };
-extend = function() {
-  const args = arguments;
+extend = function(...args) {
   const length = args.length;
   let target = args[0] || {};
   let i = 1;
@@ -124,10 +126,6 @@ extend = function() {
   if (!isObject(target) && typeOf(target) !== "function") {
     target = {};
   }
-  if (i === length) {
-    target = this;
-    i--;
-  }
   for (; i < length; i++) {
     const options = args[i];
     if (options !== null && isObject(options)) {
@@ -154,7 +152,7 @@ const isEqual = (sourceData, targetData, deep, fields) => {
     }
     const source = isEachEqual(sourceData, targetData, deep);
     const target = isEachEqual(targetData, sourceData, deep);
-    return source === target && source !== false;
+    return source && target;
   }
   return false;
 };
@@ -201,9 +199,9 @@ const toJsonStr = (obj) => {
     return void 0;
   }
 };
-const merge = function(target) {
-  for (let i = 1, len = arguments.length; i < len; i++) {
-    const source = arguments[i] || {};
+const merge = function(target, ...rest) {
+  for (let i = 0, len = rest.length; i < len; i++) {
+    const source = rest[i] || {};
     for (const prop in source) {
       if (hasOwn.call(source, prop)) {
         const value = source[prop];

package/common/runtime.js

@@ -1,4 +1,4 @@
-import "../chunk-PKUHTIDK.js";
+import "../chunk-G2ADBYYC.js";
 import * as array from "./array";
 import browser from "./browser";
 import * as date from "./date";
@@ -22,7 +22,7 @@ import vuePopup from "./deps/vue-popup";
 import validate from "./validate";
 import memorize from "./deps/memorize";
 import * as common from ".";
-const version = "3.10.0";
+const version = "3.11.0";
 const Renderless = {
   browser,
   array,

package/common/string.js

@@ -1,8 +1,7 @@
-import "../chunk-PKUHTIDK.js";
+import "../chunk-G2ADBYYC.js";
 import { isPlainObject, isNumber, isNumeric, isNull } from "./type";
 import { getObj, toJsonStr } from "./object";
 import { toFixed } from "./decimal";
-import { nanoid } from "./xss";
 const formatTypes = {
   text: "text",
   url: "url",
@@ -116,8 +115,19 @@ const fillChar = (string, length, append, chr = "0") => {
     }
   }
 };
-const random = nanoid.random;
-const guid = (prefix = "", length = 8) => prefix + random().toString().substr(2, length);
+const random = () => {
+  let MAX_UINT32_PLUS_ONE = 4294967296;
+  return window.crypto.getRandomValues(new window.Uint32Array(1))[0] / MAX_UINT32_PLUS_ONE;
+};
+const guid = (prefix = "", length = 8) => {
+  return "xxxxxxxx".replace(/[x]/g, (c) => {
+    const random2 = parseFloat("0." + crypto.getRandomValues(new Uint32Array(1))[0]);
+    const r = random2 * 16 | 0;
+    const v = c === "x" ? r : r & 3 | 8;
+    const randomStr = v.toString(16);
+    return prefix + randomStr.substring(0, length);
+  });
+};
 const escapeHtml = (string, isReplaceSpace) => {
   if (!string || typeof string !== "string") {
     return string;

package/common/type.js

@@ -1,4 +1,4 @@
-import "../chunk-PKUHTIDK.js";
+import "../chunk-G2ADBYYC.js";
 const toString = Object.prototype.toString;
 const hasOwn = Object.prototype.hasOwnProperty;
 const getProto = Object.getPrototypeOf;
@@ -15,7 +15,7 @@ const class2type = {
   "[object Number]": "number",
   "[object Boolean]": "boolean"
 };
-const isNull = (x) => x === null || x === void 0 || x === "undefined";
+const isNull = (x) => x === null || x === void 0;
 const typeOf = (obj) => isNull(obj) ? String(obj) : class2type[toString.call(obj)] || "object";
 const isObject = (obj) => typeOf(obj) === "object";
 const isFunction = (fn) => typeOf(fn) === "function";

package/common/validate/index.js

@@ -1,4 +1,4 @@
-import "../../chunk-PKUHTIDK.js";
+import "../../chunk-G2ADBYYC.js";
 import Schema from "./schema";
 import validators from "./validations/index";
 import getDefaultMessage from "./messages";

package/common/validate/messages.js

@@ -1,4 +1,4 @@
-import "../../chunk-PKUHTIDK.js";
+import "../../chunk-G2ADBYYC.js";
 const getTypesObj = (translate) => ({
   string: translate("validation.types.string"),
   method: translate("validation.types.method"),

package/common/validate/rules/enum.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PKUHTIDK.js";
+import "../../../chunk-G2ADBYYC.js";
 import * as util from "../util";
 const ENUM = "enum";
 function enum_default(rule, checkValue, source, errors, options) {

package/common/validate/rules/index.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PKUHTIDK.js";
+import "../../../chunk-G2ADBYYC.js";
 import type from "./type";
 import range from "./range";
 import enumRule from "./enum";

package/common/validate/rules/pattern.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PKUHTIDK.js";
+import "../../../chunk-G2ADBYYC.js";
 import * as util from "../util";
 function pattern_default(rule, checkValue, source, errors, options) {
   if (rule.pattern) {

package/common/validate/rules/range.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PKUHTIDK.js";
+import "../../../chunk-G2ADBYYC.js";
 import * as util from "../util";
 import { isNumber } from "../../type";
 import { getLength } from "../../string";

package/common/validate/rules/required.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PKUHTIDK.js";
+import "../../../chunk-G2ADBYYC.js";
 import * as util from "../util";
 import { hasOwn } from "../../type";
 function required_default({ rule, checkValue, source, errors, options, type }) {

package/common/validate/rules/type.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PKUHTIDK.js";
+import "../../../chunk-G2ADBYYC.js";
 import * as util from "../util";
 import required from "./required";
 import { format } from "../../date";

package/common/validate/rules/whitespace.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PKUHTIDK.js";
+import "../../../chunk-G2ADBYYC.js";
 import * as util from "../util";
 function whitespace_default(rule, checkValue, source, errors, options) {
   if (/^\s+$/.test(checkValue) || checkValue === "") {

package/common/validate/schema.js

@@ -1,7 +1,7 @@
 import {
   __spreadProps,
   __spreadValues
-} from "../../chunk-PKUHTIDK.js";
+} from "../../chunk-G2ADBYYC.js";
 import { format, complementError, asyncMap, warning, deepMerge, convertFieldsError } from "./util";
 import { hasOwn, isFunction } from "../type";
 function Schema(descriptor, translate) {
@@ -129,6 +129,9 @@ Schema.prototype = {
     }
     return this._messages;
   },
+  /** 格式化检验规则并添加到实例上。
+   *  rules格式化后的数据结构: { key: [ { type: 'xx', ...others } ] }
+   */
   define(rules) {
     if (!rules) {
       throw new Error("Cannot configure a schema with no rules");
@@ -145,6 +148,10 @@ Schema.prototype = {
       }
     });
   },
+  /** 将检验规则和源数据合并转化成新数据
+   *  rules: { key: [rule1, rule2] }, source: { key: sourceData, key2: sourceData2 }
+   *  series { key: [{ rule: rule1, value: sourceData, source, field: key }, ...] }
+   */
   getSeries(options, source, source_) {
     let arr;
     let value;

package/common/validate/util.js

@@ -1,6 +1,6 @@
 import {
   __spreadValues
-} from "../../chunk-PKUHTIDK.js";
+} from "../../chunk-G2ADBYYC.js";
 import { hasOwn, isNull } from "../type";
 import { log } from "../xss";
 const formatRegExp = /%[sdj%]/g;
@@ -52,7 +52,7 @@ function format(...args) {
   return checkData;
 }
 function isNativeStringType(type) {
-  return ~[
+  return [
     "string",
     "url",
     "hex",
@@ -71,7 +71,7 @@ function isNativeStringType(type) {
     "acceptImg",
     "acceptFile",
     "fileSize"
-  ].indexOf(type);
+  ].includes(type);
 }
 function isEmptyValue(data, dataType) {
   if (isNull(data)) {
@@ -162,7 +162,7 @@ function asyncMap(objArray, option, func, callback) {
     };
     objArrayKeys.forEach((key) => {
       const arr = objArray[key];
-      if (~firstFields.indexOf(key)) {
+      if (firstFields.includes(key)) {
         asyncSerialArray(arr, func, next);
       } else {
         asyncParallelArray(arr, func, next);

package/common/validate/validations/array.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PKUHTIDK.js";
+import "../../../chunk-G2ADBYYC.js";
 import rules from "../rules/index";
 import { isEmptyValue } from "../util";
 import { hasOwn } from "../../type";

package/common/validate/validations/date.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PKUHTIDK.js";
+import "../../../chunk-G2ADBYYC.js";
 import rules from "../rules/index";
 import { isEmptyValue } from "../util";
 import { hasOwn } from "../../type";

package/common/validate/validations/enum.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PKUHTIDK.js";
+import "../../../chunk-G2ADBYYC.js";
 import rules from "../rules/index";
 import { isEmptyValue } from "../util";
 import { hasOwn } from "../../type";

package/common/validate/validations/float.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PKUHTIDK.js";
+import "../../../chunk-G2ADBYYC.js";
 import rules from "../rules/index";
 import { isEmptyValue } from "../util";
 import { hasOwn } from "../../type";

package/common/validate/validations/index.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PKUHTIDK.js";
+import "../../../chunk-G2ADBYYC.js";
 import date from "./date";
 import type from "./type";
 import float from "./float";

package/common/validate/validations/integer.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PKUHTIDK.js";
+import "../../../chunk-G2ADBYYC.js";
 import rules from "../rules/index";
 import { isEmptyValue } from "../util";
 import { hasOwn } from "../../type";

package/common/validate/validations/method.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PKUHTIDK.js";
+import "../../../chunk-G2ADBYYC.js";
 import rules from "../rules/index";
 import { isEmptyValue } from "../util";
 import { hasOwn } from "../../type";

package/common/validate/validations/number.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PKUHTIDK.js";
+import "../../../chunk-G2ADBYYC.js";
 import rules from "../rules/index";
 import { isEmptyValue } from "../util";
 import { hasOwn } from "../../type";

package/common/validate/validations/pattern.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PKUHTIDK.js";
+import "../../../chunk-G2ADBYYC.js";
 import rules from "../rules/index";
 import { isEmptyValue } from "../util";
 import { hasOwn } from "../../type";

package/common/validate/validations/required.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PKUHTIDK.js";
+import "../../../chunk-G2ADBYYC.js";
 import rules from "../rules/index";
 function required_default(rule, checkValue, callback, source, options) {
   const errors = [];

package/common/validate/validations/string.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PKUHTIDK.js";
+import "../../../chunk-G2ADBYYC.js";
 import rules from "../rules/index";
 import { isEmptyValue } from "../util";
 import { hasOwn } from "../../type";

package/common/validate/validations/type.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PKUHTIDK.js";
+import "../../../chunk-G2ADBYYC.js";
 import rules from "../rules/index";
 import { isEmptyValue } from "../util";
 import { hasOwn } from "../../type";