agilebuilder-ui 1.1.36 → 1.1.37-sit2

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

@@ -333,6 +333,17 @@
     <!-- <custom-fma v-if="type==null ||type === ''" /> -->
     <!-- v-model="newValue" -->
     <!--必须有@input ,否则无法输入值-->
+    <GridRadioInput
+      v-else-if="type === 'radio'"
+      v-model="innerValue"
+      @update:modelValue="innerValue = $event"
+      :disabled="disabled"
+      :options="options"
+      :value-set-options="valueSetOptions"
+      :prop="column.prop"
+      :entity="row"
+      @cellEvent="cellEvent"
+    />
     <el-select
       v-else-if="type === 'select' && !isDynamicDataSourceSource()"
       ref="item"
@@ -468,6 +479,7 @@
       :check-strictly="isCheckStrictly"
       :department-info="departmentInfo"
       :disabled="disabled"
+      :limit-filter-column="controlConfig?.limitFilterColumn"
       :fields="fields"
       :is-join-table="isJoinTable"
       :models="row"
@@ -525,23 +537,31 @@ import {
   isDynamicDataSourceSource,
   isEditOptionFunction,
   otherFilesToStandard,
-  getControlConfig
+  getControlConfig,
+  rowBeforeValidate
 } from './utils'
 import dynamicSourceSelect from '../../dynamic-source-select/src/dynamic-source-select.vue'
-import { getEntityFieldValue, setEntityFieldValue } from '../../../src/utils/util'
+import {
+  getEntityFieldValue,
+  setEntityFieldValue,
+  getPropValueNew,
+  watchPageContextDynamicVariable
+} from '../../../src/utils/util'
 import { getToken } from '../../../src/utils/auth'
 import apis from './apis'
-import ViewImageDialog from './view-image-dialog'
+import ViewImageDialog from './view-image-dialog.vue'
 import { $emit } from '../../utils/gogocodeTransfer'
 import eventBus from './eventBus'
 import { isMobileBrowser, getAuthSource } from '../../../src/utils/common-util'
 import { analysisScanValue, setScanAnalysisValue } from './scan-util.ts'
 import customFormatter from './custom-formatter'
