super-page-runtime 2.0.49 → 2.0.53

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");
+      })
     }]
   },
   {
@@ -263,6 +269,13 @@ const assemblyGroups = [
           return import("../views/assemblys/data/table/table-runtime.vue.js");
         })
       },
+      {
+        name: "tree",
+        label: "树控件",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/data/tree/tree-runtime.vue.js");
+        })
+      },
       {
         name: "bar-code",
         label: "条码",

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

@@ -2,7 +2,7 @@ import { getBaseUrl, getRealRestApiPath, upperFirstCase, packageTemplateFiles, d
 import http from "agilebuilder-ui/src/utils/request";
 import { getI18n } from "agilebuilder-ui/src/utils/util";
 import { ElMessage, ElMessageBox } from "element-plus";
-import { getToken } from "agilebuilder-ui/src/utils/auth";
+import { setSessionCache, getToken } from "agilebuilder-ui/src/utils/auth";
 import { getComponentRef } from "../global-refs.js";
 import eventBus from "../eventBus.js";
 import axios from "axios";
@@ -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) {
@@ -276,9 +278,9 @@ function exportFormReport(pageContext, configureObj, templateFile, isPdf) {
   param["additionalParamMap"] = additionalParamMap;
   let exportResult;
   if (isPdf) {
-    exportResult = exportFormPdf(fileName, backendUrl, param);
+    exportResult = exportFormPdf(fileName, backendUrl, param, pageContext.isTest);
   } else {
-    exportResult = exportFormReportSuccess(fileName, backendUrl, param);
+    exportResult = exportFormReportSuccess(fileName, backendUrl, param, pageContext.isTest);
   }
   if (exportResult) {
     exportResult.then(() => {
@@ -286,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, {
@@ -318,14 +320,14 @@ function exportFormReportSuccess(fileName, backendUrl, param) {
     });
   });
 }
-function exportFormPdf(fileName, backendUrl, param) {
+function exportFormPdf(fileName, backendUrl, param, isTest) {
   return new Promise((resolve, reject) => {
-    const baseUrl = getBaseUrl(backendUrl);
+    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/x-www-form-urlencoded"
+        "content-type": "application/json"
       },
       responseType: "blob"
     });
@@ -462,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(
@@ -476,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);
@@ -713,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) => {
@@ -752,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);
@@ -863,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) {
@@ -921,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({
@@ -1106,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,
@@ -1152,6 +1154,9 @@ function dealCompleteTaskParam(commonEntity, isInit, pageContext, params, operat
       pageContext.initFormNo = commonEntity.formNo;
       pageContext.emailTemplateCode = commonEntity.emailTemplateCode;
     }
+    if (formParam.entity) {
+      cacheFormDataId(formParam.entity.id || formParam.entity.ID, pageContext);
+    }
     const completeTaskResult = formParam.completeTaskResult;
     if (completeTaskResult) {
       const completeTaskTipType = completeTaskResult.completeTaskTipType;
@@ -1196,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,
@@ -1233,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,
@@ -1279,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;
@@ -1340,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,
@@ -1380,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,
@@ -1410,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,
@@ -1443,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,
@@ -1462,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,
@@ -1474,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");
 }
@@ -1489,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,
@@ -1513,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;
@@ -1537,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,
@@ -1556,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,
@@ -1587,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");
 }
@@ -1800,6 +1805,12 @@ function isTaskComplete(completeTaskParam) {
   }
   return taskComplete;
 }
+function cacheFormDataId(dataId, pageContext) {
+  const additionalParamMap = getAdditionalParamMap(pageContext);
+  if (dataId && additionalParamMap) {
+    setSessionCache(additionalParamMap._t_ + "_id", dataId);
+  }
+}
 export {
   dealAfterOperate,
   dealCompleteTaskParam,

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

@@ -74,25 +74,10 @@ 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, isSql);
+  return validatorEntity(entity, rules, columns, rowIndex, true);
 }
 function sublistVerify(rules) {
   if (!rules) {
@@ -118,7 +103,7 @@ function sublistVerify(rules) {
 function validatorEntity(entity, rules, columns, rowIndex, isShouldRepeateValdate, isSql) {
   let validateRules = sublistVerify(rules);
   if ((!rules || rules === null) && columns) {
-    validateRules = getValidator(columns);
+    validateRules = getValidator();
   }
   if (!validateRules || Object.keys(validateRules).length === 0) {
     entity["validateErrorField"] = "";
@@ -136,11 +121,6 @@ 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,
@@ -153,11 +133,11 @@ function validatorEntity(entity, rules, columns, rowIndex, isShouldRepeateValdat
       }
       if (fieldName && isShouldRepeateValdate === true) {
         const reg1 = /[A-Z]+/;
-        if (isSql !== void 0 && isSql === true && reg1.test(fieldName) && entity[fieldName.toLowerCase()] !== void 0) {
+        if (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, isSql);
+          result = validatorEntity(copyEntity, rules, columns, rowIndex, false);
         }
       }
     }
@@ -205,7 +185,7 @@ function validateWorkflowFormDataModel(dataModel, pageContext) {
     if (!rules || Object.keys(rules).length === 0) {
       result = true;
     } else {
-      result = validator(handleModels, rules, null, null, true);
+      result = validator(handleModels, rules, null, null);
     }
     if (result === true) {
       const workflowFieldPermissionRules = pageContext.workflowRules;
@@ -269,7 +249,7 @@ function validateCommonFormDataModel(dataModel, pageContext, rules) {
     if (!rules || Object.keys(rules).length === 0) {
       resolve(handleModels);
     } else {
-      const validateEntityResult = validator(handleModels, rules, null, null, true);
+      const validateEntityResult = validator(handleModels, rules, null, null);
       if (validateEntityResult === true) {
         const validateResult = validateSubTables(pageContext);
         if (validateResult === true) {

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

@@ -77,8 +77,7 @@ function getTableQueryInfo(dataOriginInfo, pageContext2) {
           }
         }
       }
-      if (f.propValue)
-        ;
+      if (f.propValue) ;
       searchForm.push(tempObj);
     }
     infoObj.props.searchForm = searchForm;
@@ -243,45 +242,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;
@@ -669,7 +629,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,10 +108,18 @@ 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) {

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/chart/column-line/column-line-runtime.vue2.js

@@ -86,17 +86,21 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       hisGroupValue = headerInfo.groupValue;
       refresh();
     });
-    function refresh() {
+    function refresh(isHandle) {
       if (!dataConfig) {
         console.log("无数据源配置，不需要查询!");
         return;
       }
       dataConfig.services[0].groupValue = headerInfo.groupValue;
-      dataConfig.isRefresh = true;
+      if (isHandle !== true) {
+        dataConfig.autoRefresh = true;
+      }
       updateChartDatasources(props.pageContext, [dataConfig], headerInfo.drillParams);
     }
     const monitorFields = headerInfo.monitorFields;
-    monitorFieldChange(props.pageContext, monitorFields, refresh);
+    monitorFieldChange(props.pageContext, monitorFields, () => {
+      refresh(true);
+    });
     function updateChartDatas(resultData) {
       if (!resultData) {
         resultData = [];
@@ -111,17 +115,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return;
       }
       resultData.hasRender = true;
-      if (!dataConfig.isRefresh) {
+      if (!dataConfig.autoRefresh) {
         hisGroupValue = resultData.groupValue;
         if (hisGroupValue && headerInfo.groupComponent !== "checkbox") {
           hisGroupValue = hisGroupValue.join(",");
         }
         headerInfo.groupValue = hisGroupValue;
       }
-      if (!dataConfig.isRefresh || !enableDrill) {
+      if (!dataConfig.autoRefresh || !enableDrill) {
         clearChartSelected(props.pageContext, props.configure, chartRef.value.chart);
       }
-      dataConfig.isRefresh = false;
+      dataConfig.autoRefresh = false;
       updateChartOption(props.pageContext, props.configure, chartOption, resultData);
     }
     __expose({