@web-utils/component 2.7.36 → 2.7.37

package/dist/components/swiper/index.mjs

@@ -0,0 +1,178 @@
+var h = (t, e, s) => new Promise((i, r) => {
+  var d = (n) => {
+    try {
+      a(s.next(n));
+    } catch (o) {
+      r(o);
+    }
+  }, c = (n) => {
+    try {
+      a(s.throw(n));
+    } catch (o) {
+      r(o);
+    }
+  }, a = (n) => n.done ? i(n.value) : Promise.resolve(n.value).then(d, c);
+  a((s = s.apply(t, e)).next());
+});
+import { getEleWidth as u } from "@web-utils/core";
+import { n as p } from "../../chunks/vueComponentNormalizer.446f5dc4.mjs";
+var f = function() {
+  var t = this, e = t.$createElement, s = t._self._c || e;
+  return s("div", {
+    staticClass: "egd-swiper"
+  }, [s("ElButton", {
+    staticClass: "el-carousel__arrow el-carousel__arrow--left",
+    attrs: {
+      disabled: t.reachedLeft,
+      icon: "el-icon-arrow-left"
+    },
+    on: {
+      click: t.clickLeft
+    }
+  }), s("div", {
+    ref: "swiperBox",
+    staticClass: "egd-swiper-box",
+    on: {
+      wheel: function(i) {
+        return i.stopPropagation(), i.preventDefault(), t.onMouseWheel.apply(null, arguments);
+      }
+    }
+  }, [s("div", {
+    ref: "swiperContent",
+    staticClass: "egd-swiper-content",
+    style: t.swiperContentStyle
+  }, [t._t("default")], 2)]), s("ElButton", {
+    staticClass: "el-carousel__arrow el-carousel__arrow--right",
+    attrs: {
+      disabled: t.reachedRight,
+      icon: "el-icon-arrow-right"
+    },
+    on: {
+      click: t.clickRight
+    }
+  }), s("ResizeObserver", {
+    on: {
+      notify: t.resize
+    }
+  })], 1);
+}, w = [];
+const m = {
+  name: "Swiper",
+  data() {
+    return {
+      mouseDown: !1,
+      swiperBoxWith: 0,
+      swiperContentWidth: 0,
+      translateX: 0,
+      reachedLeft: !0,
+      reachedRight: !1,
+      childrenWidth: [],
+      swiperContentStyle: {
+        transitionDuration: "0ms",
+        transform: "translate3d(0px, 0px, 0px)"
+      }
+    };
+  },
+  mounted() {
+    return h(this, null, function* () {
+      yield this.layout();
+    });
+  },
+  updated() {
+    this.computeContentWidth();
+  },
+  methods: {
+    layout() {
+      return h(this, null, function* () {
+        yield this.$nextTick(), this.computeContentWidth(), this.resize();
+      });
+    },
+    resize() {
+      console.log(1), this.swiperBoxWith = this.$refs.swiperBox.offsetWidth;
+    },
+    computeContentWidth() {
+      let t = 0;
+      const e = [], { children: s } = this.$refs.swiperContent;
+      Array.prototype.forEach.call(s, (i) => {
+        const r = u(i);
+        t += r, e.push(r);
+      }), this.childrenWidth = e, this.swiperContentWidth = t;
+    },
+    updateDuration(t) {
+      this.swiperContentStyle.transitionDuration = t ? "300ms" : "0ms";
+    },
+    setTranslateX(t) {
+      this.swiperContentWidth <= this.swiperBoxWith || (t > 0 ? (this.translateX = 0, this.reachedLeft = !0, this.reachedRight = !1) : t - this.swiperBoxWith < -this.swiperContentWidth ? (this.translateX = -this.swiperContentWidth + this.swiperBoxWith, this.reachedLeft = !1, this.reachedRight = !0) : (this.translateX = t, this.reachedLeft = !1, this.reachedRight = !1), this.swiperContentStyle.transform = `translate3d(${this.translateX}px, 0px, 0px)`);
+    },
+    clickLeft() {
+      this.updateDuration(!0);
+      let t = this.translateX + this.swiperBoxWith, e = t;
+      if (t < 0) {
+        e = 0, t = -t;
+        for (let s = 0, i = this.childrenWidth.length; s < i && (e += this.childrenWidth[s], !(e >= t)); s++)
+          ;
+        e = -e;
+      }
+      this.setTranslateX(e);
+    },
+    clickRight() {
+      this.updateDuration(!0);
+      const t = Math.abs(this.translateX - this.swiperBoxWith);
+      let e = 0;
+      for (let s = 0, i = this.childrenWidth.length; s < i; s++)
+        if (e += this.childrenWidth[s], e >= t) {
+          e > t && (e -= this.childrenWidth[s]);
+          break;
+        }
+      this.setTranslateX(-e);
+    },
+    onMouseWheel(t) {
+      this.updateDuration(!0), t.deltaMode === WheelEvent.DOM_DELTA_LINE ? this.setTranslateX(this.translateX - t.deltaY * 30) : t.deltaMode === WheelEvent.DOM_DELTA_PAGE ? t.deltaY > 0 ? this.clickRight() : this.clickLeft() : this.setTranslateX(this.translateX - t.deltaY);
+    },
+    onMouseDown(t) {
+      this.mouseDown = !0, this.startX = t.clientX, this.translateXRaw = this.translateX, window.addEventListener("mousemove", this.onMouseMove, { passive: !1 }), window.addEventListener("mouseup", this.onMouseUp, { passive: !1 });
+    },
+    onMouseUp(t) {
+      this.mouseDown = !1, this.updateDuration(!0), this.$refs.swiperContent.addEventListener("transitionend", this.transitionend), this.$refs.swiperContent.addEventListener("webkitTransitionEnd", this.transitionend);
+      const e = t.clientX - this.startX;
+      if (e < 0) {
+        const s = this.translateX + e;
+        this.setTranslateX(s);
+      }
+      if (e > 0) {
+        const s = this.translateX + e;
+        this.setTranslateX(s);
+      }
+      window.removeEventListener("mousemove", this.onMouseMove), window.removeEventListener("mouseup", this.onMouseUp);
+    },
+    onMouseMove(t) {
+      this.mouseDown && requestAnimationFrame(() => {
+        const e = t.clientX - this.startX, s = this.translateXRaw + e;
+        this.setTranslateX(s);
+      });
+    },
+    transitionend() {
+      this.updateDuration(!1), this.$refs.swiperContent.removeEventListener("transitionend", this.transitionend), this.$refs.swiperContent.removeEventListener("webkitTransitionEnd", this.transitionend);
+    }
+  }
+}, l = {};
+var _ = /* @__PURE__ */ p(
+  m,
+  f,
+  w,
+  !1,
+  v,
+  null,
+  null,
+  null
+);
+function v(t) {
+  for (let e in l)
+    this[e] = l[e];
+}
+const x = /* @__PURE__ */ function() {
+  return _.exports;
+}();
+export {
+  x as default
+};