+import GridRadioInput from './components/grid-radio-input.vue'
 export default {
   name: 'DynamicInput',
   components: {
     dynamicSourceSelect,
-    ViewImageDialog
+    ViewImageDialog,
+    GridRadioInput
   },
   props: {
     value: {
@@ -614,7 +634,7 @@ export default {
     if (defaultValue !== undefined && defaultValue !== null) {
       innerValue = defaultValue
     }
-    const disabled = isDisableEdit(this.column.prop, this.listCode, this.row)
+    const disabled = isDisableEdit(this.column.prop, this.listCode, this.row, this.rowIndex)
     this.$emit('change-disabled', disabled)
     const defaultAction = window.$vueApp.config.globalProperties.baseAPI + '/component/super-form/uploads'
     if (!this.listCode) {
@@ -664,7 +684,6 @@ export default {
       // 表示手机浏览器访问的
       userAgent = 'browser'
     }
-    console.log('superGrid----window.location.protocol---', window.location.protocol)
     const isDingTalk = getAuthSource() === 'dingtalk' ? true : false
     const isApk = isMobile && userAgent && userAgent === 'app' ? true : false
     const isShowScanIcon =
@@ -677,14 +696,6 @@ export default {
     const colConfigure = gridParams.colConfigureMap ? gridParams.colConfigureMap[this.column.prop] : null
     const runtimeInfo = colConfigure && colConfigure.runtime ? colConfigure.runtime : {}
     const designProperty = runtimeInfo.props ? runtimeInfo.props : {}
-    console.log(
-      'super-grid-dynamicInput--designProperty=',
-      designProperty,
-      'colConfigure=',
-      colConfigure,
-      'gridParams.colConfigureMap=',
-      gridParams.colConfigureMap
-    )
     return {
       deptManTree: false, // 是否是部门人员树
       isMultiTree: false, // 是否是多选树
@@ -840,6 +851,7 @@ export default {
         }
       }
     }
+
     if (this.column.orgTreeSet) {
       const orgTreeSet = JSON.parse(this.column.orgTreeSet)
       if (this.type.indexOf('DeptTree') > 0 && orgTreeSet.checkStrictly) {
@@ -1041,6 +1053,7 @@ export default {
           // 说明是工作组树
           this.wgTree = true
         }
+        this.deptScopeLimit()
       }
     },
     orgTreeSetSort() {
@@ -1133,7 +1146,6 @@ export default {
         this.blurEvent()
         isInputVal = true
         if (this.innerValue && this.isInputControl() && this.column.dataType === 'TEXT') {
-          console.log('trim value', this.innerValue)
           this.innerValue = this.innerValue.trim()
         }
       }
@@ -1320,6 +1332,12 @@ export default {
             }
           }
         }
+        this.callCustomEventWithParam('uploaded', {
+          value: response,
+          row: this.row,
+          column: this.column,
+          extendParams: this.extendParams
+        })
       }
       this.annexUploadFlag = false
     },
@@ -1837,6 +1855,12 @@ export default {
       $emit(this, 'refresMainTableFields', map)
     },
     deleteSuccess(deleteFile) {
+      this.callCustomEventWithParam('deleted', {
+        value: deleteFile,
+        row: this.row,
+        column: this.column,
+        extendParams: this.extendParams
+      })
       console.log('deleteSuccess', deleteFile, this.fileInfo)
     },
     // 时间格式判断是否是字符串类型，如果是字符串类型使用格式化的数据，如果是时间格式的显示时间搓
@@ -1977,10 +2001,17 @@ export default {
       this.blurEvent()
     },
     packageCustomRules(columnRule) {
-      console.log('packageCustomRules---columnRule=', columnRule)
       if (!columnRule) {
         return
       }
+      let beforeValidateResult = true
+      if (columnRule.beforeValidate) {
+        const gridParams = store.get(this.listCode)
+        beforeValidateResult = rowBeforeValidate(columnRule, gridParams, this.row, this.rowIndex)
+        if (beforeValidateResult === false) {
+          return
+        }
+      }
       if (columnRule.disabled !== undefined) {
         this.$emit('change-disabled', columnRule.disabled)
       }
@@ -2021,6 +2052,53 @@ export default {
         // 表示没有跳转页面配置
         this.callCustomEvent(eventName)
       }
+    },
+    deptScopeLimit() {
+      if (this.controlConfig && this.controlConfig.deptScope) {
+        // 表示有部门范围限制
+        if (this.controlConfig.deptScope == 'field' && this.controlConfig.deptScopeField) {
+          if (this.controlConfig.deptScopeField.indexOf('${row.') === 0) {
+            // 表示是行记录的字段
+            const fieldName = this.controlConfig.deptScopeField.replace('${row.', '').replace('}', '')
+            if (this.row[fieldName]) {
+              this.departmentInfo = this.row[fieldName].split(',')
+            } else {
+              this.departmentInfo = []
+            }
+            this.$watch('row.' + fieldName, (newVal, oldVal) => {
+              if (newVal) {
+                this.departmentInfo = newVal.split(',')
+              } else {
+                this.departmentInfo = []
+              }
+            })
+          } else {
+            // 表示是页面pageContext的字段
+            this.setLimitDepartmentInfo()
+            if (!this.controlConfig.deptScopeField.indexOf('${fixed.') === 0) {
+              watchPageContextDynamicVariable(
+                this,
+                this.pageContext,
+                this.controlConfig.deptScopeField,
+                (newVal, oldVal) => {
+                  this.setLimitDepartmentInfo()
+                }
+              )
+            }
+          }
+        } else if (this.controlConfig.deptScope == 'depts' && this.controlConfig.deptScopeCodes) {
+          // 表示固定部门范围
+          this.departmentInfo = this.controlConfig.deptScopeCodes.split(',')
+        }
+      }
+    },
+    setLimitDepartmentInfo() {
+      const deptScopeFieldValue = getPropValueNew(this.controlConfig.deptScopeField, this.pageContext, this.row)
+      if (deptScopeFieldValue) {
+        this.departmentInfo = deptScopeFieldValue.split(',')
+      } else {
+        this.departmentInfo = []
+      }
     }
   }
 }

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

@@ -117,7 +117,12 @@ function setRules(rules, editField, listCode, customRules) {
             item.pattern = new RegExp(item.pattern)
           }
         })
-        validations = validations.concat(columnCustomRules)
+        // validations = validations.concat(columnCustomRules)
+        if (columnCustomRules && columnCustomRules.length > 0) {
+          validations = columnCustomRules
+        } else {
+          validations = validations.concat(columnCustomRules)
+        }
         if (prop.indexOf('.') > 0) {
           setObjectPropRule(editField, rules, validations)
         } else {
@@ -189,7 +194,7 @@ function setRuleDataType(dataType, rule) {
   if (!rule.type) {
     if (dataType === 'BOOLEAN') {
       rule.type = 'boolean'
-    } 
+    }
     return rule
   }
 }

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

