n20-common-lib 3.0.35 → 3.0.37

package/src/components/FileUploadTable/not.svg

@@ -0,0 +1,29 @@
+<svg width="100" height="100" viewBox="0 0 100 100" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_4435_91993)">
+<path d="M17.5 5H71.3365L92.5 26.3423V85C92.5 90.5229 88.0229 95 82.5 95H17.5C11.9772 95 7.5 90.5229 7.5 85V15C7.5 9.47715 11.9772 5 17.5 5Z" fill="#D1D5DB"/>
+<mask id="mask0_4435_91993" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="7" y="5" width="86" height="90">
+<path d="M17.5 5H71.3365L92.5 26.3423V85C92.5 90.5229 88.0229 95 82.5 95H17.5C11.9772 95 7.5 90.5229 7.5 85V15C7.5 9.47715 11.9772 5 17.5 5Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_4435_91993)">
+<g filter="url(#filter0_d_4435_91993)">
+<path d="M71.2602 16.3363L71.2602 4.9999L92.5001 26.3363L81.2602 26.3363C75.7374 26.3363 71.2602 21.8592 71.2602 16.3363Z" fill="black"/>
+</g>
+<path d="M71.2602 16.3363L71.2602 4.9999L92.5001 26.3363L81.2602 26.3363C75.7374 26.3363 71.2602 21.8592 71.2602 16.3363Z" fill="white" fill-opacity="0.92"/>
+</g>
+</g>
+<defs>
+<filter id="filter0_d_4435_91993" x="53.2603" y="-16" width="57.2397" height="57.3359" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="-3"/>
+<feGaussianBlur stdDeviation="9"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.4 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_4435_91993"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_4435_91993" result="shape"/>
+</filter>
+<clipPath id="clip0_4435_91993">
+<rect width="100" height="100" fill="white"/>
+</clipPath>
+</defs>
+</svg>

package/src/components/ProFilterView/advancedQuery.vue

@@ -177,7 +177,7 @@
       <el-button v-if="value.length > 0" type="text" class="add-condition-btn" @click.stop="addCondition(0)">
         <i class="v3-icon-add-fill"></i> 添加条件
       </el-button>
-      <el-button type="text" class="add-group-btn" @click.stop="addConditionGroup(groupIndex)">
+      <el-button type="text" class="add-group-btn" @click.stop="addConditionGroup()">
         <i class="v3-icon-add-fill"></i> 添加条件组
       </el-button>
     </div>
