doway-coms 2.11.4 → 2.11.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "2.11.4",
+  "version": "2.11.6",
   "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
@@ -198,6 +197,17 @@
           />
         </div>
       </template>
+      <template #checkbox_default="scope">
+        <div class="interceptor-class">
+          <a-checkbox
+              class="inner-cell-control"
+              size="small"
+              @change="cellValueChange(scope)"
+              v-model="scope.row[scope.column.property]"
+              :disabled="true"
+          />
+        </div>
+      </template>
       <template #number_edit="scope">
         <div class="interceptor-class">
           <a-input-number
@@ -1070,7 +1080,7 @@ export default {
     },
     showHeaderOverflow: {
       type: Boolean,
-      default: true,
+      default: null,
     },
     cellClassName: {
       type: Function,
@@ -1286,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++) {
@@ -1348,7 +1370,7 @@ export default {
       )
     }
 
-    
+
     this.gridEdit = this.edit
   },
   mounted() {
@@ -1903,15 +1925,15 @@ export default {
     },
     /**
      * 固定列到左侧
-     * @param scope 
+     * @param scope
      */
     fixedLeftColumn(scope){
         this.$refs.baseGrid.setColumnFixed(scope.column.field, 'left')
-        
+
     },
     /**
      * 取消固定列
-     * @param scope 
+     * @param scope
      */
     fixedCancelColumn(scope){
 
@@ -2039,6 +2061,9 @@ export default {
         originCol.controlType = controlType.text
       }
       if (originCol.controlType === controlType.checkbox) {
+        if (originCol.checkbox_default){
+          customSlot['default'] = 'checkbox_default'
+        }
         originCol.dataSource = [
           { caption: '是', value: true },
           { caption: '否', value: false },