n20-common-lib 2.5.43 → 2.5.45

package/package.json

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

package/src/assets/css/el-table.scss

@@ -51,7 +51,6 @@
 }
 
 .el-table {
-
   /* 排序 */
   .caret-wrapper {
     display: inline-flex;
@@ -196,23 +195,20 @@ th.vxe-header--column {
   color: #333;
 }
 
-
-.vxe-table-custom-wrap.vxe-body--column.col--ellipsis:not(.col--actived)>.vxe-cell,
-.vxe-table--render-default .vxe-table-custom-wrap.vxe-footer--column.col--ellipsis:not(.col--actived)>.vxe-cell,
-.vxe-table--render-default .vxe-table-custom-wrap.vxe-header--column.col--ellipsis:not(.col--actived)>.vxe-cell {
+.vxe-table-custom-wrap.vxe-body--column.col--ellipsis:not(.col--actived) > .vxe-cell,
+.vxe-table--render-default .vxe-table-custom-wrap.vxe-footer--column.col--ellipsis:not(.col--actived) > .vxe-cell,
+.vxe-table--render-default .vxe-table-custom-wrap.vxe-header--column.col--ellipsis:not(.col--actived) > .vxe-cell {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: wrap !important;
 }
 
-.vxe-table--render-default.size--small .vxe-table-custom-wrap.vxe-body--column.col--ellipsis>.vxe-cell,
-.vxe-table--render-default.size--small .vxe-table-custom-wrap.vxe-footer--column.col--ellipsis>.vxe-cell,
-.vxe-table--render-default.size--small .vxe-table-custom-wrap.vxe-header--column.col--ellipsis>.vxe-cell {
+.vxe-table--render-default.size--small .vxe-table-custom-wrap.vxe-body--column.col--ellipsis > .vxe-cell,
+.vxe-table--render-default.size--small .vxe-table-custom-wrap.vxe-footer--column.col--ellipsis > .vxe-cell,
+.vxe-table--render-default.size--small .vxe-table-custom-wrap.vxe-header--column.col--ellipsis > .vxe-cell {
   max-height: 100%;
 }
 
-
-
 .vxe-header--column {
   .vxe-cell {
     justify-content: center !important;
@@ -229,4 +225,4 @@ th.vxe-header--column {
   .icon-mini {
     background-image: url('../../components/TableSetSize/mini.png');
   }
-}
+}

package/src/components/ShowColumn/index.vue

@@ -57,16 +57,16 @@
             </el-checkbox-group>
           </div>
         </div>
-        <div class="right-c flex-column p-t-m bd-r" v-if="!hasPX">
+        <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>
           </div>
           <div class="flex-1 overflow-y">
-            <drag-list :list="dragList" @click="clickItem" :label-key="labelKey" :in-show-column="true" />
+            <drag-list :list="dragList" :label-key="labelKey" :in-show-column="true" @click="clickItem" />
           </div>
         </div>
-        <div class="right-tree flex-column p-t-m" v-else>
+        <div v-else class="right-tree flex-column p-t-m">
           <div class="m-b flex-box flex-lr flex-v">
             {{ '当前选定项' | $lc }}
             <el-link class="m-r-s" :underline="false" icon="n20-icon-xinzeng" @click="add">{{
@@ -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>
@@ -124,7 +129,7 @@
           ]"
           prop="width"
         >
-          <el-input v-model="configModel.width" class="w-224"></el-input>
+          <el-input v-model="configModel.width" class="w-224" />
         </el-form-item>
         <el-form-item :label="'是否折行' | $lc">
           <el-radio-group v-model="configModel.wrap">
@@ -140,7 +145,7 @@
     <dialogWrap v-drag :visible.sync="configVisibleN" :title="'新增' | $lc" width="350px" :close-on-click-modal="false">
       <el-form :model="configModelN">
         <el-form-item :label="'名称' | $lc" required>
-          <el-input v-model="configModelN.label" class="input-w" :placeholder="'请输入' | $lc"></el-input>
+          <el-input v-model="configModelN.label" class="input-w" :placeholder="'请输入' | $lc" />
         </el-form-item>
       </el-form>
       <div slot="footer">
@@ -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) {
@@ -363,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)
       }
     },
@@ -384,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)
 
@@ -413,16 +433,13 @@ function saveTransform(list, labelKey, isFilter) {
   let listN = []
   if (!isFilter) {
     list.forEach((c) => {
-      if (c.prop && !c.children && !c.isNew && !c.width) {
+      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

package/src/components/TablePro/index.vue

@@ -12,7 +12,7 @@
       show-header-overflow
       :row-config="{ isHover: true, useKey: true, ...$attrs.rowConfig }"
       :column-config="{ resizable: true, useKey: true, ...$attrs.columnConfig }"
-      :scroll-y="{ enabled: true, oSize: 20, gt: 30 }"
+      :scroll-y="scrollY"
       :sort-config="{
         multiple: false,
         remote: true,
@@ -38,7 +38,7 @@
           :field="item.prop"
           type="checkbox"
           width="50"
-          fixed="left"
+          :fixed="item.fixed || item.fixed === '' ? item.fixed : 'left'"
         >
           <template #header="{ $table, checked, indeterminate, disabled }">
             <span class="custom-checkbox" @click.stop="toggleAll($table, disabled)">
@@ -56,32 +56,34 @@
           </template>
         </vxe-column>
         <vxe-colgroup
-          :title="item.label"
           v-else-if="item.children && item.children.length > 0"
           :key="'vxe-colgroup-' + i"
+          :title="item.label"
         >
           <vxe-column
             v-for="(subItem, i) in item.children"
             :key="'vxe-table-' + i"
-            :className="item.wrap ? 'vxe-table-custom-wrap' : ''"
+            :class-name="subItem.wrap ? 'vxe-table-custom-wrap' : ''"
             :formatter="subItem.formatter ? subItem.formatter : 'formatName'"
             :filters="subItem.filters"
             :filter-render="subItem.filterRender"
             :title="subItem.label"
             :field="subItem.prop"
             v-bind="subItem"
+            :show-overflow="!subItem.wrap"
           />
         </vxe-colgroup>
         <vxe-column
           v-else
-          :className="item.wrap ? 'vxe-table-custom-wrap' : ''"
           :key="'vxe-table-' + i"
+          :class-name="item.wrap ? 'vxe-table-custom-wrap' : ''"
           :formatter="item.formatter ? item.formatter : 'formatName'"
           :filters="item.filters"
           :filter-render="item.filterRender"
           :title="item.label"
           :field="item.prop"
           v-bind="item"
+          :show-overflow="!item.wrap"
         />
       </template>
       <template #empty>
@@ -104,6 +106,12 @@ export default {
     empty
   },
   props: {
+    scrollY: {
+      type: Object,
+      default: () => {
+        return { enabled: true, oSize: 20, gt: 30 }
+      }
+    },
     data: {
       type: Array,
       default: undefined