imatrix-ui 2.9.18-dw → 2.9.20-dw

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "imatrix-ui",
3
- "version": "2.9.18-dw",
3
+ "version": "2.9.20-dw",
4
4
  "description": "前端组件库:表格、表单、组织结构树等",
5
5
  "main": "lib/super-ui.umd.min.js",
6
6
  "private": false,
@@ -4,7 +4,8 @@ import {
4
4
  isEditOptionFunction,
5
5
  isLastEditRowSave,
6
6
  isHasEditOption,
7
- scrollYToBottom
7
+ scrollYToBottom,
8
+ getAdditionalParamMap
8
9
  } from './utils'
9
10
  import formValidatorService from './formValidatorUtil'
10
11
  import Vue from 'vue'
@@ -129,7 +130,7 @@ const apis = {
129
130
  // 每页显示多少条
130
131
  const pageSize = gridParams.pagination && gridParams.pagination.pageSize
131
132
  const isMobile = false
132
- canCreate = gridParams.options.lineEditOptions.beforeInsertRow.call(this, isSubTableShowPage ? gridParams.subTableData : gridParams.gridData, gridParams.$rowIndex, isMobile, this.baseURL, isSubTableShowPage ? gridParams.gridData : null, pageSize)
133
+ canCreate = gridParams.options.lineEditOptions.beforeInsertRow.call(this, isSubTableShowPage ? gridParams.subTableData : gridParams.gridData, gridParams.$rowIndex, isMobile, this.baseURL, isSubTableShowPage ? gridParams.gridData : null, pageSize, gridParams.additionalParamMap)
133
134
  }
134
135
  // console.log('创建行记录执行前判断', canCreate)
135
136
  // console.log('创建行记录gridParams.options.isFormSubTable=', gridParams.options.isFormSubTable)
@@ -227,7 +228,7 @@ const apis = {
227
228
  // 每页显示多少条
228
229
  const pageSize = gridParams.pagination && gridParams.pagination.pageSize
229
230
  const isMobile = false
230
- gridParams.options.lineEditOptions.afterInsertRow.call(this, isSubTableShowPage ? gridParams.subTableData : gridParams.gridData, gridParams.$rowIndex, isMobile, this.baseURL, isSubTableShowPage ? gridParams.gridData : null, pageSize)
231
+ gridParams.options.lineEditOptions.afterInsertRow.call(this, isSubTableShowPage ? gridParams.subTableData : gridParams.gridData, gridParams.$rowIndex, isMobile, this.baseURL, isSubTableShowPage ? gridParams.gridData : null, pageSize, gridParams.additionalParamMap)
231
232
  }
232
233
 
233
234
  gridParams.isCreateRow = true
@@ -354,7 +355,8 @@ const apis = {
354
355
  columns: gridParams.columns,
355
356
  isMobile: false,
356
357
  pageGridData: isSubTableShowPage ? gridParams.gridData : null,
357
- pageSize
358
+ pageSize,
359
+ additionalParamMap: getAdditionalParamMap(gridParams)
358
360
  })
359
361
  }
