agilebuilder-ui 1.0.90-tmp13 → 1.0.90-tmp15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.0.90-tmp13",
+  "version": "1.0.90-tmp15",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

package/packages/fs-upload-list/src/fs-upload-list.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <span>
     <template v-if="!disabled">
       <template v-if="!isMobile">
         <el-input
@@ -120,7 +120,7 @@
     <template v-else>
       <fs-preview :entity="row" :file-set-obj="fileSetObj" :is-sql="isSql" :label="value" />
     </template>
-  </div>
+  </span>
 </template>
 
 <script>

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

@@ -87,41 +87,99 @@ 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 (editField.validations && !isDisableEdit(prop, listCode)) {
+        let 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) {
+  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
 }
 /**
  * 验证实体

package/packages/super-grid/src/normal-column-content.vue

@@ -528,10 +528,6 @@ export default {
     //   }
     //   return isLineEdit
     // },
-    // requiredClass(){
-    //   console.log('computed------requiredClass=', this.myRequiredClass)
-    //   return this.myRequiredClass
-    // },
 
     ...mapGetters(['preventReclick'])
   },
@@ -1032,9 +1028,7 @@ export default {
       }
     },
     changeRequired(required) {
-      console.log('changeRequired------required=', required)
       this.requiredClass = required? 'm-requried' : ''
-      console.log('changeRequired------requiredClass=', this.requiredClass)
     }
   },
   emits: ['refresData', 'refresPortData', 'refresPortsData', 'refresMainTableFields', 'prohibitToEdit']

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

@@ -264,8 +264,8 @@ export function isDisableEdit(prop, listCode, row) {
     }
     if (isDiabled === false) {
       // 表示不是禁止编辑的，继续校验自定义规则中是否是禁止编辑的
-      if(gridParams.options.customRules && gridParams.options.customRules[prop]){
-        const columnRules = gridParams.options.customRules[prop]
+      if(gridParams.options.customRules && (gridParams.options.customRules[prop] || gridParams.options.customRules['_all_fields'])){
+        const columnRules = gridParams.options.customRules[prop]? gridParams.options.customRules[prop]: gridParams.options.customRules['_all_fields']
         if(columnRules && columnRules.disabled){
           isDiabled = true
         }

package/src/i18n/langs/cn.js

@@ -83,7 +83,8 @@ const cn = {
         forbiddenExceptionLinkUrl: '请点击进行权限申请',
         forbiddenExceptionLinkUser: '如有疑问请联系',
         uploadFileTip: '上传的文件不超过{fileSize}M',
-        asyncExportJumpMsg: '或点击我跳转到下载页面'
+        asyncExportJumpMsg: '或点击我跳转到下载页面',
+        mustFill: '{label} 必须填写'
     },
     // 列表组件
     superGrid: {

package/src/i18n/langs/en.js

@@ -85,7 +85,8 @@ const en = {
         forbiddenExceptionLinkUrl: 'please click to apply',
         forbiddenExceptionLinkUser: 'if you have any questions,please contact',
         uploadFileTip: 'The file size should lower {fileSize}M',
-        asyncExportJumpMsg: 'Or click me to jump to download page.'
+        asyncExportJumpMsg: 'Or click me to jump to download page.',
+        mustFill: '{label} must fill'
     },
     superGrid: {
         columnConfig: 'Column Config',