agilebuilder-ui 1.0.621 → 1.0.962

package/packages/super-grid/src/formValidatorUtil.js

@@ -87,41 +87,100 @@ function getValidator(listCode) {
   }
   const gridParams = store.get(listCode)
   const editFieldInfos = gridParams.columns
+  const customRules = gridParams.options.customRules
   const rules = {}
   if (editFieldInfos) {
     editFieldInfos.forEach((editField) => {
-      setRules(rules, editField, listCode)
+      setRules(rules, editField, listCode, customRules)
     })
   }
   // console.log('rules', rules)
   return rules
 }
 
-function setRules(rules, editField, listCode) {
+function setRules(rules, editField, listCode, customRules) {
   const prop = editField.prop
   if (editField.groupHeader && editField.children && editField.children.length > 0) {
     // 组合表头时或者动态列，递归设置规则，
     editField.children.forEach((child) => {
-      setRules(rules, child, listCode)
+      setRules(rules, child, listCode, customRules)
     })
   } else {
-    if (prop && editField.validations && !isDisableEdit(prop, listCode)) {
-      const validations = JSON.parse(editField.validations)
-      validations.forEach((item) => {
-        if (item.pattern) {
-          // 后台传递的是正则字符串，不能直接使用
-          item.pattern = new RegExp(item.pattern)
+    if(prop) {
+      // 获得当前列的自定义校验规则
+      const columnCustomRules = getColumnCustomRules(editField, customRules)
+      if ((columnCustomRules || editField.validations) && !isDisableEdit(prop, listCode)) {
+        let validations = editField.validations? JSON.parse(editField.validations): []
+        validations.forEach((item) => {
+          if (item.pattern) {
+            // 后台传递的是正则字符串，不能直接使用
+            item.pattern = new RegExp(item.pattern)
+          }
+        })
+        validations = validations.concat(columnCustomRules)
+        if (prop.indexOf('.') > 0) {
+          setObjectPropRule(editField, rules, validations)
+        } else {
+          if (validations && validations.length > 0) {
+            rules[prop] = [...validations]
+          }
         }
+      }
+    }
+  }
+}
+/**
+ * 获得当前列的自定义校验规则
+ * @param {*} editField 
+ * @param {*} customRules 
+ * @returns 
+ */
+function getColumnCustomRules(editField, customRules) {
+  const prop = editField.prop
+  let columnCustomRules = []
+  let requiredRule
+  const allFieldsName = '_all_fields'
+  let columnRule 
+  if(customRules){
+    columnRule = customRules[prop]? customRules[prop]: customRules[allFieldsName]
+  }
+  if(columnRule && (columnRule.required || columnRule.rules)) {
+    // 表示配置的必填或其它验证规则时
+    const mustFillMsg = getI18n().t('imatrixUIMessage.mustFill', {
+      label: editField.label
+    })
+    columnCustomRules = columnRule.rules? JSON.parse(JSON.stringify(columnRule.rules)): null
+    if(columnCustomRules && columnCustomRules.length > 0){
+      // 获得必填验证规则
+      const requiredRules = columnCustomRules.filter(item=>item.required)
+      if(requiredRules && requiredRules.length > 0){
+        requiredRule = requiredRules[0]
+      }
+    }
+    if(columnRule.name === allFieldsName && columnCustomRules){
+      // 所有字段_all_fields的验证的message更新，补充“label”
+      columnCustomRules.forEach(item=>{
+        item.message = editField.label + item.message
       })
-      if (prop.indexOf('.') > 0) {
-        setObjectPropRule(editField, rules, validations)
-      } else {
-        if (validations && validations.length > 0) {
-          rules[prop] = [...validations]
-        }
+    }
+    if(!requiredRule && columnRule.required) {
+      // 当rules中没有配置必填验证，但是有required为true时，则封装必填验证规则，到集合中
+      if(!columnCustomRules){
+        columnCustomRules = []
+      }
+      requiredRule = {
+        required: true,
+        message: mustFillMsg,
+        trigger: 'blur'
       }
+      columnCustomRules.push(requiredRule)
+    }
+    if(requiredRule && !requiredRule.message) {
+      // 如果必填验证规则中message为空时，封装默认的必填验证规则，'_all_fields'可能会为空
+      requiredRule.message = mustFillMsg
     }
   }
+  return columnCustomRules
 }
 /**
  * 验证实体
@@ -161,6 +220,11 @@ function validatorEntity(
   }
 
   const gridParams = store.get(listCode)
+  Object.keys(entity).forEach(function(key) {
+    if(entity[key] && typeof entity[key] === 'string') {
+      entity[key] = entity[key].trim()
+    }
+  })
   validator.validate(
     entity,
     {

package/packages/super-grid/src/group-column.vue

@@ -20,6 +20,7 @@
         @refresPortsData="refresPortsData"
         @refresMainTableFields="refresMainTableFields"
         @prohibit-to-edit="prohibitToEdit"
+        @open-page="openPageDialog"
       />
     </template>
     <template v-else>
@@ -33,6 +34,7 @@
         :grid-data="gridData"
         :page-grid-data="gridData"
         @prohibit-to-edit="prohibitToEdit"
+        @open-page="openPageDialog"
       />
     </template>
   </el-table-column>
@@ -108,6 +110,9 @@ export default {
     },
     prohibitToEdit(entity) {
       this.$emit('prohibit-to-edit', entity)
+    },
+    openPageDialog(openPageParams) {
+      this.$emit('open-page', openPageParams)
     }
   }
 }