360
362
  if (isPromise(canEdit)) {
@@ -458,17 +460,12 @@ gridParams.$rowIndex < gridParams.gridData.length) {
458
460
  if (validateResult === true) {
459
461
  let canSave = true
460
462
  if (isEditOptionFunction('beforeSave', listCode)) {
461
- canSave = gridParams.options.lineEditOptions['beforeSave'].call(this, row, gridParams.columns)
463
+ canSave = gridParams.options.lineEditOptions['beforeSave'].call(this, row, gridParams.columns, gridParams.additionalParamMap)
462
464
  }
463
465
  if (canSave === undefined || canSave === true) {
464
466
  // 触发点击保存时的事件线,在 normal-column 监听处对字段控件是选项组的字段的值进行处理
465
467
  eventBus.$emit('un-edit', { row })
466
- let additionalParamMap = null
467
- if (gridParams.additionalParamMap && typeof (gridParams.additionalParamMap) === 'object') {
468
- additionalParamMap = gridParams.additionalParamMap
469
- } else if (gridParams.additionalParamMap && gridParams.additionalParamMap !== '') {
470
- additionalParamMap = JSON.parse(gridParams.additionalParamMap)
471
- }
468
+ const additionalParamMap = getAdditionalParamMap(gridParams)
472
469
  let saveRowRequest
473
470
  if (isEditOptionFunction('saveRow', listCode)) {
474
471
  // 表示保存方法,用户自己重写了
@@ -551,7 +548,7 @@ gridParams.$rowIndex < gridParams.gridData.length) {
551
548
  }
552
549
 
553
550
  if (isEditOptionFunction('saveSuccess', listCode)) {
554
- gridParams.options.lineEditOptions['saveSuccess'].call(this, data, gridParams.columns, rowIndex, row)
551
+ gridParams.options.lineEditOptions['saveSuccess'].call(this, data, gridParams.columns, rowIndex, row, gridParams.additionalParamMap)
555
552
  }
556
553
  Object.assign(gridParams.orgGridData[rowIndex], data)
557
554
  // 必须加这句,否则连续保存时报事务异常
@@ -607,7 +604,7 @@ gridParams.$rowIndex < gridParams.gridData.length) {
607
604
  // 每页显示多少条
608
605
  const pageSize = gridParams.pagination && gridParams.pagination.pageSize
609
606
  const isMobile = false
610
- isValidate = gridParams.options.lineEditOptions.beforeRestoreValidate.call(this, { rowIndex, gridData: isSubTableShowPage ? gridParams.subTableData : gridParams.gridData, entity: gridParams.gridData[rowIndex], isMobile, baseURL: this.baseURL, isEditing: !isUnEditing, pageGridData: isSubTableShowPage ? gridParams.gridData : null, pageSize })
607
+ isValidate = gridParams.options.lineEditOptions.beforeRestoreValidate.call(this, { rowIndex, gridData: isSubTableShowPage ? gridParams.subTableData : gridParams.gridData, entity: gridParams.gridData[rowIndex], isMobile, baseURL: this.baseURL, isEditing: !isUnEditing, pageGridData: isSubTableShowPage ? gridParams.gridData : null, pageSize, additionalParamMap: gridParams.additionalParamMap })
611
608
  }
612
609
  if (isValidate === undefined || isValidate === true) {
613
610
  // 例如:自定义验证成功,再继续平台的验证
@@ -633,7 +630,7 @@ gridParams.$rowIndex < gridParams.gridData.length) {
633
630
  // 每页显示多少条
634
631
  const pageSize = gridParams.pagination && gridParams.pagination.pageSize
635
632
  const isMobile = false
636
- canRestore = gridParams.options.lineEditOptions.beforeRestore.call(this, { rowIndex, gridData: isSubTableShowPage ? gridParams.subTableData : gridParams.gridData, entity: gridParams.gridData[rowIndex], isMobile, baseURL: Vue.prototype.baseURL, isEditing: !isUnEditing, pageGridData: isSubTableShowPage ? gridParams.gridData : null, pageSize })
633
+ canRestore = gridParams.options.lineEditOptions.beforeRestore.call(this, { rowIndex, gridData: isSubTableShowPage ? gridParams.subTableData : gridParams.gridData, entity: gridParams.gridData[rowIndex], isMobile, baseURL: Vue.prototype.baseURL, isEditing: !isUnEditing, pageGridData: isSubTableShowPage ? gridParams.gridData : null, pageSize, additionalParamMap: gridParams.additionalParamMap })
637
634
  }
638
635
  if (canRestore === undefined || canRestore === true) {
639
636
  // 如果没有编辑过任何行
@@ -672,7 +669,7 @@ gridParams.$rowIndex < gridParams.gridData.length) {
672
669
  gridParams.isCreateRow = false
673
670
  // 撤销编辑后回调
674
671
  if (isEditOptionFunction('afterRestore', listCode)) {
675
- gridParams.options.lineEditOptions.afterRestore.call(this, rowIndex, gridParams.orgGridData[rowIndex])
672
+ gridParams.options.lineEditOptions.afterRestore.call(this, rowIndex, gridParams.orgGridData[rowIndex], gridParams.additionalParamMap)
676
673
  }
677
674
  }
678
675
  }
@@ -691,7 +688,7 @@ gridParams.$rowIndex < gridParams.gridData.length) {
691
688
  const pageSize = gridParams.pagination && gridParams.pagination.pageSize
692
689
  const gridData = isSubTableShowPage ? gridParams.subTableData : gridParams.gridData
693
690
  const isMobile = false
694
- canDelete = gridParams.options.lineEditOptions.beforeDelete.call(this, rowIndex, gridParams.gridData[rowIndex], gridData, isMobile, this.baseURL, isSubTableShowPage ? gridParams.gridData : null, pageSize)
691
+ canDelete = gridParams.options.lineEditOptions.beforeDelete.call(this, rowIndex, gridParams.gridData[rowIndex], gridData, isMobile, this.baseURL, isSubTableShowPage ? gridParams.gridData : null, pageSize, gridParams.additionalParamMap)
695
692
  }
