doway-coms 2.8.0 → 2.8.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "2.8.0",
+  "version": "2.8.2",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",

package/packages/BaseGrid/src/index.vue

@@ -83,6 +83,7 @@
       :maxHeight="expandHeight"
       :show-footer="showFooter"
       @scroll="bodyScroll"
+      @keydown="keydownEvent"
     >
       <template v-for="item in internalColumns" #[item.field]>
         <div :key="item.field">
@@ -207,6 +208,7 @@
             :min="scope.column.numberMin"
             :max="scope.column.numberMax"
             :disabled="editDisabled(scope)"
+            :step="scope.column.params.step"
           />
           <div v-else>
             {{ gridDefaultValueDisplay(scope.row, scope.column) }}
@@ -1161,6 +1163,12 @@ export default {
       default:()=>{
         return null
       }
+    },
+    keyBoardNavi:{
+      type:Boolean,
+      default:()=>{
+        return false
+      }
     }
   },
   beforeCreate() {
@@ -1280,6 +1288,51 @@ export default {
     })
   },
   methods: {
+    keydownEvent({$event,$grid,$table}){
+      if(this.keyBoardNavi){
+        const key=$event.key
+          //当前行
+          const record= $grid.getActiveRecord()
+          if(!record)return
+          const fullData= $grid.getTableData().fullData
+          const currentIndex= $grid.getRowIndex(record.row)
+          const columns= $grid.getColumns()
+        const visibleColIndex= columns.findIndex((x,index)=>{
+            return x.field==record.column.field
+          })
+          let row=null
+          switch (key) {
+                case 'ArrowUp':
+                  row= fullData[currentIndex-1]
+                  $grid.setActiveCell(row,record.column)
+                  $grid.setCurrentRow(row)
+                  break;
+                case 'ArrowDown':
+                  row= fullData[currentIndex+1]
+                  $grid.setActiveCell(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())
+                    })
+                  }
+                  break;
+                case 'ArrowRight':
+                  row= record.row
+                  //左右移动的需要手动focus下
+                  if(columns[visibleColIndex+1].field){
+                    $grid.setActiveCell(row,columns[visibleColIndex+1].field).then(()=>{
+                      this.editActived($grid.getActiveRecord())
+                    })
+                  }
+                  break;
+          }
+      }
+    },
     // 响应重新赋值列数据-用于动态列响应更新列数据，其余未考虑
     updateColumns() {
       this.internalColumns = []
@@ -1988,7 +2041,6 @@ export default {
             method: 'post',
             url: originCol.api,
           }).then((res) => {
-            console.log(res)
             colParams['dataSource'] = XEUtils.map(res.content, (item) => {
               return {
                 value: item[originCol.value],
@@ -2009,6 +2061,10 @@ export default {
       }
       if (originCol.controlType === controlType.number) {
         colParams['controlEdit'] = true
+        //如果启用了键盘导航 数字输入就不要跳了
+        if(this.keyBoardNavi){
+          colParams['step'] = 0
+        }
       }
       if (originCol.controlType === controlType.date) {
         colParams['pastDate'] = originCol.pastDate == undefined ? true : false

package/packages/BasePulldown/src/index.vue

@@ -702,7 +702,7 @@ export default {
         let vm = this
         this.inputTimeout = setTimeout(() => {
           //判断面板是否打开
-          if (vm.$refs.pulldownRef.isPanelVisible() === false) {
+          if (vm.$refs.pulldownRef&&vm.$refs.pulldownRef.isPanelVisible() === false) {
             vm.$refs.pulldownRef.showPanel()
           }
           vm.searchData()

package/packages/BaseTreeSelect/src/index.vue

@@ -386,12 +386,12 @@ export default {
           }
         }
         return false
-    },  
+    },
     changeData(value) {
-      if (!value) {
+      if (value) {
         this.$set(this.row, this.linkedField, '')
         this.$set(this.row, this.field, '')
-        this.$emit('selectChanged', this.row)
+        this.$emit('change', this.row)
       }
     },
   },