@bsgoal/common 2.15.8 → 2.15.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsgoal/common",
-  "version": "2.15.8",
+  "version": "2.15.10",
   "private": false,
   "files": [
     "dist",

package/src/components/bsgoal-base-search-table/index.vue

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-04-18 17:04:47
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-06-29 14:35:56
+ * @LastEditTime: 2023-06-30 10:12:43
  * @FilePath: \common\src\components\bsgoal-base-search-table\index.vue
  * @Description: 查询+表格 基础组件
  * 
@@ -137,6 +137,13 @@ const props = defineProps({
   showSummary: {
     type: [Boolean],
     default: false
+  },
+  /**
+   *  合计的列
+   */
+   summaryProps: {
+    type: [Array],
+    default: () => []
   }
 })
 
@@ -253,6 +260,7 @@ defineExpose({
         :fetch="fetch"
         :call="call"
         :has-page="hasPage"
+        :summary-props="summaryProps"
         @select="triggerSelect"
         @select-all="triggerSelectAll"
         @selection-change="triggerSelectionChange"

package/src/components/bsgoal-base-table/demo.vue

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-04-10 14:26:44
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-06-29 17:34:31
+ * @LastEditTime: 2023-06-30 10:04:04
  * @FilePath: \common\src\components\bsgoal-base-table\demo.vue
  * @Description: 表格公共组件演示页面
  * 
@@ -276,6 +276,7 @@ const clearSelection = () => {
       :config-options="configOptionsTable"
       :data="data"
       :auto-height="false"
+      :summary-props="['prop1', 'prop2', 'prop3', 'prop4', 'prop5', 'prop6']"
       @select="triggerSelect"
       @select-all="triggerSelectAll"
       @selection-change="triggerSelectionChange"

package/src/components/bsgoal-base-table/index.vue

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-04-10 11:29:04
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-06-30 08:40:07
+ * @LastEditTime: 2023-06-30 10:33:45
  * @FilePath: \common\src\components\bsgoal-base-table\index.vue
  * @Description: 
  * 
@@ -140,6 +140,13 @@ const props = defineProps({
   showSummary: {
     type: [Boolean],
     default: false
+  },
+  /**
+   *  合计的列
+   */
+  summaryProps: {
+    type: [Array],
+    default: () => []
   }
 })
 
@@ -278,22 +285,20 @@ const clearSelection = () => {
 // ---> S 表格绑定的方法 <---
 
 const summaryMethod = (columns = '') => {
+  const { summaryProps = [] } = props
   const dataList = columns.data
   const calcResultList = []
 
-  dataList.forEach((fi = {}) => {
-    let calcIndex = 0
-    for (const [prop, value] of Object.entries(fi)) {
-      const cellValue = calcResultList[calcIndex]
-      const cellValueInt = parseInt(cellValue) || 0
-      const valueInt = parseInt(value) || 0
-      calcResultList[calcIndex] = cellValueInt + valueInt
-      calcIndex++
-    }
+  summaryProps.forEach((prop = '', index = 0) => {
+    let sum = 0
+    const propDataList = dataList.map((mi) => mi[prop])
+    propDataList.forEach((pfi) => {
+      const valueInt = parseInt(pfi) || 0
+      sum += valueInt
+    })
+    calcResultList[index] = sum
   })
-
-
-  return ['合计', ...calcResultList.slice(1)]
+  return ['合计', ...calcResultList]
 }
 
 // ---> E 表格绑定的方法 <---

package/src/components/bsgoal-base-tree-table/index.vue

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-06-20 09:20:44
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-06-29 14:37:18
+ * @LastEditTime: 2023-06-30 10:13:58
  * @FilePath: \common\src\components\bsgoal-base-tree-table\index.vue
  * @Description: 树结构  + 列表
  * 
@@ -172,9 +172,16 @@ const props = defineProps({
   /**
    * 是否显示合计
    */
-   showSummary: {
+  showSummary: {
     type: [Boolean],
     default: false
+  },
+  /**
+   *  合计的列
+   */
+  summaryProps: {
+    type: [Array],
+    default: () => []
   }
 })
 
@@ -233,7 +240,7 @@ const refreshList = (params = {}) => {
 }
 
 // ---> S 触发事件 <---
-const triggerSelect = (selection = {}, row =[]) => {
+const triggerSelect = (selection = {}, row = []) => {
   emits('on-select-table', selection, row)
 }
 const triggerSelectAll = (selection = {}) => {
@@ -303,6 +310,7 @@ const tableStyler = computed(() => {
           ref="BSGOAL_BASE_SEARCH_TABLE_REF"
           v-bind="$props"
           :show-summary="showSummary"
+          :summary-props="summaryProps"
           @select="triggerSelect"
           @select-all="triggerSelectAll"
           @selection-change="triggerSelectionChange"