@juzhenfe/page-model 3.13.1 → 3.13.3

package/dist/index.es.js

@@ -2316,12 +2316,12 @@ const _hoisted_1$x = {
   viewBox: "0 0 1024 1024",
   xmlns: "http://www.w3.org/2000/svg"
 };
-const _hoisted_2$r = /* @__PURE__ */ createElementVNode("path", {
+const _hoisted_2$q = /* @__PURE__ */ createElementVNode("path", {
   fill: "currentColor",
   d: "M104.704 338.752a64 64 0 0190.496 0l316.8 316.8 316.8-316.8a64 64 0 0190.496 90.496L557.248 791.296a64 64 0 01-90.496 0L104.704 429.248a64 64 0 010-90.496z"
 }, null, -1);
 const _hoisted_3$o = [
-  _hoisted_2$r
+  _hoisted_2$q
 ];
 function _sfc_render$j(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createElementBlock("svg", _hoisted_1$x, _hoisted_3$o);
@@ -2337,12 +2337,12 @@ const _hoisted_1$w = {
   viewBox: "0 0 1024 1024",
   xmlns: "http://www.w3.org/2000/svg"
 };
-const _hoisted_2$q = /* @__PURE__ */ createElementVNode("path", {
+const _hoisted_2$p = /* @__PURE__ */ createElementVNode("path", {
   fill: "currentColor",
   d: "M831.872 340.864L512 652.672 192.128 340.864a30.592 30.592 0 00-42.752 0 29.12 29.12 0 000 41.6L489.664 714.24a32 32 0 0044.672 0l340.288-331.712a29.12 29.12 0 000-41.728 30.592 30.592 0 00-42.752 0z"
 }, null, -1);
 const _hoisted_3$n = [
-  _hoisted_2$q
+  _hoisted_2$p
 ];
 function _sfc_render$i(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createElementBlock("svg", _hoisted_1$w, _hoisted_3$n);
@@ -2358,12 +2358,12 @@ const _hoisted_1$v = {
   viewBox: "0 0 1024 1024",
   xmlns: "http://www.w3.org/2000/svg"
 };
-const _hoisted_2$p = /* @__PURE__ */ createElementVNode("path", {
+const _hoisted_2$o = /* @__PURE__ */ createElementVNode("path", {
   fill: "currentColor",
   d: "M192 384l320 384 320-384z"
 }, null, -1);
 const _hoisted_3$m = [
-  _hoisted_2$p
+  _hoisted_2$o
 ];
 function _sfc_render$h(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createElementBlock("svg", _hoisted_1$v, _hoisted_3$m);
@@ -2379,12 +2379,12 @@ const _hoisted_1$u = {
   viewBox: "0 0 1024 1024",
   xmlns: "http://www.w3.org/2000/svg"
 };
-const _hoisted_2$o = /* @__PURE__ */ createElementVNode("path", {
+const _hoisted_2$n = /* @__PURE__ */ createElementVNode("path", {
   fill: "currentColor",
   d: "M384 192v640l384-320.064z"
 }, null, -1);
 const _hoisted_3$l = [
-  _hoisted_2$o
+  _hoisted_2$n
 ];
 function _sfc_render$g(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createElementBlock("svg", _hoisted_1$u, _hoisted_3$l);
@@ -2400,12 +2400,12 @@ const _hoisted_1$t = {
   viewBox: "0 0 1024 1024",
   xmlns: "http://www.w3.org/2000/svg"
 };
-const _hoisted_2$n = /* @__PURE__ */ createElementVNode("path", {
+const _hoisted_2$m = /* @__PURE__ */ createElementVNode("path", {
   fill: "currentColor",
   d: "M512 320L192 704h639.936z"
 }, null, -1);
 const _hoisted_3$k = [
-  _hoisted_2$n
+  _hoisted_2$m
 ];
 function _sfc_render$f(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createElementBlock("svg", _hoisted_1$t, _hoisted_3$k);
@@ -2421,12 +2421,12 @@ const _hoisted_1$s = {
   viewBox: "0 0 1024 1024",
   xmlns: "http://www.w3.org/2000/svg"
 };
-const _hoisted_2$m = /* @__PURE__ */ createElementVNode("path", {
+const _hoisted_2$l = /* @__PURE__ */ createElementVNode("path", {
   fill: "currentColor",
   d: "M512 64a448 448 0 110 896 448 448 0 010-896zm-38.4 409.6H326.4a38.4 38.4 0 100 76.8h147.2v147.2a38.4 38.4 0 0076.8 0V550.4h147.2a38.4 38.4 0 000-76.8H550.4V326.4a38.4 38.4 0 10-76.8 0v147.2z"
 }, null, -1);
 const _hoisted_3$j = [
-  _hoisted_2$m
+  _hoisted_2$l
 ];
 function _sfc_render$e(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createElementBlock("svg", _hoisted_1$s, _hoisted_3$j);
@@ -2442,7 +2442,7 @@ const _hoisted_1$r = {
   viewBox: "0 0 1024 1024",
   xmlns: "http://www.w3.org/2000/svg"
 };
-const _hoisted_2$l = /* @__PURE__ */ createElementVNode("path", {
+const _hoisted_2$k = /* @__PURE__ */ createElementVNode("path", {
   fill: "currentColor",
   d: "M352 480h320a32 32 0 110 64H352a32 32 0 010-64z"
 }, null, -1);
@@ -2455,7 +2455,7 @@ const _hoisted_4$7 = /* @__PURE__ */ createElementVNode("path", {
   d: "M512 896a384 384 0 100-768 384 384 0 000 768zm0 64a448 448 0 110-896 448 448 0 010 896z"
 }, null, -1);
 const _hoisted_5$4 = [
-  _hoisted_2$l,
+  _hoisted_2$k,
   _hoisted_3$i,
   _hoisted_4$7
 ];
@@ -2473,12 +2473,12 @@ const _hoisted_1$q = {
   viewBox: "0 0 1024 1024",
   xmlns: "http://www.w3.org/2000/svg"
 };
-const _hoisted_2$k = /* @__PURE__ */ createElementVNode("path", {
+const _hoisted_2$j = /* @__PURE__ */ createElementVNode("path", {
   fill: "currentColor",
   d: "M160 832h704a32 32 0 110 64H160a32 32 0 110-64zm384-253.696l236.288-236.352 45.248 45.248L508.8 704 192 387.2l45.248-45.248L480 584.704V128h64v450.304z"
 }, null, -1);
 const _hoisted_3$h = [
-  _hoisted_2$k
+  _hoisted_2$j
 ];
 function _sfc_render$c(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createElementBlock("svg", _hoisted_1$q, _hoisted_3$h);
@@ -2494,7 +2494,7 @@ const _hoisted_1$p = {
   viewBox: "0 0 1024 1024",
   xmlns: "http://www.w3.org/2000/svg"
 };
-const _hoisted_2$j = /* @__PURE__ */ createElementVNode("path", {
+const _hoisted_2$i = /* @__PURE__ */ createElementVNode("path", {
   fill: "currentColor",
   d: "M832 512a32 32 0 1164 0v352a32 32 0 01-32 32H160a32 32 0 01-32-32V160a32 32 0 0132-32h352a32 32 0 010 64H192v640h640V512z"
 }, null, -1);
@@ -2503,7 +2503,7 @@ const _hoisted_3$g = /* @__PURE__ */ createElementVNode("path", {
   d: "M469.952 554.24l52.8-7.552L847.104 222.4a32 32 0 10-45.248-45.248L477.44 501.44l-7.552 52.8zm422.4-422.4a96 96 0 010 135.808l-331.84 331.84a32 32 0 01-18.112 9.088L436.8 623.68a32 32 0 01-36.224-36.224l15.104-105.6a32 32 0 019.024-18.112l331.904-331.84a96 96 0 01135.744 0z"
 }, null, -1);
 const _hoisted_4$6 = [
-  _hoisted_2$j,
+  _hoisted_2$i,
   _hoisted_3$g
 ];
 function _sfc_render$b(_ctx, _cache, $props, $setup, $data, $options) {
@@ -2520,12 +2520,12 @@ const _hoisted_1$o = {
   viewBox: "0 0 1024 1024",
   xmlns: "http://www.w3.org/2000/svg"
 };
-const _hoisted_2$i = /* @__PURE__ */ createElementVNode("path", {
+const _hoisted_2$h = /* @__PURE__ */ createElementVNode("path", {
   fill: "currentColor",
   d: "M384 523.392V928a32 32 0 0046.336 28.608l192-96A32 32 0 00640 832V523.392l280.768-343.104a32 32 0 10-49.536-40.576l-288 352A32 32 0 00576 512v300.224l-128 64V512a32 32 0 00-7.232-20.288L195.52 192H704a32 32 0 100-64H128a32 32 0 00-24.768 52.288L384 523.392z"
 }, null, -1);
 const _hoisted_3$f = [
-  _hoisted_2$i
+  _hoisted_2$h
 ];
 function _sfc_render$a(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createElementBlock("svg", _hoisted_1$o, _hoisted_3$f);
@@ -2541,12 +2541,12 @@ const _hoisted_1$n = {
   viewBox: "0 0 1024 1024",
   xmlns: "http://www.w3.org/2000/svg"
 };
-const _hoisted_2$h = /* @__PURE__ */ createElementVNode("path", {
+const _hoisted_2$g = /* @__PURE__ */ createElementVNode("path", {
   fill: "currentColor",
   d: "M160 96.064l192 .192a32 32 0 010 64l-192-.192V352a32 32 0 01-64 0V96h64v.064zm0 831.872V928H96V672a32 32 0 1164 0v191.936l192-.192a32 32 0 110 64l-192 .192zM864 96.064V96h64v256a32 32 0 11-64 0V160.064l-192 .192a32 32 0 110-64l192-.192zm0 831.872l-192-.192a32 32 0 010-64l192 .192V672a32 32 0 1164 0v256h-64v-.064z"
 }, null, -1);
 const _hoisted_3$e = [
-  _hoisted_2$h
+  _hoisted_2$g
 ];
 function _sfc_render$9(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createElementBlock("svg", _hoisted_1$n, _hoisted_3$e);
@@ -2562,12 +2562,12 @@ const _hoisted_1$m = {
   viewBox: "0 0 1024 1024",
   xmlns: "http://www.w3.org/2000/svg"
 };
-const _hoisted_2$g = /* @__PURE__ */ createElementVNode("path", {
+const _hoisted_2$f = /* @__PURE__ */ createElementVNode("path", {
   fill: "currentColor",
   d: "M640 384v256H384V384h256zm64 0h192v256H704V384zm-64 512H384V704h256v192zm64 0V704h192v192H704zm-64-768v192H384V128h256zm64 0h192v192H704V128zM320 384v256H128V384h192zm0 512H128V704h192v192zm0-768v192H128V128h192z"
 }, null, -1);
 const _hoisted_3$d = [
-  _hoisted_2$g
+  _hoisted_2$f
 ];
 function _sfc_render$8(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createElementBlock("svg", _hoisted_1$m, _hoisted_3$d);
@@ -2583,12 +2583,12 @@ const _hoisted_1$l = {
   viewBox: "0 0 1024 1024",
   xmlns: "http://www.w3.org/2000/svg"
 };
-const _hoisted_2$f = /* @__PURE__ */ createElementVNode("path", {
+const _hoisted_2$e = /* @__PURE__ */ createElementVNode("path", {
   fill: "currentColor",
   d: "M512 64a32 32 0 0132 32v192a32 32 0 01-64 0V96a32 32 0 0132-32zm0 640a32 32 0 0132 32v192a32 32 0 11-64 0V736a32 32 0 0132-32zm448-192a32 32 0 01-32 32H736a32 32 0 110-64h192a32 32 0 0132 32zm-640 0a32 32 0 01-32 32H96a32 32 0 010-64h192a32 32 0 0132 32zM195.2 195.2a32 32 0 0145.248 0L376.32 331.008a32 32 0 01-45.248 45.248L195.2 240.448a32 32 0 010-45.248zm452.544 452.544a32 32 0 0145.248 0L828.8 783.552a32 32 0 01-45.248 45.248L647.744 692.992a32 32 0 010-45.248zM828.8 195.264a32 32 0 010 45.184L692.992 376.32a32 32 0 01-45.248-45.248l135.808-135.808a32 32 0 0145.248 0zm-452.544 452.48a32 32 0 010 45.248L240.448 828.8a32 32 0 01-45.248-45.248l135.808-135.808a32 32 0 0145.248 0z"
 }, null, -1);
 const _hoisted_3$c = [
-  _hoisted_2$f
+  _hoisted_2$e
 ];
 function _sfc_render$7(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createElementBlock("svg", _hoisted_1$l, _hoisted_3$c);
@@ -2604,12 +2604,12 @@ const _hoisted_1$k = {
   viewBox: "0 0 1024 1024",
   xmlns: "http://www.w3.org/2000/svg"
 };
-const _hoisted_2$e = /* @__PURE__ */ createElementVNode("path", {
+const _hoisted_2$d = /* @__PURE__ */ createElementVNode("path", {
   fill: "currentColor",
   d: "M160 448a32 32 0 01-32-32V160.064a32 32 0 0132-32h256a32 32 0 0132 32V416a32 32 0 01-32 32H160zm448 0a32 32 0 01-32-32V160.064a32 32 0 0132-32h255.936a32 32 0 0132 32V416a32 32 0 01-32 32H608zM160 896a32 32 0 01-32-32V608a32 32 0 0132-32h256a32 32 0 0132 32v256a32 32 0 01-32 32H160zm448 0a32 32 0 01-32-32V608a32 32 0 0132-32h255.936a32 32 0 0132 32v256a32 32 0 01-32 32H608z"
 }, null, -1);
 const _hoisted_3$b = [
-  _hoisted_2$e
+  _hoisted_2$d
 ];
 function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createElementBlock("svg", _hoisted_1$k, _hoisted_3$b);
@@ -2625,12 +2625,12 @@ const _hoisted_1$j = {
   viewBox: "0 0 1024 1024",
   xmlns: "http://www.w3.org/2000/svg"
 };
-const _hoisted_2$d = /* @__PURE__ */ createElementVNode("path", {
+const _hoisted_2$c = /* @__PURE__ */ createElementVNode("path", {
   fill: "currentColor",
   d: "M512 64a448 448 0 110 896 448 448 0 010-896zm23.744 191.488c-52.096 0-92.928 14.784-123.2 44.352-30.976 29.568-45.76 70.4-45.76 122.496h80.256c0-29.568 5.632-52.8 17.6-68.992 13.376-19.712 35.2-28.864 66.176-28.864 23.936 0 42.944 6.336 56.32 19.712 12.672 13.376 19.712 31.68 19.712 54.912 0 17.6-6.336 34.496-19.008 49.984l-8.448 9.856c-45.76 40.832-73.216 70.4-82.368 89.408-9.856 19.008-14.08 42.24-14.08 68.992v9.856h80.96v-9.856c0-16.896 3.52-31.68 10.56-45.76 6.336-12.672 15.488-24.64 28.16-35.2 33.792-29.568 54.208-48.576 60.544-55.616 16.896-22.528 26.048-51.392 26.048-86.592 0-42.944-14.08-76.736-42.24-101.376-28.16-25.344-65.472-37.312-111.232-37.312zm-12.672 406.208a54.272 54.272 0 00-38.72 14.784 49.408 49.408 0 00-15.488 38.016c0 15.488 4.928 28.16 15.488 38.016A54.848 54.848 0 00523.072 768c15.488 0 28.16-4.928 38.72-14.784a51.52 51.52 0 0016.192-38.72 51.968 51.968 0 00-15.488-38.016 55.936 55.936 0 00-39.424-14.784z"
 }, null, -1);
 const _hoisted_3$a = [
-  _hoisted_2$d
+  _hoisted_2$c
 ];
 function _sfc_render$5(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createElementBlock("svg", _hoisted_1$j, _hoisted_3$a);
@@ -2646,12 +2646,12 @@ const _hoisted_1$i = {
   viewBox: "0 0 1024 1024",
   xmlns: "http://www.w3.org/2000/svg"
 };
-const _hoisted_2$c = /* @__PURE__ */ createElementVNode("path", {
+const _hoisted_2$b = /* @__PURE__ */ createElementVNode("path", {
   fill: "currentColor",
   d: "M289.088 296.704h92.992a32 32 0 010 64H232.96a32 32 0 01-32-32V179.712a32 32 0 0164 0v50.56a384 384 0 01643.84 282.88 384 384 0 01-383.936 384 384 384 0 01-384-384h64a320 320 0 10640 0 320 320 0 00-555.712-216.448z"
 }, null, -1);
 const _hoisted_3$9 = [
-  _hoisted_2$c
+  _hoisted_2$b
 ];
 function _sfc_render$4(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createElementBlock("svg", _hoisted_1$i, _hoisted_3$9);
@@ -2667,12 +2667,12 @@ const _hoisted_1$h = {
   viewBox: "0 0 1024 1024",
   xmlns: "http://www.w3.org/2000/svg"
 };
-const _hoisted_2$b = /* @__PURE__ */ createElementVNode("path", {
+const _hoisted_2$a = /* @__PURE__ */ createElementVNode("path", {
   fill: "currentColor",
   d: "M512 64a448 448 0 110 896 448 448 0 010-896zM288 512a38.4 38.4 0 0038.4 38.4h371.2a38.4 38.4 0 000-76.8H326.4A38.4 38.4 0 00288 512z"
 }, null, -1);
 const _hoisted_3$8 = [
-  _hoisted_2$b
+  _hoisted_2$a
 ];
 function _sfc_render$3(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createElementBlock("svg", _hoisted_1$h, _hoisted_3$8);
@@ -2688,7 +2688,7 @@ const _hoisted_1$g = {
   viewBox: "0 0 1024 1024",
   xmlns: "http://www.w3.org/2000/svg"
 };
-const _hoisted_2$a = /* @__PURE__ */ createElementVNode("path", {
+const _hoisted_2$9 = /* @__PURE__ */ createElementVNode("path", {
   fill: "currentColor",
   d: "M352 480h320a32 32 0 110 64H352a32 32 0 010-64z"
 }, null, -1);
@@ -2697,7 +2697,7 @@ const _hoisted_3$7 = /* @__PURE__ */ createElementVNode("path", {
   d: "M512 896a384 384 0 100-768 384 384 0 000 768zm0 64a448 448 0 110-896 448 448 0 010 896z"
 }, null, -1);
 const _hoisted_4$5 = [
-  _hoisted_2$a,
+  _hoisted_2$9,
   _hoisted_3$7
 ];
 function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
@@ -2714,12 +2714,12 @@ const _hoisted_1$f = {
   viewBox: "0 0 1024 1024",
   xmlns: "http://www.w3.org/2000/svg"
 };
-const _hoisted_2$9 = /* @__PURE__ */ createElementVNode("path", {
+const _hoisted_2$8 = /* @__PURE__ */ createElementVNode("path", {
   fill: "currentColor",
   d: "M77.248 415.04a64 64 0 0190.496 0l226.304 226.304L846.528 188.8a64 64 0 1190.56 90.496l-543.04 543.04-316.8-316.8a64 64 0 010-90.496z"
 }, null, -1);
 const _hoisted_3$6 = [
-  _hoisted_2$9
+  _hoisted_2$8
 ];
 function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createElementBlock("svg", _hoisted_1$f, _hoisted_3$6);
@@ -2735,12 +2735,12 @@ const _hoisted_1$e = {
   viewBox: "0 0 1024 1024",
   xmlns: "http://www.w3.org/2000/svg"
 };
-const _hoisted_2$8 = /* @__PURE__ */ createElementVNode("path", {
+const _hoisted_2$7 = /* @__PURE__ */ createElementVNode("path", {
   fill: "currentColor",
   d: "M764.416 254.72a351.68 351.68 0 0186.336 149.184H960v192.064H850.752a351.68 351.68 0 01-86.336 149.312l54.72 94.72-166.272 96-54.592-94.72a352.64 352.64 0 01-172.48 0L371.136 936l-166.272-96 54.72-94.72a351.68 351.68 0 01-86.336-149.312H64v-192h109.248a351.68 351.68 0 0186.336-149.312L204.8 160l166.208-96h.192l54.656 94.592a352.64 352.64 0 01172.48 0L652.8 64h.128L819.2 160l-54.72 94.72zM704 499.968a192 192 0 10-384 0 192 192 0 00384 0z"
 }, null, -1);
 const _hoisted_3$5 = [
-  _hoisted_2$8
+  _hoisted_2$7
 ];
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createElementBlock("svg", _hoisted_1$e, _hoisted_3$5);
@@ -5278,7 +5278,19 @@ const compareOptions$1 = {
   ["string"]: [
     {
       label: "\u5305\u542B",
-      value: "match"
+      value: "contain"
+    },
+    {
+      label: "\u4E0D\u5305\u542B",
+      value: "notContain"
+    },
+    {
+      label: "\u5F00\u59CB\u4E8E",
+      value: "StartsWith"
+    },
+    {
+      label: "\u7ED3\u675F\u4E8E",
+      value: "EndsWith"
     },
     {
       label: "\u7B49\u4E8E",
@@ -5344,7 +5356,6 @@ const compareOptions$1 = {
 };
 var index_vue_vue_type_style_index_0_scoped_true_lang$6 = "";
 const _hoisted_1$c = { key: 1 };
-const _hoisted_2$7 = { key: 1 };
 const _sfc_main$u = defineComponent({
   __name: "index",
   props: {
@@ -5358,70 +5369,56 @@ const _sfc_main$u = defineComponent({
     const { BEMSpace, createBEMName } = createBEMSpace("f_z");
     const currentColumn = ref(null);
     const filterMultiple = ref(false);
+    const hasCompare = ref(false);
     const filterList = ref([]);
-    const filterFormData = ref(null);
+    const getAddFilterItem = () => {
+      const formData = {
+        prop: currentColumn.value.prop,
+        filterType: currentColumn.value.filterType,
+        filterLabel: currentColumn.value.filterLabel,
+        filterOptions: currentColumn.value.filterOptions,
+        condition: null,
+        value: null
+      };
+      if (formData.filterType === FilterItemTypeEnum$1.\u591A\u9009\u503C) {
+        formData.value = [];
+      }
+      return formData;
+    };
     const show = (column) => {
       var _a;
       currentColumn.value = {
+        filterMultiple: column.filterMultiple,
         prop: column.prop,
         filterType: column.filterType || FilterItemTypeEnum$1.\u6587\u5B57,
         filterLabel: column.filterLabel,
         filterOptions: column.filterOptions ? jsonClone(column.filterOptions) : []
       };
+      hasCompare.value = [
+        FilterItemTypeEnum$1["\u6587\u5B57"],
+        FilterItemTypeEnum$1["\u65E5\u671F"],
+        FilterItemTypeEnum$1["\u6570\u5B57"]
+      ].includes(currentColumn.value.filterType);
       const exsitList = tableManager.value.columnParamsList.filter(
         (a) => a.prop === currentColumn.value.prop
       );
       filterMultiple.value = (_a = currentColumn.value.filterMultiple) != null ? _a : false;
-      if (currentColumn.value.filterMultiple)
-        ;
-      else {
-        const formData = {
-          prop: currentColumn.value.prop,
-          filterType: currentColumn.value.filterType,
+      let list = jsonClone(exsitList).map((item) => {
+        return {
+          ...item,
           filterLabel: currentColumn.value.filterLabel,
-          filterOptions: currentColumn.value.filterOptions,
-          condition: null,
-          value: null
+          filterOptions: currentColumn.value.filterOptions
         };
-        if (exsitList.length) {
-          formData.condition = exsitList[0].condition;
-          formData.value = exsitList[0].value;
-          if (formData.filterType === FilterItemTypeEnum$1.\u591A\u9009\u503C) {
-            formData.value = formData.value ? formData.value : [];
-          }
-        } else {
-          if (formData.filterType === FilterItemTypeEnum$1.\u591A\u9009\u503C) {
-            formData.value = [];
-          }
-        }
-        filterFormData.value = formData;
+      });
+      if (!list.length) {
+        list.push(getAddFilterItem());
       }
+      filterList.value = list;
     };
     const handleRemoveFilterItem = (index2) => {
+      filterList.value.splice(index2, 1);
     };
-    const handleScreen = () => {
-      if (filterMultiple.value)
-        ;
-      else {
-        const exsitIndex = tableManager.value.columnParamsList.findIndex(
-          (a) => a.prop === currentColumn.value.prop
-        );
-        if (exsitIndex !== -1) {
-          tableManager.value.columnParamsList.splice(exsitIndex, 1);
-        }
-        const inserData = {
-          prop: currentColumn.value.prop,
-          filterType: filterFormData.value.filterType,
-          condition: filterFormData.value.condition,
-          value: filterFormData.value.value
-        };
-        if (inserData.value) {
-          tableManager.value.columnParamsList.push(inserData);
-        }
-        emit("screen");
-      }
-    };
-    const handleClear = () => {
+    const clearCurrentParams = () => {
       const list = tableManager.value.columnParamsList;
       for (let index2 = list.length - 1; index2 >= 0; index2--) {
         const item = list[index2];
@@ -5429,188 +5426,317 @@ const _sfc_main$u = defineComponent({
           list.splice(index2, 1);
         }
       }
+    };
+    const handleScreen = () => {
+      clearCurrentParams();
+      const list = filterList.value.filter((a) => {
+        var _a;
+        if (hasCompare.value) {
+          return a.condition && a.value != null;
+        } else {
+          if (currentColumn.value.filterType === FilterItemTypeEnum$1.\u591A\u9009\u503C) {
+            return (_a = a.value) == null ? void 0 : _a.length;
+          } else {
+            return a.value !== null;
+          }
+        }
+      });
+      tableManager.value.columnParamsList = tableManager.value.columnParamsList.concat(
+        list.map((item) => {
+          return {
+            prop: currentColumn.value.prop,
+            filterType: currentColumn.value.filterType,
+            condition: item.condition,
+            value: item.value
+          };
+        })
+      );
+      emit("screen");
+    };
+    const handleClear = () => {
+      clearCurrentParams();
       emit("screen");
     };
+    const handleAddFilterItem = () => {
+      filterList.value.push(getAddFilterItem());
+    };
     __expose({
       show
     });
     return (_ctx, _cache) => {
-      const _component_el_icon = resolveComponent("el-icon");
       const _component_el_option = resolveComponent("el-option");
       const _component_el_select = resolveComponent("el-select");
       const _component_el_input = resolveComponent("el-input");
-      const _component_el_date_picker = resolveComponent("el-date-picker");
+      const _component_el_icon = resolveComponent("el-icon");
       const _component_el_input_number = resolveComponent("el-input-number");
+      const _component_el_date_picker = resolveComponent("el-date-picker");
       const _component_el_checkbox = resolveComponent("el-checkbox");
       const _component_el_checkbox_group = resolveComponent("el-checkbox-group");
       const _component_el_button = resolveComponent("el-button");
       return openBlock(), createElementBlock("div", {
         class: normalizeClass(unref(BEMSpace))
       }, [
-        createElementVNode("div", {
-          class: normalizeClass(unref(createBEMName)("title"))
-        }, "\u7B5B\u9009", 2),
-        filterMultiple.value ? (openBlock(), createElementBlock("div", {
-          key: 0,
-          class: normalizeClass(unref(createBEMName)("list"))
-        }, [
-          (openBlock(true), createElementBlock(Fragment, null, renderList(filterList.value, (item, index2) => {
-            return openBlock(), createElementBlock("div", {
-              key: index2,
-              class: normalizeClass(unref(createBEMName)("item"))
-            }, [
-              createVNode(_component_el_icon, {
-                size: 18,
-                class: normalizeClass(unref(createBEMName)("remove-icon")),
-                title: "\u79FB\u9664\u8BE5\u9879",
-                onClick: ($event) => handleRemoveFilterItem()
-              }, {
-                default: withCtx(() => [
-                  createVNode(unref(remove))
-                ]),
-                _: 2
-              }, 1032, ["class", "onClick"])
-            ], 2);
-          }), 128))
-        ], 2)) : (openBlock(), createElementBlock("div", _hoisted_1$c, [
-          currentColumn.value ? (openBlock(), createElementBlock("div", {
-            key: 0,
-            class: normalizeClass(unref(createBEMName)("item"))
+        currentColumn.value ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
+          createElementVNode("div", {
+            class: normalizeClass(unref(createBEMName)("title"))
+          }, "\u7B5B\u9009", 2),
+          createElementVNode("div", {
+            class: normalizeClass(unref(createBEMName)("list"))
           }, [
-            [
-              unref(FilterItemTypeEnum$1)["\u6587\u5B57"],
-              unref(FilterItemTypeEnum$1)["\u65E5\u671F"],
-              unref(FilterItemTypeEnum$1)["\u6570\u5B57"]
-            ].includes(filterFormData.value.filterType) ? (openBlock(), createBlock(_component_el_select, {
+            currentColumn.value.filterType === unref(FilterItemTypeEnum$1).\u6587\u5B57 ? (openBlock(true), createElementBlock(Fragment, { key: 0 }, renderList(filterList.value, (item, index2) => {
+              return openBlock(), createElementBlock("div", {
+                class: normalizeClass(unref(createBEMName)("item")),
+                key: index2
+              }, [
+                createVNode(_component_el_select, {
+                  modelValue: item.condition,
+                  "onUpdate:modelValue": ($event) => item.condition = $event,
+                  class: normalizeClass(unref(createBEMName)("operate")),
+                  placeholder: "\u7B5B\u9009\u7C7B\u578B"
+                }, {
+                  default: withCtx(() => [
+                    (openBlock(true), createElementBlock(Fragment, null, renderList(unref(compareOptions$1)[currentColumn.value.filterType], (opt) => {
+                      return openBlock(), createBlock(_component_el_option, {
+                        key: opt.label + opt.value,
+                        label: opt.label,
+                        value: opt.value
+                      }, null, 8, ["label", "value"]);
+                    }), 128))
+                  ]),
+                  _: 2
+                }, 1032, ["modelValue", "onUpdate:modelValue", "class"]),
+                createElementVNode("div", {
+                  class: normalizeClass(unref(createBEMName)("input"))
+                }, [
+                  createVNode(_component_el_input, {
+                    modelValue: item.value,
+                    "onUpdate:modelValue": ($event) => item.value = $event,
+                    placeholder: "\u8BF7\u8F93\u5165",
+                    clearable: ""
+                  }, null, 8, ["modelValue", "onUpdate:modelValue"])
+                ], 2),
+                filterMultiple.value ? (openBlock(), createBlock(_component_el_icon, {
+                  key: 0,
+                  size: 18,
+                  class: normalizeClass(unref(createBEMName)("remove-icon")),
+                  title: "\u79FB\u9664\u8BE5\u9879",
+                  onClick: ($event) => handleRemoveFilterItem(index2)
+                }, {
+                  default: withCtx(() => [
+                    createVNode(unref(remove))
+                  ]),
+                  _: 2
+                }, 1032, ["class", "onClick"])) : createCommentVNode("", true)
+              ], 2);
+            }), 128)) : currentColumn.value.filterType === unref(FilterItemTypeEnum$1).\u6570\u5B57 ? (openBlock(true), createElementBlock(Fragment, { key: 1 }, renderList(filterList.value, (item, index2) => {
+              return openBlock(), createElementBlock("div", {
+                class: normalizeClass(unref(createBEMName)("item")),
+                key: index2
+              }, [
+                createVNode(_component_el_select, {
+                  modelValue: item.condition,
+                  "onUpdate:modelValue": ($event) => item.condition = $event,
+                  class: normalizeClass(unref(createBEMName)("operate")),
+                  placeholder: "\u7B5B\u9009\u7C7B\u578B"
+                }, {
+                  default: withCtx(() => [
+                    (openBlock(true), createElementBlock(Fragment, null, renderList(unref(compareOptions$1)[currentColumn.value.filterType], (opt, iindex) => {
+                      return openBlock(), createBlock(_component_el_option, {
+                        key: opt.label + opt.value,
+                        label: opt.label,
+                        value: opt.value
+                      }, null, 8, ["label", "value"]);
+                    }), 128))
+                  ]),
+                  _: 2
+                }, 1032, ["modelValue", "onUpdate:modelValue", "class"]),
+                createElementVNode("div", {
+                  class: normalizeClass(unref(createBEMName)("input"))
+                }, [
+                  createVNode(_component_el_input_number, {
+                    modelValue: item.value,
+                    "onUpdate:modelValue": ($event) => item.value = $event,
+                    "controls-position": "right",
+                    clearable: "",
+                    placeholder: "\u8BF7\u8F93\u5165"
+                  }, null, 8, ["modelValue", "onUpdate:modelValue"])
+                ], 2),
+                filterMultiple.value ? (openBlock(), createBlock(_component_el_icon, {
+                  key: 0,
+                  size: 18,
+                  class: normalizeClass(unref(createBEMName)("remove-icon")),
+                  title: "\u79FB\u9664\u8BE5\u9879",
+                  onClick: ($event) => handleRemoveFilterItem(index2)
+                }, {
+                  default: withCtx(() => [
+                    createVNode(unref(remove))
+                  ]),
+                  _: 2
+                }, 1032, ["class", "onClick"])) : createCommentVNode("", true)
+              ], 2);
+            }), 128)) : currentColumn.value.filterType === unref(FilterItemTypeEnum$1).\u65E5\u671F ? (openBlock(true), createElementBlock(Fragment, { key: 2 }, renderList(filterList.value, (item, index2) => {
+              return openBlock(), createElementBlock("div", {
+                class: normalizeClass(unref(createBEMName)("item")),
+                key: index2
+              }, [
+                createVNode(_component_el_select, {
+                  modelValue: item.condition,
+                  "onUpdate:modelValue": ($event) => item.condition = $event,
+                  class: normalizeClass(unref(createBEMName)("operate")),
+                  placeholder: "\u7B5B\u9009\u7C7B\u578B"
+                }, {
+                  default: withCtx(() => [
+                    (openBlock(true), createElementBlock(Fragment, null, renderList(unref(compareOptions$1)[currentColumn.value.filterType], (opt, iindex) => {
+                      return openBlock(), createBlock(_component_el_option, {
+                        key: opt.label + opt.value,
+                        label: opt.label,
+                        value: opt.value
+                      }, null, 8, ["label", "value"]);
+                    }), 128))
+                  ]),
+                  _: 2
+                }, 1032, ["modelValue", "onUpdate:modelValue", "class"]),
+                createElementVNode("div", {
+                  class: normalizeClass(unref(createBEMName)("input"))
+                }, [
+                  createVNode(_component_el_date_picker, {
+                    modelValue: item.value,
+                    "onUpdate:modelValue": ($event) => item.value = $event,
+                    placeholder: "\u8BF7\u9009\u62E9\u65E5\u671F",
+                    "value-format": "YYYY-MM-DD",
+                    clearable: ""
+                  }, null, 8, ["modelValue", "onUpdate:modelValue"])
+                ], 2),
+                filterMultiple.value ? (openBlock(), createBlock(_component_el_icon, {
+                  key: 0,
+                  size: 18,
+                  class: normalizeClass(unref(createBEMName)("remove-icon")),
+                  title: "\u79FB\u9664\u8BE5\u9879",
+                  onClick: ($event) => handleRemoveFilterItem(index2)
+                }, {
+                  default: withCtx(() => [
+                    createVNode(unref(remove))
+                  ]),
+                  _: 2
+                }, 1032, ["class", "onClick"])) : createCommentVNode("", true)
+              ], 2);
+            }), 128)) : currentColumn.value.filterType === unref(FilterItemTypeEnum$1).\u5E03\u5C14\u503C ? (openBlock(true), createElementBlock(Fragment, { key: 3 }, renderList(filterList.value, (item, index2) => {
+              return openBlock(), createElementBlock("div", {
+                class: normalizeClass(unref(createBEMName)("item")),
+                key: index2
+              }, [
+                createElementVNode("div", {
+                  class: normalizeClass(unref(createBEMName)("input"))
+                }, [
+                  createVNode(_component_el_checkbox, {
+                    modelValue: item.value,
+                    "onUpdate:modelValue": ($event) => item.value = $event
+                  }, {
+                    default: withCtx(() => [
+                      createTextVNode(toDisplayString(item.filterLabel), 1)
+                    ]),
+                    _: 2
+                  }, 1032, ["modelValue", "onUpdate:modelValue"])
+                ], 2)
+              ], 2);
+            }), 128)) : currentColumn.value.filterType === unref(FilterItemTypeEnum$1).\u5355\u9009\u503C ? (openBlock(true), createElementBlock(Fragment, { key: 4 }, renderList(filterList.value, (item, index2) => {
+              return openBlock(), createElementBlock("div", {
+                class: normalizeClass(unref(createBEMName)("item")),
+                key: index2
+              }, [
+                createElementVNode("div", {
+                  class: normalizeClass(unref(createBEMName)("input"))
+                }, [
+                  createVNode(_component_el_select, {
+                    modelValue: item.value,
+                    "onUpdate:modelValue": ($event) => item.value = $event,
+                    placeholder: "\u8BF7\u9009\u62E9"
+                  }, {
+                    default: withCtx(() => [
+                      (openBlock(true), createElementBlock(Fragment, null, renderList(item.filterOptions, (opt, index22) => {
+                        return openBlock(), createBlock(_component_el_option, {
+                          key: index22,
+                          style: { "width": "100%" },
+                          label: opt.label,
+                          value: opt.value
+                        }, null, 8, ["label", "value"]);
+                      }), 128))
+                    ]),
+                    _: 2
+                  }, 1032, ["modelValue", "onUpdate:modelValue"])
+                ], 2)
+              ], 2);
+            }), 128)) : currentColumn.value.filterType === unref(FilterItemTypeEnum$1).\u591A\u9009\u503C ? (openBlock(true), createElementBlock(Fragment, { key: 5 }, renderList(filterList.value, (item, index2) => {
+              return openBlock(), createElementBlock("div", {
+                class: normalizeClass(unref(createBEMName)("item")),
+                key: index2
+              }, [
+                createElementVNode("div", {
+                  class: normalizeClass(unref(createBEMName)("input"))
+                }, [
+                  createVNode(_component_el_checkbox_group, {
+                    modelValue: item.value,
+                    "onUpdate:modelValue": ($event) => item.value = $event
+                  }, {
+                    default: withCtx(() => [
+                      (openBlock(true), createElementBlock(Fragment, null, renderList(item.filterOptions, (opt, index22) => {
+                        return openBlock(), createBlock(_component_el_checkbox, {
+                          key: index22,
+                          style: { "width": "100%" },
+                          label: opt.value
+                        }, {
+                          default: withCtx(() => [
+                            createTextVNode(toDisplayString(opt.label), 1)
+                          ]),
+                          _: 2
+                        }, 1032, ["label"]);
+                      }), 128))
+                    ]),
+                    _: 2
+                  }, 1032, ["modelValue", "onUpdate:modelValue"])
+                ], 2)
+              ], 2);
+            }), 128)) : createCommentVNode("", true)
+          ], 2),
+          createElementVNode("div", {
+            class: normalizeClass(unref(createBEMName)("actions"))
+          }, [
+            filterMultiple.value && hasCompare.value ? (openBlock(), createBlock(_component_el_button, {
               key: 0,
-              modelValue: filterFormData.value.condition,
-              "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => filterFormData.value.condition = $event),
-              class: normalizeClass(unref(createBEMName)("operate")),
-              placeholder: "\u7B5B\u9009\u7C7B\u578B"
+              type: "primary",
+              link: "",
+              icon: unref(circlePlus),
+              onClick: handleAddFilterItem
             }, {
               default: withCtx(() => [
-                (openBlock(true), createElementBlock(Fragment, null, renderList(unref(compareOptions$1)[currentColumn.value.filterType], (opt, iindex) => {
-                  return openBlock(), createBlock(_component_el_option, {
-                    key: opt.label + opt.value,
-                    label: opt.label,
-                    value: opt.value
-                  }, null, 8, ["label", "value"]);
-                }), 128))
+                createTextVNode("\u6DFB\u52A0\u7B5B\u9009\u6761\u4EF6")
               ]),
               _: 1
-            }, 8, ["modelValue", "class"])) : createCommentVNode("", true),
-            createElementVNode("div", {
-              class: normalizeClass(unref(createBEMName)("input"))
-            }, [
-              filterFormData.value.filterType === unref(FilterItemTypeEnum$1).\u6587\u5B57 ? (openBlock(), createBlock(_component_el_input, {
-                key: 0,
-                modelValue: filterFormData.value.value,
-                "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => filterFormData.value.value = $event),
-                placeholder: "\u8BF7\u8F93\u5165",
-                clearable: ""
-              }, null, 8, ["modelValue"])) : filterFormData.value.filterType === unref(FilterItemTypeEnum$1).\u65E5\u671F ? (openBlock(), createBlock(_component_el_date_picker, {
-                key: 1,
-                modelValue: filterFormData.value.value,
-                "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => filterFormData.value.value = $event),
-                placeholder: "\u8BF7\u9009\u62E9\u65E5\u671F",
-                "value-format": "YYYY-MM-DD",
-                clearable: ""
-              }, null, 8, ["modelValue"])) : filterFormData.value.filterType === unref(FilterItemTypeEnum$1).\u6570\u5B57 ? (openBlock(), createBlock(_component_el_input_number, {
-                key: 2,
-                modelValue: filterFormData.value.value,
-                "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => filterFormData.value.value = $event),
-                "controls-position": "right",
-                clearable: "",
-                placeholder: "\u8BF7\u8F93\u5165"
-              }, null, 8, ["modelValue"])) : createCommentVNode("", true),
-              filterFormData.value.filterType === unref(FilterItemTypeEnum$1).\u5E03\u5C14\u503C ? (openBlock(), createBlock(_component_el_checkbox, {
-                key: 3,
-                modelValue: filterFormData.value.value,
-                "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => filterFormData.value.value = $event)
-              }, {
+            }, 8, ["icon"])) : (openBlock(), createElementBlock("div", _hoisted_1$c)),
+            createElementVNode("div", null, [
+              createVNode(_component_el_button, { onClick: handleClear }, {
                 default: withCtx(() => [
-                  createTextVNode(toDisplayString(filterFormData.value.filterLabel), 1)
-                ]),
-                _: 1
-              }, 8, ["modelValue"])) : createCommentVNode("", true),
-              filterFormData.value.filterType === unref(FilterItemTypeEnum$1).\u591A\u9009\u503C ? (openBlock(), createBlock(_component_el_checkbox_group, {
-                key: 4,
-                modelValue: filterFormData.value.value,
-                "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => filterFormData.value.value = $event)
-              }, {
-                default: withCtx(() => [
-                  (openBlock(true), createElementBlock(Fragment, null, renderList(filterFormData.value.filterOptions, (item, index2) => {
-                    return openBlock(), createBlock(_component_el_checkbox, {
-                      key: index2,
-                      style: { "width": "100%" },
-                      label: item.value
-                    }, {
-                      default: withCtx(() => [
-                        createTextVNode(toDisplayString(item.label), 1)
-                      ]),
-                      _: 2
-                    }, 1032, ["label"]);
-                  }), 128))
+                  createTextVNode("\u6E05\u7A7A\u503C")
                 ]),
                 _: 1
-              }, 8, ["modelValue"])) : createCommentVNode("", true),
-              filterFormData.value.filterType === unref(FilterItemTypeEnum$1).\u5355\u9009\u503C ? (openBlock(), createBlock(_component_el_select, {
-                key: 5,
-                modelValue: filterFormData.value.value,
-                "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => filterFormData.value.value = $event)
+              }),
+              createVNode(_component_el_button, {
+                type: "primary",
+                onClick: handleScreen
               }, {
                 default: withCtx(() => [
-                  (openBlock(true), createElementBlock(Fragment, null, renderList(filterFormData.value.filterOptions, (item, index2) => {
-                    return openBlock(), createBlock(_component_el_option, {
-                      key: index2,
-                      style: { "width": "100%" },
-                      label: item.label,
-                      value: item.value
-                    }, null, 8, ["label", "value"]);
-                  }), 128))
+                  createTextVNode("\u786E\u5B9A")
                 ]),
                 _: 1
-              }, 8, ["modelValue"])) : createCommentVNode("", true)
-            ], 2)
-          ], 2)) : createCommentVNode("", true)
-        ])),
-        createElementVNode("div", {
-          class: normalizeClass(unref(createBEMName)("actions"))
-        }, [
-          filterMultiple.value ? (openBlock(), createBlock(_component_el_button, {
-            key: 0,
-            type: "primary",
-            link: "",
-            icon: unref(circlePlus)
-          }, {
-            default: withCtx(() => [
-              createTextVNode("\u6DFB\u52A0\u7B5B\u9009\u6761\u4EF6")
-            ]),
-            _: 1
-          }, 8, ["icon"])) : (openBlock(), createElementBlock("div", _hoisted_2$7)),
-          createElementVNode("div", null, [
-            createVNode(_component_el_button, { onClick: handleClear }, {
-              default: withCtx(() => [
-                createTextVNode("\u6E05\u7A7A\u503C")
-              ]),
-              _: 1
-            }),
-            createVNode(_component_el_button, {
-              type: "primary",
-              onClick: handleScreen
-            }, {
-              default: withCtx(() => [
-                createTextVNode("\u786E\u5B9A")
-              ]),
-              _: 1
-            })
-          ])
-        ], 2)
+              })
+            ])
+          ], 2)
+        ], 64)) : createCommentVNode("", true)
       ], 2);
     };
   }
 });
-var FilterZone$1 = /* @__PURE__ */ _export_sfc(_sfc_main$u, [["__scopeId", "data-v-4f0da6ca"]]);
+var FilterZone$1 = /* @__PURE__ */ _export_sfc(_sfc_main$u, [["__scopeId", "data-v-942c88e6"]]);
 var index_vue_vue_type_style_index_0_lang$7 = "";
 const _hoisted_1$b = ["data-key"];
 const _hoisted_2$6 = {
@@ -5758,7 +5884,10 @@ const _sfc_main$t = defineComponent({
           }, column.props), {
             header: withCtx(($header) => [
               createElementVNode("div", {
-                class: normalizeClass(["el-table__header-cell", { dragable: tableManager.value.table.dragable }]),
+                class: normalizeClass([
+                  "el-table__header-cell",
+                  { dragable: tableManager.value.table.dragable, filterable: column.filterable }
+                ]),
                 "data-key": column._key
               }, [
                 column.required ? (openBlock(), createElementBlock("span", _hoisted_2$6, "*")) : createCommentVNode("", true),
@@ -8577,8 +8706,10 @@ const _sfc_main$k = defineComponent({
       }, 2e3);
     });
     const handleTableHeaderDragEnd = (newWidth, oldWidth, column, event) => {
+      if (newWidth === oldWidth) {
+        return false;
+      }
       const newList = jsonClone(renderedTableEls.value);
-      console.log("newList", column);
       const _column = newList.find(
         (item) => item.label === column.label && item.prop === column.property
       );
@@ -12696,7 +12827,7 @@ const defineEditableTable = function(config) {
 };
 var iconfont = "";
 const name = "@juzhenfe/page-model";
-const version = "3.13.1";
+const version = "3.13.3";
 const types = "dist/main.d.ts";
 const main = "dist/index.umd.js";
 const keywords = [