meixioacomponent 2.0.50 → 2.0.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meixioacomponent",
-  "version": "2.0.50",
+  "version": "2.0.52",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/packages/components/proPageTable/oa_pro_table.vue

@@ -76,6 +76,7 @@
       <t-enhanced-table
           ref="enhancedTableRef"
           :row-key="rowKey"
+          :dragSort="dragSort"
           :expanded-row-keys="expandRowKeys"
           :columns="showTableHeader"
           :data="tableData"
@@ -95,6 +96,7 @@
           :selected-row-keys="tableCheckboxConfig.value"
           @sort-change="sortChange"
           @expand-change="rehandleExpandChange"
+          @drag-sort="onDragSort"
       >
 
 
@@ -315,6 +317,12 @@ export default {
   },
 
   props: {
+
+    dragSort: {
+      type: String,
+      default: ''
+    },
+
     // 树形结构传入的判断子节点与最后一级
     treeProps: {
       type: Object,
@@ -325,6 +333,8 @@ export default {
         };
       },
     },
+
+
     // 网络请求
     httpRequire: {
       type: Function,
@@ -509,7 +519,12 @@ export default {
     // 使用序号下标
     useIndex: {
       type: Boolean,
-      default: true
+      default: false
+    },
+
+    indexDefaultValue: {
+      type: Number,
+      default: 0
     },
 
     expandId: {
@@ -636,19 +651,19 @@ export default {
   },
   mixins: [tableSectionMixins],
   methods: {
-      /**
-       * 初始化表格下标
-       */
-      initTableIndex() {
-        if (this.$props.useIndex) {
-          this.tableConfigColumnList.unshift({
-            key: ColIndexStr,
-            colKey: ColIndexStr,
-            label: '序号',
-            title: '序号',
-          })
-        }
-      },
+    /**
+     * 初始化表格下标
+     */
+    initTableIndex() {
+      if (this.$props.useIndex) {
+        this.tableConfigColumnList.unshift({
+          key: ColIndexStr,
+          colKey: ColIndexStr,
+          label: '序号',
+          title: '序号',
+        })
+      }
+    },
     rehandleExpandChange(value, params) {
       this.$emit('rehandleExpandChange', value)
     },
@@ -1008,7 +1023,7 @@ export default {
         if (this.$props.useIndex) {
           const size = this.$props.pageProps[this.$props.pageConfig.size];
           data.forEach((item, index) => {
-            item[`${ColIndexStr}`] = (((pageNum - 1) * size) + (index+1))
+            item[`${ColIndexStr}`] = (((pageNum - 1) * size) + (index + this.$props.indexDefaultValue))
           })
         }
         this.tableData = [];
@@ -1195,7 +1210,9 @@ export default {
       this.$emit("handleSelectionChange", checkValue);
     },
 
-
+    onDragSort(eve) {
+      this.$emit('onDragSort', eve);
+    }
   },
   watch: {
     tableConfig() {