@newview/ui 1.1.13 → 1.1.15

package/dist/newview-ui.js

@@ -5,8 +5,8 @@ var __publicField2 = (obj, key2, value) => {
   return value;
 };
 import { BaseInstance } from "@newview/base-vue";
-import { openBlock, createElementBlock, normalizeStyle, defineComponent, ref, resolveComponent, createVNode, reactive, watch, onMounted, onUnmounted, createBlock, withCtx, createElementVNode, Fragment, renderList, normalizeClass, withDirectives, createTextVNode, toDisplayString, renderSlot, createCommentVNode, createSlots, vShow, h, computed, nextTick, mergeProps, toHandlers, pushScopeId, popScopeId, withModifiers, createApp, getCurrentInstance } from "vue";
-import { VxeColumn, VxeColgroup, VxeGrid, VxeTable } from "vxe-table";
+import { openBlock, createElementBlock, normalizeStyle, defineComponent, ref, resolveComponent, createVNode, reactive, watch, onMounted, onUnmounted, createBlock, withCtx, createElementVNode, Fragment, renderList, normalizeClass, withDirectives, createTextVNode, toDisplayString, renderSlot, createCommentVNode, createSlots, vShow, h, toRaw, computed, nextTick, mergeProps, toHandlers, pushScopeId, popScopeId, withModifiers, createApp, getCurrentInstance } from "vue";
+import { VxeColumn, VxeColgroup, VXETable, VxeGrid, VxeTable } from "vxe-table";
 import { utilities } from "@newview/tools";
 import { Space, Icon, Drawer, Button } from "view-ui-plus";
 import dayjs from "dayjs";
@@ -17805,7 +17805,7 @@ const _export_sfc = (sfc, props) => {
   }
   return target;
 };
