doway-coms 2.11.61 → 2.11.62

package/package.json

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

package/packages/BaseDateMonth/index.js

@@ -1,8 +1,8 @@
-// 导入组件，组件必须声明 name
-import BaseDateMonth from './src/index.vue';
-// 为组件提供 install 安装方法，供按需引入
-BaseDateMonth.install = function(Vue) {
-    Vue.component(BaseDateMonth.name, BaseDateMonth);
-};
-// 默认导出组件
+// 导入组件，组件必须声明 name
+import BaseDateMonth from './src/index.vue';
+// 为组件提供 install 安装方法，供按需引入
+BaseDateMonth.install = function(Vue) {
+    Vue.component(BaseDateMonth.name, BaseDateMonth);
+};
+// 默认导出组件
 export default BaseDateMonth;

package/packages/BaseDateMonth/src/index.vue

@@ -1,164 +1,164 @@
-<template>
-  <div class="d-control-container">
-    <div class="d-control-label">
-      {{ label }}
-      <span v-if="rules && rules['required']" class="d-control-label-required"
-        >*</span
-      >
-      <Tooltip :title="tooltip" v-if="tooltip" style="margin: 0 2px">
-        <img src="../../styles/icon/help.png" alt="" style="width: 14px" />
-      </Tooltip>
-    </div>
-    <div class="d-control">
-      <ValidationProvider
-        :name="label"
-        v-slot="v"
-        :rules="rules"
-        v-if="edit === true"
-      >
-        <MonthPicker
-          :size="'small'"
-          placeholder="选择月"
-          v-model="currentValue"
-          value-format="YYYY-MM-DD"
-          style="width: 100%"
-          :class="{ 'd-error-input': v.errors.length > 0 }"
-          @change="change"
-        />
-        <div class="d-error-msg">
-          {{ v.errors[0] }}
-        </div>
-      </ValidationProvider>
-      <Tooltip placement="topLeft" v-else>
-        <template slot="title">
-          {{ moment(currentValue).format("YYYY-MM") }}
-        </template>
-        <span  @contextmenu.prevent="(event) => onContextmenu(event, currentValue)">
-          {{ moment(currentValue).format("YYYY-MM") }}
-        </span>
-      </Tooltip>
-    </div>
-  </div>
-</template>
-  
-<script>
-//VXETable插件
-import VXETable from "vxe-table";
-//轻量级剪贴板复制函数
-import XEClipboard from "xe-clipboard";
-import moment from "moment";
-import { DatePicker } from "ant-design-vue";
-import { ValidationProvider } from "vee-validate";
-import { Tooltip } from "ant-design-vue";
-export default {
-  name: "BaseDateMonth",
-  components: {
-    MonthPicker: DatePicker.MonthPicker,
-    ValidationProvider,
-    Tooltip,
-  },
-  data() {
-    return {
-      moment,
-      filterValue: "",
-      isInputChanged: false,
-      inputTimeout: null,
-      searchRows: [],
-      filterCols: [],
-      gridLoading: false,
-      gridPagerConfig: {
-        total: 0,
-        currentPage: 1,
-        pageSize: 10,
-      },
-    };
-  },
-  computed: {
-    currentValue: {
-      // 动态计算currentValue的值
-      get: function () {
-        return this.value; // 将props中的value赋值给currentValue
-      },
-      set: function (val) {
-        this.$emit("input", val); // 通过$emit触发父组件
-      },
-    },
-  },
-  props: {
-    rules: {
-      type: Object,
-      default: function () {
-        return null;
-      },
-    },
-    value: {
-      type: String,
-      default: function () {
-        return "";
-      },
-    },
-    edit: {
-      type: Boolean,
-      default: function () {
-        return false;
-      },
-    },
-    name: {
-      type: String,
-      default: function () {
-        return "";
-      },
-    },
-    label: {
-      type: String,
-      default: function () {
-        return "";
-      },
-    },
-    placeholder: {
-      type: String,
-      default: function () {
-        return "";
-      },
-    },
-    tooltip: {
-      type: String,
-      default: function () {
-        return "";
-      },
-    },
-  },
-  created() {},
-  methods: {
-    change() {
-      this.$emit("change");
-    },
-    onContextmenu(event, currentValue) {
-      this.$contextmenu({
-        items: [
-          {
-            icon: 'ant-design:folder-open-filled',
-            label: "复制",
-            onClick: () => {
-              if (XEClipboard.copy(currentValue)) {
-                VXETable.modal.message({
-                  content: "已复制到剪贴板！",
-                  status: "success",
-                });
-              }
-            }
-          }
-        ],
-        event,
-        zIndex: 1000,
-        minWidth: 150
-      });
-      return false;
-    }
-  },
-};
-</script>
-  
-  <style lang="less">
-@import "../../styles/default.less";
+<template>
+  <div class="d-control-container">
+    <div class="d-control-label">
+      {{ label }}
+      <span v-if="rules && rules['required']" class="d-control-label-required"
+        >*</span
+      >
+      <Tooltip :title="tooltip" v-if="tooltip" style="margin: 0 2px">
+        <img src="../../styles/icon/help.png" alt="" style="width: 14px" />
+      </Tooltip>
+    </div>
+    <div class="d-control">
+      <ValidationProvider
+        :name="label"
+        v-slot="v"
+        :rules="rules"
+        v-if="edit === true"
+      >
+        <MonthPicker
+          :size="'small'"
+          placeholder="选择月"
+          v-model="currentValue"
+          value-format="YYYY-MM-DD"
+          style="width: 100%"
+          :class="{ 'd-error-input': v.errors.length > 0 }"
+          @change="change"
+        />
+        <div class="d-error-msg">
+          {{ v.errors[0] }}
+        </div>
+      </ValidationProvider>
+      <Tooltip placement="topLeft" v-else>
+        <template slot="title">
+          {{ moment(currentValue).format("YYYY-MM") }}
+        </template>
+        <span  @contextmenu.prevent="(event) => onContextmenu(event, currentValue)">
+          {{ moment(currentValue).format("YYYY-MM") }}
+        </span>
+      </Tooltip>
+    </div>
+  </div>
+</template>
+  
+<script>
+//VXETable插件
+import VXETable from "vxe-table";
+//轻量级剪贴板复制函数
+import XEClipboard from "xe-clipboard";
+import moment from "moment";
+import { DatePicker } from "ant-design-vue";
+import { ValidationProvider } from "vee-validate";
+import { Tooltip } from "ant-design-vue";
+export default {
+  name: "BaseDateMonth",
+  components: {
+    MonthPicker: DatePicker.MonthPicker,
+    ValidationProvider,
+    Tooltip,
+  },
+  data() {
+    return {
+      moment,
+      filterValue: "",
+      isInputChanged: false,
+      inputTimeout: null,
+      searchRows: [],
+      filterCols: [],
+      gridLoading: false,
+      gridPagerConfig: {
+        total: 0,
+        currentPage: 1,
+        pageSize: 10,
+      },
+    };
+  },
+  computed: {
+    currentValue: {
+      // 动态计算currentValue的值
+      get: function () {
+        return this.value; // 将props中的value赋值给currentValue
+      },
+      set: function (val) {
+        this.$emit("input", val); // 通过$emit触发父组件
+      },
+    },
+  },
+  props: {
+    rules: {
+      type: Object,
+      default: function () {
+        return null;
+      },
+    },
+    value: {
+      type: String,
+      default: function () {
+        return "";
+      },
+    },
+    edit: {
+      type: Boolean,
+      default: function () {
+        return false;
+      },
+    },
+    name: {
+      type: String,
+      default: function () {
+        return "";
+      },
+    },
+    label: {
+      type: String,
+      default: function () {
+        return "";
+      },
+    },
+    placeholder: {
+      type: String,
+      default: function () {
+        return "";
+      },
+    },
+    tooltip: {
+      type: String,
+      default: function () {
+        return "";
+      },
+    },
+  },
+  created() {},
+  methods: {
+    change() {
+      this.$emit("change");
+    },
+    onContextmenu(event, currentValue) {
+      this.$contextmenu({
+        items: [
+          {
+            icon: 'ant-design:folder-open-filled',
+            label: "复制",
+            onClick: () => {
+              if (XEClipboard.copy(currentValue)) {
+                VXETable.modal.message({
+                  content: "已复制到剪贴板！",
+                  status: "success",
+                });
+              }
+            }
+          }
+        ],
+        event,
+        zIndex: 1000,
+        minWidth: 150
+      });
+      return false;
+    }
+  },
+};
+</script>
+  
+  <style lang="less">
+@import "../../styles/default.less";
 </style>

