agilebuilder-ui 1.0.90-tmp182 → 1.0.90-tmp183

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.0.90-tmp182",
+  "version": "1.0.90-tmp183",
   "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

@@ -1267,6 +1267,85 @@ const apis = {
     const gridParams = store.get(listCode)
     gridParams.options['subTableData'] = null
     this.fetchListData()
+  },
+    /**
+     * v10 行编辑时动态控制字段的编辑权限
+     * @param pageContext 页面解析的上下文对象
+     * @param customRules 格式如下：
+     * [
+        {
+          name: '_all_fields', // _all_fields 表示所有字段
+          disabled: true,
+          required: true,
+          rules: [
+            {
+              required: true,
+              trigger: 'blur'
+            },
+            {
+              type: 'email',
+              trigger: ['blur', 'change']
+            }
+          ]
+        },
+        {
+          name: 'xxxx',
+          disabled: true,
+          required: true,
+          rules: [
+            {
+              required: true,
+              message: 'Please input email address',
+              trigger: 'blur'
+            },
+            {
+              type: 'email',
+              message: 'Please input correct email address',
+              trigger: ['blur', 'change']
+            }
+          ]
+        }
+      ]
+     */
+  dynamicControlTableEdit(pageContext, customRules, listCode){
+    const gridParams = store.get(listCode)
+    // console.log('dynamicControlTableEdit----customRules-----', customRules, gridParams.options.customRules)
+    if(!customRules){
+      return
+    }
+    let gridCustomRules = {}
+    if(gridParams.options.customRules){
+      gridCustomRules = JSON.parse(JSON.stringify(gridParams.options.customRules))
+    }
+    customRules.forEach(item=>{
+      const copyItem = JSON.parse(JSON.stringify(item))
+      const prop = item.name
+      // 当前列新的自定义规则集合
+      let columnRules
+      if(!gridCustomRules[prop]){
+        gridCustomRules[prop] = {}
+      }
+      // console.log('dynamicControlTableEdit----gridCustomRules111-----', gridCustomRules)
+      // 获得当前列已有的自定义规则集合
+      columnRules = gridCustomRules[prop].rules
+      
+      if(copyItem.rules){
+        if(!columnRules){
+          columnRules = []
+        }
+        // 将当前列自定义规则集合拼接到已有的自定义规则集合中
+        columnRules = columnRules.concat(copyItem.rules)
+      }
+      // 当前列总的自定义规则更新
+      copyItem.rules = columnRules
+      // 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----gridParams.options.customRules333-----', gridParams.options.customRules)
   }
 }
 export default apis

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

@@ -441,7 +441,6 @@ import { $emit } from '../../utils/gogocodeTransfer'
 import eventBus from './eventBus'
 import { isMobileBrowser } from '../../../src/utils/common-util'
 import { analysisScanValue, setScanAnalysisValue } from './scan-util.ts'
-
 export default {
   name: 'DynamicInput',
   components: {
@@ -465,6 +464,7 @@ export default {
       type: Object,
       default: null
     },
+    // 下拉选选项集合
     options: {
       type: Array,
       default: null
@@ -498,6 +498,11 @@ export default {
     disabled: {
       type: Boolean,
       default: false
+    },
+    // 列表配置信息
+    gridOptions: {
+      type: Object,
+      default: null
     }
   },
   data() {
@@ -737,6 +742,25 @@ export default {
       }
     }
     this.getDateAllowTime()
+    if(!this.gridOptions.customRules){
+      this.gridOptions.customRules = {}
+    }
+    this.$watch('gridOptions.customRules.'+this.column.prop,
+				(newVal, oldVal)=> {
+					this.packageCustomRules(newVal)
+				},
+				{
+					immediate: true,
+					deep: true,
+				})
+    this.$watch('gridOptions.customRules._all_fields',
+				(newVal, oldVal)=> {
+					this.packageCustomRules(newVal)
+				},
+				{
+					immediate: true,
+					deep: true,
+				})
   },
   mounted() {
     // 去掉该监听，否则导致焦点总是跳到第一个编辑框
@@ -1797,6 +1821,18 @@ export default {
       this.isShowBrowserScan = false
       this.innerValue = value
       this.blurEvent()
+    },
+    packageCustomRules(columnRule) {
+      console.log('packageCustomRules---columnRule=', columnRule)
+      if(!columnRule){
+        return
+      }
+      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

@@ -4,13 +4,14 @@
     <dynamic-input
       v-if="(lineEdit.editable && isEditable && row.$editing) || isShowForm"
       v-model:value="row[column.prop]"
-      :class="isRequired(row.$editing) ? 'm-requried' : ''"
+      :class="requiredClass"
       :column="column"
       :is-sql="isSql"
       :line-edit="lineEdit"
       :list-code="listCode"
       :list-toolbar-form-data="listToolbarFormData"
       :options="column.valueSet"
+      :grid-options="options"
       :position="{
         row: rowIndex,
         prop: column.prop
@@ -28,6 +29,7 @@
       @refresPortData="refresPortData"
       @refresPortsData="refresPortsData"
       @change-disabled="changeDisabled"
+      @change-required="changeRequired"
     />
     <span v-else>
       <span v-if="column.operations" class="grid-operation-buttons">
@@ -117,6 +119,7 @@
           :value="getCellValue(row)"
           :additional-param-map="additionalParamMap"
           :additional-settings="additionalSettings"
+          :pageContext="options.pageContext"
         />
       </span>
       <!-- 自定义格式的时候 -->
@@ -153,6 +156,7 @@
           :listCode="listCode"
           :component-id="componentId"
           :additional-settings="additionalSettings"
+          :pageContext="options.pageContext"
           @prohibitToEdit="prohibitToEdit"
           @refresh-list="refreshList"
       /></span>
@@ -460,6 +464,7 @@ export default {
   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
     }
@@ -474,6 +479,10 @@ export default {
       scanEnable = true
     }
     const componentId = this.listCode + '_' + this.column.prop
+    let lineEdit
+    if (gridParams.lineEdit !== null && gridParams.lineEdit !== undefined) {
+      lineEdit = gridParams.lineEdit
+    }
     return {
       selectRow: null,
       that: this,
@@ -502,80 +511,25 @@ export default {
       scanEnable,
       componentId,
       controlConfig,
-      rowLinkConfigMapping: {}
+      rowLinkConfigMapping: {},
+      requiredClass: '',
+      lineEdit,
+      options
     }
   },
   computed: {
-    filters() {
-      if (this.column.filterable) {
-        const gridParams = store.get(this.listCode)
-        const values = getColumnValues(gridParams.gridData, this.column.prop)
-        const filters = []
-        for (const value of values) {
-          filters.push({
-            text: value,
-            value
-          })
-        }
-        return filters
-      } else {
-        return null
-      }
-    },
-    filterMethod() {
-      if (this.column.filterable) {
-        return this.filterHandler
-      } else {
-        return null
-      }
-    },
-    fixed() {
-      if (
-        (this.column.fixed && this.column.fixed === 'false') ||
-        this.column.fixed === undefined ||
-        this.column.fixed === ''
-      ) {
-        return false
-      }
-      if (this.column.prop === 'operation' && this.column.fixed && this.column.fixed === 'left') {
-        // 操作列居右固定
-        return 'right'
-      }
-      return this.column.fixed
-    },
-    sortable() {
-      const gridParams = store.get(this.listCode)
-      if (
-        gridParams &&
-        gridParams.options &&
-        gridParams.options.isFormSubTable &&
-        gridParams.options.showOperationButton
-      ) {
-        return false
-      }
-      if (this.column.sortable === 'false' || this.column.sortable === false || this.column.sortable === '') {
-        return false
-      } else if (this.column.sortable === 'true' || this.column.sortable === true) {
-        return 'custom'
-      }
-      if (this.column.sortable) {
-        return 'custom'
-      } else {
-        return false
-      }
-    },
-    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'])
   },
@@ -661,6 +615,7 @@ export default {
       }
     }
     this.setScanRuleSets()
+    this.requiredClass = this.isRequired(this.row.$editing) ? 'm-requried' : ''
   },
   mounted() {
     // 监听保存时点击按钮事件线触发
@@ -926,6 +881,7 @@ export default {
         tableName,
         this.listCode
       )
+      debugger
       if (hyperLinkResult.jumpPageSetting && rowIndex !== undefined) {
         this.rowLinkConfigMapping[rowIndex] = hyperLinkResult.jumpPageSetting
       }
@@ -1019,7 +975,15 @@ 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
         }
@@ -1071,6 +1035,9 @@ export default {
           this.column._scanRuleSets = res
         })
       }
+    },
+    changeRequired(required) {
+      this.requiredClass = required ? 'm-requried' : ''
     }
   },
   emits: ['refresData', 'refresPortData', 'refresPortsData', 'refresMainTableFields', 'prohibitToEdit']
