imatrix-ui 2.9.14-dw → 2.9.15-dw

package/package.json

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

package/packages/department-tree-inline/src/department-multi-tree-inline.vue

@@ -7,11 +7,9 @@
             <el-autocomplete
               v-model="filterText"
               size="small"
-              select-when-unmatched
               class="inline-input inline-input-custom"
               :fetch-suggestions="querySearch"
               :placeholder="$t('departmentTreeInline.pleaseEnterDepartmentName')"
-              :trigger-on-focus="false"
               @keyup.enter.native="clickSearch"
               @select="handleSelect"
             >
@@ -74,6 +72,7 @@ import localStorage from '../../../src/utils/local-storage'
 import utils from '../../utils/utils'
 import departmentTreeService from './department-tree-service'
 import UserResult from './search-result.vue'
+import memoryCacheUtils from '../../utils/memory-cache-utils'
 export default {
   name: 'InlineDepartmentMultiTree',
   components: {
@@ -137,7 +136,10 @@ export default {
       tenantInfo: {}, // 公司根节点信息
       searchResult: [],
       selectResult: [],
-      isloading: false // 控制右侧选择区的loading状态
+      isloading: false, // 控制右侧选择区的loading状态
+      multiple: true,
+      memoryCacheKey: 'DEPARTMENT_MEMORY_KEY',
+      memoryCacheData: [] // 记忆选择数据, 搜索框获得焦点后，下拉显示最近选中的10个人，倒序排列，最后选中的在最上面显示。
     }
   },
   computed: {
@@ -171,10 +173,12 @@ export default {
     } else {
       this.restaurants = []
     }
+    this.getMemoryCacheData('department')
   },
   methods: {
     ...utils,
     ...departmentTreeService,
+    ...memoryCacheUtils,
     filterNode(value, data, node) {
       if (!value) {
         return true
@@ -290,7 +294,7 @@ export default {
           // 不存在该用户则放到结果集合中，去掉重复使用
           leafSelectNodeInfo.ids.push(userData.id)
           leafSelectNodeInfo.codes.push(userData.code)
-          if(userData.enName) {
+          if (userData.enName) {
             leafSelectNodeInfo.enNames.push(userData.enName)
           } else {
             leafSelectNodeInfo.enNames.push('')
@@ -300,7 +304,7 @@ export default {
           } else {
             leafSelectNodeInfo.departments.push(userData)
           }
-          let name = userData.showName
+          const name = userData.showName
           leafSelectNodeInfo.names.push(name)
           leafSelectNodeInfo.zhNames.push(userData.name)
         }
@@ -351,6 +355,8 @@ export default {
         dept.tenantCode = this.tenantInfo.code
         dept.tenantName = this.tenantInfo.tenantName
         this.selectResult.push(dept)
+        // 搜索选中记忆
+        this.setMemoryCacheData(dept, 'department')
       }
       // } else {
       //   this.alertByAllUser()

package/packages/department-tree-inline/src/department-single-tree-inline.vue

@@ -5,11 +5,9 @@
         <el-autocomplete
           v-model="filterText"
           size="small"
-          select-when-unmatched
           class="inline-input inline-input-custom"
           :fetch-suggestions="querySearch"
           :placeholder="$t('departmentTreeInline.pleaseEnterDepartmentName')"
-          :trigger-on-focus="false"
           @keyup.enter.native="clickSearch"
           @select="handleSelect"
         >
@@ -53,6 +51,7 @@
 import localStorage from '../../../src/utils/local-storage'
 import utils from '../../utils/utils'
 import departmentTreeService from './department-tree-service'
+import memoryCacheUtils from '../../utils/memory-cache-utils'
 import UserResult from './search-result.vue'
 export default {
   name: 'InlineDepartmentSingleTree',
@@ -111,7 +110,9 @@ export default {
       searchStoreKey: 'searchDepartment',
       selectNodeInfo: null, // 单选时，选择的部门信息
       tenantInfo: {}, // 公司根节点信息
-      searchResult: []
+      searchResult: [],
+      memoryCacheKey: 'DEPARTMENT_MEMORY_KEY',
+      memoryCacheData: [] // 记忆选择数据, 搜索框获得焦点后，下拉显示最近选中的10个人，倒序排列，最后选中的在最上面显示。
     }
   },
   computed: {
@@ -138,10 +139,12 @@ export default {
     } else {
       this.restaurants = []
     }
+    this.getMemoryCacheData('department')
   },
   methods: {
     ...utils,
     ...departmentTreeService,
+    ...memoryCacheUtils,
     filterNode(value, data, node) {
       if (!value) {
         return true
@@ -193,6 +196,7 @@ export default {
         // 点击的是部门节点，并且是单选树时，点击部门节点直接关闭弹框
         const department = JSON.parse(data.data)
         this.packageSelectResult(department)
+        this.setMemoryCacheData(department, 'department')
         // if (this.selectNodeInfo && isClickOkBtn === true) {
         // // 点击确定按钮时才需要调result回调事件，关闭弹框
         //   this.$emit('result', this.selectNodeInfo)
@@ -273,6 +277,8 @@ export default {
       // this.selectUser = selectUser
       // true参数表示是否是勾选单选框，是勾选单选框时不关闭弹框
       this.packageSelectResult(selectUser)
+      // 搜索选中记忆
+      this.setMemoryCacheData(selectUser, 'department')
     },
     resultRowDblclick(user) {
       this.packageSelectResult(user)

package/packages/department-tree-inline/src/department-tree-service.js

@@ -45,11 +45,38 @@ const departmentTreeService = {
     this.filterAppendNodes(value)
   },
   handleSelect(item) {
-    this.handleSelectUtil(item, localStorage)
+    // this.handleSelectUtil(item, localStorage)
+    // 查询最新部门信息替换,缓存为历史数据 数据库可能发生变化
+    this.$http.get(Vue.prototype.baseAPI + '/api/departments?departmentCode=' + item.code).then(departmentDTO => {
+      if (departmentDTO !== null) {
+        for (const dtoKey in departmentDTO) {
+          if (item.hasOwnProperty(dtoKey)) {
+            item[dtoKey] = departmentDTO[dtoKey]
+          }
+        }
+      }
+      this.filterText = ''
+      this.searchValue = ''
+      this.setMemoryCacheData(item, 'department')
+      if (this.multiple) {
+        const index = this.selectResult.findIndex(selectEntity => selectEntity.code === item.code)
+        if (index < 0) {
+          this.selectResult.push(item)
+        }
+      } else {
+        this.packageSelectResult(item)
+        // 关闭弹窗
+        this.$emit('result', this.selectNodeInfo)
+      }
+    })
   },
   querySearch(queryString, cb) {
-    this.search(this.filterText)
-    cb([])
+    if (!this.filterText && this.filterText.length === 0) {
+      this.memorySearch(queryString, cb)
+    } else {
+      this.search(this.filterText)
+      cb([])
+    }
   },
   // 点击查询按钮调用的方法
   clickSearch() {
@@ -86,6 +113,7 @@ const departmentTreeService = {
         // 表示当前选中的节点是部门
         const department = JSON.parse(data.data)
         this.selectUser(null, department)
+        this.isloading = false
       }
       if (data.childDepartments) {
         // 如果已展开，不需要再走后台获得其子节点。只需要选中已有子节点
@@ -99,7 +127,7 @@ const departmentTreeService = {
         if (!data.leaf) {
           // 不是叶子节点，并且没有加载过该父节点的子节点时，需要走后台展开子节点
           this.$http.get(Vue.prototype.baseAPI + '/component/organization-trees/departments/' + data.id).then(result => {
-          // 更新当前点击的节点的子节点
+            // 更新当前点击的节点的子节点
             this.$refs.deparmentTree.updateKeyChildren(data.id, result)
             // 展开当前选中的节点
             this.$refs.deparmentTree.store.nodesMap[data.id].expanded = true

package/packages/department-user-tree-inline/src/department-user-multiple-tree-inline.vue

@@ -8,10 +8,8 @@
               v-model="filterText"
               :fetch-suggestions="querySearch"
               :placeholder="$t('departmentUserTree.pleaseEnterUserInformation')"
-              :trigger-on-focus="false"
               size="small"
-              select-when-unmatched
-              class="inline-input inline-input-custom"
+              class="inline-input inline-input-custom searchDepartmentUser"
               @keyup.enter.native="clickSearch"
               @select="handleSelect"
             >
@@ -35,7 +33,7 @@
               <!-- @node-click="handleNodeClick" 移除节点点击，不然会造成节点不可选择时，点击也会选择节点 -->
             </div>
 
-            <div v-if="searchValue && searchValue.length > 0" style="height:100%;overflow: hidden;">
+            <div v-if="searchValue && searchValue.length > 0 || selectResult.length > 0" style="height:100%;overflow: hidden;">
               <user-result :grid-data="searchResult" :select-result="selectResult" :height="height" :contain-branch="containBranch" :multiple="true" :is-search-result="true" @addUser="selectUser" />
             </div>
           </el-main>
@@ -68,12 +66,16 @@
 .inline-input-custom {
   width : 98%
 }
+.searchDepartmentUser {
+  width: 250px
+}
 </style>
 <script>
 import localStorage from '../../../src/utils/local-storage'
 import UserResult from './search-result'
 import utils from '../../utils/utils'
 import departmentUserTreeMultiService from './department-user-tree-multi-service'
+import memoryCacheUtils from '../../utils/memory-cache-utils'
 
 export default {
   name: 'InlineDepartmentUserMultiTree',
@@ -138,7 +140,9 @@ export default {
       searchResult: [], // 用户的查询结果
       selectResult: [], // 已选用户结果
       searchStoreKey: 'searchDepartmentUser',
-      tenantInfo: {} // 公司根节点信息
+      tenantInfo: {}, // 公司根节点信息
+      memoryCacheKey: 'DEPARTMENT_USER_MEMORY_KEY',
+      memoryCacheData: [] // 记忆选择数据, 搜索框获得焦点后，下拉显示最近选中的10个人，倒序排列，最后选中的在最上面显示。
     }
   },
   computed: {
@@ -172,10 +176,12 @@ export default {
     } else {
       this.restaurants = []
     }
+    this.getMemoryCacheData('departmentUser')
   },
   methods: {
     ...utils,
     ...departmentUserTreeMultiService,
+    ...memoryCacheUtils,
     // 将查询结果中指定用户添加到已选择用户集合中
     selectUser(index, user) {
       if (!this.isContainAllUser()) {
@@ -186,6 +192,8 @@ export default {
           user.tenantCode = this.tenantInfo.code
           user.tenantName = this.tenantInfo.tenantName
           this.selectResult.push(user)
+          // 搜索选中记忆
+          this.setMemoryCacheData(user, 'departmentUser')
         }
       } else {
         this.alertByAllUser()
@@ -228,9 +236,9 @@ export default {
         return (userId === queryUser.id + '')
       }
     },
-    handleSelect(item) {
-      this.handleSelectUtil(item, localStorage)
-    },
+    // handleSelect(item) {
+    //   this.handleSelectUtil(item, localStorage)
+    // },
     search(value) {
       this.searchValue = value
       let mySearchValue = value
@@ -258,6 +266,8 @@ export default {
           const selectUser = this.packageSelectUser(user)
           if (selectUser) {
             this.selectResult.push(selectUser)
+            // 搜索选中记忆
+            this.setMemoryCacheData(user, 'departmentUser')
           }
         }
       }

package/packages/department-user-tree-inline/src/department-user-single-tree-inline.vue

@@ -6,21 +6,11 @@
           v-model="filterText"
           :fetch-suggestions="querySearch"
           :placeholder="$t('departmentUserTree.pleaseEnterUserInformation')"
-          :trigger-on-focus="false"
           size="small"
-          select-when-unmatched
-          class="inline-input"
+          class="inline-input searchDepartmentUser"
           @keyup.enter.native="clickSearch"
           @select="handleSelect"
         >
-          <!-- <el-select slot="prepend" v-model="searchField" class="inline-select-custom">
-            <el-option
-              v-for="item in searchFields"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select> -->
           <el-button slot="append" icon="el-icon-search" @click="clickSearch" />
         </el-autocomplete>
       </el-header>
@@ -53,12 +43,16 @@
 .inline-input-custom {
   width : 98%
 }
+.searchDepartmentUser {
+  width: 250px
+}
 </style>
 <script>
 import localStorage from '../../../src/utils/local-storage'
 import UserResult from './search-result'
 import utils from '../../utils/utils'
 import departmentUserTreeSingleService from './department-user-tree-single-service'
+import memoryCacheUtils from '../../utils/memory-cache-utils'
 export default {
   name: 'InlineDepartmentUserSingleTree',
   components: {
@@ -109,7 +103,9 @@ export default {
       selectUser: null, // 选择的用户原信息
       selectNodeInfo: null, // 封装后的用户信息，即用户结果
       notMultipleClickNum: null, // 节点没有双击事件，手动实现双击事件，参数用来记录次数
-      notMultipleClickNode: null // 节点没有双击事件，手动实现双击事件，参数用来记录节点
+      notMultipleClickNode: null, // 节点没有双击事件，手动实现双击事件，参数用来记录节点
+      memoryCacheKey: 'DEPARTMENT_USER_MEMORY_KEY',
+      memoryCacheData: [] // 记忆选择数据, 搜索框获得焦点后，下拉显示最近选中的10个人，倒序排列，最后选中的在最上面显示。
     }
   },
   computed: {
@@ -139,10 +135,12 @@ export default {
     } else {
       this.restaurants = []
     }
+    this.getMemoryCacheData('departmentUser')
   },
   methods: {
     ...utils,
     ...departmentUserTreeSingleService,
+    ...memoryCacheUtils,
     // selectUser(row, column, event) {
     //   this.packageSelectResult(row)
     // },
@@ -151,6 +149,8 @@ export default {
         const user = JSON.parse(data.data)
         user.tenantName = this.tenantInfo.tenantName
         user.tenantCode = this.tenantInfo.code
+        // 搜索选中记忆
+        this.setMemoryCacheData(user, 'departmentUser')
         // 点击的是用户节点，并且是单选树时，点击部门节点直接关闭弹框
         this.packageSelectResult(user)
         if (this.notMultipleClickNode && this.notMultipleClickNode.id === node.id) {
@@ -257,6 +257,8 @@ export default {
     getSelectUser(selectUser) {
       // console.log('getSelectUser==', selectUser)
       this.selectUser = selectUser
+      // 搜索选中记忆
+      this.setMemoryCacheData(selectUser, 'departmentUser')
       // true参数表示是否是勾选单选框，是勾选单选框时不关闭弹框
       this.packageSelectResult(selectUser)
     },

package/packages/department-user-tree-inline/src/department-user-tree-multi-service.js

@@ -1,6 +1,6 @@
 import Vue from 'vue'
-import { getI18n } from '../../../src/utils/util'
 import localStorage from '../../../src/utils/local-storage'
+import { getI18n } from '../../../src/utils/util'
 const departmentUserTreeMultiService = {
   // 后台查询部门，并拼接树节点
   filterAppendNodes(value) {
@@ -29,11 +29,29 @@ const departmentUserTreeMultiService = {
     })
   },
   querySearch(queryString, cb) {
-    this.search(this.filterText)
-    cb([])
+    if (!this.filterText && this.filterText.length === 0) {
+      this.memorySearch(queryString, cb)
+    } else {
+      this.search(this.filterText)
+      cb([])
+    }
   },
   handleSelect(item) {
-    this.handleSelectUtil(item, localStorage)
+    // this.handleSelectUtil(item, localStorage)
+    // 查询最新用户信息替换,缓存为历史数据 数据库可能发生变化
+    this.$http.get(Vue.prototype.baseAPI + '/api/users?loginName=' + item.loginName).then(userDTO => {
+      if (userDTO !== null) {
+        for (const dtoKey in userDTO) {
+          if (item.hasOwnProperty(dtoKey)) {
+            item[dtoKey] = userDTO[dtoKey]
+          }
+        }
+      }
+      this.filterText = ''
+      this.searchValue = ''
+      this.selectUser(-1, item)
+      this.setMemoryCacheData(item, 'departmentUser')
+    })
   },
   search(value) {
     this.searchValue = value
@@ -83,7 +101,7 @@ const departmentUserTreeMultiService = {
         this.checkedChildrenUserNodes(node.data, node.data.children)
       }
     } else {
-    // 表示没有加载过该父节点的子节点集合时
+      // 表示没有加载过该父节点的子节点集合时
       const param = {
         parentId: parentId,
         needVirtualUser: this.isNeedVirtualUser
@@ -96,15 +114,15 @@ const departmentUserTreeMultiService = {
         // 更新当前点击的节点的子节点，必须加该方法，否则会导致子节点无法选中
         this.$refs.deparmentUserTree.updateKeyChildren(parentNodeId, data)
         if (parentId === 0) {
-        // 初始化树时，展开公司节点
+          // 初始化树时，展开公司节点
           const tenantData = data[0].data
           this.tenantInfo = JSON.parse(tenantData)
           this.containBranch = data[0].containBranch
           if (this.departmentInfo && this.departmentInfo.length > 0) {
-          // 加载指定部门时，展开公司节点
+            // 加载指定部门时，展开公司节点
             this.loadPointDepartments()
           } else {
-          // 加载整个组织结构树时，展开公司节点
+            // 加载整个组织结构树时，展开公司节点
             this.loadDepartment(this.tenantNodeId, this.tenantNodeId + '')
           }
         }

package/packages/department-user-tree-inline/src/department-user-tree-single-service.js

@@ -1,6 +1,6 @@
 import Vue from 'vue'
-import { getI18n } from '../../../src/utils/util'
 import localStorage from '../../../src/utils/local-storage'
+import { getI18n } from '../../../src/utils/util'
 const departmentUserTreeSingleService = {
   // 后台查询部门，并拼接树节点
   filterAppendNodes(value) {
@@ -30,11 +30,31 @@ const departmentUserTreeSingleService = {
     })
   },
   querySearch(queryString, cb) {
-    this.search(this.filterText)
-    cb([])
+    if (!this.filterText && this.filterText.length === 0) {
+      this.memorySearch(queryString, cb)
+    } else {
+      this.search(this.filterText)
+      cb([])
+    }
   },
   handleSelect(item) {
-    this.handleSelectUtil(item, localStorage)
+    // this.handleSelectUtil(item, localStorage)
+    // 查询最新用户信息替换,缓存为历史数据 数据库可能发生变化
+    this.$http.get(Vue.prototype.baseAPI + '/api/users?loginName=' + item.loginName).then(userDTO => {
+      if (userDTO !== null) {
+        for (const dtoKey in userDTO) {
+          if (item.hasOwnProperty(dtoKey)) {
+            item[dtoKey] = userDTO[dtoKey]
+          }
+        }
+      }
+      this.filterText = ''
+      this.searchValue = ''
+      this.packageSelectResult(item)
+      this.setMemoryCacheData(item, 'departmentUser')
+      // 关闭弹窗
+      this.$emit('result', this.selectNodeInfo)
+    })
   },
   search(value) {
     this.searchValue = value
@@ -70,7 +90,7 @@ const departmentUserTreeSingleService = {
         this.checkedChildrenUserNodes(node.data, node.data.children)
       }
     } else {
-    // 表示没有加载过该父节点的子节点集合时
+      // 表示没有加载过该父节点的子节点集合时
       const param = {
         parentId: parentId,
         needVirtualUser: this.isNeedVirtualUser
@@ -83,15 +103,15 @@ const departmentUserTreeSingleService = {
         // 更新当前点击的节点的子节点，必须加该方法，否则会导致子节点无法选中
         this.$refs.deparmentUserTree.updateKeyChildren(parentNodeId, data)
         if (parentId === 0) {
-        // 初始化树时，展开公司节点
+          // 初始化树时，展开公司节点
           const tenantData = data[0].data
           this.tenantInfo = JSON.parse(tenantData)
           this.containBranch = data[0].containBranch
           if (this.departmentInfo && this.departmentInfo.length > 0) {
-          // 加载指定部门时，展开公司节点
+            // 加载指定部门时，展开公司节点
             this.loadPointDepartments(this)
           } else {
-          // 加载整个组织结构树时，展开公司节点
+            // 加载整个组织结构树时，展开公司节点
             this.loadDepartment(this.tenantNodeId, this.tenantNodeId + '')
           }
         }

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

@@ -15,6 +15,7 @@ import {
   getPropValue
 } from '../../../src/utils/util'
 import eventBus from './eventBus'
+import { isPromise } from '../../../src/utils/common-util'
 const apis = {
   // 刷新列表数据
   refresh(parentRowIds, isLineEdit, toolbarFieldParam, isDeleteSubTableData) {
@@ -356,29 +357,40 @@ const apis = {
           pageSize
         })
       }
-      if (canEdit === undefined || canEdit === true) {
-        // 取消上一行的编辑状态
-        if (typeof (gridParams.$rowIndex) !== 'undefined' && gridParams.$rowIndex !== null &&
-          gridParams.$rowIndex < gridParams.gridData.length) {
-          const lastEditRow = gridParams.gridData[gridParams.$rowIndex]
-          setEntityFieldValue(lastEditRow, '$editing', false)
-          // Vue.set(lastEditRow, '$editing', false)
-          gridParams.isEditRow = false
-        }
-        // 使指定行变为编辑状态
-        const row = gridParams.gridData[rowIndex]
-        setEntityFieldValue(row, '$editing', true)
-        // Vue.set(row, '$editing', true)
-        gridParams.$lastSaveRowIndex = null
-        gridParams.$rowIndex = rowIndex
-        gridParams.isEditRow = true
-        // 使指定行变为编辑状态，触发获得焦点
-        if (gridParams.lineEdit.editingCell) {
-          gridParams.lineEdit.editingCell.row = rowIndex
+      if (isPromise(canEdit)) {
+        canEdit.then((result) => {
+          if (result === undefined || result === true) {
+            this.doEditRow(gridParams, rowIndex)
+          }
+        })
+      } else {
+        if (canEdit === undefined || canEdit === true) {
+          this.doEditRow(gridParams, rowIndex)
         }
       }
     }
   },
+  doEditRow(gridParams, rowIndex) {
+    // 取消上一行的编辑状态
+    if (typeof (gridParams.$rowIndex) !== 'undefined' && gridParams.$rowIndex !== null &&
+gridParams.$rowIndex < gridParams.gridData.length) {
+      const lastEditRow = gridParams.gridData[gridParams.$rowIndex]
+      setEntityFieldValue(lastEditRow, '$editing', false)
+      // Vue.set(lastEditRow, '$editing', false)
+      gridParams.isEditRow = false
+    }
+    // 使指定行变为编辑状态
+    const row = gridParams.gridData[rowIndex]
+    setEntityFieldValue(row, '$editing', true)
+    // Vue.set(row, '$editing', true)
+    gridParams.$lastSaveRowIndex = null
+    gridParams.$rowIndex = rowIndex
+    gridParams.isEditRow = true
+    // 使指定行变为编辑状态，触发获得焦点
+    if (gridParams.lineEdit.editingCell) {
+      gridParams.lineEdit.editingCell.row = rowIndex
+    }
+  },
   saveRow(rowIndex, listCode) {
     return new Promise((resolve, reject) => {
       const vm = this

package/packages/super-grid/src/custom-formatter.js

@@ -10,6 +10,7 @@ import {
 import {
   analysisFileSetObj, otherFilesToStandard
 } from './utils'
+import { isPromise } from '../../../src/utils/common-util'
 const customFormatter = {
   /**
    * 自定义格式化值
@@ -225,26 +226,53 @@ const customFormatter = {
     }
     if (jumpPageJson && jumpPageJson !== '') {
       // 解析是否需要显示该超链接
+      let canClick = true
       const gridParams = store.get(listCode)
-      let parentFormData = null
-      if (gridParams.options.extraParam && gridParams.options.extraParam.entityMap) {
-        parentFormData = gridParams.options.extraParam.entityMap
-      }
-      console.log('ridParams.options.extraParam.entityMap', gridParams.options.extraParam)
-      jumpToPage(JSON.parse(jumpPageJson), gridParams.system, row.id ? row.id : row.ID, row, gridParams.additionalParamMap, null, null, parentFormData).then((openPageParams) => {
-        console.log('clickHyperLink--openPageParams===', openPageParams)
-        if (openPageParams) {
-          // 点击列表组件中某元素弹出的页面
-          openPageParams._position = 'list'
-          openPageParams._listCode = listCode
-          openPageParams._rowIndex = rowIndex
-          // 行编辑的记录
-          openPageParams.row = row
-          // 通知父页面弹出页面
-          this.$emit('open-page', openPageParams)
+      const jumpPageSetting = JSON.parse(jumpPageJson)
+      console.log('gupre-grid---clickHyperLink--jumpPageSetting=', jumpPageSetting)
+      if (jumpPageSetting.beforeClick) {
+        const funName = jumpPageSetting.beforeClick
+        console.log('gupre-grid---clickHyperLink--jumpPageSetting.beforeClick=', funName)
+        console.log('gupre-grid---clickHyperLink--gridParams.options[eventCallBack]=', gridParams.options['eventCallBack'])
+        if (gridParams.options && gridParams.options['eventCallBack'] &&
+          gridParams.options['eventCallBack'][funName] && typeof (gridParams.options['eventCallBack'][funName]) === 'function') {
+          const param = {
+            row: row,
+            column: column,
+            rowIndex: rowIndex,
+            listCode
+          }
+          canClick = gridParams.options['eventCallBack'][funName].call(this, param)
         }
-      })
+      }
+      if (isPromise(canClick)) {
+        canClick.then((result) => {
+          this.doClickHyperLink(row, listCode, rowIndex, jumpPageSetting, gridParams)
+        })
+      } else {
+        this.doClickHyperLink(row, listCode, rowIndex, jumpPageSetting, gridParams)
+      }
+    }
+  },
+  doClickHyperLink(row, listCode, rowIndex, jumpPageSetting, gridParams) {
+    let parentFormData = null
+    if (gridParams.options.extraParam && gridParams.options.extraParam.entityMap) {
+      parentFormData = gridParams.options.extraParam.entityMap
     }
+    console.log('ridParams.options.extraParam.entityMap', gridParams.options.extraParam)
+    jumpToPage(jumpPageSetting, gridParams.system, row.id ? row.id : row.ID, row, gridParams.additionalParamMap, null, null, parentFormData).then((openPageParams) => {
+      console.log('clickHyperLink--openPageParams===', openPageParams)
+      if (openPageParams) {
+      // 点击列表组件中某元素弹出的页面
+        openPageParams._position = 'list'
+        openPageParams._listCode = listCode
+        openPageParams._rowIndex = rowIndex
+        // 行编辑的记录
+        openPageParams.row = row
+        // 通知父页面弹出页面
+        this.$emit('open-page', openPageParams)
+      }
+    })
   }
 }
 export default customFormatter

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

@@ -351,7 +351,7 @@
       :models="row"
       :check-strictly="isCheckStrictly"
       :multiple="isMultiTree"
-      :tree-type="deptManTree?'DeptUserTree':deptTree?'DeptTree':wgManTree?'WgTree':wgTree?'WgUserTree':null"
+      :tree-type="deptManTree?'DeptUserTree':deptTree?'DeptTree':wgManTree?'WgUserTree':wgTree?'WgTree':null"
       :disabled="disabled"
       :table-name="tableName"
       :department-info="departmentInfo"