agilebuilder-ui 1.1.37 → 1.1.38-sit2

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

@@ -96,6 +96,7 @@
             :grid-data="gridData"
             :page-grid-data="pageGridData"
             :current-page="currentPage"
+            :custom-params="controlConfig ? controlConfig.customParams : null"
             @refresh-list="refreshList"
           />
           <row-operation
@@ -106,6 +107,7 @@
             :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"
@@ -133,6 +135,7 @@
           :additional-param-map="additionalParamMap"
           :additional-settings="additionalSettings"
           :page-context="options?.pageContext"
+          :custom-params="controlConfig ? controlConfig.customParams : null"
         />
       </span>
       <!-- 自定义格式的时候 -->
@@ -170,6 +173,7 @@
           :component-id="componentId"
           :additional-settings="additionalSettings"
           :page-context="options?.pageContext"
+          :custom-params="controlConfig ? controlConfig.customParams : null"
           @prohibitToEdit="prohibitToEdit"
           @refresh-list="refreshList"
       /></span>
@@ -387,7 +391,7 @@ import customFormatter from './custom-formatter'
 import RowOperation from './row-operation.vue'
 import apis from './apis'
 import { mapGetters } from 'vuex'
-import { getEntityFieldValue, getParentObjectUtil } from '../../../src/utils/util'
+import { getEntityFieldValue, getParentObjectUtil, formatCustomParams } from '../../../src/utils/util'
 import ViewImageDialog from './view-image-dialog.vue'
 import eventBus from './eventBus'
 import FsPreview from '../../fs-preview'
@@ -700,6 +704,10 @@ export default {
     this.requiredClass = this.isRequired(this.row.$editing) ? 'm-requried' : ''
   },
   mounted() {
+    if (this.controlConfig) {
+      const gridParams = store.get(this.listCode)
+      formatCustomParams(this.controlConfig.customParams, gridParams.pageContext, this.row)
+    }
     // 监听取消自定义编辑事件
     eventBus.$on('clearTableAllStartEditing', () => {
       this.clearAllEditing()

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,
@@ -148,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
       }
@@ -172,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