696
693
  if (canDelete === undefined || canDelete === true) {
697
694
  if (gridParams.isSubTableShowPage !== undefined && gridParams.isSubTableShowPage === true) {
@@ -733,7 +730,7 @@ gridParams.$rowIndex < gridParams.gridData.length) {
733
730
  // 每页显示多少条
734
731
  const pageSize = gridParams.pagination && gridParams.pagination.pageSize
735
732
  const isMobile = false
736
- gridParams.options.lineEditOptions.afterDelete.call(this, rowIndex, gridParams.orgGridData[rowIndex], isSubTableShowPage ? gridParams.subTableData : gridParams.gridData, isMobile, this.baseURL, isSubTableShowPage ? gridParams.gridData : null, pageSize)
733
+ gridParams.options.lineEditOptions.afterDelete.call(this, rowIndex, gridParams.orgGridData[rowIndex], isSubTableShowPage ? gridParams.subTableData : gridParams.gridData, isMobile, this.baseURL, isSubTableShowPage ? gridParams.gridData : null, pageSize, gridParams.additionalParamMap)
737
734
  }
738
735
  }
739
736
  }
@@ -139,7 +139,8 @@ const customFormatter = {
139
139
  value: cellValue,
140
140
  row: row,
141
141
  column: this.column,
142
- prop: prop
142
+ prop: prop,
143
+ additionalParamMap: gridParams.additionalParamMap
143
144
  }
144
145
  return gridParams.options['eventCallBack'][funName].call(this, param)
145
146
  } else {
@@ -240,7 +241,8 @@ const customFormatter = {
240
241
  row: row,
241
242
  column: column,
242
243
  rowIndex: rowIndex,
243
- listCode
244
+ listCode,
245
+ additionalParamMap: gridParams.additionalParamMap
244
246
  }
245
247
  canClick = gridParams.options['eventCallBack'][funName].call(this, param)
246
248
  }
@@ -271,7 +271,8 @@
271
271
  :options="{
272
272
  dynamicDataSourceCode:dynamicDataSourceCode,
273
273
  valueSetOptions:valueSetOptions,
274
- isSql:isSql
274
+ isSql:isSql,
275
+ additionalParameter: additionalParamMap?JSON.stringify(additionalParamMap):null
275
276
  }"
276
277
  :table-name="tableName"
277
278
  :list-code="listCode"
@@ -396,7 +397,7 @@
396
397
  <script>
397
398
  import store from './store'
398
399
  import Vue from 'vue'
399
- import { isDisableEdit, isEditOptionFunction, analysisFileSetObj, otherFilesToStandard, getFileList, isDynamicDataSourceSource } from './utils'
400
+ import { isDisableEdit, isEditOptionFunction, analysisFileSetObj, otherFilesToStandard, getFileList, isDynamicDataSourceSource, getAdditionalParamMap } from './utils'
400
401
  import dynamicSourceSelect from '../../dynamic-source-select/src/dynamic-source-select'
401
402
  import { getEntityFieldValue, setEntityFieldValue } from '../../../src/utils/util'
402
403
  import { getToken } from '../../../src/utils/auth'
