@bsgoal/common 1.6.3 → 1.6.5

package/package.json

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

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-04-27 17:45:41
+ * @LastEditTime: 2023-05-18 10:12:16
  * @FilePath: \common\src\components\bsgoal-base-search-table\demo.vue
  * @Description: 查询 + 表格 组合公共组件
  * 
@@ -705,8 +705,9 @@ const tableDataVal = unref(tableData)
 
 const fetch = (params) => {
   console.log('params >>>', params)
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve) => {
     setTimeout(() => {
+      // 存在分页
       resolve({
         data: {
           rows: tableDataVal,
@@ -714,6 +715,11 @@ const fetch = (params) => {
         },
         message: '获取数据成功'
       })
+      // 不存在分页
+      // resolve({
+      //   data: tableDataVal,
+      //   message: '获取数据成功'
+      // })
     }, 3000)
   })
 }
@@ -731,6 +737,18 @@ const fetch = (params) => {
         :expression="75"
         @on-search="triggerSearch"
       >
+        <!-- 
+        <BsgoalBaseSearchTable
+        selection
+        operation
+        :has-search="false"
+        :has-page="false"
+        :call="call"
+        :fetch="fetch"
+        :config-options="configOptions"
+        :expression="75"
+        @on-search="triggerSearch"
+      > -->
         <template v-slot:menu>
           <el-button type="primary">操作按钮</el-button>
         </template>

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-04-28 08:46:38
+ * @LastEditTime: 2023-05-18 10:13:34
  * @FilePath: \common\src\components\bsgoal-base-search-table\index.vue
  * @Description: 查询+表格 基础组件
  * 
@@ -92,12 +92,38 @@ const props = defineProps({
     type: [Object, Function],
     default: null
   },
-   /**
+  /**
    * 表格高度 下边距值
    */
-  expression:{
-    type:[Number],
+  expression: {
+    type: [Number],
     default: 75
+  },
+  /**
+   * 映射字段
+   */
+  mapProps: {
+    type: [Object],
+    default: () => ({
+      currentPage: 'currentPage',
+      pageSize: 'pageSize',
+      rows: 'rows',
+      total: 'total'
+    })
+  },
+  /**
+   * 是否显示分页
+   */
+  hasPage: {
+    type: Boolean,
+    default: true
+  },
+  /**
+   * 是否显示查询
+   */
+  hasSearch: {
+    type: Boolean,
+    default: true
   }
 })
 
@@ -108,17 +134,17 @@ const options = unref(props.configOptions)
 
 // 查询 配置项
 const searchOptions = computed(() => {
-  return options.filter(fi => {
-      const  {type = '' } =  fi
-      return !!type
+  return options.filter((fi) => {
+    const { type = '' } = fi
+    return !!type
   })
 })
 
 // 表格 配置项
 const tableOptions = computed(() => {
-  return options.filter(fi => {
-       const { item = false } = fi
-       return !item
+  return options.filter((fi) => {
+    const { item = false } = fi
+    return !item
   })
 })
 
@@ -131,24 +157,41 @@ const BSGOAL_BASE_TABLE_REF = ref(null)
 const triggerSearch = (searchParams) => {
   BSGOAL_BASE_TABLE_REF.value.refreshList(searchParams)
 }
+
+// ---> S 计算expression <---
+const expresionGet = computed(() => {
+  const { expression, hasPage } = props
+  if (hasPage === false) {
+    return 25
+  }
+  return expression
+})
+// ---> E 计算expression <---
 </script>
 <template>
   <div class="bsgoal-base-search-table">
     <div class="base_search_table">
       <!-- S 查询 -->
-      <BsgoalBaseSearch :config-options="searchOptions" @on-search="triggerSearch" @on-clear="triggerSearch" />
+      <BsgoalBaseSearch
+        v-show="hasSearch"
+        :config-options="searchOptions"
+        @on-search="triggerSearch"
+        @on-clear="triggerSearch"
+      />
       <!-- E 查询 -->
       <!-- S 表格 -->
       <BsgoalBaseTable
         ref="BSGOAL_BASE_TABLE_REF"
+        :map-props="mapProps"
         :operationWidth="operationWidth"
         :config-options="tableOptions"
         :data="tableData"
         :selection="selection"
         :operation="operation"
-        :expression="expression"
+        :expression="expresionGet"
         :fetch="fetch"
         :call="call"
+        :has-page="hasPage"
       >
         <!-- S 顶部菜单 -->
 

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-15 14:50:19
+ * @LastEditTime: 2023-05-18 10:05:33
  * @FilePath: \common\src\components\bsgoal-base-table\index.vue
  * @Description: 
  * 
@@ -111,7 +111,7 @@ const props = defineProps({
   },
   /**
    * 表格高度
-   * 
+   *
    *  默认 : 自动计算
    *  布尔值 : 默认表格高度
    *  字符串 : 直接赋值给 height
@@ -124,7 +124,7 @@ const props = defineProps({
   /**
    * 是否显示分页
    */
-  page: {
+  hasPage: {
     type: Boolean,
     default: true
   }
@@ -166,6 +166,15 @@ watchEffect(() => {
 })
 
 // 触发搜索
+const mapPropsVal = unref(props.mapProps)
+const mapPropsFuse = {
+  currentPage: 'currentPage',
+  pageSize: 'pageSize',
+  rows: 'rows',
+  total: 'total',
+  ...mapPropsVal
+}
+
 const currentPage = ref(1)
 const pageSize = ref(10)
 const total = ref(0)
@@ -174,25 +183,28 @@ const tableLoading = ref(props.loading)
 const tableData = ref(props.data)
 const resData = ref({})
 const ping = () => {
-  const { fetch, call, mapProps } = props
+  const { fetch, call, hasPage } = props
   const searchParamsVal = searchParams.value
   const currentPageVal = currentPage.value
   const pageSizeVal = pageSize.value
   const fetchParams = { ...searchParamsVal }
-  const mapPropsVal = unref(mapProps)
-
-  fetchParams[mapPropsVal.currentPage] = currentPageVal
-  fetchParams[mapPropsVal.pageSize] = pageSizeVal
+  // 显示分页的注入分页参数
+  if (hasPage) {
+    fetchParams[mapPropsFuse.currentPage] = currentPageVal
+    fetchParams[mapPropsFuse.pageSize] = pageSizeVal
+  }
 
   useFetch(fetch(fetchParams), call, tableLoading, resData)
 }
 
 watch(resData, (data) => {
-  const { mapProps } = props
-  const mapPropsVal = unref(mapProps)
-
-  tableData.value = data[mapPropsVal.rows]
-  total.value = data[mapPropsVal.total]
+  // 存在分页才注入
+  if (props.hasPage) {
+    tableData.value = data[mapPropsFuse.rows]
+    total.value = data[mapPropsFuse.total]
+  } else {
+    tableData.value = data
+  }
 })
 
 // 查询
@@ -230,13 +242,20 @@ defineExpose({
       <!-- E 表头操作区域 -->
       <!-- S 表格区域 -->
       <div ref="EL_TABLE_WRAP_REF">
-        <el-table stripe border highlight-current-row style="width: 100%" v-loading="tableLoading" :data="tableData"
+        <el-table
+          stripe
+          border
+          highlight-current-row
+          style="width: 100%"
+          v-loading="tableLoading"
+          :data="tableData"
           :header-cell-style="{
             fontWeight: 'bold',
             backgroundColor: '#EBEEF5',
             color: 'rgba(0,0,0,.85)',
             fontSize: '14px'
-          }">
+          }"
+        >
           <!-- / 无数据展示内容 -->
           <template #empty>
             <BsgoalBaseTableEmpty />
@@ -246,11 +265,28 @@ defineExpose({
           <el-table-column v-if="selection" fixed="left" type="selection" width="40" />
           <!-- / 多选 -->
           <!-- / 表格内容 -->
-          <template v-for="(
-              { prop = '', label = '', align = 'center', width = '', fixed = false, tooltip = false, limit = 0 } = {}, index
-            ) of configOptionsGet" :key="index">
-            <el-table-column :label="label" :align="align" :width="width" :fixed="fixed"
-              :min-width="`${label.length * 14 + 24}px`">
+          <template
+            v-for="(
+              {
+                prop = '',
+                label = '',
+                align = 'center',
+                width = '',
+                fixed = false,
+                tooltip = false,
+                limit = 0
+              } = {},
+              index
+            ) of configOptionsGet"
+            :key="index"
+          >
+            <el-table-column
+              :label="label"
+              :align="align"
+              :width="width"
+              :fixed="fixed"
+              :min-width="`${label.length * 14 + 24}px`"
+            >
               <template v-slot:default="{ row }">
                 <slot :name="prop" :row="row">
                   <BsgoalBaseTableContent :limit="limit" :tooltip="tooltip" :data="row[prop]" />
@@ -265,8 +301,12 @@ defineExpose({
       <!-- E 表格区域 -->
 
       <!-- S 分页 -->
-      <BsgoalBaseTablePagination v-if="page" :total="total" @on-current-change="triggerPaginationCurrentChange"
-        @on-size-change="triggerPaginationSizeChange" />
+      <BsgoalBaseTablePagination
+        v-if="hasPage"
+        :total="total"
+        @on-current-change="triggerPaginationCurrentChange"
+        @on-size-change="triggerPaginationSizeChange"
+      />
       <!-- E 分页 -->
     </div>
   </div>