vue2-client 1.19.1 → 1.19.3

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

@@ -199,6 +199,80 @@ export default {
         }
       }
       return {}
+    },
+    // 日期范围限制函数
+    disabledDate () {
+      // 查询模式下不进行范围限制
+      if (this.mode === '查询') {
+        return undefined
+      }
+
+      const dateRangeOption = this.attr.dateRangeOption
+      if (!dateRangeOption || !dateRangeOption.type) {
+        return undefined
+      }
+
+      const { type, beforeDays, afterDays } = dateRangeOption
+      const today = moment().startOf('day')
+
+      return (current) => {
+        // 根据组件类型处理不同的时间粒度
+        let currentDate, comparisonDate
+
+        if (['monthPicker', 'monthRangePicker'].includes(this.attr.type)) {
+          // 月份选择器：比较月份
+          currentDate = moment(current).startOf('month')
+          comparisonDate = moment(today).startOf('month')
+        } else if (['yearPicker', 'yearRangePicker'].includes(this.attr.type)) {
+          // 年份选择器：比较年份
+          currentDate = moment(current).startOf('year')
+          comparisonDate = moment(today).startOf('year')
+        } else {
+          // 日期选择器：比较日期
+          currentDate = moment(current).startOf('day')
+          comparisonDate = today
+        }
+
+        switch (type) {
+          case 'afterToday':
+            // 只能选择今天及以后的日期/月份/年份
+            return currentDate.isBefore(comparisonDate)
+          case 'beforeToday':
+            // 只能选择今天及以前的日期/月份/年份
+            return currentDate.isAfter(comparisonDate)
+          case 'custom':
+            // 自定义范围：beforeDays（今天前多少天）、afterDays（今天后多少天）
+            if (beforeDays && beforeDays > 0) {
+              let minDate
+              if (['monthPicker', 'monthRangePicker'].includes(this.attr.type)) {
+                minDate = moment(comparisonDate).subtract(beforeDays, 'months')
+              } else if (['yearPicker', 'yearRangePicker'].includes(this.attr.type)) {
+                minDate = moment(comparisonDate).subtract(beforeDays, 'years')
+              } else {
+                minDate = moment(comparisonDate).subtract(beforeDays, 'days')
+              }
+              if (currentDate.isBefore(minDate)) {
+                return true
+              }
+            }
+            if (afterDays && afterDays > 0) {
+              let maxDate
+              if (['monthPicker', 'monthRangePicker'].includes(this.attr.type)) {
+                maxDate = moment(comparisonDate).add(afterDays, 'months')
+              } else if (['yearPicker', 'yearRangePicker'].includes(this.attr.type)) {
+                maxDate = moment(comparisonDate).add(afterDays, 'years')
+              } else {
+                maxDate = moment(comparisonDate).add(afterDays, 'days')
+              }
+              if (currentDate.isAfter(maxDate)) {
+                return true
+              }
+            }
+            return false
+          default:
+            return false
+        }
+      }
     }
   },
   methods: {
@@ -234,6 +308,7 @@ export default {
     :getPopupContainer="enablePopupToBody? getBodyContainer : undefined"
     v-model="localValue"
     :disabled="disabled || readOnly"
+    :disabledDate="disabledDate"
     style="width: 100%"
     :showToday="true"
     placeholder="请选择日期"
@@ -251,6 +326,7 @@ export default {
     :getPopupContainer="enablePopupToBody? getBodyContainer : undefined"
     v-model="localValue"
     :disabled="disabled || readOnly"
+    :disabledDate="disabledDate"
     :show-time="true"
     placeholder="请选择月份"
     :valueFormat="formatType"
@@ -266,6 +342,7 @@ export default {
     :getPopupContainer="enablePopupToBody? getBodyContainer : undefined"
     v-model="localValue"
     :disabled="disabled || readOnly"
+    :disabledDate="disabledDate"
     format="YYYY"
     :valueFormat="formatType"
     :open="yearShowOne"
@@ -328,6 +405,7 @@ export default {
     "
     v-model="localValue"
     :disabled="disabled"
+    :disabledDate="disabledDate"
     :placeholder="placeholder"
     :show-time="
       ['yearRangePicker', 'monthRangePicker'].includes(attr.type)

package/src/base-client/components/common/XReportGrid/XReportTrGroup.vue

@@ -64,7 +64,8 @@
                 'x-import-excel-button',
                 'x-chart',
                 'h-chart',
-                'x-simple-table'
+                'x-simple-table',
+                'x-workflow-progress'
               ].includes(cell.slotType)">
               <component
                 :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
@@ -143,7 +144,8 @@
                 'x-import-excel-button',
                 'x-chart',
                 'h-chart',
-                'x-simple-table'
+                'x-simple-table',
+                'x-workflow-progress'
               ].includes(cell.slotType)">
               <component
                 :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
@@ -219,7 +221,8 @@ export default {
     XImportExcelButton: () => import('@vue2-client/base-client/components/his/XImportExcelButton/XImportExcelButton.vue'),
     XChart: () => import('@vue2-client/base-client/components/his/XChart/XChart.vue'),
     HChart: () => import('@vue2-client/base-client/components/his/HChart/HChart.vue'),
-    XSimpleTable: () => import('@vue2-client/base-client/components/his/XSimpleTable/XSimpleTable.vue')
+    XSimpleTable: () => import('@vue2-client/base-client/components/his/XSimpleTable/XSimpleTable.vue'),
+    XWorkflowProgress: () => import('@vue2-client/base-client/components/his/XWorkflowProgress/XWorkflowProgress.vue')
   },
   props: {
     // 每一行的配置