agilebuilder-ui 1.1.12 → 1.1.13-tmp2

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

@@ -15,8 +15,8 @@ import {
   getEntityFieldValue,
   getI18n,
   setEntityFieldValue,
-	getPropValue,
-	getPropValueNew
+  getPropValue,
+  getPropValueNew
 } from '../../../src/utils/util'
 import eventBus from './eventBus'
 import { isPromise } from '../../../src/utils/common-util'
@@ -156,33 +156,32 @@ const apis = {
           // 每页显示多少条
           const pageSize = gridParams.pagination && gridParams.pagination.pageSize
           const isMobile = this.isMobile
-          if(gridParams.pageContext){
-          canCreate = gridParams.options.lineEditOptions.beforeInsertRow.call(
-            this,{gridData:isSubTableShowPage ? gridParams.subTableData : gridParams.gridData,
-              rowIndex:gridParams.$rowIndex,
+          if (gridParams.pageContext) {
+            canCreate = gridParams.options.lineEditOptions.beforeInsertRow.call(this, {
+              gridData: isSubTableShowPage ? gridParams.subTableData : gridParams.gridData,
+              rowIndex: gridParams.$rowIndex,
               isMobile,
-              baseURL:this.baseURL,
-              totalData:isSubTableShowPage ? gridParams.gridData : null,
+              baseURL: this.baseURL,
+              totalData: isSubTableShowPage ? gridParams.gridData : null,
               pageSize,
-              additionalParamMap:gridParams.additionalParamMap,
+              additionalParamMap: gridParams.additionalParamMap,
               row,
               pageContext: gridParams.pageContext,
-              configureObj: gridParams.configureObj}
-            
-          )
-            }else {
-              canCreate = gridParams.options.lineEditOptions.beforeInsertRow.call(
-                this,
-                isSubTableShowPage ? gridParams.subTableData : gridParams.gridData,
-                  gridParams.$rowIndex,
-                  isMobile,
-                  this.baseURL,
-                  isSubTableShowPage ? gridParams.gridData : null,
-                  pageSize,
-                  gridParams.additionalParamMap,
-                  row
-              )
-            }
+              configureObj: gridParams.configureObj
+            })
+          } else {
+            canCreate = gridParams.options.lineEditOptions.beforeInsertRow.call(
+              this,
+              isSubTableShowPage ? gridParams.subTableData : gridParams.gridData,
+              gridParams.$rowIndex,
+              isMobile,
+              this.baseURL,
+              isSubTableShowPage ? gridParams.gridData : null,
+              pageSize,
+              gridParams.additionalParamMap,
+              row
+            )
+          }
         }
         // console.log('创建行记录执行前判断', canCreate)
         // console.log('创建行记录gridParams.options.isFormSubTable=', gridParams.options.isFormSubTable)
