@bsgoal/common 2.7.0 → 2.7.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsgoal/common",
-  "version": "2.7.0",
+  "version": "2.7.2",
   "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 10:00:37
+ * @LastEditTime: 2023-05-29 18:01:43
  * @FilePath: \common\src\components\bsgoal-base-input\demo.vue
  * @Description: Input 输入框 演示
  * 
@@ -19,12 +19,17 @@ const props = defineProps({})
 
 const inputValue = ref('')
 
+const test = () => {
+    inputValue.value = '666'
+}
+
 </script>
 <template>
   <div class="bsgoal-base-input-demo">
     <div class="base_input_demo">
         {{ inputValue }}
       <BsgoalBaseInput v-model="inputValue"/>
+      <el-button type="primary" @click="test">测试</el-button>
     </div>
   </div>
 </template>

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 11:41:48
+ * @LastEditTime: 2023-05-29 18:01:19
  * @FilePath: \common\src\components\bsgoal-base-input\index.vue
  * @Description:  Input 输入框
  * 
@@ -11,7 +11,8 @@
 <script setup>
 /* setup模板
 ---------------------------------------------------------------- */
-import { ref, watch } from 'vue'
+import { processSlotOutlet } from '@vue/compiler-core'
+import { ref, watch, watchEffect } from 'vue'
 
 defineOptions({
   name: 'BsgoalBaseInput'
@@ -63,9 +64,10 @@ const emits = defineEmits(['update:modelValue', 'change'])
 
 // ---> S 值绑定 <---
 
-const inputValue = ref(props.modelValue)
-watch(inputValue, (value = '') => {
-  emits('update:modelValue', value)
+const inputValue = ref('')
+
+watchEffect(() => {
+  inputValue.value = props.modelValue
 })
 
 // ---> E 值绑定 <---
@@ -74,12 +76,33 @@ watch(inputValue, (value = '') => {
 
 /**
  * @Author: canlong.shen
- * @description: 值变动
+ * @description: 触发 变动输入
  * @default:
  * @return {*}
  */
 const change = (value = '') => {
   emits('change', value)
+  emits('update:modelValue', value)
+}
+/**
+ * @Author: canlong.shen
+ * @description: 触发 清空输入
+ * @default:
+ * @return {*}
+ */
+const clear = (value = '') => {
+  emits('clear', value)
+  emits('update:modelValue', value)
+}
+/**
+ * @Author: canlong.shen
+ * @description: 触发 输入事件
+ * @default:
+ * @return {*}
+ */
+const input = (value = '') => {
+  emits('input', value)
+  emits('update:modelValue', value)
 }
 
 // ---> E 事件  <---
@@ -96,6 +119,8 @@ const change = (value = '') => {
       :formatter="formatter"
       :parser="parser"
       @change="change"
+      @clear="clear"
+      @input="input"
     />
   </div>
 </template>

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

@@ -47,12 +47,17 @@ const change = (value = '', data = {}) => {
   console.log('value', value)
   console.log('data', data)
 }
+
+const test = (params = '') => {
+   selectValue.value = '444'
+}
 </script>
 <template>
   <div class="bsgoal-base-select-demo">
     <div class="base_select_demo">
       {{ selectValue }}
       <BsgoalBaseSelect v-model="selectValue" :range="selectRange" @change="change" />
+      <el-button type="primary" @click="test">test</el-button>
     </div>
   </div>
 </template>

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

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-05-24 11:09:59
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-05-25 10:25:51
+ * @LastEditTime: 2023-05-29 18:48:45
  * @FilePath: \common\src\components\bsgoal-base-select\index.vue
  * @Description: Select 公共组件
  * 
@@ -11,7 +11,7 @@
 <script setup>
 /* setup模板
 ---------------------------------------------------------------- */
-import { ref } from 'vue'
+import { ref, watchEffect } from 'vue'
 
 defineOptions({
   name: 'BsgoalBaseSelect'
@@ -48,7 +48,16 @@ const props = defineProps({
   }
 })
 
-const emits = defineEmits(['update:modelValue','change'])
+const emits = defineEmits(['update:modelValue', 'change'])
+
+// ---> S 值绑定 <---
+
+const selectValue = ref('')
+watchEffect(() => {
+  selectValue.value = props.modelValue
+})
+
+// ---> E 值绑定 <---
 
 // ---> S 触发 方法 <---
 
@@ -64,7 +73,7 @@ const triggerChange = (value = '') => {
   const data = finder ? finder.data : null
 
   emits('update:modelValue', value)
-  emits('change', value , data)
+  emits('change', value, data)
 }
 
 // ---> E 触发 方法 <---
@@ -74,7 +83,7 @@ const triggerChange = (value = '') => {
     <el-select
       clearable
       class="base_select"
-      :model-value="modelValue"
+      v-model="selectValue"
       :no-data-text="none"
       :placeholder="placeholder"
       @change="triggerChange"