@newview/ui 1.1.96 → 1.1.98

package/README.md

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

package/dist/newview-ui.js

@@ -32185,7 +32185,7 @@ let SearchComInstance$1 = class SearchComInstance2 extends BaseInstance {
   }
   //#endregion AutoComplete END
 };
-const SearchCom_vue_vue_type_style_index_0_scoped_cda08489_lang = "";
+const SearchCom_vue_vue_type_style_index_0_scoped_4a07b3ec_lang = "";
 function _sfc_render$o(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Input = resolveComponent("Input");
   const _component_Radio = resolveComponent("Radio");
@@ -32305,22 +32305,22 @@ function _sfc_render$o(_ctx, _cache, $props, $setup, $data, $options) {
                     }, null, 8, ["modelValue", "onUpdate:modelValue", "data", "filter-method", "placeholder", "style"])) : createCommentVNode("", true),
                     option.type == "DatePicker" ? (openBlock(), createBlock(_component_DatePicker, {
                       key: 6,
-                      modelValue: _ctx.formModel[option.field],
-                      "onUpdate:modelValue": ($event) => _ctx.formModel[option.field] = $event,
+                      "model-value": _ctx.formModel[option.field],
                       type: option.pickerType,
                       placeholder: option.placeholder,
                       format: option.format,
-                      style: normalizeStyle({ width: _ctx.getWidth(option) })
-                    }, null, 8, ["modelValue", "onUpdate:modelValue", "type", "placeholder", "format", "style"])) : createCommentVNode("", true),
+                      style: normalizeStyle({ width: _ctx.getWidth(option) }),
+                      onOnChange: ($event) => _ctx.formModel[option.field] = $event
+                    }, null, 8, ["model-value", "type", "placeholder", "format", "style", "onOnChange"])) : createCommentVNode("", true),
                     option.type == "TimePicker" ? (openBlock(), createBlock(_component_TimePicker, {
                       key: 7,
-                      modelValue: _ctx.formModel[option.field],
-                      "onUpdate:modelValue": ($event) => _ctx.formModel[option.field] = $event,
+                      "model-value": _ctx.formModel[option.field],
                       type: option.pickerType,
                       placeholder: option.placeholder,
                       format: option.format,
-                      style: normalizeStyle({ width: _ctx.getWidth(option) })
-                    }, null, 8, ["modelValue", "onUpdate:modelValue", "type", "placeholder", "format", "style"])) : createCommentVNode("", true),
+                      style: normalizeStyle({ width: _ctx.getWidth(option) }),
+                      onOnChange: ($event) => _ctx.formModel[option.field] = $event
+                    }, null, 8, ["model-value", "type", "placeholder", "format", "style", "onOnChange"])) : createCommentVNode("", true),
                     option.type == "InputNumber" ? (openBlock(), createBlock(_component_InputNumber, {
                       key: 8,
                       modelValue: _ctx.formModel[option.field],
@@ -32373,7 +32373,7 @@ function _sfc_render$o(_ctx, _cache, $props, $setup, $data, $options) {
     _: 1
   }, 8, ["model", "label-width"]);
 }
-const SearchCom = /* @__PURE__ */ _export_sfc(_sfc_main$o, [["render", _sfc_render$o], ["__scopeId", "data-v-cda08489"]]);
+const SearchCom = /* @__PURE__ */ _export_sfc(_sfc_main$o, [["render", _sfc_render$o], ["__scopeId", "data-v-4a07b3ec"]]);
 const propDefine$u = {
   options: {
     // 配置项
@@ -33002,6 +33002,7 @@ let GridColumnInstance$1 = class GridColumnInstance2 extends BaseInstance {
     //#endregion 事件 END
     //#region 表头筛选
     __publicField2(this, "getColumFilters", (filter3) => {
+      debugger;
       if (filter3) {
         if (filter3.type == "select") {
           return filter3.options.map((e) => {
@@ -33009,7 +33010,11 @@ let GridColumnInstance$1 = class GridColumnInstance2 extends BaseInstance {
             return e;
           });
         } else if (filter3.type == "daterange") {
-          return [{ data: ["", ""] }];
+          if ((filter3 == null ? void 0 : filter3.data) && (filter3 == null ? void 0 : filter3.data.length) >= 2) {
+            return [{ data: filter3.data }];
+          } else {
+            return [{ data: ["", ""] }];
+          }
         } else if (filter3.type == "numberrange") {
           return [{ data: ["", ""] }];
         } else {
@@ -33626,6 +33631,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 +33773,9 @@ const CreatGridRenderer$1 = () => {
       },
       // 重置筛选复原方法（当未点击确认时，该选项将被恢复为默认值）
       filterRecoverMethod({ option }) {
-        option.data = ["", ""];
+        if (!(option.data && option.data.length >= 2)) {
+          option.data = ["", ""];
+        }
       }
     });
   }
@@ -58682,8 +58694,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])) {
@@ -59442,8 +59455,8 @@ let GridInstance$1 = class GridInstance2 extends BaseInstance {
   }
   //#endregion 公开方法 END
 };
-const Grid_vue_vue_type_style_index_0_scoped_1b3fc6d2_lang = "";
-const _withScopeId$3 = (n) => (pushScopeId("data-v-1b3fc6d2"), n = n(), popScopeId(), n);
+const Grid_vue_vue_type_style_index_0_scoped_2a3c4718_lang = "";
+const _withScopeId$3 = (n) => (pushScopeId("data-v-2a3c4718"), n = n(), popScopeId(), n);
 const _hoisted_1$e = { class: "nv-crud nv-pos-r" };
 const _hoisted_2$b = { class: "grid-msg" };
 const _hoisted_3$9 = { class: "nv-crud-body" };
@@ -59480,6 +59493,7 @@ function _sfc_render$j(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_vxe_table = resolveComponent("vxe-table");
   const _component_Page = resolveComponent("Page");
   return openBlock(), createElementBlock("div", _hoisted_1$e, [
+    createTextVNode(" 123 "),
     createVNode(_component_Spin, {
       fix: "",
       show: _ctx.doMethodLoading.show,
@@ -59675,7 +59689,7 @@ function _sfc_render$j(_ctx, _cache, $props, $setup, $data, $options) {
     ])) : createCommentVNode("", true)
   ]);
 }
-const Grid = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["render", _sfc_render$j], ["__scopeId", "data-v-1b3fc6d2"]]);
+const Grid = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["render", _sfc_render$j], ["__scopeId", "data-v-2a3c4718"]]);
 const GridCellContent = defineComponent({
   name: "GridCellContent",
   props: {
@@ -241265,8 +241279,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])) {