doway-coms 3.0.6 → 3.0.8

package/package.json

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

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

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

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

package/packages/BasePrintPreview/src/index.vue

@@ -32,7 +32,7 @@
   </div>
 </template>
 <script>
-import {Modal as VxeModal} from 'vxe-table'
+import {VxeModal} from 'vxe-pc-ui'
 export default {
   name: 'BasePrintPreview',
   components:{

package/packages/BasePulldown/src/index.vue

@@ -203,7 +203,7 @@ import { replaceParamString, replaceParam } from '../../utils/common'
 import request from '../../utils/request'
 import { Input, Button, Row, Col, Checkbox } from 'ant-design-vue'
 import { ValidationProvider } from 'vee-validate'
-import { Pulldown } from 'vxe-table'
+import { VxePulldown } from 'vxe-pc-ui'
 import { Tooltip } from 'ant-design-vue'
 export default {
   name: 'BasePulldown',
@@ -214,7 +214,7 @@ export default {
     'a-col': Col,
     'a-checkbox': Checkbox,
     'a-checkbox-group': Checkbox.Group,
-    VxePulldown: Pulldown,
+    VxePulldown,
     ValidationProvider,
     Tooltip,
   },