super-page-runtime 2.0.25 → 2.0.27

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

@@ -1,7 +1,7 @@
 import { getSystemBackendUrl } from "agilebuilder-ui/src/utils/common-util";
 import { getSessionCache } from "agilebuilder-ui/src/utils/auth";
 import http from "agilebuilder-ui/src/utils/request";
-import { getBaseUrl } from "../common-util.js";
+import { getBaseUrl, getListCode } from "../common-util.js";
 import { getAdditionalParamMap, dealCompleteTaskParam } from "../events/standard-event.js";
 import { packageCustomRules, getWorkflowRules } from "../events/validator-util.js";
 import { handleEvent } from "../events/event-util.js";
@@ -66,6 +66,14 @@ function getCommonFormData(pageContext) {
     if (taskId) {
       param["taskId"] = taskId;
     }
+    if (pageContext.tableUuids) {
+      let listCodes = [];
+      pageContext.tableUuids.forEach((tableUuid) => {
+        const listCode = getListCode(pageCode, pageVersion, tableUuid);
+        listCodes.push(listCode);
+      });
+      param["tableNames"] = listCodes;
+    }
     const urlForView = backendUrl + "/dsc/commons/gets";
     http.post(urlForView, param).then((commonEntity) => {
       if (commonEntity) {

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

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

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

@@ -0,0 +1,8 @@
+/**
+ * 跟据规则生成条码
+ */
+export declare function generateCodeByRule(rules: any[], data: any): string;
+declare const _default: {
+    generateCodeByRule: typeof generateCodeByRule;
+};
+export default _default;

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

@@ -0,0 +1,36 @@
+function generateCodeByRule(rules, data) {
+  let allVariablesPresent = true;
+  let value = "";
+  rules.forEach((item) => {
+    if (item.propDbName !== "-1" && item.propDbName !== -1) {
+      const filedValue = data[item.propDbName];
+      if (item.supplementaryCharacters && item.length) {
+        if (!filedValue) {
+          value += "".padEnd(item.length, item.supplementaryCharacters);
+        } else {
+          if (filedValue.length > item.length) {
+            value += filedValue.substring(0, item.supplementaryCharacters);
+          } else {
+            value += filedValue.padEnd(item.length, item.supplementaryCharacters);
+          }
+        }
+      } else {
+        if (!filedValue) {
+          allVariablesPresent = false;
+        } else {
+          value += filedValue;
+        }
+      }
+    } else {
+      value += item.fixedValue;
+    }
+  });
+  console.log("跟据规则生成条码：" + value);
+  if (allVariablesPresent) {
+    return value;
+  }
+  return null;
+}
+export {
+  generateCodeByRule
+};

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 "V" + pageVersion + "__" + pageCode + "__" + tableUuid;
 }
 function deepCopy(srcObj) {
   if (typeof srcObj !== "object" || srcObj === null) {

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

@@ -104,6 +104,7 @@ function handleEventUtil($event, pageContext, configure, eventType, isExecute, o
       const isListButton = isListPage(pageContext);
       if (isListButton) {
         otherParams["selections"] = selections;
+        otherParams["id"] = selectionIds && selectionIds.length > 0 ? selectionIds[0] : null;
         otherParams["ids"] = selectionIds;
       }
       const tableConfigure = gridRef.getTableConfigure();
@@ -590,25 +591,13 @@ function headerClick(pageContext, configureObj, params) {
 function fileUploadBeforeUpload(params) {
   return getHandleEvent(null, params.pageContext, params.configureObj, "before-upload", params);
 }
-function fileUploadUploaded(pageContext, configureObj, params) {
-  return handleEvent(null, pageContext, configureObj, "uploaded", params);
-}
-function fileUploadBeforeDelete(pageContext, configureObj, params) {
-  return handleEvent(null, pageContext, configureObj, "before-delete", params);
-}
-function fileUploadDeleted(pageContext, configureObj, params) {
-  return handleEvent(null, pageContext, configureObj, "deleted", params);
-}
 export {
   canExecuteButton,
   cellClick,
   cellDblClick,
   doAfterClickEvent,
   doBeforeClickEvent,
-  fileUploadBeforeDelete,
   fileUploadBeforeUpload,
-  fileUploadDeleted,
-  fileUploadUploaded,
   getClickEventFuncByType,
   getCustomFunc,
   getEventFuncByType,

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

@@ -0,0 +1,5 @@
+export declare function printLabel(params: any, templateUuid: string): void;
+declare const _default: {
+    printLabel: typeof printLabel;
+};
+export default _default;

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

@@ -0,0 +1,153 @@
+import http from "agilebuilder-ui/src/utils/request";
+import { hiprint } from "vue-plugin-hiprint";
+import { generateCodeByRule } from "../barcode-util.js";
+function printLabel(params, templateUuid) {
+  http.post(window["$vueApp"].config.globalProperties.baseAPI + "/dc/print-models/by-codes", [
+    templateUuid
+  ]).then((res) => {
+    const templateJson = JSON.parse(res[0].template);
+    const barCodeOptions = [];
+    templateJson.panels.forEach((panel) => {
+      panel.printElements.forEach((element) => {
+        if (element.options.textType === "barcode" || element.options.textType === "qrcode") {
+          barCodeOptions.push(element.options);
+        }
+      });
+    });
+    const printTemplate = new hiprint.PrintTemplate({
+      template: templateJson
+    });
+    const ext = {
+      callback: () => {
+        console.log("浏览器打印窗口已打开");
+      },
+      styleHandler: () => {
+        return "";
+      }
+    };
+    const options = { leftOffset: -1, topOffset: -1 };
+    if (params.pageContext.pageType) {
+      if (params.pageContext.pageType === "list") {
+        printListData(params, barCodeOptions, printTemplate, options, ext);
+      } else if (params.pageContext.pageType === "form") {
+        printFormData(params, barCodeOptions, printTemplate, options, ext);
+      }
+    } else {
+      printFormData(params, barCodeOptions, printTemplate, options, ext);
+    }
+  });
+}
+function printListData(params, barCodeOptions, printTemplate, options, ext) {
+  if (barCodeOptions.length > 0) {
+    const valuePromises = [];
+    const selections = JSON.parse(JSON.stringify(params.selections));
+    barCodeOptions.forEach((barCodeOption) => {
+      valuePromises.push(resloveListData(barCodeOption, selections));
+    });
+    Promise.all(valuePromises).then((allBarValues) => {
+      allBarValues.forEach((barValues) => {
+        barValues.forEach((item) => {
+          const index = item.index;
+          const selection = selections[index];
+          if (!selection[item.type]) {
+            selection[item.type] = {};
+          }
+          selection[item.type][item.name] = item.value;
+        });
+      });
+      printTemplate.print(selections, options, ext);
+    });
+  } else {
+    printTemplate.print(params.selections, options, ext);
+  }
+}
+function resloveListData(barCodeOption, selections) {
+  return new Promise((reslove, reject) => {
+    const fields = barCodeOption.field.split(".");
+    const barcodeValues = [];
+    if (fields.length < 2) {
+      reslove([]);
+    }
+    try {
+      getBarcodeModelsByName(fields[1]).then((res) => {
+        selections.forEach((selection, index) => {
+          const barcodeValue = {
+            type: fields[0],
+            name: fields[1],
+            value: null,
+            index
+            // 记录当前行索引
+          };
+          barcodeValue.value = generateCodeByRule(JSON.parse(res.barcodeModelItems), selection);
+          barcodeValues.push(barcodeValue);
+        });
+        reslove(barcodeValues);
+      });
+    } catch (error) {
+      console.error("获取条码规则失败:", error);
+      reslove([]);
+    }
+  });
+}
+function printFormData(params, barCodeOptions, printTemplate, options, ext) {
+  if (barCodeOptions.length > 0) {
+    const valuePromises = [];
+    barCodeOptions.forEach((barCodeOption) => {
+      valuePromises.push(getFormBarCodeValue(params.pageContext, barCodeOption));
+    });
+    Promise.all(valuePromises).then((barcodeRuleValues) => {
+      const codeValue = {};
+      barcodeRuleValues.forEach((item) => {
+        if (item.type && item.name && item.value) {
+          if (!codeValue[item.type]) {
+            codeValue[item.type] = {};
+          }
+          codeValue[item.type][item.name] = item.value;
+        }
+      });
+      const data = {};
+      Object.assign(data, params.pageContext.entity, codeValue);
+      printTemplate.print(data, options, ext);
+    });
+  } else {
+    const data = {};
+    Object.assign(data, params.pageContext.entity);
+    printTemplate.print(data, options, ext);
+  }
+}
+function getFormBarCodeValue(pageContext, barCodeOption) {
+  return new Promise((reslove, reject) => {
+    const fields = barCodeOption.field.split(".");
+    const barcodeRule = {
+      type: null,
+      name: null,
+      value: null
+    };
+    if (fields.length < 2) {
+      reslove(barcodeRule);
+    }
+    barcodeRule.type = fields[0];
+    barcodeRule.name = fields[1];
+    try {
+      getBarcodeModelsByName(barcodeRule.name).then((res) => {
+        const rule = JSON.parse(res.barcodeModelItems);
+        barcodeRule.value = generateCodeByRule(rule, pageContext.entity.data);
+        reslove(barcodeRule);
+      });
+    } catch (error) {
+      console.error("获取条码规则失败:", error);
+      reslove(barcodeRule);
+    }
+  });
+}
+function getBarcodeModelsByName(name) {
+  const encodedParam = encodeURIComponent(name);
+  return http.get(
+    window["$vueApp"].config.globalProperties.baseAPI + `/dc/setting-barcode-models/by-name?name=${encodedParam}`
+  );
+}
+const printLabelUtil = { printLabel };
+export {
+  printLabelUtil as default,
+  printLabel
+};

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

@@ -36,6 +36,8 @@ export declare const standardEvents: {
     retrieveTask: (params: any) => Promise<unknown>;
     viewDetail: (params: any) => void;
     lineEditCreate: (params: any) => void;
+    printLabel: (params: any) => void;
+    queryCharts: (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;

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

@@ -12,6 +12,8 @@ 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";
+import { updateChartDatasources } from "../page-helper-util.js";
+import printLabelUtil from "./print-label.js";
 const standardEvents = {
   // 表单标准事件保存save
   save: function(params) {
@@ -206,6 +208,37 @@ const standardEvents = {
   lineEditCreate: function(params) {
     console.log("列表行编辑 新建lineEditCreate--params=", params);
     return lineEditCreateFunc(params);
+  },
+  printLabel: function(params) {
+    console.log("打印标签 打印标签事件--params=", params);
+    return printLabel(params);
+  },
+  queryCharts: function(params) {
+    console.log("查询统计图--params=", params);
+    const pageContext = params.pageContext;
+    const chartConfigs = pageContext.initChartServiceConfigs;
+    if (!chartConfigs || chartConfigs.length == 0) {
+      console.log("无需要查询的统计图数据");
+      return;
+    }
+    const configure = params.configureObj;
+    let runtimeProps = null;
+    if (configure && configure.runtime) {
+      runtimeProps = configure.runtime.props;
+    }
+    const hisState = runtimeProps ? runtimeProps.state : void 0;
+    if (runtimeProps) {
+      runtimeProps.state = "disabled";
+    }
+    updateChartDatasources(pageContext, chartConfigs, void 0).then(() => {
+      if (runtimeProps) {
+        runtimeProps.state = hisState;
+      }
+    }).catch(() => {
+      if (runtimeProps) {
+        runtimeProps.state = hisState;
+      }
+    });
   }
 };
 function exportFormReport(pageContext, configureObj, templateFile, isPdf) {
@@ -241,7 +274,7 @@ function exportFormReport(pageContext, configureObj, templateFile, isPdf) {
   if (logSetting) {
     param["logSettingText"] = logSetting;
   }
-  let additionalParamMap = getAdditionalParamMap(pageContext);
+  const additionalParamMap = getAdditionalParamMap(pageContext);
   param["additionalParamMap"] = additionalParamMap;
   let exportResult;
   if (isPdf) {
@@ -363,7 +396,6 @@ function getCommonFormRequestParam(pageContext, configureObj, isUnControlVersion
   }
   const param = {
     entity,
-    pageModel: pageContext.entity.page,
     tableName: pageContext.tableName,
     formNoRuleCode: pageContext.formNoRuleCode,
     isWorkflowEntity: isWorkflow,
@@ -391,14 +423,6 @@ function getCommonFormRequestParam(pageContext, configureObj, isUnControlVersion
       param["dataConversionRule"] = conversionCodes;
     }
   }
-  const autoSetValueData = configureObj.props.base.setValueList;
-  if (autoSetValueData) {
-    if (isArrayFn(autoSetValueData)) {
-      param["autoSetValueData"] = autoSetValueData.join(",");
-    } else if (typeof autoSetValueData === "string") {
-      param["autoSetValueData"] = autoSetValueData;
-    }
-  }
   const logSetting = configureObj.props.logSetting;
   if (logSetting) {
     param["logSettingText"] = logSetting;
@@ -416,7 +440,7 @@ function getCommonFormRequestParam(pageContext, configureObj, isUnControlVersion
   if (mainDefaultValueColumns) {
     param["mainDefaultValueColumns"] = mainDefaultValueColumns;
   }
-  let additionalParamMap = getAdditionalParamMap(pageContext);
+  const additionalParamMap = getAdditionalParamMap(pageContext);
   param["additionalParamMap"] = additionalParamMap;
   if (isUnControlVersion !== void 0) {
     param["unControlVersion"] = isUnControlVersion;
@@ -491,7 +515,7 @@ function dealAfterWithForm(pageContext, configureObj, data, successTip) {
   }
 }
 function afterSuccessOperateInForm(pageContext, configureObj, dataModel) {
-  let successOperation = configureObj.props.base.successOperation;
+  const successOperation = configureObj.props.base.successOperation;
   if (!successOperation || successOperation === null) {
     return;
   }
@@ -521,7 +545,11 @@ function closeDialog(pageContext, dataModel, isNeedValueMapping) {
     const isNeedValueMappingFinal = isNeedValueMapping !== void 0 && isNeedValueMapping === true && dataModel && dataModel !== void 0;
     const parentPageCode = pageContext.entity && pageContext.entity.request ? pageContext.entity.request.parentPageCode : null;
     const eventPageInfo = parentPageCode + "_";
-    eventBus.$emit(eventPageInfo + "close-dialog", { isNeedValueMapping: isNeedValueMappingFinal, dataModel, sourceTableName });
+    eventBus.$emit(eventPageInfo + "close-dialog", {
+      isNeedValueMapping: isNeedValueMappingFinal,
+      dataModel,
+      sourceTableName
+    });
   } else if (jumpMode === "openWindow" || jumpMode === "newTab") {
     if (window.parent) {
       window.parent.close();
@@ -555,7 +583,7 @@ function updateValuesWhenCloseDialog(parentPageContext, parentConfigureObj, sour
 function dealAfterWithList(pageContext, configureObj, row, successTip) {
   let successOperation = configureObj.props.base.successOperation;
   const isNeedValueMapping = configureObj.props.base.isNeedValueMapping;
-  let tableUuid = configureObj.props.base.tableUuid;
+  const tableUuid = configureObj.props.base.tableUuid;
   if (!successOperation) {
     successOperation = "refresh";
   }
@@ -841,7 +869,7 @@ function doImportFinally(params, fileObj) {
   if (functionCodes) {
     param.append("functionCode", functionCodes);
   }
-  let additionalParamMap = getAdditionalParamMap(pageContext);
+  const additionalParamMap = getAdditionalParamMap(pageContext);
   param.append("additionalParamMapStr", JSON.stringify(additionalParamMap));
   const isPermission = buttonConfigureBase.isPermission === void 0 || buttonConfigureBase.isPermission === "true" || buttonConfigureBase.isPermission;
   param.append("isPermission", isPermission + "");
@@ -996,14 +1024,6 @@ function getWorkflowSaveParams(params) {
       param["dataConversionRule"] = conversionCodes;
     }
   }
-  const autoSetValueData = configureObj.props.base.setValueList;
-  if (autoSetValueData) {
-    if (isArrayFn(autoSetValueData)) {
-      param["autoSetValueData"] = autoSetValueData.join(",");
-    } else if (typeof autoSetValueData === "string") {
-      param["autoSetValueData"] = autoSetValueData;
-    }
-  }
   if (pageContext.beanName) {
     param["beanName"] = pageContext.beanName;
   }
@@ -1014,7 +1034,7 @@ function getWorkflowSaveParams(params) {
   if (!param.systemCode) {
     param.systemCode = systemCode;
   }
-  let additionalParamMap = getAdditionalParamMap(pageContext);
+  const additionalParamMap = getAdditionalParamMap(pageContext);
   param["additionalParamMap"] = additionalParamMap;
   if (additionalParamMap.ids && additionalParamMap.ids.length > 0) {
     param["ids"] = additionalParamMap.ids;
@@ -1219,7 +1239,6 @@ function doAssign(params, selectNodeInfo) {
 function getTransactTaskParam(params) {
   const pageContext = params.pageContext;
   const dataModel = pageContext.entity.data;
-  const pageModel = pageContext.entity.page;
   const systemCode = pageContext.systemCode;
   const permissionPrefix = pageContext.code;
   const additionalParamMap = getAdditionalParamMap(pageContext);
@@ -1228,7 +1247,6 @@ function getTransactTaskParam(params) {
     beanName: pageContext.beanName,
     id: dataId,
     entity: dataModel,
-    pageModel,
     additionalParamMap,
     tableName: pageContext.tableName,
     functionCode: permissionPrefix + ".xxx",
@@ -1427,7 +1445,7 @@ function getTaskInformitions(params) {
     return;
   }
   const permissionPrefix = pageContext.code;
-  let additionalParamMap = getAdditionalParamMap(pageContext);
+  const additionalParamMap = getAdditionalParamMap(pageContext);
   const requestParams = {
     beanName: pageContext.beanName,
     additionalParamMap,
@@ -1526,6 +1544,22 @@ function lineEditCreateFunc(params) {
     gridRef.createRow(params);
   }
 }
+function printLabel(params) {
+  let templateUuid = null;
+  try {
+    if (params.menuItem) {
+      templateUuid = params.menuItem.templateUuid;
+    } else {
+      templateUuid = params.configureObj.props.base.template[0].templateUuid;
+    }
+    if (!templateUuid) {
+      throw new Error("未找到模板");
+    }
+  } catch (e) {
+    console.error("打印标签失败，未在配置中找到找到模板", e, params);
+  }
+  printLabelUtil.printLabel(params, templateUuid);
+}
 function isVisibleWorkflowButton(standardEventName, buttonInfo, completeTaskParam) {
   let isVisible = true;
   if (standardEventName && buttonInfo) {

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

@@ -339,6 +339,7 @@ function setValueForVariableName(entity, variableName, newValue) {
   setVariableValue(entity, fields, newValue);
 }
 function setVariableValue(entity, fields, newValue) {
+  debugger;
   if (!entity || !fields || fields.length == 0) {
     return;
   }

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

@@ -22,7 +22,7 @@ export declare function convertToPageContext(pageDesign: PageDesign, pageRequest
  * @param pageContext 页面对象
  * @param formItemConfigure 表单元素配置参数
  */
-export declare function getFormModelFields(pageContext: PageContext, formItemConfigure: Component): string[];
+export declare function getFormModelFields(pageContext: PageContext, formItemConfigure: Component, prop?: string): string[];
 /**
  * 获取组件的权限编码
  * @param configure

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

@@ -49,9 +49,9 @@ function convertToPageContext(pageDesign, pageRequest) {
       system: {}
     }
   };
-  if (pageDesign.props.activeWorkflow && pageDesign.props.workflowSource && pageDesign.props.workflowSource === "link") {
+  if (pageDesign.props && pageDesign.props.activeWorkflow && pageDesign.props.workflowSource && pageDesign.props.workflowSource === "link") {
     pageContext.workflowCode = pageDesign.props.linkWorkflowCode;
-  } else if (pageDesign.props.activeWorkflow && pageDesign.props.workflowSource && pageDesign.props.workflowSource === "create") {
+  } else if (pageDesign.props && pageDesign.props.activeWorkflow && pageDesign.props.workflowSource && pageDesign.props.workflowSource === "create") {
     pageContext.workflowCode = pageDesign.props.createWorkflowCode;
   }
   if (pageDesign.variables) {
@@ -111,15 +111,21 @@ function getRequestObject(pageRequest) {
     ;
   return requestObj;
 }
-function getFormModelFields(pageContext, formItemConfigure) {
+function getFormModelFields(pageContext, formItemConfigure, prop) {
   if (!formItemConfigure) {
     return ["temp"];
   }
   const entity = pageContext.entity;
-  const propsBase = formItemConfigure.props.base ? formItemConfigure.props.base : {};
-  let propName = propsBase.prop;
+  let propsBase;
+  let propName = prop;
+  if (!prop) {
+    propsBase = formItemConfigure.props.base ? formItemConfigure.props.base : {};
+    propName = propsBase.prop;
+  }
   let fields = null;
-  if (!propName || !propName.startsWith("${")) {
+  if (prop) {
+    fields = ["data", prop];
+  } else if (!propName || !propName.startsWith("${")) {
     fields = ["page", formItemConfigure.uuid];
   } else {
     propName = propName.substring(2, propName.length - 1);
@@ -129,7 +135,7 @@ function getFormModelFields(pageContext, formItemConfigure) {
     }
   }
   if (entity.data.ID == void 0 && entity.data.ID == void 0) {
-    if (propsBase.defaultValue) {
+    if (propsBase && propsBase.defaultValue) {
       let defaultValue = formatVariableValue(pageContext, propsBase.defaultValue);
       if (defaultValue != null && defaultValue != void 0) {
         let isMultiple = false;
@@ -204,6 +210,9 @@ function packageFormRules(pageContext, configure) {
   const prop = configure.props && configure.props.base ? configure.props.base.prop : null;
   if (prop) {
     const propName = getFormPropName(prop);
+    if (!pageContext.rules) {
+      pageContext.rules = {};
+    }
     if (!pageContext.rules[propName]) {
       pageContext.rules[propName] = [];
     }

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

@@ -1,15 +1,6 @@
 import { getBaseUrl } from "./common-util.js";
 import http from "agilebuilder-ui/src/utils/request";
 import eventBus from "./eventBus.js";
-function getDataTypeMap(backendUrl, tableName) {
-  return new Promise((resolve, reject) => {
-    getDataTypeMapRequest(backendUrl, tableName).then((dataTypeMap) => {
-      resolve(dataTypeMap);
-    }).catch(() => {
-      reject(new Error("获得数据表：" + tableName + "的字段类型集合失败"));
-    });
-  });
-}
 function getDataTypeMapRequest(backendUrl, tableName) {
   const baseUrl = getBaseUrl(backendUrl);
   return http.get(baseUrl + "/dsc/commons/tables/" + tableName + "/data-types");
@@ -18,6 +9,6 @@ function popupToPage(params) {
   eventBus.$emit(params.pageCode + "_open-dialog", params);
 }
 export {
-  getDataTypeMap,
+  getDataTypeMapRequest,
   popupToPage
 };

package/dist/es/components/runtime/views/assemblys/button/print-label/printlabel-runtime.vue.js

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

package/dist/es/components/runtime/views/assemblys/button/print-label/printlabel-runtime.vue2.js

@@ -0,0 +1,96 @@
+import { defineComponent, ref, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createVNode, createElementBlock, Fragment, renderList, createTextVNode, toDisplayString } from "vue";
+import "agilebuilder-ui";
+import { handleEvent } from "../../../../utils/events/event-util.js";
+import _sfc_main$1 from "../button/button-runtime.vue2.js";
+const _hoisted_1 = { key: 1 };
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  __name: "printlabel-runtime",
+  props: {
+    pageContext: {},
+    configure: {}
+  },
+  setup(__props) {
+    const props = __props;
+    const runtimeInfo = props.configure.runtime ? props.configure.runtime : {};
+    const designProperty = ref(runtimeInfo.props ? runtimeInfo.props : {});
+    const showDropdown = ref(false);
+    if (designProperty.value.template && designProperty.value.template.length > 1) {
+      showDropdown.value = true;
+    }
+    const runtimeStyle = runtimeInfo.style;
+    const runtimeClass = runtimeInfo.class;
+    return (_ctx, _cache) => {
+      const _component_el_button = resolveComponent("el-button");
+      const _component_ArrowDown = resolveComponent("ArrowDown");
+      const _component_el_icon = resolveComponent("el-icon");
+      const _component_el_text = resolveComponent("el-text");
+      const _component_el_dropdown_item = resolveComponent("el-dropdown-item");
+      const _component_el_dropdown_menu = resolveComponent("el-dropdown-menu");
+      const _component_el_dropdown = resolveComponent("el-dropdown");
+      return !showDropdown.value ? (openBlock(), createBlock(_sfc_main$1, {
+        key: 0,
+        configure: _ctx.configure,
+        pageContext: _ctx.pageContext
+      }, null, 8, ["configure", "pageContext"])) : (openBlock(), createBlock(_component_el_dropdown, {
+        key: 1,
+        class: normalizeClass(unref(runtimeClass)),
+        style: normalizeStyle(unref(runtimeStyle)),
+        placement: designProperty.value.placement,
+        "split-button": designProperty.value.splitButton,
+        disabled: designProperty.value.state === "disabled",
+        type: designProperty.value.buttonType,
+        size: designProperty.value.size,
+        trigger: designProperty.value.trigger
+      }, {
+        dropdown: withCtx(() => [
+          createVNode(_component_el_dropdown_menu, null, {
+            default: withCtx(() => [
+              (openBlock(true), createElementBlock(Fragment, null, renderList(designProperty.value.template, (item, index) => {
+                return openBlock(), createBlock(_component_el_dropdown_item, {
+                  key: item,
+                  onClick: ($event) => unref(handleEvent)($event, _ctx.pageContext, _ctx.configure, "click", { menuItem: item })
+                }, {
+                  default: withCtx(() => [
+                    createTextVNode(toDisplayString(item.label), 1)
+                  ]),
+                  _: 2
+                }, 1032, ["onClick"]);
+              }), 128))
+            ]),
+            _: 1
+          })
+        ]),
+        default: withCtx(() => [
+          designProperty.value.triggerElement === "button" ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
+            !designProperty.value.splitButton ? (openBlock(), createBlock(_component_el_button, {
+              key: 0,
+              size: designProperty.value.size,
+              type: designProperty.value.buttonType,
+              onClick: _cache[0] || (_cache[0] = ($event) => unref(handleEvent)($event, _ctx.pageContext, _ctx.configure, "menuClick"))
+            }, {
+              default: withCtx(() => [
+                createTextVNode(toDisplayString(designProperty.value.title), 1)
+              ]),
+              _: 1
+            }, 8, ["size", "type"])) : (openBlock(), createElementBlock("span", _hoisted_1, toDisplayString(designProperty.value.title), 1))
+          ], 64)) : (openBlock(), createBlock(_component_el_text, { key: 1 }, {
+            default: withCtx(() => [
+              createTextVNode(toDisplayString(designProperty.value.title) + " ", 1),
+              createVNode(_component_el_icon, null, {
+                default: withCtx(() => [
+                  createVNode(_component_ArrowDown)
+                ]),
+                _: 1
+              })
+            ]),
+            _: 1
+          }))
+        ]),
+        _: 1
+      }, 8, ["class", "style", "placement", "split-button", "disabled", "type", "size", "trigger"]));
+    };
+  }
+});
+export {
+  _sfc_main as default
+};

package/dist/es/components/runtime/views/assemblys/container/flex/flex-runtime.vue2.js

@@ -22,7 +22,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         justify: designProperty.value.flexJustify,
         gutter: designProperty.value.flexGutter,
         align: designProperty.value.alignItems,
-        style: normalizeStyle(unref(runtimeStyle)),
+        style: normalizeStyle([{ "display": "flex" }, unref(runtimeStyle)]),
         class: normalizeClass(unref(runtimeClass))
       }, {
         default: withCtx(() => [

package/dist/es/components/runtime/views/assemblys/data/bar-code/barcode-runtime.vue2.js

@@ -2,6 +2,7 @@ import { defineComponent, computed, ref, onMounted, watch, resolveComponent, ope
 import qrcode from "qrcode";
 import JsBarcode from "jsbarcode";
 import { getFormModelFields } from "../../../../utils/page-init-util.js";
+import { generateCodeByRule } from "../../../../utils/barcode-util.js";
 import { getVariableValue, setVariableValue } from "../../../../utils/page-helper-util.js";
 import { handleEvent } from "../../../../utils/events/event-util.js";
 import "agilebuilder-ui/src/utils/request";
@@ -78,7 +79,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             () => props.pageContext.entity.data[item.fieldName],
             (newValue, oldValue) => {
               if (newValue !== void 0 && newValue !== null) {
-                generateCodeByRule(rule);
+                const codeValue = generateCodeByRule(rule, props.pageContext.entity.data);
+                if (codeValue) {
+                  generateCode(codeValue);
+                }
               }
             }
           );
@@ -101,38 +105,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         generateCode(barCodeValue);
       }
     }
-    function generateCodeByRule(rule) {
-      let allVariablesPresent = true;
-      let value = "";
-      rule.forEach((item) => {
-        if (item.fieldName !== "-1" && item.fieldName !== -1) {
-          const filedValue = props.pageContext.entity.data[item.fieldName];
-          if (item.suppliement && item.fieldLength) {
-            if (!filedValue) {
-              value += "".padEnd(item.fieldLength, item.suppliement);
-            } else {
-              if (filedValue.length > item.fieldLength) {
-                value += filedValue.substring(0, item.fieldLength);
-              } else {
-                value += filedValue.padEnd(item.fieldLength, item.suppliement);
-              }
-            }
-          } else {
-            if (!filedValue) {
-              allVariablesPresent = false;
-            } else {
-              value += filedValue;
-            }
-          }
-        } else {
-          value += item.fixedValue;
-        }
-      });
-      console.log(value);
-      if (allVariablesPresent) {
-        generateCode(value);
-      }
-    }
     function generateCode(value) {
       createCode(value);
       setValue(value);

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

@@ -4,7 +4,7 @@ import { setTableEvents, getEventFuncByType, canExecuteButton, doAfterClickEvent
 import { getListCode, getRealRestApiPath } from "../../../../utils/common-util.js";
 import { getAdditionalParamMap, getSaveFormRequestWithRow, standardEvents } from "../../../../utils/events/standard-event.js";
 import { isPromise } from "agilebuilder-ui/src/utils/common-util";
-import { getDataTypeMap, popupToPage } from "../../../../utils/table-utils.js";
+import { getDataTypeMapRequest, popupToPage } from "../../../../utils/table-utils.js";
 import eventBus from "../../../../utils/eventBus.js";
 import { getPermissionCodes } from "../../../../utils/page-init-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -22,7 +22,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const runtimeClass = runtimeInfo.class;
     const systemCode = pageContext.systemCode;
     const backendUrl = pageContext.backendUrl;
-    const tableName = pageContext.tableName;
+    debugger;
+    const tableName = configure.props && configure.props.dataOrigin && configure.props.dataOrigin.tableName;
     let baseURL = pageContext.backendUrl;
     if (!baseURL) {
       baseURL = window["$vueApp"].config.globalProperties.baseURL;
@@ -155,7 +156,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (!backendUrl && !tableName) {
         return;
       }
-      getDataTypeMap(backendUrl, tableName).then((result) => {
+      getDataTypeMapRequest(backendUrl, tableName).then((result) => {
         if (!pageContext["dataTypeMaps"]) {
           pageContext["dataTypeMaps"] = {};
         }

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

@@ -16,8 +16,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const props = __props;
     const pageContext = props.pageContext;
     const configure = props.configure;
+    const listCode = getListCode(pageContext.code, pageContext.version, configure.uuid);
     const dataModel = pageContext.entity.data;
-    const prop = configure.props && configure.props.base ? configure.props.base.prop : null;
+    const prop = listCode;
     const additionalParamMap = getAdditionalParamMap(pageContext);
     const tableEvents = configure.runtime && configure.runtime.events ? configure.runtime.events : [];
     const selections = ref([]);
@@ -28,7 +29,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const runtimeStyle = runtimeInfo.style;
     const runtimeClass = runtimeInfo.class;
     const entity = props.pageContext.entity ? props.pageContext.entity : {};
-    let dynamicFields = getFormModelFields(props.pageContext, props.configure);
+    let dynamicFields = getFormModelFields(props.pageContext, props.configure, prop);
     const listViewShowFlag = ref(false);
     const baseURL = window["$vueApp"].config.globalProperties.baseURL;
     const listViewOptions = ref({
@@ -50,13 +51,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     if (runtimeClass) {
       listViewOptions.value["tableClass"] = runtimeClass;
     }
-    if (configure.props && configure.props.base && configure.props.base.subPaging === void 0 || configure.props.base.subPaging === null || configure.props.base.subPaging === false) {
-      listViewOptions.value.showPageArea = false;
-    } else {
+    if (configure.props && configure.props.base && configure.props.base.subPaging === true) {
       listViewOptions.value.showPageArea = true;
+    } else {
+      listViewOptions.value.showPageArea = false;
     }
     const gridRef = ref(null);
-    const listCode = getListCode(pageContext.code, pageContext.version, configure.uuid);
     function currencyListViewSetting(canRrefreshSubtableData) {
       if (canRrefreshSubtableData === void 0) {
         canRrefreshSubtableData = judgeInitializationSubTable();
@@ -115,11 +115,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return getVariableValue(entity, dynamicFields);
     }
     function changeInitializationSubTable(canRrefreshSubtableData) {
+      debugger;
       currencyListViewSetting(canRrefreshSubtableData);
       listViewOptions.value["isPageInfo"] = false;
-      listViewOptions.value["subTableData"] = null;
+      listViewOptions.value["subTableData"] = getValue();
       listViewOptions.value.extraParam["subTableListViewCode"] = listCode;
-      listViewOptions.value.extraParam["subtableSetting"] = configure.props || !configure.props.otherSettings ? JSON.stringify(configure.props.otherSettings.subtableSetting) : null;
+      listViewOptions.value.extraParam["subtableSetting"] = configure.props && configure.props.otherSettings ? JSON.stringify(configure.props.otherSettings.subtableSetting) : null;
       listViewOptions.value.extraParam["additionalParamMap"] = additionalParamMap;
       listViewOptions.value.extraParam["entityMap"] = pageContext.entity.data;
       setGridDataEventOptions();
@@ -129,7 +130,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         setGridToStore();
       }, 10);
     }
-    changeInitializationSubTable();
     function setGridDataEventOptions() {
       setSubTableValidateInfo();
       setTableEvents(listViewOptions.value, tableEvents, pageContext, configure);
@@ -164,6 +164,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
         listViewOptions.value["actionPermission"] = actionPermission;
       }
+      if (!listViewOptions.value["operations"]) {
+        listViewOptions.value["operations"] = {};
+      }
       const subTableOperations = getOperations();
       listViewOptions.value["operations"]["operation"] = subTableOperations;
       listViewOptions.value["subTableCanAdd"] = isShowAdd();
@@ -175,6 +178,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       pageContext.tableUuids.push(configure.uuid);
     }
     function getOperations() {
+      debugger;
       let operations = [];
       if (isShowAdd()) {
         const addButton = {
@@ -207,6 +211,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       return operations;
     }
+    changeInitializationSubTable();
     function getEntityId(row) {
       if (row && row.id) {
         return row.id;
@@ -281,6 +286,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       gridRef.value.deleteRow(rowIndex, listCode, false);
     }
     function changeGridData(gridData) {
+      debugger;
       setVariableValue(entity, dynamicFields, gridData);
     }
     function changeRowsPerpage(pageSize) {

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

@@ -19,7 +19,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const tableUuid = props.configure.uuid;
     const superGridItems = props.pageContext.superGridItems;
     const superGridSetting = superGridItems ? superGridItems[tableUuid] : null;
-    tableConfigure.value = superGridSetting.configure ? JSON.parse(superGridSetting.configure) : null;
+    tableConfigure.value = superGridSetting ? superGridSetting.configure ? JSON.parse(superGridSetting.configure) : null : props.configure;
+    debugger;
     const runtimeInfo = props.configure.runtime ? props.configure.runtime : {};
     runtimeInfo.style;
     runtimeInfo.class;
@@ -71,7 +72,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           ref_key: "gridRef",
           ref: gridRef,
           pageContext: _ctx.pageContext,
-          configure: _ctx.configure
+          configure: tableConfigure.value
         }, null, 8, ["pageContext", "configure"])) : (openBlock(), createBlock(_sfc_main$2, {
           key: 1,
           ref_key: "gridRef",

package/dist/es/components/runtime/views/assemblys/form/date-picker/datepicker-runtime.vue2.js

@@ -1,7 +1,7 @@
 import { defineComponent, computed, ref, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createElementBlock, toDisplayString, createCommentVNode } from "vue";
 import { getFormModelFields } from "../../../../utils/page-init-util.js";
 import { getVariableValue, setVariableValue } from "../../../../utils/page-helper-util.js";
-import { handleEvent } from "../../../../utils/events/event-util.js";
+import { getCustomFunc, handleEvent } from "../../../../utils/events/event-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "datepicker-runtime",
   props: {
@@ -25,6 +25,30 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const runtimeClass = runtimeInfo.class;
     const headerStyle = runtimeInfo.headerStyle;
     const designProperty = ref(runtimeInfo.props ? runtimeInfo.props : {});
+    if (designProperty.value.shortcutsFunc) {
+      const func = getCustomFunc(props.pageContext, designProperty.value.shortcutsFunc);
+      if (func) {
+        let returns = func.apply(func, [
+          {
+            pageContext: props.pageContext,
+            configureObj: props.configure
+          }
+        ]);
+        if (returns) {
+          if (typeof returns === "object") {
+            returns = [returns];
+          }
+          if (!designProperty.value.shortcuts) {
+            designProperty.value.shortcuts = [];
+          }
+          for (let r of returns) {
+            if (r.text && r.value) {
+              designProperty.value.shortcuts.push(r);
+            }
+          }
+        }
+      }
+    }
     return (_ctx, _cache) => {
       const _component_el_time_picker = resolveComponent("el-time-picker");
       const _component_el_date_picker = resolveComponent("el-date-picker");

package/dist/es/components/runtime/views/assemblys/form/file-upload/fileupload-runtime.vue2.js

@@ -1,6 +1,8 @@
-import { defineComponent, ref, watch, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createElementBlock, toDisplayString, createCommentVNode, createVNode } from "vue";
+import { defineComponent, ref, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createElementBlock, toDisplayString, createCommentVNode, createVNode } from "vue";
 import { getVariableValue, setVariableValue } from "../../../../utils/page-helper-util.js";
-import { fileUploadBeforeUpload, fileUploadUploaded, fileUploadBeforeDelete, fileUploadDeleted } from "../../../../utils/events/event-util.js";
+import { fileUploadBeforeUpload } from "../../../../utils/events/event-util.js";
+import http from "agilebuilder-ui/src/utils/request";
+import FsUploadNew from "agilebuilder-ui";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "fileupload-runtime",
   props: {
@@ -14,25 +16,36 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const runtimeStyle = runtimeInfo.style;
     const runtimeClass = runtimeInfo.class;
     const headerStyle = runtimeInfo.headerStyle;
-    const fileSetObj = designProperty.value.fileSetObj;
-    fileSetObj.beforeUpload = beforeUpload;
-    fileSetObj.pageContext = props.pageContext;
-    fileSetObj.configureObj = props.configure;
     const entity = props.pageContext.entity ? props.pageContext.entity : {};
     const propsBase = props.configure.props.base ? props.configure.props.base : {};
-    propsBase.prop;
     const pathFields = getFieldsByVariable(propsBase.prop);
     const nameFields = getFieldsByVariable(propsBase.propName);
-    const initNames = getVariableValue(entity, nameFields);
     const initPaths = getVariableValue(entity, pathFields);
-    const fileInfo = ref({
-      name: initNames ? initNames : "",
-      serverPath: initPaths ? initPaths : ""
-    });
-    watch(fileInfo, () => {
-      setVariableValue(entity, nameFields, fileInfo.name);
-      setVariableValue(entity, pathFields, fileInfo.serverPath);
-    });
+    const fileList = ref([]);
+    const fileInfo = ref({});
+    const baseURL = window.$vueApp.config.globalProperties.baseURL;
+    const baseAPI = window.$vueApp.config.globalProperties.baseAPI;
+    let url = baseURL;
+    if (!isPlateSys(props.pageContext.systemCode)) {
+      url = baseAPI;
+    }
+    if (initPaths) {
+      const uuids = initPaths.split(",");
+      if (uuids.length > 0) {
+        http.post(url + "/common/fs-upload/search-file-names").then((result) => {
+          const names = [];
+          for (let index = 0; index < uuids.length; index++) {
+            const uuid = uuids[index];
+            names.push(result[uuid]);
+            fileList.value.push({ showName: result[uuid], serverPath: uuid });
+          }
+          if (designProperty.value.displayType === "input") {
+            fileInfo.value.showName = names.join(",");
+            fileInfo.value.serverPath = uuids.join(",");
+          }
+        });
+      }
+    }
     function getFieldsByVariable(variableName) {
       if (!variableName) {
         return [];
@@ -45,17 +58,30 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function beforeUpload(params) {
       return fileUploadBeforeUpload(params);
     }
-    function uploaded(params) {
-      return fileUploadUploaded(props.pageContext, props.configure, params);
-    }
-    function beforeDelete(params) {
-      return fileUploadBeforeDelete(props.pageContext, props.configure, params);
-    }
-    function deleted(params) {
-      return fileUploadDeleted(props.pageContext, props.configure, params);
+    const onSuccess = (response, uploadFile, uploadFiles) => {
+      updateValue();
+    };
+    const onRemove = (file) => {
+      updateValue();
+    };
+    const updateValue = () => {
+      const names = [];
+      const uuids = [];
+      for (let index = 0; index < fileList.value.length; index++) {
+        names.push(fileList.value[index].showName);
+        uuids.push(fileList.value[index].serverPath);
+      }
+      setVariableValue(props.pageContext.entity, pathFields, uuids.join(","));
+      setVariableValue(props.pageContext.entity, nameFields, names.join(","));
+    };
+    function isPlateSys(systemCode) {
+      if (systemCode && (systemCode === "agilebuilder" || systemCode === "portal" || systemCode === "mms" || systemCode === "task" || systemCode === "wf" || systemCode === "dc" || systemCode === "mc" || systemCode === "mobile" || systemCode === "acs" || systemCode === "bs" || systemCode === "pcm")) {
+        return true;
+      } else {
+        return false;
+      }
     }
     return (_ctx, _cache) => {
-      const _component_FsUploadList = resolveComponent("FsUploadList");
       const _component_el_form_item = resolveComponent("el-form-item");
       return designProperty.value.tittleShow ? (openBlock(), createBlock(_component_el_form_item, {
         key: 0,
@@ -71,25 +97,37 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }, toDisplayString(designProperty.value.title), 5)) : createCommentVNode("", true)
         ]),
         default: withCtx(() => [
-          createVNode(_component_FsUploadList, {
+          createVNode(unref(FsUploadNew), {
             disabled: designProperty.value.state == "disabled",
-            fileSetObj: designProperty.value.fileSetObj,
-            fileInfo: fileInfo.value,
-            onUploaded: uploaded,
-            onBeforeDelete: beforeDelete,
-            onDeleted: deleted
-          }, null, 8, ["disabled", "fileSetObj", "fileInfo"])
+            displayType: designProperty.value.displayType,
+            accept: designProperty.value.accept,
+            multiple: designProperty.value.multiple,
+            placeholder: designProperty.value.placeholder,
+            limit: designProperty.value.limit,
+            "limit-file-size": designProperty.value.limitFileSize,
+            "file-info": fileInfo.value,
+            "file-list": fileList.value,
+            "on-success": onSuccess,
+            "on-remove": onRemove,
+            "before-upload": beforeUpload
+          }, null, 8, ["disabled", "displayType", "accept", "multiple", "placeholder", "limit", "limit-file-size", "file-info", "file-list"])
         ]),
         _: 1
-      }, 8, ["required", "class", "label-width", "style"])) : (openBlock(), createBlock(_component_FsUploadList, {
+      }, 8, ["required", "class", "label-width", "style"])) : (openBlock(), createBlock(unref(FsUploadNew), {
         key: 1,
         disabled: designProperty.value.state == "disabled",
-        fileSetObj: designProperty.value.fileSetObj,
-        fileInfo: fileInfo.value,
-        onUploaded: uploaded,
-        onBeforeDelete: beforeDelete,
-        onDeleted: deleted
-      }, null, 8, ["disabled", "fileSetObj", "fileInfo"]));
+        displayType: designProperty.value.displayType,
+        accept: designProperty.value.accept,
+        multiple: designProperty.value.multiple,
+        placeholder: designProperty.value.placeholder,
+        limit: designProperty.value.limit,
+        "limit-file-size": designProperty.value.limitFileSize,
+        "file-info": fileInfo.value,
+        "file-list": fileList.value,
+        "on-success": onSuccess,
+        "on-remove": onRemove,
+        "before-upload": beforeUpload
+      }, null, 8, ["disabled", "displayType", "accept", "multiple", "placeholder", "limit", "limit-file-size", "file-info", "file-list"]));
     };
   }
 });

package/dist/es/components/runtime/views/assemblys/object-render.vue.js

@@ -142,7 +142,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         pageContext: _ctx.pageContext
       }, null, 8, ["style", "class", "configure", "pageContext"])), [
         [vShow, unref(showFlag)],
-        [_directive_permission, unref(permissionCodes)]
+        [_directive_permission, unref(permissionCodes) ? unref(permissionCodes) : "true"]
       ]);
     };
   }

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

@@ -40,6 +40,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         } catch (error) {
           console.error(error);
         }
+        if (dataId.value === null || dataId.value === void 0) {
+          dataId.value = props.parentPageEventParams["id"];
+        }
       }
       pageRequest.value["parentPageCode"] = myJumpPageSetting && myJumpPageSetting["parentPageCode"] ? myJumpPageSetting["parentPageCode"] : null;
       pageRequest.value["parentPageVersion"] = myJumpPageSetting && myJumpPageSetting["parentPageVersion"] ? myJumpPageSetting["parentPageVersion"] : null;

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

@@ -173,7 +173,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         parentPageContext.value = params.pageContext;
         parentConfigureObj.value = params.configureObj;
         parentEventParams.value = params.eventParams;
-        openDialog(parentConfigureObj.value);
+        openDialog(parentConfigureObj.value, parentEventParams.value);
       });
       eventBus.$on(
         eventPageInfo.value + "close-dialog",
@@ -181,7 +181,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           closeDialog({ isNeedValueMapping, dataModel, sourceTableName });
         }
       );
-      getFormData(pageContext.value);
       watch(
         () => pageContext.value.isRefresh,
         (newValue) => {
@@ -194,6 +193,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }
         }
       );
+      return getFormData(pageContext.value);
     }
     function initOptionDatas(pageContext2, optionConfigs) {
       if (!optionConfigs || optionConfigs.length == 0) {
@@ -219,28 +219,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     }
     onMounted(() => {
-      if (props.pageDesign != null) {
-        pageDesignResult.value = props.pageDesign;
-        setTimeout(() => {
-          initPageDesign(props.pageDesign);
-          if (props.pageDesign.tableRuntimes && Object.keys(props.pageDesign.tableRuntimes).length > 0) {
-            queryPageSuperGrids(props.pageDesign, pageContext.value, props.publishVersion).then((superGridItems) => {
-              pageContext.value.superGridItems = superGridItems;
-              isShowPage.value = true;
-            }).catch(() => {
-              isShowPage.value = true;
-            });
-          } else {
-            isShowPage.value = true;
-          }
-        }, 0);
-      } else if (props.pageCode) {
-        queryPageDesignByCode(props.pageCode).then((result) => {
-          pageDesignResult.value = result;
-          initPageDesign(result);
-          isShowPage.value = true;
-        });
-      }
+      initPage();
       if (thisRef.value) {
         setTimeout(() => {
           const parentNode = thisRef.value.parentNode ? thisRef.value.parentNode : thisRef.value;
@@ -251,6 +230,36 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }, 10);
       }
     });
+    function initPage() {
+      if (props.pageDesign != null) {
+        pageDesignResult.value = props.pageDesign;
+        setTimeout(() => {
+          initPageDesign(props.pageDesign).then(() => {
+            if (props.pageDesign.tableRuntimes && Object.keys(props.pageDesign.tableRuntimes).length > 0) {
+              queryPageSuperGrids(props.pageDesign, pageContext.value, props.publishVersion).then((superGridItems) => {
+                pageContext.value.superGridItems = superGridItems;
+                isShowPage.value = true;
+              }).catch(() => {
+                isShowPage.value = true;
+              });
+            } else {
+              isShowPage.value = true;
+            }
+          });
+        }, 0);
+      } else if (props.pageCode) {
+        queryPageDesignByCode(props.pageCode).then((appPageDesign) => {
+          if (appPageDesign && appPageDesign.designJson) {
+            const designJson = appPageDesign.designJson;
+            const pageConf = JSON.parse(designJson);
+            pageDesignResult.value = pageConf;
+            initPageDesign(pageConf).then(() => {
+              isShowPage.value = true;
+            });
+          }
+        });
+      }
+    }
     onUpdated(() => {
       nextTick(() => {
         if (pageContext.value && thisRef.value) {
@@ -337,16 +346,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       doRemoveSigners(buttonParams.value, selectRemoveTasks);
     }
     const router = useRouter();
-    function openDialog(configureObj) {
+    function openDialog(configureObj, eventParams) {
       const myJumpPageSetting = configureObj && configureObj["props"] && configureObj["props"].linkPage ? configureObj["props"].linkPage : null;
       if (myJumpPageSetting && myJumpPageSetting.jumpPageUrl) {
         const additionalParamMap = getAdditionalParamMap(pageContext);
-        let dataId;
-        let ids;
-        if (additionalParamMap) {
-          dataId = additionalParamMap.id;
-          ids = additionalParamMap.ids;
-        }
+        let dataId = eventParams ? eventParams.id : null;
+        let ids = eventParams ? eventParams.ids : null;
         const dataModel = pageContext.value.entity.data;
         const pageModel = pageContext.value.entity.page;
         let entity = {};
@@ -380,14 +385,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         console.error("页面配置信息不存在");
       }
     }
-    function closeDialog({ isNeedValueMapping, dataModel, sourceTableName }) {
-      if (isNeedValueMapping) {
-        updateValuesWhenCloseDialog(
-          parentPageContext.value,
-          parentConfigureObj.value,
-          dataModel,
-          sourceTableName
-        );
+    function closeDialog(params) {
+      if (params) {
+        const isNeedValueMapping = params.isNeedValueMapping;
+        const dataModel = params.dataModel;
+        const sourceTableName = params.sourceTableName;
+        if (isNeedValueMapping) {
+          updateValuesWhenCloseDialog(
+            parentPageContext.value,
+            parentConfigureObj.value,
+            dataModel,
+            sourceTableName
+          );
+        }
       }
       parentPageContext.value = null;
       parentConfigureObj.value = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-runtime",
-  "version": "2.0.25",
+  "version": "2.0.27",
   "description": "AgileBuilder super page runtime",
   "license": "ISC",
   "main": "dist/es/index.js",
@@ -35,7 +35,8 @@
     "vue-awesome": "^4.5.0",
     "vue-codemirror": "^6.1.1",
     "vue-draggable-plus": "^0.3.5",
-    "vue-echarts": "^6.6.9"
+    "vue-echarts": "^6.6.9",
+    "vue-plugin-hiprint": "^0.0.56"
   },
   "devDependencies": {
     "@element-plus/icons": "^0.0.11",
@@ -47,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.19",
+    "agilebuilder-ui": "1.0.22",
     "axios": "^1.6.8",
     "cypress": "^13.6.6",
     "element-plus": "^2.6.1",