super-page-runtime 2.1.17 → 2.1.19

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

@@ -138,3 +138,4 @@ export declare function caculateShowCondition(pageContext: PageContext, configur
  */
 export declare function monitorFieldChange(pageContext: PageContext, monitorFields: Array<string>, triggerFunc: Function): void;
 export declare function getFormPropName(prop: any): any;
+export declare function getSizeConfig(pageContext: PageContext, configure: Component): any;

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

@@ -7,6 +7,9 @@ function getComponentOptionConfigs(component, pageContext2) {
   if (!component.props || !component.props.dataOrigin) {
     return;
   }
+  if (component.name && component.name === "table") {
+    return;
+  }
   const dataOriginInfo = component.props.dataOrigin;
   const infoObj = {
     uuid: component.uuid
@@ -614,6 +617,21 @@ function getFormPropName(prop) {
     return prop;
   }
 }
+function getSizeConfig(pageContext2, configure2) {
+  const pageModeType = getPageModeType(pageContext2);
+  let sizeConfig;
+  if (configure2.props && configure2.props.size && configure2.props.size[pageModeType]) {
+    sizeConfig = configure2.props.size[pageModeType];
+  }
+  return sizeConfig;
+}
+function getPageModeType(pageContext2) {
+  let dimensions = pageContext2.dimensions;
+  if (!dimensions) {
+    dimensions = "pc";
+  }
+  return dimensions;
+}
 export {
   autoSetAfterSelect,
   caculateShowCondition,
@@ -624,6 +642,7 @@ export {
   getFormPropName,
   getOptionDatasFromPage,
   getParamNames,
+  getSizeConfig,
   getValueFromSource,
   getValueFromVariable,
   getVariableValue,

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

@@ -282,15 +282,25 @@ function queryPageSuperGrids(pageDesign, pageContext, publishVersion) {
   );
 }
 function packageFormRules(pageContext, configure) {
-  var _a, _b;
+  var _a, _b, _c;
   const prop = configure.props && configure.props.base ? configure.props.base.prop : null;
-  const isWorkflow = pageContext.workflowCode ? true : false;
+  let isWorkflow = false;
+  if ((_a = pageContext.props) == null ? void 0 : _a.activeWorkflow) {
+    isWorkflow = pageContext.workflowCode ? true : false;
+  }
+  let allFieldsDisabled = false;
   if (isWorkflow) {
-    console.log("packageFormRules-----prop=", prop, "--pageContext.fieldPermissionMap=", pageContext.fieldPermissionMap);
+    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)) {
+      if ((allFields == null ? void 0 : allFields["canEdit"]) === false && ((_b = configure.runtime) == null ? void 0 : _b.props)) {
         configure.runtime.props.state = "disabled";
+        allFieldsDisabled = true;
       }
     }
     const requiredRules = configure.props && configure.props.rules ? configure.props.rules.filter((item) => item.required) : null;
@@ -311,7 +321,7 @@ function packageFormRules(pageContext, configure) {
       }
       pageContext.rules[propName] = configure.props.rules;
     }
-    if (configure.name !== "button-detail" && pageContext.fieldPermissionMap) {
+    if (!allFieldsDisabled && configure.name !== "button-detail" && pageContext.fieldPermissionMap) {
       const propEditPermission = pageContext.fieldPermissionMap.get(propName);
       console.log("packageFormRules-----prop=", prop, "--propEditPermission=", propEditPermission);
       if (propEditPermission) {
@@ -321,10 +331,17 @@ function packageFormRules(pageContext, configure) {
           configure.runtime.props.state = "";
           configure.runtime.props.required = true;
         }
-        console.log("packageFormRules-----prop=", prop, "--configure.runtime.props=", configure.runtime.props);
+        console.log(
+          "packageFormRules-----prop=",
+          prop,
+          "--configure.runtime.props=",
+          configure.runtime.props
+        );
+      } else {
+        configure.runtime.props.state = "";
       }
     }
-    if ((_b = configure.props) == null ? void 0 : _b.customRuleEvents) {
+    if ((_c = configure.props) == null ? void 0 : _c.customRuleEvents) {
       if (!pageContext.customRuleEvents) {
         pageContext.customRuleEvents = [];
       }

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

@@ -1,6 +1,11 @@
-import { defineComponent, ref, resolveComponent, openBlock, createBlock, unref, normalizeStyle, normalizeClass, withCtx, createElementBlock, toDisplayString, createCommentVNode, Fragment, renderList } from "vue";
+import { defineComponent, ref, resolveComponent, openBlock, createElementBlock, createVNode, unref, normalizeStyle, normalizeClass, withCtx, toDisplayString, createCommentVNode, Fragment, renderList, createBlock } from "vue";
 import _sfc_main$1 from "../../object-render.vue.js";
 import "../../../../utils/global-refs.js";
+import "agilebuilder-ui/src/utils/common-util";
+import "agilebuilder-ui/src/utils/util";
+import "agilebuilder-ui/src/utils/request";
+import "dayjs";
+import "agilebuilder-ui/src/utils/calculator/calculator-util";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "form-runtime",
   props: {
@@ -19,30 +24,32 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const titleStyle = ref(runtimeInfo.titleStyle ? runtimeInfo.titleStyle : {});
     return (_ctx, _cache) => {
       const _component_el_form = resolveComponent("el-form");
-      return openBlock(), createBlock(_component_el_form, {
-        ref: "thisRef",
-        "label-width": unref(runtimeProps).labelWidth,
-        "label-position": unref(runtimeProps).labelPosition,
-        size: unref(runtimeProps).componentSize,
-        style: normalizeStyle(runtimeStyle.value),
-        class: normalizeClass(unref(runtimeClass))
-      }, {
-        default: withCtx(() => [
-          unref(runtimeProps).formTitle ? (openBlock(), createElementBlock("div", {
-            key: 0,
-            class: "amb-widget-form-title",
-            style: normalizeStyle(titleStyle.value)
-          }, toDisplayString(unref(runtimeProps).formTitle), 5)) : createCommentVNode("", true),
-          (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.configure.items, (element, itemIndex) => {
-            return openBlock(), createBlock(_sfc_main$1, {
-              key: element.uuid,
-              pageContext: _ctx.pageContext,
-              configure: element
-            }, null, 8, ["pageContext", "configure"]);
-          }), 128))
-        ]),
-        _: 1
-      }, 8, ["label-width", "label-position", "size", "style", "class"]);
+      return openBlock(), createElementBlock("div", null, [
+        createVNode(_component_el_form, {
+          ref: "thisRef",
+          "label-width": unref(runtimeProps).labelWidth,
+          "label-position": unref(runtimeProps).labelPosition,
+          size: unref(runtimeProps).componentSize,
+          style: normalizeStyle(runtimeStyle.value),
+          class: normalizeClass(unref(runtimeClass))
+        }, {
+          default: withCtx(() => [
+            unref(runtimeProps).formTitle ? (openBlock(), createElementBlock("div", {
+              key: 0,
+              class: "amb-widget-form-title",
+              style: normalizeStyle(titleStyle.value)
+            }, toDisplayString(unref(runtimeProps).formTitle), 5)) : createCommentVNode("", true),
+            (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.configure.items, (element, itemIndex) => {
+              return openBlock(), createBlock(_sfc_main$1, {
+                key: element.uuid,
+                pageContext: _ctx.pageContext,
+                configure: element
+              }, null, 8, ["pageContext", "configure"]);
+            }), 128))
+          ]),
+          _: 1
+        }, 8, ["label-width", "label-position", "size", "style", "class"])
+      ]);
     };
   }
 });

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

