super-page-runtime 2.0.43-beta1 → 2.0.43-beta2

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

@@ -37,11 +37,11 @@ function packageTemplateFiles(templateFiles) {
   }
   const currentLocale = getLanguageWithLocale();
   if (Array.isArray(templateFiles)) {
-    let templateFilesResult = [];
-    let fileCodes = [];
+    const templateFilesResult = [];
+    const fileCodes = [];
     const fileSeperate = "~-~-";
     templateFiles.forEach((template) => {
-      let showName = template.templateShowPath;
+      const showName = template.templateName;
       if (showName.indexOf(fileSeperate) > 0) {
         const fileCode = showName.substring(0, showName.indexOf(fileSeperate));
         const fileLanguage = showName.substring(
@@ -53,8 +53,8 @@ function packageTemplateFiles(templateFiles) {
         );
         if (currentLocale === fileLanguage && fileCodes.indexOf(fileCode) < 0) {
           templateFilesResult.push({
-            templateUUID: template.templateUUID,
-            templateShowPath: fileName
+            templateUuid: template.templateUuid,
+            templateName: fileName
           });
           fileCodes.push(fileCode);
         }

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

@@ -1,3 +1,5 @@
+import { PageContext } from '../interfaces/page-design-types';
+
 export declare const standardEvents: {
     save: (params: any) => Promise<unknown>;
     saveList: (params: any) => Promise<unknown>;
@@ -40,7 +42,7 @@ export declare const standardEvents: {
     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;
+export declare function getSaveFormRequestWithRow(pageContext: PageContext, configureObj: any, url: string, isUnControlVersion: boolean, mainDefaultValueColumns: any, dynamicColumnInfo: any, row: any, commonParams: 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

@@ -415,7 +415,7 @@ function getCommonFormRequestParam(pageContext, configureObj, isUnControlVersion
   }
   return param;
 }
-function getSaveFormRequestWithRow(pageContext, configureObj, url, isUnControlVersion, mainDefaultValueColumns, dynamicColumnInfo, row) {
+function getSaveFormRequestWithRow(pageContext, configureObj, url, isUnControlVersion, mainDefaultValueColumns, dynamicColumnInfo, row, commonParams) {
   const systemCode = pageContext.systemCode;
   const backendUrl = pageContext.backendUrl;
   const param = getCommonFormRequestParam(
@@ -427,6 +427,11 @@ function getSaveFormRequestWithRow(pageContext, configureObj, url, isUnControlVe
     null,
     row
   );
+  if (commonParams) {
+    if (commonParams.tableName) {
+      param.tableName = commonParams.tableName;
+    }
+  }
   return getSaveFormRequestByParam(systemCode, backendUrl, param, url, pageContext.entity.data);
 }
 function getSaveFormRequest(pageContext, configureObj, url, isUnControlVersion, mainDefaultValueColumns, dynamicColumnInfo) {
@@ -437,6 +442,7 @@ function getSaveFormRequest(pageContext, configureObj, url, isUnControlVersion,
     isUnControlVersion,
     mainDefaultValueColumns,
     dynamicColumnInfo,
+    null,
     null
   );
 }

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

@@ -290,11 +290,11 @@ function packageCustomRules(orgCustomRules, orgRules) {
 }
 function validateSubTables(pageContext) {
   if (!pageContext) {
-    return;
+    return true;
   }
   const tableUuidArr = pageContext.tableUuids;
   if (!tableUuidArr) {
-    return;
+    return true;
   }
   for (let i = 0; i < tableUuidArr.length; i++) {
     const tableUuid = tableUuidArr[i];

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

@@ -24,23 +24,23 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     onMounted(() => {
       if (configureBase.templateFiles && configureBase.templateFiles.length > 0) {
         templateFiles.value = packageTemplateFiles(configureBase.templateFiles);
-      } else if (configureBase.templateUUID && configureBase.templateShowPath) {
+      } else if (configureBase.templateUuid && configureBase.templateName) {
         templateFiles.value.push({
-          templateUUID: configureBase.templateUUID,
-          templateShowPath: configureBase.templateShowPath
+          templateUuid: configureBase.templateUuid,
+          templateName: configureBase.templateName
         });
       }
       templateFiles.value.forEach((item) => {
-        if (item && item.templateShowPath) {
-          item.templateShowPath = formatTemplateShowPath(item.templateShowPath);
+        if (item && item.templateName) {
+          item.templateName = formatTemplateShowName(item.templateName);
         }
       });
     });
-    function getFileds(templateShowPath) {
-      console.log("templateShowPath", templateShowPath);
+    function getFileds(templateShowName) {
+      console.log("templateShowName", templateShowName);
       let field;
       let formatStr;
-      let newValue = templateShowPath;
+      let newValue = templateShowName;
       const prefixIndex = newValue.indexOf(prefix);
       const suffixIndex = newValue.indexOf(suffix);
       console.log("prefixIndex", prefixIndex);
@@ -50,14 +50,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           newValue = newValue.substring(0, suffixIndex) + newValue.substring(suffixIndex + suffix.length);
           console.log("non replacement value === newValue", newValue);
         } else {
-          field = newValue.substring(
-            prefixIndex + prefix.length,
-            suffixIndex
-          );
-          formatStr = newValue.substring(
-            prefixIndex,
-            suffixIndex + suffix.length
-          );
+          field = newValue.substring(prefixIndex + prefix.length, suffixIndex);
+          formatStr = newValue.substring(prefixIndex, suffixIndex + suffix.length);
           console.log("field", field);
           console.log("formatStr", formatStr);
           fields.value.push(field);
@@ -69,18 +63,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       return fields.value;
     }
-    function formatTemplateShowPath(templateShowPath) {
-      const fields2 = getFileds(templateShowPath);
+    function formatTemplateShowName(templateShowName) {
+      const fields2 = getFileds(templateShowName);
       console.log("fields", fields2);
       fields2.forEach((field) => {
         const formatStr = prefix + field + suffix;
         let formatValue;
-        if (templateShowPath.indexOf(formatStr) !== -1 && dataModel.hasOwnProperty(field)) {
+        if (templateShowName.indexOf(formatStr) !== -1 && dataModel.hasOwnProperty(field)) {
           formatValue = dataModel[field] ? dataModel[field] : "";
-          templateShowPath = templateShowPath.replace(formatStr, formatValue);
+          templateShowName = templateShowName.replace(formatStr, formatValue);
         }
       });
-      return templateShowPath;
+      return templateShowName;
     }
     function exportForm(row) {
       emits("export", row);
@@ -111,7 +105,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 prop: "templateShowPath"
               }, {
                 default: withCtx((scope) => [
-                  createTextVNode(toDisplayString(scope.row.templateShowPath), 1)
+                  createTextVNode(toDisplayString(scope.row.templateName), 1)
                 ]),
                 _: 1
               }, 8, ["label"]),

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

@@ -315,6 +315,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const tableConfigure = configure;
       buttonConfigure.props.base.tableUuid = tableConfigure.uuid;
       return new Promise((resolve, reject) => {
+        const commonParams = { tableName: tableConfigure.props.dataOrigin.tableName };
         getSaveFormRequestWithRow(
           pageContext,
           buttonConfigure,
@@ -322,7 +323,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           false,
           mainDefaultValueColumns,
           dynamicColumnInfo,
-          row
+          row,
+          commonParams
         ).then((commonEntity) => {
           if (commonEntity) {
             resolve(commonEntity.entity);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-runtime",
-  "version": "2.0.43-beta1",
+  "version": "2.0.43-beta2",
   "description": "AgileBuilder super page runtime",
   "license": "ISC",
   "main": "dist/es/index.js",
@@ -69,4 +69,4 @@
     "vue-router": "^4.3.0",
     "vuex": "^4.1.0"
   }
-}
+}