@@ -191,16 +190,11 @@ const apis = {
             // 如果是表单子表模式，则不需要判断上一行是否是编辑状态
             // 取消上一行的编辑状态
             let myGridData = gridParams.gridData
-            if (
-              gridParams.isSubTableShowPage !== undefined &&
-              gridParams.isSubTableShowPage === true
-            ) {
+            if (gridParams.isSubTableShowPage !== undefined && gridParams.isSubTableShowPage === true) {
               // 子表集合
               myGridData = gridParams.subTableData
             }
-            const editRows = myGridData.filter(
-              (item) => item.$editing !== undefined && item.$editing === true
-            )
+            const editRows = myGridData.filter((item) => item.$editing !== undefined && item.$editing === true)
             if (editRows && editRows.length > 0) {
               editRows.forEach((editRow) => {
                 setEntityFieldValue(editRow, '$editing', false)
@@ -213,16 +207,15 @@ const apis = {
           } else {
             if (
               !isLastEditRowSave(listCode) ||
-              (typeof gridParams.isCreateRow !== 'undefined' &&
-                gridParams.isCreateRow === true)
+              (typeof gridParams.isCreateRow !== 'undefined' && gridParams.isCreateRow === true)
             ) {
               // 最后编辑的一行没有保存 或（说明刚刚新建的行还没有保存 或 撤销编辑），则提示
               window.$vueApp.config.globalProperties.$message({
                 showClose: true,
                 message: getI18n().t('superGrid.pleaseSaveLine', {
-                  row: gridParams.$rowIndex + 1,
+                  row: gridParams.$rowIndex + 1
                 }),
-                type: 'warning',
+                type: 'warning'
               })
               reject(new Error('please save line'))
               return
@@ -247,7 +240,7 @@ const apis = {
             gridParams.contextParameter,
             row,
             listCode,
-            options?options.getDefaultValueFunc: null
+            options ? options.getDefaultValueFunc : null
           )
 
           // console.log('创建行记录要添加的新行1', row)
@@ -258,17 +251,10 @@ const apis = {
           // console.log('创建行所属的list1', gridData)
           if (gridParams.options && gridParams.options.isFormSubTable) {
             // 表单的子表行编辑时显示是添加到最后面
-            if (
-              gridParams.isSubTableShowPage !== undefined &&
-              gridParams.isSubTableShowPage === true
-            ) {
+            if (gridParams.isSubTableShowPage !== undefined && gridParams.isSubTableShowPage === true) {
               // 子表集合添加该新建的行。会触发watch subTableData的监控
               gridParams.isChangePage = true
-              gridParams.subTableData.splice(
-                gridParams.subTableData.length,
-                0,
-                row
-              )
+              gridParams.subTableData.splice(gridParams.subTableData.length, 0, row)
             } else {
               // 子表不分页
               gridData.splice(gridData.length, 0, row)
@@ -304,42 +290,33 @@ const apis = {
           if (isEditOptionFunction('afterInsertRow', listCode)) {
             const isSubTableShowPage = gridParams.isSubTableShowPage
             // 每页显示多少条
-            const pageSize =
-              gridParams.pagination && gridParams.pagination.pageSize
+            const pageSize = gridParams.pagination && gridParams.pagination.pageSize
             const isMobile = this.isMobile
-            
-            if(gridParams.pageContext){
-              gridParams.options.lineEditOptions.afterInsertRow.call(
-                this,{
-                  gridData:isSubTableShowPage
-                    ? gridParams.subTableData
-                    : gridParams.gridData,
-                  rowIndex:gridParams.$rowIndex,
-                  isMobile,
-                  baseURL:this.baseURL,
-                  totalData:isSubTableShowPage ? gridParams.gridData : null,
-                  pageSize,
-                  additionalParamMap:gridParams.additionalParamMap,
+
+            if (gridParams.pageContext) {
+              gridParams.options.lineEditOptions.afterInsertRow.call(this, {
+                gridData: isSubTableShowPage ? gridParams.subTableData : gridParams.gridData,
+                rowIndex: gridParams.$rowIndex,
+                isMobile,
+                baseURL: this.baseURL,
+                totalData: isSubTableShowPage ? gridParams.gridData : null,
+                pageSize,
+                additionalParamMap: gridParams.additionalParamMap,
                 pageContext: gridParams.pageContext,
                 configureObj: gridParams.configureObj
-                }
-              )
-            } else { 
+              })
+            } else {
               gridParams.options.lineEditOptions.afterInsertRow.call(
-              this,
-                isSubTableShowPage
-                  ? gridParams.subTableData
-                  : gridParams.gridData,
+                this,
+                isSubTableShowPage ? gridParams.subTableData : gridParams.gridData,
                 gridParams.$rowIndex,
                 isMobile,
                 this.baseURL,
                 isSubTableShowPage ? gridParams.gridData : null,
                 pageSize,
                 gridParams.additionalParamMap
-            )
-
+              )
             }
-           
           }
 
           gridParams.isCreateRow = true
@@ -353,14 +330,7 @@ const apis = {
     })
   },
   // 获取一个新的对象，已经解析完默认值
-  getNewRow(
-    defaultValueColumns,
-    additionalParamMap,
-    contextParameter,
-    row,
-    listCode,
-    getDefaultValueFunc
-  ) {
+  getNewRow(defaultValueColumns, additionalParamMap, contextParameter, row, listCode, getDefaultValueFunc) {
     if (!row) {
       row = {}
     }
@@ -380,20 +350,13 @@ const apis = {
             if (
               col.defaultValue &&
               col.defaultValue !== '' &&
-              (propValue === undefined ||
-                propValue === '' ||
-                propValue === null)
+              (propValue === undefined || propValue === '' || propValue === null)
             ) {
               let value
-              if(gridParams.pageContext){
+              if (gridParams.pageContext) {
                 value = getPropValueNew(col.defaultValue, gridParams.pageContext)
               } else {
-                value = getPropValue(
-                  col.defaultValue,
-                  row,
-                  additionalParamMap,
-                  contextParameter
-                )
+                value = getPropValue(col.defaultValue, row, additionalParamMap, contextParameter)
               }
               setEntityFieldValue(row, col.prop, value)
             }
@@ -420,11 +383,11 @@ const apis = {
           const defaultValueSet = column.defaultValue
           let defaultValue = null
           //console.log('setColumnsDefaultValue111------getDefaultValueFunc--', getDefaultValueFunc, 'column=',column,'defaultValueSet=', defaultValueSet)
-          if(getDefaultValueFunc) {
+          if (getDefaultValueFunc) {
             //console.log('setColumnsDefaultValue22---getDefaultValueFunc222---')
             defaultValue = getDefaultValueFunc(gridParams.pageContext, defaultValueSet, null, null)
             //console.log('setColumnsDefaultValue33---defaultValue---', defaultValue)
-            if(defaultValue === undefined) {
+            if (defaultValue === undefined) {
               defaultValue = null
             }
           }
@@ -466,8 +429,7 @@ const apis = {
         // 不是当前编辑行时
         if (
           typeof gridParams.options.lineEditOptions.autoSave === 'undefined' ||
-          (isHasEditOption('autoSave', listCode) &&
-            gridParams.options.lineEditOptions.autoSave === true)
+          (isHasEditOption('autoSave', listCode) && gridParams.options.lineEditOptions.autoSave === true)
         ) {
           // 自动保存行数据
           if (!isSaveCallback) {
@@ -484,9 +446,9 @@ const apis = {
             window.$vueApp.config.globalProperties.$message({
               showClose: true,
               message: getI18n().t('superGrid.pleaseSaveLine', {
-                row: gridParams.$rowIndex + 1,
+                row: gridParams.$rowIndex + 1
               }),
-              type: 'warning',
+              type: 'warning'
             })
             return
           }
@@ -499,9 +461,7 @@ const apis = {
         // 每页显示多少条
         const pageSize = gridParams.pagination && gridParams.pagination.pageSize
         canEdit = gridParams.options.lineEditOptions.beforeEdit.call(this, {
-          gridData: isSubTableShowPage
-            ? gridParams.subTableData
-            : gridParams.gridData,
+          gridData: isSubTableShowPage ? gridParams.subTableData : gridParams.gridData,
           listCode: listCode,
           entity: gridParams.gridData[rowIndex],
           row: gridParams.gridData[rowIndex],
@@ -577,9 +537,9 @@ const apis = {
           window.$vueApp.config.globalProperties.$message({
             showClose: true,
             message: getI18n().t('superGrid.noNeedToSaveRow', {
-              row: rowIndex + 1,
+              row: rowIndex + 1
             }),
-            type: 'warning',
+            type: 'warning'
           })
           return
         }
@@ -589,9 +549,9 @@ const apis = {
           window.$vueApp.config.globalProperties.$message({
             showClose: true,
             message: getI18n().t('superGrid.pleaseSaveLine', {
-              row: gridParams.$rowIndex + 1,
+              row: gridParams.$rowIndex + 1
             }),
-            type: 'warning',
+            type: 'warning'
           })
           return
         }
@@ -606,7 +566,7 @@ const apis = {
           window.$vueApp.config.globalProperties.$message({
             showClose: true,
             message: getI18n().t('superGrid.pleaseSetURLToSaveRowInformation'),
-            type: 'warning',
+            type: 'warning'
           })
           return
         }
@@ -623,35 +583,27 @@ const apis = {
         }
         let validateResult = true
         if (needValidate === true) {
-          validateResult = formValidatorService.validator(
-            row,
-            listCode,
-            rowIndex
-          )
+          validateResult = formValidatorService.validator(row, listCode, rowIndex)
         }
         if (validateResult === true) {
           let canSave = true
           if (isEditOptionFunction('beforeSave', listCode)) {
-            if(gridParams.pageContext){
-              canSave = gridParams.options.lineEditOptions['beforeSave'].call(
-                this,{
-                  row,
-                  columns:gridParams.columns,
-                  additionalParamMap:gridParams.additionalParamMap,
-                  pageContext: gridParams.pageContext,
-                  configureObj: gridParams.configureObj
-  
-                }
-              )
+            if (gridParams.pageContext) {
+              canSave = gridParams.options.lineEditOptions['beforeSave'].call(this, {
+                row,
+                columns: gridParams.columns,
+                additionalParamMap: gridParams.additionalParamMap,
+                pageContext: gridParams.pageContext,
+                configureObj: gridParams.configureObj
+              })
             } else {
               canSave = gridParams.options.lineEditOptions['beforeSave'].call(
                 this,
-                  row,
-                  gridParams.columns,
-                  gridParams.additionalParamMap
+                row,
+                gridParams.columns,
+                gridParams.additionalParamMap
               )
             }
-            
           }
           if (canSave === undefined || canSave === true) {
             // 触发点击保存时的事件线，在 normal-column 监听处对字段控件是选项组的字段的值进行处理
@@ -660,79 +612,59 @@ const apis = {
             let saveRowRequest
             if (isEditOptionFunction('saveRow', listCode)) {
               // 表示保存方法，用户自己重写了
-              if(gridParams.pageContext){
-                saveRowRequest = gridParams.options.lineEditOptions[
-                  'saveRow'
-                ].call(
-                  this,{
-                    row,
-                    columns:gridParams.columns,
-                    dataTypeMap:gridParams.$dataTypeMap,
-                    dynamicColumnInfo:gridParams.dynamicColumnInfo,
-                    additionalParamMap,
-                    mainDefaultValueColumns:gridParams.mainDefaultValueColumns,
-                    pageContext: gridParams.pageContext,
-                    configureObj: gridParams.configureObj
-                  }
-                )
+              if (gridParams.pageContext) {
+                saveRowRequest = gridParams.options.lineEditOptions['saveRow'].call(this, {
+                  row,
+                  columns: gridParams.columns,
+                  dataTypeMap: gridParams.$dataTypeMap,
+                  dynamicColumnInfo: gridParams.dynamicColumnInfo,
+                  additionalParamMap,
+                  mainDefaultValueColumns: gridParams.mainDefaultValueColumns,
+                  pageContext: gridParams.pageContext,
+                  configureObj: gridParams.configureObj
+                })
               } else {
                 // 兼容历史数据
-                saveRowRequest = gridParams.options.lineEditOptions[
-                  'saveRow'
-                ].call(
+                saveRowRequest = gridParams.options.lineEditOptions['saveRow'].call(
                   this,
-                    row,
-                    gridParams.columns,
-                    gridParams.$dataTypeMap,
-                    gridParams.dynamicColumnInfo,
-                    additionalParamMap,
-                    gridParams.mainDefaultValueColumns
+                  row,
+                  gridParams.columns,
+                  gridParams.$dataTypeMap,
+                  gridParams.dynamicColumnInfo,
+                  additionalParamMap,
+                  gridParams.mainDefaultValueColumns
                 )
               }
-              
             }
-            if (
-              !saveRowRequest &&
-              gridParams.lineEdit &&
-              gridParams.lineEdit.urlToSaveRow
-            ) {
+            if (!saveRowRequest && gridParams.lineEdit && gridParams.lineEdit.urlToSaveRow) {
               // 使用默认的保存实现
               let urlToSaveRow = gridParams.lineEdit.urlToSaveRow
               if (isHasEditOption('urlToSaveRow', listCode)) {
                 // 表示手动配置了保存行记录的url
-                urlToSaveRow =
-                  gridParams.options.lineEditOptions['urlToSaveRow']
+                urlToSaveRow = gridParams.options.lineEditOptions['urlToSaveRow']
               }
-              saveRowRequest =
-                window.$vueApp.config.globalProperties.$http.post(
-                  window.$vueApp.config.globalProperties.baseURL + urlToSaveRow,
-                  row
-                )
+              saveRowRequest = window.$vueApp.config.globalProperties.$http.post(
+                window.$vueApp.config.globalProperties.baseURL + urlToSaveRow,
+                row
+              )
             }
-            if (
-              gridParams.isHasDynamic !== undefined &&
-              gridParams.isHasDynamic === true &&
-              !saveRowRequest
-            ) {
+            if (gridParams.isHasDynamic !== undefined && gridParams.isHasDynamic === true && !saveRowRequest) {
               // 表示有动态列，保存时使用平台封装好的请求
               const urlToSaveRow = '/common/dynamic-values'
               const dynamicValueDTO = {
                 mainTableName:
-                  gridParams.basicInfo && gridParams.basicInfo.tableName
-                    ? gridParams.basicInfo.tableName
-                    : '',
+                  gridParams.basicInfo && gridParams.basicInfo.tableName ? gridParams.basicInfo.tableName : '',
                 row: row,
                 dynamicColumnInfo: gridParams.dynamicColumnInfo,
                 additionalParamMap: additionalParamMap,
                 dataTypeMap: gridParams.$dataTypeMap,
                 dynamicServiceName: gridParams.dynamicServiceName,
-                mainDefaultValueColumns: gridParams.mainDefaultValueColumns,
+                mainDefaultValueColumns: gridParams.mainDefaultValueColumns
               }
-              saveRowRequest =
-                window.$vueApp.config.globalProperties.$http.post(
-                  window.$vueApp.config.globalProperties.baseURL + urlToSaveRow,
-                  dynamicValueDTO
-                )
+              saveRowRequest = window.$vueApp.config.globalProperties.$http.post(
+                window.$vueApp.config.globalProperties.baseURL + urlToSaveRow,
+                dynamicValueDTO
+              )
             }
             if (saveRowRequest) {
               saveRowRequest
@@ -748,13 +680,7 @@ const apis = {
                 .catch((error) => {
                   gridParams.canSaveRow = true
                   if (isEditOptionFunction('saveError', listCode)) {
-                    gridParams.options.lineEditOptions['saveError'].call(
-                      this,
-                      row,
-                      gridParams.columns,
-                      rowIndex,
-                      error
-                    )
+                    gridParams.options.lineEditOptions['saveError'].call(this, row, gridParams.columns, rowIndex, error)
                   }
                   reject(error)
                 })
@@ -764,11 +690,7 @@ const apis = {
             }
           } else {
             gridParams.canSaveRow = true
-            reject(
-              getI18n().t(
-                'superGrid.theReturnValueOfTheBeforesaveCallbackMethodIsFalse'
-              )
-            )
+            reject(getI18n().t('superGrid.theReturnValueOfTheBeforesaveCallbackMethodIsFalse'))
           }
         } else {
           gridParams.canSaveRow = true
@@ -788,16 +710,14 @@ const apis = {
       window.$vueApp.config.globalProperties.$message({
         showClose: true,
         message: getI18n().t('superGrid.lineSavedSuccessfully', {
-          row: rowIndex + 1,
+          row: rowIndex + 1
         }),
-        type: 'success',
+        type: 'success'
       })
       if (
-        typeof gridParams.options.lineEditOptions.aftersaveIsCancelEditState ===
-          'undefined' ||
+        typeof gridParams.options.lineEditOptions.aftersaveIsCancelEditState === 'undefined' ||
         (isHasEditOption('aftersaveIsCancelEditState', listCode) &&
-          gridParams.options.lineEditOptions.aftersaveIsCancelEditState ===
-            true)
+          gridParams.options.lineEditOptions.aftersaveIsCancelEditState === true)
       ) {
         // 取消编辑状态
         setEntityFieldValue(row, '$editing', false)
@@ -806,18 +726,16 @@ const apis = {
       }
 
       if (isEditOptionFunction('saveSuccess', listCode)) {
-        if(gridParams.pageContext) {
-          gridParams.options.lineEditOptions['saveSuccess'].call(
-            this,{data,
-              columns:gridParams.columns,
-              rowIndex,
-              row,
-              additionalParamMap:gridParams.additionalParamMap,
-              pageContext: gridParams.pageContext,
-              configureObj: gridParams.configureObj
-            }
-          )
-          
+        if (gridParams.pageContext) {
+          gridParams.options.lineEditOptions['saveSuccess'].call(this, {
+            data,
+            columns: gridParams.columns,
+            rowIndex,
+            row,
+            additionalParamMap: gridParams.additionalParamMap,
+            pageContext: gridParams.pageContext,
+            configureObj: gridParams.configureObj
+          })
         } else {
           gridParams.options.lineEditOptions['saveSuccess'].call(
             this,
@@ -844,15 +762,14 @@ const apis = {
       this.refresh(false, true)
         .then(() => {
           if (
-            typeof gridParams.options.lineEditOptions.aftersaveIsCreateRow ===
-              'undefined' ||
+            typeof gridParams.options.lineEditOptions.aftersaveIsCreateRow === 'undefined' ||
             gridParams.options.lineEditOptions.aftersaveIsCreateRow
           ) {
             this.createRow(listCode)
           }
           resolve({
             rowIndex,
-            listCode,
+            listCode
           })
         })
         .catch((error) => reject(error))
@@ -875,18 +792,14 @@ const apis = {
     const gridParams = store.get(listCode)
     // console.log('restoreCurrentRow-gridParams.$rowIndex,rowIndex', gridParams.$rowIndex, rowIndex)
     if (gridParams.lineEdit && gridParams.lineEdit.editable) {
-      if (
-        gridParams.$rowIndex !== null &&
-        gridParams.$rowIndex !== rowIndex &&
-        !isLastEditRowSave(listCode)
-      ) {
+      if (gridParams.$rowIndex !== null && gridParams.$rowIndex !== rowIndex && !isLastEditRowSave(listCode)) {
         // 最后编辑的一行没有保存，则提示
         window.$vueApp.config.globalProperties.$message({
           showClose: true,
           message: getI18n().t('superGrid.pleaseSaveLine', {
-            row: gridParams.$rowIndex + 1,
+            row: gridParams.$rowIndex + 1
           }),
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
@@ -902,22 +815,19 @@ const apis = {
         // 每页显示多少条
         const pageSize = gridParams.pagination && gridParams.pagination.pageSize
         const isMobile = this.isMobile
-        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,
-            pageContext: gridParams.pageContext,
-            configureObj: gridParams.configureObj
-          })
+        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,
+          pageContext: gridParams.pageContext,
+          configureObj: gridParams.configureObj
+        })
       }
       if (isValidate === undefined || isValidate === true) {
         // 例如：自定义验证成功，再继续平台的验证
@@ -927,9 +837,9 @@ const apis = {
           window.$vueApp.config.globalProperties.$message({
             showClose: true,
             message: getI18n().t('superGrid.lineNoNeedToUndoEdit', {
-              row: rowIndex + 1,
+              row: rowIndex + 1
             }),
-            type: 'warning',
+            type: 'warning'
           })
           return
         }
@@ -943,90 +853,71 @@ const apis = {
         // 每页显示多少条
         const pageSize = gridParams.pagination && gridParams.pagination.pageSize
         const isMobile = this.isMobile
-        canRestore = gridParams.options.lineEditOptions.beforeRestore.call(
-          this,
-          {
-            rowIndex,
-            gridData: isSubTableShowPage
-              ? gridParams.subTableData
-              : gridParams.gridData,
-            entity: gridParams.gridData[rowIndex],
-            isMobile,
-            baseURL: window.$vueApp.config.globalProperties.baseURL,
-            isEditing: !isUnEditing,
-            pageGridData: isSubTableShowPage ? gridParams.gridData : null,
-            pageSize,
-            additionalParamMap: gridParams.additionalParamMap,
-            pageContext: gridParams.pageContext,
-            configureObj: gridParams.configureObj
-          }
-        )
+        canRestore = gridParams.options.lineEditOptions.beforeRestore.call(this, {
+          rowIndex,
+          gridData: isSubTableShowPage ? gridParams.subTableData : gridParams.gridData,
+          entity: gridParams.gridData[rowIndex],
+          isMobile,
+          baseURL: window.$vueApp.config.globalProperties.baseURL,
+          isEditing: !isUnEditing,
+          pageGridData: isSubTableShowPage ? gridParams.gridData : null,
+          pageSize,
+          additionalParamMap: gridParams.additionalParamMap,
+          pageContext: gridParams.pageContext,
+          configureObj: gridParams.configureObj
+        })
       }
       if (canRestore === undefined || canRestore === true) {
         // 如果没有编辑过任何行
-        if (
-          !gridParams.orgGridData[rowIndex].id &&
-          !gridParams.orgGridData[rowIndex].ID
-        ) {
+        if (!gridParams.orgGridData[rowIndex].id && !gridParams.orgGridData[rowIndex].ID) {
           // 表示没有保存行数据，需要删除该行记录
           this.deleteRow(rowIndex, listCode, true)
         } else {
           // 这样写会导致“如果字段值原来是空的，输入了内容后，取消编辑没法把输入的值清空”问题
           // Object.assign(gridParams.gridData[rowIndex], gridParams.orgGridData[rowIndex])
           // 所以改成如下写法
-          gridParams.gridData[rowIndex] = JSON.parse(
-            JSON.stringify(gridParams.orgGridData[rowIndex])
-          )
-          if (
-            gridParams.isSubTableShowPage !== undefined &&
-            gridParams.isSubTableShowPage === true
-          ) {
+          const orgRow = JSON.parse(JSON.stringify(gridParams.orgGridData[rowIndex]))
+          if (gridParams.isSubTableShowPage !== undefined && gridParams.isSubTableShowPage === true) {
             // 子表集合移除该行。会触发watch subTableData的监控
             const lastPageRowIndex = (this.currentPage - 1) * this.pageSize
             const subTableRowIndex = lastPageRowIndex + rowIndex
-            gridParams.subTableData[subTableRowIndex] =
-              gridParams.gridData[rowIndex]
+            gridParams.subTableData[subTableRowIndex] = gridParams.gridData[rowIndex]
           }
           window.$vueApp.config.globalProperties.$message({
             showClose: true,
             message: getI18n().t('superGrid.lineCancelledSuccessfully', {
-              row: rowIndex + 1,
+              row: rowIndex + 1
             }),
-            type: 'success',
+            type: 'success'
           })
 
           if (
-            typeof gridParams.options.lineEditOptions
-              .afterRestoreIsCancelEditState === 'undefined' ||
+            typeof gridParams.options.lineEditOptions.afterRestoreIsCancelEditState === 'undefined' ||
             (isHasEditOption('afterRestoreIsCancelEditState', listCode) &&
-              gridParams.options.lineEditOptions
-                .afterRestoreIsCancelEditState === true)
+              gridParams.options.lineEditOptions.afterRestoreIsCancelEditState === true)
           ) {
             // 取消编辑状态
-            setEntityFieldValue(
-              gridParams.gridData[rowIndex],
-              '$editing',
-              false
-            )
+            // setEntityFieldValue(gridParams.gridData[rowIndex], '$editing', false)
+            orgRow.$editing = false
             // Vue.set(gridParams.gridData[rowIndex], '$editing', false)
             gridParams.isEditRow = false
           }
+          this.restoreCurrentRowTimer = setTimeout(() => {
+            gridParams.gridData[rowIndex] = orgRow
+          }, 100)
         }
         gridParams.$rowIndex = null
         gridParams.isCreateRow = false
         // 撤销编辑后回调
         if (isEditOptionFunction('afterRestore', listCode)) {
-          
-          if(gridParams.pageContext){
-            gridParams.options.lineEditOptions.afterRestore.call(
-              this,{
-                rowIndex,
-                row:gridParams.orgGridData[rowIndex],
-                additionalParamMap:gridParams.additionalParamMap,
-                pageContext: gridParams.pageContext,
-                configureObj: gridParams.configureObj
-              }
-            )
+          if (gridParams.pageContext) {
+            gridParams.options.lineEditOptions.afterRestore.call(this, {
+              rowIndex,
+              row: gridParams.orgGridData[rowIndex],
+              additionalParamMap: gridParams.additionalParamMap,
+              pageContext: gridParams.pageContext,
+              configureObj: gridParams.configureObj
+            })
           } else {
             gridParams.options.lineEditOptions.afterRestore.call(
               this,
@@ -1035,7 +926,6 @@ const apis = {
               gridParams.additionalParamMap
             )
           }
-          
         }
       }
     }
@@ -1052,27 +942,22 @@ const apis = {
         const isSubTableShowPage = gridParams.isSubTableShowPage
         // 每页显示多少条
         const pageSize = gridParams.pagination && gridParams.pagination.pageSize
-        const gridData = isSubTableShowPage
-          ? gridParams.subTableData
-          : gridParams.gridData
+        const gridData = isSubTableShowPage ? gridParams.subTableData : gridParams.gridData
         const isMobile = this.isMobile
-        if(gridParams.pageContext){
-          canDelete = gridParams.options.lineEditOptions.beforeDelete.call(
-            this,{
-              rowIndex,
-              row:gridParams.gridData[rowIndex],
-              gridData,
-              isMobile,
-              baseURL:this.baseURL,
-              totalData:isSubTableShowPage ? gridParams.gridData : null,
-              pageSize,
-              additionalParamMap:gridParams.additionalParamMap,
-              pageContext: gridParams.pageContext,
-              configureObj: gridParams.configureObj
-            }
-            
-          )
-        }else {
+        if (gridParams.pageContext) {
+          canDelete = gridParams.options.lineEditOptions.beforeDelete.call(this, {
+            rowIndex,
+            row: gridParams.gridData[rowIndex],
+            gridData,
+            isMobile,
+            baseURL: this.baseURL,
+            totalData: isSubTableShowPage ? gridParams.gridData : null,
+            pageSize,
+            additionalParamMap: gridParams.additionalParamMap,
+            pageContext: gridParams.pageContext,
+            configureObj: gridParams.configureObj
+          })
+        } else {
           canDelete = gridParams.options.lineEditOptions.beforeDelete.call(
             this,
             rowIndex,
@@ -1085,13 +970,9 @@ const apis = {
             gridParams.additionalParamMap
           )
         }
-        
       }
       if (canDelete === undefined || canDelete === true) {
-        if (
-          gridParams.isSubTableShowPage !== undefined &&
-          gridParams.isSubTableShowPage === true
-        ) {
+        if (gridParams.isSubTableShowPage !== undefined && gridParams.isSubTableShowPage === true) {
           // 子表集合添加该新建的行。会触发watch subTableData的监控
           gridParams.isChangePage = true
           const lastPageRowIndex = (this.currentPage - 1) * this.pageSize
@@ -1110,7 +991,7 @@ const apis = {
         window.$vueApp.config.globalProperties.$message({
           showClose: true,
           message: getI18n().t('superGrid.deleteSuccessful'),
-          type: 'success',
+          type: 'success'
         })
         if (gridParams.gridData.length === 0) {
           if (
@@ -1132,34 +1013,27 @@ const apis = {
           if (isEditOptionFunction('afterDelete', listCode)) {
             const isSubTableShowPage = gridParams.isSubTableShowPage
             // 每页显示多少条
-            const pageSize =
-              gridParams.pagination && gridParams.pagination.pageSize
+            const pageSize = gridParams.pagination && gridParams.pagination.pageSize
             const isMobile = this.isMobile
-            if(gridParams.pageContext){
-              gridParams.options.lineEditOptions.afterDelete.call(
-                this,{
-                  rowIndex,
-                  row:gridParams.orgGridData[rowIndex],
-                  gridData:isSubTableShowPage
-                    ? gridParams.subTableData
-                    : gridParams.gridData,
-                  isMobile,
-                  baseURL:this.baseURL,
-                  totalData:isSubTableShowPage ? gridParams.gridData : null,
-                  pageSize,
-                  additionalParamMap:gridParams.additionalParamMap,
-                  pageContext: gridParams.pageContext,
-                  configureObj: gridParams.configureObj
-                }
-              )
-            }else {
+            if (gridParams.pageContext) {
+              gridParams.options.lineEditOptions.afterDelete.call(this, {
+                rowIndex,
+                row: gridParams.orgGridData[rowIndex],
+                gridData: isSubTableShowPage ? gridParams.subTableData : gridParams.gridData,
+                isMobile,
+                baseURL: this.baseURL,
+                totalData: isSubTableShowPage ? gridParams.gridData : null,
+                pageSize,
+                additionalParamMap: gridParams.additionalParamMap,
+                pageContext: gridParams.pageContext,
+                configureObj: gridParams.configureObj
+              })
+            } else {
               gridParams.options.lineEditOptions.afterDelete.call(
                 this,
                 rowIndex,
                 gridParams.orgGridData[rowIndex],
-                isSubTableShowPage
-                  ? gridParams.subTableData
-                  : gridParams.gridData,
+                isSubTableShowPage ? gridParams.subTableData : gridParams.gridData,
                 isMobile,
                 this.baseURL,
                 isSubTableShowPage ? gridParams.gridData : null,
@@ -1167,7 +1041,6 @@ const apis = {
                 gridParams.additionalParamMap
               )
             }
-            
           }
         }
       }
@@ -1215,7 +1088,7 @@ const apis = {
     }
     const gridParams = store.get(listCode)
     const columns = gridParams.columns
-    columns.forEach(col => {
+    columns.forEach((col) => {
       const prop = col.prop
       const isDynamicDataSource = isDynamicDataSourceSource(col)
       if (!isDynamicDataSource && col.valueSet && col.valueSet.length > 0) {
@@ -1224,26 +1097,26 @@ const apis = {
     })
     return result
   },
-    // 获得该列表中，下拉选是选项组的字段信息，返回的key是属性名，value是选项集合
-    getTableSelectOptions(listCode) {
-      const result = {}
-      if (!listCode) {
-        listCode = store.get('_list_code')
-      }
-      const gridParams = store.get(listCode)
-      const columns = gridParams.columns
-      columns.forEach(col => {
-        const prop = col.prop
-        const isDynamicDataSource = isDynamicDataSourceSource(col)
-        if (!isDynamicDataSource && col.valueSet && col.valueSet.length > 0) {
-          result[prop] = {
-            options: col.valueSet,
-            column: col
-          }
+  // 获得该列表中，下拉选是选项组的字段信息，返回的key是属性名，value是选项集合
+  getTableSelectOptions(listCode) {
+    const result = {}
+    if (!listCode) {
+      listCode = store.get('_list_code')
+    }
+    const gridParams = store.get(listCode)
+    const columns = gridParams.columns
+    columns.forEach((col) => {
+      const prop = col.prop
+      const isDynamicDataSource = isDynamicDataSourceSource(col)
+      if (!isDynamicDataSource && col.valueSet && col.valueSet.length > 0) {
+        result[prop] = {
+          options: col.valueSet,
+          column: col
         }
-      })
-      return result
-    },
+      }
+    })
+    return result
+  },
   // 取消列表的编辑状态
   restoreGridEdit(listCode) {
     if (!listCode) {
@@ -1275,10 +1148,7 @@ const apis = {
   // 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)
@@ -1298,26 +1168,22 @@ const apis = {
         const params = {
           params: gridParams.additionalParamMap,
           additionalParamMap: gridParams.additionalParamMap,
-          entity: row,
+          entity: row
         }
         if (popParams) {
           params.eventParams = {
             popEntity: popParams.entity,
             popPageCode: popParams.pageCode,
-            pageCode: this.pageCode,
+            pageCode: this.pageCode
           }
         }
-				closeEvent.call(this, params)
-				if (popParams.jumpInfo && popParams.jumpInfo.successOperation === 'closeWindowAndRefresh') {
+        closeEvent.call(this, params)
+        if (popParams.jumpInfo && popParams.jumpInfo.successOperation === 'closeWindowAndRefresh') {
           this.refresh()
         }
       }
-      const isRefreshWhenClosePopup =
-        this.jumpPageSetting.isRefreshWhenClosePopup
-      if (
-        isRefreshWhenClosePopup !== undefined &&
-        isRefreshWhenClosePopup === true
-      ) {
+      const isRefreshWhenClosePopup = this.jumpPageSetting.isRefreshWhenClosePopup
+      if (isRefreshWhenClosePopup !== undefined && isRefreshWhenClosePopup === true) {
         // 关闭弹框时，刷新父页面列表
         const gridParams = store.get(this.code)
         this.search(gridParams.searchForm)
@@ -1330,19 +1196,14 @@ const apis = {
     // TODO 值更新
     const gridParams = store.get(this.code)
     const editRowIndex = targetRowIndex
-    if (
-      editRowIndex !== undefined &&
-      editRowIndex !== null &&
-      editRowIndex < this.gridData.length
-    ) {
+    if (editRowIndex !== undefined && editRowIndex !== null && editRowIndex < this.gridData.length) {
       // 返回true表示不需要替换字段，false表示需要替换字段
       const isNotNeedReplaceFieldName =
         this.isSql === false ||
         (gridParams.options &&
           ((gridParams.options.isAdministerListView !== undefined &&
             gridParams.options.isAdministerListView === true) ||
-            (gridParams.options.isFormSubTable !== undefined &&
-              gridParams.options.isFormSubTable === true)))
+            (gridParams.options.isFormSubTable !== undefined && gridParams.options.isFormSubTable === true)))
       const tableName = this.tableName
       updateWithPageValue(
         sourceModel,
@@ -1353,9 +1214,7 @@ const apis = {
         !isNotNeedReplaceFieldName
       )
       const updateValueEventName =
-        this.jumpPageSetting && this.jumpPageSetting.updateValueEvent
-          ? this.jumpPageSetting.updateValueEvent
-          : null
+        this.jumpPageSetting && this.jumpPageSetting.updateValueEvent ? this.jumpPageSetting.updateValueEvent : null
       let updateValueEvent
       if (
         gridParams.options.eventCallBack &&
@@ -1364,8 +1223,7 @@ const apis = {
         gridParams.options.eventCallBack[updateValueEventName]
       ) {
         // 表单页面中子表自定义事件集合
-        updateValueEvent =
-          gridParams.options.eventCallBack[updateValueEventName]
+        updateValueEvent = gridParams.options.eventCallBack[updateValueEventName]
       }
       if (updateValueEvent) {
         updateValueEvent.call(this, {
@@ -1375,16 +1233,14 @@ const apis = {
           entity: this.gridData[editRowIndex],
           targetTableName: tableName,
           isNeedReplaceFieldName: !isNotNeedReplaceFieldName,
-          additionalParamMap: gridParams.additionalParamMap,
+          additionalParamMap: gridParams.additionalParamMap
         })
       }
     }
   },
   refreshChildData(listCode, gridData, isShowPageArea) {
     const gridParams = store.get(listCode)
-    if (isShowPageArea === undefined ||
-      isShowPageArea === null ||
-      isShowPageArea === false) {
+    if (isShowPageArea === undefined || isShowPageArea === null || isShowPageArea === false) {
       // 子表不分页
       // console.log('refreshChildData111====', listCode + 'listCode', gridData)
       gridParams.gridData = gridData
@@ -1402,7 +1258,7 @@ const apis = {
     const gridParams = store.get(listCode)
     const defaultValueColumns = gridParams.defaultValueColumns
     if (defaultValueColumns && defaultValueColumns.length > 0) {
-      defaultValueColumns.forEach(column => {
+      defaultValueColumns.forEach((column) => {
         defaultValueColumnsMap[column.prop] = column.defaultValue
       })
     }
@@ -1414,7 +1270,7 @@ const apis = {
     gridParams.options['subTableData'] = null
     this.fetchListData()
   },
-    /**
+  /**
      * v10 行编辑时动态控制字段的编辑权限
      * @param pageContext 页面解析的上下文对象
      * @param customRules 格式如下：
@@ -1453,30 +1309,30 @@ const apis = {
         }
       ]
      */
-  dynamicControlTableEdit(pageContext, customRules, listCode){
+  dynamicControlTableEdit(pageContext, customRules, listCode) {
     const gridParams = store.get(listCode)
     // console.log('dynamicControlTableEdit----customRules-----', customRules, gridParams.options.customRules)
-    if(!customRules){
+    if (!customRules) {
       return
     }
     let gridCustomRules = {}
-    if(gridParams.options.customRules){
+    if (gridParams.options.customRules) {
       gridCustomRules = JSON.parse(JSON.stringify(gridParams.options.customRules))
     }
-    customRules.forEach(item=>{
+    customRules.forEach((item) => {
       const copyItem = JSON.parse(JSON.stringify(item))
       const prop = item.name
       // 当前列新的自定义规则集合
       let columnRules
-      if(!gridCustomRules[prop]){
+      if (!gridCustomRules[prop]) {
         gridCustomRules[prop] = {}
       }
       // console.log('dynamicControlTableEdit----gridCustomRules111-----', gridCustomRules)
       // 获得当前列已有的自定义规则集合
       columnRules = gridCustomRules[prop].rules
-      
-      if(copyItem.rules){
-        if(!columnRules){
+
+      if (copyItem.rules) {
+        if (!columnRules) {
           columnRules = []
         }
         // 将当前列自定义规则集合拼接到已有的自定义规则集合中
@@ -1485,7 +1341,7 @@ const apis = {
       // 当前列总的自定义规则更新
       copyItem.rules = columnRules
       // this.options.customRules[prop] = copyItem
-      if(!gridParams.options.customRules){
+      if (!gridParams.options.customRules) {
         gridParams.options.customRules = {}
       }
       // console.log('dynamicControlTableEdit----gridParams.options.customRules222-----', gridParams.options.customRules)
@@ -1494,22 +1350,22 @@ const apis = {
     // console.log('dynamicControlTableEdit----gridParams.options.customRules333-----', gridParams.options.customRules)
   },
   doLayout(hiddenColumns, listCode) {
-    if(!listCode){
+    if (!listCode) {
       listCode = this.code
     }
     const gridParams = store.get(listCode)
     const orgHiddenColumns = gridParams.hiddenColumns
     // console.log('doLayout----orgHiddenColumns=', orgHiddenColumns)
-    if(hiddenColumns && hiddenColumns.length > 0){
+    if (hiddenColumns && hiddenColumns.length > 0) {
       let hiddenColumnsResult = orgHiddenColumns
-      if(!hiddenColumnsResult){
+      if (!hiddenColumnsResult) {
         hiddenColumnsResult = []
       }
-      if(hiddenColumnsResult.length === 0){
+      if (hiddenColumnsResult.length === 0) {
         hiddenColumnsResult = hiddenColumns
       } else {
-        hiddenColumns.forEach(prop=>{
-          if(hiddenColumnsResult.indexOf(prop) < 0) {
+        hiddenColumns.forEach((prop) => {
+          if (hiddenColumnsResult.indexOf(prop) < 0) {
             // 去重处理
             hiddenColumnsResult.push(prop)
           }