super-page-designer 2.1.94 → 2.1.98

package/dist/es/components/design/views/assemblys/data/table/table-design.vue2.js

@@ -1,371 +1,122 @@
-import { defineComponent, ref, onMounted, watch, resolveComponent, openBlock, createElementBlock, createVNode, normalizeClass, normalizeStyle, withCtx, Fragment, renderList, createBlock, createElementVNode, withDirectives, unref, createTextVNode, createCommentVNode, vShow } from "vue";
-import eventBus from "../../../../utils/eventBus.js";
-import { useDraggable } from "vue-draggable-plus";
-import { caculateDetailComponentStyle, caculateComponentProps } from "../../../../utils/form-design-util.js";
-import { getTableColumnConf } from "../../../../utils/assemblys-config.js";
-import { Plus, Delete } from "@element-plus/icons-vue";
-import { ElMessageBox } from "element-plus";
-import { getColumnsWithGroupHeader, addColumnToGroupHeaders } from "../../../../utils/data-table-util.js";
+import { defineComponent as e, ref as n, onMounted as l, watch as o, resolveComponent as a, openBlock as t, createElementBlock as i, createVNode as u, normalizeClass as r, normalizeStyle as s, withCtx as c, Fragment as p, renderList as d, createBlock as g, createElementVNode as m, withDirectives as f, unref as v, createTextVNode as b, createCommentVNode as y, vShow as h } from "vue";
+import C from "../../../../utils/eventBus.js";
+import { useDraggable as x } from "vue-draggable-plus";
+import { caculateDetailComponentStyle as S, caculateComponentProps as j } from "../../../../utils/form-design-util.js";
+import { getTableColumnConf as D } from "../../../../utils/assemblys-config.js";
+import { Plus as H, Delete as k } from "@element-plus/icons-vue";
+import { ElMessageBox as O } from "element-plus";
+import { getColumnsWithGroupHeader as w, addColumnToGroupHeaders as z } from "../../../../utils/data-table-util.js";
 import "uuid";
 import "@element-plus/icons";
 import "agilebuilder-ui/src/utils/auth";
 import "super-page-runtime";
 import "../../../../../../stores/page-store.js";
 import "@vueuse/core";
