n20-common-lib 3.0.15 → 3.0.16

package/package.json

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

package/src/assets/css/filter.scss

@@ -12,11 +12,11 @@
   width: 100%;
   font-size: 14px;
   .top {
-    padding: 12px 16px;
+    padding: 12px 0px;
     border-bottom: 1px solid #e5e6eb !important;
   }
   .filter {
-    padding: 12px 16px 4px;
+    padding: 12px 0px 4px;
     border-bottom: 1px solid #e5e6eb !important;
   }
   .flex-item {

package/src/components/AdvancedFilter/index.vue

@@ -231,14 +231,15 @@ export default {
         viewName: this.form.viewName,
         viewType: '0',
         bussId: this.bussId,
-        filterId: this.filterId,
-        viewConfig: JSON.stringify(this.model)
+        viewConfig: JSON.stringify(this.model),
+        keyIds: JSON.stringify(this.checkList)
       }
       console.log(obj, 'obj')
       axios.post(`/bems/query/viewColumn/saveOrUpdateViewInfo`, obj).then((res) => {
         if (res.code === 200) {
           this.stVisible = false
           this.$message.success('保存成功')
+          this.$emit('refresh')
         }
       })
     },
@@ -466,7 +467,7 @@ export default {
     getFilterList() {
       if (!this.filterId) {
         if (this.checkIds.length === 0) {
-          this.mackData(this.filterList)
+          this.GroupData = []
         } else {
           // 按照 checkIds 的顺序过滤和排序
           const sortedList = this.filterList

package/src/components/Dialog/index.vue

@@ -19,11 +19,6 @@ export default {
     closeOnClickModal: {
       type: Boolean,
       default: false
-    },
-    // 自定义距离顶部的距离，默认居中显示
-    top: {
-      type: String,
-      default: '0'
     }
   },
   watch: {
@@ -37,15 +32,6 @@ export default {
         } else {
           this.$el.querySelector('.el-dialog__header').style.borderBottom = ''
         }
-        // 使用 CSS transform 实现居中，避免内容变化时位置改变
-        this.$nextTick(() => {
-          const dialog = this.$el.querySelector('.el-dialog')
-          if (dialog && this.top === '0') {
-            dialog.style.position = 'relative'
-            dialog.style.top = '50%'
-            dialog.style.transform = 'translateY(-50%)'
-          }
-        })
       }
     }
   }

package/src/components/ProFilterView/advancedQuery.vue

@@ -225,6 +225,7 @@ export default {
   },
   data() {
     return {
+      canSetFilter: [],
       // 字段配置
       fieldOptions: [
         { label: '分派账户所属机构', value: 'accountOrg', type: 'select', options: ['机构1', '机构2', '机构3'] },
@@ -461,8 +462,31 @@ export default {
   methods: {
     // 查询支持可配置高级查询的字段
     getAdvancedQueryFields() {
-      axios.get('/bems/query/viewColumn/getColumnInfo', { bussId: this.bussId }).then((res) => {
-        console.log(res, 'res')
+      axios.get('/bems/query/viewColumn/getColumnInfo', { bussId: this.bussId }, { loading: false }).then((res) => {
+        // 过滤可筛选的字段，保留完整对象信息
+        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
+          })
+        console.log(this.canSetFilter, 'canSetFilter')
       })
     },
     // 修改字段

package/src/components/ProFilterView/index.vue

@@ -17,20 +17,20 @@
               <template v-slot="{ item }">
                 <div
                   class="proFilterView-list-item"
-                  :class="{ 'is-selected': selectedItem === item.name }"
+                  :class="{ 'is-selected': selectedItem === item.viewName }"
                   @click="handleSelect(item)"
                 >
-                  <span>{{ item.name }}</span>
-                  <i v-if="selectedItem === item.name" class="el-icon-check selected-icon"></i>
+                  <span>{{ item.viewName }}</span>
+                  <i v-if="selectedItem === item.viewName" class="el-icon-check selected-icon"></i>
                   <el-button
-                    v-if="selectedItem !== item.name && item.name !== '所有的'"
+                    v-if="selectedItem !== item.viewName && item.viewName !== '所有的'"
                     type="text"
                     size="mini"
                     @click.stop="edit(item)"
                     >{{ $lc('编辑') }}</el-button
                   >
                   <el-button
-                    v-if="selectedItem !== item.name && item.name !== '所有的'"
+                    v-if="selectedItem !== item.viewName && item.viewName !== '所有的'"
                     type="text"
                     size="mini"
                     @click.stop="deleteOne(item)"
@@ -45,7 +45,7 @@
             </div>
           </div>
         </el-popover>
-        <el-button v-if="selectItem" class="activiti m-r" @click="edit(selectItem)">
+        <el-button v-if="selectItem" class="activiti m-r" @click="edit(selectItem, true)">
           <div class="flex-box flex-v">
             <!-- <img src="./find.svg" alt="" /> -->
             <i class="iconfont icon-find"></i>
@@ -53,7 +53,7 @@
               {{
                 `视图数据范围（${
                   (selectItem.keyIds && selectItem.keyIds.length) ||
-                  (selectItem.conditionGroups && selectItem.conditionGroups.length)
+                  (this.conditionGroups && this.conditionGroups.length)
                 }）`
               }}
             </div>
@@ -78,6 +78,7 @@
       @clear="handleClear"
       @enter="filterFn"
       @change="changeFn"
+      @refresh="getFilterList"
     >
       <!-- 使用作用域插槽传递 searchValue -->
       <template v-for="filter in filterList.filter((item) => item.type === 'slot')" #[filter.slotName]="{ model }">
@@ -217,7 +218,9 @@ export default {
       // 视图筛选值
       searchForm: {},
       // 普通筛选值
-      searchValue: {}
+      searchValue: {},
+      viewId: undefined,
+      isRefresh: false
     }
   },
   computed: {
@@ -265,7 +268,6 @@ export default {
           item.options = opts
         }
       })
-      console.log(this.filterList, 'filterList updated')
     },
     changeFn(value) {
       console.log('changeFn', value)
@@ -293,151 +295,22 @@ export default {
     // 通过filterId拿取视图列表
     getFilterList() {
       let list = []
-      axios.post(`/bems/query/viewColumn/getViewInfo`, { bussId: this.bussId }).then((res) => {
-        console.log(res)
-      })
-      /*  list = [
-        {
-          userNo: '001', // 用户编号
-          pageNo: 'test1', // 页面编号
-          viewId: '2', // 视图编号唯一值
-          name: '测试视图2', // 视图名称
-          viewType: '0', // 0 基础查询 1高级查询
-          keyIds: [1, 3, 14], //选中的条件字段 高级查询则为空
-          searchForm: {
-            //筛选条件值
-            seeValue: '2',
-            qxfz: ['1', '2', '3'],
-            types: []
+      axios.get(`/bems/query/viewColumn/getViewInfo`, { bussId: this.bussId }).then((res) => {
+        list = res.data.map((item) => {
+          item.keyIds = item.keyIds ? JSON.parse(item.keyIds) : []
+          return item
+        })
+        this.list = [
+          {
+            viewName: '所有的'
           },
-          conditionGroups: [] //高级查询值 普通查询则为空
-        },
-        // 高级视图
-        {
-          userNo: '001', // 用户编号
-          pageNo: 'test1', // 页面编号
-          viewId: '3', // 视图编号唯一值
-          name: '高级视图1', // 视图名称
-          keyIds: [], //选中的条件字段 高级查询则为空
-          searchForm: {}, // 普通查询条件值 高级查询则为空
-          viewType: '1', // 0 基础查询 1高级查询
-          conditionGroups: [
-            //高级查询值
-            {
-              conditionLogic: 'or',
-              conditions: [
-                {
-                  field: 'qxfz',
-                  operator: 3,
-                  value: '1',
-                  advancedQueryType: 4,
-                  options: [
-                    {
-                      label: '权限分组权限分组权限分组',
-                      value: '1'
-                    },
-                    {
-                      label: '权限分组权限分组',
-                      value: '2'
-                    },
-                    {
-                      label: '权限分组权限分组权限分组权限分组',
-                      value: '3'
-                    }
-                  ],
-                  valueType: 'select'
-                },
-                {
-                  field: 'ser',
-                  operator: 1,
-                  value: '123123',
-                  advancedQueryType: 1,
-                  valueType: 'input'
-                },
-                {
-                  field: 'oN',
-                  operator: 1,
-                  value: '123123',
-                  advancedQueryType: 1,
-                  valueType: 'input'
-                },
-                {
-                  field: 'date',
-                  operator: 3,
-                  value: '2026-01-15',
-                  advancedQueryType: 3,
-                  valueType: 'datePicker'
-                },
-                {
-                  operator: 14,
-                  value: {
-                    startT: '2025-01-15',
-                    endT: '2026-01-15'
-                  },
-                  advancedQueryType: 3,
-                  valueType: 'dateRangePicker'
-                },
-                {
-                  field: 'num',
-                  operator: 8,
-                  value: 123,
-                  advancedQueryType: 2,
-                  valueType: 'inputNumber'
-                },
-                {
-                  operator: 13,
-                  value: {
-                    start: 1,
-                    end: 22
-                  },
-                  advancedQueryType: 2,
-                  valueType: 'inputNumberRange'
-                }
-              ]
-            },
-            {
-              conditionLogic: 'or',
-              conditions: [
-                {
-                  field: 'type',
-                  operator: 3,
-                  value: '1',
-                  advancedQueryType: 4,
-                  options: [
-                    {
-                      label: '权限分组权限分组权限分组',
-                      value: '1'
-                    }
-                  ],
-                  valueType: 'select'
-                },
-                {
-                  field: 'types',
-                  operator: 6,
-                  value: '',
-                  advancedQueryType: 4,
-                  options: [
-                    {
-                      label2: '权限分组权限分组权限分组',
-                      value2: '1'
-                    }
-                  ],
-                  valueType: 'selectDisabled'
-                }
-              ]
-            }
-          ]
-        }
-      ] */
-      this.list = [
-        {
-          name: '所有的'
-        },
-        ...list
-      ]
+          ...list
+        ]
+      })
     },
     // 新增
     add() {
+      this.isRefresh = false
       this.stVisible = false
       this.visible = true
       this.isAdd = true
@@ -446,16 +319,16 @@ export default {
         pageNo: this.filterId,
         viewType: '0' // 明确设置 type 为 1
       }
-      this.form.keyIds = this.filterList.map((item) => {
-        return item.id
-      })
+      this.viewId = undefined
+      this.form.keyIds = []
       this.conditionGroups = []
       this.searchForm = {
         ...this.getInitialSearchValue
       }
     },
     // 修改
-    edit(item) {
+    edit(item, isRefresh = false) {
+      this.isRefresh = isRefresh
       console.log(item)
       this.stVisible = false
       this.visible = true
@@ -463,8 +336,12 @@ export default {
       this.key++
       // 赋值操作
       this.form = item
-      this.searchForm = { ...this.getInitialSearchValue, ...item.searchForm }
-      this.conditionGroups = item.conditionGroups
+      this.viewId = item.viewId
+      if (item.viewType === '0') {
+        this.searchForm = { ...this.getInitialSearchValue, ...JSON.parse(item.viewConfig) }
+      } else {
+        this.conditionGroups = JSON.parse(item.viewConfig)?.conditionGroups || []
+      }
     },
     // 保存筛选条件
     saveCheckData(data) {
@@ -480,7 +357,7 @@ export default {
         viewConfig = JSON.stringify(this.searchForm)
         keyIds = this.form.keyIds
       } else {
-        viewConfig = JSON.stringify(this.conditionGroups)
+        viewConfig = JSON.stringify({ conditionGroups: this.conditionGroups })
         keyIds = []
       }
       this.form.viewConfig = viewConfig
@@ -495,17 +372,24 @@ export default {
         viewName: this.form.viewName,
         viewType: this.form.viewType,
         bussId: this.bussId,
-        viewId: this.filterId,
         viewConfig: this.form.viewConfig,
-        keyIds
+        keyIds: JSON.stringify(keyIds),
+        viewId: this.viewId
       }
-      console.log(obj, 'obj')
       axios.post('/bems/query/viewColumn/saveOrUpdateViewInfo', obj).then((res) => {
         if (res.code !== 200) {
           return false
         }
         this.visible = false
         this.$message.success('保存成功')
+        this.getFilterList()
+        this.$nextTick(() => {
+          if (this.isRefresh) {
+            const obj = this.list.find((item) => item.viewId === this.viewId)
+            this.handleSelect(obj)
+            this.selectItem = obj
+          }
+        })
       })
     },
     // 删除
@@ -520,16 +404,22 @@ export default {
     },
     // 选中视图
     handleSelect(item) {
+      console.log(item)
       this.stVisible = false
-      this.selectedItem = item.name
-      if (item.name === '所有的') {
+      this.selectItem = item
+      this.selectedItem = item.viewName
+      if (item.viewName === '所有的') {
         this.selectItem = ''
-        return false
+        this.searchValue = {}
+        this.conditionGroups = []
+      }
+      if (item.viewType === '0') {
+        this.searchForm = JSON.parse(item.viewConfig)
+        this.searchValue = JSON.parse(item.viewConfig)
+      } else if (item.viewType === '1') {
+        this.conditionGroups = JSON.parse(item.viewConfig)?.conditionGroups || []
+        this.searchValue = { ...this.getInitialSearchValue }
       }
-      this.searchForm = item.searchForm
-      this.searchValue = item.viewType === '0' ? item.searchForm : { ...this.getInitialSearchValue }
-      this.conditionGroups = item.conditionGroups
-      this.selectItem = item
       this.$emit('filter', this.filterObj)
     },
     // 拖动保存视图列表
@@ -545,66 +435,6 @@ export default {
         this.searchForm = { ...this.getInitialSearchValue }
       }
     }
-
-    // 高级视图
-
-    // 提供接口
-    // 根据用户userNo 及视图pageNo 返回当前视图列表
-    /* eg: [
-      {
-          userNo: '001', // 用户编号
-          pageNo: 'test1', // 页面编号
-          id: '1', // 视图编号唯一值
-          name: '测试视图', // 视图名称
-          type: '1', // 1 基础查询 2高级查询
-          keyIds: [1, 2, 3], // 视图字段id(基础查询有，高级查询为空)
-          conditionGroups:[], //高级查询条件
-          searchValue: {  // 搜索条件值
-            qxfz: ['1', '2', '3'],
-            types: [],
-            datetime: '2026-01-08 00:00:00'
-          }
-        },
-    ] */
-
-    // 保存视图列表
-    /*eg:
-      {
-          userNo: '001', // 用户编号
-          pageNo: 'test1', // 页面编号
-          id: '1', // 视图编号唯一值
-          name: '测试视图', // 视图名称
-          type: '1', // 1 基础查询 2高级查询
-          keyIds: [1, 2, 3], // 视图字段id(基础查询有，高级查询为空)
-          conditionGroups:[], //高级查询条件
-          searchValue: {  // 搜索条件值
-            qxfz: ['1', '2', '3'],
-            types: [],
-            datetime: '2026-01-08 00:00:00'
-          }
-      }
-
-    */
-
-    // 调整当前视图顺序
-    /*
-    eg:
-    {
-        userNo: '001', // 用户编号
-        pageNo: 'test1', // 页面编号
-        views:[1,2,3]  //视图编号
-    }
-    */
-    // 传递给业务模块参数说明:
-    // 普通视图直接输出条件值给业务前端 业务前端塞入参数查询
-    // 高级视图将高级视图的viewId 传给业务前端 业务前端塞入参数查询
-    // 高级视图+普通条件混合查询 就把这两个参数都传给后端
-
-    /*
-    问题点：
-    1. 是否是所有的条件都是后端注册？还是只用注册
-
-    */
   }
 }
 </script>