doway-coms 3.0.4 → 3.0.5

package/package.json

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

package/packages/BaseGrid/src/exportCmp.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-      <vxe-modal
+      <VxeModal
         v-model="showExport"
         :title="exportTitle"
         show-zoom
@@ -22,7 +22,7 @@
         <template #footer>
           <Button type="primary" size="small" @click="confirmExport">确认导出</Button>
         </template>
-      </vxe-modal>
+      </VxeModal>
     </div>
   </template>
   
@@ -32,12 +32,13 @@ import XEUtils from 'xe-utils';
 import { controlType } from '../../utils/enum';
 import draggable from 'vuedraggable';
 import { Button } from 'ant-design-vue';
-
+import { VxeModal} from 'vxe-pc-ui'
 export default {
   name: 'commonExportCmp',
   components: {
     draggable,
-    Button
+    Button,
+    VxeModal
   },
   props: {
     objectService: {

package/packages/BaseGrid/src/index.vue

@@ -1897,6 +1897,10 @@ 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)

package/packages/BasePagination/src/index.vue

@@ -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() {