-import _sfc_main$1 from "../component/table-children-column.vue.js";
-import { queryTableFields, changeFeieldToMap } from "../../../../utils/page-table-util.js";
-const _hoisted_1 = {
-  id: "tableDesignMenu",
-  ref: "headerMenu",
-  class: "context-menu"
-};
-const _hoisted_2 = {
-  key: 0,
-  style: { "width": "100%", "display": "flex", "justify-content": "center", "padding-top": "20px" }
-};
-const _sfc_main = /* @__PURE__ */ defineComponent({
-  __name: "table-design",
-  props: {
-    pageDesign: {},
-    configure: {},
-    selectWidget: {},
-    indexObj: {}
-  },
-  emits: ["selectColumn", "onSelectWidget"],
-  setup(__props, { emit: __emit }) {
-    const props = __props;
-    const emit = __emit;
-    const tableData = ref([{}]);
-    const currentPage = ref(1);
-    const pageSize = ref(1);
-    const designStyle = ref({});
-    const designClass = ref("");
-    const designHeaderStyle = ref({});
-    const designProperty = ref({});
-    const menuVisible = ref(false);
-    props.configure.props.groupHeaders;
-    const listColumns = ref([]);
-    const tableRef = ref();
-    const hiddenColumsName = ref([]);
-    function getRestsParameter() {
-      let defineProps = props.configure.props;
-      if (!defineProps["base"]) {
-        return;
-      }
-      const tempProps = {};
-      if (defineProps["base"]["subPaging"]) {
-        tempProps["subPaging"] = defineProps["base"]["subPaging"];
-      }
-      if (defineProps["base"]["layout"]) {
-        tempProps["layout"] = defineProps["base"]["layout"].join(",");
-      }
-      if (defineProps["base"]["pageSizes"]) {
-        tempProps["pageSizes"] = defineProps["base"]["pageSizes"].split(",");
-      }
-      if (defineProps["base"]["alignTitle"]) {
-        tempProps["alignTitle"] = defineProps["base"]["alignTitle"];
-      }
-      if (defineProps["base"]["alignContent"]) {
-        tempProps["alignContent"] = defineProps["base"]["alignContent"];
-      }
-      if (tempProps != {}) {
-        for (const tempPropsKey in tempProps) {
-          designProperty.value[tempPropsKey] = tempProps[tempPropsKey];
-        }
-      }
-    }
-    if (props.configure) {
-      queryMyTableFields();
-    }
-    onMounted(() => {
-      listColumns.value = getColumnsWithGroupHeader(props.configure);
-    });
-    eventBus.$on("setHiddenColumsName", (data) => {
-      if (!data.value) {
-        hiddenColumsName.value.push(data.name);
-      } else {
-        hiddenColumsName.value = hiddenColumsName.value.filter((item) => item != data.name);
-      }
+import E from "../component/table-children-column.vue.js";
+import { queryTableFields as M, changeFeieldToMap as T } from "../../../../utils/page-table-util.js";
+const W = { id: "tableDesignMenu", ref: "headerMenu", class: "context-menu" }, _ = { key: 0, style: { width: "100%", display: "flex", "justify-content": "center", "padding-top": "20px" } }, B = e({ __name: "table-design", props: { pageDesign: {}, configure: {}, selectWidget: {}, indexObj: {} }, emits: ["selectColumn", "onSelectWidget"], setup(e2, { emit: B2 }) {
+  const P = e2, N = B2, $ = n([{}]), G = n(1), L = n(1), F = n({}), V = n(""), I = n({}), R = n({}), U = n(false);
+  P.configure.props.groupHeaders;
+  const q = n([]), K = n(), X = n([]);
+  function Y(e3, n2) {
+    N("onSelectWidget", e3, n2);
+  }
+  P.configure && function() {
+    const e3 = P.configure.tableSysCode ? P.configure.tableSysCode : P.pageDesign.systemCode, n2 = P.configure.tableSysVersion ? P.configure.tableSysVersion : P.pageDesign.version, l2 = P.configure.props.dataOrigin.tableName;
+    M(e3, n2, l2).then((e4) => {
+      P.configure.modelFieldsMap = T(P.configure.modelFieldsMap, e4), P.configure.modelFields = e4;
     });
-    watch(
-      props.configure.style,
-      () => {
-        caculateDetailComponentStyle(props.configure, designStyle, designClass, designHeaderStyle);
-        props.configure.runtime.style = designStyle.value;
-        props.configure.runtime.class = designClass.value;
-        props.configure.runtime.headerStyle = designHeaderStyle.value;
-      },
-      { immediate: true }
-    );
-    watch(
-      props.configure.props,
-      () => {
-        caculateComponentProps(props.configure, designProperty);
-        getRestsParameter();
-        props.configure.runtime.props = designProperty.value;
-        console.log("%c描述-142333", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", props.configure);
-      },
-      { immediate: true }
-    );
-    watch(
-      () => props.configure.props.isChangeGroupHeader,
-      () => {
-        if (props.configure.props.isChangeGroupHeader) {
-          listColumns.value = getColumnsWithGroupHeader(props.configure);
-          if (tableRef.value) {
-            tableRef.value.doLayout();
-          }
-        }
-      }
-    );
-    eventBus.$on("reloadTable-" + props.configure.uuid, (columns) => {
-      if (columns) {
-        props.configure.items = columns;
-        listColumns.value = getColumnsWithGroupHeader(props.configure);
-      }
-      if (tableRef.value) {
-        tableRef.value.doLayout();
-      }
+  }(), l(() => {
+    q.value = w(P.configure);
+  }), C.$on("setHiddenColumsName", (e3) => {
+    e3.value ? X.value = X.value.filter((n2) => n2 != e3.name) : X.value.push(e3.name);
+  }), o(P.configure.style, () => {
+    S(P.configure, F, V, I), P.configure.runtime.style = F.value, P.configure.runtime.class = V.value, P.configure.runtime.headerStyle = I.value;
+  }, { immediate: true }), o(P.configure.props, () => {
+    j(P.configure, R), function() {
+      let e3 = P.configure.props;
+      if (!e3.base)
+        return;
+      const n2 = {};
+      if (e3.base.subPaging && (n2.subPaging = e3.base.subPaging), e3.base.layout && (n2.layout = e3.base.layout.join(",")), e3.base.pageSizes && (n2.pageSizes = e3.base.pageSizes.split(",")), e3.base.alignTitle && (n2.alignTitle = e3.base.alignTitle), e3.base.alignContent && (n2.alignContent = e3.base.alignContent), n2 != {})
+        for (const e4 in n2)
+          R.value[e4] = n2[e4];
+    }(), P.configure.runtime.props = R.value;
+  }, { immediate: true }), o(() => P.configure.props.isChangeGroupHeader, () => {
+    P.configure.props.isChangeGroupHeader && (q.value = w(P.configure), K.value && K.value.doLayout());
+  }), C.$on("reloadTable-" + P.configure.uuid, (e3) => {
+    e3 && (P.configure.items = e3, q.value = w(P.configure)), K.value && K.value.doLayout();
+  }), o(() => q.value, (e3) => {
+    e3.forEach((e4) => {
+      e4.props && e4.props.base && !e4.props.base.visible && X.value.push(e4.props.base.name);
     });
-    watch(
-      () => listColumns.value,
-      (newVal) => {
-        newVal.forEach((item) => {
-          if (item.props && item.props.base && !item.props.base.visible) {
-            hiddenColumsName.value.push(item.props.base.name);
-          }
-        });
-      },
-      { deep: true }
-    );
-    function onSelectWidget(selIndex, objConfigure) {
-      emit("onSelectWidget", selIndex, objConfigure);
-    }
-    function queryMyTableFields() {
-      const systemCode = props.configure.tableSysCode ? props.configure.tableSysCode : props.pageDesign.systemCode;
-      const systemVersion = props.configure.tableSysVersion ? props.configure.tableSysVersion : props.pageDesign.version;
-      const tableName = props.configure.props.dataOrigin.tableName;
-      queryTableFields(systemCode, systemVersion, tableName).then((tableFields) => {
-        props.configure.modelFieldsMap = changeFeieldToMap(props.configure.modelFieldsMap, tableFields);
-        props.configure.modelFields = tableFields;
-      });
-    }
-    const headerLabel = ref("");
-    function rowClick() {
-      headerLabel.value = "";
-      columnData.value = {};
-      closeMenuVisible();
-      let obj = {
-        columnData: {}
-      };
-      eventBus.$emit("selectColumn", obj);
-    }
-    function headerContextmenu(column, event) {
-      var evt = event || window.event;
-      evt.preventDefault();
-      getColumnData(column);
-      menuVisible.value = true;
-      const menu = document.querySelector("#tableDesignMenu");
-      const scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
-      menu.style.display = "block";
-      menu.style.left = event.clientX + 30 + "px";
-      menu.style.top = event.clientY + scrollTop - 22 + "px";
-    }
-    function closeMenuVisible() {
-      menuVisible.value = false;
-    }
-    function getColumnData(columnInfo) {
-      props.configure.items.forEach((Ttime, index) => {
-        if (Ttime.props.base.name == columnInfo.label) {
-          columnData.value = Ttime;
-          columnDataIndex.value = index;
-        }
-      });
-    }
-    function operationalMenuFun(type) {
-      var _a;
-      closeMenuVisible();
-      if (type === "createCombinedHeader") {
-        const fieldInfo = {
-          alias: "字段名称",
-          displayOrder: columnData.value.props.base.displayOrder + 1
-        };
-        let newObj = getTableColumnConf(fieldInfo);
-        props.configure.items.splice(columnDataIndex.value + 1, 0, newObj);
-        (_a = props.configure.items) == null ? void 0 : _a.forEach((item, index) => {
-          if (!item.props.base.displayOrder || item.props.base.displayOrder != index) {
-            item.props.base.displayOrder = index;
-          }
-        });
-        if (props.configure.props.base.isEnableGroupHeader) {
-          addColumnToGroupHeaders(
-            props.configure.items[columnDataIndex.value + 1],
-            null,
-            props.configure.props.groupHeaders
-          );
-          listColumns.value = getColumnsWithGroupHeader(props.configure);
-          eventBus.$emit("synchroGroupHeadersData");
-        }
-      } else if (type === "deleteNode") {
-        ElMessageBox.confirm("当前操作会删除当前列", "确认", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          console.log(
-            "%c描述-173127",
-            "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px",
-            props.configure.props
-          );
-          console.log("%c描述-173140", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", columnData.value);
-          props.configure.items.splice(columnDataIndex.value, 1);
-        }).catch(() => {
-        });
-      }
-    }
-    const columnData = ref({});
-    const columnDataIndex = ref(null);
-    function setColumnData(item) {
-      columnData.value = item;
-    }
-    function headerDragend(newWidth, oldWidth, column, event) {
-      let data = getColumnsConfigure(listColumns.value, column.columnKey);
-      data.props.base.columnWidth = newWidth;
-    }
-    function getColumnsConfigure(columnData2, uuid) {
-      let dataObj = {};
-      columnData2.forEach((item) => {
-        if (item.uuid && item.uuid === uuid) {
-          console.log("%c描述-193228", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", item);
-          return dataObj = item;
-        }
-        if (item.children && item.children.length > 0) {
-          dataObj = getColumnsConfigure(item.children, uuid);
-        }
+  }, { deep: true });
+  const A = n("");
+  function J() {
+    A.value = "", ne.value = {}, Z();
+    C.$emit("selectColumn", { columnData: {} });
+  }
+  function Q(e3, n2) {
+    var l2;
+    (n2 || window.event).preventDefault(), l2 = e3, P.configure.items.forEach((e4, n3) => {
+      e4.props.base.name == l2.label && (ne.value = e4, le.value = n3);
+    }), U.value = true;
+    const o2 = document.querySelector("#tableDesignMenu"), a2 = document.documentElement.scrollTop || document.body.scrollTop;
+    o2.style.display = "block", o2.style.left = n2.clientX + 30 + "px", o2.style.top = n2.clientY + a2 - 22 + "px";
+  }
+  function Z() {
+    U.value = false;
+  }
+  function ee(e3) {
+    var _a;
+    if (Z(), "createCombinedHeader" === e3) {
+      const e4 = { alias: "字段名称", displayOrder: ne.value.props.base.displayOrder + 1 };
+      let n2 = D(e4);
+      P.configure.items.splice(le.value + 1, 0, n2), (_a = P.configure.items) == null ? void 0 : _a.forEach((e5, n3) => {
+        e5.props.base.displayOrder && e5.props.base.displayOrder == n3 || (e5.props.base.displayOrder = n3);
+      }), P.configure.props.base.isEnableGroupHeader && (z(P.configure.items[le.value + 1], null, P.configure.props.groupHeaders), q.value = w(P.configure), C.$emit("synchroGroupHeadersData"));
+    } else
+      "deleteNode" === e3 && O.confirm("当前操作会删除当前列", "确认", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning" }).then(() => {
+        P.configure.items.splice(le.value, 1);
+      }).catch(() => {
       });
-      return dataObj;
-    }
-    function addClass({ row, column, rowIndex, columnIndex }) {
-      let className = "";
-      if (hiddenColumsName.value.includes(column.label)) {
-        className = "hiddenBorder";
-      }
-      if (column.label === headerLabel.value) {
-        className = "addBorder";
-      }
-      return className;
-    }
-    function setHeaderLabel(labelValue) {
-      headerLabel.value = labelValue;
-    }
-    function cellMouseEnter(row, column) {
-      var selrange = document.getElementsByClassName(column.id);
-      for (var i = 0; i < selrange.length; i++) {
-        selrange[i].style.backgroundColor = "rgba(88, 147, 239,.1)";
-      }
-    }
-    function cellMouseLeave(row, column) {
-      var selrange = document.getElementsByClassName(column.id);
-      for (var i = 0; i < selrange.length; i++) {
-        selrange[i].style.backgroundColor = "";
-      }
-    }
-    useDraggable(".el-table__header-wrapper tr", props.configure.items, {
-      animation: 150,
-      ghostClass: "ghost",
-      onStart(event) {
-        console.log(event);
-      }
-    });
-    return (_ctx, _cache) => {
-      const _component_el_table = resolveComponent("el-table");
-      const _component_el_icon = resolveComponent("el-icon");
-      const _component_el_pagination = resolveComponent("el-pagination");
-      return openBlock(), createElementBlock("div", null, [
-        createVNode(_component_el_table, {
-          ref_key: "tableRef",
-          ref: tableRef,
-          "cell-class-name": addClass,
-          "header-cell-class-name": addClass,
-          border: "",
-          class: normalizeClass(designClass.value),
-          data: tableData.value,
-          onHeaderDragend: headerDragend,
-          onHeaderContextmenu: headerContextmenu,
-          onRowClick: rowClick,
-          onCellMouseEnter: cellMouseEnter,
-          onCellMouseLeave: cellMouseLeave,
-          style: normalizeStyle(designStyle.value)
-        }, {
-          default: withCtx(() => [
-            (openBlock(true), createElementBlock(Fragment, null, renderList(listColumns.value, (item) => {
-              return openBlock(), createBlock(_sfc_main$1, {
-                key: item,
-                listColumns: item,
-                designProperty: designProperty.value,
-                configure: _ctx.configure,
-                pageDesign: _ctx.pageDesign,
-                indexObj: _ctx.indexObj,
-                onSetHeaderLabel: setHeaderLabel,
-                onOnSelectWidget: onSelectWidget,
-                onSetColumnData: setColumnData,
-                onCloseMenuVisible: closeMenuVisible,
-                selectWidget: _ctx.selectWidget
-              }, null, 8, ["listColumns", "designProperty", "configure", "pageDesign", "indexObj", "selectWidget"]);
-            }), 128))
-          ]),
-          _: 1
-        }, 8, ["class", "data", "style"]),
-        createElementVNode("div", {
-          onClick: rowClick,
-          style: { "width": "100%", "height": "30px" }
-        }),
-        withDirectives(createElementVNode("div", null, [
-          createElementVNode("ul", _hoisted_1, [
-            createElementVNode("li", {
-              tabindex: "-1",
-              onClick: _cache[0] || (_cache[0] = () => operationalMenuFun("createCombinedHeader"))
-            }, [
-              createVNode(_component_el_icon, null, {
-                default: withCtx(() => [
-                  createVNode(unref(Plus))
-                ]),
-                _: 1
-              }),
-              createTextVNode(" 创建 ")
-            ]),
-            columnData.value.props && columnData.value.props.base && columnData.value.props.base.prop !== "$selection" && columnData.value.props.base.prop !== "$index" ? (openBlock(), createElementBlock("li", {
-              key: 0,
-              tabindex: "-1",
-              onClick: _cache[1] || (_cache[1] = () => operationalMenuFun("deleteNode"))
-            }, [
-              createVNode(_component_el_icon, null, {
-                default: withCtx(() => [
-                  createVNode(unref(Delete))
-                ]),
-                _: 1
-              }),
-              createTextVNode(" 删除 ")
-            ])) : createCommentVNode("", true)
-          ], 512)
-        ], 512), [
-          [vShow, menuVisible.value]
-        ]),
-        designProperty.value.subPaging ? (openBlock(), createElementBlock("div", _hoisted_2, [
-          createVNode(_component_el_pagination, {
-            "current-page": currentPage.value,
-            "onUpdate:currentPage": _cache[2] || (_cache[2] = ($event) => currentPage.value = $event),
-            "page-size": pageSize.value,
-            "onUpdate:pageSize": _cache[3] || (_cache[3] = ($event) => pageSize.value = $event),
-            "page-sizes": designProperty.value.pageSizes,
-            layout: designProperty.value.layout,
-            total: 400
-          }, null, 8, ["current-page", "page-size", "page-sizes", "layout"])
-        ])) : createCommentVNode("", true)
-      ]);
-    };
   }
-});
+  const ne = n({}), le = n(null);
+  function oe(e3) {
+    ne.value = e3;
+  }
+  function ae(e3, n2, l2, o2) {
+    te(q.value, l2.columnKey).props.base.columnWidth = e3;
+  }
+  function te(e3, n2) {
+    let l2 = {};
+    return e3.forEach((e4) => {
+      if (e4.uuid && e4.uuid === n2)
+        return l2 = e4;
+      e4.children && e4.children.length > 0 && (l2 = te(e4.children, n2));
+    }), l2;
+  }
+  function ie({ row: e3, column: n2, rowIndex: l2, columnIndex: o2 }) {
+    let a2 = "";
+    return X.value.includes(n2.label) && (a2 = "hiddenBorder"), n2.label === A.value && (a2 = "addBorder"), a2;
+  }
+  function ue(e3) {
+    A.value = e3;
+  }
+  function re(e3, n2) {
+    for (var l2 = document.getElementsByClassName(n2.id), o2 = 0; o2 < l2.length; o2++)
+      l2[o2].style.backgroundColor = "rgba(88, 147, 239,.1)";
+  }
+  function se(e3, n2) {
+    for (var l2 = document.getElementsByClassName(n2.id), o2 = 0; o2 < l2.length; o2++)
+      l2[o2].style.backgroundColor = "";
+  }
+  return x(".el-table__header-wrapper tr", P.configure.items, { animation: 150, ghostClass: "ghost", onStart(e3) {
+  } }), (e3, n2) => {
+    const l2 = a("el-table"), o2 = a("el-icon"), C2 = a("el-pagination");
+    return t(), i("div", null, [u(l2, { ref_key: "tableRef", ref: K, "cell-class-name": ie, "header-cell-class-name": ie, border: "", class: r(V.value), data: $.value, onHeaderDragend: ae, onHeaderContextmenu: Q, onRowClick: J, onCellMouseEnter: re, onCellMouseLeave: se, style: s(F.value) }, { default: c(() => [(t(true), i(p, null, d(q.value, (n3) => (t(), g(E, { key: n3, listColumns: n3, designProperty: R.value, configure: e3.configure, pageDesign: e3.pageDesign, indexObj: e3.indexObj, onSetHeaderLabel: ue, onOnSelectWidget: Y, onSetColumnData: oe, onCloseMenuVisible: Z, selectWidget: e3.selectWidget }, null, 8, ["listColumns", "designProperty", "configure", "pageDesign", "indexObj", "selectWidget"]))), 128))]), _: 1 }, 8, ["class", "data", "style"]), m("div", { onClick: J, style: { width: "100%", height: "30px" } }), f(m("div", null, [m("ul", W, [m("li", { tabindex: "-1", onClick: n2[0] || (n2[0] = () => ee("createCombinedHeader")) }, [u(o2, null, { default: c(() => [u(v(H))]), _: 1 }), b(" 创建 ")]), ne.value.props && ne.value.props.base && "$selection" !== ne.value.props.base.prop && "$index" !== ne.value.props.base.prop ? (t(), i("li", { key: 0, tabindex: "-1", onClick: n2[1] || (n2[1] = () => ee("deleteNode")) }, [u(o2, null, { default: c(() => [u(v(k))]), _: 1 }), b(" 删除 ")])) : y("", true)], 512)], 512), [[h, U.value]]), R.value.subPaging ? (t(), i("div", _, [u(C2, { "current-page": G.value, "onUpdate:currentPage": n2[2] || (n2[2] = (e4) => G.value = e4), "page-size": L.value, "onUpdate:pageSize": n2[3] || (n2[3] = (e4) => L.value = e4), "page-sizes": R.value.pageSizes, layout: R.value.layout, total: 400 }, null, 8, ["current-page", "page-size", "page-sizes", "layout"])])) : y("", true)]);
+  };
+} });
 export {
-  _sfc_main as default
+  B as default
 };

package/dist/es/components/design/views/assemblys/data/table/tablecolumn-attr-base.vue.js

@@ -1,7 +1,7 @@
-import _sfc_main from "./tablecolumn-attr-base.vue2.js";
+import t from "./tablecolumn-attr-base.vue2.js";
 import "./tablecolumn-attr-base.vue3.js";
-import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
-const TablecolumnAttrBase = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-727aa6f0"]]);
+import a from "../../../../../../_virtual/_plugin-vue_export-helper.js";
+const e = a(t, [["__scopeId", "data-v-727aa6f0"]]);
 export {
-  TablecolumnAttrBase as default
+  e as default
 };