@opentiny/vue-renderless 3.12.1 → 3.13.0-alpha.1

package/common/deps/popper.js

@@ -68,6 +68,22 @@ const isScrollElement = (el) => {
   const scrollTypes = ["scroll", "auto"];
   return scrollTypes.includes(getStyleComputedProperty(el, "overflow")) || scrollTypes.includes(getStyleComputedProperty(el, "overflow-x")) || scrollTypes.includes(getStyleComputedProperty(el, "overflow-y"));
 };
+const getAdjustOffset = (parent) => {
+  const placeholder = document.createElement("div");
+  setStyle(placeholder, {
+    opacity: 0,
+    position: "fixed",
+    width: 1,
+    height: 1,
+    top: 0,
+    left: 0,
+    "z-index": "-99"
+  });
+  parent.appendChild(placeholder);
+  const result = getBoundingClientRect(placeholder);
+  parent.removeChild(placeholder);
+  return result;
+};
 const getScrollParent = (el) => {
   let parent = el.parentNode;
   if (!parent) {
@@ -84,9 +100,14 @@ const getScrollParent = (el) => {
   }
   return getScrollParent(parent);
 };
-const getOffsetRectRelativeToCustomParent = (el, parent, fixed) => {
+const getOffsetRectRelativeToCustomParent = (el, parent, fixed, popper) => {
   let { top, left, width, height } = getBoundingClientRect(el);
   if (fixed) {
+    if (popper.parentElement) {
+      const { top: adjustTop, left: adjustLeft } = getAdjustOffset(popper.parentElement);
+      top -= adjustTop;
+      left -= adjustLeft;
+    }
     return {
       top,
       left,
@@ -161,6 +182,9 @@ const getOffsetRect = (el) => {
   elementRect.bottom = elementRect.top + elementRect.height;
   return elementRect;
 };
+const stopFn = (ev) => {
+  ev.stopPropagation();
+};
 class Popper {
   constructor(reference, popper, options) {
     this.modifiers = {};
@@ -192,6 +216,7 @@ class Popper {
   }
   update() {
     let data = { instance: this, styles: {} };
+    this.stopEventBubble();
     this.popperOuterSize = null;
     data.placement = data._originalPlacement = this._options.placement;
     data.offsets = this._getRefPopOffsets(this._popper, this._reference, data.placement);
@@ -199,6 +224,15 @@ class Popper {
     data = this.runModifiers(data, this._options.modifierFns);
     typeof this.state.updateCallback === "function" && this.state.updateCallback(data);
   }
+  // 阻止popper的mousewheel等事件冒泡。 通过 onxxx 绑定，是为了避免重复绑定事件
+  stopEventBubble() {
+    if (!this._popper)
+      return;
+    if (!this._popper.onmousewheel)
+      this._popper.onmousewheel = stopFn;
+    if (!this._popper.onwheel)
+      this._popper.onwheel = stopFn;
+  }
   /** 按顺序执行Modifiers， 如果传入终点modifier,则执行到指定位置 */
   runModifiers(data, modifiers2, ends) {
     let modifiersToRun = modifiers2.slice();
@@ -206,7 +240,7 @@ class Popper {
     if (ends !== void 0) {
       modifiersToRun = this._options.modifierFns.slice(
         0,
-        _options.modifierFns.findIndex((m) => m == ends)
+        _options.modifierFns.findIndex((m) => m === ends)
       );
     }
     modifiersToRun.forEach((modifier) => {
@@ -221,8 +255,12 @@ class Popper {
     let styles = { position: data.offsets.popper.position };
     let left = Math.round(data.offsets.popper.left);
     let top = Math.round(data.offsets.popper.top);
-    styles.transform = `translate3d(${left}px, ${top}px, 0)`;
-    Object.assign(styles, { top: 0, left: 0 });
+    if (this._options.gpuAcceleration) {
+      styles.transform = `translate3d(${left}px, ${top}px, 0)`;
+      Object.assign(styles, { top: 0, left: 0 });
+    } else {
+      Object.assign(styles, { top, left });
+    }
     Object.assign(styles, data.styles);
     setStyle(this._popper, styles);
     this._popper.setAttribute("x-placement", data.placement);
@@ -416,7 +454,12 @@ class Popper {
     placement = placement.split("-")[0];
     let popperOffsets = { position: this.state.position };
     let isParentFixed = popperOffsets.position === "fixed";
-    let referenceOffsets = getOffsetRectRelativeToCustomParent(reference, getOffsetParent(popper), isParentFixed);
+    let referenceOffsets = getOffsetRectRelativeToCustomParent(
+      reference,
+      getOffsetParent(popper),
+      isParentFixed,
+      popper
+    );
     const { width, height } = this.popperOuterSize ? this.popperOuterSize : this.popperOuterSize = getOuterSizes(popper);
     if (~["right", "left"].indexOf(placement)) {
       popperOffsets.top = referenceOffsets.top + referenceOffsets.height / 2 - height / 2;

package/common/deps/touch-emulator.js

@@ -24,6 +24,8 @@ class Touch {
     this.screenY = pos.screenY + deltaY;
     this.clientX = pos.clientX + deltaX;
     this.clientY = pos.clientY + deltaY;
+    this.offsetX = pos.offsetX + deltaX;
+    this.offsetY = pos.offsetY + deltaY;
   }
 }
 const TouchList = () => {
@@ -69,7 +71,8 @@ const onMouse = (touchType) => (ev) => {
   if (ev.type === "mousedown" || !mouseTarget) {
     mouseTarget = ev.target;
   }
-  if ((eventTarget = closest(mouseTarget, "[data-tiny-touch-simulate-container]")) && eventTarget.dispatchEvent) {
+  eventTarget = closest(mouseTarget, "[data-tiny-touch-simulate-container]");
+  if (eventTarget && eventTarget.dispatchEvent) {
     triggerTouch(touchType, ev);
   }
   if (ev.type === "mouseup") {

package/common/deps/tree-model/node.js

@@ -120,7 +120,7 @@ class Node {
     });
     const isLeafKey = ((_b = (_a = this.store) == null ? void 0 : _a.props) == null ? void 0 : _b.isLeaf) || defaultIsLeafKey;
     this.isLeaf = !!(this.data && this.data[isLeafKey]);
-    this.loaded = false;
+    this.loaded = this.isLeaf;
     this.loading = false;
     this.childNodes = [];
     this.level = this.parent ? this.parent.level + 1 : 0;

package/common/deps/tree-model/tree-store.js

@@ -27,12 +27,11 @@ class TreeStore {
     }
   }
   filter(value) {
-    const { lazy, getMappingData, filterNodeMethod } = this;
+    const { lazy, filterNodeMethod } = this;
     const walkTree = (node) => {
       const childNodes = node.root ? node.root.childNodes : node.childNodes;
       childNodes.forEach((child) => {
-        const mappingData = getMappingData.call(this, child.data);
-        child.visible = filterNodeMethod.call(child, value, mappingData, child);
+        child.visible = filterNodeMethod.call(child, value, child.data, child);
         walkTree(child);
       });
       if (!node.visible && childNodes.length) {
@@ -52,16 +51,6 @@ class TreeStore {
     };
     walkTree(this);
   }
-  getMappingData(data) {
-    const props = this.props || {};
-    const mapping = {};
-    Object.keys(props).forEach((key) => {
-      if (hasOwn.call(props, key)) {
-        mapping[key] = data[props[key]];
-      }
-    });
-    return Object.assign(data, mapping);
-  }
   setData(newVal) {
     if (newVal !== this.root.data) {
       this.root.setData(newVal);

package/common/deps/useRect.js

@@ -0,0 +1,25 @@
+import "../../chunk-G2ADBYYC.js";
+const isWindow = (val) => val === window;
+const makeDOMRect = (width, height) => ({
+  top: 0,
+  left: 0,
+  width,
+  right: width,
+  height,
+  bottom: height
+});
+const useRect = (unref) => (elOrRef) => {
+  const el = unref(elOrRef);
+  if (isWindow(el)) {
+    const width = el.innerWidth;
+    const height = el.innerHeight;
+    return makeDOMRect(width, height);
+  }
+  if (el && el.getBoundingClientRect) {
+    return el.getBoundingClientRect();
+  }
+  return makeDOMRect(0, 0);
+};
+export {
+  useRect
+};

package/common/deps/vue-popper.js

@@ -6,13 +6,8 @@ import PopperJS from "./popper";
 import { on } from "./dom";
 const stop = (e) => e.stopPropagation();
 const isServer = typeof window === "undefined";
-const getReference = ({
-  state,
-  props,
-  refs,
-  slots
-}) => {
-  let reference = state.referenceElm || props.reference || refs.reference && refs.reference.$el || refs.reference;
+const getReference = ({ state, props, vm, slots }) => {
+  let reference = state.referenceElm || props.reference || vm.$refs.reference && vm.$refs.reference.$el || vm.$refs.reference;
   if (!reference && slots.reference && slots.reference()[0]) {
     state.referenceElm = slots.reference()[0].elm || slots.reference()[0].el;
     reference = state.referenceElm;
@@ -20,7 +15,20 @@ const getReference = ({
   return reference;
 };
 var vue_popper_default = (options) => {
-  const { parent, emit, nextTick, onBeforeUnmount, onDeactivated, props, watch, reactive, refs, slots, toRefs } = options;
+  const {
+    parent,
+    emit,
+    nextTick,
+    onBeforeUnmount,
+    onDeactivated,
+    props,
+    watch,
+    reactive,
+    vm,
+    slots,
+    toRefs,
+    popperVmRef
+  } = options;
   const state = reactive({
     popperJS: null,
     appended: false,
@@ -56,9 +64,9 @@ var vue_popper_default = (options) => {
       return;
     }
     const options2 = props.popperOptions || {};
-    state.popperElm = state.popperElm || props.popper || refs.popper;
+    state.popperElm = state.popperElm || props.popper || vm.$refs.popper || popperVmRef.popper;
     const popper = state.popperElm;
-    let reference = getReference({ state, props, refs, slots });
+    let reference = getReference({ state, props, vm, slots });
     if (!popper || !reference || reference.nodeType !== Node.ELEMENT_NODE) {
       return;
     }
@@ -91,6 +99,10 @@ var vue_popper_default = (options) => {
     const popperJS = state.popperJS;
     if (popperJS) {
       popperJS.update();
+      if (popperJS._popper) {
+        popperJS._popper.style.zIndex = PopupManager.nextZIndex().toString();
+        followHide(state.popperJS);
+      }
     } else {
       createPopper();
     }

package/common/index.js

@@ -224,7 +224,7 @@ const CASCADER = {
   PropsHover: "hoverThreshold",
   MenuConnector: "cascader-menu-"
 };
-const version = "3.12.0";
+const version = "3.13.0-alpha.0";
 const log = (data, type = "log") => {
   uLog.logger[type](data);
 };

package/common/runtime.js

@@ -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.12.0";
+const version = "3.13.0-alpha.0";
 const Renderless = {
   browser,
   array,

package/common/type.js

@@ -11,6 +11,7 @@ const class2type = {
   "[object Date]": "date",
   "[object Array]": "array",
   "[object Function]": "function",
+  "[object AsyncFunction]": "asyncFunction",
   "[object String]": "string",
   "[object Number]": "number",
   "[object Boolean]": "boolean"
@@ -18,7 +19,7 @@ const class2type = {
 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";
+const isFunction = (fn) => ["asyncFunction", "function"].includes(typeOf(fn));
 const isPlainObject = (obj) => {
   if (!obj || toString.call(obj) !== "[object Object]") {
     return false;

package/common/validate/rules/enum.js

@@ -4,7 +4,7 @@ const ENUM = "enum";
 function enum_default(rule, checkValue, source, errors, options) {
   rule[ENUM] = Array.isArray(rule[ENUM]) ? rule[ENUM] : [];
   if (!rule[ENUM].includes(checkValue)) {
-    errors.push(util.format(options.messages[ENUM], rule.fullField, rule[ENUM].join(", ")));
+    errors.push(util.format(options.messages[ENUM], "", rule[ENUM].join(", ")));
   }
 }
 export {

package/common/validate/rules/pattern.js

@@ -5,12 +5,12 @@ function pattern_default(rule, checkValue, source, errors, options) {
     if (rule.pattern instanceof RegExp) {
       rule.pattern.lastIndex = 0;
       if (!rule.pattern.test(checkValue)) {
-        errors.push(util.format(options.messages.pattern.mismatch, rule.fullField, checkValue, rule.pattern));
+        errors.push(util.format(options.messages.pattern.mismatch, "", checkValue, rule.pattern));
       }
     } else if (typeof rule.pattern === "string") {
       const _pattern = new RegExp(rule.pattern);
       if (!_pattern.test(checkValue)) {
-        errors.push(util.format(options.messages.pattern.mismatch, rule.fullField, checkValue, rule.pattern));
+        errors.push(util.format(options.messages.pattern.mismatch, "", checkValue, rule.pattern));
       }
     }
   }

package/common/validate/rules/range.js

@@ -4,11 +4,11 @@ import { isNumber } from "../../type";
 import { getLength } from "../../string";
 function getErro({ min, max, val, key, rule, errors, util: util2, options }) {
   if (min && !max && val < rule.min) {
-    errors.push(util2.format(options.messages[key].min, rule.fullField, rule.min));
+    errors.push(util2.format(options.messages[key].min, "", rule.min));
   } else if (max && !min && val > rule.max) {
-    errors.push(util2.format(options.messages[key].max, rule.fullField, rule.max));
+    errors.push(util2.format(options.messages[key].max, "", rule.max));
   } else if (min && max && (val < rule.min || val > rule.max)) {
-    errors.push(util2.format(options.messages[key].range, rule.fullField, rule.min, rule.max));
+    errors.push(util2.format(options.messages[key].range, "", rule.min, rule.max));
   }
 }
 function range_default(rule, checkValue, source, errors, options) {
@@ -17,7 +17,7 @@ function range_default(rule, checkValue, source, errors, options) {
   const max = isNumber(rule.max);
   let val = checkValue;
   let key = null;
-  const num = isNumber(checkValue);
+  const num = isNumber(Number(checkValue));
   const str = typeof checkValue === "string";
   const arr = Array.isArray(checkValue);
   if (num) {
@@ -36,9 +36,12 @@ function range_default(rule, checkValue, source, errors, options) {
   if (str) {
     val = getLength(checkValue, "string");
   }
+  if (rule.type === "number") {
+    val = checkValue;
+  }
   if (len) {
     if (val !== rule.len) {
-      errors.push(util.format(options.messages[key].len, rule.fullField, rule.len));
+      errors.push(util.format(options.messages[key].len, "", rule.len));
     }
   } else {
     getErro({ min, max, val, key, rule, errors, util, options });

package/common/validate/rules/required.js

@@ -3,7 +3,7 @@ import * as util from "../util";
 import { hasOwn } from "../../type";
 function required_default({ rule, checkValue, source, errors, options, type }) {
   if (rule.required && (!hasOwn.call(source, rule.field) || util.isEmptyValue(checkValue, type || rule.type))) {
-    errors.push(util.format(options.messages.required, rule.fullField));
+    errors.push(util.format(options.messages.required, ""));
   }
 }
 export {

package/common/validate/rules/type.js

@@ -17,11 +17,11 @@ const pattern = {
   speczh: /^[0-9a-zA-Z_\u4E00-\u9FA5]+$/,
   specialch: /^[0-9a-zA-Z_\-.]+$/,
   specialch2: /^[0-9a-zA-Z_-]+$/,
-  url: /^([a-zA-Z]{3,}):\/\/([\w-]+\.)+[\w]+(\/[a-zA-Z- ./?%&=]*)?/i,
+  url: /^(([a-zA-Z]{3,}):)?\/\/([\w-]+\.)+[\w]+(\/[a-zA-Z- ./?%&=]*)?/i,
   version: /^\d+\.\d+(\.\d+)*$/
 };
 const types = {
-  integer: (value) => types.number(value) && parseInt(value, 10) === value,
+  integer: (value) => types.number(value) && /^[-]?[\d]+$/.test(value),
   float: (value) => types.number(value) && !types.integer(value),
   array: Array.isArray,
   regexp(value) {
@@ -35,7 +35,7 @@ const types = {
     }
   },
   date: isDate,
-  number: isNumber,
+  number: (value) => isNumber(Number(value)),
   object: (value) => isObject(value) && !types.array(value),
   method: (value) => typeOf(value) === "function",
   email: (value) => isNullOrEmpty(value) || !!value.match(pattern.email) && value.length < 255,
@@ -89,10 +89,10 @@ function type_default(rule, value, source, errors, options) {
   const ruleType = rule.type;
   if (custom.includes(ruleType)) {
     if (!types[ruleType](value)) {
-      errors.push(util.format(options.messages.types[ruleType], rule.fullField, rule.type));
+      errors.push(util.format(options.messages.types[ruleType], "", rule.type));
     }
   } else if (ruleType && typeof value !== rule.type) {
-    errors.push(util.format(options.messages.types[ruleType], rule.fullField, rule.type));
+    errors.push(util.format(options.messages.types[ruleType], "", rule.type));
   }
 }
 export {

package/common/validate/rules/whitespace.js

@@ -2,7 +2,7 @@ import "../../../chunk-G2ADBYYC.js";
 import * as util from "../util";
 function whitespace_default(rule, checkValue, source, errors, options) {
   if (/^\s+$/.test(checkValue) || checkValue === "") {
-    errors.push(util.format(options.messages.whitespace, rule.fullField));
+    errors.push(util.format(options.messages.whitespace, ""));
   }
 }
 export {

package/common/validate/util.js

@@ -4,7 +4,7 @@ import {
 import { hasOwn, isNull } from "../type";
 import { log } from "../xss";
 const formatRegExp = /%[sdj%]/g;
-let warning = () => void 0;
+const warning = () => void 0;
 function convertFieldsError(errors) {
   if (!errors || !errors.length) {
     return null;
@@ -17,15 +17,14 @@ function convertFieldsError(errors) {
   });
   return fields;
 }
-function format(...args) {
-  let i = 1;
-  const checkData = args[0];
-  const len = args.length;
-  if (typeof checkData === "function") {
-    return checkData.apply(null, args.slice(1));
+function format(i18nTemplate, ...rest) {
+  if (typeof i18nTemplate === "function") {
+    return i18nTemplate(...rest);
   }
-  if (typeof checkData === "string") {
-    let str = String(checkData).replace(formatRegExp, (matchChar) => {
+  if (typeof i18nTemplate === "string") {
+    let i = 0;
+    const len = rest.length;
+    let str = String(i18nTemplate).replace(formatRegExp, (matchChar) => {
       if (matchChar === "%%") {
         return "%";
       }
@@ -35,21 +34,21 @@ function format(...args) {
       switch (matchChar) {
         case "%j":
           try {
-            return JSON.stringify(args[i++]);
+            return JSON.stringify(rest[i++]);
           } catch (e) {
             return "[Circular]";
           }
         case "%d":
-          return Number(args[i++]);
+          return Number(rest[i++]);
         case "%s":
-          return String(args[i++]);
+          return String(rest[i++]);
         default:
           return matchChar;
       }
     });
     return str;
   }
-  return checkData;
+  return i18nTemplate;
 }
 function isNativeStringType(type) {
   return [
@@ -93,7 +92,7 @@ function asyncParallelArray(arrData, func, callback) {
   const results = [];
   const arrLength = arrData.length;
   function checkCount(errors) {
-    results.push.apply(results, errors);
+    results.push(...errors);
     count++;
     if (count === arrLength) {
       callback(results);
@@ -124,7 +123,7 @@ function asyncSerialArray(arr, fn, cb) {
 function flattenObjArr(objArr) {
   const result = [];
   Object.keys(objArr).forEach((item) => {
-    result.push.apply(result, objArr[item]);
+    result.push(...objArr[item]);
   });
   return result;
 }
@@ -153,7 +152,7 @@ function asyncMap(objArray, option, func, callback) {
   const pending = new Promise((resolve, reject) => {
     const errorFn = reject;
     const next = (errors) => {
-      results.push.apply(results, errors);
+      results.push(...errors);
       total++;
       if (total === objArrLength) {
         callback(results);

package/common/validate/validations/integer.js

@@ -10,7 +10,7 @@ function integer_default(rule, checkValue, callback, source, options) {
       return callback();
     }
     rules.required({ rule, checkValue, source, errors, options });
-    if (void 0 !== checkValue) {
+    if (checkValue !== void 0 && checkValue !== "") {
       rules.type(rule, checkValue, source, errors, options);
       rules.range(rule, checkValue, source, errors, options);
     }

package/common/validate/validations/method.js

@@ -10,7 +10,7 @@ function method_default(rule, checkValue, callback, source, options) {
       return callback();
     }
     rules.required({ rule, checkValue, source, errors, options });
-    if (void 0 !== checkValue) {
+    if (checkValue !== void 0) {
       rules.type(rule, checkValue, source, errors, options);
     }
   }

package/container/index.js

@@ -73,12 +73,28 @@ const computedFooterStyle = ({ constants, props }) => () => {
     height: transferWidthOrHeight(props.footerHeight)
   };
 };
+const computedLeftStyle = ({ constants, props }) => () => {
+  return {
+    width: transferWidthOrHeight(props.leftWidth)
+  };
+};
+const computedShowRight = ({ constants, props }) => () => {
+  return props.pattern === constants.DEFAULT ? false : true;
+};
+const computedRightStyle = ({ constants, props }) => () => {
+  return {
+    width: transferWidthOrHeight(props.rightWidth)
+  };
+};
 export {
   computedAsideStyle,
   computedFooterStyle,
   computedHeaderStyle,
+  computedLeftStyle,
   computedMainStyle,
+  computedRightStyle,
   computedShowAside,
   computedShowFooter,
-  computedShowHeader
+  computedShowHeader,
+  computedShowRight
 };

package/container/vue.js

@@ -6,7 +6,10 @@ import {
   computedHeaderStyle,
   computedAsideStyle,
   computedMainStyle,
-  computedFooterStyle
+  computedFooterStyle,
+  computedLeftStyle,
+  computedShowRight,
+  computedRightStyle
 } from "./index";
 const api = ["state"];
 const renderless = (props, { computed, reactive }, { constants }) => {
@@ -18,7 +21,10 @@ const renderless = (props, { computed, reactive }, { constants }) => {
     mainStyle: computed(() => api2.computedMainStyle()),
     asideStyle: computed(() => api2.computedAsideStyle()),
     headerStyle: computed(() => api2.computedHeaderStyle()),
-    footerStyle: computed(() => api2.computedFooterStyle())
+    footerStyle: computed(() => api2.computedFooterStyle()),
+    showRight: computed(() => api2.computedShowRight()),
+    leftStyle: computed(() => api2.computedLeftStyle()),
+    rightStyle: computed(() => api2.computedRightStyle())
   });
   Object.assign(api2, {
     state,
@@ -28,7 +34,10 @@ const renderless = (props, { computed, reactive }, { constants }) => {
     computedMainStyle: computedMainStyle({ constants, props }),
     computedAsideStyle: computedAsideStyle({ constants, props }),
     computedHeaderStyle: computedHeaderStyle({ constants, props }),
-    computedFooterStyle: computedFooterStyle({ constants, props })
+    computedFooterStyle: computedFooterStyle({ constants, props }),
+    computedLeftStyle: computedLeftStyle({ constants, props }),
+    computedShowRight: computedShowRight({ constants, props }),
+    computedRightStyle: computedRightStyle({ constants, props })
   });
   return api2;
 };