super-page-runtime 2.2.11 → 2.2.17

package/dist/es/components/runtime/views/super-page.vue.js

@@ -2,13 +2,13 @@ import { defineComponent as e, ref as l, onMounted as t, onUpdated as a, nextTic
 import y from "./assemblys/object-render.vue.js";
 import { updateOptionDatasources as h, updateChartDatasources as C } from "../utils/page-helper-util.js";
 import { queryPageSuperGrids as b, queryPageDesignByCode as P, convertToPageContext as j, packageAdditionalMapWithLocationSearch as k, packageAdditionalMapWithRoute as $, packageAdditionalMapWithPageRequest as x } from "../utils/page-init-util.js";
-import { addComponentRef as D, removePageAllRef as N, initComponentRefState as q } from "../utils/global-refs.js";
-import { removeCustomFuncFromWindow as w, handleEvent as I, initPageEvents as S, getCustomFunc as T } from "../utils/events/event-util.js";
+import { addComponentRef as D, removePageAllRef as w, initComponentRefState as N } from "../utils/global-refs.js";
+import { removeCustomFuncFromWindow as q, handleEvent as I, initPageEvents as S, getCustomFunc as T } from "../utils/events/event-util.js";
 import _ from "./assemblys/common/export-form-report-dialog.vue.js";
 import O from "./assemblys/common/task-informition-dialog.vue.js";
 import R from "./assemblys/common/remove-signer-dialog.vue.js";
 import F from "../utils/eventBus.js";
-import { getTaskInformitions as M, getRemoveSigner as E, getFormData as V, exportFormReport as W, doImportFinally as B, doAddSigner as H, doCreateCopyTask as J, doAssign as U, doReturnTaskTo as G, doRemoveSigners as z, updateValuesWhenCloseDialog as A, refreshFormOrListPage as K, getAdditionalParamMap as L } from "../utils/events/standard-event.js";
+import { getTaskInformitions as M, getRemoveSigner as V, getFormData as E, exportFormReport as W, doImportFinally as B, doAddSigner as H, doCreateCopyTask as J, doAssign as U, doReturnTaskTo as G, doRemoveSigners as L, updateValuesWhenCloseDialog as z, refreshFormOrListPage as A, getAdditionalParamMap as K } from "../utils/events/standard-event.js";
 import "../utils/api/api-util.js";
 import { ElMessage as Q } from "element-plus";
 import { useI18n as X } from "vue-i18n";
@@ -23,10 +23,10 @@ import { isMobileBrowser as re } from "agilebuilder-ui/src/utils/common-util";
 import { usePageContextStore as ve } from "../utils/page-store.js";
 import pe from "agilebuilder-ui/src/store";
 const me = { class: "app-container" }, ge = e({ __name: "super-page", props: { pageCode: { type: String, required: false }, pageVersion: { type: Number, required: false }, pageId: { type: Number, required: false }, dataId: { type: Number, required: false }, pageDesign: { type: Object, required: false }, isTest: { type: Boolean, required: false }, dimensions: { type: String, required: false }, publishVersion: { type: Number, required: false }, taskId: { type: Number, required: false }, pageRequest: { type: Object, required: false }, contentHeight: { type: [String, Number], default: null }, isDialog: { type: Boolean, required: false } }, emits: ["open", "opened", "close", "closed"], setup(e2, { expose: ge2, emit: fe }) {
-  const ce = ve(), { t: de } = X(), ye = e2, he = l(null), Ce = l([]), be = l(""), Pe = l({}), je = l(null), ke = l(null), $e = l(false), xe = l(false), De = l(false), Ne = l(false), qe = l(false), we = l(null), Ie = l(false), Se = l([]), Te = l([]), _e = l(false), Oe = l(null), Re = l(false), Fe = l(false), Me = l(null), Ee = l(null), Ve = l(null), We = l(null);
+  const ce = ve(), { t: de } = X(), ye = e2, he = l(null), Ce = l([]), be = l(""), Pe = l({}), je = l(null), ke = l(null), $e = l(false), xe = l(false), De = l(false), we = l(false), Ne = l(false), qe = l(null), Ie = l(false), Se = l([]), Te = l([]), _e = l(false), Oe = l(null), Re = l(false), Fe = l(false), Me = l(null), Ve = l(null), Ee = l(null), We = l(null);
   let Be = l(null);
-  const He = l(null), Je = l(null), Ue = le(), Ge = l(0), ze = re();
-  function Ae(e3) {
+  const He = l(null), Je = l(null), Ue = le(), Ge = l(0), Le = re();
+  function ze(e3) {
     var _a;
     const l2 = j(e3);
     if (l2.isTest = ye.isTest, l2.isTest && ye.dimensions && (l2.dimensions = ye.dimensions), ye.isDialog || (k(l2.entity.request), $(Ue, l2.entity.request)), x(ye.pageRequest, l2.entity.request), Be.value = l2, null == Be.value) return;
@@ -41,38 +41,38 @@ const me = { class: "app-container" }, ge = e({ __name: "super-page", props: { p
         if (!l3 || 0 == l3.length) return;
         e4.initChartData = {}, e4.initChartData.data = oe(e4.entity.data), e4.initChartData.page = oe(e4.entity.page), l3 && l3.length > 0 && C(e4, l3, null, true);
       }(Be.value, e3.initChartServiceConfigs);
-    }, 200), Be.value.initDataSources = [], q(Be.value), Ce.value = Be.value.items ? Be.value.items : [];
+    }, 200), Be.value.initDataSources = [], N(Be.value), Ce.value = Be.value.items ? Be.value.items : [];
     const t2 = Be.value.runtime ? Be.value.runtime : {};
     be.value = t2.class, Pe.value = t2.style, S(e3, Be.value), Z(Be.value.rules), I(null, Be.value, e3, "beforeload");
     const a2 = Be.value.code;
-    return ce.setPageContext(Be.value), we.value = a2 + "_", F.$on(we.value + "export-form-report", (e4) => {
+    return ce.setPageContext(Be.value), qe.value = a2 + "_", F.$on(qe.value + "export-form-report", (e4) => {
       ke.value = e4, He.value = e4.configureObj, Je.value = e4.pageContext, $e.value = true;
-    }), F.$on(we.value + "export-pdf-report", (e4) => {
+    }), F.$on(qe.value + "export-pdf-report", (e4) => {
       ke.value = e4, He.value = e4.configureObj, Je.value = e4.pageContext, $e.value = true;
-    }), F.$on(we.value + "import-file", (e4) => {
+    }), F.$on(qe.value + "import-file", (e4) => {
       ke.value = e4, Ye.value.click();
-    }), F.$on(we.value + "assign-task", (e4) => {
-      ke.value = e4, Ne.value = true, qe.value = false;
-    }), F.$on(we.value + "copy-task", (e4) => {
-      ke.value = e4, De.value = true, qe.value = true;
-    }), F.$on(we.value + "add-signer", (e4) => {
-      ke.value = e4, xe.value = true, qe.value = true;
-    }), F.$on(we.value + "choose-return-node", (e4) => {
+    }), F.$on(qe.value + "assign-task", (e4) => {
+      ke.value = e4, we.value = true, Ne.value = false;
+    }), F.$on(qe.value + "copy-task", (e4) => {
+      ke.value = e4, De.value = true, Ne.value = true;
+    }), F.$on(qe.value + "add-signer", (e4) => {
+      ke.value = e4, xe.value = true, Ne.value = true;
+    }), F.$on(qe.value + "choose-return-node", (e4) => {
       ke.value = e4, M(e4).then((e5) => {
         Se.value = e5, Ie.value = true;
       }).catch((e5) => {
         Ie.value = false;
       });
-    }), F.$on(we.value + "remove-signer", (e4) => {
-      ke.value = e4, E(e4).then((l3) => {
+    }), F.$on(qe.value + "remove-signer", (e4) => {
+      ke.value = e4, V(e4).then((l3) => {
         Oe.value = e4.pageContext.completeTaskParam.taskId, Te.value = l3, _e.value = true;
       }).catch((e5) => {
         _e.value = false;
       });
-    }), F.$on(we.value + "prohibit-edit", (e4) => {
-    }), F.$on(we.value + "open-dialog", (e4) => {
+    }), F.$on(qe.value + "prohibit-edit", (e4) => {
+    }), F.$on(qe.value + "open-dialog", (e4) => {
       var l3, t3, a3;
-      Ee.value = e4.pageContext, Ve.value = e4.configureObj, We.value = e4.eventParams, l3 = Ve.value, t3 = We.value, a3 = e4.jumpPageSetting, function(e5, l4, t4) {
+      Ve.value = e4.pageContext, Ee.value = e4.configureObj, We.value = e4.eventParams, l3 = Ee.value, t3 = We.value, a3 = e4.jumpPageSetting, function(e5, l4, t4) {
         return new Promise((a4, u2) => {
           var _a2;
           if (t4) a4(t4);
@@ -80,14 +80,14 @@ const me = { class: "app-container" }, ge = e({ __name: "super-page", props: { p
             const t5 = e5 && e5.props && e5.props.linkPage ? e5.props.linkPage : null;
             if (t5 && t5.jumpPageUrl) {
               false !== t5.isNewPage && true !== t5.isNewPage && (t5.isNewPage = true);
-              const e6 = L(Be), u3 = !!((_a2 = Ve.value.props.linkPage) == null ? void 0 : _a2.isNeedId);
+              const e6 = K(Be), u3 = !!((_a2 = Ee.value.props.linkPage) == null ? void 0 : _a2.isNeedId);
               let n2 = u3 && l4 ? l4.id : null, o2 = u3 && l4 ? l4.ids : null, i2 = l4 ? l4.selections : [], s2 = l4 ? l4.row : null;
               if (!s2) if (s2 = {}, i2 && i2.length > 0) s2 = i2[0];
               else {
-                const e7 = Ee.value.entity.data, l5 = Ee.value.entity.page;
+                const e7 = Ve.value.entity.data, l5 = Ve.value.entity.page;
                 l5 && Object.assign(s2, l5), e7 && Object.assign(s2, e7);
               }
-              const r2 = oe(Ee.value.entity.page);
+              const r2 = oe(Ve.value.entity.page);
               t5._pageData = r2, ae(t5, null, n2, s2, e6, o2).then((e7) => {
                 e7.isNeedId = u3, a4(e7);
               });
@@ -97,14 +97,14 @@ const me = { class: "app-container" }, ge = e({ __name: "super-page", props: { p
       }(l3, t3, a3).then((e5) => {
         if (e5) {
           const t4 = l3 && l3.props && l3.props.linkPage ? l3.props.linkPage : null;
-          t4 && Object.assign(e5, oe(t4)), se(e5, ze);
+          t4 && Object.assign(e5, oe(t4)), se(e5, Le);
           const a4 = e5.jumpMode, u2 = e5;
-          if (We.value || (We.value = {}), We.value.paramStoreId = e5.paramStoreId, u2.parentPageCode = Ee.value.code, u2.parentPageVersion = Ee.value.version, u2.isNewPage = true, "popup" === a4 || "refresh" === a4) {
+          if (We.value || (We.value = {}), We.value.paramStoreId = e5.paramStoreId, u2.parentPageCode = Ve.value.code, u2.parentPageVersion = Ve.value.version, u2.isNewPage = true, "popup" === a4 || "refresh" === a4) {
             const e6 = u2.linkType;
             (function(e7, l4) {
               const t5 = ne();
               return new Promise((a5, u3) => {
-                if (t5) if ("popup" !== l4 && !ze || Ee.value.systemCode === e7.customSystem) a5(true);
+                if (t5) if ("popup" !== l4 && !Le || Ve.value.systemCode === e7.customSystem) a5(true);
                 else {
                   const l5 = e7.customSystem;
                   pe.dispatch("getCurrentUserPermissions", { loginName: t5, systemCode: l5 }).then(() => {
@@ -116,33 +116,36 @@ const me = { class: "app-container" }, ge = e({ __name: "super-page", props: { p
                 else a5(true);
               });
             })(u2, a4).then(() => {
-              ze && (Ee.value.systemCode !== u2.customSystem || e6 && "url" === e6) ? (u2._isIframe = true, "refresh" === a4 && (u2.dialogType = "drawer", u2.jumpPageWidth = "100%"), Me.value = u2, Fe.value = true) : (u2._isIframe = false, "popup" === a4 || ze && "refresh" === a4 ? ("refresh" === a4 && (u2.dialogType = "drawer", u2.jumpPageWidth = "100%"), Me.value = u2, Fe.value = true) : "refresh" === a4 && tl.push({ path: "/dsc/page", query: u2 }));
-            }), F.$on(we.value + "close-dialog", (e7) => {
+              Le && (Ve.value.systemCode !== u2.customSystem || e6 && "url" === e6) ? (u2._isIframe = true, "refresh" === a4 && (u2.dialogType = "drawer", u2.jumpPageWidth = "100%"), Me.value = u2, Fe.value = true) : (u2._isIframe = false, "popup" === a4 || Le && "refresh" === a4 ? ("refresh" === a4 && (u2.dialogType = "drawer", u2.jumpPageWidth = "100%"), Me.value = u2, Fe.value = true) : "refresh" === a4 && tl.push({ path: "/dsc/page", query: u2 }));
+            }), F.$on(qe.value + "close-dialog", (e7) => {
               !function(e8) {
                 const l4 = e8.jumpMode;
-                l4 && "popup" === l4 || ze && "refresh" === l4 ? al(e8) : tl.go(-1);
+                l4 && "popup" === l4 || Le && "refresh" === l4 ? al(e8) : tl.go(-1);
               }(e7);
             });
           }
         }
       });
+    }), F.$on("pageLoaded", () => {
+      const e4 = { runtime: { events: Be.value.events }, systemCode: "", systemVersion: 0, code: "", version: 0, workflowCode: "", workflowVersion: 0, name: "", uuid: "", label: "" };
+      I(null, Be.value, e4, "load");
     }), d(() => Be.value.isRefresh, (e4) => {
       e4 && (Ge.value++, Be.value.isRefresh = false);
-    }), V(Be.value, null, (_a = ye.pageRequest) == null ? void 0 : _a.isNeedId);
+    }), E(Be.value, null, (_a = ye.pageRequest) == null ? void 0 : _a.isNeedId);
   }
-  function Ke() {
+  function Ae() {
     u(() => {
       const e3 = he.value.parentNode ? he.value.parentNode : he.value;
       let l2 = ye.contentHeight;
       if (!l2) {
         const t3 = e3.getBoundingClientRect();
-        l2 = ze ? window.innerHeight - 78 : window.innerHeight - t3.y - 40;
+        l2 = Le ? window.innerHeight - 78 : window.innerHeight - t3.y - 40;
       }
       let t2 = l2;
       ie(l2) && (t2 = l2 + "px"), e3.style.height = t2, e3.style["overflow-y"] = "auto";
     });
   }
-  function Le() {
+  function Ke() {
     const e3 = Be.value.entity.data, l2 = null == e3.ID ? e3.id : e3.ID;
     Ue.query && Ue.query._t_ && l2 && ue(Ue.query._t_ + "_id", l2);
   }
@@ -155,19 +158,19 @@ const me = { class: "app-container" }, ge = e({ __name: "super-page", props: { p
   }
   t(() => {
     null != ye.pageDesign ? (je.value = ye.pageDesign, setTimeout(() => {
-      Ae(ye.pageDesign).then(() => {
+      ze(ye.pageDesign).then(() => {
         ye.pageDesign.tableRuntimes && Object.keys(ye.pageDesign.tableRuntimes).length > 0 ? b(ye.pageDesign, Be.value, ye.publishVersion).then((e3) => {
           Be.value.isWorkflowEntity = e3.isWorkflowEntity, Be.value.dataTypeMaps = e3.dataTypeMaps, Be.value.superGridItems = e3.superGrids;
         }).catch((e3) => {
         }).finally(() => {
-          Re.value = true, Ke();
-        }) : (Re.value = true, Ke()), Le();
+          Re.value = true, Ae();
+        }) : (Re.value = true, Ae()), Ke();
       });
     }, 0)) : ye.pageCode && P(ye.pageCode).then((e3) => {
       if (e3 && e3.designJson) {
         const l2 = e3.designJson, t2 = JSON.parse(l2);
-        je.value = t2, Ae(t2).then(() => {
-          Le(), Re.value = true, Ke();
+        je.value = t2, ze(t2).then(() => {
+          Ke(), Re.value = true, Ae();
         });
       }
     });
@@ -176,17 +179,17 @@ const me = { class: "app-container" }, ge = e({ __name: "super-page", props: { p
       Be.value && he.value && D(Be.value, "-1", he);
     });
   }), n(() => {
-    N(Be.value), je.value && w(je.value), F.$off(we.value + "export-form-report"), F.$off(we.value + "export-pdf-report"), F.$off(we.value + "import-file"), F.$off(we.value + "assign-task"), F.$off(we.value + "copy-task"), F.$off(we.value + "add-signer"), F.$off(we.value + "choose-return-node"), F.$off(we.value + "remove-signer"), F.$off(we.value + "prohibit-edit"), F.$off(we.value + "open-dialog"), Be.value && I(null, Be.value, Be.value, "onUnmounted");
+    w(Be.value), je.value && q(je.value), F.$off(qe.value + "export-form-report"), F.$off(qe.value + "export-pdf-report"), F.$off(qe.value + "import-file"), F.$off(qe.value + "assign-task"), F.$off(qe.value + "copy-task"), F.$off(qe.value + "add-signer"), F.$off(qe.value + "choose-return-node"), F.$off(qe.value + "remove-signer"), F.$off(qe.value + "prohibit-edit"), F.$off(qe.value + "open-dialog"), F.$off("pageLoaded"), Be.value && I(null, Be.value, Be.value, "onUnmounted");
   });
   const Ye = l(null);
   function Ze(e3) {
-    true === xe.value && (xe.value = false, H(ke.value, e3)), true === De.value && (De.value = false, J(ke.value, e3)), true === Ne.value && (Ne.value = false, U(ke.value, e3));
+    true === xe.value && (xe.value = false, H(ke.value, e3)), true === De.value && (De.value = false, J(ke.value, e3)), true === we.value && (we.value = false, U(ke.value, e3));
   }
   function el(e3) {
     Se.value = [], Ie.value = false, G(ke.value, e3);
   }
   function ll(e3) {
-    Te.value = [], _e.value = false, z(ke.value, e3);
+    Te.value = [], _e.value = false, L(ke.value, e3);
   }
   const tl = te();
   function al(e3) {
@@ -195,24 +198,24 @@ const me = { class: "app-container" }, ge = e({ __name: "super-page", props: { p
     let a2, u2;
     if (e3) {
       const l3 = e3.isNeedValueMapping;
-      a2 = e3.dataModel, u2 = e3.sourceTableName, l3 && A(Ee.value, Ve.value, a2, u2);
+      a2 = e3.dataModel, u2 = e3.sourceTableName, l3 && z(Ve.value, Ee.value, a2, u2);
     }
-    const n2 = Ee.value.tableName;
+    const n2 = Ve.value.tableName;
     let o2;
     const i2 = We.value.columnProp ? We.value.columnProp : null;
     if (i2) {
-      const e4 = (_b = (_a = Ve.value) == null ? void 0 : _a.items) == null ? void 0 : _b.filter((e5) => {
+      const e4 = (_b = (_a = Ee.value) == null ? void 0 : _a.items) == null ? void 0 : _b.filter((e5) => {
         var _a2, _b2, _c, _d;
         return ((_b2 = (_a2 = e5.props) == null ? void 0 : _a2.base) == null ? void 0 : _b2.prop) && ((_d = (_c = e5.props) == null ? void 0 : _c.base) == null ? void 0 : _d.prop) === i2;
       });
       o2 = e4 && e4.length > 0 ? e4[0] : null;
-    } else o2 = Ve.value;
-    I(null, Ee.value, o2, "closePopup", { sourceModel: a2, sourceTableName: u2, jumpPageSetting: Me, entity: Ee.value.entity.data, targetTableName: n2, pageContext: Be.value, parentPageContext: Ee.value, parentConfigureObj: o2, columnProp: i2 }), function(e4, l3, t3) {
+    } else o2 = Ee.value;
+    I(null, Ve.value, o2, "closePopup", { sourceModel: a2, sourceTableName: u2, jumpPageSetting: Me, entity: Ve.value.entity.data, targetTableName: n2, pageContext: Be.value, parentPageContext: Ve.value, parentConfigureObj: o2, columnProp: i2 }), function(e4, l3, t3) {
       if (e4) {
-        const a3 = T(Ee.value, e4);
-        a3 && a3.apply(a3, [{ pageContext: Be.value, parentPageContext: Ee.value, parentConfigureObj: t3, jumpPageSetting: Me, columnProp: l3 }]);
+        const a3 = T(Ve.value, e4);
+        a3 && a3.apply(a3, [{ pageContext: Be.value, parentPageContext: Ve.value, parentConfigureObj: t3, jumpPageSetting: Me, columnProp: l3 }]);
       }
-    }(l2, i2, o2), K(Ee.value, Ve.value, t2, void 0 !== t2 && false === t2 ? "noOperation" : null), Ee.value = null, Ve.value = null, We.value = null, F.$off(we.value + "close-dialog"), Fe.value = false;
+    }(l2, i2, o2), A(Ve.value, Ee.value, t2, void 0 !== t2 && false === t2 ? "noOperation" : null), Ve.value = null, Ee.value = null, We.value = null, F.$off(qe.value + "close-dialog"), Fe.value = false;
   }
   return ge2({ pickFileDone: function(e3) {
     let l2 = e3.componentId, t2 = e3.listCode;
@@ -230,7 +233,7 @@ const me = { class: "app-container" }, ge = e({ __name: "super-page", props: { p
       const e5 = Ye.value.files[0];
       e5 ? (Ye.value.value = null, B(ke.value, e5)) : Q({ showClose: true, type: "warning", message: de("superPageRuntimeMessage.noFileSelected") });
     }
-  }()) }, null, 544), xe.value || De.value || Ne.value ? (i(), p(c(Y), { key: 1, width: "60%", multiple: qe.value, onClose: Ze }, null, 8, ["multiple"])) : s("", true), Ie.value ? (i(), p(O, { key: 2, "task-informitions": Se.value, onClose: l2[1] || (l2[1] = (e4) => Ie.value = false), onResult: el }, null, 8, ["task-informitions"])) : s("", true), _e.value ? (i(), p(R, { key: 3, "task-id": Oe.value, "active-tasks": Te.value, onClose: l2[2] || (l2[2] = (e4) => _e.value = false), onResult: ll }, null, 8, ["task-id", "active-tasks"])) : s("", true), Fe.value ? (i(), p(ee, { key: 4, parentPageContext: Ee.value, parentPageEventParams: We.value, jumpPageSetting: Me.value, onClose: l2[3] || (l2[3] = (e4) => al()) }, null, 8, ["parentPageContext", "parentPageEventParams", "jumpPageSetting"])) : s("", true)], 6)) : s("", true)]));
+  }()) }, null, 544), xe.value || De.value || we.value ? (i(), p(c(Y), { key: 1, width: "60%", multiple: Ne.value, onClose: Ze }, null, 8, ["multiple"])) : s("", true), Ie.value ? (i(), p(O, { key: 2, "task-informitions": Se.value, onClose: l2[1] || (l2[1] = (e4) => Ie.value = false), onResult: el }, null, 8, ["task-informitions"])) : s("", true), _e.value ? (i(), p(R, { key: 3, "task-id": Oe.value, "active-tasks": Te.value, onClose: l2[2] || (l2[2] = (e4) => _e.value = false), onResult: ll }, null, 8, ["task-id", "active-tasks"])) : s("", true), Fe.value ? (i(), p(ee, { key: 4, parentPageContext: Ve.value, parentPageEventParams: We.value, jumpPageSetting: Me.value, onClose: l2[3] || (l2[3] = (e4) => al()) }, null, 8, ["parentPageContext", "parentPageEventParams", "jumpPageSetting"])) : s("", true)], 6)) : s("", true)]));
 } });
 export {
   ge as default

package/dist/es/style.css

@@ -1,3 +1,6 @@
 .el-form-item[data-v-96fc65d8] {
   margin-bottom: 0px;
-}
+}
+[data-v-ebee0fff] .el-empty {
+  padding: 0;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-runtime",
-  "version": "2.2.11",
+  "version": "2.2.17",
   "description": "AgileBuilder super page runtime",
   "license": "ISC",
   "main": "dist/es/index.js",
@@ -48,7 +48,7 @@
     "@vitejs/plugin-vue-jsx": "^3.1.0",
     "@vue/eslint-config-prettier": "^8.0.0",
     "@vue/test-utils": "^2.4.4",
-    "agilebuilder-ui": "1.1.7",
+    "agilebuilder-ui": "1.1.8",
     "axios": "^1.6.8",
     "cypress": "^13.6.6",
     "element-plus": "^2.6.1",