super-page-runtime 2.2.90 → 2.2.91-sit1

package/dist/es/components/runtime/utils/table-utils.js

@@ -24,7 +24,11 @@ function u(t2, i2, s2, n2) {
       const o2 = e(i3, t2);
       o2 && (u3.permission = o2);
     }
-    u3.label = o(u3.title), u3.sourceButton = { uuid: i3.uuid }, r3.props = u3, void 0 !== n2 && (r3.onClick = n2(i3)), s2.push(r3);
+    if (u3.label = o(u3.title), u3.sourceButton = { uuid: i3.uuid }, r3.props = u3, void 0 !== n2) {
+      const t3 = n2(i3);
+      r3.onClick = (t3 == null ? void 0 : t3.onClick) ?? t3, r3.eventName = t3 == null ? void 0 : t3.eventName;
+    }
+    s2.push(r3);
   });
 }
 function l(t2, e2, o2, n2) {

package/dist/es/components/runtime/views/assemblys/data/table/main-table-runtime.vue.js

@@ -1,5 +1,5 @@
 import { defineComponent as e, ref as t, onMounted as n, watch as o, onUnmounted as i, resolveComponent as a, createElementBlock as l, openBlock as r, unref as u, createVNode as s } from "vue";
-import { setTableEvents as c, canExecuteButton as p, doAfterClickEvent as d, doBeforeClickEvent as f, gridSelectRecord as g, gridSelectAllRecords as m, gridSelectionChange as v, cellClick as h, cellDblClick as b, rowClick as w, rowDblClick as S, headerClick as y, getEventNameByType as C, getEventFuncByType as x, getHandleEvent as D } from "../../../../utils/events/event-util.js";
+import { setTableEvents as c, canExecuteButton as p, doAfterClickEvent as d, doBeforeClickEvent as f, gridSelectRecord as g, gridSelectAllRecords as m, gridSelectionChange as v, cellClick as h, cellDblClick as b, rowClick as w, rowDblClick as S, headerClick as C, getEventNameByType as y, getEventFuncByType as x, getHandleEvent as D } from "../../../../utils/events/event-util.js";
 import { getBaseUrl as E, getListCode as O, getRealRestApiPath as k, isWorkflowPage as T, isVariableInvalidValue as R } from "../../../../utils/common-util.js";
 import { getAdditionalParamMap as I, getSaveFormRequestWithRow as V, standardEvents as j } from "../../../../utils/events/standard-event.js";
 import { isPromise as N } from "agilebuilder-ui/src/utils/common-util";
@@ -21,7 +21,7 @@ const A = ["id"], z = e({ __name: "main-table-runtime", props: { pageContext: {}
     const e3 = G.systemCode, t2 = G.code;
     let n2 = Q.props && Q.props.dataOrigin && "[]" !== Q.props.dataOrigin.sqlFilterCondition ? Q.props.dataOrigin.sqlFilterCondition : null;
     null == n2 && (n2 = []);
-    const i2 = { isSql: true, optionTableHeight: 0, rowKeyProp: Q.props.dataOrigin.principalLinkage, extraParam: { beanName: G.beanName, functionCode: t2 + ".listData", tableName: ee, systemCode: e3, pageCode: G.code, pageVersion: G.version }, initSearchForm: n2, lineEditOptions: { aftersaveIsCreateRow: false, autoSave: false, enter: he, esc: Ce }, indexContinuous: !(!Q.props || !Q.props.otherSettings) && Q.props.otherSettings.serialNumberContinuous, initSearch: !Q.props || false !== Q.props.dataOrigin.initializationQuery, resizeHeight: Re, pageCode: G.code, pageVersion: G.version, additionalParamMap: I(G), showOverflowTooltip: !(!Q.props || !Q.props.otherSettings || void 0 !== Q.props.otherSettings.isBreakLine && false !== Q.props.otherSettings.isBreakLine), isEnableEnterEvent: Q.props && Q.props.otherSettings && Q.props.otherSettings.isEnableEnterEvent, isWithDataPermission: !!(Q.props && Q.props.otherSettings && Q.props.otherSettings.isWithDataPermission) && Q.props.otherSettings.isWithDataPermission, pageDevMode: false, isWorkflowEntity: T(G), tableClass: X, tableStyle: K, pageContext: G, configureObj: Q, backendUrl: te, cellStyleRender: ze, rowStyleRender: Ae, titleStyleRender: We };
+    const i2 = { isSql: true, optionTableHeight: 0, rowKeyProp: Q.props.dataOrigin.principalLinkage, extraParam: { beanName: G.beanName, functionCode: t2 + ".listData", tableName: ee, systemCode: e3, pageCode: G.code, pageVersion: G.version }, initSearchForm: n2, lineEditOptions: { aftersaveIsCreateRow: false, autoSave: false, enter: he, esc: ye }, indexContinuous: !(!Q.props || !Q.props.otherSettings) && Q.props.otherSettings.serialNumberContinuous, initSearch: !Q.props || false !== Q.props.dataOrigin.initializationQuery, resizeHeight: Re, pageCode: G.code, pageVersion: G.version, additionalParamMap: I(G), showOverflowTooltip: !(!Q.props || !Q.props.otherSettings || void 0 !== Q.props.otherSettings.isBreakLine && false !== Q.props.otherSettings.isBreakLine), isEnableEnterEvent: Q.props && Q.props.otherSettings && Q.props.otherSettings.isEnableEnterEvent, isWithDataPermission: !!(Q.props && Q.props.otherSettings && Q.props.otherSettings.isWithDataPermission) && Q.props.otherSettings.isWithDataPermission, pageDevMode: false, isWorkflowEntity: T(G), tableClass: X, tableStyle: K, pageContext: G, configureObj: Q, backendUrl: te, cellStyleRender: ze, rowStyleRender: Ae, titleStyleRender: We };
     (function(e4) {
       var _a;
       ((_a = Q.props.highOrder) == null ? void 0 : _a.mergeFields) && Q.props.highOrder.mergeFields.length > 0 && (e4.mergeFields = Q.props.highOrder.mergeFields.join(","));
@@ -86,7 +86,7 @@ const A = ["id"], z = e({ __name: "main-table-runtime", props: { pageContext: {}
   function be(e3, t2, n2, o2, i2) {
     const a2 = ne.value.lineEditSave, l2 = Q;
     a2.props.base.tableUuid = l2.uuid, ie.value.lineEditOptions.beforeSave = Se, G.editData = n2, p({ pageContext: G, configureObj: a2 }).then((l3) => {
-      true === l3.canExecute && (ie.value.lineEditOptions.saveRow = ye, le.value.saveRow(i2, ue).then(() => {
+      true === l3.canExecute && (ie.value.lineEditOptions.saveRow = Ce, le.value.saveRow(i2, ue).then(() => {
         d(G, a2, { originalValue: e3, formatValue: t2, row: n2, column: o2, rowIndex: i2 });
       }));
     }).finally(() => {
@@ -96,20 +96,20 @@ const A = ["id"], z = e({ __name: "main-table-runtime", props: { pageContext: {}
   function we(e3) {
     if (!e3) return;
     let t2;
-    const n2 = C(e3.events, "click");
+    const n2 = y(e3.events, "click");
     if (n2) {
       if (ne.value[n2] = e3, "lineEditSave" === n2 ? t2 = be : "restoreEdit" === n2 ? t2 = xe : "lineEditUpdate" === n2 ? t2 = De : "lineEditDelete" === n2 && (t2 = Oe), !t2) {
         t2 = x(G, e3.events, "click");
       }
     } else ne.value[e3.uuid] = e3, t2 = Ve;
-    return t2;
+    return { onClick: t2, eventName: n2 };
   }
   function Se({ row: e3, columns: t2, additionalParamMap: n2 }) {
     const o2 = ne.value.lineEditSave, i2 = Q;
     o2.props.base.tableUuid = i2.uuid;
     return f(G, o2, { row: e3, columns: t2 });
   }
-  function ye({ row: e3, columns: t2, dataTypeMap: n2, dynamicColumnInfo: o2, additionalParamMap: i2, mainDefaultValueColumns: a2 }) {
+  function Ce({ row: e3, columns: t2, dataTypeMap: n2, dynamicColumnInfo: o2, additionalParamMap: i2, mainDefaultValueColumns: a2 }) {
     const l2 = ne.value.lineEditSave, r2 = Q;
     return l2.props.base.tableUuid = r2.uuid, new Promise((t3, n3) => {
       const i3 = { tableName: r2.props.dataOrigin.tableName };
@@ -120,7 +120,7 @@ const A = ["id"], z = e({ __name: "main-table-runtime", props: { pageContext: {}
       });
     });
   }
-  function Ce({ rowIndex: e3, column: t2, row: n2, orgRow: o2 }) {
+  function ye({ rowIndex: e3, column: t2, row: n2, orgRow: o2 }) {
     xe(null, null, n2, t2, e3);
   }
   function xe(e3, t2, n2, o2, i2) {
@@ -246,7 +246,7 @@ const A = ["id"], z = e({ __name: "main-table-runtime", props: { pageContext: {}
     S(G, Q, { row: e3, column: t2, event: n2 });
   }
   function $e(e3, t2) {
-    y(G, Q, { column: e3, event: t2 });
+    C(G, Q, { column: e3, event: t2 });
   }
   function _e() {
     ce.value = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-runtime",
-  "version": "2.2.90",
+  "version": "2.2.91-sit1",
   "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.31",
+    "agilebuilder-ui": "1.1.33-sit1",
     "axios": "^1.6.8",
     "cypress": "^13.6.6",
     "element-plus": "^2.6.1",