n20-common-lib 3.1.2 → 3.1.4

package/package.json

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

package/src/components/Pivot/index.vue

@@ -70,7 +70,7 @@
         <!-- 内容头部工具栏 -->
         <div class="main-toolbar">
           <div class="toolbar-left">
-            <div>
+            <div class="toolbar-left-top">
               <h2 class="report-title">{{ currentReport.name }}</h2>
               <div class="add-to-home-btn" @click="handleAddToHome">
                 <svg width="14" height="14" viewBox="0 0 14 14" fill="none">
@@ -81,6 +81,7 @@
             </div>
             <div class="report-stats">
               <span class="stat-item">计算耗时：{{ calculateTime }} ms</span>
+              <span class="stat-divider"></span>
               <span class="stat-item">数据条数：{{ dataCount }}</span>
             </div>
           </div>
@@ -95,42 +96,10 @@
 
             <div class="action-buttons">
               <div class="action-btn" @click="handleRefresh" title="刷新">
-                <svg width="14" height="14" viewBox="0 0 14 14" fill="none">
-                  <path
-                    d="M13 2.5V6.5H9M1 11.5V7.5H5"
-                    stroke="currentColor"
-                    stroke-width="1.5"
-                    stroke-linecap="round"
-                    stroke-linejoin="round"
-                  />
-                  <path
-                    d="M13 2.5C11.5 1 9.5 0.5 7 1C4.5 1.5 2.5 2.5 1.5 4.5C0.5 6.5 0.5 9 2 11C3.5 13 5.5 14 7.5 14C9.5 14 11 13 12 12"
-                    stroke="currentColor"
-                    stroke-width="1.5"
-                    stroke-linecap="round"
-                  />
-                </svg>
+                <i class="n20-icon-shuaxin"></i>
               </div>
-              <div class="action-btn" @click="handleExport" title="导出">
-                <svg width="14" height="14" viewBox="0 0 14 14" fill="none">
-                  <path
-                    d="M3 9L7 13L11 9"
-                    stroke="currentColor"
-                    stroke-width="1.5"
-                    stroke-linecap="round"
-                    stroke-linejoin="round"
-                  />
-                  <path d="M7 3V11" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" />
-                  <path
-                    d="M1 9V11C1 11.5523 1.44772 12 2 12H12C12.5523 12 13 11.5523 13 11V9"
-                    stroke="currentColor"
-                    stroke-width="1.5"
-                    stroke-linecap="round"
-                  />
-                </svg>
-              </div>
-              <div class="action-btn" title="折叠" @click="handleToggleRightSidebar">
-                <i :class="isRightSidebarCollapsed ? 'v3-icon-move-left' : 'v3-icon-move-right'" class="pointer"></i>
+              <div class="action-btn" @click="handleMore" title="更多">
+                <i class="v3-icon-more"></i>
               </div>
             </div>
           </div>
@@ -464,10 +433,7 @@ export default {
       // 图表实例
       chartInstance: null,
       // 下拉框显示状态
-      showChartTypeDropdown: false,
-      showDimensionDropdown: false,
-      showMetricDropdown: false,
-      showAggregateDropdown: false,
+      showCustomAggregateDropdown: false,
       // 左侧边栏是否折叠
       isLeftSidebarCollapsed: false,
       // 右侧边栏是否折叠
@@ -806,11 +772,20 @@ export default {
         statType: 'group',
         chartType: 'bar',
         dimensions: [],
-        metrics: [],
-        aggregateType: 'sum'
+        metrics: [] // 每项格式: { key: '字段名', aggregateType: 'sum' }
       }
     },
 
