n20-common-lib 3.0.14 → 3.0.15

package/package.json

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

package/src/components/AdvancedFilter/index.vue

@@ -92,10 +92,10 @@
       <el-form ref="form" :model="form" label-width="80px" :inline="false" size="normal" label-position="top">
         <el-form-item
           :label="$lc('视图名称')"
-          prop="name"
+          prop="viewName"
           :rules="[{ required: true, message: '请输入', trigger: 'blur' }]"
         >
-          <el-input v-model="form.name" />
+          <el-input v-model="form.viewName" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="flex-box flex-c flex-v page-button-shadow">
@@ -173,6 +173,10 @@ export default {
     checkIds: {
       type: Array,
       default: () => []
+    },
+    bussId: {
+      type: String,
+      default: ''
     }
   },
   data() {
@@ -224,12 +228,19 @@ export default {
     saveSt() {
       // 保存筛选视图
       const obj = {
-        ...this.form,
-        searchForm: this.model
+        viewName: this.form.viewName,
+        viewType: '0',
+        bussId: this.bussId,
+        filterId: this.filterId,
+        viewConfig: JSON.stringify(this.model)
       }
       console.log(obj, 'obj')
-      this.stVisible = false
-      this.$message.success('保存成功')
+      axios.post(`/bems/query/viewColumn/saveOrUpdateViewInfo`, obj).then((res) => {
+        if (res.code === 200) {
+          this.stVisible = false
+          this.$message.success('保存成功')
+        }
+      })
     },
     // 另存为视图
     addView() {

package/src/components/ProFilterView/advancedQuery.vue

@@ -195,6 +195,7 @@ 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: {
@@ -216,6 +217,10 @@ export default {
     filterId: {
       type: String,
       default: ''
+    },
+    bussId: {
+      type: String,
+      default: ''
     }
   },
   data() {
@@ -450,15 +455,15 @@ export default {
       options: []
     }
   },
+  mounted() {
+    this.getAdvancedQueryFields()
+  },
   methods: {
     // 查询支持可配置高级查询的字段
     getAdvancedQueryFields() {
-      let array = [
-        {
-          fileCode: '',
-          fileName: ''
-        }
-      ]
+      axios.get('/bems/query/viewColumn/getColumnInfo', { bussId: this.bussId }).then((res) => {
+        console.log(res, 'res')
+      })
     },
     // 修改字段
     updatefield(field, row) {

package/src/components/ProFilterView/index.vue

@@ -64,9 +64,11 @@
       <slot name="rightContent"></slot>
     </div>
     <cl-advanced-filter
+      ref="filter"
       class="filter"
       :visible.sync="multiple"
       :filter-id="filterId"
+      :buss-id="bussId"
       :model="searchValue"
       only-key="id"
       :filter-list="filterList"
@@ -98,21 +100,22 @@
       <el-form ref="form" :model="form" label-width="80px" :inline="false" size="normal" label-position="top">
         <el-form-item
           :label="$lc('视图名称')"
-          prop="name"
+          prop="viewName"
           :rules="[{ required: true, message: '请输入', trigger: 'blur' }]"
         >
-          <el-input v-model="form.name" />
+          <el-input v-model="form.viewName" />
         </el-form-item>
         <div class="flex-box flex-lr flex-v">
           <div>{{ $lc('数据范围') }}</div>
           <div style="color: var(--color-primary); cursor: pointer" @click="typeChange">
             <i class="iconfont icon-switch"></i>
-            <span v-if="form.viewType === 1"> {{ $lc('高级查询') }}</span>
+            <span v-if="form.viewType === '0'"> {{ $lc('高级查询') }}</span>
             <span v-else> {{ $lc('基础查询') }}</span>
           </div>
         </div>
         <cl-advanced-filter
-          v-if="form.viewType === 1"
+          v-if="form.viewType === '0'"
+          ref="filter"
           :key="key"
           class="filter"
           :visible.sync="multiple"
@@ -132,9 +135,18 @@
             ></slot>
           </template>
         </cl-advanced-filter>
-        <advancedQuery v-else v-model="conditionGroups" :filter-list="filterList" :filter-id="filterId">
+        <advancedQuery
+          v-else
+          v-model="conditionGroups"
+          :filter-list="filterList"
+          :filter-id="filterId"
+          :buss-id="bussId"
+        >
           <!-- 使用作用域插槽传递 slot 类型的过滤器 -->
-          <template v-for="filter in filterList.filter((item) => item.type === 'slot')" #[filter.slotName]="{ model, value, input, disabled }">
+          <template
+            v-for="filter in filterList.filter((item) => item.type === 'slot')"
+            #[filter.slotName]="{ model, value, input, disabled }"
+          >
             <slot
               :name="filter.slotName"
               :model="model"
@@ -159,6 +171,8 @@ import ClAdvancedFilter from '../AdvancedFilter/index.vue'
 import ClInputSearch from '../InputSearch/index.vue'
 import ClDragList from '../DragList/index.vue'
 import ClDialog from '../Dialog/index.vue'
+import axios from '../../utils/axios.js'
+
 export default {
   name: 'ProFilterView',
   components: {
@@ -169,6 +183,10 @@ export default {
     ClDialog
   },
   props: {
+    bussId: {
+      type: String,
+      default: ''
+    },
     filterId: {
       type: String,
       default: ''
@@ -240,6 +258,15 @@ export default {
     this.searchValue = { ...this.getInitialSearchValue }
   },
   methods: {
+    setOptions(id, opts) {
+      this.$refs.filter.setOptions(id, opts)
+      this.filterList.forEach((item) => {
+        if (item.value === id) {
+          item.options = opts
+        }
+      })
+      console.log(this.filterList, 'filterList updated')
+    },
     changeFn(value) {
       console.log('changeFn', value)
     },
@@ -265,16 +292,17 @@ export default {
     },
     // 通过filterId拿取视图列表
     getFilterList() {
-      /* this.$axios.get(`/api/v3/filter/${this.userNo}/${this.filterId}`).then((res) => {
+      let list = []
+      axios.post(`/bems/query/viewColumn/getViewInfo`, { bussId: this.bussId }).then((res) => {
         console.log(res)
-      }) */
-      const list = [
+      })
+      /*  list = [
         {
           userNo: '001', // 用户编号
           pageNo: 'test1', // 页面编号
           viewId: '2', // 视图编号唯一值
           name: '测试视图2', // 视图名称
-          viewType: 1, // 1 基础查询 2高级查询
+          viewType: '0', // 0 基础查询 1高级查询
           keyIds: [1, 3, 14], //选中的条件字段 高级查询则为空
           searchForm: {
             //筛选条件值
@@ -292,7 +320,7 @@ export default {
           name: '高级视图1', // 视图名称
           keyIds: [], //选中的条件字段 高级查询则为空
           searchForm: {}, // 普通查询条件值 高级查询则为空
-          viewType: 2, // 1 基础查询 2高级查询
+          viewType: '1', // 0 基础查询 1高级查询
           conditionGroups: [
             //高级查询值
             {
@@ -400,7 +428,7 @@ export default {
             }
           ]
         }
-      ]
+      ] */
       this.list = [
         {
           name: '所有的'
@@ -416,7 +444,7 @@ export default {
       this.form = {
         userNo: sessionStorage.getItem('userNo'),
         pageNo: this.filterId,
-        type: 1 // 明确设置 type 为 1
+        viewType: '0' // 明确设置 type 为 1
       }
       this.form.keyIds = this.filterList.map((item) => {
         return item.id
@@ -446,15 +474,39 @@ export default {
     },
     // 保存视图
     saveSt() {
+      let viewConfig
+      let keyIds
+      if (this.form.viewType === '0') {
+        viewConfig = JSON.stringify(this.searchForm)
+        keyIds = this.form.keyIds
+      } else {
+        viewConfig = JSON.stringify(this.conditionGroups)
+        keyIds = []
+      }
+      this.form.viewConfig = viewConfig
+      if (this.isAdd) {
+        if (this.form.name === '') {
+          this.$message.error('请输入视图名称')
+          return false
+        }
+      }
       // 保存筛选视图
       const obj = {
-        ...this.form,
-        searchForm: this.searchForm,
-        conditionGroups: this.conditionGroups
+        viewName: this.form.viewName,
+        viewType: this.form.viewType,
+        bussId: this.bussId,
+        viewId: this.filterId,
+        viewConfig: this.form.viewConfig,
+        keyIds
       }
       console.log(obj, 'obj')
-      this.visible = false
-      this.$message.success('保存成功')
+      axios.post('/bems/query/viewColumn/saveOrUpdateViewInfo', obj).then((res) => {
+        if (res.code !== 200) {
+          return false
+        }
+        this.visible = false
+        this.$message.success('保存成功')
+      })
     },
     // 删除
     deleteOne() {
@@ -475,7 +527,7 @@ export default {
         return false
       }
       this.searchForm = item.searchForm
-      this.searchValue = item.viewType === '1' ? item.searchForm : { ...this.getInitialSearchValue }
+      this.searchValue = item.viewType === '0' ? item.searchForm : { ...this.getInitialSearchValue }
       this.conditionGroups = item.conditionGroups
       this.selectItem = item
       this.$emit('filter', this.filterObj)
@@ -486,8 +538,8 @@ export default {
     },
     // 查询切换
     typeChange() {
-      this.form.viewType = this.form.viewType === 1 ? 2 : 1
-      if (this.form.viewType === 1) {
+      this.form.viewType = this.form.viewType === '0' ? '1' : '0'
+      if (this.form.viewType === '0') {
         this.conditionGroups = []
       } else {
         this.searchForm = { ...this.getInitialSearchValue }