package/dist/components/swiper/style.css

@@ -1,43 +1 @@
-/* 全局公共颜色配置 */ /* 全局公共尺寸配置 */
-/* 应用头部高度 */
-/* 页面宽度 */
-/* 侧栏宽度 */
-/* 标签高度 */
-/* 页面头部工具条高度 */
-.egd-swiper {
-  position: relative;
-  height: 100%;
-  padding: 0 60px;
-}
-.egd-swiper .el-button.el-carousel__arrow {
-  padding: 0;
-  color: #fff;
-  font-size: 12px;
-  background-color: rgba(31, 45, 61, 0.11);
-  border-color: rgba(31, 45, 61, 0.01);
-  border-radius: 50%;
-}
-.egd-swiper .el-button.el-carousel__arrow i {
-  cursor: unset;
-}
-.egd-swiper .el-button.el-carousel__arrow.is-disabled {
-  color: white;
-  background-color: rgba(31, 45, 61, 0.11);
-  border-color: rgba(31, 45, 61, 0.01);
-}
-.egd-swiper .egd-swiper-box {
-  height: 100%;
-  overflow: hidden;
-  user-select: none;
-}
-.egd-swiper .egd-swiper-box .egd-swiper-content {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: nowrap;
-  width: 100%;
-  height: 100%;
-  padding-top: 14px;
-  overflow: visible;
-  transform: translate3d(0, 0, 0);
-  transition-property: transform;
-}
+.egd-swiper{position:relative;height:100%;padding:0 60px}.egd-swiper .el-button.el-carousel__arrow{padding:0;color:#fff;font-size:12px;background-color:#1f2d3d1c;border-color:#1f2d3d03;border-radius:50%}.egd-swiper .el-button.el-carousel__arrow i{cursor:unset}.egd-swiper .el-button.el-carousel__arrow.is-disabled{color:#fff;background-color:#1f2d3d1c;border-color:#1f2d3d03}.egd-swiper .egd-swiper-box{height:100%;overflow:hidden;user-select:none}.egd-swiper .egd-swiper-box .egd-swiper-content{display:flex;flex-direction:row;flex-wrap:nowrap;width:100%;height:100%;padding-top:14px;overflow:visible;transform:translateZ(0);transition-property:transform}

package/dist/components/tab/index.mjs

@@ -0,0 +1,147 @@
+import { p as a } from "../../chunks/tab-mixin.e2b9c6a4.mjs";
+import { n as s } from "../../chunks/vueComponentNormalizer.446f5dc4.mjs";
+var o = function() {
+  var t = this, r = t.$createElement, e = t._self._c || r;
+  return e("div", {
+    staticClass: "vux-tab-wrap",
+    class: t.barPosition === "top" ? "vux-tab-bar-top" : ""
+  }, [e("div", {
+    staticClass: "vux-tab-container"
+  }, [e("div", {
+    ref: "nav",
+    staticClass: "vux-tab",
+    class: [{
+      "vux-tab-no-animate": !t.animate,
+      scrollable: t.scrollable
+    }]
+  }, [t._t("default"), t.animate ? e("div", {
+    staticClass: "vux-tab-ink-bar",
+    class: t.barClass,
+    style: t.barStyle
+  }, [t.customBarWidth ? e("span", {
+    staticClass: "vux-tab-bar-inner",
+    style: t.innerBarStyle
+  }) : t._e()]) : t._e()], 2)])]);
+}, l = [];
+const c = {
+  name: "Tab",
+  mixins: [a],
+  props: {
+    lineWidth: {
+      type: Number,
+      default: 3
+    },
+    activeColor: String,
+    barActiveColor: String,
+    animate: {
+      type: Boolean,
+      default: !0
+    },
+    customBarWidth: [Function, String],
+    scrollThreshold: {
+      type: Number,
+      default: 4
+    },
+    barPosition: {
+      type: String,
+      default: "bottom",
+      validator(t) {
+        return ["bottom", "top"].indexOf(t) !== -1;
+      }
+    }
+  },
+  data() {
+    return {
+      direction: "forward",
+      hasReady: !1
+    };
+  },
+  computed: {
+    barLeft() {
+      if (this.hasReady) {
+        const t = this.scrollable ? window.innerWidth / this.$children[this.currentIndex || 0].$el.getBoundingClientRect().width : this.number;
+        return `${this.currentIndex * (100 / t)}%`;
+      }
+      return null;
+    },
+    barRight() {
+      if (this.hasReady) {
+        const t = this.scrollable ? window.innerWidth / this.$children[this.currentIndex || 0].$el.getBoundingClientRect().width : this.number;
+        return `${(t - this.currentIndex - 1) * (100 / t)}%`;
+      }
+      return null;
+    },
+    // when prop:custom-bar-width
+    innerBarStyle() {
+      return {
+        width: typeof this.customBarWidth == "function" ? this.customBarWidth(this.currentIndex) : this.customBarWidth,
+        backgroundColor: this.barActiveColor || this.activeColor
+      };
+    },
+    // end
+    barStyle() {
+      const t = {
+        left: this.barLeft,
+        right: this.barRight,
+        display: "block",
+        height: `${this.lineWidth}px`,
+        transition: this.hasReady ? null : "none"
+      };
+      return this.customBarWidth ? t.backgroundColor = "transparent" : t.backgroundColor = this.barActiveColor || this.activeColor, t;
+    },
+    barClass() {
+      return {
+        "vux-tab-ink-bar-transition-forward": this.direction === "forward",
+        "vux-tab-ink-bar-transition-backward": this.direction === "backward"
+      };
+    },
+    scrollable() {
+      return this.number > this.scrollThreshold;
+    }
+  },
+  watch: {
+    currentIndex(t, r) {
+      this.direction = t > r ? "forward" : "backward", this.$emit("on-index-change", t, r), this.hasReady && this.scrollToActiveTab();
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      setTimeout(() => {
+        this.hasReady = !0;
+      }, 0);
+    });
+  },
+  methods: {
+    scrollToActiveTab() {
+      if (!this.scrollable || !this.$children || !this.$children.length)
+        return;
+      const t = this.$children[this.currentIndex].$el;
+      let r = 0;
+      const e = () => {
+        const i = this.$refs.nav;
+        i.scrollLeft += (t.offsetLeft - (i.offsetWidth - t.offsetWidth) / 2 - i.scrollLeft) / 15, ++r < 15 && window.requestAnimationFrame(e);
+      };
+      window.requestAnimationFrame(e);
+    }
+  }
+}, n = {};
+var h = /* @__PURE__ */ s(
+  c,
+  o,
+  l,
+  !1,
+  u,
+  null,
+  null,
+  null
+);
+function u(t) {
+  for (let r in n)
+    this[r] = n[r];
+}
+const m = /* @__PURE__ */ function() {
+  return h.exports;
+}();
+export {
+  m as default
+};

