@bsgoal/common 2.5.5 → 2.5.7

package/package.json

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

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

@@ -18,22 +18,31 @@ const props = defineProps({})
 
 const selectValue = ref('11')
 const selectRange = ref([
-    {
-      label : '11' ,
-      value : '11'
-    },
-    {
-      label : '22' ,
-      value : '22'
-    },
-    {
-      label : '33' ,
-      value : '33'
-    },
+  {
+    label: '11',
+    value: '11',
+    data: { prop1: 'prop1', prop2: 'prop2' }
+  },
+  {
+    label: '22',
+    value: '22'
+  },
+  {
+    label: '33',
+    value: '33'
+  }
 ])
 
-
-
+/**
+ * @Author: canlong.shen
+ * @description: 触发 值变动
+ * @default:
+ * @return {*}
+ */
+const change = (value = '', data = {}) => {
+  console.log('value', value)
+  console.log('data', data)
+}
 </script>
 <script>
 export default {
@@ -43,8 +52,8 @@ export default {
 <template>
   <div class="bsgoal-base-select-demo">
     <div class="base_select_demo">
-        {{ selectValue }}
-        <BsgoalBaseSelect  v-model="selectValue" :range="selectRange" />
+      {{ selectValue }}
+      <BsgoalBaseSelect v-model="selectValue" :range="selectRange" @change="change" />
     </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-24 14:07:10
+ * @LastEditTime: 2023-05-25 10:25:51
  * @FilePath: \common\src\components\bsgoal-base-select\index.vue
  * @Description: Select 公共组件
  * 
@@ -43,7 +43,7 @@ const props = defineProps({
   }
 })
 
-const emits = defineEmits(['update:modelValue'])
+const emits = defineEmits(['update:modelValue','change'])
 
 // ---> S 触发 方法 <---
 
@@ -54,7 +54,12 @@ const emits = defineEmits(['update:modelValue'])
  * @return {*}
  */
 const triggerChange = (value = '') => {
+  const { range = [] } = props
+  const finder = range.find((fi) => fi.value === value)
+  const data = finder ? finder.data : null
+
   emits('update:modelValue', value)
+  emits('change', value , data)
 }
 
 // ---> E 触发 方法 <---

package/src/components/bsgoal-base-time-range/index.vue

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-05-24 14:09:57
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-05-24 16:54:26
+ * @LastEditTime: 2023-05-25 11:20:07
  * @FilePath: \common\src\components\bsgoal-base-time-range\index.vue
  * @Description: 时间选择 公共组件
  * 
@@ -96,7 +96,7 @@ watchEffect(() => {
  * @return {*}
  */
 const triggerChange = (range = []) => {
-  const { startTime = '', endTime = ''  } = props
+  const { startTime = '', endTime = '' } = props
 
   const { 0: startDate, 1: endDate } = range
   const startDateFormat = dateToString(startDate)
@@ -109,6 +109,18 @@ const triggerChange = (range = []) => {
   }
 }
 
+/**
+ * @Author: canlong.shen
+ * @description: 触发 面板显隐事件
+ * @default:
+ * @return {*}
+ */
+const triggerVisibleChange = (visibility = false) => {
+  if (!visibility) {
+    triggerChange(unref(bindValue))
+  }
+}
+
 // ---> E 值绑定 <---
 </script>
 <script>
@@ -128,6 +140,7 @@ export default {
         start-placeholder="开始时间"
         end-placeholder="结束时间"
         @change="triggerChange"
+        @visible-change="triggerVisibleChange"
       />
     </el-config-provider>
   </div>