n20-common-lib 3.0.36 → 3.0.38

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 = []

package/src/components/SecondaryTab/index.vue

@@ -1,31 +1,43 @@
 <template>
-  <div v-if="data.length === 0" class="n20-secondary-tab m-b-s">
-    <div class="el-tabs__item is-active">{{ init }}</div>
-  </div>
-  <div v-else-if="data.length === 1" class="n20-secondary-tab m-b-s">
-    <div class="el-tabs__item is-active">
-      <span v-if="data[0].icon" :class="data[0].icon"></span>
-      <sup v-if="data[0].badge" class="el-tabs__item-badge"></sup>
-      {{ data[0].name }}
+  <div class="n20-secondary-tab__wrapper">
+    <div v-if="data.length === 0" class="n20-secondary-tab m-b-s">
+      <div class="el-tabs__item is-active">{{ init }}</div>
     </div>
-  </div>
-  <el-tabs v-else :value="init" :class="classes" :tabPosition="tabPosition" :before-leave="beforeFn" @tab-click="clickFn">
-    <el-tab-pane
-      v-for="item of data"
-      :key="item.name"
-      :tab-info="item"
-      :name="item.name"
-      :icon="item.icon"
-      :disabled="item.disabled"
+    <div v-else-if="data.length === 1" class="n20-secondary-tab m-b-s">
+      <div class="el-tabs__item is-active">
+        <span v-if="data[0].icon" :class="data[0].icon"></span>
+        <sup v-if="data[0].badge" class="el-tabs__item-badge"></sup>
+        {{ data[0].name }}
+      </div>
+    </div>
+    <el-tabs
+      v-else
+      :value="init"
+      :class="classes"
+      :tabPosition="tabPosition"
+      :before-leave="beforeFn"
+      @tab-click="clickFn"
     >
-      <template slot="label">
-        <span v-if="item.icon" :class="item.icon"></span>
-        <sup v-if="item.badge" class="el-tabs__item-badge"></sup>
-        <span v-if="item.content" v-title="`${item.content}`"> {{ item.name }}</span>
-        <span v-else>{{ item.name }}</span>
-      </template>
-    </el-tab-pane>
-  </el-tabs>
+      <el-tab-pane
+        v-for="item of data"
+        :key="item.name"
+        :tab-info="item"
+        :name="item.name"
+        :icon="item.icon"
+        :disabled="item.disabled"
+      >
+        <template slot="label">
+          <span v-if="item.icon" :class="item.icon"></span>
+          <sup v-if="item.badge" class="el-tabs__item-badge"></sup>
+          <span v-if="item.content" v-title="`${item.content}`"> {{ item.name }}</span>
+          <span v-else>{{ item.name }}</span>
+        </template>
+      </el-tab-pane>
+    </el-tabs>
+    <div class="n20-secondary-tab__right">
+      <slot></slot>
+    </div>
+  </div>
 </template>
 
 <script>