@@ -488,6 +489,7 @@ export default {
488
489
  const gridData = gridParams.gridData
489
490
  const subTableData = gridParams.subTableData
490
491
  const isSubTableShowPage = gridParams.isSubTableShowPage
492
+ const additionalParamMap = getAdditionalParamMap(gridParams)
491
493
  return {
492
494
  deptManTree: false, // 是否是部门人员树
493
495
  isMultiTree: false, // 是否是多选树
@@ -522,7 +524,8 @@ export default {
522
524
  inputNumberSet: {},
523
525
  fileInfo: { showName: null, serverPath: null },
524
526
  gridData: isSubTableShowPage ? subTableData : gridData,
525
- pageGridData: isSubTableShowPage ? gridData : null
527
+ pageGridData: isSubTableShowPage ? gridData : null,
528
+ additionalParamMap
526
529
 
527
530
  }
528
531
  },
@@ -784,7 +787,7 @@ export default {
784
787
  } else if (isEditOptionFunction(eventName, this.listCode)) {
785
788
  // 为了兼容历史版本保留了该判断
786
789
 
787
- gridParams.options.lineEditOptions[eventName].call(this, event, this.row, this.column)
790
+ gridParams.options.lineEditOptions[eventName].call(this, event, this.row, this.column, gridParams.additionalParamMap)
788
791
  }
789
792
  this.$emit('findIndex')
790
793
  // console.log('cellEvent5---this.innerValue=', this.innerValue)
@@ -833,6 +836,7 @@ export default {
833
836
  }
834
837
  param.formData = gridParams.options && gridParams.options.formData ? gridParams.options.formData : null
835
838
  param.parent = this.parentFormData
839
+ param.additionalParamMap = gridParams.additionalParamMap
836
840
  gridParams.options['eventCallBack'][funName].call(this, param)
837
841
  }
838
842
  }
@@ -41,7 +41,7 @@
41
41
  type="yearRange"
42
42
  @change="setYearRangeValue(column.prop,$event)"
43
43
  />
44
- <el-date-picker
44
+ <el-g-date-picker
45
45
  v-else-if="column.componentType==='dateTimePicker'"
46
46
  :value="getFormItemValue(column.prop)"
47
47
  :default-time="getDefaultTime(column)"
@@ -67,7 +67,7 @@
67
67
  value-format="yyyy-MM-dd"
68
68
  @input="setValueToModelProp(column.prop,$event)"
69
69
  />
70
- <el-date-picker
70
+ <el-g-date-picker
71
71
  v-else-if="column.dataType === 'TIME' && column.componentType==='timepicker'"
72
72
  :value="getFormItemValue(column.prop)"
73
73
  type="datetimerange"
@@ -182,7 +182,8 @@ const superGridService = {
182
182
  if (isHasOptionFunction('loadBeforeSend', this.code)) {
183
183
  canFetchData = gridParams.options.loadBeforeSend.call(this, {
184
184
  columns: this.columns,
185
- gridParams
185
+ gridParams,
186
+ additionalParamMap: gridParams.additionalParamMap
186
187
  })
187
188
  }
188
189
  if (canFetchData === undefined || canFetchData === true) {
@@ -712,7 +712,8 @@ export default {
712
712
  gridData: this.isSubTableShowPage ? this.subTableData : this.gridData,
713
713
  columns: gridParams.columns,
714
714
  superGrid: this.$refs.superGrid,
715
- pageGridData: this.isSubTableShowPage ? this.gridData : null
715
+ pageGridData: this.isSubTableShowPage ? this.gridData : null,
716
+ additionalParamMap: gridParams.additionalParamMap
716
717
  })
717
718
  }
718
719
  })