-const _sfc_main$i = {
+const _sfc_main$j = {
   name: "BAceEditor",
   props: {
     modelValue: String,
@@ -17944,13 +17944,13 @@ const _sfc_main$i = {
     }
   }
 };
-function _sfc_render$i(_ctx, _cache, $props, $setup, $data, $options) {
+function _sfc_render$j(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createElementBlock("div", {
     class: "bin-editor-next",
     style: normalizeStyle($options.wrapStyles)
   }, null, 4);
 }
-const BinEditor = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["render", _sfc_render$i]]);
+const BinEditor = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["render", _sfc_render$j]]);
 var ace$1 = { exports: {} };
 (function(module, exports) {
   (function() {
@@ -30033,7 +30033,7 @@ const propDefine$r = {
     default: {}
   }
 };
-const _sfc_main$h = defineComponent({
+const _sfc_main$i = defineComponent({
   name: "NvEditor",
   components: { BinEditor },
   emits: [""],
@@ -30080,10 +30080,10 @@ let EditorInstance$1 = class EditorInstance2 extends BaseInstance {
   //#endregion BinEditor 编辑器 END
 };
 const Editor_vue_vue_type_style_index_0_scoped_cf6872cf_lang = "";
-const _hoisted_1$c = { class: "monacoEditor" };
-function _sfc_render$h(_ctx, _cache, $props, $setup, $data, $options) {
+const _hoisted_1$d = { class: "monacoEditor" };
+function _sfc_render$i(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_BinEditor = resolveComponent("BinEditor");
-  return openBlock(), createElementBlock("div", _hoisted_1$c, [
+  return openBlock(), createElementBlock("div", _hoisted_1$d, [
     createVNode(_component_BinEditor, {
       modelValue: _ctx.editorValue,
       "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.editorValue = $event),
@@ -30099,7 +30099,7 @@ function _sfc_render$h(_ctx, _cache, $props, $setup, $data, $options) {
     }, null, 8, ["modelValue", "lang", "readonly", "font-size", "wrap", "snippets", "options", "styles"])
   ]);
 }
-const Editor = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["render", _sfc_render$h], ["__scopeId", "data-v-cf6872cf"]]);
+const Editor = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["render", _sfc_render$i], ["__scopeId", "data-v-cf6872cf"]]);
 const propDefine$q = {
   placeholder: {
     // 占位文本
@@ -30127,7 +30127,7 @@ const propDefine$q = {
     default: false
   }
 };
-const _sfc_main$g = defineComponent({
+const _sfc_main$h = defineComponent({
   name: "NvIconSelect",
   components: {},
   emits: ["update:modelValue", "change"],
@@ -31052,15 +31052,15 @@ class IconSelectInstance extends BaseInstance {
   //#endregion Icon 选择 END
 }
 const IconSelect_vue_vue_type_style_index_0_lang = "";
-const _hoisted_1$b = { class: "icon-select" };
-const _hoisted_2$9 = { class: "icon-select-search" };
-const _hoisted_3$7 = { class: "icon-select-list" };
+const _hoisted_1$c = { class: "icon-select" };
+const _hoisted_2$a = { class: "icon-select-search" };
+const _hoisted_3$8 = { class: "icon-select-list" };
 const _hoisted_4$6 = ["onClick", "title"];
-function _sfc_render$g(_ctx, _cache, $props, $setup, $data, $options) {
+function _sfc_render$h(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Icon = resolveComponent("Icon");
   const _component_Input = resolveComponent("Input");
   const _component_Poptip = resolveComponent("Poptip");
-  return openBlock(), createElementBlock("div", _hoisted_1$b, [
+  return openBlock(), createElementBlock("div", _hoisted_1$c, [
     _ctx.readonly ? (openBlock(), createBlock(_component_Icon, {
       key: 0,
       type: "iconValue"
@@ -31076,7 +31076,7 @@ function _sfc_render$g(_ctx, _cache, $props, $setup, $data, $options) {
         createElementVNode("div", {
           style: normalizeStyle({ width: _ctx.poptipWidth + "px" })
         }, [
-          createElementVNode("div", _hoisted_2$9, [
+          createElementVNode("div", _hoisted_2$a, [
             createVNode(_component_Input, {
               modelValue: _ctx.iconSearch,
               "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => _ctx.iconSearch = $event),
@@ -31085,7 +31085,7 @@ function _sfc_render$g(_ctx, _cache, $props, $setup, $data, $options) {
               onOnChange: _ctx.doSearchIcon
             }, null, 8, ["modelValue", "onOnChange"])
           ]),
-          createElementVNode("div", _hoisted_3$7, [
+          createElementVNode("div", _hoisted_3$8, [
             (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.icons, (item2) => {
               return openBlock(), createElementBlock("div", {
                 class: "icon-select-item",
@@ -31121,7 +31121,7 @@ function _sfc_render$g(_ctx, _cache, $props, $setup, $data, $options) {
     }, 8, ["modelValue"]))
   ]);
 }
-const NvIconSelect = /* @__PURE__ */ _export_sfc(_sfc_main$g, [["render", _sfc_render$g]]);
+const NvIconSelect = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["render", _sfc_render$h]]);
 const propDefine$p = {
   onlyView: {
     // 是否只读
@@ -31140,7 +31140,7 @@ const propDefine$p = {
     }
   }
 };
-const _sfc_main$f = defineComponent({
+const _sfc_main$g = defineComponent({
   name: "NvComForm",
   components: { NvIconSelect },
   emits: [""],
@@ -31278,10 +31278,10 @@ let ComFormInstance$1 = class ComFormInstance2 extends BaseInstance {
   }
   //#endregion 公开Api End
 };
-const ComForm_vue_vue_type_style_index_0_scoped_f1e7ddce_lang = "";
-const _hoisted_1$a = { class: "comForm" };
-const _hoisted_2$8 = { key: 1 };
-function _sfc_render$f(_ctx, _cache, $props, $setup, $data, $options) {
+const ComForm_vue_vue_type_style_index_0_scoped_eba0d593_lang = "";
+const _hoisted_1$b = { class: "comForm" };
+const _hoisted_2$9 = { key: 1 };
+function _sfc_render$g(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_com_form = resolveComponent("com-form", true);
   const _component_Card = resolveComponent("Card");
   const _component_Switch = resolveComponent("Switch");
@@ -31309,7 +31309,7 @@ function _sfc_render$f(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_FormItem = resolveComponent("FormItem");
   const _component_Col = resolveComponent("Col");
   const _component_Row = resolveComponent("Row");
-  return openBlock(), createElementBlock("div", _hoisted_1$a, [
+  return openBlock(), createElementBlock("div", _hoisted_1$b, [
     createElementVNode("div", {
       class: normalizeClass({ onlyViewForm: _ctx.onlyView })
     }, [
@@ -31369,7 +31369,7 @@ function _sfc_render$f(_ctx, _cache, $props, $setup, $data, $options) {
                       loading: _ctx.getPropValue(item2.switchProp, "loading"),
                       onOnChange: ($event) => _ctx.getPropEvent(item2.switchProp, "onChange")($event, item2)
                     }, null, 8, ["modelValue", "onUpdate:modelValue", "size", "disabled", "true-value", "false-value", "true-color", "false-color", "before-change", "loading", "onOnChange"])) : createCommentVNode("", true),
-                    item2.type == "Label" ? (openBlock(), createElementBlock("span", _hoisted_2$8, toDisplayString(_ctx.formModel[item2.model]), 1)) : createCommentVNode("", true),
+                    item2.type == "Label" ? (openBlock(), createElementBlock("span", _hoisted_2$9, toDisplayString(_ctx.formModel[item2.model]), 1)) : createCommentVNode("", true),
                     item2.type == "Button" ? (openBlock(), createBlock(_component_Button, {
                       key: 2,
                       type: _ctx.getPropValue(item2.buttonProp, "type"),
@@ -31527,13 +31527,14 @@ function _sfc_render$f(_ctx, _cache, $props, $setup, $data, $options) {
                       default: withCtx(() => [
                         (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.getPropValue(item2.radioProp, "datas"), (option) => {
                           return openBlock(), createBlock(_component_Radio, {
-                            label: option.value
+                            label: option.value,
+                            disabled: _ctx.getPropValue(item2.radioProp, "disabled") || _ctx.onlyView
                           }, {
                             default: withCtx(() => [
                               createTextVNode(toDisplayString(option.text), 1)
                             ]),
                             _: 2
-                          }, 1032, ["label"]);
+                          }, 1032, ["label", "disabled"]);
                         }), 256))
                       ]),
                       _: 2
@@ -31659,7 +31660,10 @@ function _sfc_render$f(_ctx, _cache, $props, $setup, $data, $options) {
                       "events-enabled": _ctx.getPropValue(item2.datePickerProp, "events-enabled"),
                       shortcuts: _ctx.getPropValue(item2.datePickerProp, "shortcuts"),
                       disabledDate: _ctx.getPropValue(item2.datePickerProp, "disabledDate"),
-                      onOnChange: ($event) => _ctx.getPropEvent(item2.datePickerProp, "onChange")($event, item2),
+                      onOnChange: ($event) => {
+                        _ctx.formModel[item2.model] = $event;
+                        _ctx.getPropEvent(item2.datePickerProp, "onChange")($event, item2);
+                      },
                       onOnOpenChange: ($event) => _ctx.getPropEvent(item2.datePickerProp, "onOpenChange")($event, item2),
                       onOnOk: ($event) => _ctx.getPropEvent(item2.datePickerProp, "onOk")($event, item2),
                       onOnClear: ($event) => _ctx.getPropEvent(item2.datePickerProp, "onClear")($event, item2),
@@ -31798,7 +31802,7 @@ function _sfc_render$f(_ctx, _cache, $props, $setup, $data, $options) {
     ], 2)
   ]);
 }
-const ComForm = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["render", _sfc_render$f], ["__scopeId", "data-v-f1e7ddce"]]);
+const ComForm = /* @__PURE__ */ _export_sfc(_sfc_main$g, [["render", _sfc_render$g], ["__scopeId", "data-v-eba0d593"]]);
 const style = "";
 const propDefine$o = {
   options: {
@@ -31817,7 +31821,7 @@ const propDefine$o = {
     default: () => 80
   }
 };
-const _sfc_main$e = defineComponent({
+const _sfc_main$f = defineComponent({
   name: "NvSearchCom",
   components: {},
   emits: ["search"],
@@ -31937,7 +31941,7 @@ let SearchComInstance$1 = class SearchComInstance2 extends BaseInstance {
   //#endregion AutoComplete END
 };
 const SearchCom_vue_vue_type_style_index_0_scoped_cda08489_lang = "";
-function _sfc_render$e(_ctx, _cache, $props, $setup, $data, $options) {
+function _sfc_render$f(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Input = resolveComponent("Input");
   const _component_Radio = resolveComponent("Radio");
   const _component_RadioGroup = resolveComponent("RadioGroup");
@@ -32124,7 +32128,7 @@ function _sfc_render$e(_ctx, _cache, $props, $setup, $data, $options) {
     _: 1
   }, 8, ["model", "label-width"]);
 }
-const SearchCom = /* @__PURE__ */ _export_sfc(_sfc_main$e, [["render", _sfc_render$e], ["__scopeId", "data-v-cda08489"]]);
+const SearchCom = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["render", _sfc_render$f], ["__scopeId", "data-v-cda08489"]]);
 const propDefine$n = {
   options: {
     // 配置项
@@ -32147,7 +32151,7 @@ const propDefine$n = {
     default: 3
   }
 };
-const _sfc_main$d = defineComponent({
+const _sfc_main$e = defineComponent({
   name: "NvToolbar",
   components: {},
   emits: [""],
@@ -32282,10 +32286,10 @@ let ToolbarInstance$1 = class ToolbarInstance2 extends BaseInstance {
   //#endregion 业务逻辑 END
 };
 const Toolbar_vue_vue_type_style_index_0_scoped_69337cbe_lang = "";
-const _hoisted_1$9 = { class: "toolbar" };
-const _hoisted_2$7 = { style: { "display": "none" } };
-const _hoisted_3$6 = { key: 0 };
-function _sfc_render$d(_ctx, _cache, $props, $setup, $data, $options) {
+const _hoisted_1$a = { class: "toolbar" };
+const _hoisted_2$8 = { style: { "display": "none" } };
+const _hoisted_3$7 = { key: 0 };
+function _sfc_render$e(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Button = resolveComponent("Button");
   const _component_ButtonGroup = resolveComponent("ButtonGroup");
   const _component_Divider = resolveComponent("Divider");
@@ -32294,10 +32298,10 @@ function _sfc_render$d(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_DropdownMenu = resolveComponent("DropdownMenu");
   const _component_Dropdown = resolveComponent("Dropdown");
   const _component_Space = resolveComponent("Space");
-  return openBlock(), createElementBlock("div", _hoisted_1$9, [
+  return openBlock(), createElementBlock("div", _hoisted_1$a, [
     (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.mainOptions, (item2, index2) => {
-      return openBlock(), createElementBlock("div", _hoisted_2$7, [
-        _ctx.getIsShow(item2) ? (openBlock(), createElementBlock("span", _hoisted_3$6)) : createCommentVNode("", true)
+      return openBlock(), createElementBlock("div", _hoisted_2$8, [
+        _ctx.getIsShow(item2) ? (openBlock(), createElementBlock("span", _hoisted_3$7)) : createCommentVNode("", true)
       ]);
     }), 256)),
     _ctx.isButtonGroup ? (openBlock(), createBlock(_component_ButtonGroup, { key: 0 }, {
@@ -32405,7 +32409,7 @@ function _sfc_render$d(_ctx, _cache, $props, $setup, $data, $options) {
     }))
   ]);
 }
-const Toolbar = /* @__PURE__ */ _export_sfc(_sfc_main$d, [["render", _sfc_render$d], ["__scopeId", "data-v-69337cbe"]]);
+const Toolbar = /* @__PURE__ */ _export_sfc(_sfc_main$e, [["render", _sfc_render$e], ["__scopeId", "data-v-69337cbe"]]);
 const GridCellContent = defineComponent({
   name: "GridCellContent",
   props: {
@@ -32453,7 +32457,7 @@ const propDefine$m = {
     }
   }
 };
-const _sfc_main$c = defineComponent({
+const _sfc_main$d = defineComponent({
   name: "GridColumn",
   components: { VxeColumn, VxeColgroup, GridCellContent, GridTitleContent },
   emits: ["clearRadioRow", "change", "delete", "addchild"],
@@ -32691,6 +32695,69 @@ class GridColumnInstance extends BaseInstance {
         btn.onclick(row, btn);
       }
     });
+    //#endregion 事件 END
+    //#region 表头筛选
+    __publicField2(this, "getColumFilters", (filter3) => {
+      if (filter3) {
+        if (filter3.type == "select") {
+          return filter3.options;
+        } else if (filter3.type == "daterange") {
+          return [{ data: ["", ""] }];
+        } else {
+          return [{ data: "" }];
+        }
+      } else {
+        return void 0;
+      }
+    });
+    __publicField2(this, "getColumFilterMultiple", (filter3) => {
+      if (filter3) {
+        if (filter3.type == "select") {
+          return filter3.multiple;
+        } else {
+          return void 0;
+        }
+      } else {
+        return void 0;
+      }
+    });
+    __publicField2(this, "getColumFilterRender", (filter3) => {
+      let FilterRender;
+      if (filter3) {
+        switch (filter3.type) {
+          case "select":
+            FilterRender = void 0;
+            break;
+          case "input":
+            FilterRender = { name: "$input" };
+            break;
+          case "date":
+            FilterRender = { name: "$input", props: { type: "date" } };
+            break;
+          case "month":
+            FilterRender = { name: "$input", props: { type: "month", valueFormat: "yyyy-MM" } };
+            break;
+          case "year":
+            FilterRender = { name: "$input", props: { type: "year", valueFormat: "yyyy" } };
+            break;
+          case "time":
+            FilterRender = { name: "$input", props: { type: "time" } };
+            break;
+          case "datetime":
+            FilterRender = { name: "$input", props: { type: "datetime" } };
+            break;
+          case "daterange":
+            FilterRender = { name: "filterDaterange" };
+            break;
+          default:
+            FilterRender = { name: "$input" };
+            break;
+        }
+      } else {
+        FilterRender = void 0;
+      }
+      return FilterRender;
+    });
     this.props = props;
     this.ctx = ctx;
     this.parseColumn();
@@ -32812,12 +32879,12 @@ class GridColumnInstance extends BaseInstance {
       }
     }
   }
-  //#endregion 事件 END
+  //#endregion
 }
 const GridColumn_vue_vue_type_style_index_0_lang = "";
-const GridColumn_vue_vue_type_style_index_1_scoped_edaf2a4d_lang = "";
-const _hoisted_1$8 = { class: "gridColumn" };
-function _sfc_render$c(_ctx, _cache, $props, $setup, $data, $options) {
+const GridColumn_vue_vue_type_style_index_1_scoped_067f3d07_lang = "";
+const _hoisted_1$9 = { class: "gridColumn" };
+function _sfc_render$d(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_GridTitleContent = resolveComponent("GridTitleContent");
   const _component_grid_column = resolveComponent("grid-column", true);
   const _component_vxe_colgroup = resolveComponent("vxe-colgroup");
@@ -32835,7 +32902,7 @@ function _sfc_render$c(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Checkbox = resolveComponent("Checkbox");
   const _component_Button = resolveComponent("Button");
   const _component_Space = resolveComponent("Space");
-  return openBlock(), createElementBlock("div", _hoisted_1$8, [
+  return openBlock(), createElementBlock("div", _hoisted_1$9, [
     (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.columns, (column) => {
       return openBlock(), createElementBlock(Fragment, null, [
         _ctx.getHasColgroup(column) && _ctx.getVisible(column) ? (openBlock(), createBlock(_component_vxe_colgroup, {
@@ -32939,7 +33006,10 @@ function _sfc_render$c(_ctx, _cache, $props, $setup, $data, $options) {
             "sort-by": column.sortBy,
             "sort-type": column.sortType,
             "edit-render": {},
-            "tree-node": column.treeNode
+            "tree-node": column.treeNode,
+            filters: _ctx.getColumFilters(column.filter),
+            "filter-multiple": _ctx.getColumFilterMultiple(column.filter),
+            "filter-render": _ctx.getColumFilterRender(column.filter)
           }, {
             edit: withCtx((scope) => [
               column.colType == "ed" ? (openBlock(), createBlock(_component_Input, {
@@ -33047,7 +33117,7 @@ function _sfc_render$c(_ctx, _cache, $props, $setup, $data, $options) {
               createVNode(_component_GridTitleContent, { column }, null, 8, ["column"])
             ]),
             _: 2
-          }, 1032, ["field", "min-width", "width", "resizable", "visible", "fixed", "align", "header-align", "footer-align", "show-overflow", "show-header-overflow", "show-footer-overflow", "class-name", "header-class-name", "footer-class-name", "formatter", "sortable", "sort-by", "sort-type", "tree-node"])) : _ctx.getHasRowButton(column) ? (openBlock(), createBlock(_component_vxe_column, {
+          }, 1032, ["field", "min-width", "width", "resizable", "visible", "fixed", "align", "header-align", "footer-align", "show-overflow", "show-header-overflow", "show-footer-overflow", "class-name", "header-class-name", "footer-class-name", "formatter", "sortable", "sort-by", "sort-type", "tree-node", "filters", "filter-multiple", "filter-render"])) : _ctx.getHasRowButton(column) ? (openBlock(), createBlock(_component_vxe_column, {
             key: 5,
             field: column.field,
             "min-width": column.minWidth,
@@ -33101,7 +33171,10 @@ function _sfc_render$c(_ctx, _cache, $props, $setup, $data, $options) {
             sortable: column.sortable,
             "sort-by": column.sortBy,
             "sort-type": column.sortType,
-            "tree-node": column.treeNode
+            "tree-node": column.treeNode,
+            filters: _ctx.getColumFilters(column.filter),
+            "filter-multiple": _ctx.getColumFilterMultiple(column.filter),
+            "filter-render": _ctx.getColumFilterRender(column.filter)
           }, {
             default: withCtx(({ row }) => [
               createVNode(_component_GridCellContent, {
@@ -33113,13 +33186,110 @@ function _sfc_render$c(_ctx, _cache, $props, $setup, $data, $options) {
               createVNode(_component_GridTitleContent, { column }, null, 8, ["column"])
             ]),
             _: 2
-          }, 1032, ["field", "min-width", "width", "resizable", "visible", "fixed", "align", "header-align", "footer-align", "show-overflow", "show-header-overflow", "show-footer-overflow", "class-name", "header-class-name", "footer-class-name", "formatter", "sortable", "sort-by", "sort-type", "tree-node"]))
+          }, 1032, ["field", "min-width", "width", "resizable", "visible", "fixed", "align", "header-align", "footer-align", "show-overflow", "show-header-overflow", "show-footer-overflow", "class-name", "header-class-name", "footer-class-name", "formatter", "sortable", "sort-by", "sort-type", "tree-node", "filters", "filter-multiple", "filter-render"]))
         ], 64)) : createCommentVNode("", true)
       ], 64);
     }), 256))
   ]);
 }
-const GridColumn = /* @__PURE__ */ _export_sfc(_sfc_main$c, [["render", _sfc_render$c], ["__scopeId", "data-v-edaf2a4d"]]);
+const GridColumn = /* @__PURE__ */ _export_sfc(_sfc_main$d, [["render", _sfc_render$d], ["__scopeId", "data-v-067f3d07"]]);
+const _sfc_main$c = defineComponent({
+  name: "FilterDaterange",
+  props: {
+    params: Object
+  },
+  setup(props) {
+    const filterDateRangeVal = reactive({
+      option: null
+    });
+    const warningMsg = reactive({
+      isShow: false
+    });
+    const load = () => {
+      const { params } = props;
+      if (params) {
+        const { column } = params;
+        const option = column.filters[0];
+        filterDateRangeVal.option = option;
+      }
+    };
+    const changeOptionEvent = () => {
+      warningMsg.isShow = false;
+      const { params } = props;
+      const { option } = filterDateRangeVal;
+      if (params && option) {
+        const { $panel } = params;
+        const checked = option.data[0] && option.data[1];
+        if (checked && new Date(option.data[0]).getTime() > new Date(option.data[1]).getTime()) {
+          warningMsg.isShow = true;
+          return;
+        }
+        $panel.changeOption(null, checked, toRaw(option));
+      }
+    };
+    load();
+    return {
+      filterDateRangeVal,
+      changeOptionEvent,
+      warningMsg
+    };
+  }
+});
+const _hoisted_1$8 = { class: "nv-flex" };
+const _hoisted_2$7 = /* @__PURE__ */ createElementVNode("span", null, "~", -1);
+const _hoisted_3$6 = {
+  key: 0,
+  style: { "font-size": "12px", "color": "#f00", "text-align": "center" }
+};
+function _sfc_render$c(_ctx, _cache, $props, $setup, $data, $options) {
+  const _component_vxe_input = resolveComponent("vxe-input");
+  return openBlock(), createElementBlock("div", null, [
+    createElementVNode("div", _hoisted_1$8, [
+      _ctx.filterDateRangeVal.option.data && _ctx.filterDateRangeVal.option.data.length > 0 ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
+        createVNode(_component_vxe_input, {
+          modelValue: _ctx.filterDateRangeVal.option.data[0],
+          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.filterDateRangeVal.option.data[0] = $event),
+          placeholder: "开始日期",
+          type: "date",
+          style: { "width": "120px" },
+          onChange: _ctx.changeOptionEvent
+        }, null, 8, ["modelValue", "onChange"]),
+        _hoisted_2$7,
+        createVNode(_component_vxe_input, {
+          modelValue: _ctx.filterDateRangeVal.option.data[1],
+          "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => _ctx.filterDateRangeVal.option.data[1] = $event),
+          placeholder: "结束日期",
+          type: "date",
+          style: { "width": "120px" },
+          onChange: _ctx.changeOptionEvent
+        }, null, 8, ["modelValue", "onChange"])
+      ], 64)) : createCommentVNode("", true)
+    ]),
+    _ctx.warningMsg.isShow ? (openBlock(), createElementBlock("div", _hoisted_3$6, "起始时间不能大于结束时间")) : createCommentVNode("", true)
+  ]);
+}
+const FilterDaterange = /* @__PURE__ */ _export_sfc(_sfc_main$c, [["render", _sfc_render$c]]);
+const CreatGridRenderer = () => {
+  if (!VXETable.renderer.get("filterDaterange")) {
+    VXETable.renderer.add("filterDaterange", {
+      // 筛选模板
+      renderFilter(renderOpts, params) {
+        return h(FilterDaterange, { params });
+      },
+      // 重置数据方法
+      filterResetMethod(params) {
+        const { options: options2 } = params;
+        options2.forEach((option) => {
+          option.data = ["", ""];
+        });
+      },
+      // 重置筛选复原方法（当未点击确认时，该选项将被恢复为默认值）
+      filterRecoverMethod({ option }) {
+        option.data = ["", ""];
+      }
+    });
+  }
+};
 const propDefine$l = {
   option: {
     // Gird 配置项
@@ -33146,6 +33316,10 @@ const propDefine$l = {
         },
         treeConfig: {
           lazy: false
+        },
+        filterConfig: {
+          remote: true
+          //默认使用服务端筛选
         }
       }
     })
@@ -33242,6 +33416,16 @@ let GridInstance$1 = class GridInstance2 extends BaseInstance {
         this.props.option.event.event_search(searchData);
       }
     });
+    /**
+     * 合并行或列
+     * @param param0 
+     * @returns 
+     */
+    __publicField2(this, "rowspanMethod", ({ row, _rowIndex, column, visibleData }) => {
+      if (this.props.option.event && this.props.option.event.event_rowspanMethod) {
+        return this.props.option.event.event_rowspanMethod({ row, _rowIndex, column, visibleData });
+      }
+    });
     //#endregion 查询面板 End
     /**
      * 清除当前选中行
@@ -33463,8 +33647,12 @@ let GridInstance$1 = class GridInstance2 extends BaseInstance {
         }
       },
       filterChange: (params) => {
-        if (!this.utilities.isNull(this.props.option.event) && !this.utilities.isNull(this.props.option.event.filterChange)) {
-          this.props.option.event.filterChange(params);
+        if (!this.utilities.isNull(this.props.option.event) && !this.utilities.isNull(this.props.option.event.event_filterChange)) {
+          let filterData = {};
+          params.filterList.map((e) => {
+            filterData[e.field] = e.values && e.values[0] ? e.values.length == 1 ? e.values[0] : e.values : toRaw(e.datas[0]);
+          });
+          this.props.option.event.event_filterChange(filterData, params);
         }
       },
       resizableChange: (params) => {
@@ -33588,6 +33776,15 @@ let GridInstance$1 = class GridInstance2 extends BaseInstance {
     __publicField2(this, "getMenuConfig", () => {
       return this.utilities.isNull(this.props.option.setting) ? {} : this.props.option.setting.menuConfig;
     });
+    /**
+     * 获取表头筛选配置
+     */
+    __publicField2(this, "getFilterConfig", () => {
+      let defaultFilterConfig = { remote: true };
+      let propFilterConfig = this.props.option.setting ? this.props.option.setting.filterConfig : {};
+      propFilterConfig = propFilterConfig ? propFilterConfig : {};
+      return this.utilities.isNull(this.props.option.setting) ? defaultFilterConfig : Object.assign(defaultFilterConfig, propFilterConfig);
+    });
     /**
      * 校验规则配置项
      * @returns 
@@ -34159,6 +34356,7 @@ let GridInstance$1 = class GridInstance2 extends BaseInstance {
     });
     this.props = props;
     this.ctx = ctx;
+    CreatGridRenderer();
     this.useSearchPanel();
     this.useToolbar();
   }
@@ -34278,8 +34476,8 @@ let GridInstance$1 = class GridInstance2 extends BaseInstance {
   }
   //#endregion 公开方法 END
 };
-const Grid_vue_vue_type_style_index_0_scoped_636503f8_lang = "";
-const _withScopeId$1 = (n) => (pushScopeId("data-v-636503f8"), n = n(), popScopeId(), n);
+const Grid_vue_vue_type_style_index_0_scoped_18038d66_lang = "";
+const _withScopeId$1 = (n) => (pushScopeId("data-v-18038d66"), n = n(), popScopeId(), n);
 const _hoisted_1$7 = { class: "nv-crud" };
 const _hoisted_2$6 = { class: "nv-crud-body" };
 const _hoisted_3$5 = { class: "nv-crud-body-search" };
@@ -34295,7 +34493,7 @@ const _hoisted_6$1 = {
   class: "nv-crud-body-table",
   ref: "crudTable"
 };
-const _hoisted_7$1 = /* @__PURE__ */ _withScopeId$1(() => /* @__PURE__ */ createElementVNode("span", { class: "grid-msg" }, "加载中...", -1));
+const _hoisted_7$1 = /* @__PURE__ */ _withScopeId$1(() => /* @__PURE__ */ createElementVNode("span", { class: "grid-msg" }, "加载中去...", -1));
 const _hoisted_8$1 = {
   key: 0,
   class: "nv-crud-footer"
@@ -34414,6 +34612,8 @@ function _sfc_render$b(_ctx, _cache, $props, $setup, $data, $options) {
           "tree-config": _ctx.getTreeConfig(),
           "edit-rules": _ctx.getEditRules(),
           "menu-config": _ctx.getMenuConfig(),
+          "filter-config": _ctx.getFilterConfig(),
+          "span-method": _ctx.rowspanMethod,
           onKeydownStart: _ctx.gridEvents.keydownStart,
           onKeydown: _ctx.gridEvents.keydown,
           onKeydownEnd: _ctx.gridEvents.keydownEnd,
@@ -34461,7 +34661,7 @@ function _sfc_render$b(_ctx, _cache, $props, $setup, $data, $options) {
             }, null, 8, ["columns", "xTable", "onClearRadioRow", "onDelete", "onAddchild"])
           ]),
           _: 1
-        }, 16, ["data", "border", "show-header", "row-class-name", "cell-class-name", "row-config", "edit-config", "tree-config", "edit-rules", "menu-config", "onKeydownStart", "onKeydown", "onKeydownEnd", "onPaste", "onCopy", "onCut", "onCurrentChange", "onRadioChange", "onCheckboxChange", "onCheckboxAll", "onCheckboxRangeStart", "onCheckboxRangeChange", "onCheckboxRangeEnd", "onCellClick", "onCellDblclick", "onCellMenu", "onCellMouseenter", "onCellMouseleave", "onHeaderCellClick", "onHeaderCellDblclick", "onHeaderCellMenu", "onFooterCellClick", "onFooterCellDblclick", "onFooterCellMenu", "onSortChange", "onFilterChange", "onResizableChange", "onToggleRowExpand", "onToggleTreeExpand", "onMenuClick", "onEditClosed", "onEditActived", "onEditDisabled", "onValidError", "onScroll", "onCustom"]), [
+        }, 16, ["data", "border", "show-header", "row-class-name", "cell-class-name", "row-config", "edit-config", "tree-config", "edit-rules", "menu-config", "filter-config", "span-method", "onKeydownStart", "onKeydown", "onKeydownEnd", "onPaste", "onCopy", "onCut", "onCurrentChange", "onRadioChange", "onCheckboxChange", "onCheckboxAll", "onCheckboxRangeStart", "onCheckboxRangeChange", "onCheckboxRangeEnd", "onCellClick", "onCellDblclick", "onCellMenu", "onCellMouseenter", "onCellMouseleave", "onHeaderCellClick", "onHeaderCellDblclick", "onHeaderCellMenu", "onFooterCellClick", "onFooterCellDblclick", "onFooterCellMenu", "onSortChange", "onFilterChange", "onResizableChange", "onToggleRowExpand", "onToggleTreeExpand", "onMenuClick", "onEditClosed", "onEditActived", "onEditDisabled", "onValidError", "onScroll", "onCustom"]), [
           [vShow, _ctx.showTable]
         ])
       ], 512)
@@ -34479,7 +34679,7 @@ function _sfc_render$b(_ctx, _cache, $props, $setup, $data, $options) {
     ])) : createCommentVNode("", true)
   ]);
 }
-const Grid = /* @__PURE__ */ _export_sfc(_sfc_main$b, [["render", _sfc_render$b], ["__scopeId", "data-v-636503f8"]]);
+const Grid = /* @__PURE__ */ _export_sfc(_sfc_main$b, [["render", _sfc_render$b], ["__scopeId", "data-v-18038d66"]]);
 const propDefine$k = {
   width: {
     // Box 宽度
@@ -211560,6 +211760,10 @@ const propDefine$7 = {
         },
         treeConfig: {
           lazy: false
+        },
+        filterConfig: {
+          remote: true
+          //默认使用服务端筛选
         }
       }
     })
@@ -211656,6 +211860,16 @@ class GridInstance extends BaseInstance {
         this.props.option.event.event_search(searchData);
       }
     });
+    /**
+     * 合并行或列
+     * @param param0 
+     * @returns 
+     */
+    __publicField2(this, "rowspanMethod", ({ row, _rowIndex, column, visibleData }) => {
+      if (this.props.option.event && this.props.option.event.event_rowspanMethod) {
+        return this.props.option.event.event_rowspanMethod({ row, _rowIndex, column, visibleData });
+      }
+    });
     //#endregion 查询面板 End
     /**
      * 清除当前选中行
@@ -211877,8 +212091,12 @@ class GridInstance extends BaseInstance {
         }
       },
       filterChange: (params) => {
-        if (!this.utilities.isNull(this.props.option.event) && !this.utilities.isNull(this.props.option.event.filterChange)) {
-          this.props.option.event.filterChange(params);
+        if (!this.utilities.isNull(this.props.option.event) && !this.utilities.isNull(this.props.option.event.event_filterChange)) {
+          let filterData = {};
+          params.filterList.map((e) => {
+            filterData[e.field] = e.values && e.values[0] ? e.values.length == 1 ? e.values[0] : e.values : toRaw(e.datas[0]);
+          });
+          this.props.option.event.event_filterChange(filterData, params);
         }
       },
       resizableChange: (params) => {
@@ -212002,6 +212220,15 @@ class GridInstance extends BaseInstance {
     __publicField2(this, "getMenuConfig", () => {
       return this.utilities.isNull(this.props.option.setting) ? {} : this.props.option.setting.menuConfig;
     });
+    /**
+     * 获取表头筛选配置
+     */
+    __publicField2(this, "getFilterConfig", () => {
+      let defaultFilterConfig = { remote: true };
+      let propFilterConfig = this.props.option.setting ? this.props.option.setting.filterConfig : {};
+      propFilterConfig = propFilterConfig ? propFilterConfig : {};
+      return this.utilities.isNull(this.props.option.setting) ? defaultFilterConfig : Object.assign(defaultFilterConfig, propFilterConfig);
+    });
     /**
      * 校验规则配置项
      * @returns 
@@ -212573,6 +212800,7 @@ class GridInstance extends BaseInstance {
     });
     this.props = props;
     this.ctx = ctx;
+    CreatGridRenderer();
     this.useSearchPanel();
     this.useToolbar();
   }