@bsgoal/common 2.15.2 → 2.15.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsgoal/common",
-  "version": "2.15.2",
+  "version": "2.15.4",
   "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-26 11:53:22
+ * @LastEditTime: 2023-06-28 14:19:38
  * @FilePath: \common\src\components\bsgoal-base-search-table\index.vue
  * @Description: 查询+表格 基础组件
  * 
@@ -127,12 +127,13 @@ const props = defineProps({
   /**
    * pageSize
    */
-   pageSize: {
+  pageSize: {
     type: [Number],
     default: 20
   }
 })
 
+const emits = defineEmits(['select', 'select-all', 'selection-change', 'on-total-change'])
 
 const transferFoldStatus = ref(false)
 provide('transferFoldStatus', transferFoldStatus)
@@ -185,10 +186,36 @@ const refresh = () => {
 }
 // ---> E 刷新 <---
 
+// ---> S 触发事件 <---
+const triggerSelect = (selection, row) => {
+  emits('select', selection, row)
+}
+const triggerSelectAll = (selection) => {
+  emits('select-all', selection)
+}
+const triggerSelectionChange = (selection) => {
+  emits('selection-change', selection)
+}
+
+const triggerTotalChange = (total = 0) => {
+  emits('on-total-change', total)
+}
+
+// ---> E 触发事件 <---
+
+// ---> S 暴露事件 <---
+
+const clearSelection = () => {
+  BSGOAL_BASE_TABLE_REF.value.clearSelection()
+}
+
+// ---> E 暴露事件 <---
+
 // ---> S 暴露 <---
 
 defineExpose({
-  refresh
+  refresh,
+  clearSelection
 })
 // ---> E 暴露 <---
 </script>
@@ -218,6 +245,10 @@ defineExpose({
         :fetch="fetch"
         :call="call"
         :has-page="hasPage"
+        @select="triggerSelect"
+        @select-all="triggerSelectAll"
+        @selection-change="triggerSelectionChange"
+        @on-total-change="triggerTotalChange"
       >
         <!-- S 顶部菜单 -->
 

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-25 17:11:30
+ * @LastEditTime: 2023-06-28 13:53:43
  * @FilePath: \common\src\components\bsgoal-base-table\demo.vue
  * @Description: 表格公共组件演示页面
  * 
@@ -16,7 +16,7 @@ import BsgoalBaseSearch from '../bsgoal-base-search/index.vue'
 import ComponentTypeEnums from '../../enums/componentTypeEnums.js'
 
 defineOptions({
-   name:'BsgoalBaseTableDemo111'
+  name: 'BsgoalBaseTableDemo111'
 })
 
 let searchOptions = ref([
@@ -216,7 +216,7 @@ setTimeout(() => {
 const configOptionsTable = ref([
   {
     label: '宽度',
-    prop: 'prop1',
+    prop: 'prop1'
     // tooltip: true,
     // limit: 3
   },
@@ -245,12 +245,30 @@ const configOptionsTable = ref([
 const clearData = () => {
   data.value = []
 }
+
+const triggerSelect = (selection, row) => {
+  console.log('select', selection, row)
+}
+const triggerSelectAll = (selection) => {
+  console.log('select-all', selection)
+}
+const triggerSelectionChange = (selection) => {
+  console.log('selection-change', selection)
+}
+
+const BSGOAL_EL_TABLE_REF = ref(null)
+
+const clearSelection = () => {
+  BSGOAL_EL_TABLE_REF.value.clearSelection()
+}
 </script>
 <template>
   <div class="bsgoal-base-table-demo">
+    <el-button type="primary" @click="clearSelection">清空选择</el-button>
     <!-- <BsgoalBaseSearch  :config-options="searchOptions" /> -->
-    <el-button type="primary" @click="clearData">设置为空数据</el-button>
+    <!-- <el-button type="primary" @click="clearData">设置为空数据</el-button> -->
     <BsgoalBaseTable
+      ref="BSGOAL_EL_TABLE_REF"
       operation-width="200"
       operation
       selection
@@ -258,6 +276,9 @@ const clearData = () => {
       :config-options="configOptionsTable"
       :data="data"
       :auto-height="false"
+      @select="triggerSelect"
+      @select-all="triggerSelectAll"
+      @selection-change="triggerSelectionChange"
     >
       <!-- S 操作项 -->
       <template v-slot:operation="{ row }">

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-25 17:14:14
+ * @LastEditTime: 2023-06-28 14:17:06
  * @FilePath: \common\src\components\bsgoal-base-table\index.vue
  * @Description: 
  * 
@@ -136,6 +136,8 @@ const props = defineProps({
   }
 })
 
+const emits = defineEmits(['select', 'select-all', 'selection-change','on-total-change'])
+
 /**
  * @Author: canlong.shen
  * @description:
@@ -217,6 +219,10 @@ watch(resData, (data) => {
   }
 })
 
+watchEffect(() => {
+  emits('on-total-change', total.value)
+})
+
 // 查询
 const refreshList = (params = {}) => {
   searchParams.value = params
@@ -240,9 +246,32 @@ watch([currentPage, curPageSize], () => {
 const TREE_SWITCH_STATUS = inject('TREE_SWITCH_STATUS')
 // ---> E 左侧机构树折叠状态 <---
 
+// ---> S 触发事件 <---
+const triggerSelect = (selection, row) => {
+  emits('select', selection, row)
+}
+const triggerSelectAll = (selection) => {
+  emits('select-all', selection)
+}
+const triggerSelectionChange = (selection) => {
+  emits('selection-change', selection)
+}
+// ---> E 触发事件 <---
+
+// ---> S 暴露事件 <---
+
+const BSGOAL_EL_TABLE_REF = ref(null)
+
+const clearSelection = () => {
+  BSGOAL_EL_TABLE_REF.value.clearSelection()
+}
+
+// ---> E 暴露事件 <---
+
 // 暴露的属性
 defineExpose({
-  refreshList
+  refreshList,
+  clearSelection
 })
 </script>
 
@@ -257,6 +286,7 @@ defineExpose({
       <!-- S 表格区域 -->
       <div ref="EL_TABLE_WRAP_REF">
         <el-table
+          ref="BSGOAL_EL_TABLE_REF"
           stripe
           border
           highlight-current-row
@@ -269,6 +299,9 @@ defineExpose({
             color: 'rgba(0,0,0,.85)',
             fontSize: '14px'
           }"
+          @select="triggerSelect"
+          @select-all="triggerSelectAll"
+          @selection-change="triggerSelectionChange"
         >
           <!-- / 无数据展示内容 -->
           <template #empty>

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

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-06-20 09:20:51
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-06-27 11:27:35
+ * @LastEditTime: 2023-06-28 14:22:20
  * @FilePath: \common\src\components\bsgoal-base-tree-table\demo.vue
  * @Description:  树 + 列表 + 演示
  * 
@@ -779,7 +779,7 @@ setTimeout(() => {
       hasIcon: true
     },
     {
-      key:'label2-2',
+      key: 'label2-2',
       label: 'label2-2',
       children: [
         {
@@ -798,9 +798,27 @@ const test = () => {
   BSGOAL_BASE_TREE_TABLE_REF.value.refreshList({})
 }
 
+const triggerTableSelect = () => {
+  console.log('triggerTableSelect', triggerTableSelect)
+}
+const triggerTableSelectAll = () => {
+  console.log('triggerTableSelectAll', triggerTableSelectAll)
+}
+const triggerTableSelectionChange = () => {
+  console.log('triggerTableSelectionChange', triggerTableSelectionChange)
+}
+const triggerTableTotalChange = (total = 0) => {
+  console.log('triggerTableTotalChange', total)
+}
+
+const clearSelection = () => {
+  BSGOAL_BASE_TREE_TABLE_REF.value.clearSelection()
+}
 // ---> E 列表 <---
 </script>
 <template>
+  <el-button type="primary" @click="clearSelection">清空选择</el-button>
+
   <div class="bsgoal-base-tree-table-demo">
     <div class="base_tree_table_demo">
       <!-- <div @click="test">点击</div> -->
@@ -816,14 +834,18 @@ const test = () => {
         :expression="77"
         @on-click-tree="triggerTreeClick"
         @on-add-tree="triggerTreeAddClick"
+        @on-select-table="triggerTableSelect"
+        @on-select-all-table="triggerTableSelectAll"
+        @on-selection-change-table="triggerTableSelectionChange"
+        @on-total-change-table="triggerTableTotalChange"
       >
-      <!-- <template #tree="{data}">
+        <!-- <template #tree="{data}">
          <div>{{ data }}</div>
       </template> -->
-      <!-- <template #prop1="{row}">
+        <!-- <template #prop1="{row}">
          <div>{{ row }}</div>
       </template> -->
-    </BsgoalBaseTreeTable>
+      </BsgoalBaseTreeTable>
     </div>
   </div>
 </template>

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-27 13:54:17
+ * @LastEditTime: 2023-06-28 14:21:32
  * @FilePath: \common\src\components\bsgoal-base-tree-table\index.vue
  * @Description: 树结构  + 列表
  * 
@@ -158,7 +158,7 @@ const props = defineProps({
   /**
    * 节点的 key
    */
-   nodeKey: {
+  nodeKey: {
     type: [String],
     default: 'key'
   },
@@ -171,7 +171,15 @@ const props = defineProps({
   }
 })
 
-const emits = defineEmits(['on-click-tree', 'on-switch-tree', 'on-add-tree'])
+const emits = defineEmits([
+  'on-click-tree',
+  'on-switch-tree',
+  'on-add-tree',
+  'on-select-table',
+  'on-select-all-table',
+  'on-selection-change-table',
+  'on-total-change-table'
+])
 
 // ---> S 注入插槽 <---
 const slots = useSlots()
@@ -217,9 +225,33 @@ const refreshList = (params = {}) => {
   BSGOAL_BASE_SEARCH_TABLE_REF.value.refresh(params)
 }
 
+// ---> S 触发事件 <---
+const triggerSelect = (selection = {}, row =[]) => {
+  emits('on-select-table', selection, row)
+}
+const triggerSelectAll = (selection = {}) => {
+  emits('on-select-all-table', selection)
+}
+const triggerSelectionChange = (selection = {}) => {
+  emits('on-selection-change-table', selection)
+}
+const triggerTotalChange = (total = 0) => {
+  emits('on-total-change-table', total)
+}
+// ---> E 触发事件 <---
+
+// ---> S 暴露事件 <---
+
+const clearSelection = () => {
+  BSGOAL_BASE_SEARCH_TABLE_REF.value.clearSelection()
+}
+
+// ---> E 暴露事件 <---
+
 // 暴露的属性
 defineExpose({
-  refreshList
+  refreshList,
+  clearSelection
 })
 
 // ---> E 表 <---
@@ -260,7 +292,14 @@ const tableStyler = computed(() => {
       </div>
       <div class="base_tree_table--table" :style="tableStyler">
         <!-- S 列表 -->
-        <BsgoalBaseSearchTable ref="BSGOAL_BASE_SEARCH_TABLE_REF" v-bind="$props">
+        <BsgoalBaseSearchTable
+          ref="BSGOAL_BASE_SEARCH_TABLE_REF"
+          v-bind="$props"
+          @select="triggerSelect"
+          @select-all="triggerSelectAll"
+          @selection-change="triggerSelectionChange"
+          @on-total-change="triggerTotalChange"
+        >
           <template v-for="slotName of slotNames" v-slot:[slotName]="{ row = {} }">
             <slot :name="slotName" :row="row"></slot>
           </template>