super-page-runtime 2.0.22 → 2.0.25

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

@@ -36,7 +36,7 @@ function getCommonFormData(pageContext) {
     const dataId = additionalParamMap ? additionalParamMap.id : null;
     const ids = additionalParamMap ? additionalParamMap.ids : null;
     const taskId = additionalParamMap ? additionalParamMap.taskId : null;
-    const permissionPrefix = systemCode + "." + pageCode;
+    const permissionPrefix = pageCode;
     const backendUrl = getSystemBackendUrl(pageContext.backendUrl);
     const param = {
       pageCode,
@@ -45,7 +45,7 @@ function getCommonFormData(pageContext) {
       formNoRuleCode: pageContext.formNoRuleCode,
       id: dataId,
       systemCode,
-      functionCode: permissionPrefix + ".get",
+      functionCode: permissionPrefix + ".gets",
       tableNames: pageContext.tableNames
     };
     if (!param.id && additionalParamMap && additionalParamMap._t_ && getSessionCache(additionalParamMap._t_ + "_id")) {
@@ -104,7 +104,7 @@ function getWorkflowFormData(pageContext) {
     const dataId = additionalParamMap ? additionalParamMap.id : null;
     const ids = additionalParamMap ? additionalParamMap.ids : null;
     const taskId = additionalParamMap ? additionalParamMap.taskId : null;
-    const permissionPrefix = systemCode + "." + pageCode;
+    const permissionPrefix = pageCode;
     const param = {
       pageCode,
       pageVersion,
@@ -112,7 +112,7 @@ function getWorkflowFormData(pageContext) {
       formNoRuleCode: pageContext.formNoRuleCode,
       isWorkflowEntity: true,
       systemCode,
-      functionCode: permissionPrefix + ".get",
+      functionCode: permissionPrefix + ".gets",
       tableNames: pageContext.tableNames
     };
     if (ids) {

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

@@ -187,7 +187,11 @@ const functions = {
     if (!params.taskParamMap) {
       params.requestParams = pageContext.entity.task;
     }
-    return http.post(`/dsc/service-flow/execute/${pageCode}/${flowCode}`, params);
+    let baseUrl = pageContext.backendUrl;
+    if (!baseUrl) {
+      baseUrl = window["$vueApp"].config.globalProperties.baseURL;
+    }
+    return http.post(`${baseUrl}/dsc/service-flow/execute/${pageCode}/${flowCode}`, params);
   },
   openPage: function(pageContext, openParam) {
     eventBus.$emit(pageContext.code + "_open-dialog", {

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

@@ -249,13 +249,22 @@ const assemblyGroups = [
   {
     name: "data",
     label: "数据",
-    items: [{
-      name: "table",
-      label: "表格",
-      runtimeComponent: defineAsyncComponent(() => {
-        return import("../views/assemblys/data/table/table-runtime.vue.js");
-      })
-    }]
+    items: [
+      {
+        name: "table",
+        label: "表格",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/data/table/table-runtime.vue.js");
+        })
+      },
+      {
+        name: "bar-code",
+        label: "条码",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/data/bar-code/barcode-runtime.vue.js");
+        })
+      }
+    ]
   }
 ];
 function getRuntimeComponentByName(name) {

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

@@ -65,7 +65,7 @@ function upperFirstCase(str) {
   return str.toLowerCase().replace(/( |^)[a-z]/g, (L) => L.toUpperCase());
 }
 function getListCode(pageCode, pageVersion, tableUuid) {
-  return pageCode + ":V" + pageVersion + ":" + tableUuid;
+  return pageCode + "__V" + pageVersion + "__" + tableUuid;
 }
 function deepCopy(srcObj) {
   if (typeof srcObj !== "object" || srcObj === null) {

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

@@ -5,6 +5,13 @@ import { PageDesign, Component, PageContext } from '../interfaces/page-design-ty
  * @param pageDesign
  */
 export declare function initPageEvents(pageDesign: PageDesign, pageContext: PageContext): void;
+/**
+ * 获取自定义方法
+ * @param pageContext
+ * @param funcName
+ * @returns
+ */
+export declare function getCustomFunc(pageContext: PageContext, funcName: any): any;
 /**
  * 页面销毁时，将window上注册的函数移除掉
  * @param pageDesign
@@ -21,6 +28,13 @@ export declare function doAfterClickEvent(pageContext: PageContext, configure: C
  * @param eventType change、click等事件类型
  */
 export declare function getEventFuncByType(pageContext: PageContext, events: Array<any>, eventType: string): any;
+/**
+ * 根据事件类型，获得事件名称
+ * @param events
+ * @param eventType
+ * @returns
+ */
+export declare function getEventNameByType(events: Array<any>, eventType: string): any;
 /**
  * 获得事件Function对象
  * @param events 该组件所有事件集合

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

@@ -1,18 +1,71 @@
 import { isPromise } from "agilebuilder-ui/src/utils/common-util";
 import { judgeDataNumber, standardEvents, getAdditionalParamMap, dealAfterOperate } from "./standard-event.js";
 import { validateDataModelFunc } from "./validator-util.js";
-import { getComponentRef } from "../global-refs.js";
+import { getComponentRef, getComponentRefByCode } from "../global-refs.js";
 import { ElMessage } from "element-plus";
 import { analysisCondition } from "agilebuilder-ui/src/utils/util";
 import { getListCode } from "../common-util.js";
 import eventBus from "../eventBus.js";
-import "agilebuilder-ui/src/utils/request";
-import "dayjs";
-import "agilebuilder-ui/src/utils/calculator/calculator-util";
-import "vue";
+import { getValueFromSource } from "../page-helper-util.js";
 function initPageEvents(pageDesign, pageContext) {
   if (pageDesign && pageDesign.customEvents) {
-    pageContext.customEvents = transferToFunction(pageDesign.customEvents);
+    const customEvents = transferToFunction(pageDesign.customEvents);
+    appendDefaultMethod(pageContext, customEvents);
+    console.log("initPage  customEvents", customEvents);
+    pageContext.customEvents = customEvents;
+  }
+}
+function getCustomFunc(pageContext, funcName) {
+  if (pageContext.customEvents) {
+    return pageContext.customEvents[funcName];
+  }
+}
+function appendDefaultMethod(pageContext, customEvents) {
+  if (!customEvents) {
+    return;
+  }
+  for (const pro in customEvents) {
+    const func = customEvents[pro];
+    func.get = function(code) {
+      if (code) {
+        return getComponentRefByCode(pageContext, code);
+      } else {
+        return void 0;
+      }
+    };
+    func.getByUuid = function(uuid) {
+      if (uuid) {
+        return getComponentRef(pageContext, uuid);
+      } else {
+        return void 0;
+      }
+    };
+    func.getPageContext = function() {
+      return pageContext;
+    };
+    func.getContextValue = function(fieldName) {
+      let contextData = pageContext && pageContext.entity ? pageContext.entity.context : null;
+      contextData = contextData ? contextData : {};
+      return getValueFromSource(contextData, fieldName, "context");
+    };
+    func.getContext = function() {
+      return pageContext && pageContext.entity ? pageContext.entity.context : {};
+    };
+    func.getSystem = function() {
+      return pageContext && pageContext.entity ? pageContext.entity.system : {};
+    };
+    func.getTask = function() {
+      return pageContext && pageContext.entity ? pageContext.entity.task : {};
+    };
+    func.getRequest = function() {
+      return pageContext && pageContext.entity ? pageContext.entity.request : {};
+    };
+    func.getPage = function() {
+      return pageContext && pageContext.entity ? pageContext.entity.page : {};
+    };
+    func.getCustomFunc = function(funcName) {
+      return getCustomFunc(pageContext, funcName);
+    };
   }
 }
 function removeCustomFuncFromWindow(pageDesign) {
@@ -36,8 +89,6 @@ function handleEventUtil($event, pageContext, configure, eventType, isExecute, o
   const pageCode = pageContext.code;
   const pageVersion = pageContext.version;
   const events = configure.runtime && configure.runtime.events ? configure.runtime.events : [];
-  configure.name;
-  debugger;
   let eventFun;
   if (eventType && eventType === "click") {
     const tableUuid = configure.props.base.tableUuid ? configure.props.base.tableUuid : pageContext.tableUuids && pageContext.tableUuids.length > 0 ? pageContext.tableUuids[0] : null;
@@ -253,35 +304,50 @@ function doClickEvent(pageContext, configure, clickEventFunObj, eventParams) {
     doClickCustomEvent(pageContext, configure, clickEventFunObj, eventParams);
   }
 }
-function getEventByEventName(pageContext, eventName) {
+function getEventByEventName(pageContext, eventObj) {
   const eventsObj = pageContext.customEvents;
-  if (eventsObj && eventName && eventsObj[eventName]) {
-    return eventsObj[eventName];
+  if (eventsObj && eventObj) {
+    let key = "";
+    if (typeof eventObj === "object") {
+      key = eventObj.componentUuid + "_" + eventObj.name;
+    } else {
+      key = eventObj;
+    }
+    return eventsObj[key];
   }
 }
 function getEventFuncByType(pageContext, events, eventType) {
   if (events && eventType) {
-    const eventArr = events.filter((item) => item.name === eventType && item.eventName);
+    const eventArr = events.filter((item) => item.name === eventType);
     if (eventArr && eventArr.length > 0) {
       const event = eventArr[0];
       if (event.isStandard) {
         return standardEvents[event.eventName];
       } else {
-        return getEventByEventName(pageContext, event.eventName);
+        return getEventByEventName(pageContext, event);
       }
     }
   }
 }
+function getEventNameByType(events, eventType) {
+  if (events && eventType) {
+    const eventArr = events.filter((item) => item.name === eventType);
+    if (eventArr && eventArr.length > 0) {
+      const event = eventArr[0];
+      return event.eventName;
+    }
+  }
+}
 function getClickEventFuncByType(pageContext, events, eventType) {
   if (events && eventType) {
-    const eventArr = events.filter((item) => item.name === eventType && item.eventName);
+    const eventArr = events.filter((item) => item.name === eventType);
     if (eventArr && eventArr.length > 0) {
       const event = eventArr[0];
       if (event.isStandard) {
         return { func: standardEvents[event.eventName], isStandard: true, event };
       } else {
         return {
-          func: getEventByEventName(pageContext, event.eventName),
+          func: getEventByEventName(pageContext, event),
           isStandard: false,
           event
         };
@@ -305,19 +371,25 @@ function callItemEvent(pageContext, configureObj, eventFun, eventParams, otherPa
       eventParams[key] = otherParams[key];
     }
   }
-  return eventFun(eventParams);
+  return eventFun.apply(eventFun, [eventParams]);
 }
 function transferToFunction(customEvents) {
   const eventsObj = {};
   customEvents.forEach((event) => {
-    if (event.jsContent) {
-      eventsObj[event.eventName] = new Function("params", event.jsContent);
+    if (!event.isStandard && event.jsContent) {
       if (event.name === "customFunc") {
+        let newFunc = null;
         if (event.funcParam) {
-          window["$page_" + event.eventName] = new Function(event.funcParam, event.jsContent);
+          const args = event.funcParam.split(",");
+          newFunc = new Function(args, event.jsContent);
         } else {
-          window["$page_" + event.eventName] = new Function(event.jsContent);
+          newFunc = new Function(event.jsContent);
         }
+        eventsObj[event.eventName] = newFunc;
+      } else {
+        let key = event.componentUuid + "_";
+        key += event.name;
+        eventsObj[key] = new Function("params", event.jsContent);
       }
     }
   });
@@ -538,7 +610,9 @@ export {
   fileUploadDeleted,
   fileUploadUploaded,
   getClickEventFuncByType,
+  getCustomFunc,
   getEventFuncByType,
+  getEventNameByType,
   getHandleEvent,
   gridSelectAllRecords,
   gridSelectRecord,

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

@@ -38,6 +38,7 @@ export declare const standardEvents: {
     lineEditCreate: (params: any) => void;
 };
 export declare function exportFormReport(pageContext: any, configureObj: any, templateFile: any, isPdf: any): void;
+export declare function getSaveFormRequestWithRow(pageContext: any, configureObj: any, url: any, isUnControlVersion: any, mainDefaultValueColumns: any, dynamicColumnInfo: any, row: any): any;
 export declare function getSaveFormRequest(pageContext: any, configureObj: any, url: any, isUnControlVersion: any, mainDefaultValueColumns: any, dynamicColumnInfo: any): any;
 /**
  * 按钮执行后页面处理方式：刷新、关闭弹框等等

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

@@ -11,6 +11,7 @@ import { doAfterClickEvent, handleEvent } from "./event-util.js";
 import { setStoreInfo } from "../store-util.js";
 import { refreshPage } from "../api/api-util.js";
 import { updateWithPageValue } from "agilebuilder-ui/src/utils/jump-page-utils";
+import { getPermissionCodes } from "../page-init-util.js";
 const standardEvents = {
   // 表单标准事件保存save
   save: function(params) {
@@ -219,6 +220,7 @@ function exportFormReport(pageContext, configureObj, templateFile, isPdf) {
   const backendUrl = pageContext.backendUrl;
   const viewModels = pageContext.entity.data;
   const isPermission = button.isPermission === void 0 || button.isPermission === "true" || button.isPermission;
+  const functionCodes = getPermissionCodes(configureObj, pageContext);
   const param = {
     entity: viewModels,
     fileName: templateUUID,
@@ -228,11 +230,13 @@ function exportFormReport(pageContext, configureObj, templateFile, isPdf) {
     beanName,
     isWorkflowForm,
     // 是否是流程表单
-    functionCode: button.functionCode,
+    functionCode: functionCodes,
     tableName,
     isPermission: isPermission + "",
     systemCode,
-    tableNames: pageContext.tableNames
+    tableNames: pageContext.tableNames,
+    pageCode: pageContext.code,
+    pageVersion: pageContext.version
   };
   if (logSetting) {
     param["logSettingText"] = logSetting;
@@ -348,19 +352,26 @@ function saveFunc(params, isListButton) {
     }
   });
 }
-function getCommonFormRequestParam(pageContext, configureObj, isUnControlVersion, mainDefaultValueColumns, dynamicColumnInfo, ids) {
+function getCommonFormRequestParam(pageContext, configureObj, isUnControlVersion, mainDefaultValueColumns, dynamicColumnInfo, ids, row) {
   const isWorkflow = pageContext.workflowCode ? true : false;
   const systemCode = pageContext.systemCode;
   const isPermission = configureObj.props.base.isPermission === void 0 || configureObj.props.base.isPermission === "true" || configureObj.props.base.isPermission;
+  const functionCodes = getPermissionCodes(configureObj, pageContext);
+  let entity = row;
+  if (!entity) {
+    entity = pageContext.entity.data;
+  }
   const param = {
-    entity: pageContext.entity.data,
+    entity,
     pageModel: pageContext.entity.page,
     tableName: pageContext.tableName,
     formNoRuleCode: pageContext.formNoRuleCode,
     isWorkflowEntity: isWorkflow,
-    functionCode: configureObj.props.base.functionCode,
+    functionCode: functionCodes,
     isPermission: isPermission + "",
-    tableNames: pageContext.tableNames
+    tableNames: pageContext.tableNames,
+    pageCode: pageContext.code,
+    pageVersion: pageContext.version
   };
   if (ids) {
     param["ids"] = ids;
@@ -412,7 +423,7 @@ function getCommonFormRequestParam(pageContext, configureObj, isUnControlVersion
   }
   return param;
 }
-function getSaveFormRequest(pageContext, configureObj, url, isUnControlVersion, mainDefaultValueColumns, dynamicColumnInfo) {
+function getSaveFormRequestWithRow(pageContext, configureObj, url, isUnControlVersion, mainDefaultValueColumns, dynamicColumnInfo, row) {
   const systemCode = pageContext.systemCode;
   const backendUrl = pageContext.backendUrl;
   const param = getCommonFormRequestParam(
@@ -421,10 +432,22 @@ function getSaveFormRequest(pageContext, configureObj, url, isUnControlVersion,
     isUnControlVersion,
     mainDefaultValueColumns,
     dynamicColumnInfo,
-    null
+    null,
+    row
   );
   return getSaveFormRequestByParam(systemCode, backendUrl, param, url, pageContext.entity.data);
 }
+function getSaveFormRequest(pageContext, configureObj, url, isUnControlVersion, mainDefaultValueColumns, dynamicColumnInfo) {
+  return getSaveFormRequestWithRow(
+    pageContext,
+    configureObj,
+    url,
+    isUnControlVersion,
+    mainDefaultValueColumns,
+    dynamicColumnInfo,
+    null
+  );
+}
 function getSaveFormRequestByParam(systemCode, backendUrl, param, url, formData) {
   const baseUrl = getBaseUrl(backendUrl);
   let path = baseUrl + url;
@@ -532,7 +555,7 @@ function updateValuesWhenCloseDialog(parentPageContext, parentConfigureObj, sour
 function dealAfterWithList(pageContext, configureObj, row, successTip) {
   let successOperation = configureObj.props.base.successOperation;
   const isNeedValueMapping = configureObj.props.base.isNeedValueMapping;
-  const tableUuid = configureObj.props.base.tableUuid;
+  let tableUuid = configureObj.props.base.tableUuid;
   if (!successOperation) {
     successOperation = "refresh";
   }
@@ -616,7 +639,8 @@ function getSubmitFormRequest(pageContext, configureObj, url, isUnControlVersion
         isUnControlVersion,
         mainDefaultValueColumns,
         dynamicColumnInfo,
-        ids
+        ids,
+        null
       );
       getSaveFormRequestByParam(systemCode, backendUrl, param, url, pageContext.entity.data).then((result) => {
         resolve(result);
@@ -659,13 +683,16 @@ function deleteFunc(params) {
       path = getRealRestApiPath(path, systemCode, backendUrl);
       const isPermission = configureBase.isPermission === void 0 || configureBase.isPermission === "true" || configureBase.isPermission;
       const isWorkflow = pageContext.workflowCode ? true : false;
+      const functionCodes = getPermissionCodes(configureObj, pageContext);
       const param = {
         ids,
-        functionCode: configureBase.functionCode,
+        functionCode: functionCodes,
         isPermission: isPermission + "",
         systemCode,
         isWorkflowEntity: isWorkflow,
-        tableNames: pageContext.tableNames
+        tableNames: pageContext.tableNames,
+        pageCode: pageContext.code,
+        pageVersion: pageContext.version
       };
       if (configureBase.beanName) {
         param["beanName"] = configureBase.beanName;
@@ -689,7 +716,8 @@ function deleteFunc(params) {
       http.delete(path, {
         data: param
       }).then((data) => {
-        const gridRef = getComponentRef(pageContext, params.tableUuid);
+        const tableUuid = configureObj.props.base.tableUuid;
+        const gridRef = getComponentRef(pageContext, tableUuid);
         if (gridRef) {
           gridRef.isDeleteChange(true);
           gridRef.clearSelections();
@@ -744,12 +772,19 @@ function downloadTemplateFunc(params) {
   if (pageContext.beanName) {
     param += "&beanName=" + pageContext.beanName;
   }
-  if (configureBase.functionCode) {
-    param += "&functionCode=" + configureBase.functionCode;
+  const functionCodes = getPermissionCodes(configureObj, pageContext);
+  if (functionCodes) {
+    param += "&functionCode=" + functionCodes;
   }
   if (pageContext.tableName) {
     param += "&tableName=" + pageContext.tableName;
   }
+  if (pageContext.code) {
+    param += "&pageCode=" + pageContext.code;
+  }
+  if (pageContext.version) {
+    param += "&pageVersion=" + pageContext.version;
+  }
   if (configureBase) {
     const isPermission = configureBase.isPermission === void 0 || configureBase.isPermission === "true" || configureBase.isPermission;
     param += "&isPermission=" + isPermission;
@@ -802,8 +837,9 @@ function doImportFinally(params, fileObj) {
   if (isWorkflowEntity !== null && isWorkflowEntity !== void 0) {
     param.append("isWorkflowEntity", isWorkflowEntity + "");
   }
-  if (buttonConfigureBase.functionCode) {
-    param.append("functionCode", buttonConfigureBase.functionCode);
+  const functionCodes = getPermissionCodes(buttonConfigureObj, pageContext);
+  if (functionCodes) {
+    param.append("functionCode", functionCodes);
   }
   let additionalParamMap = getAdditionalParamMap(pageContext);
   param.append("additionalParamMapStr", JSON.stringify(additionalParamMap));
@@ -897,12 +933,13 @@ function exportFunc(params) {
       isAsync = false;
     }
     const isPermission = configureBase.isPermission === void 0 || configureBase.isPermission === "true" || configureBase.isPermission;
+    const functionCodes = getPermissionCodes(params.configureObj, pageContext);
     const exportFileName = pageName;
     window["$vueApp"].config.globalProperties.$exportDataNew(
       dataParam,
       exportFileName,
       listCode,
-      configureBase.functionCode,
+      functionCodes,
       null,
       null,
       isAsync,
@@ -916,10 +953,10 @@ function getWorkflowSaveParams(params) {
   const configureObj = params.configureObj;
   const dataModel = pageContext.entity.data;
   const systemCode = pageContext.systemCode;
-  const permissionPrefix = systemCode + "." + pageContext.code;
-  let functionCode = configureObj.props.base.functionCode;
-  if (!functionCode) {
-    functionCode = permissionPrefix + ".xxx";
+  const permissionPrefix = pageContext.code;
+  let functionCodes = getPermissionCodes(configureObj, pageContext);
+  if (!functionCodes) {
+    functionCodes = permissionPrefix + ".xxx";
   }
   if (!dataModel.id && !dataModel.ID) {
     dataModel["pageCode"] = pageContext.code;
@@ -932,9 +969,11 @@ function getWorkflowSaveParams(params) {
     tableName: pageContext.tableName,
     emailTemplateCode: pageContext.emailTemplateCode,
     definitionId: pageContext.definitionId,
-    functionCode,
+    functionCode: functionCodes,
     systemCode,
-    tableNames: pageContext.tableNames
+    tableNames: pageContext.tableNames,
+    pageCode: pageContext.code,
+    pageVersion: pageContext.version
   };
   if (pageContext.completeTaskParam) {
     param["completeTaskParam"] = {
@@ -1182,7 +1221,7 @@ function getTransactTaskParam(params) {
   const dataModel = pageContext.entity.data;
   const pageModel = pageContext.entity.page;
   const systemCode = pageContext.systemCode;
-  const permissionPrefix = systemCode + "." + pageContext.code;
+  const permissionPrefix = pageContext.code;
   const additionalParamMap = getAdditionalParamMap(pageContext);
   const dataId = dataModel.ID !== void 0 && dataModel.ID !== null ? dataModel.ID : dataModel.id;
   ({
@@ -1194,7 +1233,9 @@ function getTransactTaskParam(params) {
     tableName: pageContext.tableName,
     functionCode: permissionPrefix + ".xxx",
     isWorkflowEntity: true,
-    tableNames: pageContext.tableNames
+    tableNames: pageContext.tableNames,
+    pageCode: pageContext.code,
+    pageVersion: pageContext.version
   });
   ({
     taskId: pageContext.completeTaskParam.taskId,
@@ -1385,7 +1426,7 @@ function getTaskInformitions(params) {
     });
     return;
   }
-  const permissionPrefix = systemCode + "." + pageContext.code;
+  const permissionPrefix = pageContext.code;
   let additionalParamMap = getAdditionalParamMap(pageContext);
   const requestParams = {
     beanName: pageContext.beanName,
@@ -1683,6 +1724,7 @@ export {
   getAdditionalParamMap,
   getRemoveSigner,
   getSaveFormRequest,
+  getSaveFormRequestWithRow,
   getTaskInformitions,
   isVisibleWorkflowButton,
   judgeDataNumber,