agilebuilder-ui 1.0.90-tmp2 → 1.0.90-tmp21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.0.90-tmp2",
+  "version": "1.0.90-tmp21",
   "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/apis.js

@@ -1453,14 +1453,15 @@ const apis = {
         }
       ]
      */
-  dynamicControlTableEdit(pageContext, customRules){
-    console.log('dynamicControlTableEdit----customRules-----', customRules)
+  dynamicControlTableEdit(pageContext, customRules, listCode){
+    const gridParams = store.get(listCode)
+    // console.log('dynamicControlTableEdit----customRules-----', customRules, gridParams.options.customRules)
     if(!customRules){
       return
     }
     let gridCustomRules = {}
-    if(this.options.customRules){
-      gridCustomRules = JSON.parse(JSON.stringify(this.options.customRules))
+    if(gridParams.options.customRules){
+      gridCustomRules = JSON.parse(JSON.stringify(gridParams.options.customRules))
     }
     customRules.forEach(item=>{
       const copyItem = JSON.parse(JSON.stringify(item))
@@ -1469,10 +1470,11 @@ const apis = {
       let columnRules
       if(!gridCustomRules[prop]){
         gridCustomRules[prop] = {}
-      } else {
-        // 获得当前列已有的自定义规则集合
-        columnRules = gridCustomRules[prop].rules
       }
+      // console.log('dynamicControlTableEdit----gridCustomRules111-----', gridCustomRules)
+      // 获得当前列已有的自定义规则集合
+      columnRules = gridCustomRules[prop].rules
+      
       if(copyItem.rules){
         if(!columnRules){
           columnRules = []
@@ -1482,9 +1484,45 @@ const apis = {
       }
       // 当前列总的自定义规则更新
       copyItem.rules = columnRules
-      this.options.customRules[prop] = copyItem
+      // this.options.customRules[prop] = copyItem
+      if(!gridParams.options.customRules){
+        gridParams.options.customRules = {}
+      }
+      // console.log('dynamicControlTableEdit----gridParams.options.customRules222-----', gridParams.options.customRules)
+      gridParams.options.customRules[prop] = copyItem
     })
-    console.log('dynamicControlTableEdit----this.options-----', this.options)
+    // console.log('dynamicControlTableEdit----gridParams.options.customRules333-----', gridParams.options.customRules)
+  },
+  doLayout(hiddenColumns, listCode) {
+    if(!listCode){
+      listCode = this.code
+    }
+    const gridParams = store.get(listCode)
+    const orgHiddenColumns = gridParams.hiddenColumns
+    console.log('doLayout----orgHiddenColumns=', orgHiddenColumns)
+    if(hiddenColumns && hiddenColumns.length > 0){
+      let hiddenColumnsResult = orgHiddenColumns
+      if(!hiddenColumnsResult){
+        hiddenColumnsResult = []
+      }
+      if(hiddenColumnsResult.length === 0){
+        hiddenColumnsResult = hiddenColumns
+      } else {
+        hiddenColumns.forEach(prop=>{
+          if(hiddenColumnsResult.indexOf(prop) < 0) {
+            // 去重处理
+            hiddenColumnsResult.push(prop)
+          }
+        })
+      }
+      console.log('doLayout----hiddenColumnsResult=', hiddenColumnsResult)
+      this.options.hiddenColumns = hiddenColumnsResult
+    } else {
+      this.options.hiddenColumns = orgHiddenColumns
+    }
+    if (this.$refs && this.$refs.superGrid) {
+      this.$refs.superGrid.doLayout()
+    }
   }
 }
 export default apis

package/packages/super-grid/src/dynamic-input.vue

@@ -743,17 +743,17 @@ export default {
     if(!this.gridOptions.customRules){
       this.gridOptions.customRules = {}
     }
-    this.watch('gridOptions.customRules.'+this.column.prop,
+    this.$watch('gridOptions.customRules.'+this.column.prop,
 				(newVal, oldVal)=> {
-					this.packageCustomRules()
+					this.packageCustomRules(newVal)
 				},
 				{
 					immediate: true,
 					deep: true,
 				})
-    this.watch('gridOptions.customRules._all_fields',
+    this.$watch('gridOptions.customRules._all_fields',
 				(newVal, oldVal)=> {
-					this.packageCustomRules()
+					this.packageCustomRules(newVal)
 				},
 				{
 					immediate: true,
@@ -1815,21 +1815,16 @@ export default {
       this.innerValue = value
       this.blurEvent()
     },
-    packageCustomRules() {
-      if(!this.options.customRules){
+    packageCustomRules(columnRule) {
+      console.log('packageCustomRules---columnRule=', columnRule)
+      if(!columnRule){
         return
       }
-      const columnRules = this.options.customRules.filter(item=>item.name===this.column.prop || item.name === '_all_fields')
-      if(columnRules && columnRules.length > 0) {
-        for(let i = 0; i< columnRules.length; i++) {
-          const columnRule = columnRules[i]
-          if(columnRule.disabled !== undefined){
-            this.$emit('change-disabled', columnRule.disabled)
-          }
-          if(columnRule.required !== undefined){
-            this.$emit('change-required', columnRule.required)
-          }
-        }
+      if(columnRule.disabled !== undefined){
+        this.$emit('change-disabled', columnRule.disabled)
+      }
+      if(columnRule.required !== undefined){
+        this.$emit('change-required', columnRule.required)
       }
     }
   }

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
 }
 /**
  * 验证实体

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

@@ -457,16 +457,12 @@ export default {
     isShowForm: {
       type: Boolean,
       default: false
-    },
-    // 列表配置信息
-    options: {
-      type: Object,
-      default: null
     }
   },
   data() {
     let parentFormData
     const gridParams = store.get(this.listCode)
+    const options = gridParams.options
     if (gridParams.options.extraParam && gridParams.options.extraParam.entityMap) {
       parentFormData = gridParams.options.extraParam.entityMap
     }
@@ -481,7 +477,10 @@ export default {
       scanEnable = true
     }
     const componentId = this.listCode + '_' + this.column.prop
-    const requiredClass = this.isRequired(this.row.$editing) ? 'm-requried' : ''
+    let lineEdit
+    if (gridParams.lineEdit !== null && gridParams.lineEdit !== undefined) {
+      lineEdit = gridParams.lineEdit
+    }
     return {
       selectRow: null,
       that: this,
@@ -511,22 +510,24 @@ export default {
       componentId,
       controlConfig,
       rowLinkConfigMapping: {},
-      requiredClass
+      requiredClass: '',
+      lineEdit,
+      options
     }
   },
   computed: {
-    lineEdit() {
-      let isLineEdit = false
-      if (this.listCode) {
-        const gridParams = store.get(this.listCode)
-        if (gridParams.lineEdit !== null && gridParams.lineEdit !== undefined) {
-          isLineEdit = gridParams.lineEdit
-        } else {
-          isLineEdit = false
-        }
-      }
-      return isLineEdit
-    },
+    // lineEdit() {
+    //   let isLineEdit = false
+    //   if (this.listCode) {
+    //     const gridParams = store.get(this.listCode)
+    //     if (gridParams.lineEdit !== null && gridParams.lineEdit !== undefined) {
+    //       isLineEdit = gridParams.lineEdit
+    //     } else {
+    //       isLineEdit = false
+    //     }
+    //   }
+    //   return isLineEdit
+    // },
 
     ...mapGetters(['preventReclick'])
   },
@@ -612,6 +613,7 @@ export default {
       }
     }
     this.setScanRuleSets()
+    this.requiredClass = this.isRequired(this.row.$editing) ? 'm-requried' : ''
   },
   mounted() {
     // 监听保存时点击按钮事件线触发
@@ -971,7 +973,8 @@ export default {
       }
     },
     isRequired(editing) {
-      if (!this.isFormSubTable && this.lineEdit.editable && this.isEditable && editing && this.column.validations) {
+      console.log('isRequired---this.lineEdit=', this.lineEdit)
+      if (!this.isFormSubTable && this.lineEdit && this.lineEdit.editable && this.isEditable && editing && this.column.validations) {
         if (this.column.validations.indexOf('"required":true') > 0) {
           return true
         }
@@ -1042,7 +1045,7 @@ export default {
 .m-requried {
   float: left;
   white-space: nowrap;
-  width: 100%;
+  width: 96%;
 }
 
 .m-requried::after {

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

@@ -146,16 +146,12 @@ export default {
     listToolbarFormData: {
       type: Object,
       default: null
-    },
-    // 列表配置信息
-    options: {
-      type: Object,
-      default: null
     }
   },
   data() {
     let parentFormData
     const gridParams = store.get(this.listCode)
+    const options = gridParams.options
     if (gridParams.options.extraParam && gridParams.options.extraParam.entityMap) {
       parentFormData = gridParams.options.extraParam.entityMap
     }
@@ -169,7 +165,8 @@ export default {
       subTableCanAdd: true, // 表单子表时是否有新增权限
       isShowAdd: false, // 是否显示表头的新增按钮
       cellWidth: null,
-      parentFormData
+      parentFormData,
+      options
     }
   },
   computed: {
@@ -370,20 +367,4 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.annex-cell {
-  padding-right: 5px;
-  cursor: pointer;
-  color: #409eff;
-}
-
-.m-requried {
-  float: left;
-  white-space: nowrap;
-  width: 100%;
-}
-
-.m-requried::after {
-  content: '*';
-  color: #f56c6c;
-}
 </style>

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

@@ -176,6 +176,7 @@ const superGridService = {
                 gridParams.pagination = this.pagination
                 gridParams.pageContext = this.pageContext
                 gridParams.configureObj = this.configureObj
+                gridParams.hiddenColumns = this.options.hiddenColumns?JSON.parse(JSON.stringify(this.options.hiddenColumns)):[]
                 if (this.pagination) {
                   // 监控每行显示多少条变量使用
                   this.pageSize = this.pagination.pageSize

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

@@ -3333,9 +3333,6 @@ export default {
     },
     closeRowForm () {
       this.showRowForm = false
-    },
-    testFunc(params){
-      console.log('testFunc-----------------params=', params)
     }
   },
   emits: [

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',