super-page-designer 2.1.90 → 2.1.98

package/dist/es/components/design/views/design/page-design.vue.js

@@ -1,372 +1,129 @@
-import { defineComponent, ref, watch, resolveComponent, openBlock, createElementBlock, createElementVNode, createVNode, withCtx, createBlock, createCommentVNode, normalizeClass, withDirectives, vShow, unref } from "vue";
-import _sfc_main$1 from "./view/view-design.vue.js";
-import { initComponentRefState } from "../../utils/page-helper-util.js";
-import { getTableNameByTableUuid, queryTableFields, changeFeieldToMap } from "../../utils/page-table-util.js";
-import { addPermission, delPermission } from "../../utils/page-permission-util.js";
-import { usePageContextStore } from "../../../../stores/page-store.js";
-import ServiceFlowDesginer from "service-flow-designer";
-import { getHighestVersionDefinition } from "../../utils/page-design-util.js";
-import { getPageConf } from "../../utils/assemblys-config.js";
-import { fetchPageDesignData } from "../../utils/page-service-util.js";
-import { ElMessage, ElLoading } from "element-plus";
-import PageSwitch from "./view/page-switch.vue.js";
-import { undoRedo } from "../../../../stores/undo-redo-store.js";
-import _sfc_main$2 from "./page-event/page-event-view.vue.js";
-import eventBus from "../../utils/eventBus.js";
-const _hoisted_1 = { class: "amb-page-container" };
-const _hoisted_2 = { class: "amb-page-container-header-page" };
-const _hoisted_3 = { class: "amb-page-container-header" };
-const _hoisted_4 = { class: "amb-page-container-header-type" };
-const _hoisted_5 = {
-  key: 0,
-  class: "amb-page-container-main"
-};
-const _sfc_main = /* @__PURE__ */ defineComponent({
-  __name: "page-design",
-  props: {
-    pageId: {
-      type: Number,
-      default: null
-    }
-  },
-  setup(__props) {
-    const undoRedoStore = undoRedo();
-    const props = __props;
-    const pageDesign = ref(null);
-    const ViewDesignRef = ref(null);
-    const pageEventContainerRef = ref();
-    const pageDesignUtil = usePageContextStore();
-    const clickType = ref("page");
-    const definitionId = ref(null);
-    const selectWfCode = ref(null);
-    const selectWfVersion = ref(null);
-    const isShowWfEditor = ref(false);
-    const viewDesignComponentKey = ref(0);
-    let publishVersion = ref(null);
-    const system = ref(null);
-    eventBus.$on("editComponentEvent", () => {
-      clickFrontLogic();
-    });
-    function clickFrontLogic() {
-      clickType.value = "front";
-      if (pageEventContainerRef.value && pageEventContainerRef.value.resize) {
-        pageEventContainerRef.value.resize();
-      }
-    }
-    if (props.pageId) {
-      fetchPageDesignData(props.pageId).then((appPageDesign) => {
-        if (appPageDesign && appPageDesign.designJson) {
-          const designJson = appPageDesign.designJson;
-          const pageConf = getPageDesignConf(JSON.parse(designJson));
-          pageConf.id = props.pageId;
-          pageDesign.value = pageConf;
-          initPageDesign(pageDesign.value);
-        } else {
-          pageDesign.value = getPageDesignConf(null);
-          initPageDesign(pageDesign.value);
-        }
-      });
-    } else {
-      pageDesign.value = getPageDesignConf(null);
-      initPageDesign(pageDesign.value);
-    }
-    function getPageDesignConf(initConf) {
-      const pageConf = getPageConf();
-      if (initConf) {
-        Object.assign(pageConf, initConf);
-      } else {
-        if (!pageConf.systemCode) {
-          pageConf.systemCode = "iqc";
-          pageConf.systemVersion = 1;
-        }
-      }
-      return pageConf;
-    }
-    function initPageDesign(pageDesign2) {
-      initComponentRefState(pageDesign2);
-      let tableUuid;
-      const tableUuids = pageDesign2 == null ? void 0 : pageDesign2.tableUuids;
-      if (tableUuids && tableUuids.length > 0) {
-        tableUuid = tableUuids[0];
-      }
-      const tableName = getTableNameByTableUuid(pageDesign2, tableUuid);
-      if (tableName) {
-        const systemCode = pageDesign2.tableSysCode ? pageDesign2.tableSysCode : pageDesign2.systemCode;
-        const systemVersion = pageDesign2.tableSysVersion ? pageDesign2.tableSysVersion : pageDesign2.systemVersion;
-        queryTableFields(systemCode, systemVersion, tableName).then((tableFields) => {
-          pageDesign2.modelFields = tableFields;
-          pageDesign2.modelFieldsMap = changeFeieldToMap(pageDesign2.modelFieldsMap, tableFields);
-          pageDesignUtil.setPageContext(pageDesign2);
-        });
-      }
-      publishVersion.value = pageDesign2.systemVersion;
-      pageDesignUtil.setPageContext(pageDesign2);
-      watch(
-        () => pageDesign2,
-        (newVal) => {
-          changePageDesign();
-        },
-        { deep: true }
-      );
-      watch(
-        pageDesign2.events,
-        (newVal) => {
-          if (!pageDesign2.runtime) {
-            pageDesign2.runtime = {};
-          }
-          if (pageDesign2.events) {
-            const bindEvents = pageDesign2.events.filter((event) => {
-              return !event.isStandard && event.jsContent || event.isStandard && event.eventName;
-            });
-            pageDesign2.runtime.events = bindEvents;
-          }
-        },
-        { immediate: true }
-      );
-      watch(
-        () => pageDesign2.label,
-        () => {
-          managePagePermission(pageDesign2);
-        },
-        { immediate: true }
-      );
-      watch(
-        () => pageDesign2.pageType,
-        () => {
-          managePagePermission(pageDesign2);
-        },
-        { immediate: true }
-      );
-      if (pageDesign2.props) {
-        watch(
-          () => pageDesign2.props.activeWorkflow,
-          () => {
-            managePagePermission(pageDesign2);
-          },
-          { immediate: true }
-        );
-      }
-      console.log("%c描述-164627", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", pageDesign2);
-      eventBus.$emit("changePageDesign");
-    }
-    let changePageDesign = debounce(() => {
-      undoRedoStore.addSnapshot(pageDesign.value);
-    }, 400);
-    function revocation() {
-      viewDesignComponentKey.value++;
-      undoRedoStore.undo(pageDesign.value);
-    }
-    function regain() {
-      viewDesignComponentKey.value++;
-      undoRedoStore.record(pageDesign.value);
-    }
-    function debounce(fn, wait) {
-      let timeout = null;
-      return function() {
-        let context = this;
-        let args = arguments;
-        if (timeout)
-          clearTimeout(timeout);
-        let callNow = !timeout;
-        timeout = setTimeout(() => {
-          timeout = null;
-        }, wait);
-        if (callNow)
-          fn.apply(context, args);
-      };
-    }
-    function workflowDefVersionChange(newDef) {
-      const workflowVersion = newDef.definitionVersion;
-      if (workflowVersion) {
-        pageDesign.value.props.workflowSource = "link";
-        pageDesign.value.props.linkWorkflowVersion = workflowVersion;
-        pageDesign.value.workflowVersion = workflowVersion;
-        afterChangeDefinition(newDef);
-      }
-    }
-    function managePagePermission(pageDesign2) {
-      addPermission(pageDesign2, "page", pageDesign2.label, "-1");
-      const allAutos = ["gets", "workflowGets", "listData", "listSubData"];
-      const adds = [];
-      if (!pageDesign2.pageType || pageDesign2.pageType == "form") {
-        addPermission(pageDesign2, "gets", "", "-1");
-        adds.push("gets");
-        const propsBase = pageDesign2.props ? pageDesign2.props : {};
-        if (propsBase.activeWorkflow) {
-          addPermission(pageDesign2, "workflowGets", "", "-1");
-          adds.push("workflowGets");
-        }
-      } else if (pageDesign2.pageType == "list") {
-        addPermission(pageDesign2, "listData", "", "-1");
-        addPermission(pageDesign2, "listSubData", "", "-1");
-        adds.push("listData");
-        adds.push("listSubData");
-      }
-      for (let eventName of allAutos) {
-        if (!adds.includes(eventName)) {
-          delPermission(pageDesign2, eventName, "-1");
-        }
-      }
-    }
-    function getProcessDefinition(workflowCode, defVersion) {
-      getHighestVersionDefinition(workflowCode, defVersion, publishVersion.value).then((definition) => {
-        afterChangeDefinition(definition);
-        clickType.value = "workflow";
-        isShowWfEditor.value = true;
+import { defineComponent as e, ref as l, watch as o, resolveComponent as s, openBlock as a, createElementBlock as t, createElementVNode as n, createVNode as i, withCtx as u, createBlock as r, createCommentVNode as v, normalizeClass as p, withDirectives as c, vShow as f, unref as d } from "vue";
+import m from "./view/view-design.vue.js";
+import { initComponentRefState as g } from "../../utils/page-helper-util.js";
+import { getTableNameByTableUuid as w, queryTableFields as k, changeFeieldToMap as y } from "../../utils/page-table-util.js";
+import { addPermission as b, delPermission as C } from "../../utils/page-permission-util.js";
+import { usePageContextStore as h } from "../../../../stores/page-store.js";
+import S from "service-flow-designer";
+import { getHighestVersionDefinition as j } from "../../utils/page-design-util.js";
+import { getPageConf as V } from "../../utils/assemblys-config.js";
+import { fetchPageDesignData as D } from "../../utils/page-service-util.js";
+import { ElMessage as W, ElLoading as I } from "element-plus";
+import x from "./view/page-switch.vue.js";
+import { undoRedo as J } from "../../../../stores/undo-redo-store.js";
+import T from "./page-event/page-event-view.vue.js";
+import _ from "../../utils/eventBus.js";
+const B = { class: "amb-page-container" }, N = { class: "amb-page-container-header-page" }, P = { class: "amb-page-container-header" }, R = { class: "amb-page-container-header-type" }, E = { key: 0, class: "amb-page-container-main" }, F = e({ __name: "page-design", props: { pageId: { type: Number, default: null } }, setup(e2) {
+  const F2 = J(), G = e2, O = l(null), z = l(null), M = l(), $ = h(), q = l("page"), L = l(null), U = l(null), A = l(null), H = l(false), K = l(0);
+  let Q = l(null);
+  const X = l(null);
+  function Y() {
+    q.value = "front", M.value && M.value.resize && M.value.resize();
+  }
+  function Z(e3) {
+    const l2 = V();
+    return e3 ? Object.assign(l2, e3) : l2.systemCode || (l2.systemCode = "iqc", l2.systemVersion = 1), l2;
+  }
+  function ee(e3) {
+    let l2;
+    g(e3);
+    const s2 = e3 == null ? void 0 : e3.tableUuids;
+    s2 && s2.length > 0 && (l2 = s2[0]);
+    const a2 = w(e3, l2);
+    if (a2) {
+      const l3 = e3.tableSysCode ? e3.tableSysCode : e3.systemCode, o2 = e3.tableSysVersion ? e3.tableSysVersion : e3.systemVersion;
+      k(l3, o2, a2).then((l4) => {
+        e3.modelFields = l4, e3.modelFieldsMap = y(e3.modelFieldsMap, l4), $.setPageContext(e3);
       });
     }
-    function afterChangeDefinition(definition) {
-      selectWfCode.value = definition.code;
-      selectWfVersion.value = definition.definitionVersion;
-      definitionId.value = definition.id;
-    }
-    function clickWorkflow() {
-      let defVersion;
-      let workflowCode;
-      if (pageDesign.value.props.activeWorkflow && pageDesign.value.props.workflowSource && pageDesign.value.props.workflowSource === "link") {
-        workflowCode = pageDesign.value.props.linkWorkflowCode;
-        defVersion = pageDesign.value.props.linkWorkflowVersion;
-      } else if (pageDesign.value.props.activeWorkflow && pageDesign.value.props.workflowSource && pageDesign.value.props.workflowSource === "create") {
-        workflowCode = pageDesign.value.props.createWorkflowCode;
-        defVersion = 1;
-      }
-      if (workflowCode) {
-        if (!selectWfCode.value && !selectWfVersion.value || selectWfCode.value !== workflowCode || selectWfVersion.value !== defVersion) {
-          isShowWfEditor.value = false;
-          getProcessDefinition(workflowCode, defVersion);
-        } else {
-          clickType.value = "workflow";
-        }
-      } else {
-        ElMessage({
-          type: "warning",
-          showClose: true,
-          message: "请在页面设计/属性/工作流中先绑定流程"
-        });
+    Q.value = e3.systemVersion, $.setPageContext(e3), o(() => e3, (e4) => {
+      le();
+    }, { deep: true }), o(e3.events, (l3) => {
+      if (e3.runtime || (e3.runtime = {}), e3.events) {
+        const l4 = e3.events.filter((e4) => !e4.isStandard && e4.jsContent || e4.isStandard && e4.eventName);
+        e3.runtime.events = l4;
       }
+    }, { immediate: true }), o(() => e3.label, () => {
+      te(e3);
+    }, { immediate: true }), o(() => e3.pageType, () => {
+      te(e3);
+    }, { immediate: true }), e3.props && o(() => e3.props.activeWorkflow, () => {
+      te(e3);
+    }, { immediate: true }), _.$emit("changePageDesign");
+  }
+  _.$on("editComponentEvent", () => {
+    Y();
+  }), G.pageId ? D(G.pageId).then((e3) => {
+    if (e3 && e3.designJson) {
+      const l2 = e3.designJson, o2 = Z(JSON.parse(l2));
+      o2.id = G.pageId, O.value = o2, ee(O.value);
+    } else
+      O.value = Z(null), ee(O.value);
+  }) : (O.value = Z(null), ee(O.value));
+  let le = /* @__PURE__ */ function(e3, l2) {
+    let o2 = null;
+    return function() {
+      let s2 = arguments;
+      o2 && clearTimeout(o2);
+      let a2 = !o2;
+      o2 = setTimeout(() => {
+        o2 = null;
+      }, l2), a2 && e3.apply(this, s2);
+    };
+  }(() => {
+    F2.addSnapshot(O.value);
+  }, 400);
+  function oe() {
+    K.value++, F2.undo(O.value);
+  }
+  function se() {
+    K.value++, F2.record(O.value);
+  }
+  function ae(e3) {
+    const l2 = e3.definitionVersion;
+    l2 && (O.value.props.workflowSource = "link", O.value.props.linkWorkflowVersion = l2, O.value.workflowVersion = l2, ne(e3));
+  }
+  function te(e3) {
+    b(e3, "page", e3.label, "-1");
+    const l2 = ["gets", "workflowGets", "listData", "listSubData"], o2 = [];
+    if (e3.pageType && "form" != e3.pageType)
+      "list" == e3.pageType && (b(e3, "listData", "", "-1"), b(e3, "listSubData", "", "-1"), o2.push("listData"), o2.push("listSubData"));
+    else {
+      b(e3, "gets", "", "-1"), o2.push("gets");
+      (e3.props ? e3.props : {}).activeWorkflow && (b(e3, "workflowGets", "", "-1"), o2.push("workflowGets"));
     }
-    function changePage(pageId) {
-      const loading = ElLoading.service({
-        lock: true,
-        text: "切换中，请稍后..."
-      });
-      fetchPageDesignData(pageId).then((appPageDesign) => {
-        viewDesignComponentKey.value++;
-        loading.close();
-        if (appPageDesign && appPageDesign.designJson) {
-          const designJson = appPageDesign.designJson;
-          const pageConf = getPageDesignConf(JSON.parse(designJson));
-          pageConf.id = pageId;
-          console.log("pageConf", pageConf);
-          pageDesign.value = pageConf;
-          if (!pageDesign.value.items) {
-            pageDesign.value.items = [];
-          }
-          if (!pageDesign.value.props) {
-            pageDesign.value.props = {};
-          }
-          initPageDesign(pageDesign.value);
-        } else {
-          pageDesign.value = getPageDesignConf(null);
-          initPageDesign(pageDesign.value);
-        }
+    for (let s2 of l2)
+      o2.includes(s2) || C(e3, s2, "-1");
+  }
+  function ne(e3) {
+    U.value = e3.code, A.value = e3.definitionVersion, L.value = e3.id;
+  }
+  function ie() {
+    let e3, l2;
+    O.value.props.activeWorkflow && O.value.props.workflowSource && "link" === O.value.props.workflowSource ? (l2 = O.value.props.linkWorkflowCode, e3 = O.value.props.linkWorkflowVersion) : O.value.props.activeWorkflow && O.value.props.workflowSource && "create" === O.value.props.workflowSource && (l2 = O.value.props.createWorkflowCode, e3 = 1), l2 ? !U.value && !A.value || U.value !== l2 || A.value !== e3 ? (H.value = false, function(e4, l3) {
+      j(e4, l3, Q.value).then((e5) => {
+        ne(e5), q.value = "workflow", H.value = true;
       });
-    }
-    function pageSwitchInitLoadedNodes(res) {
-      if (res && res.system) {
-        system.value = res.system;
-      }
-      if (system.value) {
-        pageDesignUtil.setEnableI18n(system.value.enableI18n);
-      }
-    }
-    return (_ctx, _cache) => {
-      const _component_el_col = resolveComponent("el-col");
-      const _component_el_row = resolveComponent("el-row");
-      const _component_workflow_editor = resolveComponent("workflow-editor");
-      return openBlock(), createElementBlock("div", _hoisted_1, [
-        createElementVNode("div", _hoisted_2, [
-          createVNode(_component_el_row, null, {
-            default: withCtx(() => [
-              createVNode(_component_el_col, {
-                span: 23,
-                style: {}
-              }, {
-                default: withCtx(() => [
-                  pageDesign.value && pageDesign.value.code ? (openBlock(), createBlock(PageSwitch, {
-                    key: 0,
-                    pageDesign: pageDesign.value,
-                    onChangePage: changePage,
-                    onInitLoaded: pageSwitchInitLoadedNodes
-                  }, null, 8, ["pageDesign"])) : createCommentVNode("", true)
-                ]),
-                _: 1
-              })
-            ]),
-            _: 1
-          })
-        ]),
-        createElementVNode("div", _hoisted_3, [
-          createElementVNode("div", _hoisted_4, [
-            createElementVNode("label", {
-              class: normalizeClass({ selected: clickType.value === "page" }),
-              onClick: _cache[0] || (_cache[0] = ($event) => clickType.value = "page")
-            }, "页面设计", 2),
-            createElementVNode("label", {
-              class: normalizeClass({ selected: clickType.value === "front" }),
-              onClick: _cache[1] || (_cache[1] = ($event) => clickFrontLogic())
-            }, "页面逻辑", 2),
-            createElementVNode("label", {
-              class: normalizeClass({ selected: clickType.value === "workflow" }),
-              onClick: _cache[2] || (_cache[2] = ($event) => clickWorkflow())
-            }, "工作流设计", 2),
-            createElementVNode("label", {
-              class: normalizeClass({ selected: clickType.value === "service" }),
-              onClick: _cache[3] || (_cache[3] = ($event) => clickType.value = "service")
-            }, "服务编排", 2)
-          ])
-        ]),
-        pageDesign.value ? (openBlock(), createElementBlock("div", _hoisted_5, [
-          withDirectives((openBlock(), createBlock(_sfc_main$1, {
-            ref_key: "ViewDesignRef",
-            ref: ViewDesignRef,
-            key: viewDesignComponentKey.value,
-            configure: pageDesign.value,
-            system: system.value,
-            onRegain: regain,
-            onRevocation: revocation
-          }, null, 8, ["configure", "system"])), [
-            [vShow, clickType.value === "page"]
-          ]),
-          isShowWfEditor.value ? withDirectives((openBlock(), createBlock(_component_workflow_editor, {
-            key: 0,
-            id: definitionId.value,
-            code: pageDesign.value.workflowCode,
-            version: pageDesign.value.workflowVersion,
-            "system-code": pageDesign.value.systemCode,
-            "system-publish-version": pageDesign.value.systemVersion,
-            "page-code": pageDesign.value.code,
-            onBack: _ctx.goBack,
-            onChangeDefVersion: workflowDefVersionChange
-          }, null, 8, ["id", "code", "version", "system-code", "system-publish-version", "page-code", "onBack"])), [
-            [vShow, clickType.value === "workflow"]
-          ]) : createCommentVNode("", true),
-          clickType.value === "service" ? (openBlock(), createBlock(unref(ServiceFlowDesginer), {
-            key: 1,
-            pageContext: pageDesign.value
-          }, null, 8, ["pageContext"])) : createCommentVNode("", true),
-          withDirectives(createVNode(_sfc_main$2, {
-            ref_key: "pageEventContainerRef",
-            ref: pageEventContainerRef,
-            configure: pageDesign.value
-          }, null, 8, ["configure"]), [
-            [vShow, clickType.value === "front"]
-          ])
-        ])) : createCommentVNode("", true)
-      ]);
-    };
+    }(l2, e3)) : q.value = "workflow" : W({ type: "warning", showClose: true, message: "请在页面设计/属性/工作流中先绑定流程" });
+  }
+  function ue(e3) {
+    const l2 = I.service({ lock: true, text: "切换中，请稍后..." });
+    D(e3).then((o2) => {
+      if (K.value++, l2.close(), o2 && o2.designJson) {
+        const l3 = o2.designJson, s2 = Z(JSON.parse(l3));
+        s2.id = e3, O.value = s2, O.value.items || (O.value.items = []), O.value.props || (O.value.props = {}), ee(O.value);
+      } else
+        O.value = Z(null), ee(O.value);
+    });
+  }
+  function re(e3) {
+    e3 && e3.system && (X.value = e3.system), X.value && $.setEnableI18n(X.value.enableI18n);
   }
-});
+  return (e3, l2) => {
+    const o2 = s("el-col"), g2 = s("el-row"), w2 = s("workflow-editor");
+    return a(), t("div", B, [n("div", N, [i(g2, null, { default: u(() => [i(o2, { span: 23, style: {} }, { default: u(() => [O.value && O.value.code ? (a(), r(x, { key: 0, pageDesign: O.value, onChangePage: ue, onInitLoaded: re }, null, 8, ["pageDesign"])) : v("", true)]), _: 1 })]), _: 1 })]), n("div", P, [n("div", R, [n("label", { class: p({ selected: "page" === q.value }), onClick: l2[0] || (l2[0] = (e4) => q.value = "page") }, "页面设计", 2), n("label", { class: p({ selected: "front" === q.value }), onClick: l2[1] || (l2[1] = (e4) => Y()) }, "页面逻辑", 2), n("label", { class: p({ selected: "workflow" === q.value }), onClick: l2[2] || (l2[2] = (e4) => ie()) }, "工作流设计", 2), n("label", { class: p({ selected: "service" === q.value }), onClick: l2[3] || (l2[3] = (e4) => q.value = "service") }, "服务编排", 2)])]), O.value ? (a(), t("div", E, [c((a(), r(m, { ref_key: "ViewDesignRef", ref: z, key: K.value, configure: O.value, system: X.value, onRegain: se, onRevocation: oe }, null, 8, ["configure", "system"])), [[f, "page" === q.value]]), H.value ? c((a(), r(w2, { key: 0, id: L.value, code: O.value.workflowCode, version: O.value.workflowVersion, "system-code": O.value.systemCode, "system-publish-version": O.value.systemVersion, "page-code": O.value.code, onBack: e3.goBack, onChangeDefVersion: ae }, null, 8, ["id", "code", "version", "system-code", "system-publish-version", "page-code", "onBack"])), [[f, "workflow" === q.value]]) : v("", true), "service" === q.value ? (a(), r(d(S), { key: 1, pageContext: O.value }, null, 8, ["pageContext"])) : v("", true), c(i(T, { ref_key: "pageEventContainerRef", ref: M, configure: O.value }, null, 8, ["configure"]), [[f, "front" === q.value]])])) : v("", true)]);
+  };
+} });
 export {
-  _sfc_main as default
+  F as default
 };

package/dist/es/components/design/views/design/page-design.vue2.js

@@ -1,4 +1,4 @@
-import _sfc_main from "./page-design.vue.js";
+import e from "./page-design.vue.js";
 export {
-  _sfc_main as default
+  e as default
 };

package/dist/es/components/design/views/design/page-event/config.vue.js

@@ -1,7 +1,7 @@
-import _sfc_main from "./config.vue3.js";
+import o from "./config.vue3.js";
 import "./config.vue2.js";
-import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.js";
-const config = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-bc0d50cd"]]);
+import e from "../../../../../_virtual/_plugin-vue_export-helper.js";
+const r = e(o, [["__scopeId", "data-v-bc0d50cd"]]);
 export {
-  config as default
+  r as default
 };