n20-common-lib 3.2.13 → 3.2.15

package/package.json

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

package/src/components/ProFilterView/advancedQuery.vue

@@ -67,9 +67,19 @@
               </el-select>
               <!-- 值输入区域 -->
               <div class="value-inputs">
+                <!-- slot类型 - 支持自定义插槽 -->
+                <slot
+                  v-if="condition.valueType === 'slot'"
+                  :name="condition.slotName"
+                  :model="condition"
+                  :value="condition.value"
+                  :input="(val) => (condition.value = val)"
+                  :disabled="[5, 6].includes(condition.operator)"
+                ></slot>
+
                 <!-- 下拉框 -->
                 <el-select
-                  v-if="condition.valueType === 'select' || condition.valueType === 'selectMultiple'"
+                  v-else-if="condition.valueType === 'select' || condition.valueType === 'selectMultiple'"
                   v-model="condition.value"
                   class="input-w"
                   placeholder="请选择"
@@ -146,15 +156,6 @@
                   clearable
                   @change="searchFn"
                 />
-                <!-- slot类型 - 支持自定义插槽 -->
-                <slot
-                  v-else-if="condition.valueType === 'slot'"
-                  :name="condition.slotName"
-                  :model="condition"
-                  :value="condition.value"
-                  :input="(val) => (condition.value = val)"
-                  :disabled="[5, 6].includes(condition.operator)"
-                ></slot>
               </div>
               <!-- 添加按钮 -->
               <el-button type="text" class="add-btn" icon="v3-icon-add-fill" @click.stop="addCondition(groupIndex)" />
@@ -452,14 +453,6 @@ export default {
       options: []
     }
   },
-  mounted() {
-    // 先基于 filterList 初始化 canSetFilter，避免闪烁
-    this.canSetFilter = this.filterList
-    // 立即过滤一次无效条件
-    this.filterInvalidConditions()
-    // 然后再发起异步请求获取更精确的字段配置
-    this.getAdvancedQueryFields()
-  },
   watch: {
     canSetFilter: {
       handler(newVal) {
@@ -486,6 +479,14 @@ export default {
       immediate: true
     }
   },
+  mounted() {
+    // 先基于 filterList 初始化 canSetFilter，避免闪烁
+    this.canSetFilter = this.filterList
+    // 立即过滤一次无效条件
+    this.filterInvalidConditions()
+    // 然后再发起异步请求获取更精确的字段配置
+    this.getAdvancedQueryFields()
+  },
   methods: {
     // 查询支持可配置高级查询的字段
     async getAdvancedQueryFields() {
@@ -618,8 +619,7 @@ export default {
     },
     // 更新操作符对应的值
     updateOperatorOptions(field, condition) {
-      // if (condition.valueType === 'slot') return
-      this.$set(condition, 'valueType', field.type)
+      this.$set(condition, 'valueType', condition.valueType === 'slot' ? condition.valueType : field.type)
       this.$set(condition, 'value', '')
       if (field.type === 'dateRangePicker' || field.type === 'inputNumberRange') {
         this.$set(condition, 'value', {})

package/src/components/ProFilterView/index.vue

@@ -142,13 +142,9 @@
         </el-form-item>
         <div class="flex-box flex-lr flex-v">
           <div>{{ $lc('数据范围') }}</div>
-          <div
-            v-if="showTypeSwitch"
-            style="color: var(--color-primary); cursor: pointer"
-            @click="typeChange"
-          >
+          <div v-if="showTypeSwitch" style="color: var(--color-primary); cursor: pointer" @click="typeChange">
             <i class="v3-icon-switch"></i>
-            <span v-if="form.viewType === VIEW_TYPE.ADVANCED"> {{ $lc('高级查询') }}</span>
+            <span v-if="form.viewType === VIEW_TYPE.BASIC"> {{ $lc('高级查询') }}</span>
             <span v-else> {{ $lc('基础查询') }}</span>
           </div>
         </div>
@@ -518,10 +514,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) {
@@ -648,9 +644,7 @@ export default {
     },
     // 保存筛选条件
     saveCheckData(data = []) {
-      this.form.keyIds = data
-        .map((item) => item.id)
-        .filter((id) => id !== undefined && id !== null && id !== '')
+      this.form.keyIds = data.map((item) => item.id).filter((id) => id !== undefined && id !== null && id !== '')
     },
     // 同步弹窗内基础查询筛选器当前选中项，覆盖 filterId 存在时 saveCheckData 不触发的场景
     syncDialogFilterKeyIds() {

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

@@ -634,6 +634,10 @@ export default {
     getOperateBtns: {
       type: Function,
       default: null
+    },
+    isExpand: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -656,11 +660,11 @@ export default {
       isOperateFixed: true, // 操作按钮是否固定为列模式
       hoverHeaderProp: null, // 当前悬停表头列的 prop
       hoverIconKey: null, // 当前悬停的静态列头图标标识
-      isExpand: false,
       isExport: false, // 是否导出
       dialogVisible: false, // 显示列设置对话框
       checkColumns: this.filterDefaultHidden(this.columns), // 显示列设置对话框中已选择的列（默认过滤 defaultHidden 列）
-      headerHeight: 40 // 表头实际高度，骨架屏定位用
+      headerHeight: 40, // 表头实际高度，骨架屏定位用
+      innerIsExpand: this.isExpand // 本地展开状态，避免直接修改 prop
     }
   },
   computed: {
@@ -736,6 +740,9 @@ export default {
     size(val) {
       this.sizeC = val
     },
+    isExpand(val) {
+      this.innerIsExpand = val
+    },
     data() {
       // 翻页清除选中
       if (this.clearSelect) {
@@ -881,10 +888,11 @@ export default {
       const topLevelRows = this.data || []
       if (topLevelRows.length === 0) return
       // 切换展开状态：当前已展开则折叠，当前已折叠则展开
-      const nextExpand = !this.isExpand
+      const nextExpand = !this.innerIsExpand
       // setTreeExpand 返回 Promise，await 确保展开动作完成后再更新图标状态
       await $table.setTreeExpand(topLevelRows, nextExpand)
-      this.isExpand = nextExpand
+      this.innerIsExpand = nextExpand
+      this.$emit('update:isExpand', nextExpand)
     },
     /**
      * 同步单行手动展开/折叠后的图标状态
@@ -897,7 +905,8 @@ export default {
       if (topLevelRows.length === 0) return
       // 若顶层行全部处于展开状态则认为是"已展开"，否则为"未全部展开"
       const expandSet = new Set(expandRecords)
-      this.isExpand = topLevelRows.every((row) => expandSet.has(row))
+      this.innerIsExpand = topLevelRows.every((row) => expandSet.has(row))
+      this.$emit('update:isExpand', this.innerIsExpand)
     },
     // 锁定列：将该列 fixed 设为 'left'，直接修改 prop 对象并刷新表格
     lockColumn(item) {