@@ -461,35 +461,39 @@ export default {
   },
   methods: {
     // 查询支持可配置高级查询的字段
-    getAdvancedQueryFields() {
-      axios.get('/bems/query/viewColumn/getColumnInfo', { bussId: this.bussId }, { loading: false }).then((res) => {
-        //res.data=[]
-        // 过滤可筛选的字段，保留完整对象信息
-        const searchableFields = res.data.filter((item) => {
-          return item.searchable === '1'
-        })
-        // 用 filterList 去匹配可搜索的字段，并设置 advancedQueryType
-        this.canSetFilter = this.filterList
-          .filter((item) => {
-            return searchableFields.some(
-              (field) => field.fieldCode === item.fieldCode || field.fieldCode === item.value
-            )
-          })
-          .map((item) => {
-            // 查找匹配的字段配置，获取 fieldType
-            const matchedField = searchableFields.find(
-              (field) => field.fieldCode === item.fieldCode || field.fieldCode === item.value
-            )
-            if (matchedField) {
-              // 设置 advancedQueryType 为 fieldType
-              this.$set(item, 'advancedQueryType', Number(matchedField.fieldType))
-              this.$set(item, 'value', matchedField.fieldCode)
-            }
-            return item
-          })
-        // 再次过滤，确保数据正确
-        this.filterInvalidConditions()
+    async getAdvancedQueryFields() {
+      const { code, data } = await axios.get(
+        '/bems/query/viewColumn/getColumnInfo',
+        { bussId: this.bussId },
+        { loading: false }
+      )
+      if (code !== 200) return
+
+      // 过滤可筛选的字段，保留完整对象信息
+      const searchableFields = data.filter((item) => {
+        return item.searchable === '1'
       })
+      console.log(this.filterList, '10086')
+
+      // 用 filterList 去匹配可搜索的字段，并设置 advancedQueryType
+      this.canSetFilter = this.filterList
+        .filter((item) => {
+          return searchableFields.some((field) => field.fieldCode === item.fieldCode || field.fieldCode === item.value)
+        })
+        .map((item) => {
+          // 查找匹配的字段配置，获取 fieldType
+          const matchedField = searchableFields.find(
+            (field) => field.fieldCode === item.fieldCode || field.fieldCode === item.value
+          )
+          if (matchedField) {
+            // 设置 advancedQueryType 为 fieldType
+            this.$set(item, 'advancedQueryType', Number(matchedField.fieldType))
+            this.$set(item, 'value', matchedField.fieldCode)
+          }
+          return item
+        })
+      // 再次过滤，确保数据正确
+      this.filterInvalidConditions()
     },
     // 过滤掉无效的条件（字段不在可筛选列表中）
     filterInvalidConditions() {

package/src/components/ProFilterView/index.vue

@@ -2,43 +2,48 @@
   <div class="ProFilterView">
     <div class="flex-box flex-lr flex-v top">
       <div class="flex-box flex-v">
-        <el-popover v-model="stVisible" placement="bottom" trigger="click" class="m-r">
-          <el-button slot="reference" class="botton" :class="{ activiti: selectedItem !== '所有的' }">
+        <el-popover
+          v-model="stVisible"
+          popper-class="pro-filter-view-popover"
+          placement="bottom-start"
+          trigger="click"
+          class="m-r"
+        >
+          <el-button slot="reference" class="botton" :class="{ activiti: selectedItem !== '无视图' }">
             <div class="flex-box flex-v m-r">
               <i class="v3-icon-inbox"></i>
-              <div style="margin: 0 8px">{{ selectedItem }}</div>
+              <div class="popover-title" style="margin: 0 8px" :title="selectedItem">{{ selectedItem }}</div>
               <i class="n20-icon-xiala-moren"></i>
             </div>
           </el-button>
           <div class="p-s">
-            <cl-input-search v-model="val" class="input-w" placeholder="请输入" />
-            <div style="color: var(--color-text-secondary); margin-top: 8px">{{ $lc('自定义视图') }}</div>
-            <cl-drag-list class="flex-item" :list="filteredList" :hide-delete="true" @change="fn">
-              <template v-slot="{ item }">
-                <div
-                  class="proFilterView-list-item"
-                  :class="{ 'is-selected': selectedItem === item.viewName }"
-                  @click="handleSelect(item)"
-                >
-                  <span>{{ item.viewName }}</span>
-                  <i v-if="selectedItem === item.viewName" class="el-icon-check selected-icon"></i>
-                  <el-button
-                    v-if="selectedItem !== item.viewName && item.viewName !== '所有的'"
-                    type="text"
-                    size="mini"
-                    @click.stop="edit(item)"
-                    >{{ $lc('编辑') }}</el-button
-                  >
-                  <el-button
-                    v-if="selectedItem !== item.viewName && item.viewName !== '所有的'"
-                    type="text"
-                    size="mini"
-                    @click.stop="deleteOne(item)"
-                    >{{ $lc('删除') }}</el-button
-                  >
-                </div>
-              </template>
-            </cl-drag-list>
+            <cl-input-search v-model="val" class="w-100p" placeholder="请输入关键字" />
+            <div style="color: var(--color-text-secondary); margin: 12px 0 8px 0">{{ $lc('自定义视图') }}</div>
+            <div class="filter-view-wrapper">
+              <cl-drag-list class="flex-item" :list="filteredList" :hide-delete="true" @change="fn">
+                <template v-slot="{ item }">
+                  <div class="proFilterView-list-item" :class="{ 'is-selected': selectedItem === item.viewName }">
+                    <span class="proFilterView-list-item__name" :title="item.viewName" @click="handleSelect(item)">{{
+                      item.viewName
+                    }}</span>
+                    <i v-if="selectedItem === item.viewName" class="el-icon-check selected-icon"></i>
+                    <el-dropdown
+                      v-if="selectedItem !== item.viewName && item.viewName !== '无视图'"
+                      trigger="click"
+                      class="proFilterView-list-item__more"
+                      @command="(command) => handleCommand(command, item)"
+                    >
+                      <i class="v3-icon-more"></i>
+                      <el-dropdown-menu slot="dropdown">
+                        <el-dropdown-item command="edit">{{ $lc('编辑') }}</el-dropdown-item>
+                        <el-dropdown-item command="delete">{{ $lc('删除') }}</el-dropdown-item>
+                      </el-dropdown-menu>
+                    </el-dropdown>
+                  </div>
+                </template>
+              </cl-drag-list>
+            </div>
+            <div class="ProFilterView_divider"></div>
             <div class="flex-box flex-v flex-l ProFilterView-add">
               <img src="./plus.svg" alt="" />
               <div @click="add">{{ $lc('新建视图') }}</div>
@@ -104,7 +109,7 @@
           prop="viewName"
           :rules="[{ required: true, message: '请输入', trigger: 'blur' }]"
         >
-          <el-input maxlength="30" show-word-limit v-model="form.viewName" />
+          <el-input v-model="form.viewName" maxlength="30" show-word-limit />
         </el-form-item>
         <div class="flex-box flex-lr flex-v">
           <div>{{ $lc('数据范围') }}</div>
@@ -201,8 +206,8 @@ export default {
   data() {
     return {
       val: '',
-      list: ['所有的'],
-      selectedItem: '所有的', // 默认选中第一项
+      list: ['无视图'],
+      selectedItem: '无视图', // 默认选中第一项
       stVisible: false,
       visible: false,
       isAdd: false,
@@ -225,11 +230,16 @@ export default {
     }
   },
   computed: {
+    /**
+     * 本地搜索过滤视图列表
+     * @returns {Array} 根据 val 关键字过滤后的视图列表；val 为空时返回完整列表
+     */
     filteredList() {
       if (!this.val) {
         return this.list
       }
-      return this.list.filter((item) => item.toLowerCase().includes(this.val.toLowerCase()))
+      const keyword = this.val.toLowerCase()
+      return this.list.filter((item) => item.viewName && item.viewName.toLowerCase().includes(keyword))
     },
     getInitialSearchValue() {
       const obj = {}
@@ -262,6 +272,13 @@ export default {
     this.searchValue = { ...this.getInitialSearchValue }
   },
   methods: {
+    handleCommand(command, item) {
+      const commandMap = {
+        edit: () => this.edit(item),
+        delete: () => this.deleteOne(item)
+      }
+      commandMap[command]()
+    },
     setOptions(id, opts) {
       this.$refs.filter.setOptions(id, opts)
       this.filterList.forEach((item) => {
@@ -305,7 +322,7 @@ export default {
           })
           this.list = [
             {
-              viewName: '所有的'
+              viewName: '无视图'
             },
             ...list
           ]
@@ -320,7 +337,7 @@ export default {
         .catch((err) => {
           this.list = [
             {
-              viewName: '所有的'
+              viewName: '无视图'
             }
           ]
         })
@@ -342,6 +359,8 @@ export default {
       this.searchForm = {
         ...this.getInitialSearchValue
       }
+      // 新建时重置切换缓存
+      this._savedViewConfigs = {}
     },
     // 修改
     edit(item, isRefresh = false) {
@@ -354,10 +373,17 @@ export default {
       // 赋值操作
       this.form = item
       this.viewId = item.viewId
+      // 初始化两种类型的已保存数据缓存，供 typeChange 切换时恢复使用
+      this._savedViewConfigs = {}
       if (item.viewType === '0') {
-        this.searchForm = { ...this.getInitialSearchValue, ...JSON.parse(item.viewConfig) }
+        const parsed = JSON.parse(item.viewConfig || '{}')
+        this.searchForm = { ...this.getInitialSearchValue, ...parsed }
+        this._savedViewConfigs['0'] = { ...parsed }
       } else {
-        this.conditionGroups = JSON.parse(item.viewConfig)?.conditionGroups || []
+        const parsed = JSON.parse(item.viewConfig || '{}')
+        this.conditionGroups = parsed.conditionGroups || []
+
+        this._savedViewConfigs['1'] = { conditionGroups: this.conditionGroups }
       }
     },
     // 保存筛选条件
@@ -377,29 +403,51 @@ export default {
         viewConfig = JSON.stringify({ conditionGroups: this.conditionGroups })
         keyIds = []
       }
+      console.log(this.conditionGroups)
       this.form.viewConfig = viewConfig
-      if (this.isAdd) {
-        if (this.form.viewName === '') {
+
+      const hasEmptyValue = this.conditionGroups.some((group) =>
+        group.conditions.some((condition) => {
+          const val = condition.value
+          return val === null || val === undefined || val === '' || (Array.isArray(val) && val.length === 0)
+        })
+      )
+
+      this.$refs.form.validate(async (valid) => {
+        if (!valid) {
           this.$message.error('请输入视图名称')
-          return false
+          return
         }
-      }
-      // 保存筛选视图
-      const obj = {
-        viewName: this.form.viewName,
-        viewType: this.form.viewType,
-        bussId: this.bussId,
-        viewConfig: this.form.viewConfig,
-        keyIds: JSON.stringify(keyIds),
-        viewId: this.viewId
-      }
-      axios.post('/bems/query/viewColumn/saveOrUpdateViewInfo', obj).then((res) => {
-        if (res.code !== 200) {
-          return false
+
+        if (this.form.viewType === '0' && !keyIds.length) {
+          this.$message.warning('至少添加一个条件')
+          return
+        }
+        if (this.form.viewType === '1') {
+          if (!this.conditionGroups.length || hasEmptyValue) {
+            this.$message.warning('至少添加一个条件')
+            return
+          }
         }
-        this.visible = false
-        this.$message.success('保存成功')
-        this.getFilterList(this.viewId)
+
+        // 保存筛选视图
+        const obj = {
+          viewName: this.form.viewName,
+          viewType: this.form.viewType,
+          bussId: this.bussId,
+          viewConfig: this.form.viewConfig,
+          keyIds: JSON.stringify(keyIds),
+          viewId: this.viewId
+        }
+
+        axios.post('/bems/query/viewColumn/saveOrUpdateViewInfo', obj).then((res) => {
+          if (res.code !== 200) {
+            return false
+          }
+          this.visible = false
+          this.$message.success('保存成功')
+          this.getFilterList(this.viewId)
+        })
       })
     },
     // 删除
@@ -423,7 +471,7 @@ export default {
       this.stVisible = false
       this.selectItem = item
       this.selectedItem = item.viewName
-      if (item.viewName === '所有的') {
+      if (item.viewName === '无视图') {
         this.selectItem = ''
         this.searchValue = {}
         this.conditionGroups = []
@@ -441,12 +489,34 @@ export default {
     fn(list) {
       console.log('当前list:', list)
     },
-    // 查询切换
+    /**
+     * 查询类型切换（基础查询 <-> 高级查询）
+     * 切换时优先从已保存的 viewConfig 中恢复对应类型的数据，
+     * 若无已保存数据则重置为初始值
+     */
     typeChange() {
       this.form.viewType = this.form.viewType === '0' ? '1' : '0'
+      // 切换到基础查询（viewType === '0'）
       if (this.form.viewType === '0') {
         this.conditionGroups = []
+        // 若已有保存的 viewConfig 且原始类型也是基础查询，则恢复已保存的搜索条件
+        const savedConfig = this._savedViewConfigs && this._savedViewConfigs['0']
+        if (savedConfig) {
+          this.searchForm = { ...this.getInitialSearchValue, ...savedConfig }
+        } else {
+          this.searchForm = { ...this.getInitialSearchValue }
+        }
       } else {
+        // 切换到高级查询（viewType === '1'），先保存当前基础查询数据
+        if (!this._savedViewConfigs) this._savedViewConfigs = {}
+        this._savedViewConfigs['0'] = { ...this.searchForm }
+        // 恢复已保存的高级查询数据，若无则重置
+        const savedConfig = this._savedViewConfigs['1']
+        if (savedConfig) {
+          this.conditionGroups = savedConfig.conditionGroups || []
+        } else {
+          this.conditionGroups = []
+        }
         this.searchForm = { ...this.getInitialSearchValue }
       }
     }