super-page-runtime 2.0.49-beta1 → 2.0.52

package/dist/es/components/runtime/utils/assemblys-config.js

@@ -188,6 +188,12 @@ const assemblyGroups = [
       runtimeComponent: defineAsyncComponent(() => {
         return import("../views/assemblys/button/print-label/printlabel-runtime.vue.js");
       })
+    }, {
+      name: "export-pdf",
+      label: "打印标签",
+      runtimeComponent: defineAsyncComponent(() => {
+        return import("../views/assemblys/button/export-pdf/exportpdf-runtime.vue.js");
+      })
     }]
   },
   {

package/dist/es/components/runtime/utils/common-util.d.ts

@@ -1,6 +1,6 @@
 export declare function isArrayFn(value: any): boolean;
 export declare function getBaseUrl(backendUrl: any, isTest?: boolean): any;
-export declare function getRealRestApiPath(orgRestApiPath: any, systemCode: any, backendUrl: any): any;
+export declare function getRealRestApiPath(orgRestApiPath: any, systemCode: any, backendUrl: any, isTest?: boolean): any;
 /**
  * 封装模板文件列表
  * @param templateFiles

package/dist/es/components/runtime/utils/common-util.js

@@ -18,11 +18,11 @@ function getBaseUrl(backendUrl, isTest) {
     return baseUrl;
   }
 }
-function getRealRestApiPath(orgRestApiPath, systemCode, backendUrl) {
+function getRealRestApiPath(orgRestApiPath, systemCode, backendUrl, isTest) {
   let path = orgRestApiPath;
   if (orgRestApiPath) {
     if (backendUrl && !isFullPath(orgRestApiPath)) {
-      const baseUrl = getBaseUrl(backendUrl);
+      const baseUrl = getBaseUrl(backendUrl, isTest);
       path = baseUrl + "/" + systemCode + orgRestApiPath;
     }
   }

package/dist/es/components/runtime/utils/events/print-label.js

@@ -1,6 +1,7 @@
 import http from "agilebuilder-ui/src/utils/request";
-import { hiprint } from "vue-plugin-hiprint";
+import { disAutoConnect, hiprint } from "vue-plugin-hiprint";
 import { generateCodeByRule } from "../barcode-util.js";
+disAutoConnect();
 function printLabel(params, templateUuid) {
   http.post(window["$vueApp"].config.globalProperties.baseAPI + "/dc/print-models/by-codes", [
     templateUuid

package/dist/es/components/runtime/utils/events/standard-event.js

@@ -35,7 +35,9 @@ const standardEvents = {
   exportPDF: function(params) {
     console.log("表单标准事件导出报告exportPDF--params=", params);
     const pageContext = params.pageContext;
-    pageContext.code;
+    const pagCode = pageContext.code;
+    const eventPageInfo = pagCode + "_";
+    eventBus.$emit(eventPageInfo + "export-pdf-report", params);
   },
   // 表单标准事件提交submit
   submit: function(params) {
@@ -275,8 +277,10 @@ function exportFormReport(pageContext, configureObj, templateFile, isPdf) {
   const additionalParamMap = getAdditionalParamMap(pageContext);
   param["additionalParamMap"] = additionalParamMap;
   let exportResult;
-  {
-    exportResult = exportFormReportSuccess(fileName, backendUrl, param);
+  if (isPdf) {
+    exportResult = exportFormPdf(fileName, backendUrl, param, pageContext.isTest);
+  } else {
+    exportResult = exportFormReportSuccess(fileName, backendUrl, param, pageContext.isTest);
   }
   if (exportResult) {
     exportResult.then(() => {
@@ -284,9 +288,9 @@ function exportFormReport(pageContext, configureObj, templateFile, isPdf) {
     });
   }
 }
-function exportFormReportSuccess(fileName, backendUrl, param) {
+function exportFormReportSuccess(fileName, backendUrl, param, isTest) {
   return new Promise((resolve, reject) => {
-    const baseUrl = getBaseUrl(backendUrl);
+    const baseUrl = getBaseUrl(backendUrl, isTest);
     const path = baseUrl + "/dsc/commons/export-reports";
     axios.defaults.headers.common.Authorization = getToken();
     const request = axios.post(path, param, {
@@ -316,6 +320,34 @@ function exportFormReportSuccess(fileName, backendUrl, param) {
     });
   });
 }
+function exportFormPdf(fileName, backendUrl, param, isTest) {
+  return new Promise((resolve, reject) => {
+    const baseUrl = getBaseUrl(backendUrl, isTest);
+    const path = baseUrl + "/dsc/commons/export-pdf";
+    axios.defaults.headers.common.Authorization = getToken();
+    const request = axios.post(path, param, {
+      headers: {
+        "content-type": "application/json"
+      },
+      responseType: "blob"
+    });
+    request.then((response) => {
+      const blob = new Blob([response.data]);
+      const elink = document.createElement("a");
+      elink.download = fileName.substring(0, fileName.lastIndexOf(".")) + ".pdf";
+      elink.style.display = "none";
+      elink.target = "_blank";
+      elink.href = URL.createObjectURL(blob);
+      document.body.appendChild(elink);
+      elink.click();
+      URL.revokeObjectURL(elink.href);
+      document.body.removeChild(elink);
+      resolve(true);
+    }).catch((error) => {
+      reject(error);
+    });
+  });
+}
 function saveFunc(params, isListButton) {
   return new Promise((resolve, reject) => {
     const pageContext = params.pageContext;
@@ -432,7 +464,7 @@ function getSaveFormRequestWithRow(pageContext, configureObj, url, isUnControlVe
       param.tableName = otherParams.tableName;
     }
   }
-  return getSaveFormRequestByParam(systemCode, backendUrl, param, url, pageContext.entity.data);
+  return getSaveFormRequestByParam(systemCode, backendUrl, param, url, pageContext.entity.data, pageContext.isTest);
 }
 function getSaveFormRequest(pageContext, configureObj, url, isUnControlVersion, mainDefaultValueColumns, dynamicColumnInfo) {
   return getSaveFormRequestWithRow(
@@ -446,10 +478,10 @@ function getSaveFormRequest(pageContext, configureObj, url, isUnControlVersion,
     null
   );
 }
-function getSaveFormRequestByParam(systemCode, backendUrl, param, url, formData) {
-  const baseUrl = getBaseUrl(backendUrl);
+function getSaveFormRequestByParam(systemCode, backendUrl, param, url, formData, isTest) {
+  const baseUrl = getBaseUrl(backendUrl, isTest);
   let path = baseUrl + url;
-  path = getRealRestApiPath(path, systemCode, backendUrl);
+  path = getRealRestApiPath(path, systemCode, backendUrl, isTest);
   let request;
   if (formData && (formData.id || formData.ID)) {
     request = http.put(path, param);
@@ -683,9 +715,9 @@ function getSubmitFormRequest(pageContext, configureObj, url, isUnControlVersion
         ids2,
         null
       );
-      const baseUrl = getBaseUrl(backendUrl);
+      const baseUrl = getBaseUrl(backendUrl, pageContext.isTest);
       let path = baseUrl + url;
-      path = getRealRestApiPath(path, systemCode, backendUrl);
+      path = getRealRestApiPath(path, systemCode, backendUrl, pageContext.isTest);
       http.post(path, param).then((result) => {
         resolve(result);
       }).catch((error) => {
@@ -722,9 +754,9 @@ function deleteFunc(params) {
       const configureBase = configureObj.props.base;
       const systemCode = pageContext.systemCode;
       const backendUrl = pageContext.backendUrl;
-      const baseUrl = getBaseUrl(backendUrl);
+      const baseUrl = getBaseUrl(backendUrl, pageContext.isTest);
       let path = baseUrl + "/dsc/commons/" + tableName;
-      path = getRealRestApiPath(path, systemCode, backendUrl);
+      path = getRealRestApiPath(path, systemCode, backendUrl, pageContext.isTest);
       const isPermission = configureBase.isPermission === void 0 || configureBase.isPermission === "true" || configureBase.isPermission;
       const isWorkflow = pageContext.workflowCode ? true : false;
       const functionCodes = getPermissionCodes(configureObj, pageContext);
@@ -833,7 +865,7 @@ function downloadTemplateFunc(params) {
     const isPermission = configureBase.isPermission === void 0 || configureBase.isPermission === "true" || configureBase.isPermission;
     param += "&isPermission=" + isPermission;
   }
-  const baseUrl = getBaseUrl(backendUrl);
+  const baseUrl = getBaseUrl(backendUrl, pageContext.isTest);
   window.open(baseUrl + "/dsc/commons/download-files" + param);
 }
 function doImportFinally(params, fileObj) {
@@ -891,9 +923,9 @@ function doImportFinally(params, fileObj) {
   param.append("isPermission", isPermission + "");
   const systemCode = pageContext.systemCode;
   const backendUrl = pageContext.backendUrl;
-  const baseUrl = getBaseUrl(backendUrl);
+  const baseUrl = getBaseUrl(backendUrl, pageContext.isTest);
   let path = baseUrl + "/dsc/commons/import-data";
-  path = getRealRestApiPath(path, systemCode, backendUrl);
+  path = getRealRestApiPath(path, systemCode, backendUrl, pageContext.isTest);
   http.post(path, param).then((data) => {
     if (isAsync) {
       ElMessage({
@@ -1076,8 +1108,8 @@ function workflowSaveFunc(params) {
     const dataModel = pageContext.entity.data;
     const systemCode = pageContext.systemCode;
     const backendUrl = pageContext.backendUrl;
-    let path = getBaseUrl(backendUrl) + "/dsc/workflow-commons";
-    path = getRealRestApiPath(path, systemCode, backendUrl);
+    let path = getBaseUrl(backendUrl, pageContext.isTest) + "/dsc/workflow-commons";
+    path = getRealRestApiPath(path, systemCode, backendUrl, pageContext.isTest);
     if (!path) {
       ElMessage({
         showClose: true,
@@ -1169,8 +1201,8 @@ function submitProcessFunc(params) {
     const pageContext = params.pageContext;
     const systemCode = pageContext.systemCode;
     const backendUrl = pageContext.backendUrl;
-    let path = getBaseUrl(backendUrl) + "/dsc/workflow-commons/submit";
-    path = getRealRestApiPath(path, systemCode, backendUrl);
+    let path = getBaseUrl(backendUrl, pageContext.isTest) + "/dsc/workflow-commons/submit";
+    path = getRealRestApiPath(path, systemCode, backendUrl, pageContext.isTest);
     if (!path) {
       ElMessage({
         showClose: true,
@@ -1206,8 +1238,8 @@ function completeTaskFunc(params, operationResult) {
     const pageContext = params.pageContext;
     const systemCode = pageContext.systemCode;
     const backendUrl = pageContext.backendUrl;
-    let path = getBaseUrl(backendUrl) + "/dsc/workflow-commons/complete-tasks";
-    path = getRealRestApiPath(path, systemCode, backendUrl);
+    let path = getBaseUrl(backendUrl, pageContext.isTest) + "/dsc/workflow-commons/complete-tasks";
+    path = getRealRestApiPath(path, systemCode, backendUrl, pageContext.isTest);
     if (!path) {
       ElMessage({
         showClose: true,
@@ -1252,7 +1284,7 @@ function doAssign(params, selectNodeInfo) {
     const pageContext = params.pageContext;
     const configureObj = params.configureObj;
     const backendUrl = pageContext.backendUrl;
-    const path = getBaseUrl(backendUrl) + "/dsc/workflow-commons/assigns";
+    const path = getBaseUrl(backendUrl, pageContext.isTest) + "/dsc/workflow-commons/assigns";
     const assigneeId = selectNodeInfo.id ? selectNodeInfo.id : selectNodeInfo.ID ? selectNodeInfo.ID : null;
     const requestParam = getWorkflowSaveParams(params);
     requestParam["assigneeId"] = assigneeId;
@@ -1313,8 +1345,8 @@ function doAddSigner(params, selectNodeInfo) {
     const buttonConfigureObj = params.configureObj;
     const systemCode = pageContext.systemCode;
     const backendUrl = pageContext.backendUrl;
-    let path = getBaseUrl(backendUrl) + "/dsc/workflow-commons/add-signers";
-    path = getRealRestApiPath(path, systemCode, backendUrl);
+    let path = getBaseUrl(backendUrl, pageContext.isTest) + "/dsc/workflow-commons/add-signers";
+    path = getRealRestApiPath(path, systemCode, backendUrl, pageContext.isTest);
     if (!path) {
       ElMessage({
         showClose: true,
@@ -1353,8 +1385,8 @@ function doCreateCopyTask(params, selectNodeInfo) {
     const buttonConfigureObj = params.configureObj;
     const systemCode = pageContext.systemCode;
     const backendUrl = pageContext.backendUrl;
-    let path = getBaseUrl(backendUrl) + "/dsc/workflow-commons/add-signers";
-    path = getRealRestApiPath(path, systemCode, backendUrl);
+    let path = getBaseUrl(backendUrl, pageContext.isTest) + "/dsc/workflow-commons/add-signers";
+    path = getRealRestApiPath(path, systemCode, backendUrl, pageContext.isTest);
     if (!path) {
       ElMessage({
         showClose: true,
@@ -1383,7 +1415,7 @@ function transactTask(params, requestParam, path, successMessageTip) {
     const pageContext = params.pageContext;
     const systemCode = pageContext.systemCode;
     const backendUrl = pageContext.backendUrl;
-    path = getRealRestApiPath(path, systemCode, backendUrl);
+    path = getRealRestApiPath(path, systemCode, backendUrl, pageContext.isTest);
     if (!path) {
       ElMessage({
         showClose: true,
@@ -1416,14 +1448,14 @@ function transactTask(params, requestParam, path, successMessageTip) {
 function drawTaskFunc(params) {
   const pageContext = params.pageContext;
   const backendUrl = pageContext.backendUrl;
-  const path = getBaseUrl(backendUrl) + "/dsc/workflow-commons/draw-tasks";
+  const path = getBaseUrl(backendUrl, pageContext.isTest) + "/dsc/workflow-commons/draw-tasks";
   const requestParam = getWorkflowSaveParams(params);
   return transactTask(params, requestParam, path, "superPageRuntimeMessage.successfulDrawTask");
 }
 function abandonReceiveFunc(params) {
   const pageContext = params.pageContext;
   const backendUrl = pageContext.backendUrl;
-  const path = getBaseUrl(backendUrl) + "/dsc/workflow-commons/abandon-receives";
+  const path = getBaseUrl(backendUrl, pageContext.isTest) + "/dsc/workflow-commons/abandon-receives";
   const requestParam = getWorkflowSaveParams(params);
   return transactTask(
     params,
@@ -1435,7 +1467,7 @@ function abandonReceiveFunc(params) {
 function returnToPreviousTaskFunc(params) {
   const pageContext = params.pageContext;
   const backendUrl = pageContext.backendUrl;
-  const path = getBaseUrl(backendUrl) + "/dsc/workflow-commons/return-to-previous-tasks";
+  const path = getBaseUrl(backendUrl, pageContext.isTest) + "/dsc/workflow-commons/return-to-previous-tasks";
   const requestParam = getWorkflowSaveParams(params);
   return transactTask(
     params,
@@ -1447,7 +1479,7 @@ function returnToPreviousTaskFunc(params) {
 function endInstanceFunc(params) {
   const pageContext = params.pageContext;
   const backendUrl = pageContext.backendUrl;
-  const path = getBaseUrl(backendUrl) + "/dsc/workflow-commons/end-instance";
+  const path = getBaseUrl(backendUrl, pageContext.isTest) + "/dsc/workflow-commons/end-instance";
   const requestParam = getWorkflowSaveParams(params);
   return transactTask(params, requestParam, path, "superPageRuntimeMessage.successfulEndInstance");
 }
@@ -1462,8 +1494,8 @@ function getTaskInformitions(params) {
   const systemCode = pageContext.systemCode;
   const backendUrl = pageContext.backendUrl;
   const completeTaskParam = pageContext.completeTaskParam;
-  let path = getBaseUrl(backendUrl) + "/dsc/workflow-commons/returnable-task/" + completeTaskParam.taskId;
-  path = getRealRestApiPath(path, systemCode, backendUrl);
+  let path = getBaseUrl(backendUrl, pageContext.isTest) + "/dsc/workflow-commons/returnable-task/" + completeTaskParam.taskId;
+  path = getRealRestApiPath(path, systemCode, backendUrl, pageContext.isTest);
   if (!path) {
     ElMessage({
       showClose: true,
@@ -1486,7 +1518,7 @@ function doReturnTaskTo(params, selectTaskNode) {
   const pageContext = params.pageContext;
   const configureObj = params.configureObj;
   const backendUrl = pageContext.backendUrl;
-  const path = getBaseUrl(backendUrl) + "/dsc/workflow-commons/returnTaskTo";
+  const path = getBaseUrl(backendUrl, pageContext.isTest) + "/dsc/workflow-commons/returnTaskTo";
   const requestParam = getWorkflowSaveParams(params);
   if (selectTaskNode.nodeName) {
     requestParam["returnToNodeName"] = selectTaskNode.nodeName;
@@ -1510,9 +1542,9 @@ function getRemoveSigner(params) {
   const pageContext = params.pageContext;
   const systemCode = pageContext.systemCode;
   const backendUrl = pageContext.backendUrl;
-  let path = getBaseUrl(backendUrl) + "/dsc/workflow-commons/get-remove-signers";
+  let path = getBaseUrl(backendUrl, pageContext.isTest) + "/dsc/workflow-commons/get-remove-signers";
   const requestParam = getWorkflowSaveParams(params);
-  path = getRealRestApiPath(path, systemCode, backendUrl);
+  path = getRealRestApiPath(path, systemCode, backendUrl, pageContext.isTest);
   if (!path) {
     ElMessage({
       showClose: true,
@@ -1529,8 +1561,8 @@ function doRemoveSigners(params, selectRemoveTasks) {
     const configureObj = params.configureObj;
     const systemCode = pageContext.systemCode;
     const backendUrl = pageContext.backendUrl;
-    let path = getBaseUrl(backendUrl) + "/dsc/workflow-commons/remove-signers";
-    path = getRealRestApiPath(path, systemCode, backendUrl);
+    let path = getBaseUrl(backendUrl, pageContext.isTest) + "/dsc/workflow-commons/remove-signers";
+    path = getRealRestApiPath(path, systemCode, backendUrl, pageContext.isTest);
     if (!path) {
       this.$message({
         showClose: true,
@@ -1560,7 +1592,7 @@ function doRemoveSigners(params, selectRemoveTasks) {
 function retrieveTaskFunc(params) {
   const pageContext = params.pageContext;
   const backendUrl = pageContext.backendUrl;
-  const path = getBaseUrl(backendUrl) + "/dsc/workflow-commons/retrieves";
+  const path = getBaseUrl(backendUrl, pageContext.isTest) + "/dsc/workflow-commons/retrieves";
   const requestParam = getWorkflowSaveParams(params);
   return transactTask(params, requestParam, path, "superPageRuntimeMessage.successfulRetrieve");
 }

package/dist/es/components/runtime/utils/events/validator-util.js

@@ -74,10 +74,25 @@ function getEndObjectRule(rule, props, currentProp) {
 }
 function getValidator(columns) {
   const rules = {};
+  if (columns) {
+    columns.forEach((editField) => {
+      const prop = editField.model;
+      if (prop && editField.validations) {
+        const validations = editField.validations;
+        if (prop.indexOf(".") > 0) {
+          setObjectPropRule(editField.prop, rules, validations);
+        } else {
+          if (validations && validations.length > 0) {
+            rules[prop] = [...validations];
+          }
+        }
+      }
+    });
+  }
   return rules;
 }
 function validator(entity, rules, columns, rowIndex, isSql) {
-  return validatorEntity(entity, rules, columns, rowIndex, true);
+  return validatorEntity(entity, rules, columns, rowIndex, true, isSql);
 }
 function sublistVerify(rules) {
   if (!rules) {
@@ -103,7 +118,7 @@ function sublistVerify(rules) {
 function validatorEntity(entity, rules, columns, rowIndex, isShouldRepeateValdate, isSql) {
   let validateRules = sublistVerify(rules);
   if ((!rules || rules === null) && columns) {
-    validateRules = getValidator();
+    validateRules = getValidator(columns);
   }
   if (!validateRules || Object.keys(validateRules).length === 0) {
     entity["validateErrorField"] = "";
@@ -121,6 +136,11 @@ function validatorEntity(entity, rules, columns, rowIndex, isShouldRepeateValdat
       if (errors) {
         result = errors[0].message;
         fieldName = errors[0]["field"];
+        if (typeof rowIndex !== "undefined" && rowIndex !== null) {
+          result = getI18n().t("superPageRuntimeMessage.recordLine", {
+            row: rowIndex + 1
+          }) + "，" + result;
+        }
         ElMessage({
           message: result,
           showClose: true,
@@ -133,11 +153,11 @@ function validatorEntity(entity, rules, columns, rowIndex, isShouldRepeateValdat
       }
       if (fieldName && isShouldRepeateValdate === true) {
         const reg1 = /[A-Z]+/;
-        if (reg1.test(fieldName) && entity[fieldName.toLowerCase()] !== void 0) {
+        if (isSql !== void 0 && isSql === true && reg1.test(fieldName) && entity[fieldName.toLowerCase()] !== void 0) {
           const copyEntity = JSON.parse(JSON.stringify(entity));
           copyEntity[fieldName.toUpperCase()] = entity[fieldName.toLowerCase()];
           delete copyEntity[fieldName.toLowerCase()];
-          result = validatorEntity(copyEntity, rules, columns, rowIndex, false);
+          result = validatorEntity(copyEntity, rules, columns, rowIndex, false, isSql);
         }
       }
     }
@@ -185,7 +205,7 @@ function validateWorkflowFormDataModel(dataModel, pageContext) {
     if (!rules || Object.keys(rules).length === 0) {
       result = true;
     } else {
-      result = validator(handleModels, rules, null, null);
+      result = validator(handleModels, rules, null, null, true);
     }
     if (result === true) {
       const workflowFieldPermissionRules = pageContext.workflowRules;
@@ -249,7 +269,7 @@ function validateCommonFormDataModel(dataModel, pageContext, rules) {
     if (!rules || Object.keys(rules).length === 0) {
       resolve(handleModels);
     } else {
-      const validateEntityResult = validator(handleModels, rules, null, null);
+      const validateEntityResult = validator(handleModels, rules, null, null, true);
       if (validateEntityResult === true) {
         const validateResult = validateSubTables(pageContext);
         if (validateResult === true) {

package/dist/es/components/runtime/utils/page-helper-util.js

@@ -77,7 +77,8 @@ function getTableQueryInfo(dataOriginInfo, pageContext2) {
           }
         }
       }
-      if (f.propValue) ;
+      if (f.propValue)
+        ;
       searchForm.push(tempObj);
     }
     infoObj.props.searchForm = searchForm;
@@ -242,45 +243,6 @@ function getChartDatasFromPage(pageContext2, configure2) {
 function queryOptionDatasources(pageContext2, dataSourceConf, query) {
   return updateOptionDatasources(pageContext2, dataSourceConf ? [dataSourceConf] : [], query);
 }
-function queryOptions(component, pageContext2, query) {
-  if (!component.props || !component.props.dataOrigin) {
-    return new Promise(function(resolve, reject) {
-      resolve([]);
-    });
-  }
-  const dataOriginInfo = component.props.dataOrigin;
-  if (dataOriginInfo.optionValueSetType == "dynamicData") {
-    if (!dataOriginInfo.dynamicDataSourceCode) {
-      return new Promise(function(resolve, reject) {
-        throw new Error("未指定动态数据源!");
-      });
-    }
-    return queryByDynamicCode(dataOriginInfo.dynamicDataSourceCode, query);
-  } else if (dataOriginInfo.optionValueSetType == "dataTable") {
-    if (!dataOriginInfo.tableName) {
-      return new Promise(function(resolve, reject) {
-        throw new Error("未指定查询的数据表!");
-      });
-    }
-    const tempObj = getTableQueryInfo(dataOriginInfo, pageContext2);
-    return queryByTable(tempObj);
-  } else {
-    return new Promise(function(resolve, reject) {
-      throw new Error("无有效的查询设置!");
-    });
-  }
-}
-function queryByDynamicCode(dynamicCode, query) {
-  const param = {
-    code: dynamicCode,
-    query
-  };
-  return http.post("", param);
-}
-function queryByTable(tableQueryInfo) {
-  const param = tableQueryInfo.props;
-  return http.post("", param);
-}
 function autoSetAfterSelect(component, pageContext2, autoSets, selItems) {
   if (!autoSets || autoSets.length == 0) {
     return;
@@ -668,7 +630,6 @@ export {
   getVariableValue,
   monitorFieldChange,
   queryOptionDatasources,
-  queryOptions,
   setValueForVariableName,
   setVariableValue,
   setVariableValueWithProp,

package/dist/es/components/runtime/utils/page-init-util.js

@@ -3,6 +3,7 @@ import { useRoute } from "vue-router";
 import { getAdditionalParamMap } from "./events/standard-event.js";
 import { PageDimensions } from "./interfaces/page-design-types.js";
 import { formatVariableValue, setVariableValue, getFormPropName } from "./page-helper-util.js";
+import { getSessionCache } from "agilebuilder-ui/src/utils/auth";
 function queryPageDesignByCode(pageCode) {
   return http.get(
     window["$vueApp"].config.globalProperties.baseAPI + "/component/super-page-design/runtime/" + pageCode
@@ -107,9 +108,19 @@ function getRequestObject(pageRequest) {
     }
     if (route.query) {
       Object.assign(requestObj, route.query);
+      const paramStoreId = route.query.paramStoreId;
+      if (paramStoreId) {
+        const additionalParamMapJson = getSessionCache(paramStoreId);
+        if (additionalParamMapJson) {
+          const additionalParamMap = JSON.parse(additionalParamMapJson);
+          Object.assign(requestObj, additionalParamMap);
+          console.log("已获取到附加参数", additionalParamMap);
+        }
+      }
     }
   }
-  if (requestObj["_t_"]) ;
+  if (requestObj["_t_"])
+    ;
   return requestObj;
 }
 function getModelFields(pageContext, formItemConfigure, prop) {
@@ -217,6 +228,7 @@ function queryPageSuperGrids(pageDesign, pageContext, publishVersion) {
 }
 function packageFormRules(pageContext, configure) {
   var _a;
+  debugger;
   const isWorkflow = pageContext.workflowCode ? true : false;
   if (isWorkflow) {
     if (configure.name !== "button-detail" && pageContext.fieldPermissionMap) {

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

@@ -1,8 +1,8 @@
 import { getBaseUrl } from "./common-util.js";
 import http from "agilebuilder-ui/src/utils/request";
 import eventBus from "./eventBus.js";
-function getDataTypeMapRequest(backendUrl, tableName) {
-  const baseUrl = getBaseUrl(backendUrl);
+function getDataTypeMapRequest(backendUrl, tableName, isTest) {
+  const baseUrl = getBaseUrl(backendUrl, isTest);
   return http.get(baseUrl + "/dsc/commons/tables/" + tableName + "/data-types");
 }
 function popupToPage(params) {

package/dist/es/components/runtime/views/assemblys/button/dropdown/dropdown-runtime.vue2.js

@@ -1,7 +1,7 @@
 import { defineComponent, ref, computed, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createVNode, createElementBlock, Fragment, renderList, createTextVNode, toDisplayString } from "vue";
 import { ArrowDown } from "@element-plus/icons-vue";
 import { formatVariableValue } from "../../../../utils/page-helper-util.js";
-import { handleEvent } from "../../../../utils/events/event-util.js";
+import { handleEvent, handleFormEvent } from "../../../../utils/events/event-util.js";
 const _hoisted_1 = { key: 1 };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "dropdown-runtime",
@@ -45,6 +45,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     } else {
       listOptions = ref(designProperty.value.options ? designProperty.value.options : []);
     }
+    function visibleChange(isVisible) {
+      if (isVisible) {
+        handleFormEvent(isVisible, props.pageContext, props.configure, "menuShow");
+      } else {
+        handleFormEvent(isVisible, props.pageContext, props.configure, "menuHidden");
+      }
+    }
     return (_ctx, _cache) => {
       const _component_el_button = resolveComponent("el-button");
       const _component_el_icon = resolveComponent("el-icon");
@@ -60,7 +67,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         disabled: designProperty.value.state === "disabled",
         type: designProperty.value.buttonType,
         size: designProperty.value.size,
-        trigger: designProperty.value.trigger
+        trigger: designProperty.value.trigger,
+        onVisibleChange: visibleChange
       }, {
         dropdown: withCtx(() => [
           createVNode(_component_el_dropdown_menu, null, {

package/dist/es/components/runtime/views/assemblys/button/export-pdf/exportpdf-runtime.vue.js

@@ -0,0 +1,4 @@
+import _sfc_main from "./exportpdf-runtime.vue2.js";
+export {
+  _sfc_main as default
+};

package/dist/es/components/runtime/views/assemblys/button/export-pdf/exportpdf-runtime.vue2.js

@@ -0,0 +1,20 @@
+import { defineComponent, openBlock, createBlock } from "vue";
+import _sfc_main$1 from "../button/button-runtime.vue2.js";
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  __name: "exportpdf-runtime",
+  props: {
+    pageContext: {},
+    configure: {}
+  },
+  setup(__props) {
+    return (_ctx, _cache) => {
+      return openBlock(), createBlock(_sfc_main$1, {
+        configure: _ctx.configure,
+        pageContext: _ctx.pageContext
+      }, null, 8, ["configure", "pageContext"]);
+    };
+  }
+});
+export {
+  _sfc_main as default
+};

package/dist/es/components/runtime/views/assemblys/common/export-form-report-dialog.vue.js

@@ -77,7 +77,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return templateShowName;
     }
     function exportForm(row) {
-      emits("export", row);
+      emits("export", props.configure, row);
     }
     function closeExportForm() {
       emits("close");

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

@@ -90,7 +90,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function getUrlToListData() {
       let urlToListData2 = baseURL + "/dsc/commons/list";
       if (urlToListData2) {
-        urlToListData2 = getRealRestApiPath(urlToListData2, systemCode, backendUrl);
+        urlToListData2 = getRealRestApiPath(urlToListData2, systemCode, backendUrl, pageContext.isTest);
       }
       return urlToListData2;
     }
@@ -163,7 +163,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (!backendUrl && !tableName) {
         return;
       }
-      getDataTypeMapRequest(backendUrl, tableName).then((result) => {
+      getDataTypeMapRequest(backendUrl, tableName, pageContext.isTest).then((result) => {
         if (!pageContext["dataTypeMaps"]) {
           pageContext["dataTypeMaps"] = {};
         }

package/dist/es/components/runtime/views/assemblys/form/label/label-runtime.vue2.js

@@ -1,8 +1,8 @@
 import { defineComponent, ref, computed, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createElementBlock, toDisplayString, createCommentVNode, createElementVNode, createTextVNode } from "vue";
 import { getFormModelFields } from "../../../../utils/page-init-util.js";
-import { queryOptions, formatVariableValue, formatValueByType } from "../../../../utils/page-helper-util.js";
+import { getVariableValue, formatValueByType } from "../../../../utils/page-helper-util.js";
 import { SuperIcon } from "agilebuilder-ui";
-import { handleFormEvent } from "../../../../utils/events/event-util.js";
+import { getCustomFunc, handleFormEvent } from "../../../../utils/events/event-util.js";
 const _hoisted_1 = { style: { "overflow": "hidden", "white-space": "nowrap" } };
 const _hoisted_2 = ["title"];
 const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -11,9 +11,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     pageContext: {},
     configure: {}
   },
-  setup(__props) {
+  setup(__props, { expose: __expose }) {
     const props = __props;
-    getFormModelFields(props.pageContext, props.configure);
+    const entity = props.pageContext.entity ? props.pageContext.entity : {};
+    let dynamicFields = getFormModelFields(props.pageContext, props.configure);
     const runtimeInfo = props.configure.runtime ? props.configure.runtime : {};
     const runtimeStyle = runtimeInfo.style;
     const runtimeClass = runtimeInfo.class;
@@ -21,28 +22,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const appendClass = runtimeInfo.appendClass;
     const appendStyle = runtimeInfo.appendStyle;
     const designProperty = ref(runtimeInfo.props ? runtimeInfo.props : {});
-    const listOptions = designProperty.value.options ? designProperty.value.options : [];
-    const dataOrigin = props.configure.props && props.configure.props.dataOrigin ? props.configure.props.dataOrigin : {};
-    const valueType = dataOrigin.optionValueSetType;
-    if (valueType == "dynamicData" || valueType == "dynamicData" || valueType == "service") {
-      queryOptions(props.configure, props.pageContext, "").then((results) => {
-        listOptions.value = results;
-      }).catch((error) => {
-        console.log("lable组件查询数据源失败!", error);
-      });
-    }
-    let contentVariable = designProperty.value.formatting;
-    if (!contentVariable) {
-      const propsBase = props.configure.props.base ? props.configure.props.base : {};
-      contentVariable = propsBase.prop;
-    }
-    if (!contentVariable) {
-      contentVariable = "${page." + props.configure.uuid + "}";
-    }
+    const listOptions = ref(designProperty.value.options ? designProperty.value.options : []);
     const formatType = designProperty.value.formatType;
+    console.log("designProperty.value", designProperty.value);
     const dynamicValue = computed(() => {
-      let resultValue = formatVariableValue(props.pageContext, contentVariable);
-      console.log("formatType", formatType);
+      let resultValue = getVariableValue(entity, dynamicFields);
       if (formatType) {
         if (designProperty.value.hasOptions) {
           let selItems = null;
@@ -52,11 +36,29 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           if (selItems && selItems.length > 0) {
             resultValue = selItems[0].label;
           }
+        } else if ("custom" === formatType) {
+          const func = getCustomFunc(props.pageContext, designProperty.value.formatFunc);
+          if (func) {
+            resultValue = func.apply(func, [
+              {
+                pageContext: props.pageContext,
+                configureObj: props.configure,
+                value: resultValue
+              }
+            ]);
+          }
         } else {
           resultValue = formatValueByType(resultValue, formatType, designProperty.value);
         }
       }
-      return resultValue == void 0 || resultValue == null ? "" : resultValue;
+      resultValue = resultValue === void 0 || resultValue === null ? "" : resultValue;
+      return resultValue;
+    });
+    function updateOptions(newOptions) {
+      listOptions.value = newOptions ? newOptions : [];
+    }
+    __expose({
+      updateOptions
     });
     return (_ctx, _cache) => {
       const _component_el_form_item = resolveComponent("el-form-item");
@@ -81,7 +83,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             createElementVNode("span", _hoisted_1, [
               designProperty.value.preIconValue || designProperty.value.preText ? (openBlock(), createElementBlock("span", {
                 key: 0,
-                class: normalizeClass({ "el-input__suffix": designProperty.value.iconPosition != "outer", "el-input-group__append": designProperty.value.iconPosition == "outer" }),
+                class: normalizeClass({
+                  "el-input__suffix": designProperty.value.iconPosition != "outer",
+                  "el-input-group__append": designProperty.value.iconPosition == "outer"
+                }),
                 style: normalizeStyle(unref(appendStyle))
               }, [
                 designProperty.value.preIconType && designProperty.value.preIconValue ? (openBlock(), createBlock(unref(SuperIcon), {
@@ -95,7 +100,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             ]),
             designProperty.value.sufIconValue || designProperty.value.sufText ? (openBlock(), createElementBlock("span", {
               key: 0,
-              class: normalizeClass({ "el-input__suffix": designProperty.value.iconPosition != "outer", "el-input-group__append": designProperty.value.iconPosition == "outer" })
+              class: normalizeClass({
+                "el-input__suffix": designProperty.value.iconPosition != "outer",
+                "el-input-group__append": designProperty.value.iconPosition == "outer"
+              })
             }, [
               designProperty.value.sufIconType && designProperty.value.sufIconValue ? (openBlock(), createBlock(unref(SuperIcon), {
                 key: 0,

package/dist/es/components/runtime/views/assemblys/workflow/workflow-button/workflowbutton-runtime.vue2.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, openBlock, createElementBlock, Fragment, renderList, createBlock, createCommentVNode } from "vue";
+import { defineComponent, ref, openBlock, createElementBlock, Fragment, renderList, createBlock, createCommentVNode, unref, normalizeStyle, toDisplayString } from "vue";
 import _sfc_main$1 from "../../object-render.vue.js";
 import { getClickEventFuncByType } from "../../../../utils/events/event-util.js";
 import { isVisibleWorkflowButton } from "../../../../utils/events/standard-event.js";
@@ -16,6 +16,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const buttonInfo = props.pageContext.workflowButtonComponent;
     const completeTaskParam = props.pageContext.completeTaskParam;
     const visibleBtns = ref([]);
+    let taskName = ref("");
+    let activityNameColor = "";
+    if (props.configure.props.base.showActivityName) {
+      activityNameColor = props.configure.props.base.activityNameColor || "red";
+      if (props.pageContext.entity && props.pageContext.entity.task && props.pageContext.entity.task.name) {
+        taskName.value = props.pageContext.entity.task.name;
+      }
+    }
     props.configure.items.forEach((item) => {
       if (isVisibleBtn(item)) {
         visibleBtns.value.push(item);
@@ -50,7 +58,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               configure: element
             }, null, 8, ["pageContext", "configure"])) : createCommentVNode("", true)
           ], 64);
-        }), 256))
+        }), 256)),
+        unref(taskName) ? (openBlock(), createElementBlock("span", {
+          key: 0,
+          style: normalizeStyle({ color: unref(activityNameColor) })
+        }, " 当前环节： " + toDisplayString(unref(taskName)), 5)) : createCommentVNode("", true)
       ]);
     };
   }

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

@@ -1,5 +1,4 @@
 import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createCommentVNode } from "vue";
-import "element-plus";
 import _sfc_main$1 from "./super-page.vue.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "super-page-dialog",
@@ -20,8 +19,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const pageCode = ref(null);
     const dataId = ref(null);
     const taskId = ref(null);
+    const dialogType = ref(null);
     const pageRequest = ref({});
+    const draggable = ref(false);
+    const overflow = ref(false);
+    const showPosition = ref("rtl");
     if (myJumpPageSetting) {
+      dialogType.value = myJumpPageSetting && myJumpPageSetting["dialogType"] ? myJumpPageSetting["dialogType"] : "dialog";
+      draggable.value = myJumpPageSetting && myJumpPageSetting["draggable"] ? myJumpPageSetting["draggable"] : false;
+      overflow.value = myJumpPageSetting && myJumpPageSetting["overflow"] ? myJumpPageSetting["overflow"] : false;
+      showPosition.value = myJumpPageSetting && myJumpPageSetting["showPosition"] ? myJumpPageSetting["showPosition"] : "rtl";
       title.value = myJumpPageSetting && myJumpPageSetting["jumpPageTitle"] ? myJumpPageSetting["jumpPageTitle"] : null;
       width.value = myJumpPageSetting && myJumpPageSetting["jumpPageWidth"] ? myJumpPageSetting["jumpPageWidth"] : "100%";
       pageCode.value = myJumpPageSetting && myJumpPageSetting["pageCode"];
@@ -52,12 +59,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     return (_ctx, _cache) => {
       const _component_el_drawer = resolveComponent("el-drawer");
-      return openBlock(), createBlock(_component_el_drawer, {
+      const _component_el_dialog = resolveComponent("el-dialog");
+      return dialogType.value && dialogType.value === "drawer" ? (openBlock(), createBlock(_component_el_drawer, {
+        key: 0,
         modelValue: showContent.value,
         "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => showContent.value = $event),
-        "with-header": !title.value,
         title: title.value,
-        direction: "btt",
+        direction: showPosition.value,
         size: width.value,
         onOpen: _cache[1] || (_cache[1] = ($event) => emits("open")),
         onOpened: _cache[2] || (_cache[2] = ($event) => emits("opened")),
@@ -72,7 +80,29 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }, null, 8, ["pageCode", "pageRequest"])) : createCommentVNode("", true)
         ]),
         _: 1
-      }, 8, ["modelValue", "with-header", "title", "size"]);
+      }, 8, ["modelValue", "title", "direction", "size"])) : (openBlock(), createBlock(_component_el_dialog, {
+        key: 1,
+        "model-value": "",
+        title: title.value,
+        "close-on-click-modal": false,
+        "append-to-body": "",
+        width: width.value,
+        draggable: draggable.value,
+        overflow: overflow.value,
+        onOpen: _cache[5] || (_cache[5] = ($event) => _ctx.$emit("open")),
+        onOpend: _cache[6] || (_cache[6] = ($event) => _ctx.$emit("opend")),
+        onClose: _cache[7] || (_cache[7] = ($event) => emits("close")),
+        onClosed: _cache[8] || (_cache[8] = ($event) => _ctx.$emit("closed"))
+      }, {
+        default: withCtx(() => [
+          pageCode.value ? (openBlock(), createBlock(_sfc_main$1, {
+            key: 0,
+            pageCode: pageCode.value,
+            pageRequest: pageRequest.value
+          }, null, 8, ["pageCode", "pageRequest"])) : createCommentVNode("", true)
+        ]),
+        _: 1
+      }, 8, ["title", "width", "draggable", "overflow"]));
     };
   }
 });

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

@@ -18,6 +18,7 @@ import _sfc_main$5 from "./super-page-dialog.vue.js";
 import { useRoute, useRouter } from "vue-router";
 import { jumpToPage } from "agilebuilder-ui/src/utils/jump-page-utils";
 import { setSessionCache } from "agilebuilder-ui/src/utils/auth";
+import { deepCopy } from "../utils/common-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "super-page",
   props: {
@@ -136,6 +137,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         buttonPageContext.value = params.pageContext;
         showExportForm.value = true;
       });
+      eventBus.$on(eventPageInfo.value + "export-pdf-report", (params) => {
+        buttonParams.value = params;
+        buttonConfigure.value = params.configureObj;
+        buttonPageContext.value = params.pageContext;
+        showExportForm.value = true;
+      });
       eventBus.$on(eventPageInfo.value + "import-file", (params) => {
         buttonParams.value = params;
         clickImport();
@@ -182,7 +189,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         parentPageContext.value = params.pageContext;
         parentConfigureObj.value = params.configureObj;
         parentEventParams.value = params.eventParams;
-        params.jumpPageSetting;
         openDialog(parentConfigureObj.value, parentEventParams.value, params.jumpPageSetting);
       });
       watch(
@@ -290,6 +296,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         removeCustomFuncFromWindow(pageDesignResult.value);
       }
       eventBus.$off(eventPageInfo.value + "export-form-report");
+      eventBus.$off(eventPageInfo.value + "export-pdf-report");
       eventBus.$off(eventPageInfo.value + "import-file");
       eventBus.$off(eventPageInfo.value + "assign-task");
       eventBus.$off(eventPageInfo.value + "copy-task");
@@ -306,11 +313,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       showExportForm.value = false;
       buttonParams.value = null;
     }
-    function doExportFormReport(templateFile) {
+    function doExportFormReport(buttonConfigure2, templateFile) {
+      let isPdf = false;
+      if (buttonConfigure2.name === "export-pdf") {
+        isPdf = true;
+      }
       exportFormReport(
         buttonParams.value.pageContext,
         buttonParams.value.configureObj,
-        templateFile
+        templateFile,
+        isPdf
       );
     }
     const _selectFile_ = ref(null);
@@ -322,7 +334,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         if (!_selectFile_.value) {
           return;
         }
-        if (_selectFile_.value.value === "" || _selectFile_.value.value === null) return;
+        if (_selectFile_.value.value === "" || _selectFile_.value.value === null)
+          return;
         const fileObj = _selectFile_.value.files[0];
         if (fileObj) {
           _selectFile_.value.value = null;
@@ -394,6 +407,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function openDialog(configureObj, eventParams, myJumpPageSetting) {
       getPopPageSetting(configureObj, eventParams, myJumpPageSetting).then((openPageParams) => {
         if (openPageParams) {
+          const myJumpPageSettingOrg = configureObj && configureObj["props"] && configureObj["props"].linkPage ? configureObj["props"].linkPage : null;
+          if (myJumpPageSettingOrg) {
+            Object.assign(openPageParams, deepCopy(myJumpPageSettingOrg));
+          }
           const jumpMode = openPageParams.jumpMode;
           const popPageSetting = openPageParams;
           popPageSetting.parentPageCode = parentPageContext.value.code;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-runtime",
-  "version": "2.0.49-beta1",
+  "version": "2.0.52",
   "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.38",
+    "agilebuilder-ui": "1.0.41",
     "axios": "^1.6.8",
     "cypress": "^13.6.6",
     "element-plus": "^2.6.1",