super-page-runtime 2.1.83 → 2.1.87

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

@@ -134,7 +134,6 @@ function isNumber(numStr) {
 }
 function isWorkflowPage(pageContext) {
   const isWorkflow = pageContext.isWorkflowEntity ? true : pageContext.workflowCode ? true : false;
-  console.log("isWorkflowPage----isWorkflow=", isWorkflow, "pageContext.isWorkflowEntity=", pageContext.isWorkflowEntity, "pageContext.workflowCode=", pageContext.workflowCode);
   return isWorkflow;
 }
 function refreshMobileDialogType(jumpPageSetting, isMobile) {

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

@@ -619,6 +619,19 @@ function setTableEvents(options, tableEvents, pageContext, configureObj) {
       beforeRestoreValidate({ pageContext, configureObj }),
       options["lineEditOptions"]
     );
+    filterDataEvent(
+      "filterDataEvent",
+      getHandleEvent(null, pageContext, configureObj, "filter-data", {
+        pageContext,
+        configureObj
+      }),
+      options
+    );
+  }
+}
+function filterDataEvent(gridEventType, eventFunc, options) {
+  if (eventFunc) {
+    options[gridEventType] = eventFunc;
   }
 }
 function addTableEvent(gridEventType, eventFunc, options) {

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

@@ -514,13 +514,9 @@ function getCommonFormRequestParam(pageContext, configureObj, isUnControlVersion
     }
   }
   console.log("getCommonFormRequestParam--------configureObj----", configureObj);
