imatrix-ui 2.9.65-dw → 2.9.67-dw

package/package.json

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

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

@@ -697,14 +697,17 @@ gridParams.$rowIndex < gridParams.gridData.length) {
         canDelete = gridParams.options.lineEditOptions.beforeDelete.call(this, rowIndex, gridParams.gridData[rowIndex], gridData, isMobile, this.baseURL, isSubTableShowPage ? gridParams.gridData : null, pageSize, gridParams.additionalParamMap)
       }
       if (canDelete === undefined || canDelete === true) {
+        let row
         if (gridParams.isSubTableShowPage !== undefined && gridParams.isSubTableShowPage === true) {
           // 子表集合添加该新建的行。会触发watch subTableData的监控
           gridParams.isChangePage = true
           const lastPageRowIndex = (this.currentPage - 1) * this.pageSize
           const subTableRowIndex = lastPageRowIndex + rowIndex
+          row = gridParams.subTableData[subTableRowIndex]
 
           gridParams.subTableData.splice(subTableRowIndex, 1)
         } else {
+          row = gridParams.gridData[rowIndex]
           gridParams.gridData.splice(rowIndex, 1)
           gridParams.orgGridData.splice(rowIndex, 1)
         }
@@ -736,7 +739,8 @@ gridParams.$rowIndex < gridParams.gridData.length) {
             // 每页显示多少条
             const pageSize = gridParams.pagination && gridParams.pagination.pageSize
             const isMobile = false
-            gridParams.options.lineEditOptions.afterDelete.call(this, rowIndex, gridParams.gridData[rowIndex], isSubTableShowPage ? gridParams.subTableData : gridParams.gridData, isMobile, this.baseURL, isSubTableShowPage ? gridParams.gridData : null, pageSize, gridParams.additionalParamMap)
+            console.log('afterDelete-----row=', row, 'rowIndex=', rowIndex)
+            gridParams.options.lineEditOptions.afterDelete.call(this, rowIndex, row, isSubTableShowPage ? gridParams.subTableData : gridParams.gridData, isMobile, this.baseURL, isSubTableShowPage ? gridParams.gridData : null, pageSize, gridParams.additionalParamMap)
           }
         }
       }

package/src/utils/request.js

@@ -89,13 +89,23 @@ service.interceptors.response.use(
         if (Vue.prototype.forbiddenUser || Vue.prototype.forbiddenLinkUrl) {
           vnode = '<p><span>' + message + '</span>'
           // 请点击进行权限申请
-          const forbiddenExceptionLinkUrlMsg = getI18n().t('imatrixUIMessage.forbiddenExceptionLinkUrl')
+          let forbiddenExceptionLinkUrlMsg
           if (Vue.prototype.forbiddenLinkUrl) {
+            forbiddenExceptionLinkUrlMsg = Vue.prototype.forbiddenLinkMsg
+            if (!forbiddenExceptionLinkUrlMsg) {
+              forbiddenExceptionLinkUrlMsg = getI18n().t('imatrixUIMessage.forbiddenExceptionLinkUrl')
+            }
             vnode += ',<a href="#" style="color: #1800ff;font-weight: bold;text-decoration:underline" onclick="window.open(\'' + Vue.prototype.forbiddenLinkUrl + '\')">' + forbiddenExceptionLinkUrlMsg + '</a>'
+          } else if (Vue.prototype.forbiddenLinkMsg) {
+            forbiddenExceptionLinkUrlMsg = Vue.prototype.forbiddenLinkMsg
+            vnode += ',<a href="#" style="font-weight: bold;">' + forbiddenExceptionLinkUrlMsg + '</a>'
           }
           if (Vue.prototype.forbiddenUser) {
             // 如有疑问请联系
-            const forbiddenExceptionLinkUserMsg = getI18n().t('imatrixUIMessage.forbiddenExceptionLinkUser')
+            let forbiddenExceptionLinkUserMsg = Vue.prototype.forbiddenUserMsg
+            if (!forbiddenExceptionLinkUserMsg) {
+              forbiddenExceptionLinkUserMsg = getI18n().t('imatrixUIMessage.forbiddenExceptionLinkUser')
+            }
             vnode += '<span>'
             const forbiddenUserHtml = ',' + forbiddenExceptionLinkUserMsg + '<span style="color: #1800ff;"> ' + Vue.prototype.forbiddenUser + '</span>'
             let contactUrlHtml