n20-common-lib 3.0.36 → 3.0.37

package/src/components/ProFilterView/index.vue

@@ -9,7 +9,7 @@
           trigger="click"
           class="m-r"
         >
-          <el-button slot="reference" class="botton" :class="{ activiti: selectedItem !== '所有的' }">
+          <el-button slot="reference" class="botton" :class="{ activiti: selectedItem !== '无视图' }">
             <div class="flex-box flex-v m-r">
               <i class="v3-icon-inbox"></i>
               <div class="popover-title" style="margin: 0 8px" :title="selectedItem">{{ selectedItem }}</div>
@@ -28,7 +28,7 @@
                     }}</span>
                     <i v-if="selectedItem === item.viewName" class="el-icon-check selected-icon"></i>
                     <el-dropdown
-                      v-if="selectedItem !== item.viewName && item.viewName !== '所有的'"
+                      v-if="selectedItem !== item.viewName && item.viewName !== '无视图'"
                       trigger="click"
                       class="proFilterView-list-item__more"
                       @command="(command) => handleCommand(command, item)"
@@ -206,8 +206,8 @@ export default {
   data() {
     return {
       val: '',
-      list: ['所有的'],
-      selectedItem: '所有的', // 默认选中第一项
+      list: ['无视图'],
+      selectedItem: '无视图', // 默认选中第一项
       stVisible: false,
       visible: false,
       isAdd: false,
@@ -322,7 +322,7 @@ export default {
           })
           this.list = [
             {
-              viewName: '所有的'
+              viewName: '无视图'
             },
             ...list
           ]
@@ -337,7 +337,7 @@ export default {
         .catch((err) => {
           this.list = [
             {
-              viewName: '所有的'
+              viewName: '无视图'
             }
           ]
         })
@@ -382,6 +382,7 @@ export default {
       } else {
         const parsed = JSON.parse(item.viewConfig || '{}')
         this.conditionGroups = parsed.conditionGroups || []
+
         this._savedViewConfigs['1'] = { conditionGroups: this.conditionGroups }
       }
     },
@@ -402,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
         }
-        this.visible = false
-        this.$message.success('保存成功')
-        this.getFilterList(this.viewId)
+        if (this.form.viewType === '1') {
+          if (!this.conditionGroups.length || hasEmptyValue) {
+            this.$message.warning('至少添加一个条件')
+            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
+          }
+          this.visible = false
+          this.$message.success('保存成功')
+          this.getFilterList(this.viewId)
+        })
       })
     },
     // 删除
@@ -448,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 = []