n20-common-lib 3.0.87 → 3.0.88

package/package.json

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

package/src/components/Pivot/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog class="n20-pivot-dialog" width="90%" max-dialog :visible.sync="visibleC" title="数据透视分析中心">
+  <Dialog class="n20-pivot-dialog" width="95%" max-dialog :visible.sync="visibleC" title="数据透视分析中心">
     <div class="n20-pivot-container">
       <!-- 左侧报表清单 -->
       <div class="pivot-sidebar-left" :class="{ collapsed: isLeftSidebarCollapsed }">
@@ -70,12 +70,14 @@
         <!-- 内容头部工具栏 -->
         <div class="main-toolbar">
           <div class="toolbar-left">
-            <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">
-                <path d="M7 1V13M1 7H13" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" />
-              </svg>
-              <span>添加到首页</span>
+            <div >
+              <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">
+                  <path d="M7 1V13M1 7H13" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" />
+                </svg>
+                <span>添加到首页</span>
+              </div>
             </div>
             <div class="report-stats">
               <span class="stat-item">计算耗时：{{ calculateTime }} ms</span>
@@ -404,7 +406,7 @@
 
 <script>
 import Dialog from '../Dialog/index.vue'
-import ViewToggle from './ViewToggle.vue'
+import ViewToggle from '../ViewToggle/index.vue'
 import XEUtils from 'xe-utils'
 import importG from '../../utils/importGlobal.js'
 
@@ -1373,10 +1375,13 @@ export default {
 }
 
 .report-title {
+  color: var(--text-1, #1d2129);
+  /* 18/CN-Medium */
+  font-family: 'PingFang SC';
   font-size: 18px;
+  font-style: normal;
   font-weight: 500;
-  color: #1d2129;
-  margin: 0;
+  line-height: 26px; /* 144.444% */
 }
 
 .add-to-home-btn {

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

@@ -764,7 +764,7 @@ export default {
     // 处理固定操作列的按钮事件
     handleOperateCommand(command, row, rowIndex) {
       this.$emit(command, row, rowIndex)
-      this.$emit('hover-btn-click', { btn: { command }, row, rowIndex })
+      this.$emit('hover-btn-click', { btn, row, rowIndex })
     },
     // 处理 tableOperate 固定/取消固定切换
     handleToggleOperateFixed(fixed) {

package/src/components/Pivot/ViewToggle.vue

@@ -1,132 +0,0 @@
-<template>
-  <div class="view-toggle" :class="{ disabled }">
-    <div class="toggle-container">
-      <div
-        v-for="(item, index) in options"
-        :key="item.value"
-        class="toggle-item"
-        :class="{ active: value === item.value }"
-        :style="itemStyle"
-        @click="handleChange(item.value)"
-      >
-        {{ item.label }}
-      </div>
-      <div class="toggle-indicator" :style="indicatorStyle"></div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'ViewToggle',
-  props: {
-    value: {
-      type: [String, Number],
-      required: true
-    },
-    options: {
-      type: Array,
-      required: true,
-      validator(value) {
-        return value.every((item) => item.label && item.value !== undefined)
-      }
-    },
-    itemWidth: {
-      type: [Number, String],
-      default: 80
-    },
-    itemHeight: {
-      type: [Number, String],
-      default: 30
-    },
-    disabled: {
-      type: Boolean,
-      default: false
-    }
-  },
-  computed: {
-    itemStyle() {
-      const width = typeof this.itemWidth === 'number' ? `${this.itemWidth}px` : this.itemWidth
-      const height = typeof this.itemHeight === 'number' ? `${this.itemHeight}px` : this.itemHeight
-      return {
-        width,
-        height
-      }
-    },
-    indicatorStyle() {
-      const itemW = typeof this.itemWidth === 'number' ? this.itemWidth : parseInt(this.itemWidth)
-      const itemH = typeof this.itemHeight === 'number' ? this.itemHeight : parseInt(this.itemHeight)
-      const gap = 2
-      const activeIndex = this.options.findIndex((item) => item.value === this.value)
-      const translateX = activeIndex >= 0 ? activeIndex * itemW : 0
-      return {
-        width: `${itemW - 2 * gap}px`,
-        height: `${itemH - 2 * gap}px`,
-        top: `${gap}px`,
-        left: `${gap}px`,
-        transform: `translateX(${translateX}px)`
-      }
-    }
-  },
-  methods: {
-    handleChange(val) {
-      if (this.disabled) return
-      if (val !== this.value) {
-        this.$emit('input', val)
-        this.$emit('change', val)
-      }
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.view-toggle {
-  background: #f2f3f5;
-  border-radius: 4px;
-  padding: 2px;
-  display: inline-block;
-}
-
-.view-toggle.disabled {
-  opacity: 0.6;
-  cursor: not-allowed;
-  pointer-events: none;
-}
-
-.toggle-container {
-  display: flex;
-  position: relative;
-}
-
-.toggle-item {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  color: var(--text-1, #1d2129);
-  font-family: 'PingFang SC';
-  font-size: 14px;
-  font-style: normal;
-  font-weight: 400;
-  line-height: 22px;
-  cursor: pointer;
-  border-radius: 2px;
-  transition: all 0.2s;
-  z-index: 1;
-  user-select: none;
-}
-
-.toggle-item.active {
-  color: var(--primary-6, #007aff);
-  font-weight: 500;
-}
-
-.toggle-indicator {
-  position: absolute;
-  background: #fff;
-  box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.08);
-  border-radius: 2px;
-  transition: transform 0.2s;
-  z-index: 0;
-}
-</style>