@bsgoal/common 2.15.3 → 2.15.5

package/dist/style.css

@@ -1 +1 @@
-@charset "UTF-8";.base_tooltip_popper{max-width:20em}.bsgoal-base-form .base_form .el-form-item{margin-right:10px}.bsgoal-base-form .base_form div.el-input,.bsgoal-base-form .base_form div.el-select{width:100%}.bsgoal-base-form .base_form--visible{width:0px;height:0px;overflow:hidden}.bsgoal-base-sizes{display:inline-block}.bsgoal-base-sizes .base_sizes_input{cursor:pointer;margin-left:16px}.bsgoal-base-sizes .base_sizes_item{text-align:center;font-size:14px;padding:0 20px;color:#606266;height:34px;line-height:34px;cursor:pointer}.bsgoal-base-sizes .base_sizes_item:hover{background-color:#f5f7fa}.bsgoal-base-sizes .base_sizes_item--selected{color:#409eff;font-weight:700}.bsgoal-base-sizes .bsgoal_micro_app .el-input__suffix{margin-right:8px!important}.bsgoal-base-table-pagination{text-align:right}.bsgoal-base-table-pagination .base_table_pagination{display:inline-block;margin-top:16px}.bsgoal-base-table-empty .base_table_empty{text-align:center}.bsgoal-base-table-empty .base_table_empty_img{padding-top:16px;line-height:initial}.bsgoal-base-table-empty .base_table_empty_text{display:inline-block}.bsgoal-base-table .base_table{padding:16px}.bsgoal-base-table .base_table_menu{margin-bottom:8px}.bsgoal-base-table .el-table__body-wrapper{overflow-y:hidden!important}.bsgoal-base-table .el-scrollbar__view{height:100%}.bsgoal-base-table .base_table--tree{margin-top:10px}.bsgoal-base-table th>div.cell{white-space:nowrap}.bsgoal-base-line .base_line{height:10px;background-color:#f0f2f5}.bsgoal-base-line .bsgoal-base-line__vertical{display:inline-block;height:100%}.bsgoal-base-line .base_line__vertical{width:10px;height:100%}.bsgoal-base-line .bsgoal-base-line__fill{position:absolute;left:0;right:0}.bsgoal-base-search-operation{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:33.5px}.bsgoal-base-search-operation .operation_fold{margin-left:12px;cursor:pointer;min-width:3em}.bsgoal-base-cascader{height:100%;width:100%}.bsgoal-base-cascader .base_cascader{width:inherit;height:inherit}.bsgoal-base-search .base_search{padding:16px 6px 8px 16px}.bsgoal-base-search .base_search .el-form-item{margin-bottom:8px;margin-right:10px}.bsgoal-base-search .base_search div.el-input,.bsgoal-base-search .base_search div.el-select{width:100%}.bsgoal-base-search .el-col{margin-bottom:0!important}.bsgoal-base-tree-fold .base_tree_fold{position:absolute;top:0;bottom:0;right:10px;margin:auto;width:14px;height:38px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;border-radius:10px;background-color:var(--el-color-primary)}.bsgoal-base-tree-fold .base_tree_fold--hide{right:0px}.bsgoal-base-tree{display:inline-block}.bsgoal-base-tree .base_tree{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-sizing:border-box;box-sizing:border-box;position:relative;min-width:14px}.bsgoal-base-tree .base_tree_main{width:221px;padding:16px;scrollbar-width:none;-ms-overflow-style:none;overflow-x:hidden;overflow-y:auto}.bsgoal-base-tree .base_tree_main::-webkit-scrollbar{width:6px;height:6px}.bsgoal-base-tree .base_tree_main::-webkit-scrollbar-thumb{border-radius:10px;background:rgba(0,0,0,.2);width:20px}.bsgoal-base-tree .base_tree_main::-webkit-scrollbar-track{background-color:#fff}.bsgoal-base-tree .base_tree_main_input{margin-bottom:10px}.bsgoal-base-tree .base_tree .el-tree-node__content>i.el-tree-node__expand-icon{padding-left:0}.bsgoal-base-tree .base_tree_node{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-flex:1;-ms-flex:1;flex:1}.bsgoal-base-tree .base_tree_node_label{-webkit-box-flex:1;-ms-flex:1;flex:1}.bsgoal-base-tree .base_tree_node_icon{-webkit-box-flex:0;-ms-flex:none;flex:none}.bsgoal-base-button,.bsgoal-base-button .base_button{display:inline-block}.bsgoal-base-dialog .base_dialog_header{font-weight:500;color:#303133;font-size:16px}.bsgoal-base-dialog .bsgoal-dialog__footer--conceal .el-dialog__footer{display:none}.bsgoal-base-dialog .el-dialog__footer{height:initial;line-height:initial}.bsgoal-base-dialog .el-dialog__footer .el-button{margin-left:initial}.bsgoal-base-dialog .bsgoal_base_dialog_main .el-dialog__header{padding:16px 30px;margin-right:0;background-color:#f5f7fa;height:initial!important}.bsgoal-base-dialog .bsgoal_base_dialog_main .el-dialog__header .el-dialog__headerbtn{top:0px;right:8px}.bsgoal-base-dialog .bsgoal_base_dialog_main .el-dialog__body{padding:0}.bsgoal-base-dialog .bsgoal_base_dialog_main .base_dialog_content{padding:30px}.bsgoal-base-dialog .bsgoal_base_dialog_main .base_dialog_content--form{padding:0 0 0 30px}.bsgoal-base-dialog .bsgoal_base_dialog_main .base_dialog_content--form .bsgoal-base-form .base_form{padding:initial;padding-top:16px}.bsgoal-base-dialog .bsgoal_base_dialog_main .base_dialog_content--blank{padding-top:0}.bsgoal-base-dialog .base_dialog_footer_cancel{margin-right:16px}.bsgoal-base-tabs .base_tabs--fill{position:absolute;top:8px;bottom:0;left:16px;right:16px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.bsgoal-base-tabs .base_tabs--fill>div.el-tabs__content{-webkit-box-flex:1;-ms-flex:1;flex:1;position:relative}.bsgoal-base-alert .el-alert,.bsgoal-base-item .base_item{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.bsgoal-base-item .base_item_label{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;font-size:14px;color:#606266;height:32px;line-height:32px;padding-right:12px}.bsgoal-base-tree-table .base_tree_table{display:-webkit-box;display:-ms-flexbox;display:flex}.bsgoal-base-tree-table .base_tree_table--table{overflow:hidden}.bsgoal-base-viewer{display:inline-block}.bsgoal-base-viewer .base_viewer{margin:4px 8px}
+@charset "UTF-8";.base_tooltip_popper{max-width:20em}.bsgoal-base-form .base_form .el-form-item{margin-right:10px}.bsgoal-base-form .base_form div.el-input,.bsgoal-base-form .base_form div.el-select{width:100%}.bsgoal-base-form .base_form--visible{width:0px;height:0px;overflow:hidden}.bsgoal-base-sizes{display:inline-block}.bsgoal-base-sizes .base_sizes_input{cursor:pointer;margin-left:16px}.bsgoal-base-sizes .base_sizes_item{text-align:center;font-size:14px;padding:0 20px;color:#606266;height:34px;line-height:34px;cursor:pointer}.bsgoal-base-sizes .base_sizes_item:hover{background-color:#f5f7fa}.bsgoal-base-sizes .base_sizes_item--selected{color:#409eff;font-weight:700}.bsgoal-base-sizes .bsgoal_micro_app .el-input__suffix{margin-right:8px!important}.bsgoal-base-table-pagination{text-align:right}.bsgoal-base-table-pagination .base_table_pagination{display:inline-block;margin-top:16px}.bsgoal-base-table-empty .base_table_empty{text-align:center}.bsgoal-base-table-empty .base_table_empty_img{padding-top:16px;line-height:initial}.bsgoal-base-table-empty .base_table_empty_text{display:inline-block}.bsgoal-base-table .base_table{padding:16px}.bsgoal-base-table .base_table_menu{margin-bottom:8px}.bsgoal-base-table .el-table__body-wrapper{overflow-y:hidden!important}.bsgoal-base-table .el-scrollbar__view{height:100%}.bsgoal-base-table .base_table--tree{margin-top:10px}.bsgoal-base-table th>div.cell{white-space:nowrap}.bsgoal-base-table .bsgoal_micro_app .el-scrollbar{margin-bottom:0!important}.bsgoal-base-line .base_line{height:10px;background-color:#f0f2f5}.bsgoal-base-line .bsgoal-base-line__vertical{display:inline-block;height:100%}.bsgoal-base-line .base_line__vertical{width:10px;height:100%}.bsgoal-base-line .bsgoal-base-line__fill{position:absolute;left:0;right:0}.bsgoal-base-search-operation{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:33.5px}.bsgoal-base-search-operation .operation_fold{margin-left:12px;cursor:pointer;min-width:3em}.bsgoal-base-cascader{height:100%;width:100%}.bsgoal-base-cascader .base_cascader{width:inherit;height:inherit}.bsgoal-base-search .base_search{padding:16px 6px 8px 16px}.bsgoal-base-search .base_search .el-form-item{margin-bottom:8px;margin-right:10px}.bsgoal-base-search .base_search div.el-input,.bsgoal-base-search .base_search div.el-select{width:100%}.bsgoal-base-search .el-col{margin-bottom:0!important}.bsgoal-base-tree-fold .base_tree_fold{position:absolute;top:0;bottom:0;right:10px;margin:auto;width:14px;height:38px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;border-radius:10px;background-color:var(--el-color-primary)}.bsgoal-base-tree-fold .base_tree_fold--hide{right:0px}.bsgoal-base-tree{display:inline-block}.bsgoal-base-tree .base_tree{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-sizing:border-box;box-sizing:border-box;position:relative;min-width:14px}.bsgoal-base-tree .base_tree_main{width:221px;padding:16px;scrollbar-width:none;-ms-overflow-style:none;overflow-x:hidden;overflow-y:auto}.bsgoal-base-tree .base_tree_main::-webkit-scrollbar{width:6px;height:6px}.bsgoal-base-tree .base_tree_main::-webkit-scrollbar-thumb{border-radius:10px;background:rgba(0,0,0,.2);width:20px}.bsgoal-base-tree .base_tree_main::-webkit-scrollbar-track{background-color:#fff}.bsgoal-base-tree .base_tree_main_input{margin-bottom:10px}.bsgoal-base-tree .base_tree .el-tree-node__content>i.el-tree-node__expand-icon{padding-left:0}.bsgoal-base-tree .base_tree_node{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-flex:1;-ms-flex:1;flex:1}.bsgoal-base-tree .base_tree_node_label{-webkit-box-flex:1;-ms-flex:1;flex:1}.bsgoal-base-tree .base_tree_node_icon{-webkit-box-flex:0;-ms-flex:none;flex:none}.bsgoal-base-button,.bsgoal-base-button .base_button{display:inline-block}.bsgoal-base-dialog .base_dialog_header{font-weight:500;color:#303133;font-size:16px}.bsgoal-base-dialog .bsgoal-dialog__footer--conceal .el-dialog__footer{display:none}.bsgoal-base-dialog .el-dialog__footer{height:initial;line-height:initial}.bsgoal-base-dialog .el-dialog__footer .el-button{margin-left:initial}.bsgoal-base-dialog .bsgoal_base_dialog_main .el-dialog__header{padding:16px 30px;margin-right:0;background-color:#f5f7fa;height:initial!important}.bsgoal-base-dialog .bsgoal_base_dialog_main .el-dialog__header .el-dialog__headerbtn{top:0px;right:8px}.bsgoal-base-dialog .bsgoal_base_dialog_main .el-dialog__body{padding:0}.bsgoal-base-dialog .bsgoal_base_dialog_main .base_dialog_content{padding:30px}.bsgoal-base-dialog .bsgoal_base_dialog_main .base_dialog_content--form{padding:0 0 0 30px}.bsgoal-base-dialog .bsgoal_base_dialog_main .base_dialog_content--form .bsgoal-base-form .base_form{padding:initial;padding-top:16px}.bsgoal-base-dialog .bsgoal_base_dialog_main .base_dialog_content--blank{padding-top:0}.bsgoal-base-dialog .base_dialog_footer_cancel{margin-right:16px}.bsgoal-base-tabs .base_tabs--fill{position:absolute;top:8px;bottom:0;left:16px;right:16px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.bsgoal-base-tabs .base_tabs--fill>div.el-tabs__content{-webkit-box-flex:1;-ms-flex:1;flex:1;position:relative}.bsgoal-base-alert .el-alert,.bsgoal-base-item .base_item{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.bsgoal-base-item .base_item_label{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;font-size:14px;color:#606266;height:32px;line-height:32px;padding-right:12px}.bsgoal-base-tree-table .base_tree_table{display:-webkit-box;display:-ms-flexbox;display:flex}.bsgoal-base-tree-table .base_tree_table--table{overflow:hidden}.bsgoal-base-viewer{display:inline-block}.bsgoal-base-viewer .base_viewer{margin:4px 8px}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsgoal/common",
-  "version": "2.15.3",
+  "version": "2.15.5",
   "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-28 13:57:46
+ * @LastEditTime: 2023-06-28 14:19:38
  * @FilePath: \common\src\components\bsgoal-base-search-table\index.vue
  * @Description: 查询+表格 基础组件
  * 
@@ -133,7 +133,7 @@ const props = defineProps({
   }
 })
 
-const emits = defineEmits(['select', 'select-all', 'selection-change'])
+const emits = defineEmits(['select', 'select-all', 'selection-change', 'on-total-change'])
 
 const transferFoldStatus = ref(false)
 provide('transferFoldStatus', transferFoldStatus)
@@ -196,6 +196,11 @@ const triggerSelectAll = (selection) => {
 const triggerSelectionChange = (selection) => {
   emits('selection-change', selection)
 }
+
+const triggerTotalChange = (total = 0) => {
+  emits('on-total-change', total)
+}
+
 // ---> E 触发事件 <---
 
 // ---> S 暴露事件 <---
@@ -243,6 +248,7 @@ defineExpose({
         @select="triggerSelect"
         @select-all="triggerSelectAll"
         @selection-change="triggerSelectionChange"
+        @on-total-change="triggerTotalChange"
       >
         <!-- S 顶部菜单 -->
 

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

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-06-27 16:52:31
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-06-28 11:09:20
+ * @LastEditTime: 2023-06-28 14:56:45
  * @FilePath: \common\src\components\bsgoal-base-sizes\index.vue
  * @Description: 页数切换 公共组件
  * 
@@ -99,7 +99,6 @@ watchEffect(() => {
 })
 
 const isMicroApp = window.__MICRO_APP_ENVIRONMENT__
-console.log('isMicroApp',isMicroApp);
 
 // ---> E input <---
 </script>

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-28 13:49:07
+ * @LastEditTime: 2023-06-28 15:08:52
  * @FilePath: \common\src\components\bsgoal-base-table\index.vue
  * @Description: 
  * 
@@ -136,8 +136,7 @@ const props = defineProps({
   }
 })
 
-const emits = defineEmits(['select','select-all','selection-change'])
-
+const emits = defineEmits(['select', 'select-all', 'selection-change', 'on-total-change'])
 
 /**
  * @Author: canlong.shen
@@ -220,6 +219,10 @@ watch(resData, (data) => {
   }
 })
 
+watchEffect(() => {
+  emits('on-total-change', total.value)
+})
+
 // 查询
 const refreshList = (params = {}) => {
   searchParams.value = params
@@ -257,14 +260,17 @@ const triggerSelectionChange = (selection) => {
 
 // ---> S 暴露事件 <---
 
- const BSGOAL_EL_TABLE_REF = ref(null)
- 
- const clearSelection = () => {
+const BSGOAL_EL_TABLE_REF = ref(null)
+
+const clearSelection = () => {
   BSGOAL_EL_TABLE_REF.value.clearSelection()
- }
+}
 
 // ---> E 暴露事件 <---
 
+// ---> S 兼容微前端 <---
+const isMicroApp = window.__MICRO_APP_ENVIRONMENT__
+// ---> E 兼容微前端 <---
 
 // 暴露的属性
 defineExpose({
@@ -275,7 +281,10 @@ defineExpose({
 
 <template>
   <div class="bsgoal-base-table">
-    <div class="base_table" :class="{ 'base_table--tree': TREE_SWITCH_STATUS === false }">
+    <div
+      class="base_table"
+      :class="{ 'base_table--tree': TREE_SWITCH_STATUS === false, bsgoal_micro_app: isMicroApp }"
+    >
       <!-- S 表头操作区域 -->
       <div class="base_table_menu" v-if="$slots.menu">
         <slot name="menu"></slot>
@@ -382,5 +391,11 @@ defineExpose({
   th > div.cell {
     white-space: nowrap;
   }
+
+  .bsgoal_micro_app {
+    .el-scrollbar {
+      margin-bottom: 0px !important;
+    }
+  }
 }
 </style>

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-28 14:04:55
+ * @LastEditTime: 2023-06-28 14:22:20
  * @FilePath: \common\src\components\bsgoal-base-tree-table\demo.vue
  * @Description:  树 + 列表 + 演示
  * 
@@ -807,6 +807,9 @@ const triggerTableSelectAll = () => {
 const triggerTableSelectionChange = () => {
   console.log('triggerTableSelectionChange', triggerTableSelectionChange)
 }
+const triggerTableTotalChange = (total = 0) => {
+  console.log('triggerTableTotalChange', total)
+}
 
 const clearSelection = () => {
   BSGOAL_BASE_TREE_TABLE_REF.value.clearSelection()
@@ -834,6 +837,7 @@ const clearSelection = () => {
         @on-select-table="triggerTableSelect"
         @on-select-all-table="triggerTableSelectAll"
         @on-selection-change-table="triggerTableSelectionChange"
+        @on-total-change-table="triggerTableTotalChange"
       >
         <!-- <template #tree="{data}">
          <div>{{ data }}</div>

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-28 14:01:30
+ * @LastEditTime: 2023-06-28 14:21:32
  * @FilePath: \common\src\components\bsgoal-base-tree-table\index.vue
  * @Description: 树结构  + 列表
  * 
@@ -177,7 +177,8 @@ const emits = defineEmits([
   'on-add-tree',
   'on-select-table',
   'on-select-all-table',
-  'on-selection-change-table'
+  'on-selection-change-table',
+  'on-total-change-table'
 ])
 
 // ---> S 注入插槽 <---
@@ -225,15 +226,18 @@ const refreshList = (params = {}) => {
 }
 
 // ---> S 触发事件 <---
-const triggerSelect = (selection, row) => {
+const triggerSelect = (selection = {}, row =[]) => {
   emits('on-select-table', selection, row)
 }
-const triggerSelectAll = (selection) => {
+const triggerSelectAll = (selection = {}) => {
   emits('on-select-all-table', selection)
 }
-const triggerSelectionChange = (selection) => {
+const triggerSelectionChange = (selection = {}) => {
   emits('on-selection-change-table', selection)
 }
+const triggerTotalChange = (total = 0) => {
+  emits('on-total-change-table', total)
+}
 // ---> E 触发事件 <---
 
 // ---> S 暴露事件 <---
@@ -294,6 +298,7 @@ const tableStyler = computed(() => {
           @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>