@@ -7,6 +7,7 @@ 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, getDefaultValue } from "../../../../utils/page-init-util.js";
+import { getSizeConfig } from "../../../../utils/page-helper-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "main-table-runtime",
   props: {
@@ -64,6 +65,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       eventBus.$on(eventPageInfo + "_close-dialog-get-entity", () => {
         eventBus.$emit(eventPageInfo + "_close-super-dialog");
       });
+      listOptions.value["formSetMaxHeight"] = getComponentHeight();
     });
     watch(
       () => props.pageContext.searchFormData,
@@ -526,6 +528,33 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       gridRef.value.toolbarRefresh(null, null, toolbarFieldParam);
     }
     function resizeListHeight(params) {
+      const contentHeight = getComponentHeight();
+      if (contentHeight) {
+        let searchHeight = 0;
+        if (params.searchHeight) {
+          searchHeight = params.searchHeight;
+        }
+        return contentHeight - 20 - searchHeight;
+      }
+    }
+    function getComponentHeight() {
+      if (!gridRef.value) {
+        return;
+      }
+      console.log("objectRender---configure.name=", props.configure.name, "props.configure=", props.configure, "runtimeStyle.value=", runtimeStyle);
+      const sizeConfig = getSizeConfig(props.pageContext, props.configure);
+      if (sizeConfig && sizeConfig["isCalcHeight"]) {
+        let thisRefDom = gridRef.value.$el;
+        if (!thisRefDom) {
+          thisRefDom = gridRef.value;
+        }
+        const parentNode = thisRefDom.parentNode;
+        if (!thisRefDom || !parentNode) {
+          return;
+        }
+        const rect = thisRefDom.getBoundingClientRect();
+        return window.innerHeight - rect.y - 80;
+      }
     }
     function customButtonClick(originalValue, formatValue, row, column, rowIndex, button) {
       const otherParams = {

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

@@ -1,6 +1,6 @@
 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 { getVariableValue, setVariableValue } from "../../../../utils/page-helper-util.js";
+import { getSizeConfig, 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";
@@ -119,11 +119,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       listViewOptions.value["showOperationButton"] = configure.props && configure.props.base ? configure.props.base.showOperation : false;
       listViewOptions.value["isPdfEditor"] = false;
       listViewOptions.value["tableRecordMaxNum"] = configure.props && configure.props.otherSettings ? configure.props.otherSettings.tableRecordMaxNum : null;
-      const pageModeType = getPageModeType();
-      let sizeConfig;
-      if (configure.props && configure.props.size && configure.props.size[pageModeType]) {
-        sizeConfig = configure.props.size[pageModeType];
-      }
+      let sizeConfig = getSizeConfig(pageContext, configure);
       if (sizeConfig && sizeConfig.fixHeight) {
         listViewOptions.value["formSetHeight"] = sizeConfig.fixHeight;
       }
@@ -131,13 +127,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         listViewOptions.value["formSetMaxHeight"] = sizeConfig.maxHeight;
       }
     }
-    function getPageModeType() {
-      let dimensions = pageContext.dimensions;
-      if (!dimensions) {
-        dimensions = "pc";
-      }
-      return dimensions;
-    }
     function judgeInitializationSubTable() {
       if (!configure.props || !configure.props.otherSettings) {
         return;

package/dist/es/components/runtime/views/assemblys/form/date-picker/datepicker-runtime.vue2.js

@@ -121,6 +121,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           designProperty.value.dateType == "time" || designProperty.value.dateType == "timerange" ? (openBlock(), createBlock(_component_el_time_picker, {
             key: 0,
             "is-range": designProperty.value.dateType == "timerange",
+            style: { "width": "100%" },
             "range-separator": "-",
             clearable: designProperty.value.clearable,
             disabled: designProperty.value.state === "disabled",
@@ -144,6 +145,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }, null, 8, ["is-range", "clearable", "disabled", "readonly", "size", "placeholder", "start-placeholder", "end-placeholder", "format", "value-format", "modelValue", "shortcuts", "type"])) : (openBlock(), createBlock(_component_el_date_picker, {
             key: 1,
             clearable: designProperty.value.clearable,
+            style: { "width": "100%" },
             disabled: designProperty.value.state === "disabled",
             readonly: designProperty.value.state === "readonly",
             size: designProperty.value.size,

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

@@ -174,6 +174,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         ]),
         default: withCtx(() => [
           createVNode(_component_el_select, {
+            style: { "width": "100%" },
             disabled: designProperty.value.state === "disabled",
             size: designProperty.value.size,
             clearable: designProperty.value.clearable,
@@ -197,7 +198,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   key: item.value,
                   label: item.label,
                   value: item.value,
-                  onClick: ($event) => unref(handleFormEvent)(item.value, _ctx.pageContext, _ctx.configure, "click", { values: dynamicModelMethod.value })
+                  onClick: ($event) => unref(handleFormEvent)(item.value, _ctx.pageContext, _ctx.configure, "click", {
+                    values: dynamicModelMethod.value
+                  })
                 }, {
                   default: withCtx(() => [
                     item._description_ ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [

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

@@ -1,11 +1,11 @@
-import { defineComponent, ref, computed, markRaw, onMounted, resolveDirective, withDirectives, openBlock, createBlock, resolveDynamicComponent, normalizeStyle, normalizeClass, vShow, unref } from "vue";
+import { defineComponent, ref, computed, markRaw, onMounted, resolveDirective, withDirectives, openBlock, createBlock, resolveDynamicComponent, normalizeStyle, normalizeClass, vShow, unref, nextTick } from "vue";
 import _sfc_main$1 from "./error-render.vue.js";
 import { getRuntimeComponentByName } from "../../utils/assemblys-config.js";
 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 } from "../../utils/page-helper-util.js";
-import { getPropClassName } from "../../utils/common-util.js";
+import { caculateShowCondition, getFormPropName, getSizeConfig } from "../../utils/page-helper-util.js";
+import { getPropClassName, isNumber } from "../../utils/common-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "object-render",
   props: {
@@ -129,19 +129,59 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         propName = getFormPropName(propName);
         controlObjectRenderState(props.pageContext, propName);
       }
+      setComponentHeight();
     }
     onMounted(() => {
-      if (!thisRef.value || !thisRef.value.parentNode) {
-        return;
-      }
       dynamicallyCalculatePosition();
     });
+    function setComponentHeight() {
+      if (!thisRef.value) {
+        return;
+      }
+      const sizeConfig = getSizeConfig(props.pageContext, props.configure);
+      if (props.configure.name !== "table" && sizeConfig && sizeConfig["isCalcHeight"]) {
+        nextTick(() => {
+          let thisRefDom = thisRef.value.$el;
+          if (!thisRefDom) {
+            thisRefDom = thisRef.value;
+          }
+          const parentNode = thisRefDom.parentNode;
+          if (!thisRefDom || !parentNode) {
+            return;
+          }
+          const rect = thisRefDom.getBoundingClientRect();
+          let contentHeight = window.innerHeight - rect.y - 80;
+          let heightStyle = contentHeight + "";
+          if (isNumber(contentHeight)) {
+            heightStyle = contentHeight + "px";
+          }
+          runtimeStyle.value["height"] = heightStyle;
+          runtimeStyle.value["overflow-y"] = "auto";
+          runtimeStyle.value["overflow-x"] = "hidden";
+          if (!props.configure.sytle) {
+            props.configure.sytle = {};
+          }
+          props.configure.sytle._heightStyle = heightStyle;
+        });
+      }
+    }
     const dynamicallyCalculatePosition = () => {
+      if (!thisRef.value) {
+        return;
+      }
+      let thisRefDom = thisRef.value.$el;
+      if (!thisRefDom) {
+        thisRefDom = thisRef.value;
+      }
+      const parentNode = thisRefDom.parentNode;
+      if (!thisRefDom || !parentNode) {
+        return;
+      }
       const thisProps = props.configure.props ? props.configure.props : {};
       const thisStyle = props.configure.style ? props.configure.style : {};
       const position = thisProps.position;
       if (position == "top" || position == "bottom") {
-        const contentObj = [thisRef.value.parentNode];
+        const contentObj = [parentNode];
         if (contentObj && contentObj.length > 0) {
           const contentRec = contentObj[0].getBoundingClientRect();
           if (position == "top") {
@@ -151,13 +191,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             runtimeStyle.value["bottom"] = "10px";
           }
         }
-        const thisRec = thisRef.value.getBoundingClientRect();
+        const thisRec = thisRefDom.getBoundingClientRect();
         runtimeStyle.value["width"] = thisRec.width + "px";
       } else if (thisStyle.position) {
         runtimeStyle.value["position"] = thisStyle.position;
         if (runtimeStyle.value.position != "relative") {
           if (!runtimeStyle.value["width"]) {
-            const thisRec = thisRef.value.getBoundingClientRect();
+            const thisRec = thisRefDom.getBoundingClientRect();
             runtimeStyle.value["width"] = thisRec.width + "px";
           }
           if (thisStyle.left) {

package/dist/es/components/runtime/views/assemblys/workflow/picture-flow/pictureflow-runtime.vue2.js

@@ -8,9 +8,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     configure: {}
   },
   setup(__props) {
+    var _a;
     const props = __props;
     const maxHeight = ref(null);
-    maxHeight.value = window.innerHeight - 120;
+    const heightStyle = (_a = props.configure.sytle) == null ? void 0 : _a._heightStyle;
+    if (heightStyle && (heightStyle + "").indexOf("px") > 0) {
+      const contentHeight = heightStyle.substring(0, heightStyle.lastIndexOf("px"));
+      maxHeight.value = Number(contentHeight) - 20;
+    } else {
+      maxHeight.value = window.innerHeight - 120;
+    }
     const historyGraphRef = ref(null);
     const workflowId = getWorkflowId(props.pageContext);
     if (props.pageContext.entity && props.pageContext.entity.task) {

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

@@ -8,16 +8,23 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     configure: {}
   },
   setup(__props) {
+    var _a;
     const props = __props;
     const maxHeight = ref(null);
-    maxHeight.value = window.innerHeight - 120;
+    const heightStyle = (_a = props.configure.sytle) == null ? void 0 : _a._heightStyle;
+    if (heightStyle && (heightStyle + "").indexOf("px") > 0) {
+      const contentHeight = heightStyle.substring(0, heightStyle.lastIndexOf("px"));
+      maxHeight.value = Number(contentHeight) - 20;
+    } else {
+      maxHeight.value = window.innerHeight - 120;
+    }
     const historyList = ref(null);
     const workflowId = getWorkflowId(props.pageContext);
     if (props.pageContext.entity && props.pageContext.entity.task) {
       watch(
         () => {
-          var _a;
-          return (_a = props.pageContext.entity.task) == null ? void 0 : _a.id;
+          var _a2;
+          return (_a2 = props.pageContext.entity.task) == null ? void 0 : _a2.id;
         },
         () => {
           if (workflowId && historyList.value && props.pageContext.entity.task) {

package/dist/es/components/runtime/views/super-page.vue.js

@@ -109,6 +109,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const buttonConfigure = ref(null);
     const buttonPageContext = ref(null);
     const route = useRoute();
+    const pageKey = ref(0);
     function initPageDesign(pageDesign) {
       const tempContext = convertToPageContext(pageDesign, props.pageRequest);
       tempContext.isTest = props.isTest;
@@ -202,10 +203,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         () => pageContext.value.isRefresh,
         (newValue) => {
           if (newValue) {
-            isShowPage.value = false;
-            setTimeout(() => {
-              isShowPage.value = true;
-            }, 100);
+            pageKey.value++;
             pageContext.value.isRefresh = false;
           }
         }
@@ -495,9 +493,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", _hoisted_1, [
         isShowPage.value ? (openBlock(), createElementBlock("div", {
-          key: 0,
           ref_key: "thisRef",
           ref: thisRef,
+          key: pageKey.value,
           class: normalizeClass(pageClass.value),
           style: normalizeStyle(pageStyle.value)
         }, [

package/package.json

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