doway-coms 3.0.7 → 3.0.9

package/package.json

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

package/packages/BaseFileGroup/src/index.vue

@@ -83,18 +83,17 @@
 
 <script>
 import { notification, Upload, Tree, Icon, Popconfirm, Input } from "ant-design-vue";
-import { Checkbox, Modal } from "vxe-table";
+import { VxeCheckbox, VxeModal } from "vxe-pc-ui";
 import { attachGetAttachUrlApi, attachSearchApi } from "../../utils/api";
 import XEUtils from 'xe-utils'
 import { Splitpanes, Pane } from 'splitpanes'
 import 'splitpanes/dist/splitpanes.css'
-
 export default {
   name: "BaseFileGroup",
   components: {
-    VxeCheckbox: Checkbox,
+    VxeCheckbox,
     "a-upload": Upload,
-    VxeModal: Modal,
+    VxeModal: VxeModal,
     Splitpanes, Pane,
     'a-tree': Tree,
     'a-icon': Icon,

package/packages/BaseGrid/src/index.vue

@@ -1223,7 +1223,7 @@ export default {
       type:Object,
       default:()=>{
         return {
-          enabled:true,gt:0
+          enabled:true,gt:0,mode:'default'
         }
       }
     }
@@ -1880,6 +1880,7 @@ export default {
         title: originCol.title,
         tooltip: originCol.tooltip,
         visible: true,
+        editRender:{} //一定要设置,要不然筛选就不会出来,升级3.11后出现的问题
       }
 
       if (XEUtils.has(originCol, 'showOverflow')) {
@@ -1897,6 +1898,9 @@ export default {
       if (originCol.treeNode === true) {
         colInfo['treeNode'] = true
       }
+      if (originCol.dragSort === true) {
+        colInfo['dragSort'] = true
+      }
       if (originCol.isMerge === true) {
         //合并行
         this.mergeFields.push(originCol.field)
@@ -2078,11 +2082,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'] = {

package/packages/BasePagination/src/index.vue

@@ -13,7 +13,7 @@
 <!--        @change="onPageChange"-->
 <!--        :show-total="total => `总共 ${totalRows} 条`"-->
 <!--      />-->
-      <Pager
+      <VxePager
         background
         :current-page="currentPage"
         :page-size="pageSize"
@@ -28,12 +28,12 @@
   </template>
   <script>
    import { Pagination } from 'ant-design-vue'
-   import { Pager } from "vxe-table";
+   import { VxePager } from "vxe-pc-ui";
 
    export default {
     components: {
       Pagination,
-      Pager
+      VxePager
     },
     name: 'BasePagination',
     data() {