cnhis-design-vue 3.4.0-beta.60 → 3.4.0-beta.63

package/es/components/iho-table/src/plugins/filterDaterangeRenderPlugin/filter.vue2.js

@@ -1,6 +1,7 @@
-import { defineComponent, reactive, openBlock, createBlock, unref } from 'vue';
+import { defineComponent, reactive, computed, openBlock, createBlock, unref, mergeProps } from 'vue';
 import DatePicker from '../../../../date-picker/index.js';
 import { subDays, subMonths } from 'date-fns';
+import { getLowCodeFieldFromField } from '../../utils/index.js';
 
 var _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "filter",
@@ -14,9 +15,21 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     var _a, _b, _c;
     const props = __props;
     const optionRef = reactive(((_c = (_b = (_a = props.payload) == null ? void 0 : _a.column) == null ? void 0 : _b.filters) == null ? void 0 : _c[0]) || { data: void 0 });
-    const shortcuts = reactive({
-      \u8FD1\u4E00\u5468: () => [subDays(new Date(), 7).getTime(), new Date().getTime()],
-      \u8FD1\u4E00\u4E2A\u6708: () => [subMonths(new Date(), 1).getTime(), new Date().getTime()]
+    const datePickerProps = computed(() => {
+      var _a2, _b2, _c2;
+      const fieldItem = getLowCodeFieldFromField(props.payload.column);
+      if (!fieldItem)
+        return {};
+      return (_c2 = (_b2 = (_a2 = fieldItem.filterSetting) == null ? void 0 : _a2.daterange) == null ? void 0 : _b2.datePickerProps) != null ? _c2 : {};
+    });
+    const shortcuts = computed(() => {
+      return Object.assign(
+        {
+          \u8FD1\u4E00\u5468: () => [subDays(new Date(), 7).getTime(), new Date().getTime()],
+          \u8FD1\u4E00\u4E2A\u6708: () => [subMonths(new Date(), 1).getTime(), new Date().getTime()]
+        },
+        datePickerProps.value.shortcuts
+      );
     });
     function onConfirm(value, formattedValue) {
       var _a2;
@@ -27,16 +40,17 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       props.payload.$panel.confirmFilter(new CustomEvent("click"));
     }
     return (_ctx, _cache) => {
-      return openBlock(), createBlock(unref(DatePicker), {
+      return openBlock(), createBlock(unref(DatePicker), mergeProps({
         type: "datetimerange",
         panel: "",
         clearable: "",
         "default-time": ["00:00:00", "23:59:59"],
         "formatted-value": optionRef.data,
-        "onUpdate:formattedValue": _cache[0] || (_cache[0] = ($event) => optionRef.data = $event),
-        shortcuts,
+        "onUpdate:formattedValue": _cache[0] || (_cache[0] = ($event) => optionRef.data = $event)
+      }, datePickerProps.value, {
+        shortcuts: shortcuts.value,
         onConfirm
-      }, null, 8, ["formatted-value", "shortcuts"]);
+      }), null, 16, ["formatted-value", "shortcuts"]);
     };
   }
 });

package/es/components/iho-table/src/plugins/lowCodeFieldAdaptorPlugin.js

@@ -75,7 +75,7 @@ function filterAdaptor(props) {
     Reflect.deleteProperty(props, "filterSetting");
     Reflect.deleteProperty(props, "fieldSetting");
   }
-  if ((_a = props.filterSetting) == null ? void 0 : _a.daterange) {
+  if (((_a = props.filterSetting) == null ? void 0 : _a.daterange) === true) {
     Reflect.deleteProperty(props.filterSetting, "daterange");
     props.filterSetting.type = "daterange";
   }

package/es/components/iho-table/src/types/index.d.ts

@@ -156,7 +156,9 @@ export declare namespace IhoTableLowCodeField {
         }>;
     }>;
     type FilterSetting = Partial<{
-        daterange: boolean;
+        daterange: Partial<{
+            datePickerProps: AnyObject;
+        }>;
         type: 'daterange' | 'text' | 'remote';
         pagination: boolean;
         text: Partial<{