+    // 迁移旧格式报表数据（metrics 从 string[] 迁移为 { key, aggregateType }[]）
+    migrateReportFormat(report) {
+      if (report.metrics && report.metrics.length > 0 && typeof report.metrics[0] === 'string') {
+        const aggregateType = report.aggregateType || 'sum'
+        report.metrics = report.metrics.map((key) => ({ key, aggregateType }))
+      }
+      delete report.aggregateType
+      return report
+    },
+
     // 生成唯一ID
     generateId() {
       return 'report_' + Date.now() + '_' + Math.random().toString(36).substr(2, 9)
@@ -941,7 +916,8 @@ export default {
         if (saved) {
           const configs = JSON.parse(saved)
           if (Array.isArray(configs) && configs.length > 0) {
-            this.reportList = configs
+            // 迁移旧格式数据
+            this.reportList = configs.map((report) => this.migrateReportFormat(report))
           }
         }
       } catch (e) {
@@ -1377,18 +1353,24 @@ export default {
 }
 
 .main-toolbar {
-  height: 50px;
-  padding: 0 16px;
   display: flex;
   align-items: center;
   justify-content: space-between;
+  padding: 6px 16px;
   border-bottom: 1px solid #e5e6eb;
 }
 
 .toolbar-left {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  gap: 4px;
+}
+
+.toolbar-left-top {
   display: flex;
   align-items: center;
-  gap: 12px;
+  gap: 8px;
 }
 
 .report-title {
@@ -1420,8 +1402,7 @@ export default {
 .report-stats {
   display: flex;
   align-items: center;
-  gap: 16px;
-  margin-left: 16px;
+  gap: 8px;
 }
 
 .stat-item {
@@ -1429,10 +1410,16 @@ export default {
   color: #4e5969;
 }
 
+.stat-divider {
+  width: 0;
+  height: 12px;
+  border-left: 1px solid #e5e6eb;
+}
+
 .toolbar-right {
   display: flex;
   align-items: center;
-  gap: 16px;
+  gap: 8px;
 }
 
 .action-buttons {

package/src/components/ProFilterView/index.vue

@@ -101,6 +101,7 @@
           v-if="filter.value"
           :name="filter.slotName"
           :model="model"
+          :item="filter"
           :value="searchValue[filter.value]"
           :input="(val) => handleSlotInput(filter.value, val)"
         ></slot>
@@ -335,22 +336,20 @@ export default {
         if (!newVal) return
 
         // 智能合并：保留用户已手动修改的值
-        // 策略：只有当 searchValue 的值等于初始值时，才用 newVal 更新
-        const mergedValue = { ...this.searchValue }
-
-        Object.keys(newVal || {}).forEach((key) => {
-          // 只有当前值与初始值相同时才更新（说明用户没修改过）
-          // 或者 searchValue 中没有这个字段
-          if (this.searchValue[key] === undefined || this.searchValue[key] === this.getInitialSearchValue[key]) {
-            this.$set(mergedValue, key, newVal[key])
-          }
-          // 否则保留用户已修改的值
-        })
-
-        this.searchValue = mergedValue
+        this.searchValue = newVal
       },
       deep: true,
       immediate: false
+    },
+    // filterId 变化时重新请求视图列表并重置状态
+    filterId: {
+      handler(newVal, oldVal) {
+        if (newVal && newVal !== oldVal) {
+          this.resetState()
+          this.getFilterList()
+        }
+      },
+      immediate: false
     }
   },
   mounted() {
@@ -362,13 +361,6 @@ export default {
     this.searchValue = { ...this.getInitialSearchValue, ...this.initialValue }
   },
   methods: {
-    /**
-     * 供外部调用更新 GroupData
-     * @param {Array} data - 筛选条件数据
-     */
-    setGroupData(data) {
-      this.$refs.filter.mackData(data || [])
-    },
     // 处理 slot 类型字段的输入事件，同时更新 searchValue 和 initialValue
     handleSlotInput(fieldName, val) {
       // 防御性检查：如果 fieldName 无效，不执行任何操作
@@ -394,7 +386,7 @@ export default {
       })
     },
     changeFn(value) {
-      let obj = value
+      const obj = { ...value }
       const filter = this.filterList.find((item) => item.value === value.field)
       if (filter?.type === 'daterange') {
         obj.value = {
@@ -452,16 +444,6 @@ export default {
         'clear'
       )
     },
-    isEnter() {
-      this.$rulesValidateForm('ruleValidate', (valid) => {
-        if (!valid) {
-          console.log('校验不通过')
-          this.$message.warning('校验不通过')
-        } else {
-          this.$message.warning('校验通过')
-        }
-      })
-    },
     // 通过bussId拿取视图列表
     getFilterList(viewId) {
       // 如果没有 bussId，不获取视图列表
@@ -469,11 +451,10 @@ export default {
         return
       }
 
-      let list = []
       axios
         .get(`/bems/query/viewColumn/getViewInfo`, { bussId: this.bussId })
         .then((res) => {
-          list = res.data.map((item) => {
+          const list = (res.data || []).map((item) => {
             item.keyIds = this.safeParse(item.keyIds, [])
             return item
           })
@@ -522,7 +503,6 @@ export default {
     // 修改
     edit(item, isRefresh = false) {
       this.isRefresh = isRefresh
-      console.log(item)
       this.viewPopoverVisible = false
       this.visible = true
       this.isAdd = false
@@ -642,7 +622,6 @@ export default {
     },
     // 选中视图
     handleSelect(item) {
-      console.log(item)
       this.viewPopoverVisible = false
       this.selectItem = item
       this.selectedItem = item.viewName

package/src/components/ShowColumn/index.vue

@@ -648,7 +648,7 @@ export function saveTransform(list, labelKey, isFilter) {
     // 遍历列配置列表，将每列转换为存储格式
     list.forEach((c) => {
       // 普通列：有prop属性、无子列、非新增列、无宽度设置
-      if (c.prop && !c.children && !c.isNew && !c.width & !c.isNew) {
+      if (c.prop && !c.children && !c.isNew && !c.width && !c.isNew) {
         const entry = { _colKey: 'prop', _colVal: c.prop }
         if (c.fixed) entry.fixed = c.fixed
         listN.push(entry)

package/src/components/v3/TablePro/index.vue

@@ -281,7 +281,12 @@
           </div>
         </template>
         <template #default="{ row, $rowIndex }">
-          <OperateBtns :btn-list="btnList" :row="row" :get-operate-btns="getOperateBtns" @command="(c) => handleOperateCommand(c, row, $rowIndex)" />
+          <OperateBtns
+            :btn-list="btnList"
+            :row="row"
+            :get-operate-btns="getOperateBtns"
+            @command="(c) => handleOperateCommand(c, row, $rowIndex)"
+          />
         </template>
       </vxe-column>
       <template #empty>
@@ -526,7 +531,8 @@ export default {
     },
     // 悬浮按钮组隐藏延迟（毫秒）
     hoverBtnsHideDelay: {
-      type: Number
+      type: Number,
+      default: 100
     },
     // 悬浮按钮组最大显示数量，超过则收起到"更多"下拉菜单
     hoverBtnsMaxShow: {
@@ -603,10 +609,15 @@ export default {
   computed: {
     _columns: {
       get() {
+        // 当操作列已通过模板固定渲染时，过滤掉 checkColumns 中的操作列，避免重复
+        const cols =
+          this.isOperateFixed && this.btnList && this.btnList.length > 0
+            ? this.checkColumns.filter((col) => !(col.static && col.label === $lc('操作')))
+            : this.checkColumns
         if (this.isAutoWidth) {
-          return this.calcColumnWidth(this.checkColumns)
+          return this.calcColumnWidth(cols)
         } else {
-          return this.checkColumns
+          return cols
         }
       },
       set(val) {
@@ -693,8 +704,14 @@ export default {
       this.dialogVisible = true
       this.isExport = true
     },
-    resizableChange({ resizeWidth, columnIndex }) {
-      this.checkColumns[columnIndex].width = resizeWidth
+    resizableChange({ resizeWidth, column, columnIndex }) {
+      // 通过 prop 匹配 checkColumns 中的列，避免 _columns 过滤后索引错位
+      const targetCol = column?.property
+        ? this.checkColumns.find((c) => c.prop === column.property)
+        : this.checkColumns[columnIndex]
+      if (targetCol) {
+        targetCol.width = resizeWidth
+      }
       if (this.showColumn && this.pageId) {
         this.saveColumns()
       }
@@ -706,7 +723,12 @@ export default {
     // 保存列配置到后端（固定列、列宽调整等场景复用）
     saveColumns() {
       const userNo = sessionStorage.getItem('userNo')
-      const columns = saveTransform(this.checkColumns, this.labelKey, this.isFilter)
+      // 排除模板已固定渲染的操作列，避免保存重复数据
+      const cols =
+        this.isOperateFixed && this.btnList && this.btnList.length > 0
+          ? this.checkColumns.filter((col) => !(col.static && col.label === $lc('操作')))
+          : this.checkColumns
+      const columns = saveTransform(cols, this.labelKey, this.isFilter)
       axios.post(
         `/bems/prod_1.0/user/pageHabit?t=${Math.random()}`,
         {
@@ -723,6 +745,7 @@ export default {
         this.isExport = false
       } else {
         this.checkColumns = list
+        this.colsKey++
       }
     },
     async getColumns() {
@@ -941,21 +964,6 @@ export default {
       // 得手动触发
       this.handleSelectionChange()
     },
-    // 获取被合并的从属行索引集合
-    getMergedRowIndexes() {
-      const mergedIndexes = new Set()
-      if (this.mergeCells && this.mergeCells.length > 0) {
-        this.mergeCells.forEach((cell) => {
-          if (cell.rowspan > 1) {
-            // 从 row+1 到 row+rowspan-1 都是被合并的从属行
-            for (let i = 1; i < cell.rowspan; i++) {
-              mergedIndexes.add(cell.row + i)
-            }
-          }
-        })
-      }
-      return mergedIndexes
-    },
     toggleAll($table, disabled) {
       if (disabled) {
         return false
@@ -1316,18 +1324,9 @@ export default {
       const HOVER_BTNS_WIDTH = 356 // 悬浮按钮组宽度
       const MIN_LABEL_LENGTH = 10 // 最小标签长度
 
-      // 获取容器宽度
-      let wrapperEl = this.$refs.vxeTable?.$el
-      if (!wrapperEl) wrapperEl = document.querySelector('div#app')
-      if (!wrapperEl) return columns
-
-      const { width: containerWidth } = wrapperEl.getBoundingClientRect()
-
       // 解析宽度值（支持数字、"100"、"100px"格式）
       const parseWidth = (value) => (typeof value === 'number' ? value : parseInt(value, 10) || 0)
 
-      // 计算列宽并统计总宽度
-      let totalWidth = 0
       const calcColumns = columns.map((column) => {
         // 操作列固定宽度
         if (column.static && column.label === $lc('操作') && !column.width && !column.minWidth) {
@@ -1346,7 +1345,6 @@ export default {
         const widthValue = column.width || column.minWidth || column['min-width'] || 0
         const baseWidth = parseWidth(widthValue)
         column._baseWidth_ = baseWidth
-        totalWidth += baseWidth
         return column
       })