agilebuilder-ui 1.0.90-tmp18 → 1.0.90-tmp182

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

@@ -441,6 +441,7 @@ 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: {
@@ -464,7 +465,6 @@ export default {
       type: Object,
       default: null
     },
-    // 下拉选选项集合
     options: {
       type: Array,
       default: null
@@ -498,11 +498,6 @@ export default {
     disabled: {
       type: Boolean,
       default: false
-    },
-    // 列表配置信息
-    gridOptions: {
-      type: Object,
-      default: null
     }
   },
   data() {
@@ -712,18 +707,20 @@ export default {
       this.setInputNumberConfig()
     }
     // 如果是多选文件类型，需要解析（需要设置临时字段，判断文件还是图片，图片需要预览）
-    if (this.column.valueSetOptions && this.column.componentType !== 'inputNumber') {
-      const valueSetOptionsObj = JSON.parse(this.column.valueSetOptions)
-      if (valueSetOptionsObj && valueSetOptionsObj.valueSetOptions) {
-        this.valueSetOptions = valueSetOptionsObj.valueSetOptions
-      }
-      if (valueSetOptionsObj.dynamicDataSourceCode && valueSetOptionsObj.dynamicDataSourceCode !== '') {
-        this.dynamicDataSourceCode = valueSetOptionsObj.dynamicDataSourceCode
-      }
-    } else if (this.column.componentType === 'switch' && this.column.valueSetOptions) {
-      const valueSetOptionsObj = JSON.parse(this.column.valueSetOptions)
-      if (valueSetOptionsObj) {
-        this.valueSetOptions = valueSetOptionsObj
+    if (this.column.valueSetOptions) {
+      if (this.column.componentType === 'switch') {
+        const valueSetOptionsObj = JSON.parse(this.column.valueSetOptions)
+        if (valueSetOptionsObj) {
+          this.valueSetOptions = valueSetOptionsObj
+        }
+      } else if (this.column.componentType !== 'inputNumber') {
+        const valueSetOptionsObj = JSON.parse(this.column.valueSetOptions)
+        if (valueSetOptionsObj && valueSetOptionsObj.valueSetOptions) {
+          this.valueSetOptions = valueSetOptionsObj.valueSetOptions
+        }
+        if (valueSetOptionsObj.dynamicDataSourceCode && valueSetOptionsObj.dynamicDataSourceCode !== '') {
+          this.dynamicDataSourceCode = valueSetOptionsObj.dynamicDataSourceCode
+        }
       }
     }
     if (this.column.orgTreeSet) {
@@ -740,25 +737,6 @@ 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() {
     // 去掉该监听，否则导致焦点总是跳到第一个编辑框
@@ -1762,7 +1740,12 @@ export default {
     },
     getSwitchConfig(switchProp) {
       if (this.valueSetOptions && this.valueSetOptions[switchProp]) {
-        return this.valueSetOptions[switchProp]
+        const value = this.valueSetOptions[switchProp]
+        if ('true' === value || 'false' === value) {
+          return 'true' === value
+        } else {
+          return this.valueSetOptions[switchProp]
+        }
       } else {
         if (switchProp === 'activeValue') {
           if (this.dataSourceType === 'mysql') {
@@ -1814,18 +1797,6 @@ 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,102 +87,41 @@ 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, customRules)
+      setRules(rules, editField, listCode)
     })
   }
   // console.log('rules', rules)
   return rules
 }
 
-function setRules(rules, editField, listCode, customRules) {
+function setRules(rules, editField, listCode) {
   const prop = editField.prop
   if (editField.groupHeader && editField.children && editField.children.length > 0) {
     // 组合表头时或者动态列，递归设置规则，
     editField.children.forEach((child) => {
-      setRules(rules, child, listCode, customRules)
+      setRules(rules, child, listCode)
     })
   } else {
-    if(prop) {
-      // 获得当前列的自定义校验规则
-      const columnCustomRules = getColumnCustomRules(editField, customRules)
-      console.log('setRules---prop=', prop, 'columnCustomRules====', columnCustomRules)
-      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)
-        console.log('setRules---prop=', prop, 'validations====', validations)
-        if (prop.indexOf('.') > 0) {
-          setObjectPropRule(editField, rules, validations)
-        } else {
-          if (validations && validations.length > 0) {
-            rules[prop] = [...validations]
-          }
+    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)
         }
-      }
-    }
-  }
-}
-/**
- * 获得当前列的自定义校验规则
- * @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(!requiredRule && columnRule.required) {
-      // 当rules中没有配置必填验证，但是有required为true时，则封装必填验证规则，到集合中
-      if(!columnCustomRules){
-        columnCustomRules = []
-      }
-      requiredRule = {
-        required: true,
-        message: mustFillMsg,
-        trigger: 'blur'
+      if (prop.indexOf('.') > 0) {
+        setObjectPropRule(editField, rules, validations)
+      } else {
+        if (validations && validations.length > 0) {
+          rules[prop] = [...validations]
+        }
       }
-      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,14 +4,13 @@
     <dynamic-input
       v-if="(lineEdit.editable && isEditable && row.$editing) || isShowForm"
       v-model:value="row[column.prop]"
-      :class="requiredClass"
+      :class="isRequired(row.$editing) ? 'm-requried' : ''"
       :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
@@ -29,7 +28,6 @@
       @refresPortData="refresPortData"
       @refresPortsData="refresPortsData"
       @change-disabled="changeDisabled"
-      @change-required="changeRequired"
     />
     <span v-else>
       <span v-if="column.operations" class="grid-operation-buttons">
@@ -72,20 +70,20 @@
             </template>
           </el-dropdown>
           <component
-              :is="operation.props.customControl"
-              v-else-if="operation.props.customControl"
-              v-permission="operation.props.permission"
-              :key="column.prop+'_'+rowIndex+'_'+currentPage"
-              :disabled="true"
-              :row="pageGridData[rowIndex]"
-              :entity="pageGridData[rowIndex]"
-              :prop="column.prop"
-              :parent="parentFormData"
-              :row-index="rowIndex"
-              :grid-data="gridData"
-              :page-grid-data="pageGridData"
-              :current-page="currentPage"
-              @refresh-list="refreshList"
+            :is="operation.props.customControl"
+            v-else-if="operation.props.customControl"
+            v-permission="operation.props.permission"
+            :key="column.prop + '_' + rowIndex + '_' + currentPage"
+            :disabled="true"
+            :row="pageGridData[rowIndex]"
+            :entity="pageGridData[rowIndex]"
+            :prop="column.prop"
+            :parent="parentFormData"
+            :row-index="rowIndex"
+            :grid-data="gridData"
+            :page-grid-data="pageGridData"
+            :current-page="currentPage"
+            @refresh-list="refreshList"
           />
           <row-operation
             v-else
@@ -462,7 +460,6 @@ 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
     }
@@ -477,10 +474,6 @@ 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,
@@ -509,25 +502,80 @@ export default {
       scanEnable,
       componentId,
       controlConfig,
-      rowLinkConfigMapping: {},
-      requiredClass: '',
-      lineEdit,
-      options
+      rowLinkConfigMapping: {}
     }
   },
   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
-    // },
+    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
+    },
 
     ...mapGetters(['preventReclick'])
   },
@@ -613,7 +661,6 @@ export default {
       }
     }
     this.setScanRuleSets()
-    this.requiredClass = this.isRequired(this.row.$editing) ? 'm-requried' : ''
   },
   mounted() {
     // 监听保存时点击按钮事件线触发
@@ -879,7 +926,6 @@ export default {
         tableName,
         this.listCode
       )
-      debugger
       if (hyperLinkResult.jumpPageSetting && rowIndex !== undefined) {
         this.rowLinkConfigMapping[rowIndex] = hyperLinkResult.jumpPageSetting
       }
@@ -973,8 +1019,7 @@ export default {
       }
     },
     isRequired(editing) {
-      console.log('isRequired---this.lineEdit=', this.lineEdit)
-      if (!this.isFormSubTable && this.lineEdit && this.lineEdit.editable && this.isEditable && editing && this.column.validations) {
+      if (!this.isFormSubTable && this.lineEdit.editable && this.isEditable && editing && this.column.validations) {
         if (this.column.validations.indexOf('"required":true') > 0) {
           return true
         }
@@ -1026,9 +1071,6 @@ export default {
           this.column._scanRuleSets = res
         })
       }
-    },
-    changeRequired(required) {
-      this.requiredClass = required? 'm-requried' : ''
     }
   },
   emits: ['refresData', 'refresPortData', 'refresPortsData', 'refresMainTableFields', 'prohibitToEdit']
@@ -1045,7 +1087,7 @@ export default {
 .m-requried {
   float: left;
   white-space: nowrap;
-  width: 96%;
+  width: 100%;
 }
 
 .m-requried::after {

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

@@ -11,7 +11,7 @@
     :width="getColumnWidth()"
   >
     <template v-slot:header>
-      <span v-if="!column.customHeader" :class="{is_req: isFieldRequired()}">
+      <span v-if="!column.customHeader" :class="{ is_req: isFieldRequired() }">
         <span :title="$escapeHtml(label)" class="cell--span required__label" v-html="$escapeHtml(label)" />
       </span>
       <component
@@ -27,7 +27,7 @@
       </el-icon>
     </template>
     <template v-slot="scope">
-        <!-- :pagination="pagination" -->
+      <!-- :pagination="pagination" -->
       <NormalColumnContent
         :ref="column.prop"
         :is-sql="isSql"
@@ -63,13 +63,7 @@
 <script>
 import { CirclePlus, ZoomIn as ElIconZoomIn } from '@element-plus/icons-vue'
 import { $emit, $off, $on } from '../../utils/gogocodeTransfer'
-import {
-  getColumnValues,
-  isRequiredEdit,
-  getContentAlign,
-  getHeaderAlign,
-  getHeaderLable
-} from './utils'
+import { getColumnValues, isRequiredEdit, getContentAlign, getHeaderAlign, getHeaderLable } from './utils'
 import DynamicInput from './dynamic-input.vue'
 import store from './store'
 import customFormatter from './custom-formatter'
@@ -284,7 +278,7 @@ export default {
     }
     const align = getContentAlign(this.column, gridParams)
     if (align) {
-      this.align = gridParams.options.align
+      this.align = align
     }
     const headerAlign = getHeaderAlign(this.column, gridParams)
     if (headerAlign) {
@@ -302,10 +296,8 @@ export default {
       gridParams.options &&
       gridParams.options.showOperationButton
   },
-  mounted() {
-  },
-  unmounted() {
-  },
+  mounted() {},
+  unmounted() {},
   methods: {
     ...customFormatter,
     ...apis,
@@ -323,7 +315,7 @@ export default {
       $emit(this, 'refresPortData', port, value, index)
     },
     refresPortsData(map, index) {
-        $emit(this, 'refresPortsData', map, index)
+      $emit(this, 'refresPortsData', map, index)
     },
     refresMainTableFields(map) {
       $emit(this, 'refresMainTableFields', map)
@@ -344,10 +336,6 @@ 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)
     },
@@ -362,9 +350,25 @@ export default {
       this.$emit('open-page', openPageParams)
     }
   },
-  emits: ['refresData', 'refresPortData', 'refresPortsData', 'refresMainTableFields', 'prohibitToEdit',]
+  emits: ['refresData', 'refresPortData', 'refresPortsData', 'refresMainTableFields', 'prohibitToEdit']
 }
 </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,10 +3156,7 @@ export default {
     openFold(isOpen) {
       this.resizeTableHeight()
     },
-    /**
-     * 设置字段禁止编辑。只能控制禁止编辑。不能控制必填
-     * @param entity 格式如：{'NAME':false,"DYM_COLUMN":true}。表示NAME字段不可编辑，DYM_COLUMN可以被编辑
-     */
+    // 设置字段禁止编辑
     fnProhibitToEdit(entity) {
 			if (entity) {
 				if (entity.isForceUpdate) {
@@ -3177,10 +3174,7 @@ export default {
         }
       }
     },
-    /**
-     * 设置字段禁止编辑。只能控制禁止编辑。不能控制必填
-     * @param entity 格式如：{'NAME':false,"DYM_COLUMN":true}。表示NAME字段不可编辑，DYM_COLUMN可以被编辑
-     */
+    // 设置字段禁止编辑
     prohibitToEdit(entity) {
       this.fnProhibitToEdit(entity)
     },
@@ -3333,9 +3327,6 @@ export default {
     },
     closeRowForm () {
       this.showRowForm = false
-    },
-    testFunc(params){
-      console.log('testFunc-----------------params=', params)
     }
   },
   emits: [
@@ -3349,7 +3340,8 @@ export default {
     'un-edit',
     'refresMainTableFields',
     'refresh',
-    'cancel-search'
+    'cancel-search',
+    ,
   ],
 }
 </script>

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

@@ -262,15 +262,6 @@ 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
 }
@@ -801,9 +792,9 @@ export function getControlConfig(column) {
   return controlConfig
 }
 
-export function getContentAlign(column, gridParams){
+export function getContentAlign(column, gridParams) {
   let align
-  if (typeof gridParams.options.align !== 'undefined') {
+  if (gridParams.options?.align && gridParams.options.align !== '') {
     align = gridParams.options.align
   } else if (column.contAlign && column.contAlign !== '') {
     align = column.contAlign
@@ -811,20 +802,16 @@ export function getContentAlign(column, gridParams){
   return align
 }
 
-export function getHeaderAlign(column, gridParams){
+export function getHeaderAlign(column, gridParams) {
   let headerAlign
-  if (typeof gridParams.options.headerAlign !== 'undefined') {
+  if (gridParams.options?.headerAlign && gridParams.options.headerAlign !== '') {
     headerAlign = gridParams.options.headerAlign
   } else if (column.titleAlign && column.titleAlign !== '') {
     headerAlign = column.titleAlign
-  } else {
-    // 如果没有配置表头对齐方式，默认使用内容对齐方式
-    headerAlign = 'left'
   }
   return headerAlign
 }
 
-
 export function getHeaderLable(column) {
   let label = column.label
   if (!column.titleValueSet) {
@@ -840,4 +827,4 @@ export function getHeaderLable(column) {
 
 function formatHeader(column) {
   return doFormatWithValueSet(column.titleValueSetValue, column.label)
-}
+}

package/src/i18n/langs/cn.js

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

package/src/i18n/langs/en.js

@@ -85,8 +85,7 @@ 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.',
-        mustFill: '{label} must fill'
+        asyncExportJumpMsg: 'Or click me to jump to download page.'
     },
     superGrid: {
         columnConfig: 'Column Config',