imatrix-ui 2.9.24-dw → 2.9.25-dw

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imatrix-ui",
-  "version": "2.9.24-dw",
+  "version": "2.9.25-dw",
   "description": "前端组件库：表格、表单、组织结构树等",
   "main": "lib/super-ui.umd.min.js",
   "private": false,

package/packages/dynamic-source-select/src/dynamic-source-select.vue

@@ -252,7 +252,9 @@ export default {
                           }
                           this.$emit('set-value', {
                             value: targeValue,
-                            targetColumnName: this.column.prop
+                            targetColumnName: this.column.prop,
+                            options: this.optionItems,
+                            valueAttribute: this.valueAttribute
                           })
                         }
                       }
@@ -383,7 +385,8 @@ export default {
             value: value,
             sourceColumnName: sourceColumnName,
             targetColumnName: targetColumnName,
-            options: this.optionItems
+            options: this.optionItems,
+            valueAttribute: this.valueAttribute
           })
         })
       }

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

@@ -5,7 +5,8 @@ import {
   isLastEditRowSave,
   isHasEditOption,
   scrollYToBottom,
-  getAdditionalParamMap
+  getAdditionalParamMap,
+  isDynamicDataSourceSource
 } from './utils'
 import formValidatorService from './formValidatorUtil'
 import Vue from 'vue'
@@ -782,14 +783,30 @@ gridParams.$rowIndex < gridParams.gridData.length) {
       listCode = store.get('_list_code')
     }
     const gridParams = store.get(listCode)
+    const dynamicSourceSelectOptions = gridParams.dynamicSourceSelectOptions
     const columns = gridParams.columns
     columns.forEach(col => {
-      if (col.valueSet && col.valueSet.length > 0) {
-        result[col.prop] = col.valueSet
+      const prop = col.prop
+      const isDynamicDataSource = isDynamicDataSourceSource(col)
+      if (dynamicSourceSelectOptions && isDynamicDataSource && dynamicSourceSelectOptions[prop]) {
+        // { options, valueAttribute }
+        const optionSet = dynamicSourceSelectOptions[prop]
+        result[prop] = this.packageDynamicDataSourceOptions(optionSet.options, optionSet.valueAttribute)
+      } else if (col.valueSet && col.valueSet.length > 0) {
+        result[prop] = col.valueSet
       }
     })
     return result
   },
+  packageDynamicDataSourceOptions(options, valueAttribute) {
+    if (options) {
+      options.forEach(item => {
+        item.value = item[valueAttribute]
+        item.label = item['_label_']
+      })
+    }
+    return options
+  },
   // 取消列表的编辑状态
   restoreGridEdit(listCode) {
     if (!listCode) {

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

@@ -1186,9 +1186,15 @@ export default {
         this.callCustomEventWithParam('replace', { originalValue, newValue, row: this.row, column: this.column, prop })
       }
     },
-    setDynamicSourceSelectValue({ value, sourceColumnName, targetColumnName, options }) {
+    setDynamicSourceSelectValue({ value, sourceColumnName, targetColumnName, options, valueAttribute }) {
       if (targetColumnName) {
         this.setCellValue(targetColumnName, value, 'input')
+        // 动态数据源选项集合存储，导出报告时子表字段值的导出时有使用
+        const gridParams = store.get(this.listCode)
+        if (!gridParams.dynamicSourceSelectOptions) {
+          gridParams.dynamicSourceSelectOptions = {}
+        }
+        gridParams.dynamicSourceSelectOptions[targetColumnName] = { options, valueAttribute }
       }
     },
     multiselectChange(arr) {

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

@@ -252,6 +252,7 @@ import headerContextMenu from './header-context-menu'
 import { addDynamicProp } from './utils'
 import { updateWithPageValue } from '../../../src/utils/jump-page-utils'
 import { getEntityFieldValueWithOutCase } from '../../../src/utils/util'
+import { isPromise } from '../../../src/utils/common-util'
 import { checkPermission } from '../../../src/utils/permission'
 import Vue from 'vue'
 export default {
@@ -2619,31 +2620,34 @@ export default {
         // 表示是表单的子表，点击时需要将当前行设为行编辑状态，并保存上一行的记录（不是保存到数据库，只是把编辑状态改为false）
         if (column.property &&
         column.property !== 'operation') {
-        // 取消上一行的编辑状态
-          let editRows
+          let canEdit = true
           const gridParams = store.get(this.code)
-          if (this.isSubTableShowPage) {
-            editRows = this.subTableData.filter(
-              row => row.$editing !== undefined && row.$editing === true
-            )
-          } else {
-            editRows = this.gridData.filter(
-              row => row.$editing !== undefined && row.$editing === true
-            )
+          if (isEditOptionFunction('beforeEdit', this.code)) {
+            const isSubTableShowPage = gridParams.isSubTableShowPage
+            // 每页显示多少条
+            const pageSize = gridParams.pagination && gridParams.pagination.pageSize
+            canEdit = gridParams.options.lineEditOptions.beforeEdit.call(this, {
+              gridData: isSubTableShowPage ? gridParams.subTableData : gridParams.gridData,
+              listCode: this.code,
+              entity: row,
+              columns: gridParams.columns,
+              isMobile: false,
+              pageGridData: isSubTableShowPage ? gridParams.gridData : null,
+              pageSize,
+              additionalParamMap: gridParams.additionalParamMap
+            })
           }
-          if (editRows && editRows.length > 0) {
-            editRows.forEach(editRow => {
-              setEntityFieldValue(editRow, '$editing', false)
-              // 取消上一行选中状态时，触发un-edit事件，处理下拉多选选项组问题
-              eventBus.$emit('un-edit', { row: editRow })
-              // this.$set(editRow, '$editing', false)
+          if (isPromise(canEdit)) {
+            canEdit.then((result) => {
+              if (result === undefined || result === true) {
+                this.rowDbClickEditRow(gridParams, row)
+              }
             })
+          } else {
+            if (canEdit === undefined || canEdit === true) {
+              this.rowDbClickEditRow(gridParams, row)
+            }
           }
-          gridParams.isEditRow = false
-          setEntityFieldValue(row, '$editing', true)
-          gridParams.$editRow = row
-          // this.$set(row, '$editing', true)
-          gridParams.isEditRow = true
         }
       } else {
         if (row) {
@@ -2662,6 +2666,32 @@ export default {
       }
       this.rowDblClick(row, column, event)
     },
+    rowDbClickEditRow(gridParams, row) {
+      // 取消上一行的编辑状态
+      let editRows
+      if (this.isSubTableShowPage) {
+        editRows = this.subTableData.filter(
+          row => row.$editing !== undefined && row.$editing === true
+        )
+      } else {
+        editRows = this.gridData.filter(
+          row => row.$editing !== undefined && row.$editing === true
+        )
+      }
+      if (editRows && editRows.length > 0) {
+        editRows.forEach(editRow => {
+          setEntityFieldValue(editRow, '$editing', false)
+          // 取消上一行选中状态时，触发un-edit事件，处理下拉多选选项组问题
+          eventBus.$emit('un-edit', { row: editRow })
+          // this.$set(editRow, '$editing', false)
+        })
+      }
+      gridParams.isEditRow = false
+      setEntityFieldValue(row, '$editing', true)
+      gridParams.$editRow = row
+      // this.$set(row, '$editing', true)
+      gridParams.isEditRow = true
+    },
     rowClickEvent(row, column, event) {
       // if (
       //   this.isFormSubTable &&