super-page-runtime 2.0.80 → 2.0.85

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

@@ -75,6 +75,9 @@ function getCommonFormData(pageContext, id) {
       });
       param["listCodes"] = listCodes;
     }
+    if (pageContext.refercePropMap) {
+      param["refercePropMap"] = pageContext.refercePropMap;
+    }
     const urlForView = backendUrl + "/dsc/commons/gets";
     http.post(urlForView, param).then((commonEntity) => {
       if (commonEntity) {
@@ -155,6 +158,9 @@ function getWorkflowFormData(pageContext, id) {
     if (pageContext.beanName) {
       param["beanName"] = pageContext.beanName;
     }
+    if (pageContext.refercePropMap) {
+      param["refercePropMap"] = pageContext.refercePropMap;
+    }
     const baseUrl = getBaseUrl(pageContext.backendUrl, pageContext.isTest);
     const urlForView = baseUrl + "/dsc/workflow-commons/gets";
     http.post(urlForView, param).then((commonEntity) => {

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

@@ -1,3 +1,5 @@
+import { Component } from './interfaces/page-design-types';
+
 export declare function isArrayFn(value: any): boolean;
 export declare function getBaseUrl(backendUrl: any, isTest?: boolean): any;
 export declare function getRealRestApiPath(orgRestApiPath: any, systemCode: any, backendUrl: any, isTest?: boolean): any;
@@ -15,3 +17,9 @@ export declare function getListCode(pageCode: any, pageVersion: any, tableUuid:
  */
 export declare function deepCopy(srcObj: any): any;
 export declare function getWorkflowId(pageContext: any): any;
+/**
+ * 获得当前属性名，封装到class中，操作dom时可能会使用
+ * @param configure
+ * @returns
+ */
+export declare function getPropClassName(configure: Component): any;

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

@@ -96,10 +96,30 @@ function getWorkflowId(pageContext) {
   }
   return workflowId;
 }
+function getPropClassName(configure) {
+  var _a, _b, _c, _d;
+  let propClassName;
+  if (configure && ((_b = (_a = configure.props) == null ? void 0 : _a.base) == null ? void 0 : _b.prop)) {
+    let prop = (_d = (_c = configure.props) == null ? void 0 : _c.base) == null ? void 0 : _d.prop;
+    if (prop.indexOf("${") >= 0) {
+      prop = prop.substring(2, prop.lastIndexOf("}"));
+    }
+    const props = prop.split(".");
+    if (props.length === 2) {
+      propClassName = props[1];
+    } else if (props.length === 3) {
+      propClassName = props[1] + "__" + props[2];
+    }
+  } else if (configure.code) {
+    propClassName = configure.code;
+  }
+  return propClassName;
+}
 export {
   deepCopy,
   getBaseUrl,
   getListCode,
+  getPropClassName,
   getRealRestApiPath,
   getWorkflowId,
   isArrayFn,

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

@@ -208,6 +208,10 @@ function buttonClickEvent(pageContext, configure, eventParams) {
 function doValidateForm(pageContext, configure, eventParams) {
   const events = configure.runtime && configure.runtime.events ? configure.runtime.events : [];
   let isEnableRequired = true;
+  console.log("doValidateForm---eventParams=", eventParams);
+  if (eventParams == null ? void 0 : eventParams.skipValidate) {
+    isEnableRequired = false;
+  }
   const clickEventFunObj = getClickEventFuncByType(pageContext, events, "click");
   if (clickEventFunObj) {
     const isStandardEvent = clickEventFunObj.isStandard;

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

@@ -251,7 +251,7 @@ function exportFormReport(pageContext, configureObj, templateFile, isPdf) {
   const isWorkflowForm = pageContext.workflowCode ? true : false;
   const beanName = pageContext.beanName;
   const button = configureObj.props.base;
-  const tableName = configureObj.tableName;
+  const tableName = configureObj.tableName ? configureObj.tableName : pageContext.tableName;
   const backendUrl = pageContext.backendUrl;
   const viewModels = pageContext.entity.data;
   const isPermission = button.isPermission === void 0 || button.isPermission === "true" || button.isPermission;
@@ -765,6 +765,7 @@ function deleteFunc(params) {
         type: "warning",
         message: getI18n().t("superPageRuntimeMessage.pleaseSelectRecord")
       });
+      resolve(true);
       return;
     }
     ElMessageBox.confirm(
@@ -782,7 +783,7 @@ function deleteFunc(params) {
       const configureBase = configureObj.props.base;
       const systemCode = pageContext.systemCode;
       const backendUrl = pageContext.backendUrl;
-      const tableUuid = configureObj.props.base.tableUuid;
+      const tableUuid = configureObj.props.base.tableUuid ? configureObj.props.base.tableUuid : params.tableUuid;
       const tableName = getTableNameByTableUuid(pageContext, tableUuid);
       const baseUrl = getBaseUrl(backendUrl, pageContext.isTest);
       let path = baseUrl + "/dsc/commons/" + tableName;
@@ -913,8 +914,9 @@ function doImportFinally(params, fileObj) {
   const pageContext = params.pageContext;
   const buttonConfigureObj = params.configureObj;
   const tableConfigure = params.tableConfigure;
-  const tableName = pageContext.tableName;
   const buttonConfigureBase = buttonConfigureObj.props.base;
+  const tableUuid = buttonConfigureObj.props.base.tableUuid ? buttonConfigureObj.props.base.tableUuid : params.tableUuid;
+  const tableName = getTableNameByTableUuid(pageContext, tableUuid);
   const param = new FormData();
   param.append("multipartFile", fileObj);
   if (tableName) {

package/dist/es/components/runtime/utils/interfaces/page-design-types.d.ts

@@ -136,6 +136,7 @@ export interface PageContext extends Component {
     searchFormData?: Array<object>;
     selectOptions?: object;
     chartDataSourceMap?: any;
+    refercePropMap?: object;
     [otherProp: string]: any;
 }
 /**

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

@@ -306,14 +306,13 @@ function setVariableValue(entity, fields, newValue) {
   let tempObj = entity;
   for (let i = 0; i < fields.length; i++) {
     const fieldName = fields[i];
-    if (i + 1 == fields.length) {
+    if (i + 1 === fields.length) {
       tempObj[fieldName] = newValue;
     } else {
-      tempObj = tempObj[fieldName];
-      if (tempObj == void 0) {
+      if (tempObj[fieldName] === void 0) {
         tempObj[fieldName] = {};
-        tempObj = tempObj[fieldName];
       }
+      tempObj = tempObj[fieldName];
     }
   }
 }

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

@@ -1,5 +1,4 @@
 import http from "agilebuilder-ui/src/utils/request";
-import "vue-router";
 import { getAdditionalParamMap } from "./events/standard-event.js";
 import { PageDimensions } from "./interfaces/page-design-types.js";
 import { setVariableValue, formatVariableValue, getFormPropName } from "./page-helper-util.js";
@@ -12,6 +11,7 @@ function queryPageDesignByCode(pageCode) {
   );
 }
 function convertToPageContext(pageDesign, pageRequest) {
+  var _a;
   if (pageDesign == null) {
     return null;
   }
@@ -46,6 +46,8 @@ function convertToPageContext(pageDesign, pageRequest) {
     // 列表分页信息，格式是：{列表编码: 每页显示多少条记录}，表单页面中校验有分页的子表时提示使用，提示信息格式：第 {pageNum} 页第 {row} 行记录
     workflowCode: pageDesign.workflowCode,
     workflowVersion: pageDesign.workflowVersion,
+    refercePropMap: (_a = pageDesign.runtime) == null ? void 0 : _a.refercePropMap,
+    //当前表单页面中引用字段信息集合,get请求时需要使用，格式为{tableName:[字段名,.. ... ], tableName:[字段名,.. ... ]}
     entity: {
       data: {},
       task: {},
@@ -185,7 +187,7 @@ function getFormModelFields(pageContext, formItemConfigure, prop) {
       multiple = propsBase.multiple;
     }
     const defaultValueSet = propsBase ? propsBase.defaultValue : null;
-    let defaultValue = getDefaultValue(pageContext, defaultValueSet, componentType, multiple);
+    const defaultValue = getDefaultValue(pageContext, defaultValueSet, componentType, multiple);
     if (defaultValue !== void 0 && defaultValue !== null) {
       setVariableValue(entity, fields, defaultValue);
     }
@@ -309,12 +311,20 @@ function packageFormRules(pageContext, configure) {
 }
 function controlObjectRenderState(pageContext, propName) {
   if (pageContext.initInfo) {
-    const types = ["dynamicControlFormEdit", "disableElement", "enableElement", "hideElement", "showElement"];
+    const types = [
+      "dynamicControlFormEdit",
+      "disableElement",
+      "enableElement",
+      "hideElement",
+      "showElement"
+    ];
     types.forEach((type) => {
       const infos = pageContext.initInfo[type];
       if (infos) {
         if (type === "dynamicControlFormEdit") {
-          let settings = infos.filter((item) => item.name === "_all_fields" || item.name === propName);
+          let settings = infos.filter(
+            (item) => item.name === "_all_fields" || item.name === propName
+          );
           if (settings && settings.length > 0) {
             settings = settings.filter((item) => item.name === "_all_fields");
             if (settings && settings.length > 0) {

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

@@ -543,7 +543,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function recieveMessage(event) {
       if (event.data === "close_open_win") {
-        gridRef.value.refresh();
+        if (gridRef.value) {
+          gridRef.value.refresh();
+        }
       }
     }
     function select(selection, row) {

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

@@ -14,9 +14,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     let dynamicFields = getFormModelFields(props.pageContext, props.configure);
     const dynamicModelMethod = computed({
       get() {
-        return getVariableValue(entity, dynamicFields);
+        let val = getVariableValue(entity, dynamicFields);
+        if (val) {
+          val = val.split(",");
+        }
+        return val;
       },
       set(value) {
+        if (value && value.length > 0) {
+          value = value.join(",");
+        }
         setVariableValue(entity, dynamicFields, value);
       }
     });

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

@@ -1,7 +1,7 @@
 import { defineComponent, ref, computed, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createElementBlock, toDisplayString, createCommentVNode, createVNode, createTextVNode } from "vue";
 import { getFormModelFields } from "../../../../utils/page-init-util.js";
 import { getVariableValue } from "../../../../utils/page-helper-util.js";
-import { handleFormEvent } from "../../../../utils/events/event-util.js";
+import { handleEvent } from "../../../../utils/events/event-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "link-runtime",
   props: {
@@ -61,7 +61,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 disabled: designProperty.value.state === "disabled",
                 type: designProperty.value.type,
                 underline: designProperty.value.underline,
-                onClick: _cache[0] || (_cache[0] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "click"))
+                onClick: _cache[0] || (_cache[0] = ($event) => unref(handleEvent)($event, _ctx.pageContext, _ctx.configure, "click", { skipValidate: true }))
               }, {
                 default: withCtx(() => [
                   createTextVNode(toDisplayString(dynamicValue.value), 1)

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

@@ -14,7 +14,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     let dynamicFields = getFormModelFields(props.pageContext, props.configure);
     const dynamicModelMethod = computed({
       get() {
-        return getVariableValue(entity, dynamicFields);
+        let val = getVariableValue(entity, dynamicFields);
+        if (val !== void 0 && val !== null) {
+          val = val + "";
+        }
+        return val;
       },
       set(value) {
         setVariableValue(entity, dynamicFields, value);

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

@@ -17,7 +17,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     let dynamicFields = getFormModelFields(props.pageContext, props.configure);
     const dynamicModelMethod = computed({
       get() {
-        return getVariableValue(entity, dynamicFields);
+        let val = getVariableValue(entity, dynamicFields);
+        if (val !== void 0 && val !== null) {
+          val = val + "";
+        }
+        return val;
       },
       set(value) {
         setVariableValue(entity, dynamicFields, value);

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

@@ -1,4 +1,4 @@
-import { defineComponent, computed, ref, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createElementBlock, toDisplayString, createCommentVNode, createVNode } from "vue";
+import { defineComponent, ref, computed, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createElementBlock, toDisplayString, createCommentVNode, createVNode } from "vue";
 import { getFormModelFields } from "../../../../utils/page-init-util.js";
 import { getVariableValue, setVariableValue } from "../../../../utils/page-helper-util.js";
 import { handleFormEvent } from "../../../../utils/events/event-util.js";
@@ -12,20 +12,30 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const props = __props;
     const entity = props.pageContext.entity ? props.pageContext.entity : {};
     let dynamicFields = getFormModelFields(props.pageContext, props.configure);
+    const runtimeInfo = props.configure.runtime ? props.configure.runtime : {};
+    const runtimeStyle = runtimeInfo.style;
+    const runtimeClass = runtimeInfo.class;
+    const headerStyle = runtimeInfo.headerStyle;
+    const designProperty = ref(runtimeInfo.props ? runtimeInfo.props : {});
+    if (designProperty.value.activeValue === void 0 || designProperty.value.activeValue === null) {
+      designProperty.value.activeValue = "1";
+    }
+    if (designProperty.value.inactiveValue === void 0 || designProperty.value.inactiveValue === null) {
+      designProperty.value.activeValue = "0";
+    }
+    const switchStyle = runtimeInfo.switchStyle;
     const dynamicModelMethod = computed({
       get() {
-        return getVariableValue(entity, dynamicFields);
+        let val = getVariableValue(entity, dynamicFields);
+        if (val !== void 0 && val !== null) {
+          val = val = "";
+        }
+        return val;
       },
       set(value) {
         setVariableValue(entity, dynamicFields, value);
       }
     });
-    const runtimeInfo = props.configure.runtime ? props.configure.runtime : {};
-    const runtimeStyle = runtimeInfo.style;
-    const runtimeClass = runtimeInfo.class;
-    const headerStyle = runtimeInfo.headerStyle;
-    const designProperty = ref(runtimeInfo.props ? runtimeInfo.props : {});
-    const switchStyle = runtimeInfo.switchStyle;
     return (_ctx, _cache) => {
       const _component_el_switch = resolveComponent("el-switch");
       const _component_el_form_item = resolveComponent("el-form-item");
@@ -44,7 +54,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         default: withCtx(() => [
           createVNode(_component_el_switch, {
             disabled: designProperty.value.state === "disabled",
-            "active-value:": designProperty.value.activeValue,
+            "active-value": designProperty.value.activeValue,
             "active-text": designProperty.value.activeText,
             "inactive-value": designProperty.value.inactiveValue,
             "inactive-text": designProperty.value.inactiveText,
@@ -54,7 +64,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             modelValue: dynamicModelMethod.value,
             "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => dynamicModelMethod.value = $event),
             onChange: _cache[1] || (_cache[1] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "change"))
-          }, null, 8, ["disabled", "active-value:", "active-text", "inactive-value", "inactive-text", "width", "size", "style", "modelValue"])
+          }, null, 8, ["disabled", "active-value", "active-text", "inactive-value", "inactive-text", "width", "size", "style", "modelValue"])
         ]),
         _: 1
       }, 8, ["required", "class", "label-width", "style"]);

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

@@ -5,6 +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 } from "../../utils/page-helper-util.js";
+import { getPropClassName } from "../../utils/common-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "object-render",
   props: {
@@ -12,6 +13,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     configure: {}
   },
   setup(__props) {
+    var _a;
     const props = __props;
     if (props.configure.style == void 0) {
       props.configure.style = {};
@@ -24,17 +26,25 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     let handleShowFlag = ref(true);
     let showFlag = ref(true);
     if (props.configure && props.configure.props) {
-      if (props.configure.props.showConditions) {
-        const showConditions = props.configure.props.showConditions;
-        if (showConditions.length > 0) {
-          showFlag = computed(() => {
-            if (!handleShowFlag.value) {
-              return false;
-            }
-            return caculateShowCondition(props.pageContext, props.configure, showConditions);
-          });
+      let showConditions = [];
+      if ((_a = props.configure.props.base) == null ? void 0 : _a.showConditions) {
+        if (typeof props.configure.props.base.showConditions === "string") {
+          showConditions = JSON.parse(props.configure.props.base.showConditions);
+        } else {
+          showConditions = props.configure.props.base.showConditions;
         }
       }
+      showFlag = computed(() => {
+        var _a2;
+        if (!handleShowFlag.value) {
+          return false;
+        }
+        const state = (_a2 = props.configure.props.base) == null ? void 0 : _a2.state;
+        if (state && state === "hidden") {
+          return false;
+        }
+        return caculateShowCondition(props.pageContext, props.configure, showConditions);
+      });
       if (props.configure.props.editConditions) {
         const editConditions = props.configure.props.editConditions;
         if (editConditions.length > 0) {
@@ -58,9 +68,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const thisRef = ref(null);
     const runtimeStyle = ref({});
     const runtimeClass = ref("");
+    const propClassName = getPropClassName(props.configure);
+    if (propClassName) {
+      runtimeClass.value = propClassName;
+    }
     const commonRuntime = props.configure.runtime && props.configure.runtime.common ? props.configure.runtime.common : {};
     if (commonRuntime.class) {
-      runtimeClass.value = commonRuntime.class;
+      runtimeClass.value += " " + commonRuntime.class;
     }
     if (commonRuntime.style) {
       Object.assign(runtimeStyle.value, commonRuntime.style);

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

@@ -19,6 +19,7 @@ import { useRoute, useRouter } from "vue-router";
 import { jumpToPage } from "agilebuilder-ui/src/utils/jump-page-utils";
 import { setSessionCache } from "agilebuilder-ui/src/utils/auth";
 import { deepCopy } from "../utils/common-util.js";
+const _hoisted_1 = { class: "app-container" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "super-page",
   props: {
@@ -480,7 +481,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       isShowDialog.value = false;
     }
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", null, [
+      return openBlock(), createElementBlock("div", _hoisted_1, [
         isShowPage.value ? (openBlock(), createElementBlock("div", {
           key: 0,
           ref_key: "thisRef",

package/package.json

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