n20-common-lib 3.0.24 → 3.0.26

package/package.json

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

package/src/components/ShowColumn/index.vue

@@ -114,7 +114,7 @@
               </vue-draggable>
             </template>
             <!-- 分隔线 -->
-            <div class="fixed-divider">
+            <div class="fixed-divider" v-if="fixedColumns.length > 0 || pureStaticColumns.length > 0">
               <span class="fixed-divider-text">{{ '以上为已固定列' | $lc }}</span>
             </div>
             <!-- 可拖拽列 -->

package/src/components/TablePro/index.js

@@ -24,7 +24,6 @@ function flattenObject(obj, prefix = '', result = {}) {
   }
   return result
 }
-console.log(vxeTable, 'vxeTable')
 
 vxeTable.setConfig({
   size: 'small',

package/src/components/TablePro/index.vue

@@ -70,6 +70,33 @@
           :title="item.label"
           :field="item.prop"
         >
+          <template #header="{ column }">
+            <div
+              class="flex-box flex-v flex-c"
+              @mouseenter="hoverHeaderProp = item.prop"
+              @mouseleave="hoverHeaderProp = null"
+            >
+              <slot name="header" :column="column">{{ column.title }}</slot>
+              <i
+                v-if="item.tooltip"
+                class="n20-icon-xinxitishi vxe-table--column__icon m-l-ss"
+                v-title="item.tooltip"
+              ></i>
+              <!-- 已固定列（fixed='left'）：hover 时显示 lock 图标，点击取消固定 -->
+              <i
+                v-if="item.fixed === 'left'"
+                class="iconfont icon-lock vxe-table--column__icon m-l-ss pointer color-primary"
+                @click.stop="unlockColumn(item)"
+              ></i>
+              <!-- 未固定列（且非静态列）：hover 时显示 unlock 图标，点击设为固定 -->
+              <i
+                v-if="!item.fixed && !item.static"
+                v-show="hoverHeaderProp === item.prop"
+                class="iconfont icon-unlock vxe-table--column__icon m-l-ss pointer"
+                @click.stop="lockColumn(item)"
+              ></i>
+            </div>
+          </template>
           <template slot-scope="scope">
             <renderer :render-content="item.render" :scope="scope" />
           </template>
@@ -308,7 +335,7 @@ export default {
     },
     showColumn: {
       type: Boolean,
-      default: true
+      default: false
     },
     // 数据更新时是否自动清空已选
     clearSelect: {