@bsgoal/common 2.9.1 → 2.10.0

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-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-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-search-operation{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.bsgoal-base-search-operation .operation_fold{margin-left:12px;cursor:pointer;min-width:3em}.bsgoal-base-cascader{width:100%}.bsgoal-base-cascader .base_cascader{width: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-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:#409eff}.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-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}
+@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-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-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}.bsgoal-base-search-operation .operation_fold{margin-left:12px;cursor:pointer;min-width:3em}.bsgoal-base-cascader{width:100%}.bsgoal-base-cascader .base_cascader{width: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-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:#409eff}.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-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}

package/package.json

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

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

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-04-13 17:12:43
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-05-26 15:59:36
+ * @LastEditTime: 2023-06-20 19:14:29
  * @FilePath: \common\src\components\bsgoal-base-line\index.vue
  * @Description: 分割线公共组件
  * 
@@ -11,7 +11,7 @@
 <script setup>
 /* setup模板
 ---------------------------------------------------------------- */
-import { ref } from 'vue'
+import { ref, inject, watchEffect } from 'vue'
 
 defineOptions({
   name: 'BsgoalBaseLine'
@@ -26,10 +26,21 @@ const props = defineProps({
     default: false
   }
 })
+
+// ---> S 左侧机构树折叠状态 <---
+const TREE_SWITCH_STATUS = inject('TREE_SWITCH_STATUS')
+// ---> E 左侧机构树折叠状态 <---
 </script>
+
 <template>
   <div class="bsgoal-base-line" :class="{ 'bsgoal-base-line__vertical': vertical }">
-    <div class="base_line" :class="{ base_line__vertical: vertical }"></div>
+    <div
+      class="base_line"
+      :class="{
+        'base_line__vertical': vertical,
+        'bsgoal-base-line__fill': TREE_SWITCH_STATUS === false
+      }"
+    ></div>
   </div>
 </template>
 <style lang="scss">
@@ -49,5 +60,11 @@ const props = defineProps({
     width: 10px;
     height: 100%;
   }
+
+  .bsgoal-base-line__fill {
+    position: absolute;
+    left: 0;
+    right: 0;
+  }
 }
 </style>

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

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-04-13 09:38:11
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-05-18 15:53:40
+ * @LastEditTime: 2023-06-20 19:03:02
  * @FilePath: \common\src\components\bsgoal-base-search\index.vue
  * @Description: 表格查询 公共组件
  * 
@@ -271,6 +271,7 @@ const triggerValueChange = (type, prop) => {
   emits('on-change', emitValue)
 }
 
+
 // ---> S 暴露 <---
 defineExpose({
   triggerOperationSearch
@@ -303,7 +304,9 @@ defineExpose({
             :key="index"
           >
             <el-col
-              v-show="index < 7 || type === ComponentTypeEnums.OPERATION || (index >= 7 && foldStatus)"
+              v-show="
+                index < 7 || type === ComponentTypeEnums.OPERATION || (index >= 7 && foldStatus)
+              "
               :xs="24"
               :sm="12"
               :md="medium"
@@ -388,9 +391,12 @@ defineExpose({
                   <!-- / 日期选择器 -->
                   <template
                     v-if="
-                      [ComponentTypeEnums.DATE, ComponentTypeEnums.MONTH, ComponentTypeEnums.YEAR, ComponentTypeEnums.DATE_TIME].includes(
-                        type
-                      )
+                      [
+                        ComponentTypeEnums.DATE,
+                        ComponentTypeEnums.MONTH,
+                        ComponentTypeEnums.YEAR,
+                        ComponentTypeEnums.DATE_TIME
+                      ].includes(type)
                     "
                   >
                     <el-date-picker

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

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-04-18 17:04:53
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-05-18 18:26:57
+ * @LastEditTime: 2023-06-19 18:20:59
  * @FilePath: \common\src\components\bsgoal-base-search-table\demo.vue
  * @Description: 查询 + 表格 组合公共组件
  * 

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-05-19 17:51:57
+ * @LastEditTime: 2023-06-20 19:21:34
  * @FilePath: \common\src\components\bsgoal-base-table\index.vue
  * @Description: 
  * 
@@ -164,9 +164,6 @@ watchEffect(() => {
   }
 })
 
-
-
-
 // 触发搜索
 const mapPropsVal = unref(props.mapProps)
 const mapPropsFuse = {
@@ -182,7 +179,7 @@ const pageSize = ref(10)
 const total = ref(0)
 const searchParams = ref({})
 const tableLoading = ref(props.loading)
-const tableData =  ref()
+const tableData = ref()
 const resData = ref({})
 const ping = () => {
   const { fetch, call, hasPage } = props
@@ -199,9 +196,8 @@ const ping = () => {
   useFetch(fetch(fetchParams), call, tableLoading, resData)
 }
 
-
 watchEffect(() => {
-     tableData.value = props.data
+  tableData.value = props.data
 })
 
 watch(resData, (data) => {
@@ -233,6 +229,10 @@ watch([currentPage, pageSize], () => {
   ping()
 })
 
+// ---> S 左侧机构树折叠状态 <---
+const TREE_SWITCH_STATUS = inject('TREE_SWITCH_STATUS')
+// ---> E 左侧机构树折叠状态 <---
+
 // 暴露的属性
 defineExpose({
   refreshList
@@ -241,7 +241,7 @@ defineExpose({
 
 <template>
   <div class="bsgoal-base-table">
-    <div class="base_table">
+    <div class="base_table" :class="{ 'base_table--tree': TREE_SWITCH_STATUS === false }">
       <!-- S 表头操作区域 -->
       <div class="base_table_menu" v-if="$slots.menu">
         <slot name="menu"></slot>
@@ -337,5 +337,8 @@ defineExpose({
   .el-scrollbar__view {
     height: 100%;
   }
+  .base_table--tree {
+    margin-top: 10px;
+  }
 }
 </style>

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

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-04-15 16:34:57
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-04-25 13:50:40
+ * @LastEditTime: 2023-06-20 19:34:36
  * @FilePath: \common\src\components\bsgoal-base-table-pagination\index.vue
  * @Description: 表格的分页按钮
  * 
@@ -11,7 +11,7 @@
 <script setup>
 /* setup模板
 ---------------------------------------------------------------- */
-import { ref, computed } from 'vue'
+import { ref, computed, inject, unref } from 'vue'
 import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
 
 defineOptions({
@@ -70,6 +70,17 @@ const triggerCurrentChange = (current = 1) => {
   emits('on-current-change', current)
 }
 const page = ref(1)
+
+const injectPageSize = inject('PAGINATION_PAGE_SIZE')
+console.log('injectPageSize',injectPageSize);
+// ---> S pageSize 值注入 <---
+const pageSizeValueGet = computed(() => {
+  if (injectPageSize) {
+    return unref(injectPageSize)
+  }
+  return props.pageSize
+})
+// ---> E pageSize 值注入 <---
 </script>
 <template>
   <div class="bsgoal-base-table-pagination">
@@ -80,7 +91,7 @@ const page = ref(1)
           layout="total, sizes, prev, pager, next, jumper"
           v-model:current-page="page"
           :page-sizes="pageSizes"
-          :page-size="pageSize"
+          :page-size="pageSizeValueGet"
           :total="total"
           @size-change="triggerSizeChange"
           @current-change="triggerCurrentChange"

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

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-04-21 08:43:39
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-04-21 18:03:30
+ * @LastEditTime: 2023-06-19 15:21:32
  * @FilePath: \common\src\components\bsgoal-base-tree\demo.vue
  * @Description: 左侧树的演示
  * 
@@ -44,7 +44,7 @@ const createData = (maxDeep, maxChildren, minNodesNumber, deep = 1, key = 'node'
 }
 treeData.value = createData(4, 4, 4)
 
-const triggerTreeClick = (value,node,treeNode,event ) => {
+const triggerTreeClick = (value, node, treeNode, event) => {
   console.log('value', value)
   console.log('node', node)
   console.log('treeNode', treeNode)
@@ -99,6 +99,7 @@ const treeInitNode = (node) => {
         :init-node="treeInitNode"
         @on-click="triggerTreeClick"
       />
+      
     </div>
   </div>
 </template>

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

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-04-21 08:43:33
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-04-25 09:10:35
+ * @LastEditTime: 2023-06-20 18:21:46
  * @FilePath: \common\src\components\bsgoal-base-tree\index.vue
  * @Description: 虚拟化树型结构 公共组件
  * 
@@ -10,7 +10,7 @@
 <script setup>
 /* setup模板
 ---------------------------------------------------------------- */
-import { ref, watch } from 'vue'
+import { ref, watch, watchEffect } from 'vue'
 import directiveBase from '../../directives/directiveBase.js'
 import BsgoalBaseLine from '../bsgoal-base-line/index.vue'
 import BsgoalBaseTreeFold from '../bsgoal-base-tree-fold/index.vue'
@@ -69,7 +69,7 @@ const props = defineProps({
   }
 })
 
-const emits = defineEmits(['on-click'])
+const emits = defineEmits(['on-click', 'on-switch'])
 
 // 计算高度的指令
 const vHeight = directiveBase.height
@@ -108,6 +108,11 @@ const foldStatus = ref(true)
 const clickNodeTree = (value, node, treeNode, event) => {
   emits('on-click', value, node, treeNode, event)
 }
+
+watch(foldStatus, () => {
+  emits('on-switch', foldStatus.value)
+})
+
 /**
  * @Author: canlong.shen
  * @description:  懒加载数据