@bsgoal/common 2.15.22 → 2.16.0

package/package.json

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

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

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-05-29 09:38:59
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-05-29 18:01:43
+ * @LastEditTime: 2023-07-11 09:36:34
  * @FilePath: \common\src\components\bsgoal-base-input\demo.vue
  * @Description: Input 输入框 演示
  * 
@@ -20,15 +20,20 @@ const props = defineProps({})
 const inputValue = ref('')
 
 const test = () => {
-    inputValue.value = '666'
+  inputValue.value = '666'
 }
-
 </script>
 <template>
   <div class="bsgoal-base-input-demo">
     <div class="base_input_demo">
-        {{ inputValue }}
-      <BsgoalBaseInput v-model="inputValue"/>
+      {{ inputValue }}
+      <BsgoalBaseInput
+        v-model="inputValue"
+      >
+       <template #suffix>
+           <div>111</div>
+       </template>
+      </BsgoalBaseInput>
       <el-button type="primary" @click="test">测试</el-button>
     </div>
   </div>

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

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-05-29 09:38:52
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-05-29 18:01:19
+ * @LastEditTime: 2023-07-11 09:44:43
  * @FilePath: \common\src\components\bsgoal-base-input\index.vue
  * @Description:  Input 输入框
  * 
@@ -11,8 +11,7 @@
 <script setup>
 /* setup模板
 ---------------------------------------------------------------- */
-import { processSlotOutlet } from '@vue/compiler-core'
-import { ref, watch, watchEffect } from 'vue'
+import { ref, watch, watchEffect, useSlots } from 'vue'
 
 defineOptions({
   name: 'BsgoalBaseInput'
@@ -57,6 +56,13 @@ const props = defineProps({
     default: () => {
       return (v) => v
     }
+  },
+  /**
+   * 显示清楚按钮
+   */
+  clearable: {
+    type: [Boolean],
+    default: true
   }
 })
 
@@ -106,14 +112,19 @@ const input = (value = '') => {
 }
 
 // ---> E 事件  <---
+
+// ---> S 插槽 <---
+const slots = useSlots()
+const slotNames = ref(Object.keys(slots))
+// ---> E 插槽 <---
 </script>
 
 <template>
   <div class="bsgoal-base-input">
     <el-input
       v-model="inputValue"
-      clearable
       class="base_input"
+      :clearable="clearable"
       :placeholder="placeholder"
       :disabled="disabled"
       :formatter="formatter"
@@ -121,7 +132,12 @@ const input = (value = '') => {
       @change="change"
       @clear="clear"
       @input="input"
-    />
+    >
+      <!-- S 输入框头部内容 -->
+      <template #[slotName] v-for="slotName of slotNames">
+        <slot :name="slotName"></slot>
+      </template>
+    </el-input>
   </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-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">