-  const autoSetValueData = configureObj.props.setValueList;
+  const autoSetValueData = getButtonAutoSetValueData(configureObj);
   if (autoSetValueData) {
-    if (isArrayFn(autoSetValueData)) {
-      param["autoSetValueData"] = JSON.stringify(autoSetValueData);
-    } else if (typeof autoSetValueData === "string") {
-      param["autoSetValueData"] = autoSetValueData;
-    }
+    param["autoSetValueData"] = autoSetValueData;
   }
   const logSetting = (_a = configureObj.props.base) == null ? void 0 : _a.logSetting;
   if (logSetting) {
@@ -687,7 +683,11 @@ function closeDialog(pageContext, dataModel, isNeedValueMapping) {
   }
 }
 function updateValuesWhenCloseDialog(parentPageContext, parentConfigureObj, sourceModel, sourceTableName) {
-  const valueMappings = parentConfigureObj.runtime && parentConfigureObj.runtime.linkPage && parentConfigureObj.runtime.linkPage.valueMappings ? parentConfigureObj.runtime.linkPage.valueMappings : null;
+  var _a;
+  let valueMappings = parentConfigureObj.runtime && parentConfigureObj.runtime.linkPage && parentConfigureObj.runtime.linkPage.valueMappings ? parentConfigureObj.runtime.linkPage.valueMappings : null;
+  if (!valueMappings) {
+    valueMappings = (_a = parentConfigureObj.props.linkPage) == null ? void 0 : _a.valueMappings;
+  }
   const targetTableName = parentPageContext.tableName;
   console.log("update-value66-", sourceModel, sourceTableName);
   updateWithPageValue(sourceModel, valueMappings, parentPageContext);
@@ -699,8 +699,7 @@ function updateValuesWhenCloseDialog(parentPageContext, parentConfigureObj, sour
   });
 }
 function updateWithPageValue(sourceModel, valueMappings, parentPageContext) {
-  const entity = parentPageContext.entity.data;
-  if (sourceModel && sourceModel !== null && entity && entity !== null && valueMappings) {
+  if (sourceModel && sourceModel !== null && valueMappings) {
     let sourceEntity = sourceModel;
     if (Array.isArray(sourceModel) && sourceModel.length > 0) {
       sourceEntity = sourceModel[0];
@@ -733,7 +732,13 @@ function dealAfterWithList(pageContext, configureObj, row, successTip) {
       console.error("tableUuid is empty");
     }
   } else if (successOperation === "closeWindow" || successOperation === "closeWindowAndRefresh") {
-    closeDialog(pageContext, row, isNeedValueMapping);
+    const pageData = deepCopy(pageContext.entity.page);
+    let dataModel = row;
+    if (!dataModel) {
+      dataModel = {};
+    }
+    Object.assign(pageData, dataModel);
+    closeDialog(pageContext, pageData, isNeedValueMapping);
   }
   if (successTip) {
     ElMessage({
@@ -1041,6 +1046,10 @@ function doImportFinally(params, fileObj) {
   if (judgeHeavyList) {
     param.append("judgeHeavyList", JSON.stringify(judgeHeavyList));
   }
+  const autoSetValueData = getButtonAutoSetValueData(buttonConfigureObj);
+  if (autoSetValueData) {
+    param.append("autoSetValueData", autoSetValueData);
+  }
   const formNoRuleCode = pageContext.formNoRuleCode;
   if (formNoRuleCode) {
     param.append("formNoRuleCode", formNoRuleCode);
@@ -1227,13 +1236,9 @@ function getWorkflowSaveParams(params) {
     }
   }
   console.log("getWorkflowSaveParams----configureObj=", configureObj);
-  const autoSetValueData = configureObj.props.setValueList;
+  const autoSetValueData = getButtonAutoSetValueData(configureObj);
   if (autoSetValueData) {
-    if (isArrayFn(autoSetValueData)) {
-      param["autoSetValueData"] = JSON.stringify(autoSetValueData);
-    } else if (typeof autoSetValueData === "string") {
-      param["autoSetValueData"] = autoSetValueData;
-    }
+    param["autoSetValueData"] = autoSetValueData;
   }
   if (pageContext.beanName) {
     param["beanName"] = pageContext.beanName;
@@ -2329,6 +2334,17 @@ function changeActionPermissionToMap(pageContext) {
   }
   pageContext.actionPermissionMap = actionPermissionMap;
 }
+function getButtonAutoSetValueData(configureObj) {
+  const autoSetValueData = configureObj.props.setValueList;
+  if (autoSetValueData) {
+    if (isArrayFn(autoSetValueData) && autoSetValueData.length > 0) {
+      return JSON.stringify(autoSetValueData);
+    } else if (typeof autoSetValueData === "string" && autoSetValueData !== "[]") {
+      return autoSetValueData;
+    }
+  }
+  return null;
+}
 export {
   dealAfterOperate,
   dealCompleteTaskParam,

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

@@ -146,12 +146,15 @@ function updateChartDatasources(pageContext2, dataSourceConfs, appendParams, isI
         const configure = componentRef.getConfigure();
         const serviceInputs = (_a = configure == null ? void 0 : configure.props.dataOrigin) == null ? void 0 : _a.serviceInputs;
         if (serviceInputs) {
-          serviceInputs.forEach((inParam) => {
-            const paramName = inParam.name;
-            const paramValue = inParam.value;
-            item.serviceInParams = {};
-            item.serviceInParams[paramName] = getValueFromVariable(pageContext2.entity, paramValue);
-          });
+          const services = item.services;
+          if (services && services.length > 0) {
+            services[0].serviceInParams = {};
+            serviceInputs.forEach((inParam) => {
+              const paramName = inParam.name;
+              const paramValue = inParam.value;
+              services[0].serviceInParams[paramName] = getValueFromVariable(pageContext2.entity, paramValue);
+            });
+          }
         }
       }
     });

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

@@ -175,9 +175,6 @@ function packageAdditionalMap(paramStoreId, requestObj) {
   }
 }
 function getModelFields(formItemConfigure, prop) {
-  if (!formItemConfigure) {
-    return ["temp"];
-  }
   let propsBase;
   let propName = prop;
   if (!prop) {
@@ -185,9 +182,9 @@ function getModelFields(formItemConfigure, prop) {
     propName = propsBase.prop;
   }
   let fields = null;
-  if (prop) {
+  if (prop && !prop.startsWith("${")) {
     fields = ["data", prop];
-  } else if (!propName || !propName.startsWith("${")) {
+  } else if (formItemConfigure && (!propName || !propName.startsWith("${"))) {
     fields = ["page", formItemConfigure.uuid];
   } else if (propName.startsWith("${")) {
     propName = propName.substring(2, propName.length - 1);
@@ -292,15 +289,9 @@ function queryPageSuperGrids(pageDesign, pageContext, publishVersion) {
 function packageFormRules(pageContext, configure) {
   var _a, _b;
   const prop = configure.props && configure.props.base ? configure.props.base.prop : null;
-  let isWorkflow = isWorkflowPage(pageContext);
+  const isWorkflow = isWorkflowPage(pageContext);
   let allFieldsDisabled = 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)) {
@@ -325,7 +316,6 @@ function packageFormRules(pageContext, configure) {
     }
     if (!allFieldsDisabled && configure.name !== "button-detail" && pageContext.fieldPermissionMap) {
       const propEditPermission = pageContext.fieldPermissionMap.get(propName);
-      console.log("packageFormRules-----prop=", prop, "--propEditPermission=", propEditPermission);
       if (!configure.runtime.props) {
         configure.runtime.props = {};
       }
@@ -336,12 +326,6 @@ function packageFormRules(pageContext, configure) {
           configure.runtime.props.state = "";
           configure.runtime.props.required = true;
         }
-        console.log(
-          "packageFormRules-----prop=",
-          prop,
-          "--configure.runtime.props=",
-          configure.runtime.props
-        );
       } else {
         configure.runtime.props.state = "";
       }

package/dist/es/components/runtime/views/assemblys/form/custom/custom-runtime.vue2.js

@@ -23,7 +23,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     pageContext: {},
     configure: {}
   },
-  setup(__props) {
+  setup(__props, { expose: __expose }) {
     const props = __props;
     const entity = props.pageContext.entity ? props.pageContext.entity : {};
     const dynamicFields = getFormModelFields(props.pageContext, props.configure);
@@ -104,19 +104,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       });
       nextTick(() => {
         const value = dynamicModelMethod.value;
-        handleAfterInitEvent(
+        handleAfterInitEvent(value, props.pageContext, props.configure, {
+          formItemRef: formItemRef.value,
+          componentRef: customRef.value,
+          titleRef: titleRef.value,
           value,
-          props.pageContext,
-          props.configure,
-          {
-            formItemRef: formItemRef.value,
-            componentRef: customRef.value,
-            titleRef: titleRef.value,
-            value,
-            entity: props.pageContext.entity.data,
-            pageData: props.pageContext.entity.page
-          }
-        );
+          entity: props.pageContext.entity.data,
+          pageData: props.pageContext.entity.page
+        });
       });
     });
     function handleCustomEvent(eventType) {
@@ -126,6 +121,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       eventBus.$off(componentId.value + "-scanDone");
       eventBus.$off(componentId.value + "-pickFileDone");
     });
+    function getCustomRef() {
+      return customRef.value;
+    }
+    __expose({
+      getCustomRef
+    });
     return (_ctx, _cache) => {
       const _component_el_form_item = resolveComponent("el-form-item");
       return designProperty.value.tittleShow ? (openBlock(), createBlock(_component_el_form_item, {

package/dist/es/components/runtime/views/assemblys/form/dept-tree/depttree-runtime.vue2.js

@@ -36,24 +36,21 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     onMounted(() => {
       nextTick(() => {
         const value = dataModel ? dataModel[fieldName] : null;
-        handleAfterInitEvent(
+        handleAfterInitEvent(value, props.pageContext, props.configure, {
+          formItemRef: formItemRef.value,
+          componentRef: componentRef.value,
+          titleRef: titleRef.value,
           value,
-          props.pageContext,
-          props.configure,
-          {
-            formItemRef: formItemRef.value,
-            componentRef: componentRef.value,
-            titleRef: titleRef.value,
-            value,
-            entity: props.pageContext.entity.data,
-            pageData: props.pageContext.entity.page
-          }
-        );
+          entity: props.pageContext.entity.data,
+          pageData: props.pageContext.entity.page
+        });
       });
     });
     const autoSetFields = designProperty.value.autoSetFields ? designProperty.value.autoSetFields : [];
-    function changeValue(value) {
-      handleFormEvent(value, props.pageContext, props.configure, "change");
+    function changeValue(model, value) {
+      if (model === fieldName) {
+        handleFormEvent(value, props.pageContext, props.configure, "change");
+      }
     }
     function showTree() {
       handleFormEvent(null, props.pageContext, props.configure, "click");
@@ -97,7 +94,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             fields: unref(autoSetFields),
             size: designProperty.value.size,
             separator: designProperty.value.separator,
-            onChange: changeValue,
+            onSetValue: changeValue,
             onShowTree: showTree
           }, null, 8, ["disabled", "multiple", "treeType", "value", "models", "fields", "size", "separator"])
         ]),

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

@@ -5,7 +5,7 @@ import { PageDimensions } from "../../utils/interfaces/page-design-types.js";
 import { addComponentRef, addComponentRefByCode } from "../../utils/global-refs.js";
 import { getPermissionCodes, packageFormRules, controlObjectRenderState } from "../../utils/page-init-util.js";
 import { caculateShowCondition, getFormPropName, getSizeConfig } from "../../utils/page-helper-util.js";
-import { getPropClassName, isNumber } from "../../utils/common-util.js";
+import { isWorkflowPage, getPropClassName, isNumber } from "../../utils/common-util.js";
 import { isShowComponent } from "../../utils/events/event-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "object-render",
@@ -26,6 +26,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     packageFormRules(props.pageContext, props.configure);
     let handleShowFlag = ref(true);
     let showFlag = ref(true);
+    let editFlag = ref("");
     if (props.configure && props.configure.props) {
       let showConditions = [];
       if ((_a = props.configure.props.base) == null ? void 0 : _a.showConditions) {
@@ -60,9 +61,34 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           const runtime = props.configure.runtime ? props.configure.runtime : {};
           const property = runtime.props ? runtime.props : {};
           property.rawSate = property.state;
-          property.state = computed(() => {
-            const canEdit = caculateShowCondition(props.pageContext, editConditions);
-            return canEdit ? "" : "disabled";
+          if (isWorkflowPage(props.pageContext) && props.pageContext.fieldPermissionMap) {
+            const allFields = props.pageContext.fieldPermissionMap.get("all_fields");
+            if ((allFields == null ? void 0 : allFields["canEdit"]) === false) {
+              editFlag.value = "disabled";
+            } else {
+              const propsBase = props.configure.props.base;
+              if (propsBase && propsBase.prop) {
+                let propName = propsBase.prop;
+                propName = getFormPropName(propName);
+                const propEditPermission = props.pageContext.fieldPermissionMap.get(propName);
+                if (propEditPermission) {
+                  if (propEditPermission["canEdit"] === false) {
+                    editFlag.value = "disabled";
+                  }
+                }
+              }
+            }
+          }
+          property.state = computed({
+            get() {
+              if (editFlag.value === "disabled") {
+                return editFlag.value;
+              }
+              const canEdit = caculateShowCondition(props.pageContext, editConditions);
+              return canEdit ? "" : "disabled";
+            },
+            set() {
+            }
           });
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-runtime",
-  "version": "2.1.83",
+  "version": "2.1.87",
   "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.97",
+    "agilebuilder-ui": "1.0.98",
     "axios": "^1.6.8",
     "cypress": "^13.6.6",
     "element-plus": "^2.6.1",