imatrix-ui 2.8.28 → 2.8.29

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

@@ -169,10 +169,12 @@
               />
             </span>
             <span v-else :id="column.prop+'DomData'+scope.$index" class="cell--span">
-              <span v-if="$escapeHtml(getLabel(scope.row,scope.$index))">
-                <i class="el-icon-zoom-in annex-cell" @click="previewImg(scope.row)" />
-              </span>
-              {{ $escapeHtml(getLabel(scope.row,scope.$index)) }}
+              <FsPreview
+                :label="$escapeHtml(getLabel(scope.row,scope.$index))"
+                :entity="scope.row"
+                :file-set-obj=" JSON.parse(column.fileSet)"
+                :is-sql="isSql"
+              />
             </span>
           </span>
           <span v-else-if="column.formatter && column.formatter.type === 'files'">

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

@@ -727,9 +727,15 @@ export default {
         const that = this
         const isShowUserTreeDialog =
           document.querySelector('.user-tree') !== null
+        // 列表页面中是否有弹框，例如：按钮区点击一个按钮dialog弹框时，如果有弹框，则列表的回车事件不生效，否则会导致页面刷新
+        let isPageHasDialog = window.sessionStorage.getItem(this.pageCode + '-isShowPageDialog')
+        if (isPageHasDialog === undefined) {
+          isPageHasDialog = false
+        }
+        console.log('super-grid-----this.pageCode=', this.pageCode, 'isPageHasDialog=', isPageHasDialog)
         // 当前页面监视键盘输入
         document.querySelector('.' + this.code).onkeydown = function(e) {
-          if (!that.isShowPageDialog && !isShowUserTreeDialog) {
+          if (!that.isShowPageDialog && !isShowUserTreeDialog && !isPageHasDialog) {
             // 当前列表页面没有弹框或选人弹框，才走键盘监视事件
             // 事件对象兼容
             // eslint-disable-next-line no-caller
@@ -760,7 +766,10 @@ export default {
               }
             } else if (e1 && e1.keyCode === 13) {
               // 回车
-              that.enterOperation(that)
+              if (that.isCallEnterEvent(that)) {
+                // 不是子表时，才需要回车事件，子表时不处理回车事件，扫码枪回车事件和平台的回车事件冲突了。子表时用户一般不会主动回车取消行编辑。
+                that.enterOperation(that)
+              }
             } else if (e1 && e1.keyCode === 27) {
               // ESC
               that.escOperation(that)
@@ -792,6 +801,18 @@ export default {
     ...publicMethods,
     ...superGridService,
     ...apis,
+    // 是否触发回车事件
+    isCallEnterEvent(that) {
+      let canCall = true
+      if (this.options.isEnableEnterEvent !== undefined && this.options.isEnableEnterEvent === false) {
+        canCall = false
+      }
+      const gridParams = store.get(that.code)
+      if (gridParams.options && gridParams.options.isFormSubTable) {
+        canCall = false
+      }
+      return canCall
+    },
     isShowPageArea() {
       if (this.isFormSubTable) {
         return this.options.showPageArea !== undefined && this.options.showPageArea === true
@@ -2656,7 +2677,7 @@ export default {
     // api方法，super-pages中有调用该方法
     closePageDialog(popParams) {
       // popParams格式为：{ entity, pageCode }
-      console.log('列表组件--closePageDialog---this.jumpPageSetting=', this.jumpPageSetting )
+      console.log('列表组件--closePageDialog---this.jumpPageSetting=', this.jumpPageSetting)
       if (this.jumpPageSetting) {
         // 调用关闭弹框事件
         const gridParams = store.get(this.code)

package/packages/utils/memory-cache-utils.js

@@ -0,0 +1,90 @@
+import localStorage from '../../src/utils/local-storage'
+const memoryCacheUtils = {
+  memorySearch(queryString, cb) {
+    var memoryCacheData = this.memoryCacheData
+    var results = memoryCacheData
+    setTimeout(() => {
+      cb(results)
+    }, 10 * Math.random())
+  },
+  setMemoryCacheData(row, componentType) {
+    if (componentType === 'departmentUser') {
+      this.setDepartmentUserMemoryCacheData(row)
+    } else if (componentType === 'department') {
+      this.setDepartmentMemoryCacheData(row)
+    }
+  },
+  getMemoryCacheData(componentType) {
+    if (componentType === 'departmentUser') {
+      this.getDepartmentUserMemoryCacheData()
+    } else if (componentType === 'department') {
+      this.getDepartmentMemoryCacheData()
+    }
+  },
+  setDepartmentUserMemoryCacheData(selectUser) {
+    const cacheLength = 10
+    var memoryCacheData = localStorage.getObject(this.memoryCacheKey)
+    var name = (selectUser.name === undefined || selectUser.name === null || selectUser.name === 'undefined') ? '' : selectUser.name
+    var loginName = (selectUser.loginName === undefined || selectUser.loginName === null || selectUser.loginName === 'undefined') ? '' : selectUser.loginName
+    var mainDepartmentName = (selectUser.mainDepartmentName === undefined || selectUser.mainDepartmentName === null || selectUser.mainDepartmentName === 'undefined') ? '' : selectUser.mainDepartmentName
+    const valueKey = name + '(' + loginName + '/' + mainDepartmentName + ')'
+    var index = -1
+    if (memoryCacheData && memoryCacheData.length > 0) {
+      index = memoryCacheData.findIndex(item => item.loginName === selectUser.loginName)
+    } else {
+      memoryCacheData = []
+    }
+    selectUser['value'] = valueKey
+    if (index < 0) {
+      if (memoryCacheData.length === cacheLength) {
+        memoryCacheData.splice(cacheLength - 1, 1)
+      }
+      memoryCacheData.unshift(selectUser)
+      localStorage.setObject(this.memoryCacheKey, memoryCacheData)
+    } else {
+      // 最后选中优先排序
+      memoryCacheData.splice(index, 1)
+      memoryCacheData.unshift(selectUser)
+      localStorage.setObject(this.memoryCacheKey, memoryCacheData)
+    }
+  },
+  setDepartmentMemoryCacheData(selectDept) {
+    const cacheLength = 10
+    var memoryCacheData = localStorage.getObject(this.memoryCacheKey)
+    var name = (selectDept.name === undefined || selectDept.name === null || selectDept.name === 'undefined') ? '' : selectDept.name
+    var code = (selectDept.code === undefined || selectDept.code === null || selectDept.code === 'undefined') ? '' : selectDept.code
+    const valueKey = name + '(' + code + ')'
+    var index = -1
+    if (memoryCacheData && memoryCacheData.length > 0) {
+      index = memoryCacheData.findIndex(item => item.code === selectDept.code)
+    } else {
+      memoryCacheData = []
+    }
+    selectDept['value'] = valueKey
+    if (index < 0) {
+      if (memoryCacheData.length === cacheLength) {
+        memoryCacheData.splice(cacheLength - 1, 1)
+      }
+      memoryCacheData.unshift(selectDept)
+      localStorage.setObject(this.memoryCacheKey, memoryCacheData)
+    } else {
+      // 最后选中优先排序
+      memoryCacheData.splice(index, 1)
+      memoryCacheData.unshift(selectDept)
+      localStorage.setObject(this.memoryCacheKey, memoryCacheData)
+    }
+  },
+  getDepartmentUserMemoryCacheData() {
+    var memoryCacheData = localStorage.getObject(this.memoryCacheKey)
+    if (memoryCacheData && memoryCacheData.length > 0) {
+      this.memoryCacheData = memoryCacheData
+    }
+  },
+  getDepartmentMemoryCacheData() {
+    var memoryCacheData = localStorage.getObject(this.memoryCacheKey)
+    if (memoryCacheData && memoryCacheData.length > 0) {
+      this.memoryCacheData = memoryCacheData
+    }
+  }
+}
+export default memoryCacheUtils

package/src/utils/jump-page-utils.js

@@ -331,12 +331,14 @@ function packagePathParams(dataId, path, jumpPage, ids, buttonCode, isHasIdParam
     }
   }
   if (ids && ids.length > 0) {
+    const idsStr = ids.join(',')
+    const idsPath = 'ids=' + idsStr + '&_idsStr=' + idsStr
     if (path.indexOf('?') !== -1) {
       path += '&'
-      path += 'ids=' + ids.join(',')
+      path += idsPath
     } else {
       path += '?'
-      path += 'ids=' + ids.join(',')
+      path += idsPath
     }
   }
   if (buttonCode) {