super-page-designer 2.0.61 → 2.0.70

package/dist/es/components/design/utils/form-design-util.js

@@ -345,6 +345,7 @@ function watchRequiredValidate(configure, fieldInfo) {
   }
 }
 function watchValidate(configure, verification, fieldInfo) {
+  var _a, _b;
   configure.props.rules = [];
   const prop = configure.props.base.prop;
   if (prop) {
@@ -364,6 +365,11 @@ function watchValidate(configure, verification, fieldInfo) {
       if (verification.verifyMinLength && verification.minLength) {
         watchMaxOrMinValidate(configure, "min", verification.minLength, fieldInfo);
       }
+      if (((_a = verification.custom) == null ? void 0 : _a.enabled) && ((_b = verification.custom.eventNames) == null ? void 0 : _b.length) > 0) {
+        configure.props.customRuleEvents = verification.custom.eventNames;
+      } else {
+        configure.props.customRuleEvents = [];
+      }
     }
   }
 }

package/dist/es/components/design/utils/page-table-util.js

@@ -173,13 +173,13 @@ function getListColumns(configure, pageDesign) {
       // 值设置，设置多个
       valueSetOptions: getValueSetOptions(item),
       // 是否必填
-      required: configure.props.verification.required,
+      required: item.props.verification.required,
       // 校验的正则
-      pattern: configure.props.verification.verifyRegex,
+      pattern: item.props.verification.verifyRegex,
       // 校验的类型
-      checkType: configure.props.verification.type,
+      checkType: item.props.verification.type,
       // 内容显示位置
-      contAlign: configure.props.base ? configure.props.base.alignContent : null
+      contAlign: item.props.base ? item.props.base.alignContent : null
       // 国际化key，如果配置了该列则使用该列的key去查询国际化配置，如果没用配置就以“headerName”字段的值为准
       // i18nKey: string
       /**
@@ -219,22 +219,21 @@ function getListColumnValueSet(item, listColumn) {
   if (item.name === "inputNumber") {
     return null;
   }
-  if (configureProps.dataOrigin && configureProps.dataOrigin.optionValueSetType) {
+  if (configureProps.dataOrigin && configureProps.dataOrigin.optionValueSetType && configureProps.dataOrigin.optionValueSetType !== "none") {
     const optionType = configureProps.dataOrigin.optionValueSetType;
     if (optionType === "static") {
-      const valueSets = [];
-      configureProps.dataOrigin.staticStates.forEach((element) => {
-        valueSets.push(element.value + ":" + element.label);
-      });
+      const valueSets = configureProps.dataOrigin.staticStates.map(
+        (element) => `${element.value}:${element.label}`
+      );
       return valueSets.join(",");
     } else if (optionType === "optionGroup") {
-      return optionType + ":" + configureProps.dataOrigin.optionGroup;
+      return `${optionType}:${configureProps.dataOrigin.optionGroup}`;
     } else if (optionType === "dynamicData") {
-      return "dynamicDataSource:" + configureProps.dataOrigin.dynamicDataSourceCode;
+      return `dynamicDataSource:${configureProps.dataOrigin.dynamicDataSourceCode}`;
     } else if (optionType === "dataTable") {
-      return optionType + ":" + configureProps.dataOrigin.tableName;
+      return `${optionType}:${configureProps.dataOrigin.tableName}`;
     } else if (optionType === "service") {
-      return optionType + ":" + configureProps.dataOrigin.serveName;
+      return `${optionType}:${configureProps.dataOrigin.serveName}`;
     }
   }
 }
@@ -403,7 +402,11 @@ function getPropsFormat(item) {
     if (item.props.format.type === "hyperlinks") {
       const format = {};
       format.type = item.props.format.type;
-      format.jumpPageJson = JSON.stringify(item.props.linkPage);
+      const jumpJson = JSON.parse(JSON.stringify(item.props.linkPage));
+      if (jumpJson.displayTextJudge && jumpJson.dynamicTags && jumpJson.dynamicTags.length > 0) {
+        jumpJson.displayText = jumpJson.dynamicTags.join("-#-#");
+      }
+      format.jumpPageJson = JSON.stringify(jumpJson);
       return JSON.stringify(format);
     } else if (item.props.format.type === "icon") {
       const format = {};

package/dist/es/components/design/views/assemblys/common/common-variable-bind.vue.js

@@ -1,7 +1,7 @@
-import _sfc_main from "./common-variable-bind.vue3.js";
-import "./common-variable-bind.vue2.js";
+import _sfc_main from "./common-variable-bind.vue2.js";
+import "./common-variable-bind.vue3.js";
 import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.js";
-const BindVariable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-48d27f9e"]]);
+const BindVariable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-cfaaf957"]]);
 export {
   BindVariable as default
 };