n20-common-lib 2.22.40 → 2.22.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.22.40",
+  "version": "2.22.41",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/ApprovalCard/index.vue

@@ -428,6 +428,10 @@ export default {
     align: {
       type: String,
       default: 'left-right'
+    },
+    seeTypes: {
+      type: RegExp,
+      default: /\.(jpg|png|gif|svg|pdf|swf|xlsx|xls|docx|doc|txt)$/i
     }
   },
   data() {
@@ -464,7 +468,7 @@ export default {
       imgType: /\.(jpg|png1|gif|svg)$/i,
       previewName: '',
       previewSameOrg: false,
-      seeTypes: /\.(jpg|png|gif|svg|pdf|swf|xlsx|xls|docx|doc)$/i,
+
       seeRow: {},
       showFlowHistory: true,
       showFlowHistoryChild: true

package/src/components/FileUploadTable/index.vue

@@ -25,6 +25,7 @@
       </div>
     </div>
     <el-table
+      ref="elTable"
       :key="tableKey"
       :data="tableData"
       :row-key="keys.rowKey"
@@ -35,6 +36,11 @@
       <slot name="selection-column">
         <el-table-column type="selection" width="50" align="center" />
       </slot>
+      <el-table-column :label="'排序' | $lc" width="50" align="center">
+        <template slot-scope="{ row }">
+          <i class="n20-icon-tuodong file-upload-table__drag-handle" :data-row-key="row[keys.rowKey]"></i>
+        </template>
+      </el-table-column>
       <template v-if="dataPorp.slotHeader">
         <el-table-column
           v-for="item in dataPorp.slotHeader"
@@ -316,6 +322,7 @@ import aiCheckDialog from './aiCheckDialog.vue'
 import getJsonc from '../../assets/getJsonc.js'
 import _axios from 'axios'
 import dayjs from 'dayjs'
+import Sortable from 'sortablejs'
 import XEUtils from 'xe-utils'
 
 import 'viewerjs/dist/viewer.css'
@@ -394,7 +401,7 @@ export default {
     },
     action: {
       type: String,
-      default: '/bems/1.0/attach'
+      default: '/neams/eamsbaserecord/batchSavejson'
     },
     batchPrintMethod: {
       type: Function,
@@ -499,7 +506,8 @@ export default {
       previewName: undefined,
       previewSameOrg: false,
       seeRow: {},
-      officeStatus: false
+      officeStatus: false,
+      sortable: null
     }
   },
   computed: {
@@ -542,12 +550,81 @@ export default {
       },
       immediate: true,
       deep: true
+    },
+    tableKey() {
+      this.initSortable()
     }
   },
   mounted() {
     this.getConfiguration()
+    this.initSortable()
+  },
+  beforeDestroy() {
+    this.destroySortable()
   },
   methods: {
+    initSortable() {
+      this.$nextTick(() => {
+        this.destroySortable()
+
+        const $tbody = this.$refs.elTable?.$el?.querySelector('.el-table__body-wrapper > table > tbody')
+        if (!$tbody) {
+          return
+        }
+
+        this.sortable = Sortable.create($tbody, {
+          handle: '.file-upload-table__drag-handle',
+          ghostClass: 'file-upload-table__sortable-ghost',
+          setData(dataTransfer) {
+            dataTransfer.setData('Text', '')
+          },
+          onEnd: ({ oldIndex, newIndex }) => {
+            if (
+              oldIndex === newIndex ||
+              oldIndex === undefined ||
+              newIndex === undefined ||
+              oldIndex < 0 ||
+              newIndex < 0
+            ) {
+              return
+            }
+
+            const targetRow = this.tableData.splice(oldIndex, 1)[0]
+            if (!targetRow) {
+              return
+            }
+            this.tableData.splice(newIndex, 0, targetRow)
+            this.$emit('sort', this.tableData.slice())
+            this.saveFileSort().catch(() => {
+              this.$message.error($lc('附件排序保存失败'))
+            })
+          }
+        })
+      })
+    },
+    destroySortable() {
+      if (this.sortable) {
+        this.sortable.destroy()
+        this.sortable = null
+      }
+    },
+    async saveFileSort() {
+      const sortList = this.tableData
+        .map((row, index) => ({
+          beid: row.beid || row[this.keys.rowKey],
+          fileSort: String(index + 1)
+        }))
+        .filter((item) => item.beid)
+
+      if (!sortList.length) {
+        return
+      }
+
+      await axios.post(
+        this.apiPrefix ? `${this.apiPrefix}/neams/eamsbaserecord/fileSort` : '/neams/eamsbaserecord/fileSort',
+        sortList
+      )
+    },
     // ai校验取消
     aiCheckCancel(beid) {
       this.tableData.forEach((item) => {
@@ -1014,4 +1091,21 @@ export default {
   right: 46px;
   top: 10px;
 }
+
+.file-upload-table__drag-handle {
+  display: inline-block;
+  color: #909399;
+  font-size: 16px;
+  cursor: move;
+}
+
+.file-upload-table__drag-handle:hover {
+  color: #606266;
+}
+
+.file-upload-table__sortable-ghost {
+  opacity: 0.8;
+  color: #fff !important;
+  background: #42b983 !important;
+}
 </style>

package/src/components/Upload/index.vue

@@ -99,7 +99,7 @@ export default {
     },
     action: {
       type: String,
-      default: '/bems/1.0/attach'
+      default: '/neams/eamsbaserecord/batchSavejson'
     },
     list: {
       type: Array,