doway-coms 3.0.5 → 3.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "3.0.5",
+  "version": "3.0.7",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",
@@ -25,8 +25,8 @@
     "vue-router": "3.6.5",
     "vuedraggable": "^2.24.3",
     "vuex": "3.6.2",
-    "vxe-table": "3.12.9",
-    "vxe-pc-ui": "3.3.83",
+    "vxe-table": "3.11.0",
+    "vxe-pc-ui":"3.3.83",
     "xe-clipboard": "1.10.2",
     "xe-utils": "3.5.4"
   },

package/packages/BaseFileGroup/src/index.vue

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

package/packages/BaseGrid/src/exportCmp.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-      <VxeModal
+      <vxe-modal
         v-model="showExport"
         :title="exportTitle"
         show-zoom
@@ -22,7 +22,7 @@
         <template #footer>
           <Button type="primary" size="small" @click="confirmExport">确认导出</Button>
         </template>
-      </VxeModal>
+      </vxe-modal>
     </div>
   </template>
   
@@ -32,13 +32,12 @@ 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,
-    VxeModal
+    Button
   },
   props: {
     objectService: {

package/packages/BaseGrid/src/index.vue

@@ -1897,10 +1897,6 @@ 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)
@@ -3119,12 +3115,6 @@ export default {
     },
     async cellClick({ row, column }) {
       this.$emit('cellClick', { row, column })
-
-      if(column.field==='operation'){
-          //点击操作栏按钮无需开启编辑，要不然数据多的情况下，连续点击删除按钮会照成卡顿
-          return
-      }
-
       //判断是否可以跳转
       // if (
       //   this.gridEdit != true ||

package/packages/BasePagination/src/index.vue

@@ -28,12 +28,12 @@
   </template>
   <script>
    import { Pagination } from 'ant-design-vue'
-   import { VxePager } from "vxe-pc-ui";
+   import { Pager } from "vxe-table";
 
    export default {
     components: {
       Pagination,
-      VxePager
+      Pager
     },
     name: 'BasePagination',
     data() {

package/packages/BasePrintPreview/src/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <VxeModal
+    <vxe-modal
       ref="printModal"
       show-zoom
       append-to-body
@@ -28,11 +28,11 @@
         :src="url"
       >
       </iframe>
-    </VxeModal>
+    </vxe-modal>
   </div>
 </template>
 <script>
-import { VxeModal} from 'vxe-pc-ui'
+import {VxeModal} from 'vxe-pc-ui'
 export default {
   name: 'BasePrintPreview',
   components:{

package/packages/index.js

@@ -68,8 +68,11 @@ const components = [
 import 'vxe-table/lib/style.css'
 import VXETable from 'vxe-table'
 
+
+import VxeUI from 'vxe-pc-ui'
 import 'vxe-pc-ui/lib/style.css'
 
+
 const popupInterceptor = (params) => {
   // 比如点击了某个组件的弹出层面板之后，此时被激活单元格不应该被自动关闭，通过返回 false 可以阻止默认的行为。
   let parentElement =