n20-common-lib 2.5.42 → 2.5.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.5.42",
+  "version": "2.5.44",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/components/ShowColumn/index.vue

@@ -57,7 +57,7 @@
             </el-checkbox-group>
           </div>
         </div>
-        <div v-if="!hasPX" class="right-c flex-column p-t-m bd-r">
+        <div class="right-c flex-column p-t-m" v-if="!hasPX">
           <div class="m-b">
             {{ '当前选定项' | $lc }}
             <el-link type="primary" style="visibility: hidden">{{ '当前选定项' | $lc }}</el-link>
@@ -96,7 +96,12 @@
                   >{{ data.label }}</span
                 >
               </span>
-              <el-link class="n20-icon-shanchu" :underline="false" @click.stop="() => removeMenu(node, data)" />
+              <el-link
+                class="n20-icon-shanchu"
+                :underline="false"
+                @click.stop="() => removeMenu(node, data)"
+                :disabled="data.checked"
+              />
             </span>
           </el-tree>
         </div>
@@ -160,6 +165,7 @@ import axios from '../../utils/axios'
 import dialogWrap from '../Dialog/index.vue'
 import dragList from '../DragList/index.vue'
 import forEachs from '../../utils/forEachs'
+import { Message } from 'element-ui'
 export default {
   name: 'ShowColumn',
   components: { dialogWrap, dragList },
@@ -222,7 +228,8 @@ export default {
         label: '',
         prop: '',
         width: 120,
-        isNew: true
+        isNew: true,
+        children: []
       },
       userNo: sessionStorage.getItem('userNo'),
       configVisibleN: false,
@@ -276,7 +283,7 @@ export default {
           arr.push(item)
         })
         this.dragListN = arr
-        const newArr = arr.filter((item) => {
+        /* const newArr = arr.filter((item) => {
           return item.isNew
         })
         newArr.forEach((item) => {
@@ -284,7 +291,7 @@ export default {
           if (index === -1) {
             this.columns.push(item)
           }
-        })
+        }) */
       },
       immediate: true,
       deep: true
@@ -316,14 +323,15 @@ export default {
         return this.$message.warning($lc('已有重名字段,请修改'))
       }
       this.dragList.unshift(this.configModelN)
-      this.columns = [this.configModelN, ...this.columns]
+      // this.columns = [this.configModelN, ...this.columns]
       this.$message.success($lc('添加成功'))
       this.configVisibleN = false
       this.configModelN = {
         label: '',
         prop: '',
         width: 120,
-        isNew: true
+        isNew: true,
+        children: []
       }
     },
     removeMenu(node, data) {
@@ -342,18 +350,11 @@ export default {
       }
     },
     clickItem(item) {
-      this.configModel = Object.assign({}, item)
-      this.configModel.wrap = item.wrap ?? false
+      this.configModel = item
       this.configVisible = true
     },
     configSave() {
       this.configVisible = false
-      const index = this.dragList.findIndex(
-        (item) => item.prop === this.configModel.prop || item.label === this.configModel.label
-      )
-      if (index > -1) {
-        this.dragList[index] = this.configModel
-      }
     },
     popOpen() {
       this.dragList = this.checkColumns.filter((col) => !col.static)
@@ -370,6 +371,11 @@ export default {
         let index = this.dragList.findIndex((d) => d[this.labelKey] === column[this.labelKey])
         index !== -1 && this.dragList.splice(index, 1)
       } else {
+        let index = this.dragListN.findIndex((d) => d[this.labelKey] === column[this.labelKey])
+        if (index !== -1) {
+          Message.warning($lc(`子级请在右侧删除!`))
+          return false
+        }
         this.dragList.push(column)
       }
     },
@@ -391,7 +397,14 @@ export default {
       let preCols = this.columns.filter((col) => col.static === 'pre')
       let nextCols = this.columns.filter((col) => col.static === 'next')
       list.push(...preCols, ...this.dragList, ...nextCols)
-
+      // 新增校验
+      if (!this.isExport) {
+        let state = list.findIndex((c) => c.isNew && c.children && c.children.length === 0)
+        if (state !== -1) {
+          Message.warning($lc(`新增字段必须包含子级!`))
+          return false
+        }
+      }
       // 自动保存设置的显示列
       !this.isExport && this.autoSave && this.saveColumns(list)
 
@@ -420,16 +433,13 @@ function saveTransform(list, labelKey, isFilter) {
   let listN = []
   if (!isFilter) {
     list.forEach((c) => {
-      if (c.prop && !c.children && !c.isNew) {
+      if (c.prop && !c.children && !c.isNew && !c.width & !c.isNew) {
         listN.push({ _colKey: 'prop', _colVal: c.prop })
       } else if (c.slotName) {
         listN.push({ _colKey: 'slotName', _colVal: c.slotName })
       } else if (c.type && ['selection', 'index', 'expand'].includes(c.type)) {
         listN.push({ _colKey: 'type', _colVal: c.type })
       } else {
-        if (c.isNew && !c.children) {
-          return this.$message.warning($lc(`新增字段必须包含子级!`))
-        }
         let sFn = false
         for (let k in c) {
           if (typeof c[k] === 'function') sFn = true