n20-common-lib 3.2.2 → 3.2.4

package/package.json

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

package/src/components/ProFilterView/advancedQuery.vue

@@ -185,12 +185,13 @@
 </template>
 
 <script>
+import axios from '../../utils/axios.js'
 import ClDatePicker from '../DatePicker/index.vue'
 import ClDatePickerPor from '../DatePicker/por.vue'
 import ClInputNumber from '../InputNumber/index.vue'
 import ClInputNumberRange from '../InputNumber/numberRange.vue'
 import ClInputSearch from '../InputSearch/index.vue'
-import axios from '../../utils/axios.js'
+
 export default {
   name: 'AdvancedQuery',
   components: {
@@ -554,7 +555,16 @@ export default {
     updatefield(field, row) {
       this.$set(row, 'advancedQueryType', field.advancedQueryType)
       if (field.advancedQueryType === 4) {
-        this.$set(row, 'options', field.options)
+        field.options = field?.options?.map((item) => {
+          if (field.props?.labelKey) {
+            item.label = item[field.props.labelKey]
+          }
+          if (field.props?.valueKey) {
+            item.value = item[field.props.valueKey]
+          }
+          return item
+        })
+        this.$set(row, 'options', field?.options)
       }
       // slot 类型特殊处理
       if (field.type === 'slot') {
@@ -604,42 +614,16 @@ export default {
     // 获取字段选项
     getFieldOptions(field) {
       const fieldConfig = this.fieldOptions.find((f) => f.value === field)
-      return fieldConfig ? fieldConfig.options : []
+      return fieldConfig ? fieldConfig?.options : []
     },
     // 更新操作符对应的值
     updateOperatorOptions(field, condition) {
+      if (condition.valueType === 'slot') return
       this.$set(condition, 'valueType', field.type)
       this.$set(condition, 'value', '')
       if (field.type === 'dateRangePicker' || field.type === 'inputNumberRange') {
         this.$set(condition, 'value', {})
       }
-
-      /* if (condition.operator === 'between') {
-        const fieldType = this.getFieldType(condition.field)
-        if (fieldType === 'number') {
-          condition.value = { start: undefined, end: undefined }
-        } else if (fieldType === 'date' || fieldType === 'daterange') {
-          condition.value = []
-        } else {
-          condition.value = { start: '', end: '' }
-        }
-      } else {
-        const fieldType = this.getFieldType(condition.field)
-        if (fieldType === 'select') {
-          condition.value = []
-        } else {
-          condition.value = ''
-        }
-      } */
-    },
-    // 提交表单
-    submitForm() {
-      /* const formData = {
-        value: this.value
-      }
-      this.$emit('confirm', formData)
-      this.$emit('close') */
-      console.log(this.value, 'this.value')
     }
   }
 }

package/src/components/ProFilterView/index.vue

@@ -4,7 +4,7 @@
       <slot name="leftContent"></slot>
       <div class="flex-box flex-v">
         <el-popover
-          v-if="bussId"
+          v-if="bussId && isFilter"
           v-model="viewPopoverVisible"
           popper-class="pro-filter-view-popover"
           placement="bottom-start"
@@ -52,7 +52,7 @@
             </div>
           </div>
         </el-popover>
-        <el-button v-if="bussId && selectItem" class="activiti m-r" @click="edit(selectItem, true)">
+        <el-button v-if="bussId && selectItem && isFilter" class="activiti m-r" @click="edit(selectItem, true)">
           <div class="flex-box flex-v">
             <!-- <img src="./find.svg" alt="" /> -->
             <i class="v3-icon-find"></i>
@@ -67,14 +67,19 @@
           </div>
         </el-button>
         <div class="flex-box flex-v">
-          <el-button icon="v3-icon-filter" class="m-r-s botton" @click="filterExpanded = !filterExpanded">{{
-            '筛选' | $lc
-          }}</el-button>
+          <el-button
+            v-if="isFilter"
+            icon="v3-icon-filter"
+            class="m-r-s botton"
+            @click="filterExpanded = !filterExpanded"
+            >{{ '筛选' | $lc }}</el-button
+          >
           <slot name="rightContent"></slot>
         </div>
       </div>
     </div>
     <cl-advanced-filter
+      v-if="isFilter"
       ref="filter"
       class="filter"
       :class="{ 'is-hidden': !filterExpanded }"
@@ -260,6 +265,11 @@ export default {
     autoExpandWithValues: {
       type: Boolean,
       default: false
+    },
+    // 是否显示筛选按钮及筛选区域，为 false 时不显示筛选按钮、视图相关 UI，且不请求筛选相关接口
+    isFilter: {
+      type: Boolean,
+      default: true
     }
   },
   data() {
@@ -327,16 +337,11 @@ export default {
     filterObj() {
       const filterKeys = new Set()
       this.filterList.forEach((item) => {
-        ;[
-          item.value,
-          item.startDate,
-          item.endDate,
-          item.startValue,
-          item.endValue,
-          ...(item.slotFields || [])
-        ].forEach((key) => {
-          if (key) filterKeys.add(key)
-        })
+        ;[item.value, item.startDate, item.endDate, item.startValue, item.endValue, ...(item.slotFields || [])].forEach(
+          (key) => {
+            if (key) filterKeys.add(key)
+          }
+        )
       })
 
       const extraInitialValues = {}
@@ -383,14 +388,16 @@ export default {
     }
   },
   mounted() {
-    // 只有在有 bussId 时才获取视图列表
-    if (this.bussId) {
+    // 只有在有 bussId 且 isFilter 为 true 时才获取视图列表
+    if (this.bussId && this.isFilter) {
       this.getFilterList()
     }
     // 合并初始筛选值：slot 字段使用默认值，其他字段使用 initialValue 传入的值
-    this.searchValue = { ...this.getInitialSearchValue, ...this.initialValue }
-    // 初始挂载后根据筛选值情况决定是否自动展开
-    this.checkAndAutoExpand()
+    if (this.isFilter) {
+      this.searchValue = { ...this.getInitialSearchValue, ...this.initialValue }
+      // 初始挂载后根据筛选值情况决定是否自动展开
+      this.checkAndAutoExpand()
+    }
   },
   methods: {
     /**
@@ -537,8 +544,8 @@ export default {
     },
     // 通过bussId拿取视图列表
     getFilterList(viewId) {
-      // 如果没有 bussId，不获取视图列表
-      if (!this.bussId) {
+      // 如果没有 bussId 或 isFilter 为 false，不获取视图列表
+      if (!this.bussId || !this.isFilter) {
         return
       }