doway-coms 2.11.2 → 2.11.4

package/package.json

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

package/packages/BaseGrid/src/index.vue

@@ -864,6 +864,18 @@ export default {
         header: {
           options: [
             [
+            {
+                code: 'fixedCancel',
+                name: '取消固定列',
+                visible: true,
+                disabled: false,
+              },
+            {
+                code: 'fixedLeft',
+                name: '固定列到左侧',
+                visible: true,
+                disabled: false,
+              },
               {
                 code: 'clearFilter',
                 name: '清空筛选',
@@ -922,24 +934,46 @@ export default {
           ],
         },
         visibleMethod: ({ options, column }) => {
-          console.log(options)
-          if(this.gridEdit){
-            options.forEach(list => {
+
+          options.forEach(list => {
               list.forEach(item => {
                 if(item.code=='copyRow'||item.code=='paste'){
-                  item.visible=true
+                    item.visible = this.gridEdit
                 }
-                })
-              })
-          }else{
-            options.forEach(list => {
-              list.forEach(item => {
-                if(item.code=='copyRow'||item.code=='paste'){
-                  item.visible=false
+                if(item.code==='fixedCancel'){
+                  item.visible = Boolean(column && column.fixed && this.moduleCode && this.dataCode && column.type!=='seq' && column.type!=='checkbox')
+                }
+                if(item.code==='fixedLeft'){
+                  item.visible = Boolean(column && !column.fixed && this.moduleCode && this.dataCode && column.type!=='seq' && column.type!=='checkbox')
                 }
-                })
               })
-          }
+            })
+          // if(column && column.fixed){
+          //   options.forEach(list => {
+          //     list.forEach(item => {
+          //       if(item.code==''){
+          //         item.visible=true
+          //       }
+          //       })
+          //     })
+          // }
+          // if(this.gridEdit){
+          //   options.forEach(list => {
+          //     list.forEach(item => {
+          //       if(item.code=='copyRow'||item.code=='paste'){
+          //         item.visible=true
+          //       }
+          //       })
+          //     })
+          // }else{
+          //   options.forEach(list => {
+          //     list.forEach(item => {
+          //       if(item.code=='copyRow'||item.code=='paste'){
+          //         item.visible=false
+          //       }
+          //       })
+          //     })
+          // }
           return true
         },
       },
@@ -1252,39 +1286,6 @@ export default {
     } catch (err) {
       console.debug(err)
     }
-    if (this.showSeq) {
-      this.internalColumns.push(
-        // {
-        // children: [
-        {
-          type: 'seq',
-          fixed: 'left',
-          width: 50,
-          slots: {
-            header: 'seqHeader',
-          },
-          params: {
-            disableUserVisible: true,
-          },
-        }
-        // ],
-        // slots: {
-        //   header: 'seqHeader'
-        // }
-        // }
-      )
-    }
-
-    if (this.showCheckBox) {
-      this.internalColumns.push({
-        type: 'checkbox',
-        fixed: 'left',
-        width: 40,
-        params: {
-          disableUserVisible: true,
-        },
-      })
-    }
     //拖动后输入框有错位问题，暂时不启用
     // this.initColumnDrop()
     for (let i = 0; i < this.columns.length; i++) {
@@ -1313,6 +1314,39 @@ export default {
       //设置筛选过滤条件
       this.setFilterExpression(this.internalColumns)
     }
+    //注意，不能移到上面添加，会出现布局问题，暂时不知道什么原因????
+    if (this.showCheckBox) {
+      this.internalColumns.unshift({
+        type: 'checkbox',
+        fixed: 'left',
+        width: 40,
+        params: {
+          disableUserVisible: true,
+        },
+      })
+    }
+    if (this.showSeq) {
+      this.internalColumns.unshift(
+        // {
+        // children: [
+        {
+          type: 'seq',
+          fixed: 'left',
+          width: 50,
+          slots: {
+            header: 'seqHeader',
+          },
+          params: {
+            disableUserVisible: true,
+          },
+        }
+        // ],
+        // slots: {
+        //   header: 'seqHeader'
+        // }
+        // }
+      )
+    }
 
     
     this.gridEdit = this.edit
@@ -1717,17 +1751,21 @@ export default {
     contextMenuClickEvent({ menu, row, column }) {
       let vm = this
       const $table = this.$refs.baseGrid
-      if (column && column.field) {
-        if (
-          menu.code !== 'sort' &&
-          menu.code !== 'copy' &&
-          menu.code !== 'copyRow' &&
-          menu.code !== 'refresh' &&
-          menu.code !== 'clearFilter'
-        ) {
-          $table.sort(column.field, menu.code)
-        }
-      }
+      console.debug('menu',menu)
+      // if (column && column.field) {
+      //   if (
+      //     menu.code !== 'sort' &&
+      //     menu.code !== 'copy' &&
+      //     menu.code !== 'copyRow' &&
+      //     menu.code !== 'refresh' &&
+      //     menu.code !== 'clearFilter' &&
+      //     menu.code !== 'fixedLeft' &&
+      //     menu.code !== 'fixedRight'  &&
+      //     menu.code !== 'fixedCancel'
+      //   ) {
+      //     $table.sort(column.field, menu.code)
+      //   }
+      // }
       function pasteChildren (row, childrenField, parentField) {
         if (row[childrenField] && row[childrenField].length > 0) {
           row[childrenField].forEach(item => {
@@ -1786,6 +1824,16 @@ export default {
               }
             }
           break
+        case 'fixedCancel':
+           //取消固定列
+           this.$refs.baseGrid.clearColumnFixed(column.field)
+           this.saveTableHeight()
+           break
+        case 'fixedLeft':
+           //固定列到左侧
+           this.$refs.baseGrid.setColumnFixed(column.field, 'left')
+           this.saveTableHeight()
+           break;
         case 'clearFilter':
           // 示例
           const filterList = this.$refs.baseGrid.getCheckedFilters()
@@ -1852,6 +1900,21 @@ export default {
           break
         default:
       }
+    },
+    /**
+     * 固定列到左侧
+     * @param scope 
+     */
+    fixedLeftColumn(scope){
+        this.$refs.baseGrid.setColumnFixed(scope.column.field, 'left')
+        
+    },
+    /**
+     * 取消固定列
+     * @param scope 
+     */
+    fixedCancelColumn(scope){
+
     },
     getFiltersList() {
       return this.filterExpression
@@ -3712,6 +3775,9 @@ export default {
         if (tempObject.extraInfo.order) {
           tempData.extraInfo.order = tempObject.extraInfo.order
         }
+        if(item.fixed){
+          tempData.extraInfo['fixed'] = item.fixed
+        }
         postData.fields.push(tempData)
       })
       saveUserModuleDataFieldApi(postData)
@@ -3997,6 +4063,7 @@ export default {
 }
 ::v-deep span.vxe-cell--title {
   margin-right: auto;
+  display: inline-flex;//当表头设置换行时需要把这个样式覆盖加上，否则筛选和过滤会在第二行显示
 }
 .inner-cell-control {
   width: 100% !important;