doway-coms 2.9.3 → 2.9.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "2.9.3",
+  "version": "2.9.4",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",
@@ -25,7 +25,7 @@
     "vue-router": "3.6.5",
     "vuedraggable": "^2.24.3",
     "vuex": "3.6.2",
-    "vxe-table": "3.6.17",
+    "vxe-table": "3.7.10",
     "xe-clipboard": "1.10.2",
     "xe-utils": "3.5.4"
   },

package/packages/BaseGrid/src/index.vue

@@ -26,7 +26,7 @@
       :edit-config="{
         trigger: 'manual',
         mode: 'row',
-        activeMethod: activeCellMethod,
+        beforeEditMethod: activeCellMethod,
         showStatus: true,
         showUpdateStatus: true,
         showInsertStatus: true,
@@ -62,7 +62,7 @@
       :checkbox-config="checkboxConfig"
       :expand-config="expandConfig"
       @edit-closed="editClosedEvent"
-      @edit-actived="editActived"
+      @edit-activated="editActived"
       @filter-visible="filterVisible"
       :sort-config="{
         multiple: true,
@@ -1293,7 +1293,7 @@ export default {
       if(this.keyBoardNavi){
         const key=$event.key
           //当前行
-          const record= $grid.getActiveRecord()
+          const record= $grid.getEditRecord()
           if(!record)return
           const fullData= $grid.getTableData().fullData
           const currentIndex= $grid.getRowIndex(record.row)
@@ -1305,20 +1305,20 @@ export default {
           switch (key) {
                 case 'ArrowUp':
                   row= fullData[currentIndex-1]
-                  $grid.setActiveCell(row,record.column)
+                  $grid.setEditCell(row,record.column)
                   $grid.setCurrentRow(row)
                   break;
                 case 'ArrowDown':
                   row= fullData[currentIndex+1]
-                  $grid.setActiveCell(row,record.column)
+                  $grid.setEditCell(row,record.column)
                   $grid.setCurrentRow(row)
                   break;
                 case 'ArrowLeft':
                   row= record.row
                   //左右移动的需要手动focus下
                   if(columns[visibleColIndex-1].field){
-                    $grid.setActiveCell(row,columns[visibleColIndex-1].field).then(()=>{
-                      this.editActived($grid.getActiveRecord())
+                    $grid.setEditCell(row,columns[visibleColIndex-1].field).then(()=>{
+                      this.editActived($grid.getEditRecord())
                     })
                   }
                   break;
@@ -1326,8 +1326,8 @@ export default {
                   row= record.row
                   //左右移动的需要手动focus下
                   if(columns[visibleColIndex+1].field){
-                    $grid.setActiveCell(row,columns[visibleColIndex+1].field).then(()=>{
-                      this.editActived($grid.getActiveRecord())
+                    $grid.setEditCell(row,columns[visibleColIndex+1].field).then(()=>{
+                      this.editActived($grid.getEditRecord())
                     })
                   }
                   break;
@@ -2155,13 +2155,13 @@ export default {
         case 38: //向上
           if (0 < currentRowIndex - 1) {
             targetRow = scope.data[currentRowIndex - 1]
-            this.$refs.baseGrid.setActiveCell(targetRow, columnTag)
+            this.$refs.baseGrid.setEditCell(targetRow, columnTag)
           }
           break
         case 40: //向下
           if (scope.data.length > currentRowIndex + 1) {
             targetRow = scope.data[currentRowIndex + 1]
-            this.$refs.baseGrid.setActiveCell(targetRow, columnTag)
+            this.$refs.baseGrid.setEditCell(targetRow, columnTag)
           }
           break
       }
@@ -2694,7 +2694,7 @@ export default {
       }
       let insertRow = await this.$refs.baseGrid.insertAt(row, index)
       if (autoSelect === true) {
-        this.$refs.baseGrid.setActiveRow(row)
+        this.$refs.baseGrid.setEditRow(row)
         this.$refs.baseGrid.setCurrentRow(row)
         this.$emit('currentChange', row)
       }
@@ -2712,7 +2712,7 @@ export default {
         }
 
         if (autoSelect === true) {
-          vm.$refs.baseGrid.setActiveRow(row)
+          vm.$refs.baseGrid.setEditRow(row)
           vm.$refs.baseGrid.setCurrentRow(row)
           // vm.rows.push(row)
           vm.$emit('currentChange', row)
@@ -2985,9 +2985,9 @@ export default {
       }
       // column.editRender.enabled = false
       if (column.editRender && column.editRender.enabled === true) {
-        this.$refs.baseGrid.setActiveCell(row, column)
+        this.$refs.baseGrid.setEditCell(row, column)
       } else {
-        this.$refs.baseGrid.setActiveRow(row)
+        this.$refs.baseGrid.setEditRow(row)
       }
     },
     customSetActive(id) {