doway-coms 3.0.9 → 3.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "3.0.9",
+  "version": "3.1.0",
   "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.11.33",
+    "vxe-table": "3.12.1",
     "vxe-pc-ui":"3.3.83",
     "xe-clipboard": "1.10.2",
     "xe-utils": "3.5.4"

package/packages/BaseGrid/src/index.vue

@@ -58,6 +58,9 @@
       :edit-rules="editRules"
       :tree-config="treeConfig"
       :row-config="rowConfig"
+      :row-drag-config="{
+        visibleMethod:rowDragVisibleMethod
+      }"
       @resizable-change="resizableChange"
       :checkbox-config="checkboxConfig"
       :expand-config="expandConfig"
@@ -1079,7 +1082,7 @@ export default {
     rowConfig: {
       type: Object,
       default: () => {
-        return null
+        return {drag:false}
       },
       deep: true,
     },
@@ -1879,8 +1882,7 @@ export default {
         field: originCol.field,
         title: originCol.title,
         tooltip: originCol.tooltip,
-        visible: true,
-        editRender:{} //一定要设置,要不然筛选就不会出来,升级3.11后出现的问题
+        visible: true
       }
 
       if (XEUtils.has(originCol, 'showOverflow')) {
@@ -1900,6 +1902,7 @@ export default {
       }
       if (originCol.dragSort === true) {
         colInfo['dragSort'] = true
+        this.rowConfig['drag'] = true
       }
       if (originCol.isMerge === true) {
         //合并行
@@ -2082,11 +2085,11 @@ export default {
         }
 
         //可以编辑
-        // colInfo.editRender = {
-        //   // autofocus: tempAutoSelect,
-        //   // autoselect:tempAutoSelect,
-        //   // name:'$input' //originCol.controlType + '_edit',
-        // }
+        colInfo.editRender = {
+          // autofocus: tempAutoSelect,
+          // autoselect:tempAutoSelect,
+          // name:'$input' //originCol.controlType + '_edit',
+        }
         //编辑插槽
         customSlot['edit'] = originCol.controlType + '_edit'
         //   colInfo['editRender'] = {
@@ -2230,9 +2233,14 @@ export default {
         // colInfo['filterRender'] ={name: filterTypeName,showFilterFooter:false}
         customSlot['filter'] = filterTypeName
       }
-      // console.debug(customSlot)
       colInfo.slots = customSlot
-      // console.debug(colInfo)
+
+
+      //行拖拽无需设置自定义插槽
+      if(originCol.controlType==='dragSort'){
+        colInfo.slots = {}
+        colInfo.editRender = null
+      }
       return colInfo
     },
     validPrecision({ cellValue, column }) {
@@ -2594,6 +2602,12 @@ export default {
       }
       return isShow
     },
+    rowDragVisibleMethod(scope){
+        if(scope.column.params.edit===true){
+            return true
+        }
+        return false
+    },
     activeCellMethod({ row, column }) {
       let emitData = {
         row: row,