meixioacomponent 2.0.36 → 2.0.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meixioacomponent",
-  "version": "2.0.36",
+  "version": "2.0.38",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/packages/components/base/basePlainTable/basePlainTable.vue

@@ -2,6 +2,7 @@
   <div class="table-wrap">
     <t-enhanced-table
         ref="tTable"
+        :footData="footData"
         :rowKey="rowKey"
         :data="tableData"
         :bordered="bordered"
@@ -54,7 +55,7 @@ import baseDefaultSvgVue from '../baseDefaultSvg/baseDefaultSvg.vue'
 import baseText from "../baseText";
 
 //
-import {FilterTime, TransomTableConfig} from '../../../utils/utils'
+import {FilterTime, TableFooterSummary, TransomTableConfig} from '../../../utils/utils'
 import {tableSectionMixins} from "../../mixins/tableSectionMixins";
 
 export default {
@@ -145,25 +146,21 @@ export default {
       type: Boolean,
       default: false
     },
-    tree:{
-      type:Object,
-      default:()=>{
+    tree: {
+      type: Object,
+      default: () => {
         return null
       }
+    },
+    showSummary: {
+      type: Boolean,
+      default: false
     }
 
   },
   computed: {
     renderColumns() {
 
-      const config = this.tableColumns.map((item, index) => {
-        item['key'] = item.value;
-        item['colkey'] = item.key;
-        TransomTableConfig(item, index)
-        return item;
-      });
-      console.log('checkType')
-      console.log(this.$props.checkType);
       if (this.$props.checkType) {
         const checkConfig = {
           colKey: 'row-select',
@@ -171,18 +168,44 @@ export default {
           label: 'row-select',
           disabled: (scope) => {
             if (this.$props.canSelected) {
-                return !(this.$props.canSelected(scope))
+              return !(this.$props.canSelected(scope))
             } else {
               return false
             }
 
           }
         }
+        this.tableColumns.push(checkConfig);
+      }
 
-        return [checkConfig, ...config]
-      } else {
+      return this.tableColumns.map((item, index) => {
+        item['key'] = item.value;
+        item['colkey'] = item.key;
+        TransomTableConfig(item, index)
+        if (this.$props.showSummary) {
+          if (index === 0) {
+            item['foot'] = '合计：'
+          } else {
+            item['foot'] = () => {
+              const value = TableFooterSummary(this.tableData, item.key);
+              return typeof value === 'number' ? value : '-'
+            }
+          }
+
+        }
+        return item;
+      })
+    },
+    footData() {
+      if (this.$props.showSummary) {
+        return [{
+          index: 'foot',
+          type: '汇总',
+          default: '',
+          description: '合计：',
+        }]
       }
-      return config
+      return []
     }
 
   },
@@ -236,4 +259,13 @@ export default {
 
 <style lang="less" scoped>
 @import url("../../style/tableStyle.less");
+
+.table-wrap {
+  height: 100%;
+
+  /deep/ .t-table {
+    height: 100%;
+  }
+}
+
 </style>

package/packages/components/proPageTable/oa_pro_footer.vue

@@ -21,6 +21,7 @@
       <!--      </basePopoverButton>-->
 
       <base-pagination
+          :page-sizes="pageSizes"
           :config="pageConfig"
           :pageProps="pageProps"
           @currentChange="currentChange"
@@ -50,6 +51,10 @@ export default {
     pageConfig: {
       type: Object,
     },
+    pageSizes: {
+      type: Array,
+      default: () => [15, 30, 60, 100, 200, 300],
+    },
   },
   components: {
     basePopoverButton,

package/packages/components/proPageTable/oa_pro_table.vue

@@ -97,8 +97,6 @@
       >
 
 
-
-
         <template #expanded-row="{row}" v-if="expandId">
           <slot name="expandedRow" :scope="row"></slot>
         </template>
@@ -193,6 +191,7 @@
         class="oa-pro-table-footer"
     >
       <oa_pro_footerVue
+          :page-sizes="pageSizes"
           :pageConfig="pageConfig"
           :pageProps="pageProps"
           :totalList="totalList"
@@ -510,16 +509,20 @@ export default {
       default: false
     },
 
-    expandId:{
-      type:String,
-      default:null
+    expandId: {
+      type: String,
+      default: null
     },
     rowspanAndColspan: {
       type: Function,
       default: () => {
         return null
       }
-    }
+    },
+    pageSizes: {
+      type: Array,
+      default: () => [15, 30, 60, 100, 200, 300],
+    },
   },
   computed: {
     checkType() {
@@ -630,8 +633,8 @@ export default {
   },
   mixins: [tableSectionMixins],
   methods: {
-    rehandleExpandChange(value,params){
-      this.$emit('rehandleExpandChange',value)
+    rehandleExpandChange(value, params) {
+      this.$emit('rehandleExpandChange', value)
     },
     isToolTip(value) {
       if (!value) {
@@ -903,11 +906,17 @@ export default {
       }
 
       result[`keyword`] = this.module;
-      if(this.sort.sortBy){
-        result[`sortField`] = this.sort?.sortBy;
-        result[`sortOrder`] = this.sort?.descending ? 'desc' : 'asc';
+      try {
+        if (this.sort[`sortBy`]) {
+          result[`sortField`] = this.sort?.sortBy;
+          result[`sortOrder`] = this.sort?.descending ? 'desc' : 'asc';
+        }
+      } catch (error) {
+        result[`sortField`] = null;
+        result[`sortOrder`] = '';
       }
 
+
       // 高级筛选的结果
       const searchList = [];
 

package/packages/utils/utils.js

@@ -385,3 +385,13 @@ export const TransomComponentSize = (size) => {
             return 'medium'
     }
 }
+
+
+export const TableFooterSummary = (tableData, key) => {
+    if (Array.isArray(tableData)) {
+        return tableData.reduce((preValue, currentValue, currentIndex) => {
+            return preValue + currentValue[`${key}`];
+        }, 0);
+    }
+    return 0;
+}