@bsgoal/common 2.13.1 → 2.13.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsgoal/common",
-  "version": "2.13.1",
+  "version": "2.13.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-21 10:21:34
+ * @LastEditTime: 2023-06-25 16:08:36
  * @FilePath: \common\src\components\bsgoal-base-search-table\index.vue
  * @Description: 查询+表格 基础组件
  * 
@@ -134,13 +134,6 @@ const props = defineProps({
 })
 
 
-// ---> S 注入分页的值 <---
-const pageSizeValue = unref(props.pageSize)
-if (pageSizeValue) {
-  provide('PAGINATION_PAGE_SIZE', ref(props.pageSize))
-}
-// ---> E 注入分页的值 <---
-
 const transferFoldStatus = ref(false)
 provide('transferFoldStatus', transferFoldStatus)
 
@@ -214,6 +207,7 @@ defineExpose({
       <!-- S 表格 -->
       <BsgoalBaseTable
         ref="BSGOAL_BASE_TABLE_REF"
+        :page-size="pageSize"
         :map-props="mapProps"
         :operationWidth="operationWidth"
         :config-options="tableOptions"

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-05-26 14:26:06
+ * @LastEditTime: 2023-06-25 16:05:45
  * @FilePath: \common\src\components\bsgoal-base-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-06-20 19:21:34
+ * @LastEditTime: 2023-06-25 16:04:16
  * @FilePath: \common\src\components\bsgoal-base-table\index.vue
  * @Description: 
  * 
@@ -126,6 +126,13 @@ const props = defineProps({
   hasPage: {
     type: Boolean,
     default: true
+  },
+    /**
+   * 每页显示条目个数
+   */
+   pageSize: {
+    type: [Number],
+    default: 10
   }
 })
 
@@ -175,7 +182,7 @@ const mapPropsFuse = {
 }
 
 const currentPage = ref(1)
-const pageSize = ref(10)
+const curPageSize = ref(props.pageSize)
 const total = ref(0)
 const searchParams = ref({})
 const tableLoading = ref(props.loading)
@@ -185,7 +192,7 @@ const ping = () => {
   const { fetch, call, hasPage } = props
   const searchParamsVal = searchParams.value
   const currentPageVal = currentPage.value
-  const pageSizeVal = pageSize.value
+  const pageSizeVal = curPageSize.value
   const fetchParams = { ...searchParamsVal }
   // 显示分页的注入分页参数
   if (hasPage) {
@@ -196,6 +203,7 @@ const ping = () => {
   useFetch(fetch(fetchParams), call, tableLoading, resData)
 }
 
+
 watchEffect(() => {
   tableData.value = props.data
 })
@@ -222,10 +230,10 @@ const triggerPaginationCurrentChange = (current = 1) => {
 }
 //改变页数
 const triggerPaginationSizeChange = (size = 10) => {
-  pageSize.value = size
+  curPageSize.value = size
 }
 
-watch([currentPage, pageSize], () => {
+watch([currentPage, curPageSize], () => {
   ping()
 })
 
@@ -311,6 +319,7 @@ defineExpose({
       <BsgoalBaseTablePagination
         v-if="hasPage"
         :total="total"
+        :page-size="curPageSize"
         @on-current-change="triggerPaginationCurrentChange"
         @on-size-change="triggerPaginationSizeChange"
       />

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-06-20 19:34:36
+ * @LastEditTime: 2023-06-25 16:04:50
  * @FilePath: \common\src\components\bsgoal-base-table-pagination\index.vue
  * @Description: 表格的分页按钮
  * 
@@ -70,17 +70,6 @@ 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">
@@ -91,7 +80,7 @@ const pageSizeValueGet = computed(() => {
           layout="total, sizes, prev, pager, next, jumper"
           v-model:current-page="page"
           :page-sizes="pageSizes"
-          :page-size="pageSizeValueGet"
+          :page-size="pageSize"
           :total="total"
           @size-change="triggerSizeChange"
           @current-change="triggerCurrentChange"

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-06-25 10:05:14
+ * @LastEditTime: 2023-06-25 15:38:56
  * @FilePath: \common\src\components\bsgoal-base-tree\index.vue
  * @Description: 虚拟化树型结构 公共组件
  * 
@@ -55,7 +55,7 @@ const props = defineProps({
    */
   lazyLoad: {
     type: [Function],
-    default: () => {}
+    default: null
   },
   /**
    * 初始化树节点
@@ -65,7 +65,7 @@ const props = defineProps({
    */
   initNode: {
     type: [Function],
-    default: () => {}
+    default: null
   }
 })
 
@@ -132,11 +132,10 @@ const loadNode = async (node, resolve, props) => {
 }
 
 const lazyGet = computed(() => {
-  const { treeData = [] } = props
-  if (!treeData || !treeData.length) {
+  const { lazyLoad = null , initNode = null} = props
+  if(lazyLoad && initNode ){
     return true
   }
-
   return false
 })
 

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-25 15:22:12
+ * @LastEditTime: 2023-06-25 16:29:16
  * @FilePath: \common\src\components\bsgoal-base-tree-table\demo.vue
  * @Description:  树 + 列表 + 演示
  * 
@@ -769,24 +769,29 @@ const triggerTreeAddClick = (params = '') => {
   console.log('triggerTreeAddClick', params)
 }
 
-const treeData = ref([
-  {
-    label: 'label2-1',
-    isLeaf: true,
-    hasIcon: true
-  },
-  {
-    label: 'label2-2',
-    children: [
-      {
-        label: 'label2-2-1'
-      }
-    ]
-  },
-  {
-    label: 'label2-3'
-  }
-])
+const treeData = ref([])
+
+setTimeout(() => {
+  treeData.value = ref([
+    {
+      label: 'label2-1',
+      isLeaf: true,
+      hasIcon: true
+    },
+    {
+      label: 'label2-2',
+      children: [
+        {
+          label: 'label2-2-1'
+        }
+      ]
+    },
+    {
+      label: 'label2-3'
+    }
+  ])
+}, 5000)
+
 const BSGOAL_BASE_TREE_TABLE_REF = ref(null)
 const test = () => {
   BSGOAL_BASE_TREE_TABLE_REF.value.refreshList({ prop: 111 })
@@ -809,7 +814,11 @@ const test = () => {
         :expression="77"
         @on-click-tree="triggerTreeClick"
         @on-add-tree="triggerTreeAddClick"
-      ></BsgoalBaseTreeTable>
+      >
+      <!-- <template #prop1="{row}">
+         <div>{{ row }}</div>
+      </template> -->
+    </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-25 15:20:18
+ * @LastEditTime: 2023-06-25 16:28:00
  * @FilePath: \common\src\components\bsgoal-base-tree-table\index.vue
  * @Description: 树结构  + 列表
  * 
@@ -153,7 +153,7 @@ const props = defineProps({
    */
   pageSize: {
     type: [Number],
-    default: 0
+    default: 10
   }
 })
 
@@ -215,9 +215,9 @@ const tableStyler = computed(() => {
   const styler = {}
   const switchStatusValue = switchStatus.value
   if (switchStatusValue) {
-    styler.maxWidth = 'calc(100% - 250px)'
+    styler.minWidth = 'calc(100% - 250px)'
   } else {
-    styler.maxWidth = 'calc(100%)'
+    styler.minWidth = 'calc(100%)'
   }
 
   return styler

package/src/components/bsgoal-base-select/debug.log

@@ -1,2 +0,0 @@
-[0531/134940.513:ERROR:registration_protocol_win.cc(107)] CreateFile: ϵͳ�Ҳ���ָ�����ļ��� (0x2)
-[0531/140033.772:ERROR:registration_protocol_win.cc(107)] CreateFile: ϵͳ�Ҳ���ָ�����ļ��� (0x2)