super-page-runtime 2.1.48 → 2.1.50

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

@@ -1,13 +1,14 @@
 import { defineComponent, ref, onMounted, watch, onUnmounted, resolveComponent, openBlock, createElementBlock, createVNode, unref } from "vue";
 import "agilebuilder-ui";
-import { setTableEvents, getEventFuncByType, canExecuteButton, doAfterClickEvent, getEventNameByType, doBeforeClickEvent, getHandleEvent, gridSelectRecord, gridSelectAllRecords, gridSelectionChange, cellClick, cellDblClick, rowClick, rowDblClick, headerClick } from "../../../../utils/events/event-util.js";
+import { setTableEvents, canExecuteButton, doAfterClickEvent, getEventNameByType, doBeforeClickEvent, getHandleEvent, gridSelectRecord, gridSelectAllRecords, gridSelectionChange, cellClick, cellDblClick, rowClick, rowDblClick, headerClick } from "../../../../utils/events/event-util.js";
 import { getBaseUrl, getListCode, getRealRestApiPath } from "../../../../utils/common-util.js";
 import { getAdditionalParamMap, getSaveFormRequestWithRow, standardEvents } from "../../../../utils/events/standard-event.js";
 import { isPromise } from "agilebuilder-ui/src/utils/common-util";
 import { getDataTypeMapRequest, popupToPage } from "../../../../utils/table-utils.js";
 import eventBus from "../../../../utils/eventBus.js";
 import { getPermissionCodes, getDefaultValue } from "../../../../utils/page-init-util.js";
-import { getSizeConfig } from "../../../../utils/page-helper-util.js";
+import { decomposeVariable, getSizeConfig } from "../../../../utils/page-helper-util.js";
+import { getRowStyleUtil, getCellStyleUtil, getHeaderCellStyleUtil } from "../../chart/table/chart-table-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "main-table-runtime",
   props: {
@@ -88,12 +89,26 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         searchGridData(props.pageContext.entity.data);
       }
     );