package/dist/components/tab/style.css

@@ -1,122 +1 @@
-/* 全局公共颜色配置 */ /* 全局公共尺寸配置 */
-/* 应用头部高度 */
-/* 页面宽度 */
-/* 侧栏宽度 */
-/* 标签高度 */
-/* 页面头部工具条高度 */
-.vux-tab-ink-bar {
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  height: 2px;
-  text-align: center;
-  background-color: #1989fa;
-}
-.vux-tab-ink-bar-transition-forward {
-  transition: right 0.3s cubic-bezier(0.35, 0, 0.25, 1), left 0.3s cubic-bezier(0.35, 0, 0.25, 1) 0.09s;
-}
-.vux-tab-ink-bar-transition-backward {
-  transition: right 0.3s cubic-bezier(0.35, 0, 0.25, 1) 0.09s, left 0.3s cubic-bezier(0.35, 0, 0.25, 1);
-}
-.vux-tab-bar-top .vux-tab-ink-bar {
-  top: 0;
-}
-.vux-tab {
-  position: relative;
-  display: flex;
-  height: 36px;
-  background-color: #fff;
-}
-.vux-tab button {
-  padding: 0;
-  background: 0 0;
-  border: 0;
-  outline: 0;
-  appearance: none;
-}
-.vux-tab .vux-tab-item {
-  display: block;
-  flex: 1 1 auto;
-  box-sizing: border-box;
-  width: 100%;
-  height: 100%;
-  color: #666;
-  font-size: 14px;
-  line-height: 36px;
-  text-align: center;
-  cursor: pointer;
-  /* background: linear-gradient(180deg, #e5e5e5, #e5e5e5, rgba(229, 229, 229, 0)) bottom left no-repeat; */
-  /* background-size: 100% 1px; */
-}
-.vux-tab .vux-tab-item.vux-tab-selected {
-  color: #1989fa;
-  border-bottom: 3px solid #1989fa;
-}
-.vux-tab-bar-top .vux-tab .vux-tab-item {
-  /* background: linear-gradient(180deg, #e5e5e5, #e5e5e5, rgba(229, 229, 229, 0)) top left no-repeat; */
-  /* background-size: 100% 1px; */
-}
-.vux-tab-bar-top .vux-tab .vux-tab-item.vux-tab-selected {
-  border-top: 3px solid #1989fa;
-  border-bottom: none;
-}
-.vux-tab .vux-tab-item.vux-tab-disabled {
-  color: #ddd;
-}
-.vux-tab.vux-tab-no-animate .vux-tab-item.vux-tab-selected {
-  background: 0 0;
-}
-
-/** when=prop:custom-bar-width **/
-.vux-tab-bar-inner {
-  display: block;
-  height: 100%;
-  margin: auto;
-  background-color: #1989fa;
-  transition: width 0.3s cubic-bezier(0.35, 0, 0.25, 1);
-}
-.vux-tab-item-badge {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  display: inline-block;
-  box-sizing: border-box;
-  min-width: 18px;
-  height: 18px;
-  margin: auto 0 auto 4px;
-  padding: 0 4px;
-  font-size: 11px;
-  line-height: 18px;
-  vertical-align: middle;
-  background-clip: padding-box;
-  border-radius: 30px;
-}
-.vux-tab-wrap {
-  position: relative;
-  padding-top: 36px;
-}
-.vux-tab-container {
-  position: absolute;
-  top: 0;
-  right: 0;
-  left: 0;
-  height: 36px;
-  overflow: hidden;
-}
-.scrollable {
-  box-sizing: content-box;
-  padding-bottom: 17px;
-  overflow-x: auto;
-  overflow-y: hidden;
-  -webkit-overflow-scrolling: touch;
-}
-.scrollable::-webkit-scrollbar {
-  display: none;
-}
-.scrollable .vux-tab-ink-bar {
-  position: absolute;
-  bottom: 17px;
-}
-.scrollable .vux-tab-item {
-  flex: 0 0 22%;
-}
+.vux-tab-ink-bar{position:absolute;bottom:0;left:0;height:2px;text-align:center;background-color:#1989fa}.vux-tab-ink-bar-transition-forward{transition:right .3s cubic-bezier(.35,0,.25,1),left .3s cubic-bezier(.35,0,.25,1) .09s}.vux-tab-ink-bar-transition-backward{transition:right .3s cubic-bezier(.35,0,.25,1) .09s,left .3s cubic-bezier(.35,0,.25,1)}.vux-tab-bar-top .vux-tab-ink-bar{top:0}.vux-tab{position:relative;display:flex;height:36px;background-color:#fff}.vux-tab button{padding:0;background:0 0;border:0;outline:0;appearance:none}.vux-tab .vux-tab-item{display:block;flex:1 1 auto;box-sizing:border-box;width:100%;height:100%;color:#666;font-size:14px;line-height:36px;text-align:center;cursor:pointer}.vux-tab .vux-tab-item.vux-tab-selected{color:#1989fa;border-bottom:3px solid #1989fa}.vux-tab-bar-top .vux-tab .vux-tab-item.vux-tab-selected{border-top:3px solid #1989fa;border-bottom:none}.vux-tab .vux-tab-item.vux-tab-disabled{color:#ddd}.vux-tab.vux-tab-no-animate .vux-tab-item.vux-tab-selected{background:0 0}.vux-tab-bar-inner{display:block;height:100%;margin:auto;background-color:#1989fa;transition:width .3s cubic-bezier(.35,0,.25,1)}.vux-tab-item-badge{position:absolute;top:0;bottom:0;display:inline-block;box-sizing:border-box;min-width:18px;height:18px;margin:auto 0 auto 4px;padding:0 4px;font-size:11px;line-height:18px;vertical-align:middle;background-clip:padding-box;border-radius:30px}.vux-tab-wrap{position:relative;padding-top:36px}.vux-tab-container{position:absolute;top:0;right:0;left:0;height:36px;overflow:hidden}.scrollable{box-sizing:content-box;padding-bottom:17px;overflow-x:auto;overflow-y:hidden;-webkit-overflow-scrolling:touch}.scrollable::-webkit-scrollbar{display:none}.scrollable .vux-tab-ink-bar{position:absolute;bottom:17px}.scrollable .vux-tab-item{flex:0 0 22%}

package/dist/components/tab-item/index.mjs

@@ -0,0 +1,73 @@
+import { c as n } from "../../chunks/tab-mixin.e2b9c6a4.mjs";
+import { n as l } from "../../chunks/vueComponentNormalizer.446f5dc4.mjs";
+var o = function() {
+  var e = this, t = e.$createElement, a = e._self._c || t;
+  return a("div", {
+    staticClass: "vux-tab-item",
+    class: [e.currentSelected ? e.activeClass : "", {
+      "vux-tab-selected": e.currentSelected,
+      "vux-tab-disabled": e.disabled
+    }],
+    style: e.style,
+    on: {
+      click: e.onItemClick
+    }
+  }, [e._t("default"), typeof e.badgeLabel != "undefined" && e.badgeLabel !== "" ? a("span", {
+    staticClass: "vux-tab-item-badge",
+    style: {
+      background: e.badgeBackground,
+      color: e.badgeColor
+    }
+  }, [e._v(" " + e._s(e.badgeLabel) + " ")]) : e._e()], 2);
+}, s = [];
+const i = {
+  name: "TabItem",
+  mixins: [n],
+  props: {
+    activeClass: {
+      type: String
+    },
+    disabled: Boolean,
+    badgeBackground: {
+      type: String,
+      default: "#f74c31"
+    },
+    badgeColor: {
+      type: String,
+      default: "#fff"
+    },
+    badgeLabel: {
+      type: String
+    }
+  },
+  computed: {
+    style() {
+      return {
+        borderWidth: `${this.$parent.lineWidth}px`,
+        borderColor: this.$parent.activeColor,
+        color: this.currentSelected ? this.$parent.activeColor : this.disabled ? this.$parent.disabledColor : this.$parent.defaultColor,
+        border: this.$parent.animate ? "none" : "auto"
+      };
+    }
+  }
+}, r = {};
+var d = /* @__PURE__ */ l(
+  i,
+  o,
+  s,
+  !1,
+  c,
+  null,
+  null,
+  null
+);
+function c(e) {
+  for (let t in r)
+    this[t] = r[t];
+}
+const p = /* @__PURE__ */ function() {
+  return d.exports;
+}();
+export {
+  p as default
+};

package/dist/components/table-column/index.mjs

@@ -0,0 +1,102 @@
+var u = Object.defineProperty, d = Object.defineProperties;
+var c = Object.getOwnPropertyDescriptors;
+var o = Object.getOwnPropertySymbols;
+var f = Object.prototype.hasOwnProperty, p = Object.prototype.propertyIsEnumerable;
+var i = (n, e, t) => e in n ? u(n, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : n[e] = t, l = (n, e) => {
+  for (var t in e || (e = {}))
+    f.call(e, t) && i(n, t, e[t]);
+  if (o)
+    for (var t of o(e))
+      p.call(e, t) && i(n, t, e[t]);
+  return n;
+}, r = (n, e) => d(n, c(e));
+import { n as g } from "../../chunks/vueComponentNormalizer.446f5dc4.mjs";
+const m = {
+  props: {
+    type: {
+      type: String,
+      default: "default"
+    },
+    label: String,
+    className: String,
+    labelClassName: String,
+    property: String,
+    prop: String,
+    width: {},
+    minWidth: {},
+    renderHeader: Function,
+    sortable: {
+      type: [Boolean, String],
+      default: !1
+    },
+    sortMethod: Function,
+    sortBy: [String, Function, Array],
+    resizable: {
+      type: Boolean,
+      default: !0
+    },
+    columnKey: String,
+    align: String,
+    headerAlign: String,
+    showTooltipWhenOverflow: Boolean,
+    showOverflowTooltip: {
+      type: Boolean,
+      default: !0
+    },
+    fixed: [Boolean, String],
+    formatter: Function,
+    selectable: Function,
+    reserveSelection: Boolean,
+    filterMethod: Function,
+    filteredValue: Array,
+    filters: Array,
+    filterPlacement: String,
+    filterMultiple: {
+      type: Boolean,
+      default: !0
+    },
+    index: [Number, Function],
+    sortOrders: {
+      type: Array,
+      default() {
+        return ["ascending", "descending", null];
+      },
+      validator(n) {
+        return n.every((e) => ["ascending", "descending", null].indexOf(e) > -1);
+      }
+    }
+  }
+}, _ = {
+  name: "TableColumn",
+  functional: !0,
+  mixins: [m],
+  render(n, { data: e, props: t, children: s }) {
+    return n("ElTableColumn", r(l({}, e), {
+      props: r(l({}, t), {
+        showOverflowTooltip: ["selection", "single-selection", "index", "expand"].includes(t.type) ? !1 : t.showOverflowTooltip
+      })
+    }), s);
+  }
+};
+let y, S;
+const a = {};
+var v = /* @__PURE__ */ g(
+  _,
+  y,
+  S,
+  !1,
+  h,
+  null,
+  null,
+  null
+);
+function h(n) {
+  for (let e in a)
+    this[e] = a[e];
+}
+const x = /* @__PURE__ */ function() {
+  return v.exports;
+}();
+export {
+  x as default
+};