@bsgoal/common 2.16.2 → 2.16.4

package/package.json

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

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

@@ -27,7 +27,7 @@ const task = (done) => {
 </script>
 <template>
   <div class="bsgoal-base-button-demo">
-    <BsgoalBaseButton :task="task"  mode="detail" > </BsgoalBaseButton>
+    <BsgoalBaseButton :task="task"  mode="detail" disabled > </BsgoalBaseButton>
 
     <BsgoalBaseButton :task="task" mode="edit" plain > </BsgoalBaseButton>
     <BsgoalBaseButton :task="task" mode="cancel" > </BsgoalBaseButton>

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-07-07 17:09:11
+ * @LastEditTime: 2023-07-11 18:04:43
  * @FilePath: \common\src\components\bsgoal-base-button\index.vue
  * @Description: 统一按钮 
  * 
@@ -57,6 +57,13 @@ const props = defineProps({
   hasLoading: {
     type: [Boolean],
     default: true
+  },
+  /**
+   * disabled
+   */
+  disabled: {
+    type: [Boolean],
+    default: false
   }
 })
 
@@ -94,8 +101,6 @@ const typeGet = computed(() => {
 })
 const iconGet = computed(() => {
   const { mode = '', icon = '' } = props
-  console.log('icon', icon)
-
   if (icon !== false) {
     switch (mode) {
       case 'delete':
@@ -137,9 +142,14 @@ const contentGet = computed(() => {
   <div class="bsgoal-base-button">
     <div class="base_button" @click="triggerClick">
       <slot :loading="loading">
-        <el-button :type="typeGet" :icon="iconGet" :loading="loading" :plain="plain">{{
-          contentGet
-        }}</el-button>
+        <el-button
+          :type="typeGet"
+          :icon="iconGet"
+          :loading="loading"
+          :plain="plain"
+          :disabled="disabled"
+          >{{ contentGet }}</el-button
+        >
       </slot>
     </div>
   </div>

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

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-05-24 14:58:50
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-05-24 15:37:12
+ * @LastEditTime: 2023-07-11 13:40:53
  * @FilePath: \common\src\components\bsgoal-base-time\demo.vue
  * @Description: 时间选择器
  * 
@@ -19,12 +19,43 @@ defineOptions({
 
 const props = defineProps({})
 const time = ref('11:22')
+
+const makeRange = (start, end) => {
+  const result = []
+  for (let i = start; i <= end; i++) {
+    result.push(i)
+  }
+
+  // console.log('makeRange',result);
+  return result
+}
+const disabledHours = () => {
+  return [16]
+}
+const disabledMinutes = (hour) => {
+  if (hour === 17) {
+    return makeRange(0, 29)
+  }
+  if (hour === 18) {
+    return makeRange(31, 59)
+  }
+}
+const disabledSeconds = (hour, minute) => {
+  if (hour === 18 && minute === 30) {
+    return makeRange(1, 59)
+  }
+}
 </script>
 <template>
   <div class="bsgoal-base-time-demo">
     <div class="base_time_demo">
       {{ time }}
-      <BsgoalBaseTime v-model="time" />
+      <BsgoalBaseTime
+        v-model="time"
+        :disabled-hours="disabledHours"
+        :disabled-minutes="disabledMinutes"
+        :disabled-seconds="disabledSeconds"
+      />
     </div>
   </div>
 </template>

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

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-05-24 14:58:44
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-05-24 16:36:56
+ * @LastEditTime: 2023-07-11 12:00:53
  * @FilePath: \common\src\components\bsgoal-base-time\index.vue
  * @Description: 时间选择器 
  * 
@@ -41,7 +41,63 @@ const props = defineProps({
   format: {
     type: [String],
     default: 'HH:mm'
-  }
+  },
+  /**
+   * 箭头进行选择
+   */
+  arrowControl: {
+    type: [Boolean],
+    default: false
+  },
+  /**
+   *  禁止选择部分小时选项
+   */
+  disabledHours: {
+    type: [Function],
+    default: () => {}
+  },
+  /**
+   *  禁止选择部分分钟选项
+   */
+  disabledMinutes: {
+    type: [Function],
+    default: () => {}
+  },
+  /**
+   *  禁止选择部分秒选项
+   */
+  disabledSeconds: {
+    type: [Function],
+    default: () => {}
+  },
+  /**
+   * 完全只读
+   */
+  readonly: {
+    type: [Boolean],
+    default: false
+  },
+  /**
+   * 禁用
+   */
+   disabled: {
+    type: [Boolean],
+    default: false
+  },
+  /**
+   * 文本框可输入
+   */
+   editable: {
+    type: [Boolean],
+    default: false
+  },
+  /**
+   * 是否显示清除按钮
+   */
+   clearable: {
+    type: [Boolean],
+    default: false
+  },
 })
 
 // ---> S 绑定值 <---
@@ -96,9 +152,16 @@ const triggerChange = (date = new Date()) => {
       <el-time-picker
         v-model="bindValue"
         class="base_time"
+        :arrow-control="arrowControl"
         :format="format"
-        :clearable="false"
+        :clearable="clearable"
+        :readonly="readonly"
+        :disabled="disabled"
+        :editable="editable"
         :placeholder="placeholder"
+        :disabled-hours="disabledHours"
+        :disabled-minutes="disabledMinutes"
+        :disabled-seconds="disabledSeconds"
         @change="triggerChange"
       />
     </el-config-provider>

package/src/components/bsgoal-base-tree-table/index.vue

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-06-20 09:20:44
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-07-11 11:05:09
+ * @LastEditTime: 2023-07-11 11:07:55
  * @FilePath: \common\src\components\bsgoal-base-tree-table\index.vue
  * @Description: 树结构  + 列表
  *