super-page-runtime 2.0.80 → 2.0.81

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) => {
@@ -290,8 +296,7 @@ function formatAdditionalParamMapIds(ids) {
       ids = ids.split(",");
     } else if (typeof ids === "number") {
       ids = [ids];
-    } else
-      ;
+    } else ;
   }
   return ids;
 }

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/standard-event.js

@@ -765,6 +765,7 @@ function deleteFunc(params) {
         type: "warning",
         message: getI18n().t("superPageRuntimeMessage.pleaseSelectRecord")
       });
+      resolve(true);
       return;
     }
     ElMessageBox.confirm(

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

@@ -75,25 +75,10 @@ function getEndObjectRule(rule, props, currentProp) {
 }
 function getValidator(columns) {
   const rules = {};
-  if (columns) {
-    columns.forEach((editField) => {
-      const prop = editField.model;
-      if (prop && editField.validations) {
-        const validations = editField.validations;
-        if (prop.indexOf(".") > 0) {
-          setObjectPropRule(editField.prop, rules, validations);
-        } else {
-          if (validations && validations.length > 0) {
-            rules[prop] = [...validations];
-          }
-        }
-      }
-    });
-  }
   return rules;
 }
 function validator(entity, rules, columns, rowIndex, isSql) {
-  return validatorEntity(entity, rules, columns, rowIndex, true, isSql);
+  return validatorEntity(entity, rules, columns, rowIndex, true);
 }
 function sublistVerify(rules) {
   if (!rules) {
@@ -119,7 +104,7 @@ function sublistVerify(rules) {
 function validatorEntity(entity, rules, columns, rowIndex, isShouldRepeateValdate, isSql) {
   let validateRules = sublistVerify(rules);
   if ((!rules || rules === null) && columns) {
-    validateRules = getValidator(columns);
+    validateRules = getValidator();
   }
   if (!validateRules || Object.keys(validateRules).length === 0) {
     entity["validateErrorField"] = "";
@@ -137,11 +122,6 @@ function validatorEntity(entity, rules, columns, rowIndex, isShouldRepeateValdat
       if (errors) {
         result = errors[0].message;
         fieldName = errors[0]["field"];
-        if (typeof rowIndex !== "undefined" && rowIndex !== null) {
-          result = getI18n().t("superPageRuntimeMessage.recordLine", {
-            row: rowIndex + 1
-          }) + "，" + result;
-        }
         ElMessage({
           message: result,
           showClose: true,
@@ -154,11 +134,11 @@ function validatorEntity(entity, rules, columns, rowIndex, isShouldRepeateValdat
       }
       if (fieldName && isShouldRepeateValdate === true) {
         const reg1 = /[A-Z]+/;
-        if (isSql !== void 0 && isSql === true && reg1.test(fieldName) && entity[fieldName.toLowerCase()] !== void 0) {
+        if (reg1.test(fieldName) && entity[fieldName.toLowerCase()] !== void 0) {
           const copyEntity = JSON.parse(JSON.stringify(entity));
           copyEntity[fieldName.toUpperCase()] = entity[fieldName.toLowerCase()];
           delete copyEntity[fieldName.toLowerCase()];
-          result = validatorEntity(copyEntity, rules, columns, rowIndex, false, isSql);
+          result = validatorEntity(copyEntity, rules, columns, rowIndex, false);
         }
       }
     }
@@ -206,7 +186,7 @@ function validateWorkflowFormDataModel(dataModel, pageContext) {
     if (!rules || Object.keys(rules).length === 0) {
       result = true;
     } else {
-      result = validator(handleModels, rules, null, null, true);
+      result = validator(handleModels, rules, null, null);
     }
     if (result === true) {
       const workflowFieldPermissionRules = pageContext.workflowRules;
@@ -270,7 +250,7 @@ function validateCommonFormDataModel(dataModel, pageContext, rules) {
     if (!rules || Object.keys(rules).length === 0) {
       resolve(handleModels);
     } else {
-      const validateEntityResult = validator(handleModels, rules, null, null, true);
+      const validateEntityResult = validator(handleModels, rules, null, null);
       if (validateEntityResult === true) {
         const validateResult = validateSubTables(pageContext);
         if (validateResult === true) {

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

@@ -77,8 +77,7 @@ function getTableQueryInfo(dataOriginInfo, pageContext2) {
           }
         }
       }
-      if (f.propValue)
-        ;
+      if (f.propValue) ;
       searchForm.push(tempObj);
     }
     infoObj.props.searchForm = searchForm;
@@ -306,14 +305,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

@@ -12,6 +12,7 @@ function queryPageDesignByCode(pageCode) {
   );
 }
 function convertToPageContext(pageDesign, pageRequest) {
+  var _a;
   if (pageDesign == null) {
     return null;
   }
@@ -46,6 +47,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: {},
@@ -114,8 +117,7 @@ function getRequestObject(pageRequest) {
       requestObj[paramStrs[0]] = paramStrs.length > 1 ? paramStrs[1] : "";
     }
   }
-  if (requestObj["_t_"])
-    ;
+  if (requestObj["_t_"]) ;
   return requestObj;
 }
 function packageAdditionalMapWithRoute(route, requestObj) {

package/dist/es/components/runtime/views/assemblys/form/placeholder/placeholder-runtime.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./placeholder-runtime.vue2.js";
-import "./placeholder-runtime.vue3.js";
+/* empty css                         */
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
 const placeholderRuntime = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-a0860ff0"]]);
 export {

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: {
@@ -335,8 +336,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         if (!_selectFile_.value) {
           return;
         }
-        if (_selectFile_.value.value === "" || _selectFile_.value.value === null)
-          return;
+        if (_selectFile_.value.value === "" || _selectFile_.value.value === null) return;
         const fileObj = _selectFile_.value.files[0];
         if (fileObj) {
           _selectFile_.value.value = null;
@@ -480,7 +480,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.81",
   "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.57",
     "axios": "^1.6.8",
     "cypress": "^13.6.6",
     "element-plus": "^2.6.1",

package/dist/es/components/runtime/views/assemblys/form/placeholder/placeholder-runtime.vue3.js

@@ -1 +0,0 @@
-