n20-common-lib 3.2.53 → 3.2.55

package/package.json

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

package/src/components/ApprovalButtons/index.vue

@@ -162,39 +162,41 @@
     </div>
     <!-- 审批按钮 -->
     <div v-if="authList.includes('byAddTask') && !addTaskList.length" class="text-c">
-      <el-button type="primary" @click="showAdvancePop">{{ btnsNames['approval'] }}</el-button>
-      <el-button type="primary" @click="approvalToV = true">{{ btnsNames['approval'] }}{{ '至' | $lc }}</el-button>
-      <el-button plain @click="rejectToB">{{ btnsNames['rejectTo'] }}</el-button>
-      <el-button plain @click="rejectFn">{{ btnsNames['reject'] }}</el-button>
-      <el-button type="danger" plain @click="discardFn">{{ btnsNames['discard'] }}</el-button>
+      <el-button type="primary" @click="showAdvancePop">{{ $lc(btnsNames['approval']) }}</el-button>
+      <el-button type="primary" @click="approvalToV = true">{{ $lc(btnsNames['approval']) }}{{ '至' | $lc }}</el-button>
+      <el-button plain @click="rejectToB">{{ $lc(btnsNames['rejectTo']) }}</el-button>
+      <el-button plain @click="rejectFn">{{ $lc(btnsNames['reject']) }}</el-button>
+      <el-button type="danger" plain @click="discardFn">{{ $lc(btnsNames['discard']) }}</el-button>
       <el-button plain @click="goFrom">{{ '返 回' | $lc }}</el-button>
     </div>
 
     <div v-else-if="!authList.includes('byAddTask')" class="text-c">
       <!-- 特殊会签按钮 START -->
       <el-button v-if="authList.includes('pass')" type="primary" @click="checkFlowFn">{{
-        btnsNames['pass']
+        $lc(btnsNames['pass'])
       }}</el-button>
-      <el-button v-if="authList.includes('refuse')" plain @click="rejectFn">{{ btnsNames['refuse'] }}</el-button>
-      <el-button v-if="authList.includes('takeOff')" plain @click="qjFn">{{ btnsNames['takeOff'] }}</el-button>
+      <el-button v-if="authList.includes('refuse')" plain @click="rejectFn">{{ $lc(btnsNames['refuse']) }}</el-button>
+      <el-button v-if="authList.includes('takeOff')" plain @click="qjFn">{{ $lc(btnsNames['takeOff']) }}</el-button>
       <!-- END -->
       <el-button v-if="authList.includes('approval')" type="primary" @click="showAdvancePop">{{
-        btnsNames['approval']
+        $lc(btnsNames['approval'])
       }}</el-button>
       <el-button v-if="authList.includes('approval') && nextApproval && nextBtn" type="primary" @click="approvalNext">
-        {{ btnsNames['approval'] }}{{ '并审批下一条' | $lc }}</el-button
+        {{ $lc(btnsNames['approval']) }}{{ '并审批下一条' | $lc }}</el-button
       >
       <el-button v-if="showApprovalTo && showApproveTo" type="primary" @click="approvalToV = true"
-        >{{ btnsNames['approval'] }}{{ '至' | $lc }}</el-button
+        >{{ $lc(btnsNames['approval']) }}{{ '至' | $lc }}</el-button
       >
-      <el-button v-if="authList.includes('rejectTo')" plain @click="rejectToB">{{ btnsNames['rejectTo'] }}</el-button>
-      <el-button v-if="authList.includes('reject')" plain @click="rejectFn">{{ btnsNames['reject'] }}</el-button>
+      <el-button v-if="authList.includes('rejectTo')" plain @click="rejectToB">{{
+        $lc(btnsNames['rejectTo'])
+      }}</el-button>
+      <el-button v-if="authList.includes('reject')" plain @click="rejectFn">{{ $lc(btnsNames['reject']) }}</el-button>
       <el-button v-if="authList.includes('rejectPre')" plain @click="rejectPreFn">{{
-        btnsNames['rejectPre']
+        $lc(btnsNames['rejectPre'])
       }}</el-button>
 
       <el-button v-if="authList.includes('discard')" type="danger" plain @click="discardFn">{{
-        btnsNames['discard']
+        $lc(btnsNames['discard'])
       }}</el-button>
       <el-button plain @click="goFrom">{{ '返 回' | $lc }}</el-button>
     </div>
@@ -517,14 +519,14 @@ export default {
       checkSum: 0,
       mustUploadWidget: false,
       btnsNames: {
-        pass: $lc('通过'),
-        refuse: $lc('拒绝'),
-        takeOff: $lc('请假'),
-        reject: $lc('驳回至申请人'),
-        rejectPre: $lc('驳回至上一节点'),
-        approval: $lc('批 准'),
-        discard: $lc('作 废'),
-        rejectTo: $lc('驳回至')
+        pass: '通过',
+        refuse: '拒绝',
+        takeOff: '请假',
+        reject: '驳回至申请人',
+        rejectPre: '驳回至上一节点',
+        approval: '批 准',
+        discard: '作 废',
+        rejectTo: '驳回至'
       }
     }
   },
