super-page-runtime 2.1.15 → 2.1.17

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

@@ -283,8 +283,10 @@ function queryPageSuperGrids(pageDesign, pageContext, publishVersion) {
 }
 function packageFormRules(pageContext, configure) {
   var _a, _b;
+  const prop = configure.props && configure.props.base ? configure.props.base.prop : null;
   const isWorkflow = pageContext.workflowCode ? true : false;
   if (isWorkflow) {
+    console.log("packageFormRules-----prop=", prop, "--pageContext.fieldPermissionMap=", pageContext.fieldPermissionMap);
     if (configure.name !== "button-detail" && pageContext.fieldPermissionMap) {
       const allFields = pageContext.fieldPermissionMap.get("all_fields");
       if ((allFields == null ? void 0 : allFields["canEdit"]) === false && ((_a = configure.runtime) == null ? void 0 : _a.props)) {
@@ -298,7 +300,6 @@ 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) {
@@ -312,12 +313,15 @@ function packageFormRules(pageContext, configure) {
     }
     if (configure.name !== "button-detail" && pageContext.fieldPermissionMap) {
       const propEditPermission = pageContext.fieldPermissionMap.get(propName);
+      console.log("packageFormRules-----prop=", prop, "--propEditPermission=", propEditPermission);
       if (propEditPermission) {
         if (propEditPermission["canEdit"] === false) {
           configure.runtime.props.state = "disabled";
         } else if (propEditPermission["canEdit"]) {
+          configure.runtime.props.state = "";
           configure.runtime.props.required = true;
         }
+        console.log("packageFormRules-----prop=", prop, "--configure.runtime.props=", configure.runtime.props);
       }
     }
     if ((_b = configure.props) == null ? void 0 : _b.customRuleEvents) {

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

@@ -1,6 +1,6 @@
-import { defineComponent, ref, resolveComponent, openBlock, createElementBlock, createBlock, unref, createCommentVNode } from "vue";
+import { defineComponent, ref, onMounted, onUnmounted, 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 { getVariableValue, setVariableValue } from "../../../../utils/page-helper-util.js";
 import { getModelFields, getDefaultValue } from "../../../../utils/page-init-util.js";
 import eventBus from "../../../../utils/eventBus.js";
 import { popupToPage } from "../../../../utils/table-utils.js";
@@ -31,6 +31,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const entity = props.pageContext.entity ? props.pageContext.entity : {};
     let dynamicFields = getModelFields(props.configure, prop);
     const listViewShowFlag = ref(false);
+    let componentKey = ref(0);
     const baseURL = window["$vueApp"].config.globalProperties.baseURL;
     const listViewOptions = ref({
       isSql: true,
@@ -58,14 +59,54 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       listViewOptions.value.showPageArea = false;
     }
     const gridRef = ref(null);
+    onMounted(() => {
+      const tableUuid = configure.uuid;
+      const subTableWatchProps = pageContext.subTableWatchProps;
+      eventBus.$on("_refreshSubTable_" + tableUuid, (params) => {
+        console.log("-_refreshSubTable--tableUuid=", tableUuid, "params=", params);
+        const propName = params.propName;
+        if (subTableWatchProps && subTableWatchProps[tableUuid] && subTableWatchProps[tableUuid].length > 0) {
+          const mainFormProps = subTableWatchProps[tableUuid];
+          if (mainFormProps.indexOf(propName) >= 0) {
+            if (gridRef.value) {
+              changeInitializationSubTable();
+            }
+          }
+        }
+      });
+      eventBus.$on("_refreshSubTableHandle_" + tableUuid, (params) => {
+        console.log("-_refreshSubTableHandle_--tableUuid=", tableUuid, "params=", params);
+        changeInitializationSubTable();
+      });
+      eventBus.$on(
+        "_refreshChildData_" + tableUuid,
+        (gridData) => {
+          console.log("-_refreshChildData_--tableUuid=", tableUuid);
+          refreshChildTableData(gridData);
+        }
+      );
+    });
+    onUnmounted(() => {
+      const tableUuid = configure.uuid;
+      eventBus.$off("_refreshSubTable_" + tableUuid);
+      eventBus.$off("_refreshSubTableHandle_" + tableUuid);
+      eventBus.$off("_refreshChildData_" + tableUuid);
+    });
     function currencyListViewSetting(canRrefreshSubtableData) {
       if (canRrefreshSubtableData === void 0) {
         canRrefreshSubtableData = judgeInitializationSubTable();
       }
+      listViewOptions.value["isPageInfo"] = false;
       listViewOptions.value["isFormSubTable"] = true;
       listViewOptions.value["canRrefreshSubtableData"] = canRrefreshSubtableData;
       listViewOptions.value["getFormData"] = getParentFormData;
       listViewOptions.value["getGridData"] = getGridData;
+      listViewOptions.value.extraParam["subTableListViewCode"] = listCode;
+      listViewOptions.value.extraParam["subtableSetting"] = configure.props && configure.props.otherSettings ? JSON.stringify(configure.props.otherSettings) : null;
+      listViewOptions.value.extraParam["additionalParamMap"] = additionalParamMap;
+      listViewOptions.value.extraParam["entityMap"] = pageContext.entity.data;
+      listViewOptions.value.extraParam["contextMap"] = pageContext.entity.context;
+      listViewOptions.value.extraParam["taskMap"] = pageContext.entity.task;
       if (!(configure.props && configure.props.base && configure.props.base.showOperation)) {
         let hiddenColumns = listViewOptions.value.hiddenColumns;
         if (!hiddenColumns) {
@@ -127,20 +168,25 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function getGridData() {
       return getVariableValue(entity, dynamicFields);
     }
+    function initializationSubTable() {
+      const canRrefreshSubtableData = judgeInitializationSubTable();
+      if (canRrefreshSubtableData) {
+        changeInitializationSubTable(canRrefreshSubtableData);
+      } else {
+        currencyListViewSetting(canRrefreshSubtableData);
+        listViewOptions.value["isPageInfo"] = false;
+        listViewOptions.value["subTableData"] = getValue();
+        setGridDataEventOptions();
+      }
+    }
     function changeInitializationSubTable(canRrefreshSubtableData) {
       currencyListViewSetting(canRrefreshSubtableData);
-      listViewOptions.value["isPageInfo"] = false;
-      listViewOptions.value["subTableData"] = getValue();
-      listViewOptions.value.extraParam["subTableListViewCode"] = listCode;
-      listViewOptions.value.extraParam["subtableSetting"] = configure.props && configure.props.otherSettings ? JSON.stringify(configure.props.otherSettings) : null;
-      listViewOptions.value.extraParam["additionalParamMap"] = additionalParamMap;
-      listViewOptions.value.extraParam["entityMap"] = pageContext.entity.data;
-      listViewOptions.value.extraParam["contextMap"] = pageContext.entity.context;
-      listViewOptions.value.extraParam["taskMap"] = pageContext.entity.task;
+      listViewOptions.value["subTableData"] = null;
       setGridDataEventOptions();
       listViewShowFlag.value = false;
       setTimeout(() => {
         listViewShowFlag.value = true;
+        componentKey.value = componentKey.value + 1;
         setGridToStore();
       }, 10);
     }
@@ -189,7 +235,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (!pageContext.tableUuids) {
         pageContext.tableUuids = [];
       }
-      pageContext.tableUuids.push(configure.uuid);
+      if (pageContext.tableUuids.indexOf(configure.uuid) < 0) {
+        pageContext.tableUuids.push(configure.uuid);
+      }
     }
     function getOperations() {
       let operations = [];
@@ -224,7 +272,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       return operations;
     }
-    changeInitializationSubTable();
+    initializationSubTable();
     function getEntityId(row) {
       if (row && row.id) {
         return row.id;
@@ -427,6 +475,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function setValue(value) {
       return setVariableValue(entity, dynamicFields, value);
     }
+    function refreshChildTableData(gridData) {
+      setValue(gridData);
+      setTimeout(() => {
+        if (gridRef.value) {
+          gridRef.value.refreshChildData(listCode, gridData, configure.props && configure.props.base && configure.props.base.subPaging === true);
+          listViewOptions.value.extraParam["entityMap"] = pageContext.entity.data;
+        }
+      }, 10);
+    }
     __expose({
       createRow,
       getSelections,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-runtime",
-  "version": "2.1.15",
+  "version": "2.1.17",
   "description": "AgileBuilder super page runtime",
   "license": "ISC",
   "main": "dist/es/index.js",