@bsgoal/common 2.15.21 → 2.15.23

package/package.json

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

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

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-05-18 16:24:31
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-05-23 16:58:44
+ * @LastEditTime: 2023-07-07 17:09:38
  * @FilePath: \common\src\components\bsgoal-base-button\demo.vue
  * @Description:  按钮 演示
  * 
@@ -27,10 +27,13 @@ const task = (done) => {
 </script>
 <template>
   <div class="bsgoal-base-button-demo">
-    <BsgoalBaseButton :task="task" mode="cancel" content="取消"> </BsgoalBaseButton>
+    <BsgoalBaseButton :task="task"  mode="detail" > </BsgoalBaseButton>
+
+    <BsgoalBaseButton :task="task" mode="edit" plain > </BsgoalBaseButton>
+    <BsgoalBaseButton :task="task" mode="cancel" > </BsgoalBaseButton>
     <BsgoalBaseButton :task="task" mode="confirm" content="取消"> </BsgoalBaseButton>
 
-    <BsgoalBaseButton :task="task" plain> </BsgoalBaseButton>
+    <BsgoalBaseButton :task="task"  mode="add" plain  content="取消"> </BsgoalBaseButton>
     <BsgoalBaseButton :task="task" mode="add"> </BsgoalBaseButton>
     <BsgoalBaseButton :task="task" mode="delete"> </BsgoalBaseButton>
     <BsgoalBaseButton :task="task" #default="{ loading }">

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

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-05-18 16:24:25
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-05-26 15:53:36
+ * @LastEditTime: 2023-07-07 17:09:11
  * @FilePath: \common\src\components\bsgoal-base-button\index.vue
  * @Description: 统一按钮 
  * 
@@ -31,7 +31,7 @@ const props = defineProps({
     validator: (v) => ['primary', 'success', 'warning', 'danger', 'info'].includes(v)
   },
   icon: {
-    type: [String, Object],
+    type: [String, Object, Boolean],
     default: ''
   },
   content: {
@@ -63,10 +63,10 @@ const props = defineProps({
 // ---> S 触发按钮 <---
 const loading = ref(false)
 const triggerClick = () => {
-  // 默认 loading 是打开的 
- if(props.hasLoading){
-  loading.value = true
- }
+  // 默认 loading 是打开的
+  if (props.hasLoading) {
+    loading.value = true
+  }
   const { task } = props
   const taskValue = unref(task)
   taskValue(() => {
@@ -87,23 +87,28 @@ const typeGet = computed(() => {
       return ''
     case 'confirm':
     case 'add':
+    case 'edit':
       return 'primary'
   }
   return type
 })
 const iconGet = computed(() => {
   const { mode = '', icon = '' } = props
+  console.log('icon', icon)
 
-  switch (mode) {
-    case 'delete':
-      return Delete
-    case 'add':
-      return Plus
-    case 'cancel':
-      return CloseBold
-    case 'confirm':
-      return Select
+  if (icon !== false) {
+    switch (mode) {
+      case 'delete':
+        return Delete
+      case 'add':
+        return Plus
+      case 'cancel':
+        return CloseBold
+      case 'confirm':
+        return Select
+    }
   }
+
   return icon
 })
 const contentGet = computed(() => {
@@ -116,8 +121,12 @@ const contentGet = computed(() => {
       return '确认'
     case 'add':
       return '新增'
+    case 'edit':
+      return '编辑'
     case 'delete':
       return '删除'
+    case 'detail':
+      return '详情'
   }
   return content
 })

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-07-07 14:25:44
+ * @LastEditTime: 2023-07-10 17:56:26
  * @FilePath: \common\src\components\bsgoal-base-table\index.vue
  * @Description: 
  * 
@@ -154,6 +154,13 @@ const props = defineProps({
   serial: {
     type: [Boolean],
     default: false
+  },
+  /**
+   * 主体style
+   */
+  bodyStyle: {
+    type: [Object],
+    default: () => ({})
   }
 })
 
@@ -326,6 +333,7 @@ defineExpose({
     <div
       class="base_table"
       :class="{ 'base_table--tree': TREE_SWITCH_STATUS === false, bsgoal_micro_app: isMicroApp }"
+      :style="bodyStyle"
     >
       <!-- S 表头操作区域 -->
       <div class="base_table_menu" v-if="$slots.menu">