@@ -711,7 +713,7 @@ export default {
           // 自定义按钮
           if (data.customBtnName && data.customBtnName.length > 0) {
             data.customBtnName.forEach((item) => {
-              this.btnsNames[item.key] = item.optionName
+              this.$set(this.btnsNames, item.key, item.optionName)
             })
           }
           let { taskDefKey, menuAuthority } = data

package/src/components/ApprovalButtons/indexApp.vue

@@ -140,11 +140,11 @@
     </div>
     <!-- 审批按钮 -->
     <div v-if="authList.includes('byAddTask') && !addTaskList.length" class="text-c">
-      <el-button type="primary" @click="showAdvancePop">{{ btnsNames['approval'] }}</el-button>
-      <!--       <el-button type="primary" @click="approvalToV = true">{{ btnsNames['approval'] }}{{ '至' | $lc }}</el-button>
-      <el-button plain @click="rejectToB">{{ btnsNames['rejectTo'] }}</el-button> -->
-      <el-button plain @click="rejectFn">{{ btnsNames['reject'] }}</el-button>
-      <!--       <el-button type="danger" plain @click="discardFn">{{ btnsNames['discard'] }}</el-button>
+      <el-button type="primary" @click="showAdvancePop">{{ $lc(btnsNames['approval']) }}</el-button>
+      <!--       <el-button type="primary" @click="approvalToV = true">{{ $lc(btnsNames['approval']) }}{{ '至' | $lc }}</el-button>
+      <el-button plain @click="rejectToB">{{ $lc(btnsNames['rejectTo']) }}</el-button> -->
+      <el-button plain @click="rejectFn">{{ $lc(btnsNames['reject']) }}</el-button>
+      <!--       <el-button type="danger" plain @click="discardFn">{{ $lc(btnsNames['discard']) }}</el-button>
       <el-button plain @click="goFrom">{{ '返 回' | $lc }}</el-button> -->
     </div>
 
@@ -154,31 +154,29 @@
       </div>
       <!-- 特殊会签按钮 START -->
       <el-button v-if="authList.includes('pass')" type="primary" @click="checkFlowFn">{{
-        btnsNames['pass']
+        $lc(btnsNames['pass'])
       }}</el-button>
-      <el-button v-if="authList.includes('refuse')" plain @click="rejectFn">{{ btnsNames['refuse'] }}</el-button>
-      <el-button v-if="authList.includes('takeOff')" plain @click="qjFn">{{ btnsNames['takeOff'] }}</el-button>
+      <el-button v-if="authList.includes('refuse')" plain @click="rejectFn">{{
+        $lc(btnsNames['refuse'])
+      }}</el-button>
+      <el-button v-if="authList.includes('takeOff')" plain @click="qjFn">{{ $lc(btnsNames['takeOff']) }}</el-button>
       <!-- END -->
       <el-button v-if="authList.includes('approval') && approveBtns" type="primary" @click="showAdvancePop">{{
-        btnsNames['approval']
+        $lc(btnsNames['approval'])
       }}</el-button>
       <!--  <el-button v-if="authList.includes('approval') && nextApproval && nextBtn" type="primary" @click="approvalNext">
-        {{ btnsNames['approval'] }}{{ '并审批下一条' | $lc }}</el-button
+        {{ $lc(btnsNames['approval']) }}{{ '并审批下一条' | $lc }}</el-button
       >
       <el-button v-if="showApprovalTo" type="primary" @click="approvalToV = true"
-        >{{ btnsNames['approval'] }}{{ '至' | $lc }}</el-button
+        >{{ $lc(btnsNames['approval']) }}{{ '至' | $lc }}</el-button
       >
-      <el-button v-if="authList.includes('rejectTo')" plain @click="rejectToB">{{ btnsNames['rejectTo'] }}</el-button> -->
+      <el-button v-if="authList.includes('rejectTo')" plain @click="rejectToB">{{ $lc(btnsNames['rejectTo']) }}</el-button> -->
       <el-button v-if="authList.includes('reject') && approveBtns" plain @click="rejectFn">{{
-        btnsNames['reject']
-      }}</el-button>
-      <!-- <el-button v-if="authList.includes('rejectPre')" plain @click="rejectPreFn">{{
-        btnsNames['rejectPre']
+        $lc(btnsNames['reject'])
       }}</el-button>
+      <!-- <el-button v-if="authList.includes('rejectPre')" plain @click="rejectPreFn">{{ $lc(btnsNames['rejectPre']) }}</el-button>
 
-      <el-button v-if="authList.includes('discard')" type="danger" plain @click="discardFn">{{
-        btnsNames['discard']
-      }}</el-button>
+      <el-button v-if="authList.includes('discard')" type="danger" plain @click="discardFn">{{ $lc(btnsNames['discard']) }}</el-button>
       <el-button plain @click="goFrom">{{ '返 回' | $lc }}</el-button> -->
     </div>
     <!-- 设置抄送用户 -->
@@ -496,14 +494,14 @@ export default {
       checkSum: 0,
       mustUploadWidget: false,
       btnsNames: {
-        pass: $lc('通过'),
-        refuse: $lc('拒绝'),
-        takeOff: $lc('请假'),
-        reject: $lc('驳回'),
-        rejectPre: $lc('驳回至上一节点'),
-        approval: $lc('批 准'),
-        discard: $lc('作 废'),
-        rejectTo: $lc('驳回至')
+        pass: '通过',
+        refuse: '拒绝',
+        takeOff: '请假',
+        reject: '驳回',
+        rejectPre: '驳回至上一节点',
+        approval: '批 准',
+        discard: '作 废',
+        rejectTo: '驳回至'
       },
       approveBtns: true
     }
@@ -645,7 +643,7 @@ export default {
           // 自定义按钮
           if (data.customBtnName && data.customBtnName.length > 0) {
             data.customBtnName.forEach((item) => {
-              this.btnsNames[item.key] = item.optionName
+              this.$set(this.btnsNames, item.key, item.optionName)
             })
           }
           let { taskDefKey, menuAuthority } = data

package/src/components/ApprovalCard/index.vue

@@ -447,10 +447,10 @@ export default {
       type: String,
       default: 'left-right'
     },
-    seeTypes: {
-      type: RegExp,
-      default: /\.(jpg|png|gif|svg|pdf|swf|xlsx|xls|docx|doc|txt)$/i
-    }
+   seeTypes: {
+    type: RegExp,
+    default: () => /\.(jpg|png|gif|svg|pdf|swf|xlsx|xls|docx|doc|txt)$/i
+  }
   },
   data() {
     this.viewerOptions = {

package/src/components/FileUploadTable/index.vue

@@ -32,11 +32,15 @@
       :height="height"
       border
       @selection-change="(selection) => (selectionList = selection)"
-      @sort-change="onSortChange"
     >
       <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"
@@ -320,13 +324,15 @@
 </template>
 
 <script>
-import aiCheckDialog from './aiCheckDialog.vue'
-import getJsonc from '../../assets/getJsonc.js'
 import _axios from 'axios'
 import dayjs from 'dayjs'
+import Sortable from 'sortablejs'
+import 'viewerjs/dist/viewer.css'
 import XEUtils from 'xe-utils'
 
-import 'viewerjs/dist/viewer.css'
+import aiCheckDialog from './aiCheckDialog.vue'
+
+import getJsonc from '../../assets/getJsonc.js'
 import auth from '../../utils/auth'
 import axios from '../../utils/axios'
 import { $lc } from '../../utils/i18n/index'
@@ -402,7 +408,7 @@ export default {
     },
     action: {
       type: String,
-      default: '/bems/1.0/attach'
+      default: '/neams/eamsbaserecord/batchSavejson'
     },
     batchPrintMethod: {
       type: Function,
@@ -510,7 +516,8 @@ export default {
       officeStatus: false,
       batchUploading: false,
       // 批量上传使用的文件数据（避免直接修改计算属性）
-      _batchFileData: null
+      _batchFileData: null,
+      sortable: null
     }
   },
   computed: {
@@ -553,32 +560,64 @@ export default {
       },
       immediate: true,
       deep: true
+    },
+    tableKey() {
+      this.initSortable()
     }
   },
   mounted() {
     this.getConfiguration()
+    this.initSortable()
+  },
+  beforeDestroy() {
+    this.destroySortable()
   },
   methods: {
-    // 点击附件名称表头排序（替代原拖动排序）
-    onSortChange({ prop, order }) {
-      // 仅处理附件名称列；order 为 null（取消排序）时不处理
-      if (prop !== this.keys.name || !order) {
-        return
-      }
-      const nameKey = this.keys.name
-      // 与显示一致：去除扩展名后再比较
-      const stripName = (v) => (v == null ? '' : String(v).replace(/\.[A-z0-9]+$/, ''))
-      const dir = order === 'ascending' ? 1 : -1
-      const sorted = [...this.tableData].sort(
-        (a, b) => stripName(a[nameKey]).localeCompare(stripName(b[nameKey]), 'zh-CN', { numeric:true }) * dir
-      )
-      // 原地更新 tableData（沿用现有 splice 修改 prop 数组的模式）
-      this.tableData.splice(0, this.tableData.length, ...sorted)
-      this.$emit('sort', this.tableData.slice())
-      this.saveFileSort().catch(() => {
-        this.$message.error($lc('附件排序保存失败'))
+    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) => ({
@@ -629,7 +668,7 @@ export default {
         })
       } else {
         if (!this.AIOptions.bussType) {
-          this.$message.error($lc("请先配置bussType"))
+          this.$message.error($lc('请先配置bussType'))
           return false
         }
         let { data, code } = await axios.post(
@@ -653,7 +692,7 @@ export default {
     // ai识别
     async AiFn(row) {
       if (!this.AIOptions.bussType) {
-        this.$message.error($lc("请先配置bussType"))
+        this.$message.error($lc('请先配置bussType'))
         return false
       }
       const { data, code } = await axios.post(
@@ -822,11 +861,7 @@ export default {
             return
           }
           let placeholderIndex = this.tableData.findIndex(
-            (item) =>
-              item[this.keys.type] === type &&
-              !item[this.keys.url] &&
-              !item[this.keys.name] &&
-              !item._name
+            (item) => item[this.keys.type] === type && !item[this.keys.url] && !item[this.keys.name] && !item._name
           )
           if (placeholderIndex > -1) {
             this.tableData.splice(placeholderIndex, 1)
@@ -1006,9 +1041,11 @@ export default {
         type: 'error',
         confirmButtonText: $lc('确认'),
         cancelButtonText: $lc('取消')
-      }).then(() => {
-        this.$emit('delete-rows', this.selectionList)
-      }).catch(() => undefined)
+      })
+        .then(() => {
+          this.$emit('delete-rows', this.selectionList)
+        })
+        .catch(() => undefined)
     },
 
     async getFileInfo(row, type) {
@@ -1231,4 +1268,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/ProFilterView/index.vue

@@ -11,8 +11,8 @@
           trigger="click"
           class="m-r-s"
         >
-          <el-button slot="reference" class="botton" :class="{ activiti: selectedItem !== $lc('无视图') }">
-            <div class="flex-box flex-v m-r">
+          <el-button slot="reference" class="botton view-button" :class="{ activiti: selectedItem !== $lc('无视图') }">
+            <div class="flex-box flex-v">
               <i class="v3-icon-inbox"></i>
               <div class="popover-title" style="margin: 0 8px" :title="selectedItem">{{ selectedItem }}</div>
               <i class="n20-icon-xiala-moren"></i>
@@ -70,7 +70,10 @@
           <el-button
             v-if="isFilter"
             icon="v3-icon-filter"
-            class="m-r-s botton"
+            class="m-r-s botton filter-button"
+            :class="{ 'is-filter-expanded': filterExpanded }"
+            tabindex="-1"
+            @mousedown.native.prevent
             @click="filterExpanded = !filterExpanded"
             >{{ '筛选' | $lc }}</el-button
           >
@@ -219,10 +222,10 @@
 </template>
 
 <script>
-import { $lc } from '../../utils/i18n/index'
 import advancedQuery from './advancedQuery.vue'
 
 import axios from '../../utils/axios.js'
+import { $lc } from '../../utils/i18n/index'
 import ClAdvancedFilter from '../AdvancedFilter/index.vue'
 import ClDialog from '../Dialog/index.vue'
 import ClDragList from '../DragList/index.vue'
@@ -515,10 +518,10 @@ export default {
           item.type === 'daterange'
             ? [item.startDate, item.endDate]
             : item.type === 'numberrange'
-            ? [item.startValue, item.endValue]
-            : item.slotFields?.length
-            ? item.slotFields
-            : [item.value]
+              ? [item.startValue, item.endValue]
+              : item.slotFields?.length
+                ? item.slotFields
+                : [item.value]
 
         keys.forEach((k) => allFilterKeys.add(k))
         if (item.required) {
@@ -818,4 +821,21 @@ export default {
   padding: 0 !important;
   border-bottom: none !important;
 }
+
+.filter-button,
+.view-button {
+  padding: 8px 12px !important;
+  height: 32px;
+}
+
+.filter-button {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.filter-button.is-filter-expanded {
+  color: var(--color-blue-6, #007aff);
+  background: var(--color-blue-1, #e8f7ff);
+}
 </style>

package/src/i18n.json

@@ -11821,5 +11821,12 @@
     "vi": "Quay lại bước trước",
     "ja": "前のステップに戻る",
     "zh-hk": "撤回至上一步"
+  },
+  "未知": {
+    "en": "Unknown",
+    "th": "ไม่ทราบ",
+    "vi": "Không xác định",
+    "ja": "不明",
+    "zh-hk": "未知"
   }
-}
+}