n20-common-lib 3.0.38 → 3.0.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "3.0.38",
+  "version": "3.0.40",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -120,7 +120,7 @@
     "vue-router": "^3.5.2",
     "vue-template-compiler": "^2.6.11",
     "vuex": "^3.6.2",
-    "vxe-table": "3.20.0",
+    "vxe-table": "3.20.10",
     "vxe-pc-ui": "3.13.2",
     "webpack-bundle-analyzer": "^3.9.0",
     "xlsx": "0.14.1",

package/src/assets/css/button.scss

@@ -43,6 +43,7 @@ $--button-margin-left: 6px;
 .el-button--mini {
   padding: 5px 12px;
   font-size: 13px;
+  min-width: auto;
 }
 .el-button--info {
   &,

package/src/assets/css/pagination.scss

@@ -105,6 +105,7 @@
     border-radius: 4px;
     border: 1px solid var(--border-2, #e5e6eb);
     background: var(--bg-2, #fff);
+    padding: 0 4px;
   }
 }
 

package/src/assets/css/table.scss

@@ -449,7 +449,7 @@ th.vxe-header--column {
   }
 
   &:hover {
-    width: 112px;
+    width: var(--hover-width, 112px);
   }
 
   &-item {

package/src/components/FileUploadTable/FileUploadTableV3.vue

@@ -46,7 +46,7 @@
               :on-success="(response, file, fileList) => onTypeUploadSuccess(response, file, fileList, group.item)"
               :on-error="(err, file, fileList) => onTypeUploadError(err, file, fileList, group.item, index)"
             >
-              <el-button slot="trigger" type="text" class="upload-trigger">去上传</el-button>
+              <el-button v-show="!readonly" slot="trigger" type="text" class="upload-trigger">去上传</el-button>
             </Upload>
           </div>
 
@@ -88,7 +88,7 @@
                 </div>
               </div>
               <div class="flex-box">
-                <div class="file-ai__card" v-if="AICheck" @click="AiCheck(row)">
+                <div class="file-ai__card" v-if="AICheck && !readonly" @click="AiCheck(row)">
                   <img class="file-ai_icon" src="./jytg.svg" alt="" />
                   <span class="file-ai_check">{{ $lc('AI 校验') }}</span>
                 </div>

package/src/components/PageLayout/page.vue

@@ -4,7 +4,11 @@
     <div class="n20-page-content flex-item" :class="{ is_padding: padding }">
       <slot></slot>
     </div>
-    <div class="n20-page-content__footer" :class="{ 'n20-page-content__footer--max__padding': maxPadding }">
+    <div
+      v-if="$slots.footer"
+      class="n20-page-content__footer"
+      :class="{ 'n20-page-content__footer--max__padding': maxPadding }"
+    >
       <slot name="footer"></slot>
     </div>
   </div>

package/src/components/ProFilterView/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="ProFilterView">
     <div class="flex-box flex-lr flex-v top">
+      <slot name="leftContent"></slot>
       <div class="flex-box flex-v">
         <el-popover
           v-model="stVisible"
@@ -64,9 +65,8 @@
             </div>
           </div>
         </el-button>
-        <slot name="leftContent"></slot>
+        <slot name="rightContent"></slot>
       </div>
-      <slot name="rightContent"></slot>
     </div>
     <cl-advanced-filter
       ref="filter"

package/src/components/TableOperate/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="el-table-set-size flex-box">
-    <div class="el-table-set-size-item m-r-0">
+  <div class="el-table-set-size flex-box" :style="{ '--hover-width': hoverWidth }">
+    <div v-if="showColumn" class="el-table-set-size-item m-r-0">
       <i
         v-title="$lc('设置显示列')"
         class="v3-icon-system-solution pointer color-white"
@@ -10,7 +10,7 @@
         @click="$emit('visible-column')"
       ></i>
     </div>
-    <div class="el-table-set-size-item m-r-0">
+    <div v-if="showSetsize" class="el-table-set-size-item m-r-0">
       <el-dropdown @command="setSize">
         <i
           v-title="$lc('行高')"
@@ -25,7 +25,7 @@
         </el-dropdown-menu>
       </el-dropdown>
     </div>
-    <div class="el-table-set-size-item m-r-0">
+    <div v-if="hasExpand" class="el-table-set-size-item m-r-0">
       <i
         v-title="!isExpand ? $lc('展开分组') : $lc('折叠分组')"
         class="pointer"
@@ -45,6 +45,14 @@
 export default {
   name: 'TableOperate',
   props: {
+    showColumn: {
+      type: Boolean,
+      default: false
+    },
+    showSetsize: {
+      type: Boolean,
+      default: true
+    },
     size: {
       type: String,
       default: 'small'
@@ -66,6 +74,21 @@ export default {
       })
     }
   },
+  computed: {
+    // 是否显示展开/折叠按钮（配置了 treeConfig 才显示）
+    hasExpand() {
+      return !!(this.$attrs.treeConfig || this.$attrs['tree-config'])
+    },
+    // 当前可见操作项数量
+    activeItemCount() {
+      return [this.showColumn, this.showSetsize, this.hasExpand].filter(Boolean).length
+    },
+    // 根据可见项数动态计算宽度
+    hoverWidth() {
+      const widthMap = { 3: '112px', 2: '88px', 1: '40px', 0: '0px' }
+      return widthMap[this.activeItemCount] || '0px'
+    }
+  },
   data() {
     let _this = this
     return {

package/src/components/TablePro/index.vue

@@ -50,7 +50,7 @@
       }"
       :merge-cells="mergeCells"
       :row-class-name="getRowClassName"
-      v-bind="Object.assign({ size: size }, $attrs, sizeBind)"
+      v-bind="{ size, ...$attrs, ...sizeBind }"
       v-on="$listeners"
       @sort-change="(val) => customSortMethod(val)"
       @filter-change="filterChange"
@@ -236,6 +236,8 @@
     </vxe-table>
     <!-- 操作列 -->
     <tableOperate
+      :showColumn="showColumn"
+      :showSetsize="showSetsize"
       :size="sizeC"
       v-bind="$attrs"
       @update:size="sizeUp"
@@ -380,9 +382,10 @@ export default {
         return forbidSelect
       }
     },
+    // 是否显示显示列
     showColumn: {
       type: Boolean,
-      default: false
+      default: true
     },
     // 数据更新时是否自动清空已选
     clearSelect: {
@@ -468,10 +471,6 @@ export default {
       type: String,
       default: undefined
     },
-    isExport: {
-      type: Boolean,
-      default: false
-    },
     isFilter: {
       type: Boolean,
       default: false
@@ -510,8 +509,9 @@ export default {
       hoverHeaderProp: null, // 当前悬停表头列的 prop
       hoverIconKey: null, // 当前悬停的静态列头图标标识
       isExpand: false,
+      isExport: false, // 是否导出
       dialogVisible: false, // 显示列设置对话框
-      checkColumns: [] // 显示列设置对话框中已选择的列
+      checkColumns: this.columns.slice() // 显示列设置对话框中已选择的列（默认使用 columns prop）
     }
   },
   computed: {
@@ -567,6 +567,10 @@ export default {
   watch: {
     columns() {
       this.colsKey = this.colsKey + 1
+      // 没有 pageId 时，columns 变更同步更新 checkColumns
+      if (!this.pageId) {
+        this.checkColumns = this.columns.slice()
+      }
     },
     size(val) {
       this.sizeC = val
@@ -581,7 +585,7 @@ export default {
   },
   activated() {
     this.$refs.vxeTable.loadData(this.data)
-    if (this.pageId) {
+    if (this.showColumn && this.pageId) {
       this.getColumns()
     }
   },
@@ -590,14 +594,17 @@ export default {
     this.clearHoverTimers()
   },
   mounted() {
-    if (this.pageId) {
+    if (this.showColumn && this.pageId) {
       this.getColumns()
     }
   },
   methods: {
+    openExportColumn() {
+      this.dialogVisible = true
+      this.isExport = true
+    },
     resizableChange({ resizeWidth, columnIndex }) {
       this.checkColumns[columnIndex].width = resizeWidth
-
       this.$refs.showColumn.saveColumns(this.checkColumns)
     },
     setColumns(list) {
@@ -608,8 +615,13 @@ export default {
       }
     },
     async getColumns() {
-      const columns = await this.$refs.showColumn.getColumns(this.pageId)
-      this.checkColumns = columns?.length ? columns : this.columns
+      try {
+        const columns = await this.$refs.showColumn.getColumns(this.pageId)
+        this.checkColumns = columns?.length ? columns : this.columns
+      } catch (err) {
+        // API 请求失败时回退到 columns prop
+        this.checkColumns = this.columns
+      }
     },
     /**
      * 一键展开/折叠表格树形行（仅处理第一层级数据行）

package/src/utils/asciiWidth.js

@@ -98,7 +98,7 @@ const ASCII_W = {
 }
 
 export default function getWidth(label) {
-  label = label || ''
+  label = String(label || '')
   let labels = label.match(/./gu) || []
   let labelW = 0
   labels.forEach((s) => (labelW += ASCII_W[s] || 14))

package/src/utils/axios.js

@@ -233,7 +233,7 @@ function request(opt) {
     delete debounceObj[opt.method + opt.url]
 
     closeLoading({ loading })
-  })
+  }).catch(() => {}) // 防止 finally 返回的丢弃 Promise 产生未处理的 rejection
   debounceObj[opt.method + opt.url] = resPro
   return resPro
 }