@@ -51,10 +63,9 @@ export default {
     }
   },
   computed: {
-    classes(){
+    classes() {
       return {
         'n20-secondary-tab': true,
-        'm-b-s': this.tabPosition == 'top',
         'left-css': this.tabPosition == 'left'
       }
     }
@@ -106,17 +117,17 @@ export default {
 .tooltip.show {
   opacity: 1;
 }
-.left-css .el-tabs__item.is-active:after{
+.left-css .el-tabs__item.is-active:after {
   width: 2px;
-  height: 20px!important;
-  margin-top: -22px!important;
+  height: 20px !important;
+  margin-top: -22px !important;
   margin-left: -10px;
 }
 .left-css .el-tabs__item.is-left {
-  text-align: left!important;
+  text-align: left !important;
 }
-.left-css .el-tabs__header.is-left{
-  margin-right: 0!important;
-  margin-left: 10px!important;
+.left-css .el-tabs__header.is-left {
+  margin-right: 0 !important;
+  margin-left: 10px !important;
 }
 </style>

package/src/components/ShowColumn/index.vue

@@ -641,19 +641,29 @@ export default {
 function saveTransform(list, labelKey, isFilter) {
   let listN = []
   if (!isFilter) {
+    // 遍历列配置列表，将每列转换为存储格式
     list.forEach((c) => {
+      // 普通列：有prop属性、无子列、非新增列、无宽度设置
       if (c.prop && !c.children && !c.isNew && !c.width & !c.isNew) {
         listN.push({ _colKey: 'prop', _colVal: c.prop })
-      } else if (c.type && ['selection', 'index', 'expand'].includes(c.type)) {
+      }
+      // 特殊类型列：多选/序号/展开列
+      else if (c.type && ['selection', 'index', 'expand'].includes(c.type)) {
         listN.push({ _colKey: 'type', _colVal: c.type })
-      } else {
+      }
+      // 其他列：包含函数或需要完整保留的列
+      else {
         let sFn = false
+        // 检查列配置中是否包含函数类型的属性
         for (let k in c) {
           if (typeof c[k] === 'function') sFn = true
         }
+        // 包含函数且有标签的列，使用标签作为标识存储
         if (sFn && c[labelKey]) {
-          listN.push({ _colKey: labelKey, _colVal: c[labelKey] })
-        } else {
+          listN.push({ _colKey: labelKey, _colVal: c[labelKey], ...c })
+        }
+        // 其他情况直接存储完整列配置
+        else {
           listN.push(c)
         }
       }

package/src/components/TableOperate/index.vue

@@ -0,0 +1,101 @@
+<template>
+  <div class="el-table-set-size flex-box">
+    <div class="el-table-set-size-item m-r-0">
+      <i
+        v-title="$lc('设置显示列')"
+        class="v3-icon-system-solution pointer color-white"
+        :class="hoverIconKey === 'showColumn' ? 'color-white' : ''"
+        @mouseenter="hoverIconKey = 'showColumn'"
+        @mouseleave="hoverIconKey = null"
+        @click="$emit('visible-column')"
+      ></i>
+    </div>
+    <div class="el-table-set-size-item m-r-0">
+      <el-dropdown @command="setSize">
+        <i
+          v-title="$lc('行高')"
+          class="v3-icon-line-height pointer color-white"
+          :class="hoverIconKey === 'height' ? 'color-white' : ''"
+          @mouseenter="hoverIconKey = 'height'"
+          @mouseleave="hoverIconKey = null"
+        ></i>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="small">{{ _lang === 'zh' ? '默认' : 'small' }}</el-dropdown-item>
+          <el-dropdown-item command="mini">{{ _lang === 'zh' ? '紧凑' : 'mini' }}</el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+    </div>
+    <div class="el-table-set-size-item m-r-0">
+      <i
+        v-title="!isExpand ? $lc('展开分组') : $lc('折叠分组')"
+        class="pointer"
+        :class="[
+          isExpand ? 'v3-icon-group-collapse' : 'v3-icon-group-expand',
+          hoverIconKey === 'toggleExpand' ? 'color-white' : ''
+        ]"
+        @mouseenter="hoverIconKey = 'toggleExpand'"
+        @mouseleave="hoverIconKey = null"
+        @click="$emit('toggle-expand')"
+      ></i>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'TableOperate',
+  props: {
+    size: {
+      type: String,
+      default: 'small'
+    },
+    mini: {
+      type: Object,
+      default: () => ({
+        border: false,
+        size: 'mini',
+        stripe: true
+      })
+    },
+    small: {
+      type: Object,
+      default: () => ({
+        border: false,
+        size: 'small',
+        stripe: false
+      })
+    }
+  },
+  data() {
+    let _this = this
+    return {
+      isExpand: false,
+      hoverIconKey: null, // 当前悬停的静态列头图标标识
+      sizeC: localStorage.getItem('table-size') || _this.size
+    }
+  },
+  watch: {
+    size() {
+      this.setSize(localStorage.getItem('table-size') || this.size, 'pasv')
+    }
+  },
+  created() {
+    this.setSize(localStorage.getItem('table-size') || this.size, 'pasv')
+  },
+  methods: {
+    setSize(type, t) {
+      this.sizeC = type
+      localStorage.setItem('table-size', type)
+      if (type === 'mini') {
+        this.$emit('resize', this.mini)
+      } else if (type === 'small') {
+        this.$emit('resize', this.small)
+      }
+
+      if (t !== 'pasv') {
+        this.$emit('update:size', localStorage.getItem('table-size') || type)
+      }
+    }
+  }
+}
+</script>