-    watch(
-      () => props.pageContext.entity.page,
-      (searchFormData) => {
-        searchGridData(props.pageContext.entity.page);
+    const linkageVariable = [];
+    if (configure.props.linkages && configure.props.linkages.length > 0) {
+      configure.props.linkages.forEach((linkage) => {
+        const variablePath = decomposeVariable(linkage.fieldName);
+        if (variablePath && variablePath.length > 1) {
+          linkageVariable.push(variablePath[1]);
+        }
+      });
+      if (linkageVariable.length > 0) {
+        linkageVariable.forEach((variable) => {
+          watch(
+            () => props.pageContext.entity.page[variable],
+            () => {
+              const values = getLinkageVariableValues();
+              searchGridData(values);
+            }
+          );
+        });
       }
-    );
+    }
     onUnmounted(() => {
       eventBus.$off(eventPageInfo + "-close-component-page-dialog");
       eventBus.$off(eventPageInfo + "_close-dialog-get-entity");
@@ -151,7 +166,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         tableClass: runtimeClass,
         tableStyle: runtimeStyle,
         pageContext,
-        configureObj: configure
+        configureObj: configure,
+        backendUrl: baseURL,
+        cellStyleRender: getCellStyle,
+        rowStyleRender: getRowStyle,
+        titleStyleRender: getTitleStyle
       };
       setOperationButtons(options);
       setSortInfo(options);
@@ -251,10 +270,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const customEvents = pageContext.customEvents;
       if (customEvents) {
         options.eventCallBack = customEvents;
-        const rowStyleEvent = getEventFuncByType(pageContext, tableEvents, "rowStyle");
-        if (rowStyleEvent) {
-          options.rowStyleRender = rowStyleEvent;
-        }
       }
     }
     function enterSave({ rowIndex, column, row, orgRow }) {
@@ -568,8 +583,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         if (!thisRefDom) {
           thisRefDom = gridRef.value;
         }
-        const parentNode = thisRefDom.parentNode;
-        if (!thisRefDom || !parentNode) {
+        if (!thisRefDom) {
           return;
         }
         const rect = thisRefDom.getBoundingClientRect();
@@ -698,6 +712,24 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function canShowMobileSearch(listCode2) {
       isCanShowMobileSearch.value = true;
     }
+    function getLinkageVariableValues() {
+      const values = {};
+      linkageVariable.forEach((variable) => {
+        values[variable] = props.pageContext.entity.page[variable];
+      });
+      return values;
+    }
+    function getRowStyle(data) {
+      return getRowStyleUtil(data, null, props);
+    }
+    function getCellStyle(data) {
+      return getCellStyleUtil(data, data.cellStyle, props);
+    }
+    function getTitleStyle(data) {
+      const cellTitleStyle = data.titleStyle;
+      const rowTitleStyle = props.configure.style.titleStyle;
+      return getHeaderCellStyleUtil(data, { cellTitleStyle, titleStyle: rowTitleStyle }, props);
+    }
     __expose({
       refresh,
       createRow,

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

@@ -4,8 +4,9 @@ import { getSizeConfig, getVariableValue, setVariableValue } from "../../../../u
 import { getModelFields, getDefaultValue } from "../../../../utils/page-init-util.js";
 import eventBus from "../../../../utils/eventBus.js";
 import { popupToPage } from "../../../../utils/table-utils.js";
-import { getListCode } from "../../../../utils/common-util.js";
+import { getListCode, getBaseUrl } from "../../../../utils/common-util.js";
 import { getAdditionalParamMap } from "../../../../utils/events/standard-event.js";
+import { getRowStyleUtil, getCellStyleUtil, getHeaderCellStyleUtil } from "../../chart/table/chart-table-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "sub-table-runtime",
   props: {
@@ -30,9 +31,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const runtimeClass = runtimeInfo.class;
     const entity = props.pageContext.entity ? props.pageContext.entity : {};
     let dynamicFields = getModelFields(props.configure, prop);
+    let baseURL = getBaseUrl(pageContext.backendUrl, pageContext.isTest);
+    if (!baseURL) {
+      baseURL = window["$vueApp"].config.globalProperties.baseURL;
+    }
     const listViewShowFlag = ref(false);
     let componentKey = ref(0);
-    const baseURL = window["$vueApp"].config.globalProperties.baseURL;
     const listViewOptions = ref({
       isSql: true,
       subTableData: null,
@@ -44,8 +48,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       pageContext,
       configureObj: configure,
       showPageArea: false,
-      showOverflowTooltip: !!(configure.props && configure.props.otherSettings && (configure.props.otherSettings.isBreakLine === void 0 || configure.props.otherSettings.isBreakLine === false))
+      showRowForm: false,
+      showOverflowTooltip: !!(configure.props && configure.props.otherSettings && (configure.props.otherSettings.isBreakLine === void 0 || configure.props.otherSettings.isBreakLine === false)),
       // 单元格内容是否换行显示
+      backendUrl: baseURL,
+      cellStyleRender: getCellStyle,
+      rowStyleRender: getRowStyle,
+      titleStyleRender: getTitleStyle
     });
     if (runtimeStyle) {
       listViewOptions.value["tableStyle"] = runtimeStyle;
@@ -58,6 +67,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     } else {
       listViewOptions.value.showPageArea = false;
     }
+    if (configure.props.base.showRowForm) {
+      listViewOptions.value.showRowForm = configure.props.base.showRowForm;
+    }
     const gridRef = ref(null);
     onMounted(() => {
       const tableUuid = configure.uuid;
@@ -112,6 +124,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       listViewOptions.value["getFormData"] = getParentFormData;
       listViewOptions.value["getGridData"] = getGridData;
       listViewOptions.value.extraParam["subTableListViewCode"] = listCode;
+      listViewOptions.value.extraParam["beanName"] = pageContext.beanName;
       listViewOptions.value.extraParam["subtableSetting"] = configure.props && configure.props.otherSettings ? JSON.stringify(configure.props.otherSettings) : null;
       listViewOptions.value.extraParam["additionalParamMap"] = additionalParamMap;
       listViewOptions.value.extraParam["entityMap"] = pageContext.entity.data;
@@ -483,6 +496,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       }, 10);
     }
+    function getRowStyle(data) {
+      return getRowStyleUtil(data, null, props);
+    }
+    function getCellStyle(data) {
+      return getCellStyleUtil(data, data.cellStyle, props);
+    }
+    function getTitleStyle(data) {
+      const cellTitleStyle = data.titleStyle;
+      const rowTitleStyle = props.configure.style.titleStyle;
+      return getHeaderCellStyleUtil(data, { cellTitleStyle, titleStyle: rowTitleStyle }, props);
+    }
     __expose({
       createRow,
       getSelections,
@@ -500,7 +524,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           key: 0,
           ref_key: "gridRef",
           ref: gridRef,
-          url: unref(baseURL) + "/common/super-forms/sub-table",
+          url: unref(baseURL) + "/dsc/commons/sub-table",
           options: listViewOptions.value,
           code: unref(listCode),
           settings: unref(superGridSetting),

package/dist/es/components/runtime/views/assemblys/form/input-text/inputtext-runtime.vue2.js

@@ -66,7 +66,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       userAgent = "browser";
     }
     console.log("window.location.protocol---", window.location.protocol);
-    const isShowScanIcon = ref(isMobile.value && scanEnable.value && window.location.protocol === "https:" ? true : false);
+    const isShowScanIcon = ref(
+      isMobile.value && scanEnable.value && window.location.protocol === "https:" ? true : false
+    );
     const isApk = isMobile.value && userAgent && userAgent === "app" ? true : false;
     let scanRuleSets = {};
     if (((_b = designProperty.value.scan) == null ? void 0 : _b.enable) && ((_c = designProperty.value.scan.ruleList) == null ? void 0 : _c.length) > 0) {

package/dist/es/components/runtime/views/super-page-dialog.vue.d.ts

@@ -12,6 +12,10 @@ interface MyProps {
         default: null;
     };
     isTest?: boolean;
+    customParams: {
+        type: Object;
+        default: null;
+    };
 }
 declare const _default: import('vue').DefineComponent<__VLS_TypePropsToRuntimeProps<MyProps>, {}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     close: (...args: any[]) => void;

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

@@ -8,7 +8,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     parentPageContext: {},
     parentPageEventParams: {},
     jumpPageSetting: {},
-    isTest: { type: Boolean }
+    isTest: { type: Boolean },
+    customParams: {}
   },
   emits: ["open", "opened", "close", "closed"],
   setup(__props, { emit: __emit }) {
@@ -65,6 +66,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       pageRequest.value["jumpMode"] = myJumpPageSetting ? myJumpPageSetting["jumpMode"] : null;
       pageRequest.value["id"] = dataId.value;
       pageRequest.value["taskId"] = taskId.value;
+      if (props.customParams) {
+        Object.assign(pageRequest.value, props.customParams);
+      }
     }
     return (_ctx, _cache) => {
       const _component_el_drawer = resolveComponent("el-drawer");

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

@@ -8,8 +8,8 @@ import _sfc_main$2 from "./assemblys/common/export-form-report-dialog.vue.js";
 import _sfc_main$3 from "./assemblys/common/task-informition-dialog.vue.js";
 import _sfc_main$4 from "./assemblys/common/remove-signer-dialog.vue.js";
 import eventBus from "../utils/eventBus.js";
-import { getFormData } from "../utils/api/api-util.js";
-import { getTaskInformitions, getRemoveSigner, exportFormReport, doImportFinally, doAddSigner, doCreateCopyTask, doAssign, doReturnTaskTo, doRemoveSigners, updateValuesWhenCloseDialog, refreshFormOrListPage, getAdditionalParamMap } from "../utils/events/standard-event.js";
+import { getTaskInformitions, getRemoveSigner, getFormData, exportFormReport, doImportFinally, doAddSigner, doCreateCopyTask, doAssign, doReturnTaskTo, doRemoveSigners, updateValuesWhenCloseDialog, refreshFormOrListPage, getAdditionalParamMap } from "../utils/events/standard-event.js";
+import "../utils/api/api-util.js";
 import { ElMessage } from "element-plus";
 import { useI18n } from "vue-i18n";
 import { DepartmentUserTree } from "agilebuilder-ui";
@@ -484,6 +484,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   popPageSetting.dialogType = "drawer";
                   popPageSetting.jumpPageWidth = "100%";
                 }
+                debugger;
                 jumpPageSetting.value = popPageSetting;
                 isShowDialog.value = true;
               } else if (jumpMode === "refresh") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-runtime",
-  "version": "2.1.48",
+  "version": "2.1.50",
   "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.0.83",
+    "agilebuilder-ui": "1.0.86",
     "axios": "^1.6.8",
     "cypress": "^13.6.6",
     "element-plus": "^2.6.1",