@@ -727,15 +728,9 @@ export default {
727
728
  const that = this
728
729
  const isShowUserTreeDialog =
729
730
  document.querySelector('.user-tree') !== null
730
- // 列表页面中是否有弹框,例如:按钮区点击一个按钮dialog弹框时,如果有弹框,则列表的回车事件不生效,否则会导致页面刷新
731
- let isPageHasDialog = window.sessionStorage.getItem(this.pageCode + '-isShowPageDialog')
732
- if (isPageHasDialog === undefined) {
733
- isPageHasDialog = false
734
- }
735
- console.log('super-grid-----this.pageCode=', this.pageCode, 'isPageHasDialog=', isPageHasDialog)
736
731
  // 当前页面监视键盘输入
737
732
  document.querySelector('.' + this.code).onkeydown = function(e) {
738
- if (!that.isShowPageDialog && !isShowUserTreeDialog && !isPageHasDialog) {
733
+ if (!that.isShowPageDialog && !isShowUserTreeDialog) {
739
734
  // 当前列表页面没有弹框或选人弹框,才走键盘监视事件
740
735
  // 事件对象兼容
741
736
  // eslint-disable-next-line no-caller
@@ -804,11 +799,12 @@ export default {
804
799
  // 是否触发回车事件
805
800
  isCallEnterEvent(that) {
806
801
  let canCall = true
807
- if (this.options.isEnableEnterEvent !== undefined && this.options.isEnableEnterEvent === false) {
802
+ if (that.options.isEnableEnterEvent !== undefined && that.options.isEnableEnterEvent === false) {
808
803
  canCall = false
809
804
  }
805
+ console.log('super-grid-----isEnableEnterEvent=', that.options.isEnableEnterEvent, 'canCall=', canCall)
810
806
  const gridParams = store.get(that.code)
811
- if (gridParams.options && gridParams.options.isFormSubTable) {
807
+ if (canCall && gridParams.options && gridParams.options.isFormSubTable) {
812
808
  canCall = false
813
809
  }
814
810
  return canCall
@@ -837,7 +833,8 @@ export default {
837
833
  const newHeight = gridParams.options.resizeHeight.call(this, {
838
834
  code: this.code,
839
835
  height: tableHeight,
840
- searchHeight: searchHeight
836
+ searchHeight: searchHeight,
837
+ additionalParamMap: gridParams.additionalParamMap
841
838
  })
842
839
  if (newHeight) {
843
840
  tableHeight = newHeight
@@ -911,7 +908,8 @@ export default {
911
908
  rowIndex,
912
909
  that.column,
913
910
  row,
914
- gridParams.orgGridData[rowIndex]
911
+ gridParams.orgGridData[rowIndex],
912
+ gridParams.additionalParamMap
915
913
  )
916
914
  } else {
917
915
  that.saveRow(rowIndex, that.code)
@@ -935,7 +933,8 @@ export default {
935
933
  rowIndex,
936
934
  that.column,
937
935
  row,
938
- gridParams.orgGridData[rowIndex]
936
+ gridParams.orgGridData[rowIndex],
937
+ gridParams.additionalParamMap
939
938
  )
940
939
  } else {
941
940
  that.restoreRow(rowIndex, that.code)
@@ -1214,6 +1213,7 @@ export default {
1214
1213
  }
1215
1214
  }
1216
1215
  if (isHasOptionFunction('rowStyleRender', this.code)) {
1216
+ param.additionalParamMap = gridParams.additionalParamMap
1217
1217
  return gridParams.options.rowStyleRender.call(this, param)
1218
1218
  }
1219
1219
  if (
@@ -1241,6 +1241,7 @@ export default {
1241
1241
  // {row, column, rowIndex, columnIndex}
1242
1242
  // 获取对应单元格配置
1243
1243
  if (isHasOptionFunction('cellStyleRender', this.code)) {
1244
+ param.additionalParamMap = gridParams.additionalParamMap
1244
1245
  return gridParams.options.cellStyleRender.call(this, param)
1245
1246
  } else if (
1246
1247
  funName !== null &&
@@ -1254,7 +1255,8 @@ export default {
1254
1255
  value: param.row[param.column.property],
1255
1256
  row: param.row,
1256
1257
  column: columnOptions,
1257
- prop: param.column.property
1258
+ prop: param.column.property,
1259
+ additionalParamMap: gridParams.additionalParamMap
1258
1260
  }
1259
1261
  return gridParams.options['eventCallBack'][funName].call(this, params)
1260
1262
  }
@@ -1333,6 +1335,7 @@ export default {
1333
1335
  typeof gridParams.options['eventCallBack'][funName] === 'function'
1334
1336
  ) {
1335
1337
  // const param = { value: param.row[param.column.property], row: param.row, column: columnOptions, prop: param.column.property }
1338
+ param.additionalParamMap = gridParams.additionalParamMap
1336
1339
  return gridParams.options['eventCallBack'][funName].call(this, param)
1337
1340
  }
1338
1341
  }
@@ -1352,7 +1355,8 @@ export default {
1352
1355
  if (isHasOptionFunction('gridDataLoaded', this.code)) {
1353
1356
  const gridData = gridParams.options.gridDataLoaded.call(this, {
1354
1357
  gridData: gridParams.options.SuperGrid.simulationDate,
1355
- columns: gridParams.columns
1358
+ columns: gridParams.columns,
1359
+ additionalParamMap: gridParams.additionalParamMap
1356
1360
  })
1357
1361
  if (gridData) {
1358
1362
  this.gridData = gridData
@@ -1405,7 +1409,8 @@ export default {
1405
1409
  if (isHasOptionFunction('gridDataLoaded', this.code)) {
1406
1410
  const gridData = gridParams.options.gridDataLoaded.call(this, {
1407
1411
  gridData: initSubTableData,
1408
- columns: gridParams.columns
1412
+ columns: gridParams.columns,
1413
+ additionalParamMap: gridParams.additionalParamMap
1409
1414
  })
1410
1415
  if (gridData) {
1411
1416
  subTableData = gridData
@@ -1580,7 +1585,8 @@ export default {
1580
1585
  if (isHasOptionFunction('gridDataLoaded', this.code)) {
1581
1586
  const gridDataLoadedParam = {
1582
1587
  gridData: data.data,
1583
- columns: gridParams.columns
1588
+ columns: gridParams.columns,
1589
+ additionalParamMap: gridParams.additionalParamMap
1584
1590
  }
1585
1591
  if (searchParam) {
1586
1592
  gridDataLoadedParam.searchForm = searchParam.searchForm
@@ -1672,14 +1678,16 @@ export default {
1672
1678
  } else {
1673
1679
  // 对数据做序列化,比如:处理xss攻击
1674
1680
  if (isHasOptionFunction('gridDataLoaded', this.code)) {
1675
- gridParams.options.gridDataLoaded.call(this, { gridData: data })
1681
+ gridParams.options.gridDataLoaded.call(this, { gridData: data,
1682
+ additionalParamMap: gridParams.additionalParamMap })
1676
1683
  }
1677
1684
 
1678
1685
  if (isHasOptionFunction('loadChildrenComplete', this.code)) {
1679
1686
  gridParams.options.loadChildrenComplete.call(this, {
1680
1687
  parentRowIds: parentRowIds,
1681
1688
  gridData: data,
1682
- columns: gridParams.columns
1689
+ columns: gridParams.columns,
1690
+ additionalParamMap: gridParams.additionalParamMap
1683
1691
  })
1684
1692
  }
1685
1693
  if (typeof resove !== 'undefined' && resove !== null) {
@@ -1774,7 +1782,7 @@ export default {
1774
1782
  if (isHasOptionFunction('gridDataLoaded', this.code)) {
1775
1783
  const gridData = gridParams.options.gridDataLoaded.call(
1776
1784
  this,
1777
- data.gridData
1785
+ { gridData: data.gridData, additionalParamMap: gridParams.additionalParamMap }
1778
1786
  )
1779
1787
  if (gridData) {
1780
1788
  this.gridData = gridData
@@ -1877,7 +1885,8 @@ export default {
1877
1885
  if (isHasOptionFunction('gridDataLoaded', vm.code)) {
1878
1886
  gridData = gridParams.options.gridDataLoaded.call(this, {
1879
1887
  gridData: gridParams.options.SuperGrid.simulationDate,
1880
- columns: gridParams.columns
1888
+ columns: gridParams.columns,
1889
+ additionalParamMap: gridParams.additionalParamMap
1881
1890
  })
1882
1891
  if (!gridData) {
1883
1892
  gridData = gridParams.options.SuperGrid.simulationDate
@@ -1900,7 +1909,8 @@ export default {
1900
1909
  if (isHasOptionFunction('gridDataLoaded', vm.code)) {
1901
1910
  gridData = gridParams.options.gridDataLoaded.call(this, {
1902
1911
  gridData: gridParams.options.subTableData,
1903
- columns: gridParams.columns
1912
+ columns: gridParams.columns,
1913
+ additionalParamMap: gridParams.additionalParamMap
1904
1914
  })
1905
1915
  if (!gridData) {
1906
1916
  gridData = gridParams.options.subTableData
@@ -2382,7 +2392,8 @@ export default {
2382
2392
  code: this.code,
2383
2393
  newWidth: newWidth,
2384
2394
  oldWidth: oldWidth,
2385
- column: column
2395
+ column: column,
2396
+ additionalParamMap: gridParams.additionalParamMap
2386
2397
  })
2387
2398
  if (newWidth) {
2388
2399
  myNewWidth = newWidth
@@ -2697,6 +2708,7 @@ export default {
2697
2708
  if (closeEvent) {
2698
2709
  const params = {
2699
2710
  params: gridParams.additionalParamMap,
2711
+ additionalParamMap: gridParams.additionalParamMap,
2700
2712
  entity: row
2701
2713
  }
2702
2714
  if (popParams) {
@@ -2766,7 +2778,8 @@ export default {
2766
2778
  jumpPageSetting: this.jumpPageSetting,
2767
2779
  entity: this.gridData[editRowIndex],
2768
2780
  targetTableName: tableName,
2769
- isNeedReplaceFieldName: !isNotNeedReplaceFieldName
2781
+ isNeedReplaceFieldName: !isNotNeedReplaceFieldName,
2782
+ additionalParamMap: gridParams.additionalParamMap
2770
2783
  })
2771
2784
  }
2772
2785
  }
@@ -770,3 +770,13 @@ export function scrollYToBottom(listCode) {
770
770
  scrollDivElement.scrollTop = scrollDivElement.scrollHeight
771
771
  }
772
772
  }
773
+
774
+ export function getAdditionalParamMap(gridParams) {
775
+ let additionalParamMap = null
776
+ if (gridParams.additionalParamMap && typeof (gridParams.additionalParamMap) === 'object') {
777
+ additionalParamMap = gridParams.additionalParamMap
778
+ } else if (gridParams.additionalParamMap && gridParams.additionalParamMap !== '') {
779
+ additionalParamMap = JSON.parse(gridParams.additionalParamMap)
780
+ }
781
+ return additionalParamMap
782
+ }
@@ -57,7 +57,8 @@ const superGridService = {
57
57
  this.hasLoadedColumns = true
58
58
  let canFetchData = true
59
59
  if (isHasOptionFunction('loadBeforeSend', this.storeId)) {
60
- canFetchData = gridParams.options.loadBeforeSend.call(this, { columns: this.columns, gridParams })
60
+ canFetchData = gridParams.options.loadBeforeSend.call(this, { columns: this.columns, gridParams,
61
+ additionalParamMap: gridParams.additionalParamMap })
61
62
  }
62
63
  if (canFetchData === undefined || canFetchData === true) {
63
64
  if (typeof (this.options.initSearch) === 'undefined' || this.options.initSearch !== false) {
@@ -31,6 +31,12 @@
31
31
  <span v-else>{{ scope.row.creatorName }}</span>
32
32
  </template>
33
33
  </el-table-column>
34
+ <el-table-column :label="$t('workflowHistoryList.operatorLg')" align="left" width="250">
35
+ <template slot-scope="scope">
36
+ <span v-if="scope.row.historyType && scope.row.historyType ==='PROCESS_END'" />
37
+ <span v-else>{{ scope.row.creator }}</span>
38
+ </template>
39
+ </el-table-column>
34
40
  <el-table-column :label="$t('workflowHistoryList.operatorDept')" align="left" width="150">
35
41
  <template slot-scope="scope">
36
42
  <span v-if="scope.row.historyType && scope.row.historyType ==='PROCESS_END'" />
@@ -211,6 +211,7 @@ const cn = {
211
211
  history_abandon_draw: '{1}放弃领取该任务,还原了候选人[{2}]的任务',
212
212
  toDoText: '待处理',
213
213
  operator: '操作人',
214
+ operatorLg: '操作人登录名',
214
215
  operatorDept: '操作人部门',
215
216
  operationTime: '操作时间'
216
217
 
@@ -208,6 +208,7 @@ const en = {
208
208
  history_abandon_draw: '{1}gives up the task and restores the task of candidate [{2}]',
209
209
  toDoText: 'Todo',
210
210
  operator: 'Operator',
211
+ operatorLg: 'Operator Login Name',
211
212
  operatorDept: 'Operator Dept',
212
213
  operationTime: 'Operation Time'
213
214
  },