package/packages/BaseGrid/src/index.vue

@@ -85,6 +85,8 @@
       :show-footer="showFooter"
       @scroll="bodyScroll"
       @keydown="keydownEvent"
+      @cell-mouseenter="cellMouseEnter"
+      @cell-mouseleave="cellMouseLeave"
     >
       <template v-for="item in internalColumns" #[item.field]>
         <div :key="item.field">
@@ -818,7 +820,7 @@ import BasePagination from '../../BasePagination/index'
 import exportCmp from './exportCmp.vue'
 import BasePulldown from '../../BasePulldown/index'
 import BaseGridAdjust from '../../BaseGridAdjust/index'
-import { saveUserModuleDataFieldApi, userResetApi } from '../../utils/api'
+import { saveUserModuleDataFieldApi, userResetApi, saveUserModuleDataPageSizeApi } from '../../utils/api'
 import { gridDefaultValueDisplay } from '../../utils/filters'
 import SeqSetting from './SeqSetting'
 import request from '../../utils/request'
@@ -850,6 +852,7 @@ export default {
   },
   data() {
     return {
+      selectedCells :[],//选中的列信息
       gridOptions:{},
       copySaveRow:null, //存储复制的行
       gridDefaultValueDisplay: gridDefaultValueDisplay,
@@ -924,6 +927,12 @@ export default {
                 visible: true,
                 disabled: false,
               },
+              {
+                code: 'batchPasteFirstValue',
+                name: '批量修改成第一个值',
+                visible: true,
+                disabled: false,
+              },
               {
                 code: 'sort',
                 name: '排序',
@@ -959,6 +968,16 @@ export default {
                 if(item.code==='fixedLeft'){
                   item.visible = Boolean(column && !column.fixed && this.moduleCode && this.dataCode && column.type!=='seq' && column.type!=='checkbox')
                 }
+                if(item.code==='batchPasteFirstValue'){
+                  let tempVisible = false
+                  if(this.selectedCells.length>1){
+                    let tempColumn = this.$refs.baseGrid.getColumns()[this.selectedCells[0].columnIndex]
+                    if(tempColumn.params && tempColumn.params.batchPaste===true){
+                      tempVisible = true
+                    }
+                  }
+                  item.visible =tempVisible
+                }
               })
             })
           // if(column && column.fixed){
