super-page-runtime 2.0.69 → 2.0.71

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

@@ -24,6 +24,7 @@ export declare function getModelFields(pageContext: PageContext, formItemConfigu
  * @param formItemConfigure 表单元素配置参数
  */
 export declare function getFormModelFields(pageContext: PageContext, formItemConfigure: any, prop?: string): string[];
+export declare function getDefaultValue(pageContext: PageContext, defaultValueSet: any, componentType: string, multiple: boolean): any;
 /**
  * 获取组件的权限编码
  * @param configure

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

@@ -2,7 +2,7 @@ import http from "agilebuilder-ui/src/utils/request";
 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 { formatVariableValue, getFormPropName, setVariableValue } from "./page-helper-util.js";
 import { getSessionCache } from "agilebuilder-ui/src/utils/auth";
 function queryPageDesignByCode(pageCode) {
   return http.get(
@@ -156,29 +156,43 @@ function getModelFields(pageContext, formItemConfigure, prop) {
 function getFormModelFields(pageContext, formItemConfigure, prop) {
   const fields = getModelFields(pageContext, formItemConfigure, prop);
   const entity = pageContext.entity;
-  let propsBase;
-  if (formItemConfigure) {
-    propsBase = formItemConfigure.props.base ? formItemConfigure.props.base : {};
-  }
   if (entity.data.ID == void 0 && entity.data.id == void 0) {
-    if (propsBase && propsBase.defaultValue) {
-      let defaultValue = formatVariableValue(pageContext, propsBase.defaultValue);
-      if (defaultValue != null && defaultValue != void 0) {
-        let isMultiple = false;
-        if (formItemConfigure.name == "checkbox") {
-          isMultiple = true;
-        } else if (formItemConfigure.name == "select") {
-          isMultiple = propsBase.multiple;
-        }
-        if (isMultiple) {
-          defaultValue = (defaultValue + "").split(",");
-        }
-      }
+    let propsBase;
+    let componentType;
+    let multiple = false;
+    if (formItemConfigure) {
+      propsBase = formItemConfigure.props.base ? formItemConfigure.props.base : {};
+      componentType = formItemConfigure.name;
+      multiple = propsBase.multiple;
+    }
+    const defaultValueSet = propsBase ? propsBase.defaultValue : null;
+    let defaultValue = getDefaultValue(pageContext, defaultValueSet, componentType, multiple);
+    if (defaultValue !== void 0 && defaultValue !== null) {
       setVariableValue(entity, fields, defaultValue);
     }
   }
   return fields;
 }
+function getDefaultValue(pageContext, defaultValueSet, componentType, multiple) {
+  let defaultValue;
+  console.log("pageRuntime11---getDefaultValue---defaultValueSet---", defaultValueSet, "pageContext=", pageContext);
+  if (defaultValueSet) {
+    defaultValue = formatVariableValue(pageContext, defaultValueSet);
+    console.log("pageRuntime22---getDefaultValue---defaultValue---", defaultValue);
+    if (defaultValue != null && defaultValue != void 0 && componentType) {
+      let isMultiple = false;
+      if (componentType == "checkbox") {
+        isMultiple = true;
+      } else if (componentType == "select") {
+        isMultiple = multiple;
+      }
+      if (isMultiple) {
+        defaultValue = (defaultValue + "").split(",");
+      }
+    }
+  }
+  return defaultValue;
+}
 function getPermissionCodes(configure, pageContext) {
   if (!pageContext || !configure || pageContext.isTest) {
     return "true";
@@ -278,6 +292,7 @@ function packageFormRules(pageContext, configure) {
 }
 export {
   convertToPageContext,
+  getDefaultValue,
   getFormModelFields,
   getModelFields,
   getPermissionCodes,

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

@@ -6,7 +6,7 @@ import { getAdditionalParamMap, getSaveFormRequestWithRow, standardEvents } from
 import { isPromise } from "agilebuilder-ui/src/utils/common-util";
 import { getDataTypeMapRequest, popupToPage } from "../../../../utils/table-utils.js";
 import eventBus from "../../../../utils/eventBus.js";
-import { getPermissionCodes } from "../../../../utils/page-init-util.js";
+import { getPermissionCodes, getDefaultValue } from "../../../../utils/page-init-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "main-table-runtime",
   props: {
@@ -618,7 +618,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return gridRef.value.refresh();
     }
     function createRow() {
-      return gridRef.value.createRow(listCode);
+      return gridRef.value.createRow(listCode, {}, { getDefaultValueFunc: getDefaultValue });
     }
     function getSelections() {
       return selections.value;

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

@@ -1,7 +1,7 @@
 import { defineComponent, ref, resolveComponent, openBlock, createElementBlock, createBlock, unref, createCommentVNode } from "vue";
 import { setTableEvents, gridSelectRecord, gridSelectAllRecords, gridSelectionChange, cellClick, cellDblClick, rowClick, rowDblClick, headerClick } from "../../../../utils/events/event-util.js";
 import { setVariableValue, getVariableValue } from "../../../../utils/page-helper-util.js";
-import { getModelFields } from "../../../../utils/page-init-util.js";
+import { getModelFields, getDefaultValue } from "../../../../utils/page-init-util.js";
 import eventBus from "../../../../utils/eventBus.js";
 import { popupToPage } from "../../../../utils/table-utils.js";
 import { getListCode } from "../../../../utils/common-util.js";
@@ -278,7 +278,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return canDelete;
     }
     function addSubTableData(originalValue, formatValue, row, column, rowIndex) {
-      gridRef.value.createRow(listCode);
+      gridRef.value.createRow(listCode, {}, { getDefaultValueFunc: getDefaultValue });
     }
     function removeSubTableData(originalValue, formatValue, row, column, rowIndex) {
       gridRef.value.deleteRow(rowIndex, listCode, false);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-runtime",
-  "version": "2.0.69",
+  "version": "2.0.71",
   "description": "AgileBuilder super page runtime",
   "license": "ISC",
   "main": "dist/es/index.js",
@@ -48,7 +48,7 @@
     "@vitejs/plugin-vue-jsx": "^3.1.0",
     "@vue/eslint-config-prettier": "^8.0.0",
     "@vue/test-utils": "^2.4.4",
-    "agilebuilder-ui": "1.0.50",
+    "agilebuilder-ui": "1.0.51",
     "axios": "^1.6.8",
     "cypress": "^13.6.6",
     "element-plus": "^2.6.1",