vue2-client 1.18.38 → 1.18.39

package/src/base-client/components/common/XDatePicker/index.vue

@@ -94,6 +94,26 @@ export default {
         this.yearShowOne = false
       },
     },
+    // 时间范围选择器的开始时间
+    timeRangeStartValue: {
+      get () {
+        return Array.isArray(this.value) && this.value.length > 0 ? this.value[0] : undefined
+      },
+      set (val) {
+        const end = (Array.isArray(this.value) && this.value.length > 1) ? this.value[1] : ''
+        this.$emit('change', [val || '', end])
+      },
+    },
+    // 时间范围选择器的结束时间
+    timeRangeEndValue: {
+      get () {
+        return Array.isArray(this.value) && this.value.length > 1 ? this.value[1] : undefined
+      },
+      set (val) {
+        const start = (Array.isArray(this.value) && this.value.length > 0) ? this.value[0] : ''
+        this.$emit('change', [start, val || ''])
+      },
+    },
     // 格式化类型
     formatType () {
       let defaultFormat = 'YYYY-MM-DD HH:mm:ss'
@@ -111,6 +131,8 @@ export default {
         defaultFormat = 'YYYY-MM'
       } else if (['yearRangePicker', 'yearPicker'].includes(this.attr.type)) {
         defaultFormat = 'YYYY'
+      } else if (['timePicker', 'timeRangePicker'].includes(this.attr.type)) {
+        defaultFormat = 'HH:mm:ss'
       }
       return (
         (this.mode === '查询' && this.attr.queryValueFormat
@@ -146,6 +168,7 @@ export default {
         rangePicker: ['开始日期', '结束日期'],
         monthRangePicker: ['开始月份', '结束月份'],
         yearRangePicker: ['开始年份', '结束年份'],
+        timeRangePicker: ['开始时间', '结束时间'],
       }
       return placeholders[this.attr.type] || ['开始', '结束']
     },
@@ -256,6 +279,44 @@ export default {
     "
     style="width: 100%"
   />
+  <!-- 时间选择器 -->
+  <a-time-picker
+    v-else-if="attr.type === 'timePicker'"
+    :getCalendarContainer="enablePopupToBody? undefined :getCalendarContainer"
+    :getPopupContainer="enablePopupToBody? getBodyContainer : undefined"
+    v-model="localValue"
+    :disabled="disabled || readOnly"
+    style="width: 100%"
+    placeholder="请选择时间"
+    :format="formatType"
+    :valueFormat="formatType"
+  />
+  <!-- 时间范围选择器 -->
+  <div
+    v-else-if="attr.type === 'timeRangePicker'"
+    style="display: flex; align-items: center; gap: 8px; width: 100%">
+    <a-time-picker
+      :getCalendarContainer="enablePopupToBody? undefined :getCalendarContainer"
+      :getPopupContainer="enablePopupToBody? getBodyContainer : undefined"
+      v-model="timeRangeStartValue"
+      :disabled="disabled || readOnly"
+      style="flex: 1"
+      :placeholder="placeholder[0]"
+      :format="formatType"
+      :valueFormat="formatType"
+    />
+    <span style="color: rgba(0, 0, 0, 0.45)"> - </span>
+    <a-time-picker
+      :getCalendarContainer="enablePopupToBody? undefined :getCalendarContainer"
+      :getPopupContainer="enablePopupToBody? getBodyContainer : undefined"
+      v-model="timeRangeEndValue"
+      :disabled="disabled || readOnly"
+      style="flex: 1"
+      :placeholder="placeholder[1]"
+      :format="formatType"
+      :valueFormat="formatType"
+    />
+  </div>
   <!-- 单日范围选择器 / 月份范围选择器/ 年份范围选择器  -->
   <a-range-picker
     v-else-if="

package/src/base-client/components/common/XDescriptions/index.js

@@ -1,3 +1,3 @@
-import XDescriptions from './XDescriptions.vue'
-
-export default XDescriptions
+import XDescriptions from './XDescriptions.vue'
+
+export default XDescriptions