@bsgoal/common 2.15.23 → 2.16.1

package/dist/style.css

@@ -1 +1 @@
-@charset "UTF-8";.base_tooltip_popper{max-width:20em}.bsgoal-base-form .base_form .el-form-item{margin-right:10px}.bsgoal-base-form .base_form div.el-input,.bsgoal-base-form .base_form div.el-select{width:100%}.bsgoal-base-form .base_form--visible{width:0px;height:0px;overflow:hidden}.bsgoal-base-sizes{display:inline-block}.bsgoal-base-sizes .base_sizes_input{cursor:pointer;margin-left:16px}.bsgoal-base-sizes .base_sizes_item{text-align:center;font-size:14px;padding:0 20px;color:#606266;height:34px;line-height:34px;cursor:pointer}.bsgoal-base-sizes .base_sizes_item:hover{background-color:#f5f7fa}.bsgoal-base-sizes .base_sizes_item--selected{color:#409eff;font-weight:700}.bsgoal-base-sizes .bsgoal_micro_app .el-input__suffix{margin-right:8px!important}.bsgoal-base-table-pagination{text-align:right}.bsgoal-base-table-pagination .base_table_pagination{display:inline-block;margin-top:16px}.bsgoal-base-table-empty .base_table_empty{text-align:center}.bsgoal-base-table-empty .base_table_empty_img{padding-top:16px;line-height:initial}.bsgoal-base-table-empty .base_table_empty_text{display:inline-block}.bsgoal-base-table .base_table{padding:16px}.bsgoal-base-table .base_table_menu{margin-bottom:8px}.bsgoal-base-table .el-table__body-wrapper{overflow-y:hidden!important}.bsgoal-base-table .el-scrollbar__view{height:100%}.bsgoal-base-table .base_table--tree{margin-top:10px}.bsgoal-base-table th>div.cell{white-space:nowrap}.bsgoal-base-table .bsgoal_micro_app .el-scrollbar{padding-bottom:0!important}.bsgoal-base-table .bsgoal_micro_app th.el-table__cell{overflow:initial!important}.bsgoal-base-line .base_line{height:10px;background-color:#f0f2f5}.bsgoal-base-line .bsgoal-base-line__vertical{display:inline-block;height:100%}.bsgoal-base-line .base_line__vertical{width:10px;height:100%}.bsgoal-base-line .bsgoal-base-line__fill{position:absolute;left:0;right:0}.bsgoal-base-search-operation{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:33.5px}.bsgoal-base-search-operation .operation_fold{margin-left:12px;cursor:pointer;min-width:3em}.bsgoal-base-cascader{height:100%;width:100%}.bsgoal-base-cascader .base_cascader{width:inherit;height:inherit}.bsgoal-base-search .base_search{padding:16px 6px 8px 16px}.bsgoal-base-search .base_search .el-form-item{margin-bottom:8px;margin-right:10px}.bsgoal-base-search .base_search div.el-input,.bsgoal-base-search .base_search div.el-select{width:100%}.bsgoal-base-search .el-col{margin-bottom:0!important}.bsgoal-base-tree-fold .base_tree_fold{position:absolute;top:0;bottom:0;right:10px;margin:auto;width:14px;height:38px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;border-radius:10px;background-color:var(--el-color-primary)}.bsgoal-base-tree-fold .base_tree_fold--hide{right:0px}.bsgoal-base-tree{display:inline-block}.bsgoal-base-tree .base_tree{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-sizing:border-box;box-sizing:border-box;position:relative;min-width:14px}.bsgoal-base-tree .base_tree_main{width:221px;padding:16px;scrollbar-width:none;-ms-overflow-style:none;overflow-x:hidden;overflow-y:auto}.bsgoal-base-tree .base_tree_main::-webkit-scrollbar{width:6px;height:6px}.bsgoal-base-tree .base_tree_main::-webkit-scrollbar-thumb{border-radius:10px;background:rgba(0,0,0,.2);width:20px}.bsgoal-base-tree .base_tree_main::-webkit-scrollbar-track{background-color:#fff}.bsgoal-base-tree .base_tree_main_input{margin-bottom:10px}.bsgoal-base-tree .base_tree .el-tree-node__content>i.el-tree-node__expand-icon{padding-left:0}.bsgoal-base-tree .base_tree_node{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-flex:1;-ms-flex:1;flex:1}.bsgoal-base-tree .base_tree_node_label{-webkit-box-flex:1;-ms-flex:1;flex:1}.bsgoal-base-tree .base_tree_node_icon{-webkit-box-flex:0;-ms-flex:none;flex:none}.bsgoal-base-button,.bsgoal-base-button .base_button{display:inline-block}.bsgoal-base-dialog .base_dialog_header{font-weight:500;color:#303133;font-size:16px}.bsgoal-base-dialog .bsgoal-dialog__footer--conceal .el-dialog__footer{display:none}.bsgoal-base-dialog .el-dialog__footer{height:initial;line-height:initial}.bsgoal-base-dialog .el-dialog__footer .el-button{margin-left:initial}.bsgoal-base-dialog .bsgoal_base_dialog_main .el-dialog__header{padding:16px 30px;margin-right:0;background-color:#f5f7fa;height:initial!important}.bsgoal-base-dialog .bsgoal_base_dialog_main .el-dialog__header .el-dialog__headerbtn{top:0px;right:8px}.bsgoal-base-dialog .bsgoal_base_dialog_main .el-dialog__body{padding:0}.bsgoal-base-dialog .bsgoal_base_dialog_main .base_dialog_content{padding:30px}.bsgoal-base-dialog .bsgoal_base_dialog_main .base_dialog_content--form{padding:0 0 0 30px}.bsgoal-base-dialog .bsgoal_base_dialog_main .base_dialog_content--form .bsgoal-base-form .base_form{padding:initial;padding-top:16px}.bsgoal-base-dialog .bsgoal_base_dialog_main .base_dialog_content--blank{padding-top:0}.bsgoal-base-dialog .base_dialog_footer_cancel{margin-right:16px}.bsgoal-base-tabs .base_tabs--fill{position:absolute;top:8px;bottom:0;left:16px;right:16px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.bsgoal-base-tabs .base_tabs--fill>div.el-tabs__content{-webkit-box-flex:1;-ms-flex:1;flex:1;position:relative}.bsgoal-base-alert .el-alert,.bsgoal-base-item .base_item{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.bsgoal-base-item .base_item_label{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;font-size:14px;color:#606266;height:32px;line-height:32px;padding-right:12px}.bsgoal-base-tree-table .base_tree_table{display:-webkit-box;display:-ms-flexbox;display:flex}.bsgoal-base-tree-table .base_tree_table--table{overflow:hidden}.bsgoal-base-viewer{display:inline-block}.bsgoal-base-viewer .base_viewer{margin:4px 8px}
+@charset "UTF-8";.base_tooltip_popper{max-width:20em}.bsgoal-base-form .base_form .el-form-item{margin-right:10px}.bsgoal-base-form .base_form div.el-input,.bsgoal-base-form .base_form div.el-select{width:100%}.bsgoal-base-form .base_form--visible{width:0px;height:0px;overflow:hidden}.bsgoal-base-sizes{display:inline-block}.bsgoal-base-sizes .base_sizes_input{cursor:pointer;margin-left:16px}.bsgoal-base-sizes .base_sizes_item{text-align:center;font-size:14px;padding:0 20px;color:#606266;height:34px;line-height:34px;cursor:pointer}.bsgoal-base-sizes .base_sizes_item:hover{background-color:#f5f7fa}.bsgoal-base-sizes .base_sizes_item--selected{color:#409eff;font-weight:700}.bsgoal-base-sizes .bsgoal_micro_app .el-input__suffix{margin-right:8px!important}.bsgoal-base-table-pagination{text-align:right}.bsgoal-base-table-pagination .base_table_pagination{display:inline-block;margin-top:16px}.bsgoal-base-table-empty .base_table_empty{text-align:center}.bsgoal-base-table-empty .base_table_empty_img{padding-top:16px;line-height:initial}.bsgoal-base-table-empty .base_table_empty_text{display:inline-block}.bsgoal-base-table .base_table{padding:16px}.bsgoal-base-table .base_table_menu{margin-bottom:8px}.bsgoal-base-table .el-table__body-wrapper{overflow-y:hidden!important}.bsgoal-base-table .el-scrollbar__view{height:100%}.bsgoal-base-table .base_table--tree{margin-top:10px}.bsgoal-base-table th>div.cell{white-space:nowrap}.bsgoal-base-table .bsgoal_micro_app .el-scrollbar{padding-bottom:0!important}.bsgoal-base-table .bsgoal_micro_app th.el-table__cell{overflow:initial!important}.bsgoal-base-line .base_line{height:10px;background-color:#f0f2f5}.bsgoal-base-line .bsgoal-base-line__vertical{display:inline-block;height:100%}.bsgoal-base-line .base_line__vertical{width:10px;height:100%}.bsgoal-base-line .bsgoal-base-line__fill{position:absolute;left:0;right:0}.bsgoal-base-search-operation{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:33.5px}.bsgoal-base-search-operation .operation_fold{margin-left:12px;cursor:pointer;min-width:3em}.bsgoal-base-cascader{height:100%;width:100%}.bsgoal-base-cascader .base_cascader{width:inherit;height:inherit}.bsgoal-base-search .base_search{padding:16px 6px 8px 16px}.bsgoal-base-search .base_search .el-form-item{margin-bottom:8px;margin-right:10px}.bsgoal-base-search .base_search div.el-input,.bsgoal-base-search .base_search div.el-select{width:100%}.bsgoal-base-search .el-col{margin-bottom:0!important}.bsgoal-base-tree-fold .base_tree_fold{position:absolute;top:0;bottom:0;right:10px;margin:auto;width:14px;height:38px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;border-radius:10px;background-color:var(--el-color-primary)}.bsgoal-base-tree-fold .base_tree_fold--hide{right:0px}.bsgoal-base-tree{display:inline-block}.bsgoal-base-tree .base_tree{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-sizing:border-box;box-sizing:border-box;position:relative;min-width:14px}.bsgoal-base-tree .base_tree_main{width:221px;padding:16px;scrollbar-width:none;-ms-overflow-style:none;overflow-x:hidden;overflow-y:auto}.bsgoal-base-tree .base_tree_main::-webkit-scrollbar{width:6px;height:6px}.bsgoal-base-tree .base_tree_main::-webkit-scrollbar-thumb{border-radius:10px;background:rgba(0,0,0,.2);width:20px}.bsgoal-base-tree .base_tree_main::-webkit-scrollbar-track{background-color:#fff}.bsgoal-base-tree .base_tree_main_input{margin-bottom:10px}.bsgoal-base-tree .base_tree .el-tree-node__content>i.el-tree-node__expand-icon{padding-left:0}.bsgoal-base-tree .base_tree_node{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-flex:1;-ms-flex:1;flex:1}.bsgoal-base-tree .base_tree_node_label{-webkit-box-flex:1;-ms-flex:1;flex:1}.bsgoal-base-tree .base_tree_node_icon{-webkit-box-flex:0;-ms-flex:none;flex:none}.bsgoal-base-button,.bsgoal-base-button .base_button{display:inline-block}.bsgoal-base-dialog .base_dialog_header{font-weight:500;color:#303133;font-size:16px}.bsgoal-base-dialog .bsgoal-dialog__footer--conceal .el-dialog__footer{display:none}.bsgoal-base-dialog .el-dialog__footer{height:initial;line-height:initial}.bsgoal-base-dialog .el-dialog__footer .el-button{margin-left:initial}.bsgoal-base-dialog .bsgoal_base_dialog_main .el-dialog__header{padding:16px 30px;margin-right:0;background-color:#f5f7fa;height:initial!important}.bsgoal-base-dialog .bsgoal_base_dialog_main .el-dialog__header .el-dialog__headerbtn{top:0px;right:8px}.bsgoal-base-dialog .bsgoal_base_dialog_main .el-dialog__body{padding:0}.bsgoal-base-dialog .bsgoal_base_dialog_main .base_dialog_content{padding:30px}.bsgoal-base-dialog .bsgoal_base_dialog_main .base_dialog_content--form{padding:0 0 0 30px}.bsgoal-base-dialog .bsgoal_base_dialog_main .base_dialog_content--form .bsgoal-base-form .base_form{padding:initial;padding-top:16px}.bsgoal-base-dialog .bsgoal_base_dialog_main .base_dialog_content--blank{padding-top:0}.bsgoal-base-dialog .base_dialog_footer_cancel{margin-right:16px}.bsgoal-base-tabs .base_tabs--fill{position:absolute;top:8px;bottom:0;left:16px;right:16px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.bsgoal-base-tabs .base_tabs--fill>div.el-tabs__content{-webkit-box-flex:1;-ms-flex:1;flex:1;position:relative}.bsgoal-base-alert .el-alert{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.bsgoal-base-time-range .base_time_range[data-v-fa522bcc]{width:100%}.bsgoal-base-item .base_item{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.bsgoal-base-item .base_item_label{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;font-size:14px;color:#606266;height:32px;line-height:32px;padding-right:12px}.bsgoal-base-tree-table .base_tree_table{display:-webkit-box;display:-ms-flexbox;display:flex}.bsgoal-base-tree-table .base_tree_table--table{overflow:hidden}.bsgoal-base-viewer{display:inline-block}.bsgoal-base-viewer .base_viewer{margin:4px 8px}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsgoal/common",
-  "version": "2.15.23",
+  "version": "2.16.1",
   "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-time-range/demo.vue

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-05-24 14:10:03
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-05-24 16:40:42
+ * @LastEditTime: 2023-07-11 10:34:27
  * @FilePath: \common\src\components\bsgoal-base-time-range\demo.vue
  * @Description: 时间选择 演示 
  * 
@@ -22,19 +22,33 @@ const props = defineProps({})
 
 const timeRange = ref(['11:00', '12:12'])
 
+const timeList = ref([
+  {
+    startTime: '00:00',
+    endTime: '01:00'
+  }
+])
+
 const startTime = ref('12:11')
 const endTime = ref('13:55')
+
+const changeTime = (start = '' , end = '') => {
+    console.log('start',start);
+    console.log('end',end);
+}
 </script>
 <template>
   <div class="bsgoal-base-time-range-demo">
     <div>{{ timeRange }}</div>
     <div>{{ startTime }}</div>
     <div>{{ endTime }}</div>
+    <div>{{ timeList[0]['startTime'] }}</div>
+    <div>{{ timeList[0]['endTime'] }}</div>
     <BsgoalBaseTimeRange
-      v-model:startTime="startTime"
-      v-model:endTime="endTime"
-      v-model="timeRange"
+      :body-style="{ width: '100%' }"
+      :modelValue="[timeList[0]['startTime'], timeList[0]['endTime']]"
       class="base_time_range_demo"
+      @on-change="changeTime"
     />
   </div>
 </template>

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-25 11:20:07
+ * @LastEditTime: 2023-07-11 10:13:39
  * @FilePath: \common\src\components\bsgoal-base-time-range\index.vue
  * @Description: 时间选择 公共组件
  * 
@@ -48,10 +48,17 @@ const props = defineProps({
   format: {
     type: [String],
     default: 'HH:mm'
+  },
+  /**
+   * 格式 HH:mm:ss
+   */
+   bodyStyle: {
+    type: [Object],
+    default: () => ({})
   }
 })
 
-const emits = defineEmits(['update:modelValue', 'update:startTime', 'update:endTime'])
+const emits = defineEmits(['update:modelValue', 'update:startTime', 'update:endTime','on-change'])
 // ---> S 值绑定 <---
 const bindValue = ref([])
 
@@ -112,6 +119,8 @@ const triggerChange = (range = []) => {
   } else {
     emits('update:modelValue', [startDateFormat, endDateFormat])
   }
+
+  emits('on-change',startDateFormat, endDateFormat)
 }
 
 /**
@@ -135,10 +144,11 @@ const triggerVisibleChange = (visibility = false) => {
         v-model="bindValue"
         is-range
         class="base_time_range"
-        :format="format"
         range-separator="至"
         start-placeholder="开始时间"
         end-placeholder="结束时间"
+        :style="bodyStyle"
+        :format="format"
         @change="triggerChange"
         @visible-change="triggerVisibleChange"
       />
@@ -148,6 +158,11 @@ const triggerVisibleChange = (visibility = false) => {
 <style lang="scss" scoped>
 /* 自定义样式
 ---------------------------------------------------------------- */
+.bsgoal-base-time-range {
+   .base_time_range {
+    width: 100%;
+   }
+}
 </style>
 <style lang="scss">
 /* 覆盖样式