doway-coms 1.5.2 → 1.5.4

package/package.json

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

package/packages/BaseGrid/src/index.vue

@@ -1756,7 +1756,7 @@ export default {
       );
       this.userDefineColumns = XEUtils.filter(
         tableCollectColumn,
-        (p) => !p.children && p.params.disableUserVisible !== true && p.field !== 'operation'
+        (p) => !p.children && p.params.disableUserVisible !== true && p.sysVisible===true && p.field !== 'operation'
       );
       this.showGridColumnUserDefine = true;
     },

package/packages/BasePulldown/src/index.vue

@@ -64,6 +64,7 @@
                 :data="searchRows"
                 @cell-click="gridCellClick"
                 :columns="internalColumns"
+                :checkbox-config="{ checkMethod: checkMethod }"
               >
                 <!-- :pager-config="gridPagerConfig" -->
                 <!-- @page-change="pageChangeEvent" -->
@@ -575,6 +576,13 @@
         // this.$emit('pulldownBtnClick', btn)
         this.$refs.pulldownRef.hidePanel()
       },
+      // 多选内容时，若数据不满足条件，不可选中
+      checkMethod({ row }) {
+        if (row.sysRepeat) {
+          return false
+        }
+        return true
+      },
       /**
        * 确认多选
        */

package/packages/utils/store.js

@@ -67,7 +67,8 @@ export default new Vuex.Store({
                   filters: loopField.isFilter,
                   sortable: loopField.isSortable,
                   controlType: loopField.controlType,
-                  edit:loopField.edit
+                  edit:loopField.edit,
+                  sysVisible:!loopField.sysVisible
                 }
                 //页面状态控制
                 if(loopField.editStates){