@@ -1087,7 +1054,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

@@ -336,6 +336,10 @@ export default {
       return this.column.width ? this.column.width + '' : '130'
     },
     // 设置字段禁止编辑
+    fnProhibitToEdit(isEditable) {
+      this.$refs[this.column.prop].fnProhibitToEdit(isEditable)
+    },
+    // 设置字段禁止编辑
     prohibitToEdit(entity) {
       $emit(this, 'prohibitToEdit', entity)
     },
@@ -355,20 +359,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.vue

@@ -3156,7 +3156,10 @@ export default {
     openFold(isOpen) {
       this.resizeTableHeight()
     },
-    // 设置字段禁止编辑
+    /**
+     * 设置字段禁止编辑。只能控制禁止编辑。不能控制必填
+     * @param entity 格式如：{'NAME':false,"DYM_COLUMN":true}。表示NAME字段不可编辑，DYM_COLUMN可以被编辑
+     */
     fnProhibitToEdit(entity) {
 			if (entity) {
 				if (entity.isForceUpdate) {
@@ -3174,7 +3177,10 @@ export default {
         }
       }
     },
-    // 设置字段禁止编辑
+    /**
+     * 设置字段禁止编辑。只能控制禁止编辑。不能控制必填
+     * @param entity 格式如：{'NAME':false,"DYM_COLUMN":true}。表示NAME字段不可编辑，DYM_COLUMN可以被编辑
+     */
     prohibitToEdit(entity) {
       this.fnProhibitToEdit(entity)
     },
@@ -3340,8 +3346,7 @@ export default {
     'un-edit',
     'refresMainTableFields',
     'refresh',
-    'cancel-search',
-    ,
+    'cancel-search'
   ],
 }
 </script>

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

@@ -262,6 +262,15 @@ export function isDisableEdit(prop, listCode, row) {
         isDiabled = true
       }
     }
+    if (isDiabled === false) {
+      // 表示不是禁止编辑的，继续校验自定义规则中是否是禁止编辑的
+      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
+        }
+      }
+    }
   }
   return isDiabled
 }

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