@bsgoal/common 1.5.11 → 1.6.3

package/package.json

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

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-08 15:15:07
+ * @LastEditTime: 2023-05-15 14:50:49
  * @FilePath: \common\src\components\bsgoal-base-table\demo.vue
  * @Description: 表格公共组件演示页面
  * 
@@ -213,7 +213,9 @@ const data = ref([
 const options = ref([
   {
     label: '列列列列列列列列列1',
-    prop: 'prop1'
+    prop: 'prop1',
+    tooltip: true,
+    limit: 3
   },
   {
     label: '列列列列列列列列列2',
@@ -245,21 +247,14 @@ const clearData = () => {
   <div class="bsgoal-base-table-demo">
     <!-- <BsgoalBaseSearch  :config-options="searchOptions" /> -->
     <el-button type="primary" @click="clearData">设置为空数据</el-button>
-    <BsgoalBaseTable
-      operation
-      operation-width="200"
-      selection
-      :config-options="options"
-      :data="data"
-      :auto-height="false"
-    >
+    <BsgoalBaseTable operation-width="200" operation selection :page="false" :config-options="options" :data="data"
+      :auto-height="false">
       <template v-slot:operation="{ row }">
         <div>
           <el-button type="primary">操作按钮</el-button>
         </div>
       </template>
     </BsgoalBaseTable>
-    <hr />
   </div>
 </template>
 <style lang="scss" scoped>

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-08 15:19:02
+ * @LastEditTime: 2023-05-15 14:50:19
  * @FilePath: \common\src\components\bsgoal-base-table\index.vue
  * @Description: 
  * 
@@ -120,6 +120,13 @@ const props = defineProps({
   height: {
     type: [Number, String, Boolean],
     default: ''
+  },
+  /**
+   * 是否显示分页
+   */
+  page: {
+    type: Boolean,
+    default: true
   }
 })
 
@@ -223,20 +230,13 @@ 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,22 +246,14 @@ defineExpose({
           <el-table-column v-if="selection" fixed="left" type="selection" width="40" />
           <!-- / 多选 -->
           <!-- / 表格内容 -->
-          <template
-            v-for="(
-              { prop = '', label = '', align = 'center', width = '', fixed = false } = {}, 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 :data="row[prop]" />
+                  <BsgoalBaseTableContent :limit="limit" :tooltip="tooltip" :data="row[prop]" />
                 </slot>
               </template>
             </el-table-column>
@@ -273,11 +265,8 @@ defineExpose({
       <!-- E 表格区域 -->
 
       <!-- S 分页 -->
-      <BsgoalBaseTablePagination
-        :total="total"
-        @on-current-change="triggerPaginationCurrentChange"
-        @on-size-change="triggerPaginationSizeChange"
-      />
+      <BsgoalBaseTablePagination v-if="page" :total="total" @on-current-change="triggerPaginationCurrentChange"
+        @on-size-change="triggerPaginationSizeChange" />
       <!-- E 分页 -->
     </div>
   </div>
@@ -289,9 +278,11 @@ defineExpose({
   .base_table {
     padding: 16px;
   }
+
   .base_table_menu {
     margin-bottom: 8px;
   }
+
   .el-table__body-wrapper {
     overflow-y: hidden !important;
   }

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

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-04-15 13:49:25
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-04-18 18:12:06
+ * @LastEditTime: 2023-05-15 14:26:22
  * @FilePath: \common\src\components\bsgoal-base-table-content\index.vue
  * @Description: 表格内容 
  * 
@@ -17,26 +17,49 @@ export default {
 /* setup模板
 ---------------------------------------------------------------- */
 import { ref } from 'vue';
+import BsgoalBaseTooltip from '../bsgoal-base-tooltip/index.vue'
 // props
 const props = defineProps({
+    /**
+     * 数据
+     */
     data: {
-        type: [String,Number,Object,Number,Boolean],
+        type: [String, Number, Object, Boolean],
         default: ''
-    }
+    },
+
+    /**
+     * 内容提示
+     */
+    tooltip: {
+        type: [Boolean, Number],
+        default: false
+    },
+
+    /**
+     * 内容限定数
+     */
+    limit: {
+        type: [Number],
+        default: 10
+    },
+
 })
 </script>
 <template>
     <div class="bsgoal-base-table-content">
-        <div class="bas_tabl_content">
-            {{ data }}
+        <div class="base_table_content">
+            <BsgoalBaseTooltip v-if="tooltip" :content="data" :limit="limit" />
+            <div v-else class="base_table_table_txt">
+                {{ data }}
+
+            </div>
         </div>
     </div>
 </template>
 <style lang="scss">
 /* 覆盖样式
 ---------------------------------------------------------------- */
-.bsgoal-base-table-content {
-    
-}
+.bsgoal-base-table-content {}
 </style>
 

package/src/entry.js

@@ -5,6 +5,7 @@ import BsgoalBaseSearchTable from '@/components/bsgoal-base-search-table/index.v
 import BsgoalBaseTree from '@/components/bsgoal-base-tree/index.vue'
 import BsgoalBaseDialog from '@/components/bsgoal-base-dialog/index.vue'
 import BsgoalBaseTabs from '@/components/bsgoal-base-tabs/index.vue'
+import BsgoalBaseLink from '@/components/bsgoal-base-link/index.vue'
 import enumType from '@/enums/enumType.js'
 import { useFetch } from '@/combines/useFetchs.js'
 
@@ -23,7 +24,8 @@ export default {
       BsgoalBaseSearchTable,
       BsgoalBaseTree,
       BsgoalBaseDialog,
-      BsgoalBaseTabs
+      BsgoalBaseTabs,
+      BsgoalBaseLink
     }
 
     for (const [name, component] of Object.entries(componentsMap)) {