@newview/ui 1.1.97 → 1.1.99

package/README.md

@@ -1,5 +1,6 @@
-### 1.1.97
-1、搜索日期时间选择组件赋值修改
+### 1.1.98
+1、表头筛选daterange增加默认传值功能
+
 
 ### 1.1.96
 1、表单及表格日期时间选择组件赋值修改

package/dist/newview-ui.js

@@ -33009,7 +33009,11 @@ let GridColumnInstance$1 = class GridColumnInstance2 extends BaseInstance {
             return e;
           });
         } else if (filter3.type == "daterange") {
-          return [{ data: ["", ""] }];
+          if ((filter3 == null ? void 0 : filter3.defaultFilteringTimeRange) && (filter3 == null ? void 0 : filter3.defaultFilteringTimeRange.length) >= 2) {
+            return [{ data: filter3.defaultFilteringTimeRange }];
+          } else {
+            return [{ data: ["", ""] }];
+          }
         } else if (filter3.type == "numberrange") {
           return [{ data: ["", ""] }];
         } else {
@@ -33626,6 +33630,11 @@ const _sfc_main$l = defineComponent({
         const { column } = params;
         const option = column.filters[0];
         filterDateRangeVal.option = option;
+        if (option.data && option.data.length >= 2) {
+          const { $panel } = params;
+          const checked = option.data[0] && option.data[1];
+          $panel.changeOption(null, checked, toRaw(option));
+        }
       }
     };
     const changeOptionEvent = (datevalue) => {
@@ -33763,7 +33772,9 @@ const CreatGridRenderer$1 = () => {
       },
       // 重置筛选复原方法（当未点击确认时，该选项将被恢复为默认值）
       filterRecoverMethod({ option }) {
-        option.data = ["", ""];
+        if (!(option.data && option.data.length >= 2)) {
+          option.data = ["", ""];
+        }
       }
     });
   }
@@ -58682,8 +58693,9 @@ let GridInstance$1 = class GridInstance2 extends BaseInstance {
             }
             break;
           case "daterange":
-            _queryWrapper.ge(key2, value[0]);
-            _queryWrapper.le(key2, value[1]);
+            let startDate = this.utilities.format(value[0], "yyyy-MM-DD");
+            let EndDate = this.utilities.format(value[1], "yyyy-MM-DD");
+            _queryWrapper.between(`date_format(${key2},'%Y-%m-%d')`, startDate, EndDate);
             break;
           case "numberrange":
             if (!this.utilities.isNull(value[0])) {
@@ -241265,8 +241277,9 @@ class GridInstance extends BaseInstance {
             }
             break;
           case "daterange":
-            _queryWrapper.ge(key2, value[0]);
-            _queryWrapper.le(key2, value[1]);
+            let startDate = this.utilities.format(value[0], "yyyy-MM-DD");
+            let EndDate = this.utilities.format(value[1], "yyyy-MM-DD");
+            _queryWrapper.between(`date_format(${key2},'%Y-%m-%d')`, startDate, EndDate);
             break;
           case "numberrange":
             if (!this.utilities.isNull(value[0])) {