doway-coms 2.11.5 → 2.11.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "2.11.5",
+  "version": "2.11.7",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",

package/packages/BaseGrid/src/index.vue

@@ -44,7 +44,6 @@
       @cell-click="cellClick"
       resizable
       :show-overflow="showOverFlow"
-      :show-header-overflow="showHeaderOverflow"
       show-footer-overflow
       highlight-current-row
       highlight-hover-row
@@ -393,7 +392,7 @@
         <slot name="expandDefault" :item="{ row, column }"></slot>
       </template>
       <template #linkCell="{ row, column }">
-        <div class="link-cell-tags" v-if="!gridEdit">
+        <div class="link-cell-tags" v-if="!column.params.edit">
           <template v-if="row[column.property]">
             <a-tag
                 v-for="(item, index) in row[column.property].split(',')"
@@ -1081,7 +1080,7 @@ export default {
     },
     showHeaderOverflow: {
       type: Boolean,
-      default: true,
+      default: null,
     },
     cellClassName: {
       type: Function,
@@ -1297,6 +1296,18 @@ export default {
     } catch (err) {
       console.debug(err)
     }
+    let tempShowHeadOverflow = true
+    //样式定义
+    if(this.$store.getters.baseSetting && this.$store.getters.baseSetting.gridShowHeaderOverflow){
+      tempShowHeadOverflow = this.$store.getters.baseSetting.gridShowHeaderOverflow
+    }
+    if(this.showHeaderOverflow!==null){
+      tempShowHeadOverflow = this.showHeaderOverflow
+    }
+    this.gridOptions['showHeaderOverflow'] = tempShowHeadOverflow
+     //----------------------------------------
+
+
     //拖动后输入框有错位问题，暂时不启用
     // this.initColumnDrop()
     for (let i = 0; i < this.columns.length; i++) {