super-page-runtime 2.0.35 → 2.0.39

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

@@ -1,16 +1,18 @@
+import { PageContext } from '../interfaces/page-design-types';
+
 /**
  * 设值自定义校验规则。推荐在按钮的beforeValidateForm事件中调用该方法。
  * @param params 事件中的params参数
  * @param customRules  自定义的校验规则
  */
-export declare function setCustomRules(pageContext: any, customRules: any): void;
+export declare function setCustomRules(pageContext: PageContext, customRules: any): void;
 /**
  * 刷新页面
  * @param pageContext
  */
-export declare function refreshPage(pageContext: any): void;
+export declare function refreshPage(pageContext: PageContext): void;
 /**
  * 获得表单数据
  * @param pageContext
  */
-export declare function getFormData(pageContext: any): Promise<unknown>;
+export declare function getFormData(pageContext: PageContext): Promise<unknown>;

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

@@ -1,4 +1,3 @@
-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, getListCode } from "../common-util.js";
@@ -37,7 +36,8 @@ function getCommonFormData(pageContext) {
     const ids = additionalParamMap ? additionalParamMap.ids : null;
     const taskId = additionalParamMap ? additionalParamMap.taskId : null;
     const permissionPrefix = pageCode;
-    const backendUrl = getSystemBackendUrl(pageContext.backendUrl);
+    console.log("getCommonFormData-----pageContext=", pageContext);
+    const backendUrl = getBaseUrl(pageContext.backendUrl, pageContext.isTest);
     const param = {
       pageCode,
       pageVersion,
@@ -109,7 +109,7 @@ function getWorkflowFormData(pageContext) {
     const pageCode = pageContext.code;
     const pageVersion = pageContext.version;
     const additionalParamMap = getAdditionalParamMap(pageContext);
-    const dataId = additionalParamMap && additionalParamMap.id ? additionalParamMap.id : 25;
+    const dataId = additionalParamMap && additionalParamMap.id ? additionalParamMap.id : null;
     const ids = additionalParamMap ? additionalParamMap.ids : null;
     const taskId = additionalParamMap ? additionalParamMap.taskId : null;
     const permissionPrefix = pageCode;
@@ -135,7 +135,7 @@ function getWorkflowFormData(pageContext) {
       param["ids"] = formatAdditionalParamMapIds(ids);
     }
     if (taskId) {
-      param["taskId"] = this.taskId;
+      param["taskId"] = taskId;
     } else if (dataId) {
       param["id"] = dataId;
     } else {
@@ -152,7 +152,7 @@ function getWorkflowFormData(pageContext) {
     if (pageContext.beanName) {
       param["beanName"] = pageContext.beanName;
     }
-    const baseUrl = getBaseUrl(pageContext.backendUrl);
+    const baseUrl = getBaseUrl(pageContext.backendUrl, pageContext.isTest);
     const urlForView = baseUrl + "/dsc/workflow-commons/gets";
     http.post(urlForView, param).then((commonEntity) => {
       pageContext.definitionId = commonEntity.definitionId;

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

@@ -1,5 +1,5 @@
 export declare function isArrayFn(value: any): boolean;
-export declare function getBaseUrl(backendUrl: any): any;
+export declare function getBaseUrl(backendUrl: any, isTest?: boolean): any;
 export declare function getRealRestApiPath(orgRestApiPath: any, systemCode: any, backendUrl: any): any;
 /**
  * 封装模板文件列表

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

@@ -7,12 +7,16 @@ function isArrayFn(value) {
     return Object.prototype.toString.call(value) === "[object Array]";
   }
 }
-function getBaseUrl(backendUrl) {
-  let baseUrl = window["$vueApp"].config.globalProperties.baseURL;
-  if (backendUrl) {
-    baseUrl = getSystemBackendUrl(backendUrl);
+function getBaseUrl(backendUrl, isTest) {
+  if (isTest) {
+    return backendUrl;
+  } else {
+    let baseUrl = window["$vueApp"].config.globalProperties.baseURL;
+    if (backendUrl) {
+      baseUrl = getSystemBackendUrl(backendUrl);
+    }
+    return baseUrl;
   }
-  return baseUrl;
 }
 function getRealRestApiPath(orgRestApiPath, systemCode, backendUrl) {
   let path = orgRestApiPath;

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

@@ -181,17 +181,13 @@ function buttonClickEvent(pageContext, configure, eventParams) {
 }
 function doValidateForm(pageContext, configure, eventParams) {
   const events = configure.runtime && configure.runtime.events ? configure.runtime.events : [];
-  let isEnableRequired;
   const clickEventFunObj = getClickEventFuncByType(pageContext, events, "click");
   if (clickEventFunObj) {
     const isStandardEvent = clickEventFunObj.isStandard;
     const event = clickEventFunObj.event;
-    const isNotNeedValidate = isNotNeedValidateRequired(isStandardEvent, event);
-    if (isNotNeedValidate) {
-      isEnableRequired = false;
-    }
+    isNotNeedValidateRequired(isStandardEvent, event);
   }
-  validateDataModelFunc(pageContext, configure, isEnableRequired).then(() => {
+  validateDataModelFunc(pageContext, configure, true).then(() => {
     const beforeClickResult = doBeforeClickEvent(pageContext, configure, eventParams);
     if (!beforeClickResult) {
       return;

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

@@ -200,7 +200,7 @@ function validateWorkflowFormDataModel(dataModel, pageContext) {
     const subTablePageInfo = pageContext.subTablePageInfo;
     let result = false;
     const handleModels = JSON.parse(JSON.stringify(dataModel));
-    const rules = pageContext.workflowRules;
+    const rules = pageContext.rules;
     if (!rules) {
       result = true;
     } else {

package/dist/es/components/runtime/utils/form/scan-util.js

@@ -52,7 +52,6 @@ function analysisScanValue(scanValue, scanRuleSets) {
   if (!scanValue) {
     return null;
   }
-  debugger;
   const scanSets = Object.values(scanRuleSets);
   for (let i = 0; i < scanSets.length; i++) {
     const scanSet = scanSets[i];

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

@@ -22,7 +22,7 @@ function convertToPageContext(pageDesign, pageRequest) {
     systemCode: pageDesign.systemCode,
     systemVersion: pageDesign.systemVersion,
     backendUrl: pageDesign.backendUrl,
-    rules: [],
+    rules: {},
     // rules: pageDesign.rules, // 表单验证规则。在runtime object-render中实时获得
     tableUuids: pageDesign.tableUuids,
     // 表格uuid集合
@@ -217,8 +217,15 @@ function queryPageSuperGrids(pageDesign, pageContext, publishVersion) {
   );
 }
 function packageFormRules(pageContext, configure) {
+  var _a;
   const isWorkflow = pageContext.workflowCode ? true : false;
   if (isWorkflow) {
+    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)) {
+        configure.runtime.props.state = "disabled";
+      }
+    }
     const requiredRules = configure.props && configure.props.rules ? configure.props.rules.filter((item) => item.required) : null;
     if (requiredRules && requiredRules.length > 0) {
       requiredRules.forEach((item) => {
@@ -236,6 +243,16 @@ function packageFormRules(pageContext, configure) {
       pageContext.rules[propName] = [];
     }
     pageContext.rules[propName] = configure.props.rules;
+    if (configure.name !== "button-detail" && pageContext.fieldPermissionMap) {
+      const propEditPermission = pageContext.fieldPermissionMap.get(propName);
+      if (propEditPermission) {
+        if (propEditPermission["canEdit"] === false) {
+          configure.runtime.props.state = "disabled";
+        } else if (propEditPermission["canEdit"]) {
+          configure.runtime.props.required = true;
+        }
+      }
+    }
   }
 }
 export {

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

@@ -315,12 +315,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     }
     function select(selection, row) {
-      selections.value = selection;
-      const params = {
-        selection,
-        row
-      };
-      gridSelectRecord(pageContext, configure, params);
+      if (row !== void 0) {
+        selections.value = selection;
+        const params = {
+          selection,
+          row
+        };
+        gridSelectRecord(pageContext, configure, params);
+      }
     }
     function selectAll(selection) {
       selections.value = selection;

package/dist/es/components/runtime/views/assemblys/form/common/title-suffix-element.vue.js

@@ -0,0 +1,66 @@
+import { defineComponent, computed, resolveComponent, openBlock, createElementBlock, Fragment, createBlock, unref, isRef, createCommentVNode } from "vue";
+import { formatVariableValue, setVariableValue, getVariableValue } from "../../../../utils/page-helper-util.js";
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  __name: "title-suffix-element",
+  props: {
+    pageContext: {},
+    property: {}
+  },
+  setup(__props) {
+    const props = __props;
+    const entity = props.pageContext.entity;
+    let fields = [];
+    if (!props.property.prefixPro || !props.property.prefixPro.startsWith("${")) {
+      fields = [];
+    } else {
+      let propName = props.property.prefixPro;
+      propName = propName.substring(2, propName.length - 1);
+      fields = propName.split(".");
+    }
+    if (fields.length > 0 && props.property.prefixDefault) {
+      const prefixDefault = props.property.prefixDefault;
+      let defaultValue = formatVariableValue(props.pageContext, prefixDefault);
+      if (defaultValue != null && defaultValue != void 0) {
+        let isMultiple = props.property.prefixType === "checkbox";
+        if (isMultiple) {
+          defaultValue = (defaultValue + "").split(",");
+        }
+        setVariableValue(entity, fields, defaultValue);
+      }
+    }
+    let dynamicModelMethod = null;
+    if (fields.length > 0) {
+      dynamicModelMethod = computed({
+        get() {
+          return getVariableValue(entity, fields);
+        },
+        set(value) {
+          setVariableValue(entity, fields, value);
+        }
+      });
+    }
+    return (_ctx, _cache) => {
+      const _component_el_radio = resolveComponent("el-radio");
+      const _component_el_checkbox = resolveComponent("el-checkbox");
+      return openBlock(), createElementBlock(Fragment, null, [
+        _ctx.property.prefixType === "radio" ? (openBlock(), createBlock(_component_el_radio, {
+          key: 0,
+          value: _ctx.property.prefixValue,
+          label: _ctx.property.title,
+          modelValue: unref(dynamicModelMethod),
+          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => isRef(dynamicModelMethod) ? dynamicModelMethod.value = $event : dynamicModelMethod = $event)
+        }, null, 8, ["value", "label", "modelValue"])) : createCommentVNode("", true),
+        _ctx.property.prefixType === "checkbox" ? (openBlock(), createBlock(_component_el_checkbox, {
+          key: 1,
+          label: _ctx.property.title,
+          value: _ctx.property.prefixValue,
+          modelValue: unref(dynamicModelMethod),
+          "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => isRef(dynamicModelMethod) ? dynamicModelMethod.value = $event : dynamicModelMethod = $event)
+        }, null, 8, ["label", "value", "modelValue"])) : createCommentVNode("", true)
+      ], 64);
+    };
+  }
+});
+export {
+  _sfc_main as default
+};

package/dist/es/components/runtime/views/assemblys/form/common/title-suffix-element.vue2.js

@@ -0,0 +1,4 @@
+import _sfc_main from "./title-suffix-element.vue.js";
+export {
+  _sfc_main as default
+};

package/dist/es/components/runtime/views/assemblys/form/input-text/inputtext-runtime.vue2.js

@@ -1,9 +1,10 @@
-import { defineComponent, computed, ref, watch, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createElementBlock, toDisplayString, createCommentVNode, createVNode, createSlots, createTextVNode } from "vue";
+import { defineComponent, computed, ref, watch, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createElementBlock, Fragment, createTextVNode, toDisplayString, createCommentVNode, createVNode, createSlots } from "vue";
 import { SuperIcon } from "agilebuilder-ui";
 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 { formatScanRuleSets, analysisScanValue, setScanAnalysisValue } from "../../../../utils/form/scan-util.js";
+import _sfc_main$1 from "../common/title-suffix-element.vue.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "inputtext-runtime",
   props: {
@@ -72,7 +73,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           designProperty.value.tittleShow ? (openBlock(), createElementBlock("div", {
             key: 0,
             style: normalizeStyle({ ...unref(headerStyle) })
-          }, toDisplayString(designProperty.value.title), 5)) : createCommentVNode("", true)
+          }, [
+            designProperty.value.prefixType ? (openBlock(), createBlock(_sfc_main$1, {
+              key: 0,
+              pageContext: _ctx.pageContext,
+              property: designProperty.value
+            }, null, 8, ["pageContext", "property"])) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
+              createTextVNode(toDisplayString(designProperty.value.title), 1)
+            ], 64))
+          ], 4)) : createCommentVNode("", true)
         ]),
         default: withCtx(() => [
           createVNode(_component_el_input, {

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

@@ -100,6 +100,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (!thisRef.value || !thisRef.value.parentNode) {
         return;
       }
+      dynamicallyCalculatePosition();
+    });
+    const dynamicallyCalculatePosition = () => {
       const thisProps = props.configure.props ? props.configure.props : {};
       const thisStyle = props.configure.style ? props.configure.style : {};
       const position = thisProps.position;
@@ -131,7 +134,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }
         }
       }
-    });
+    };
     return (_ctx, _cache) => {
       const _directive_permission = resolveDirective("permission");
       return withDirectives((openBlock(), createBlock(resolveDynamicComponent(dynamicComponent.value), {

package/dist/es/components/runtime/views/assemblys/workflow/text-history/textflow-runtime.vue2.js

@@ -15,9 +15,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const workflowId = getWorkflowId(props.pageContext);
     if (props.pageContext.entity && props.pageContext.entity.task) {
       watch(
-        () => props.pageContext.entity.task.id,
         () => {
-          if (workflowId && historyList.value) {
+          var _a;
+          return (_a = props.pageContext.entity.task) == null ? void 0 : _a.id;
+        },
+        () => {
+          if (workflowId && historyList.value && props.pageContext.entity.task) {
             historyList.value.refresh();
           }
         },

package/package.json

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