super-page-runtime 2.0.81 → 2.0.85

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

@@ -296,7 +296,8 @@ function formatAdditionalParamMapIds(ids) {
       ids = ids.split(",");
     } else if (typeof ids === "number") {
       ids = [ids];
-    } else ;
+    } else
+      ;
   }
   return ids;
 }

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;
@@ -783,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;
@@ -914,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/events/validator-util.js

@@ -75,10 +75,25 @@ 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);
+  return validatorEntity(entity, rules, columns, rowIndex, true, isSql);
 }
 function sublistVerify(rules) {
   if (!rules) {
@@ -104,7 +119,7 @@ function sublistVerify(rules) {
 function validatorEntity(entity, rules, columns, rowIndex, isShouldRepeateValdate, isSql) {
   let validateRules = sublistVerify(rules);
   if ((!rules || rules === null) && columns) {
-    validateRules = getValidator();
+    validateRules = getValidator(columns);
   }
   if (!validateRules || Object.keys(validateRules).length === 0) {
     entity["validateErrorField"] = "";
@@ -122,6 +137,11 @@ 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,
@@ -134,11 +154,11 @@ function validatorEntity(entity, rules, columns, rowIndex, isShouldRepeateValdat
       }
       if (fieldName && isShouldRepeateValdate === true) {
         const reg1 = /[A-Z]+/;
-        if (reg1.test(fieldName) && entity[fieldName.toLowerCase()] !== void 0) {
+        if (isSql !== void 0 && isSql === true && 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);
+          result = validatorEntity(copyEntity, rules, columns, rowIndex, false, isSql);
         }
       }
     }
@@ -186,7 +206,7 @@ function validateWorkflowFormDataModel(dataModel, pageContext) {
     if (!rules || Object.keys(rules).length === 0) {
       result = true;
     } else {
-      result = validator(handleModels, rules, null, null);
+      result = validator(handleModels, rules, null, null, true);
     }
     if (result === true) {
       const workflowFieldPermissionRules = pageContext.workflowRules;
@@ -250,7 +270,7 @@ function validateCommonFormDataModel(dataModel, pageContext, rules) {
     if (!rules || Object.keys(rules).length === 0) {
       resolve(handleModels);
     } else {
-      const validateEntityResult = validator(handleModels, rules, null, null);
+      const validateEntityResult = validator(handleModels, rules, null, null, true);
       if (validateEntityResult === true) {
         const validateResult = validateSubTables(pageContext);
         if (validateResult === true) {

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

@@ -77,7 +77,8 @@ function getTableQueryInfo(dataOriginInfo, pageContext2) {
           }
         }
       }
-      if (f.propValue) ;
+      if (f.propValue)
+        ;
       searchForm.push(tempObj);
     }
     infoObj.props.searchForm = searchForm;

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";
@@ -117,7 +116,8 @@ function getRequestObject(pageRequest) {
       requestObj[paramStrs[0]] = paramStrs.length > 1 ? paramStrs[1] : "";
     }
   }
-  if (requestObj["_t_"]) ;
+  if (requestObj["_t_"])
+    ;
   return requestObj;
 }
 function packageAdditionalMapWithRoute(route, requestObj) {
@@ -187,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);
     }
@@ -311,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/placeholder/placeholder-runtime.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./placeholder-runtime.vue2.js";
-/* empty css                         */
+import "./placeholder-runtime.vue3.js";
 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/form/placeholder/placeholder-runtime.vue3.js

@@ -0,0 +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/super-page.vue.js

@@ -336,7 +336,8 @@ 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;

package/package.json

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