n20-common-lib 3.0.98 → 3.0.99

package/package.json

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

package/src/components/AdvancedFilter/index.vue

@@ -313,38 +313,24 @@ export default {
       return this.model
     },
     activeClass(item) {
-      const getFlag = () => {
-        if (Array.isArray(this.model[item.value])) {
-          return this.model[item.value].length > 0 ? this.prefixCls + '-active' : ''
-        } else {
-          return this.model[item.value] !== null &&
-            this.model[item.value] !== undefined &&
-            this.model[item.value] !== ''
-            ? this.prefixCls + '-active'
-            : ''
-        }
+      // 判断值是否有效（非空）
+      const hasValue = (val) => {
+        if (Array.isArray(val)) return val.length > 0
+        return val !== null && val !== undefined && val !== ''
       }
-      let flag = ''
-      switch (item.type) {
-        case 'numberrange':
-          flag =
-            this.model[item.startValue] !== null &&
-            this.model[item.endValue] !== null &&
-            this.model[item.startValue] !== undefined &&
-            this.model[item.endValue] !== undefined
-              ? this.prefixCls + '-active'
-              : ''
-          break
-        case 'daterange':
-        case 'datetimerange':
-        case ' monthrange':
-          flag = this.model[item.startDate] && this.model[item.endDate] ? this.prefixCls + '-active' : ''
-          break
-        default:
-          flag = getFlag()
-          break
+
+      // 判断范围类型是否有效（起止值都存在）
+      const hasRange = (start, end) => hasValue(this.model[start]) && hasValue(this.model[end])
+
+      const rangeTypes = ['daterange', 'datetimerange', 'monthrange']
+
+      if (item.type === 'numberrange') {
+        return hasRange(item.startValue, item.endValue) ? this.prefixCls + '-active' : ''
+      }
+      if (rangeTypes.includes(item.type)) {
+        return hasRange(item.startDate, item.endDate) ? this.prefixCls + '-active' : ''
       }
-      return flag
+      return hasValue(this.model[item.value]) ? this.prefixCls + '-active' : ''
     },
     handleClose(item) {
       switch (item.type) {

package/src/components/Pivot/index.vue

@@ -20,7 +20,7 @@
             @mouseenter="hoveredReportId = report.id"
             @mouseleave="hoveredReportId = null"
           >
-            <i class="v3-icon-report"></i>
+            <i :class="getChartTypeIcon(report.chartType)" class="report-icon"></i>
             <span v-if="editingReportId !== report.id" class="report-name">{{ report.name }}</span>
             <input
               v-else
@@ -70,7 +70,7 @@
         <!-- 内容头部工具栏 -->
         <div class="main-toolbar">
           <div class="toolbar-left">
-            <div >
+            <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">
@@ -195,13 +195,16 @@
       <!-- 右侧维度配置 -->
       <div class="pivot-sidebar-right" :class="{ collapsed: isRightSidebarCollapsed }">
         <div class="sidebar-header">
-          <span v-if="!isRightSidebarCollapsed" class="sidebar-title">维度配置</span>
+          <template v-if="!isRightSidebarCollapsed">
+            <i class="v3-icon-move-right sidebar-header-collapse" @click="handleToggleRightSidebar"></i>
+            <span class="sidebar-title">维度配置</span>
+          </template>
         </div>
 
         <div class="config-form">
           <!-- 报表名称 -->
           <div class="form-item">
-            <label class="form-label">报表名称</label>
+            <label class="form-label">报表标题</label>
 
             <div class="input-wrapper">
               <input class="form-input" type="text" v-model="currentReport.name" placeholder="请输入报表名称" />
@@ -226,10 +229,7 @@
             <label class="form-label">展示形式</label>
             <div class="select-wrapper" @click="showChartTypeDropdown = !showChartTypeDropdown">
               <div class="select-value">
-                <svg width="14" height="14" viewBox="0 0 14 14" fill="none">
-                  <rect x="1" y="3" width="12" height="8" rx="1" stroke="currentColor" stroke-width="1.5" />
-                  <path d="M3 8V11M7 6V11M11 9V11" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" />
-                </svg>
+                <i :class="getChartTypeIcon(currentReport.chartType)" class="report-icon"></i>
                 <span>{{ getChartTypeLabel(currentReport.chartType) }}</span>
               </div>
               <svg class="select-arrow" width="10" height="10" viewBox="0 0 10 10" fill="none">
@@ -255,6 +255,8 @@
             </div>
           </div>
 
+          <div class="form-divider"></div>
+
           <!-- 分组维度 -->
           <div class="form-item">
             <label class="form-label">
@@ -309,6 +311,8 @@
             </div>
           </div>
 
+          <div class="form-divider"></div>
+
           <!-- 计算指标 -->
           <div class="form-item">
             <div class="form-label-row">
@@ -897,6 +901,17 @@ export default {
       return chart ? chart.label : '柱状图'
     },
 
+    // 获取图表类型图标
+    getChartTypeIcon(type) {
+      const iconMap = {
+        bar: 'v3-icon-chart-histogram',
+        line: 'v3-icon-chart-line',
+        pie: 'v3-icon-chart-pie',
+        horizontalBar: 'v3-icon-histogram'
+      }
+      return iconMap[type] || 'v3-icon-chart-histogram'
+    },
+
     // 获取聚合类型标签
     getAggregateLabel(type) {
       const agg = this.aggregateTypes.find((t) => t.value === type)
@@ -1113,11 +1128,14 @@ export default {
   .el-dialog {
     box-sizing: border-box;
     margin-top: 3vh !important;
-    max-height: 95vh;
+    max-height: 94vh;
     display: flex;
     flex-direction: column;
     .el-dialog__body {
       padding: 0;
+      flex: 1;
+      min-height: 0;
+      overflow: hidden;
     }
   }
 }
@@ -1125,7 +1143,6 @@ export default {
   display: flex;
   background: #fff;
   height: 100%;
-  min-height: 800px;
   border-radius: 8px;
   overflow: hidden;
   font-family: 'PingFang SC', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
@@ -1447,6 +1464,8 @@ export default {
   flex: 1;
   padding: 16px;
   overflow: hidden;
+  border: 1px solid #e5e6eb;
+  border-radius: 4px;
 }
 
 .chart-view,
@@ -1459,7 +1478,6 @@ export default {
 .chart-container {
   width: 100%;
   height: 100%;
-  min-height: 500px;
 }
 
 .table-container {
@@ -1577,14 +1595,34 @@ export default {
   line-height: 22px; /* 157.143% */
 }
 
+.pivot-sidebar-right .sidebar-header-collapse {
+  font-size: 14px;
+  color: #86909c;
+  cursor: pointer;
+  transition: color 0.2s;
+  &:hover {
+    color: #1d2129;
+  }
+}
+
 .config-form {
   flex: 1;
-  padding: 16px;
+  padding: 0 16px;
   overflow-y: auto;
+
+  .form-item:first-child {
+    margin-top: 16px;
+  }
 }
 
 .form-item {
-  margin-bottom: 20px;
+  margin-bottom: 16px;
+}
+
+.form-divider {
+  height: 1px;
+  background-color: #e5e6eb;
+  margin: 16px 0;
 }
 
 .form-label {
@@ -1669,8 +1707,8 @@ export default {
   position: relative;
   display: flex;
   align-items: center;
-  height: 32px;
-  padding: 0 12px;
+  gap: 4px;
+  padding: 4px 12px;
   background: #fff;
   border: 1px solid #e5e6eb;
   border-radius: 4px;
@@ -1689,6 +1727,17 @@ export default {
   gap: 8px;
   font-size: 14px;
   color: #1d2129;
+  .report-icon {
+    width: 16px;
+    height: 16px;
+    font-size: 16px;
+    line-height: 16px;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    margin-right: 0;
+    color: #007aff;
+  }
 }
 
 .select-value .placeholder {
@@ -1696,7 +1745,7 @@ export default {
 }
 
 .select-arrow {
-  color: #86909c;
+  color: #4e5969;
   transition: transform 0.2s;
 }
 

package/src/components/ProFilterView/index.vue

@@ -95,10 +95,7 @@
       <div slot="prefix">
         <slot name="prefix"></slot>
       </div>
-      <template
-        v-for="filter in slotFilters"
-        #[filter.slotName]="{ model }"
-      >
+      <template v-for="filter in slotFiltersWithValue" #[filter.slotName]="{ model }">
         <slot
           :name="filter.slotName"
           :model="model"
@@ -106,6 +103,15 @@
           :input="(val) => handleSlotInput(filter.value, val)"
         ></slot>
       </template>
+      <!-- 无 value 的 slot（如 startDate/endDate 多值绑定），传递 searchValue 让父组件自行管理 -->
+      <template v-for="filter in slotFiltersWithoutValue" #[filter.slotName]="{ model }">
+        <slot
+          :name="filter.slotName"
+          :model="model"
+          :search-value="searchValue"
+          :update-search-value="updateSearchValue"
+        ></slot>
+      </template>
       <div slot="suffix">
         <slot name="suffix"></slot>
       </div>
@@ -146,10 +152,7 @@
           :check-ids="form.keyIds"
           @saveCheckData="saveCheckData"
         >
-          <template
-            v-for="filter in slotFilters"
-            #[filter.slotName]="{ model }"
-          >
+          <template v-for="filter in slotFiltersWithValue" #[filter.slotName]="{ model }">
             <slot
               :name="filter.slotName"
               :model="model"
@@ -157,6 +160,15 @@
               :input="(val) => (searchForm[filter.value] = val)"
             ></slot>
           </template>
+          <!-- 无 value 的 slot（如 startDate/endDate 多值绑定），传递 searchForm 让父组件自行管理 -->
+          <template v-for="filter in slotFiltersWithoutValue" #[filter.slotName]="{ model }">
+            <slot
+              :name="filter.slotName"
+              :model="model"
+              :search-value="searchForm"
+              :update-search-value="(updates) => Object.assign(searchForm, updates)"
+            ></slot>
+          </template>
         </cl-advanced-filter>
         <advancedQuery
           v-else
@@ -166,10 +178,7 @@
           :filter-id="filterId"
           :buss-id="bussId"
         >
-          <template
-            v-for="filter in slotFilters"
-            #[filter.slotName]="{ model, value, input, disabled }"
-          >
+          <template v-for="filter in slotFiltersWithValue" #[filter.slotName]="{ model, value, input, disabled }">
             <slot
               :name="filter.slotName"
               :model="model"
@@ -178,6 +187,16 @@
               :disabled="disabled"
             ></slot>
           </template>
+          <!-- 无 value 的 slot（如 startDate/endDate 多值绑定），传递 searchForm 让父组件自行管理 -->
+          <template v-for="filter in slotFiltersWithoutValue" #[filter.slotName]="{ model, value, input, disabled }">
+            <slot
+              :name="filter.slotName"
+              :model="model"
+              :search-value="searchForm"
+              :update-search-value="(updates) => Object.assign(searchForm, updates)"
+              :disabled="disabled"
+            ></slot>
+          </template>
         </advancedQuery>
       </el-form>
       <div slot="footer" class="flex-box flex-c flex-v page-button-shadow">
@@ -271,15 +290,22 @@ export default {
     },
     // 筛选出类型为 slot 且在父组件提供了对应作用域插槽的筛选项
     slotFilters() {
-      return this.filterList.filter(
-        (item) => item.type === 'slot' && this.$scopedSlots[item.slotName]
-      )
+      return this.filterList.filter((item) => item.type === 'slot' && this.$scopedSlots[item.slotName])
+    },
+    // 筛选出有 value 字段的 slot 类型筛选项（用于 searchValue 初始化和值传递）
+    slotFiltersWithValue() {
+      return this.slotFilters.filter((item) => item.value)
+    },
+    // 筛选出无 value 字段的 slot 类型筛选项（如 startDate/endDate 多值绑定）
+    slotFiltersWithoutValue() {
+      return this.slotFilters.filter((item) => !item.value)
     },
     getInitialSearchValue() {
       const obj = {}
-      // 遍历 filterList，为每个 type 为 slot 的项初始化值
+      // 遍历 filterList，为每个 type 为 slot 且有 value 字段的项初始化值
+      // 注意：跳过无 value 的 slot（如 startDate/endDate 多值绑定），这些由父组件在 slot 内部管理
       this.filterList.forEach((item) => {
-        if (item.type === 'slot') {
+        if (item.type === 'slot' && item.value) {
           obj[item.value] = undefined
         }
       })
@@ -340,8 +366,14 @@ export default {
     this.searchValue = { ...this.getInitialSearchValue, ...this.initialValue }
   },
   methods: {
+    updateSearchValue(updates) {
+      console.log(updates, 'updates')
+      Object.assign(searchValue, updates)
+    },
     // 处理 slot 类型字段的输入事件，同时更新 searchValue 和 initialValue
     handleSlotInput(fieldName, val) {
+      // 防御性检查：如果 fieldName 无效，不执行任何操作
+      if (!fieldName) return
       // 更新 searchValue
       this.searchValue[fieldName] = val
       // 同步更新 initialValue，确保双向绑定生效
@@ -410,12 +442,16 @@ export default {
       })
       this.searchValue = { ...this.getInitialSearchValue, ...preserved }
       // 直接构建 payload，绕过 filterObj 避免 initialValue 重新注入
-      this.$emit('filter', {
-        conditionGroups: this.conditionGroups,
-        searchValue: { ...this.searchValue },
-        viewId: this.selectItem ? this.selectItem.viewId : null,
-        viewType: this.selectItem ? this.selectItem.viewType : null
-      }, 'clear')
+      this.$emit(
+        'filter',
+        {
+          conditionGroups: this.conditionGroups,
+          searchValue: { ...this.searchValue },
+          viewId: this.selectItem ? this.selectItem.viewId : null,
+          viewType: this.selectItem ? this.selectItem.viewType : null
+        },
+        'clear'
+      )
     },
     isEnter() {
       this.$rulesValidateForm('ruleValidate', (valid) => {