@@ -106,8 +106,10 @@
             :is-show="operation.isShow"
             :label="operation.props.label ? operation.props.label : row[column.prop]"
             :on-click="operation.onClick"
+            :operation="operation"
             :operation-index="operationIndex"
             :operation-setting="operation.props"
+            :event-name="operation.eventName"
             :row-index="rowIndex"
             :list-code="listCode"
             :parent-form-data="parentFormData"
@@ -1184,7 +1186,6 @@ export default {
       return 'primary'
     },
     changeDisabled(state) {
-      debugger
       this.disabled = state
     },
     refreshList() {

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

@@ -1,10 +1,10 @@
 <template>
   <!--将@click改为@mousedown.native是因为操作列保存按钮时事件和input等组件的@blur冲突，导致保存需要保存两次，因为
       @blur先于@click执行的，所以只会执行@blur，@click就失效了，@mousedown是先于@blur执行的-->
-  <span :style="myStyle">
+  <span class="table-operation-row-btn" :style="myStyle">
     <template v-if="isShowButton()">
       <el-tooltip :disabled="tooltipDisabled" :content="label" placement="top">
-        <template v-if="operationSettingData.permission">
+        <template v-if="operationSettingData?.permission">
           <component
             v-bind="operationSettingData"
             :is="isElementType"
@@ -77,9 +77,13 @@ export default {
       type: String,
       default: null,
     },
+    operation: {
+      type: Object,
+      default: () => ({}),
+    },
     operationSetting: {
       type: Object,
-      default: null,
+      default: () => ({}),
     },
     operationIndex: {
       type: Number,
@@ -92,6 +96,11 @@ export default {
     parentFormData: {
       type: Object,
       default: null
+    },
+    // 按钮绑定的事件名称
+    eventName: {
+      type: String,
+      default: null
     }
   },
   data() {
@@ -104,19 +113,20 @@ export default {
     ...mapGetters(['preventReclick']),
     // 是否是保存按钮
     isSaveRow() {
-      return /^\s*function\s+saveRow*\s*\(/.test((this.onClick ?? ''))
+      return ['lineEditSave', 'saveRow'].includes(this.eventName)
     },
     // 是否是删除按钮
     isDeleteRow() {
-      return /^\s*function\s+deleteRow*\s*\(/.test((this.onClick ?? ''))
+      return ['lineEditDelete', 'deleteRow'].includes(this.eventName)
     },
     // 是否是修改按钮
     isEditRow() {
-      return /^\s*function\s+editRow*\s*\(/.test((this.onClick ?? ''))
+      return ['lineEditUpdate', 'editRow'].includes(this.eventName)
     },
     // 是否是取消按钮
     isRestoreRow() {
-      return /^\s*function\s+restoreRow*\s*\(/.test((this.onClick ?? ''))
+      return ['restoreEdit', 'restoreRow'].includes(this.eventName)
+      // return /^\s*function\s+restoreRow*\s*\(/.test((this.onClick ?? ''))
     },
     // 前置图标
     prefixIcon() {
@@ -142,16 +152,16 @@ export default {
     },
     // 后置图标
     suffixIcon() {
-      if(['right'].includes(this.operationSettingData.iconPosition)) return this.operationSetting.iconValue
+      if(['right'].includes(this.operationSetting.iconPosition)) return this.operationSetting.iconValue
       return undefined
     },
     // 是否显示文字按钮 > 图标模式
     isTextIcon() {
       if (this.isTableBtnLinkShow) {
-        if (this.operationSettingData.isTextIcon === undefined) {
+        if (this.operationSetting.isTextIcon === undefined) {
           return this.isSaveRow || this.isDeleteRow || this.isEditRow || this.isRestoreRow
         }
-        return this.operationSettingData.isTextIcon
+        return this.operationSetting.isTextIcon
       } else {
         return false
       }
@@ -166,14 +176,14 @@ export default {
     },
     // 是否自动开启表格 按钮 转 文字按钮
     isTableBtnLinkShow() {
-      if (this.operationSetting.text) return true
+      if (this.operationSetting?.text) return true
       if (this.isTableBtnLink && this.elementType === 'el-button') {
-        return [this.operationSetting.text, this.operationSetting.plain, this.operationSetting.round].every(v => v === undefined)
+        return [this.operationSetting?.text, this.operationSetting?.plain, this.operationSetting?.round].every(v => v === undefined)
       }
       return false
     },
     operationSettingData() {
-      const dataList = { ...this.operationSetting }
+      const dataList = { ...(this.operationSetting ?? {}) }
       if (this.isTableBtnLinkShow) {
         dataList.underline = false
         delete dataList.text