@@ -1434,7 +1453,17 @@ export default {
       }
       return scope.column.params.controlEdit === true && editExpResult
     },
+    cellMouseEnter(scope){
+      if(scope.$event.buttons===1){
+        //左键被按下进行拖动
+        this.setRangeSelectCell(scope)
+      }
+      // console.debug('cellMouseEnter',scope)
+    },
+    cellMouseLeave(scope){
+    },
     keydownEvent({$event,$grid,$table}){
+      console.log('keydownEvent',$event)
       if(this.keyBoardNavi){
         const key=$event.key
           //当前行
@@ -1555,6 +1584,8 @@ export default {
         //设置筛选过滤条件
         this.setFilterExpression()
         //通知外部筛选改变事件
+         //清空选中单元格信息
+        this.selectedCells = []
         this.$emit('filterChange', { filterCol: colInfo })
       } else {
         // 手动触发重新筛选filterMethod()方法
@@ -1776,7 +1807,7 @@ export default {
     contextMenuClickEvent({ menu, row, column }) {
       let vm = this
       const $table = this.$refs.baseGrid
-      console.debug('menu',menu)
+      // console.debug('menu',menu)
       // if (column && column.field) {
       //   if (
       //     menu.code !== 'sort' &&
@@ -1887,6 +1918,8 @@ export default {
           this.tagData = JSON.parse(
             JSON.stringify(this.$refs.baseGrid.getCheckedFilters())
           )
+           //清空选中单元格信息
+         this.selectedCells = []
           vm.$emit('filterChange')
           break
         case 'desc':
@@ -1925,9 +1958,56 @@ export default {
           })
           this.$emit('sortChange', data)
           break
-        default:
+        case 'batchPasteFirstValue':
+          this.batchPasteFirstValue()
+          break
+          default:
       }
     },
+    batchPasteFirstValue(){
+      console.debug('batchPasteFirstValue')
+       if(this.selectedCells.length===0){ 
+          return
+       }
+       //获取第一个单元格的值,并且判断是否可以编辑
+       if(this.gridEdit!==true){
+          return
+       }
+
+       let tempVisibleColumns =  this.$refs.baseGrid.getColumns()
+
+      let firstColumn =  tempVisibleColumns[this.selectedCells[0].columnIndex]
+      if(!(firstColumn.params && firstColumn.params.edit===true)){
+          //不可编辑的状态
+          return
+      }
+      //可以批量复制的控件类型
+      let availableControlTypes = [controlType.text,controlType.number,controlType.date,
+        controlType.datetime,controlType.select
+      ]
+
+      if(XEUtils.indexOf(availableControlTypes,firstColumn.params.controlType)<0){
+        //不可编辑的状态
+        return
+      }
+
+      let visibleData = this.getVisibleData()
+      let firstValue = visibleData[this.selectedCells[0].rowIndex][firstColumn.field]
+       //可以编辑的状态
+       for(let i=1;i<this.selectedCells.length;i++){
+          if(this.selectedCells[i].columnIndex!==this.selectedCells[0].columnIndex){
+            //如果不是同一列 就不处理
+            continue
+          }
+          let currentRowInfo = visibleData[this.selectedCells[i].rowIndex]
+          currentRowInfo[firstColumn.field]=firstValue
+          this.cellValueChange({row:currentRowInfo,column:firstColumn})
+        //  console.debug('currentRowInfo',currentRowInfo)
+       }
+       
+
+      //  let firstCellValue=this.selectedCells[0].
+    },
     /**
      * 固定列到左侧
      * @param scope
@@ -1956,6 +2036,8 @@ export default {
       return this.defaultSort.map((item) => [item.field, item.order])
     },
     filterChange({ column, property, values, datas, filterList, $event }) {
+      //清空选中单元格信息
+      this.selectedCells = []
       let vm = this
       //如果不是远程筛选 就不emit了
       if (!this.filterRemote) {
@@ -2127,6 +2209,9 @@ export default {
       if (originCol.editStates) {
         colParams['editStates'] = originCol.editStates
       }
+      if(originCol.batchPaste===true){
+        colParams['batchPaste'] = originCol.batchPaste
+      }
       if (originCol.editStatuss) {
         colParams['editStatuss'] = originCol.editStatuss
       }
@@ -2146,7 +2231,7 @@ export default {
         colInfo.width = 100
       }
 
-      if (this.showHeaderOverflow = false){
+      if (this.showHeaderOverflow === false){
         // 设置最小列宽为60px
         colInfo.minWidth = originCol.minWidth || 60
       }
@@ -2446,6 +2531,9 @@ export default {
       })
     },
     sortChange({ column, property, order, sortBy, sortList, $event }) {
+      //清空单元格选中信息
+      this.selectedCells = []
+      // console.debug('sortChange')
       if (this.filterRemote) {
         let tempSortList = []
         XEUtils.arrayEach(sortList, (loopSort) => {
@@ -2458,6 +2546,12 @@ export default {
       this.$emit('currentChange', scope.row)
     },
     pageSizeChange(page, pageSize) {
+      let postData = {
+        moduleCode: this.moduleCode,
+        dataCode: this.dataCode,
+        pageSize: pageSize
+      }
+      saveUserModuleDataPageSizeApi(postData)
       this.$emit('pageSizeChange', page, pageSize, this.filterExpression)
     },
     pageChange(page, pageSize) {
@@ -2994,6 +3088,8 @@ export default {
     },
     checkBoxChanged({ checked, records, row }) {
       this.$emit('checkBoxChanged', checked, records, row)
+      //更新表尾选中合计
+      this.$refs.baseGrid.updateFooter()
     },
     checkBoxAllChanged({ checked, records }) {
       this.$emit('checkBoxAllChanged', checked, records)
@@ -3223,12 +3319,40 @@ export default {
      * 表尾
      */
     footerMethod({ columns, data }) {
+      // console.debug('footer method',columns,data)
       let footerData= this.customFooterMethod({ columns, data })
       if(footerData){
         return footerData
       }else{
         if (this.footerSum.length > 0) {
-            let tempResult = [
+          let tempResult = []
+          //选中后合计
+          let tempSelectRows =  this.$refs.baseGrid.getCheckboxRecords(true)
+          if(tempSelectRows.length>0){
+            let tempCheckedResult =  columns.map((column, columnIndex) => {
+                if (columnIndex === 0) {
+                  return '选中'
+                }
+                if (this.footerSum.includes(column.property)) {
+                  let tempSumVal = XEUtils.sum(tempSelectRows, column.property)
+                  if (
+                      column.formatter &&
+                      column.formatter !== 'defaultFormat' &&
+                      VXETable.formats.store[column.formatter]
+                  ) {
+                    tempSumVal = VXETable.formats.store[column.formatter].cellFormatMethod({
+                      cellValue: tempSumVal,
+                    })
+                  }
+                  return tempSumVal
+                }
+                return null
+              })
+              tempResult.push(tempCheckedResult)
+          }
+          
+          //所有合计
+            let tempTotalResult = 
               columns.map((column, columnIndex) => {
                 if (columnIndex === 0) {
                   return '合计'
@@ -3247,16 +3371,58 @@ export default {
                   return tempSumVal
                 }
                 return null
-              }),
-            ]
+              })
+            
+         
+            tempResult.push(tempTotalResult)
+            // console.debug('tempResult',tempResult)
             return tempResult
         } else {
           return []
         }
       }
     },
-    async cellClick({ row, column }) {
-      this.$emit('cellClick', { row, column })
+    async cellClick(scope) {
+      // console.debug('cellClick',scope)
+      // console.debug('cellClick event',scope.$event)
+      let rowKeyField = '_X_ROW_KEY'
+      // let rowElId = row._X_ROW_KEY
+      if(this.rowConfig!=null&&this.rowConfig.keyField){
+        rowKeyField= this.rowConfig.keyField
+      }
+
+      // console.debug('columnIndex',scope.$columnIndex,scope.columnIndex)
+      // console.debug(XEUtils.map(this.$refs.baseGrid.getColumns(),p=>p.field))
+
+
+
+
+      // console.debug('cellClick',column.property,rowElId,row)
+      if(scope.$event.ctrlKey===true){
+         //按住了ctrl键后的点击
+        this.selectedCells.push({
+        columnIndex:scope.$columnIndex,
+        rowIndex:scope.$rowIndex
+      })
+       
+      }else if(scope.$event.shiftKey===true && this.selectedCells.length>0){
+        //按住了shift键后的点击,需要计算选中后的区域,清空除第一个之后的数据
+        this.setRangeSelectCell(scope)
+        // scope.$event.preventDefault()
+        // scope.$event.stopPropagation()
+        
+      }else{
+        this.selectedCells = [{
+        columnIndex:scope.$columnIndex,
+        rowIndex:scope.$rowIndex
+        }]
+      }
+      // console.debug('this.selectedCells',this.selectedCells)
+      this.$emit('cellClick', { row:scope.row, column:scope.column })
+      // if(this.selectedCells.lengh>1){
+      //     //多选情况下就不开启编辑行
+      //     return
+      // }
       //判断是否可以跳转
       // if (
       //   this.gridEdit != true ||
@@ -3288,7 +3454,7 @@ export default {
       if (this.gridEdit !== true) {
         return
       }
-      if (this.$refs.baseGrid.isEditByRow(row) === true) {
+      if (this.$refs.baseGrid.isEditByRow(scope.row) === true) {
         //判断当前行是否是编辑行
         return
       }
@@ -3302,7 +3468,7 @@ export default {
     while (attempt < maxAttempts) {
       const editingRecord = this.$refs.baseGrid.getEditRecord()
       // 如果没有正在编辑的行，或者只有当前行在编辑，则退出等待
-      if (!editingRecord || editingRecord.row===row) {
+      if (!editingRecord || editingRecord.row===scope.row) {
         // console.debug('当前行编辑')
         return true
       }
@@ -3319,11 +3485,40 @@ export default {
       //检查是否存在其他行还是编辑状态，如果还是编辑状态就等待关闭编辑状态后再执行当前行的编辑
       //因为会存在如果有校验的话会存在切换快，并且页面卡顿的情况的话会出现当前行打开编辑后又
 
-      if (column.editRender && column.editRender.enabled === true) {
-        this.$refs.baseGrid.setEditCell(row, column)
+      if (scope.column.editRender && scope.column.editRender.enabled === true) {
+        this.$refs.baseGrid.setEditCell(scope.row, scope.column)
       } else {
-        this.$refs.baseGrid.setEditRow(row)
+        this.$refs.baseGrid.setEditRow(scope.row)
+      }
+    },
+    setRangeSelectCell(scope){
+      if(this.selectedCells.length===0){
+        return  
       }
+        let startRowIndex = this.selectedCells[0].rowIndex
+        let endRowIndex = scope.$rowIndex
+        let startColumnIndex = this.selectedCells[0].columnIndex
+        let endColumnIndex = scope.$columnIndex
+        //清空除第一个的坐标
+        this.selectedCells.splice(1)
+        if(startRowIndex>endRowIndex){
+          [startRowIndex, endRowIndex] = [endRowIndex, startRowIndex]
+        }
+        if (startColumnIndex > endColumnIndex) {
+          [startColumnIndex, endColumnIndex] = [endColumnIndex, startColumnIndex]
+        }
+        for (let rowIndex = startRowIndex; rowIndex <= endRowIndex; rowIndex++) {
+          for (let colIndex = startColumnIndex; colIndex <= endColumnIndex; colIndex++) {
+            if(this.selectedCells[0].rowIndex===rowIndex&&this.selectedCells[0].columnIndex===colIndex){
+              //第一个跳过
+              continue
+            }
+            this.selectedCells.push({
+              columnIndex:colIndex,
+              rowIndex:rowIndex
+            })
+          }
+        }
     },
     linkClick({item,index, row, column }) {
       if ( this.gridEdit !== true || !(column.editRender && column.editRender.enabled === true)  ) {
@@ -3394,6 +3589,9 @@ export default {
         return customStyle
     },
     cellStyleFunc(scope){
+
+        // console.debug('cellstyle',scope.column.property)
+
         let customStyle = {}
         if(this.cellStyle){
             customStyle = this.cellStyle
@@ -3403,6 +3601,20 @@ export default {
               customStyle[loopProp] = scope.column.params.cellStyle[loopProp]
             }
         }
+
+        //设置选中列样式
+        let selectedCell =  XEUtils.find(this.selectedCells,p=>p.rowIndex===scope.$rowIndex && p.columnIndex===scope.$columnIndex)
+        if(selectedCell){
+          // console.debug('scope',scope.column.property,scope.row.id,this.selectedCells)
+          customStyle.border = '1px solid #409eff'
+          customStyle.backgroundColor = 'rgb(198 223 247)'
+        }
+
+        if(this.selectedCells.length>1){
+            //多选情况下就禁用文本选择
+            customStyle.userSelect = 'none'
+        }
+
         // customStyle.border = '1px solid black'
         this.$emit('cellStyleCallback',scope,customStyle)
         return customStyle
@@ -3501,6 +3713,8 @@ export default {
       this.tagData = JSON.parse(
         JSON.stringify(this.$refs.baseGrid.getCheckedFilters())
       )
+       //清空选中单元格信息
+       this.selectedCells = []
       vm.$emit('filterChange')
     },
     filterAddExp(colInfo) {
@@ -3545,6 +3759,8 @@ export default {
       if (this.filterRemote) {
         //设置筛选过滤条件
         this.setFilterExpression()
+         //清空选中单元格信息
+      this.selectedCells = []
         //通知外部筛选改变事件
         this.$emit('filterChange', { filterCol: colInfo }, this.filterExpression)
       } else {

package/packages/utils/api.js

@@ -19,7 +19,13 @@ export function saveUserModuleDataFieldApi(data) {
     data: data
   })
 }
-
+export function saveUserModuleDataPageSizeApi(data) {
+  return request({
+    url: store.getters.umsUrl + '/v1/user/saveUserModuleDataPageSize',
+    method: 'post',
+    data: data
+  })
+}
 export function attachGetAttachUrlApi() {
   return store.getters.msgUrl + '/v1/Attach'
 }