vxe-table 3.5.9 → 3.6.0-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/button/style/style.css +1 -58
- package/lib/button/style/style.min.css +1 -1
- package/lib/edit/src/mixin.js +10 -10
- package/lib/edit/src/mixin.min.js +1 -1
- package/lib/form/src/form.js +1 -1
- package/lib/form/src/form.min.js +1 -1
- package/lib/form/style/style.css +0 -3
- package/lib/form/style/style.min.css +1 -1
- package/lib/icon/style/style.css +377 -518
- package/lib/icon/style/style.min.css +1 -1
- package/lib/index.css +1 -1
- package/lib/index.umd.js +345 -334
- package/lib/index.umd.min.js +1 -1
- package/lib/input/src/input.js +3 -3
- package/lib/input/src/input.min.js +1 -1
- package/lib/input/style/style.css +13 -4
- package/lib/input/style/style.min.css +1 -1
- package/lib/modal/style/style.css +0 -1
- package/lib/modal/style/style.min.css +1 -1
- package/lib/pager/style/style.css +3 -1
- package/lib/pager/style/style.min.css +1 -1
- package/lib/select/style/style.css +1 -0
- package/lib/select/style/style.min.css +1 -1
- package/lib/style.css +1 -1
- package/lib/style.min.css +1 -1
- package/lib/table/src/cell.js +9 -8
- package/lib/table/src/cell.min.js +1 -1
- package/lib/table/src/methods.js +281 -270
- package/lib/table/src/methods.min.js +1 -1
- package/lib/table/style/style.css +5 -5
- package/lib/table/style/style.min.css +1 -1
- package/lib/toolbar/src/toolbar.js +1 -1
- package/lib/toolbar/src/toolbar.min.js +1 -1
- package/lib/tools/log.js +1 -1
- package/lib/tools/log.min.js +1 -1
- package/lib/v-x-e-table/index.js +1 -1
- package/lib/v-x-e-table/index.min.js +1 -1
- package/lib/v-x-e-table/src/conf.js +38 -39
- package/lib/v-x-e-table/src/conf.min.js +1 -1
- package/lib/v-x-e-table/style/style.css +365 -482
- package/lib/v-x-e-table/style/style.min.css +1 -1
- package/package.json +1 -1
- package/packages/edit/src/mixin.js +10 -10
- package/packages/form/src/form.js +1 -1
- package/packages/input/src/input.js +3 -3
- package/packages/table/src/cell.js +8 -8
- package/packages/table/src/methods.js +50 -42
- package/packages/toolbar/src/toolbar.js +1 -1
- package/packages/v-x-e-table/src/conf.js +38 -38
- package/styles/button.scss +1 -43
- package/styles/form.scss +0 -3
- package/styles/icon.scss +410 -616
- package/styles/input.scss +8 -0
- package/styles/modal.scss +0 -1
- package/styles/pager.scss +2 -0
- package/styles/select.scss +1 -0
- package/styles/table.scss +6 -7
|
@@ -1 +1 @@
|
|
|
1
|
-
@charset "UTF-8";[class*=vxe-icon--]{display:inline-block;vertical-align:middle;position:relative;direction:ltr;font-family:Verdana,Arial,Tahoma;font-weight:400;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}[class*=vxe-icon--].rotate45{-webkit-transform:rotate(45deg);transform:rotate(45deg)}[class*=vxe-icon--].rotate90{-webkit-transform:rotate(90deg);transform:rotate(90deg)}[class*=vxe-icon--].rotate180{-webkit-transform:rotate(180deg);transform:rotate(180deg)}.vxe-icon--arrow-bottom,.vxe-icon--arrow-left,.vxe-icon--arrow-right,.vxe-icon--arrow-top,.vxe-icon--calendar,.vxe-icon--caret-bottom,.vxe-icon--caret-left,.vxe-icon--caret-right,.vxe-icon--caret-top,.vxe-icon--check,.vxe-icon--circle-plus,.vxe-icon--close,.vxe-icon--d-arrow-left,.vxe-icon--d-arrow-right,.vxe-icon--dot,.vxe-icon--download,.vxe-icon--edit-outline,.vxe-icon--error,.vxe-icon--eye,.vxe-icon--eye-slash,.vxe-icon--funnel,.vxe-icon--info,.vxe-icon--menu,.vxe-icon--minus,.vxe-icon--more,.vxe-icon--plus,.vxe-icon--print,.vxe-icon--question,.vxe-icon--refresh,.vxe-icon--remove,.vxe-icon--search,.vxe-icon--square,.vxe-icon--success,.vxe-icon--upload,.vxe-icon--warning,.vxe-icon--zoomin,.vxe-icon--zoomout{width:1em;height:1em;line-height:1em}.vxe-icon--arrow-bottom:before,.vxe-icon--arrow-left:before,.vxe-icon--arrow-right:before,.vxe-icon--arrow-top:before,.vxe-icon--calendar:after,.vxe-icon--calendar:before,.vxe-icon--caret-bottom:before,.vxe-icon--caret-left:before,.vxe-icon--caret-right:before,.vxe-icon--caret-top:before,.vxe-icon--check:before,.vxe-icon--circle-plus:after,.vxe-icon--close:before,.vxe-icon--d-arrow-left:after,.vxe-icon--d-arrow-left:before,.vxe-icon--d-arrow-right:after,.vxe-icon--d-arrow-right:before,.vxe-icon--dot:before,.vxe-icon--download:after,.vxe-icon--download:before,.vxe-icon--edit-outline:after,.vxe-icon--edit-outline:before,.vxe-icon--error:after,.vxe-icon--eye-slash:after,.vxe-icon--eye-slash:before,.vxe-icon--eye:before,.vxe-icon--funnel:after,.vxe-icon--funnel:before,.vxe-icon--info:after,.vxe-icon--minus:before,.vxe-icon--more:before,.vxe-icon--plus:before,.vxe-icon--print:after,.vxe-icon--print:before,.vxe-icon--question:after,.vxe-icon--refresh:after,.vxe-icon--refresh:before,.vxe-icon--remove:after,.vxe-icon--search:after,.vxe-icon--search:before,.vxe-icon--square:before,.vxe-icon--success:after,.vxe-icon--upload:after,.vxe-icon--upload:before,.vxe-icon--warning:after,.vxe-icon--zoomin:after,.vxe-icon--zoomin:before,.vxe-icon--zoomout:after,.vxe-icon--zoomout:before{content:"";position:absolute}.vxe-icon--square:before{left:.05em;top:.05em;width:.9em;height:.9em;border-width:.1em;border-style:solid;border-color:inherit}.vxe-icon--zoomin{border-width:.1em;border-style:solid;border-color:inherit;background-color:#fff}.vxe-icon--zoomin:after,.vxe-icon--zoomin:before{background-color:inherit}.vxe-icon--zoomin:before{left:-.1em;top:.2em;width:1.1em;height:.4em}.vxe-icon--zoomin:after{top:-.1em;left:.2em;width:.4em;height:1.1em}.vxe-icon--zoomout{position:relative}.vxe-icon--zoomout:before{right:0;top:0;width:.7em;height:.7em;border-width:.1em;border-style:solid;border-color:inherit}.vxe-icon--zoomout:after{left:.1em;bottom:.1em;width:.7em;height:.7em;border-width:.1em;border-style:solid;border-color:inherit;background-color:#fff}.vxe-icon--menu:before{content:"";display:inline-block;width:.22em;height:.22em;-webkit-box-shadow:0 -.36em 0,-.36em -.36em 0,.36em -.36em 0,0 0 0 1em inset,-.36em 0 0,.36em 0 0,0 .36em 0,-.36em .36em 0,.36em .36em 0;box-shadow:0 -.36em 0,-.36em -.36em 0,.36em -.36em 0,0 0 0 1em inset,-.36em 0 0,.36em 0 0,0 .36em 0,-.36em .36em 0,.36em .36em 0;margin:.26em}.vxe-icon--caret-bottom:before,.vxe-icon--caret-left:before,.vxe-icon--caret-right:before,.vxe-icon--caret-top:before{border-width:.4em;border-style:solid;border-color:transparent}.vxe-icon--caret-top:before{left:.1em;bottom:.3em;border-bottom-color:inherit}.vxe-icon--caret-bottom:before{left:.1em;top:.3em;border-top-color:inherit}.vxe-icon--caret-left:before{right:.3em;bottom:.1em;border-right-color:inherit}.vxe-icon--caret-right:before{left:.3em;bottom:.1em;border-left-color:inherit}.vxe-icon--arrow-bottom:before,.vxe-icon--arrow-left:before,.vxe-icon--arrow-right:before,.vxe-icon--arrow-top:before{top:.4em;left:.14em;width:.7em;height:.7em;border-width:.15em;border-style:solid;border-top-color:inherit;border-right-color:inherit;border-bottom-color:transparent;border-left-color:transparent;border-radius:.15em;-webkit-transform:rotate(-45deg);transform:rotate(-45deg)}.vxe-icon--arrow-bottom:before{top:0;left:.14em;-webkit-transform:rotate(135deg);transform:rotate(135deg)}.vxe-icon--arrow-left:before{top:.18em;left:.35em;-webkit-transform:rotate(-135deg);transform:rotate(-135deg)}.vxe-icon--arrow-right:before{top:.18em;left:0;-webkit-transform:rotate(45deg);transform:rotate(45deg)}.vxe-icon--d-arrow-left:before,.vxe-icon--d-arrow-right:before{left:.15em}.vxe-icon--d-arrow-left:after,.vxe-icon--d-arrow-right:after{left:.58em}.vxe-icon--d-arrow-left:after,.vxe-icon--d-arrow-left:before,.vxe-icon--d-arrow-right:after,.vxe-icon--d-arrow-right:before{top:.18em;width:.7em;height:.7em;border-width:.15em;border-style:solid;border-top-color:inherit;border-right-color:transparent;border-bottom-color:transparent;border-left-color:inherit;border-radius:.15em;-webkit-transform:rotate(-45deg);transform:rotate(-45deg)}.vxe-icon--d-arrow-right:after,.vxe-icon--d-arrow-right:before{-webkit-transform:rotate(135deg);transform:rotate(135deg)}.vxe-icon--d-arrow-right:before{left:-.25em}.vxe-icon--d-arrow-right:after{left:.18em}.vxe-icon--funnel:before{top:.05em;left:0;border-width:.5em;border-style:solid;border-top-color:inherit;border-right-color:transparent;border-bottom-color:transparent;border-left-color:transparent}.vxe-icon--funnel:after{left:.41em;top:.4em;width:0;height:.5em;border-width:0 .2em 0 0;border-style:solid;border-right-color:inherit}.vxe-icon--edit-outline:before{height:.84em;width:.86em;top:.1em;left:.02em;border-radius:.2em;border-width:.1em;border-style:solid;border-color:inherit}.vxe-icon--edit-outline:after{left:.6em;bottom:.2em;width:0;height:.8em;border-radius:0 0 80% 80%;border-width:0 0 0 .22em;border-style:solid;border-color:inherit;-webkit-transform:rotate(45deg);transform:rotate(45deg)}.vxe-icon--more:before{content:"...";top:0;left:.1em;line-height:.5em;font-weight:700}.vxe-icon--plus:before{content:"+";left:-.12em;bottom:-.1em;line-height:1em;font-size:1.6em}.vxe-icon--check:before{left:.25em;bottom:.2em;width:.5em;height:.9em;border-width:.15em;border-style:solid;border-top-color:transparent;border-right-color:inherit;border-bottom-color:inherit;border-radius:.15em;border-left-color:transparent;-webkit-transform:rotate(45deg);transform:rotate(45deg)}.vxe-icon--close:before{content:"+";left:-.1em;bottom:-.16em;line-height:1em;font-size:1.8em;-webkit-transform:rotate(45deg);transform:rotate(45deg)}.vxe-icon--minus:before{content:"\2500";left:0;bottom:0;width:100%;text-align:center;line-height:.9em;font-size:1.2em}.vxe-icon--refresh{border-width:.1em;border-style:solid;border-radius:50%;border-right-color:transparent!important;border-left-color:transparent!important}.vxe-icon--refresh:before{left:50%;top:0;-webkit-transform:translateX(50%) rotate(-45deg);transform:translateX(50%) rotate(-45deg)}.vxe-icon--refresh:after{right:50%;bottom:0;-webkit-transform:translateX(-50%) rotate(135deg);transform:translateX(-50%) rotate(135deg)}.vxe-icon--refresh:after,.vxe-icon--refresh:before{width:0;height:0;border-width:.25em;border-style:solid;border-right-color:transparent;border-bottom-color:transparent;border-left-color:transparent}.vxe-icon--refresh.roll{-webkit-animation:rollCircle 1s infinite linear;animation:rollCircle 1s infinite linear}@-webkit-keyframes rollCircle{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes rollCircle{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.vxe-icon--circle-plus:before,.vxe-icon--error:before,.vxe-icon--info:before,.vxe-icon--question:before,.vxe-icon--remove:before,.vxe-icon--success:before,.vxe-icon--warning:before{content:"";border-radius:50%;border-width:.5em;border-style:solid;border-color:inherit;position:absolute;top:0;left:0;-webkit-transform:scale(.95);transform:scale(.95)}.vxe-icon--info:after,.vxe-icon--question:after,.vxe-icon--warning:after{left:0;bottom:0;width:100%;text-align:center;color:#fff;-webkit-transform:rotate(-10deg) scale(.75);transform:rotate(-10deg) scale(.75)}.vxe-icon--question:after{content:"\3F"}.vxe-icon--info:after{content:"\A1"}.vxe-icon--warning:after{content:"\21"}.vxe-icon--success:after{content:"\2713";left:.25em;bottom:0;color:#fff;font-size:.65em}.vxe-icon--circle-plus:after{content:"+";left:0;bottom:0;width:100%;text-align:center;color:#fff;line-height:1.4em;font-size:.8em}.vxe-icon--remove:after{content:"\2500";left:0;bottom:0;width:100%;text-align:center;line-height:1.5em;color:#fff;font-size:.7em}.vxe-icon--error:after{content:"\D7";left:0;bottom:0;width:100%;line-height:1.4em;text-align:center;color:#fff;font-size:.8em}.vxe-icon--download,.vxe-icon--upload{overflow:hidden}.vxe-icon--download:before,.vxe-icon--upload:before{left:0;width:1em;border-width:0;border-style:solid;border-color:inherit}.vxe-icon--download:after,.vxe-icon--upload:after{width:100%;text-align:center;font-size:2em}.vxe-icon--upload:before{top:.1em;border-top-width:.1em}.vxe-icon--upload:after{content:"\2191";left:0;top:.15em}.vxe-icon--download:before{bottom:.05em;border-bottom-width:.1em}.vxe-icon--download:after{content:"\2191";left:0;bottom:.15em;-webkit-transform:rotate(180deg);transform:rotate(180deg)}.vxe-icon--eye-slash:before,.vxe-icon--eye:before{content:"\25CF";top:.16em;left:0;width:1em;height:.68em;line-height:.25em;border-radius:50%;border-width:.1em;border-style:solid;border-color:inherit;text-align:center}.vxe-icon--eye-slash:after{top:-.1em;left:.45em;width:0;height:1.2em;border-width:0;border-style:solid;border-color:inherit;border-left-width:.1em;-webkit-transform:rotate(45deg);transform:rotate(45deg)}.vxe-icon--calendar:before{top:.15em;left:0;width:1em;height:.8em;border-width:.2em .1em .1em .1em;border-radius:.1em .1em 0 0;border-style:solid;border-color:inherit}.vxe-icon--calendar:after{left:.2em;top:0;width:.6em;height:.3em;border-width:0 .1em;border-style:solid;border-color:inherit}.vxe-icon--dot:before{top:.25em;left:.25em;border-radius:50%;border-width:.25em;border-style:solid;border-color:inherit}.vxe-icon--print{-webkit-box-shadow:inset 0 0 0 .1em;box-shadow:inset 0 0 0 .1em;border-width:.2em 0;border-style:solid;border-color:transparent!important;border-radius:.3em .3em 0 0}.vxe-icon--print:before{width:.6em;height:.3em;top:-.2em;left:.2em;-webkit-box-shadow:inset 0 0 0 .1em;box-shadow:inset 0 0 0 .1em}.vxe-icon--print:after{width:.6em;height:.6em;left:.2em;bottom:-.2em;-webkit-box-shadow:inset 0 0 0 .1em;box-shadow:inset 0 0 0 .1em;background-color:#fff}.vxe-icon--search:before{top:0;left:0;width:.8em;height:.8em;border-width:.15em;border-style:solid;border-color:inherit;border-radius:50%}.vxe-icon--search:after{top:.75em;left:.6em;width:.35em;height:0;border-width:.15em 0 0 0;border-style:solid;border-color:inherit;-webkit-transform:rotate(45deg);transform:rotate(45deg)}.vxe-loading{display:none;position:absolute;width:100%;height:100%;top:0;left:0;z-index:99;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-color:rgba(0,0,0,.3)}.vxe-loading.is--visible{display:block}.vxe-loading>.vxe-loading--chunk{width:100%;position:absolute;top:50%;left:0;-webkit-transform:translateY(-50%);transform:translateY(-50%);text-align:center;color:#409eff}.vxe-loading .vxe-loading--default-icon{font-size:1.2em}.vxe-loading .vxe-loading--text{padding:.4em 0}.vxe-loading .vxe-loading--spinner{display:inline-block;position:relative;width:56px;height:56px}.vxe-loading .vxe-loading--spinner:after,.vxe-loading .vxe-loading--spinner:before{content:"";width:100%;height:100%;border-radius:50%;background-color:#409eff;opacity:.6;position:absolute;top:0;left:0;-webkit-animation:bounce 2s infinite ease-in-out;animation:bounce 2s infinite ease-in-out}.vxe-loading .vxe-loading--spinner:after{-webkit-animation-delay:-1s;animation-delay:-1s}@-webkit-keyframes bounce{0%,100%{-webkit-transform:scale(0);transform:scale(0)}50%{-webkit-transform:scale(1);transform:scale(1)}}@keyframes bounce{0%,100%{-webkit-transform:scale(0);transform:scale(0)}50%{-webkit-transform:scale(1);transform:scale(1)}}.size--mini .vxe-loading .vxe-loading--spinner{width:38px;height:38px}.size--small .vxe-loading .vxe-loading--spinner{width:44px;height:44px}.size--medium .vxe-loading .vxe-loading--spinner{width:50px;height:50px}
|
|
1
|
+
@charset "UTF-8";@font-face{font-family:vxeiconfont;src:url("data:application/x-font-woff2;charset=utf-8;base64,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") format("woff2")}@-webkit-keyframes rollCircle{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes rollCircle{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}[class*=vxe-icon-]{font-family:vxeiconfont!important;font-style:normal;font-weight:400;font-size:1.1em;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}[class*=vxe-icon-].animat,[class*=vxe-icon-].roll{display:inline-block}[class*=vxe-icon-].animat{-webkit-transition:-webkit-transform .25s ease-in-out;transition:-webkit-transform .25s ease-in-out;transition:transform .25s ease-in-out;transition:transform .25s ease-in-out,-webkit-transform .25s ease-in-out}[class*=vxe-icon-].rotate45{-webkit-transform:rotate(45deg);transform:rotate(45deg)}[class*=vxe-icon-].rotate90{-webkit-transform:rotate(90deg);transform:rotate(90deg)}[class*=vxe-icon-].rotate180{-webkit-transform:rotate(180deg);transform:rotate(180deg)}[class*=vxe-icon-].roll{-webkit-animation:rollCircle 1s infinite linear;animation:rollCircle 1s infinite linear}.vxe-icon-fullscreen:before{content:"\e70e"}.vxe-icon-minimize:before{content:"\e749"}.vxe-icon-print:before{content:"\eba0"}.vxe-icon-upload:before{content:"\e683"}.vxe-icon-download:before{content:"\e61a"}.vxe-icon-cloud-upload:before{content:"\e603"}.vxe-icon-cloud-download:before{content:"\e63a"}.vxe-icon-spinner:before{content:"\e601"}.vxe-icon-close:before{content:"\e6e9"}.vxe-icon-custom-column:before{content:"\e62d"}.vxe-icon-edit:before{content:"\e66e"}.vxe-icon-refresh:before{content:"\e619"}.vxe-icon-zoom-in:before{content:"\e826"}.vxe-icon-caret-down:before{content:"\e8ed"}.vxe-icon-caret-up:before{content:"\e8ee"}.vxe-icon-caret-right:before{content:"\e8ef"}.vxe-icon-caret-left:before{content:"\e8f0"}.vxe-icon-square-checked-fill:before{content:"\e6d4"}.vxe-icon-square-close:before{content:"\e793"}.vxe-icon-square-down:before{content:"\e794"}.vxe-icon-square-left:before{content:"\e796"}.vxe-icon-square-caret-right:before{content:"\e797"}.vxe-icon-square-minus:before{content:"\e798"}.vxe-icon-square-plus:before{content:"\e799"}.vxe-icon-square-right:before{content:"\e79a"}.vxe-icon-square-up:before{content:"\e79b"}.vxe-icon-square-checked:before{content:"\e7a8"}.vxe-icon-square-down-fill:before{content:"\e84b"}.vxe-icon-square-minus-fill:before{content:"\e84c"}.vxe-icon-square-close-fill:before{content:"\e84d"}.vxe-icon-square-left-fill:before{content:"\e84f"}.vxe-icon-square-caret-right-fill:before{content:"\e850"}.vxe-icon-square-up-fill:before{content:"\e851"}.vxe-icon-square-right-fill:before{content:"\e853"}.vxe-icon-square-plus-fill:before{content:"\e854"}.vxe-icon-square-plus-square:before{content:"\e87e"}.vxe-icon-square-fill:before{content:"\e8d9"}.vxe-icon-square-square:before{content:"\e6a1"}.vxe-icon-sort-alpha-desc:before{content:"\e852"}.vxe-icon-sort-alpha-asc:before{content:"\e7d5"}.vxe-icon-sort-numeric-asc:before{content:"\e800"}.vxe-icon-sort-numeric-desc:before{content:"\e801"}.vxe-icon-star-fill:before{content:"\e69e"}.vxe-icon-star:before{content:"\e69f"}.vxe-icon-star-half:before{content:"\e6b6"}.vxe-icon-lock-fill:before{content:"\e6d1"}.vxe-icon-unlock-fill:before{content:"\e92c"}.vxe-icon-question:before{content:"\e72e"}.vxe-icon-exclamation:before{content:"\e617"}.vxe-icon-information:before{content:"\e7f7"}.vxe-icon-ellipsis-h:before{content:"\e636"}.vxe-icon-ellipsis-v:before{content:"\e637"}.vxe-icon-save:before{content:"\e67c"}.vxe-icon-setting:before{content:"\e8b8"}.vxe-icon-setting-fill:before{content:"\e795"}.vxe-icon-user-fill:before{content:"\e652"}.vxe-icon-link:before{content:"\e6c8"}.vxe-icon-user:before{content:"\e61b"}.vxe-icon-sort:before{content:"\e6a0"}.vxe-icon-chart-pie:before{content:"\e902"}.vxe-icon-chart-line:before{content:"\e904"}.vxe-icon-swap:before{content:"\e7f3"}.vxe-icon-num-list:before{content:"\e7f4"}.vxe-icon-copy:before{content:"\ec7a"}.vxe-icon-company:before{content:"\e602"}.vxe-icon-swap-right:before{content:"\e8f1"}.vxe-icon-swap-left:before{content:"\e8f2"}.vxe-icon-table:before{content:"\e920"}.vxe-icon-merge-cells:before{content:"\e901"}.vxe-icon-paste:before{content:"\e70b"}.vxe-icon-cut:before{content:"\e70d"}.vxe-icon-lock:before{content:"\e676"}.vxe-icon-unlock:before{content:"\e682"}.vxe-icon-chart-bar:before{content:"\e84e"}.vxe-icon-fixed-fill:before{content:"\e9b9"}.vxe-icon-fixed:before{content:"\e9ba"}.vxe-icon-square:before{content:"\e6d5"}.vxe-icon-check:before{content:"\e645"}.vxe-icon-question-circle-fill:before{content:"\e690"}.vxe-icon-info-circle-fill:before{content:"\e6e4"}.vxe-icon-error-circle-fill:before{content:"\e62b"}.vxe-icon-delete:before{content:"\e69d"}.vxe-icon-dot:before{content:"\e63f"}.vxe-icon-success-circle:before{content:"\e6d9"}.vxe-icon-delete-fill:before{content:"\e634"}.vxe-icon-minus:before{content:"\e6ba"}.vxe-icon-maximize:before{content:"\e600"}.vxe-icon-info-circle:before{content:"\e77e"}.vxe-icon-question-circle:before{content:"\e782"}.vxe-icon-warning-circle:before{content:"\e785"}.vxe-icon-warnion-circle-fill:before{content:"\e848"}.vxe-icon-eye-fill:before{content:"\e869"}.vxe-icon-search:before{content:"\e741"}.vxe-icon-funnel:before{content:"\e8ec"}.vxe-icon-eye-fill-close:before{content:"\e8ff"}.vxe-icon-search-zoom-in:before{content:"\e6a5"}.vxe-icon-arrow-right:before{content:"\e743"}.vxe-icon-arrow-left:before{content:"\e744"}.vxe-icon-arrow-up:before{content:"\e745"}.vxe-icon-calendar:before{content:"\e746"}.vxe-icon-arrow-down:before{content:"\e7b2"}.vxe-icon-warning-triangle:before{content:"\e67f"}.vxe-icon-add:before{content:"\e664"}.vxe-icon-arrow-double-left:before{content:"\e665"}.vxe-icon-arrow-double-right:before{content:"\e666"}.vxe-icon-menu:before{content:"\e677"}.vxe-icon-repeat:before{content:"\e67b"}.vxe-icon-warning-triangle-fill:before{content:"\e68b"}.vxe-icon-error-circle:before{content:"\e613"}.vxe-icon-zoom-out:before{content:"\e65d"}.vxe-icon-success-circle-fill:before{content:"\e67e"}.vxe-icon-radio-checked:before{content:"\e763"}.vxe-icon-checkbox-unchecked:before{content:"\e8b5"}.vxe-icon-checkbox-checked:before{content:"\e8b6"}.vxe-icon-checkbox-indeterminate:before{content:"\e8b7"}.vxe-icon-radio-unchecked:before{content:"\e7c9"}.vxe-loading{display:none;position:absolute;width:100%;height:100%;top:0;left:0;z-index:99;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-color:rgba(0,0,0,.3)}.vxe-loading.is--visible{display:block}.vxe-loading>.vxe-loading--chunk{width:100%;position:absolute;top:50%;left:0;-webkit-transform:translateY(-50%);transform:translateY(-50%);text-align:center;color:#409eff}.vxe-loading .vxe-loading--default-icon{font-size:1.2em}.vxe-loading .vxe-loading--text{padding:.4em 0}.vxe-loading .vxe-loading--spinner{display:inline-block;position:relative;width:56px;height:56px}.vxe-loading .vxe-loading--spinner:after,.vxe-loading .vxe-loading--spinner:before{content:"";width:100%;height:100%;border-radius:50%;background-color:#409eff;opacity:.6;position:absolute;top:0;left:0;-webkit-animation:bounce 2s infinite ease-in-out;animation:bounce 2s infinite ease-in-out}.vxe-loading .vxe-loading--spinner:after{-webkit-animation-delay:-1s;animation-delay:-1s}@-webkit-keyframes bounce{0%,100%{-webkit-transform:scale(0);transform:scale(0)}50%{-webkit-transform:scale(1);transform:scale(1)}}@keyframes bounce{0%,100%{-webkit-transform:scale(0);transform:scale(0)}50%{-webkit-transform:scale(1);transform:scale(1)}}.size--mini .vxe-loading .vxe-loading--spinner{width:38px;height:38px}.size--small .vxe-loading .vxe-loading--spinner{width:44px;height:44px}.size--medium .vxe-loading .vxe-loading--spinner{width:50px;height:50px}
|
package/package.json
CHANGED
|
@@ -139,13 +139,13 @@ export default {
|
|
|
139
139
|
afIndex = row
|
|
140
140
|
}
|
|
141
141
|
} else {
|
|
142
|
-
afIndex =
|
|
142
|
+
afIndex = this.findRowIndexOf(afterFullData, row)
|
|
143
143
|
}
|
|
144
144
|
if (afIndex === -1) {
|
|
145
145
|
throw new Error(errLog('vxe.error.unableInsert'))
|
|
146
146
|
}
|
|
147
147
|
afterFullData.splice(afIndex, 0, ...newRecords)
|
|
148
|
-
tableFullData.splice(
|
|
148
|
+
tableFullData.splice(this.findRowIndexOf(tableFullData, row), 0, ...newRecords)
|
|
149
149
|
// 刷新单元格合并
|
|
150
150
|
mergeList.forEach(mergeItem => {
|
|
151
151
|
const { row: mergeRowIndex, rowspan: mergeRowspan } = mergeItem
|
|
@@ -205,7 +205,7 @@ export default {
|
|
|
205
205
|
// 如果绑定了多选属性,则更新状态
|
|
206
206
|
if (!checkField) {
|
|
207
207
|
rows.forEach(row => {
|
|
208
|
-
const sIndex =
|
|
208
|
+
const sIndex = this.findRowIndexOf(selection, row)
|
|
209
209
|
if (sIndex > -1) {
|
|
210
210
|
selection.splice(sIndex, 1)
|
|
211
211
|
}
|
|
@@ -227,19 +227,19 @@ export default {
|
|
|
227
227
|
const rItems = matchObj.items.splice(matchObj.index, 1)
|
|
228
228
|
rest.push(rItems[0])
|
|
229
229
|
}
|
|
230
|
-
const afIndex =
|
|
230
|
+
const afIndex = this.findRowIndexOf(afterFullData, row)
|
|
231
231
|
if (afIndex > -1) {
|
|
232
232
|
afterFullData.splice(afIndex, 1)
|
|
233
233
|
}
|
|
234
234
|
})
|
|
235
235
|
} else {
|
|
236
236
|
rows.forEach(row => {
|
|
237
|
-
const tfIndex =
|
|
237
|
+
const tfIndex = this.findRowIndexOf(tableFullData, row)
|
|
238
238
|
if (tfIndex > -1) {
|
|
239
239
|
const rItems = tableFullData.splice(tfIndex, 1)
|
|
240
240
|
rest.push(rItems[0])
|
|
241
241
|
}
|
|
242
|
-
const afIndex =
|
|
242
|
+
const afIndex = this.findRowIndexOf(afterFullData, row)
|
|
243
243
|
if (afIndex > -1) {
|
|
244
244
|
// 刷新单元格合并
|
|
245
245
|
mergeList.forEach(mergeItem => {
|
|
@@ -256,12 +256,12 @@ export default {
|
|
|
256
256
|
}
|
|
257
257
|
}
|
|
258
258
|
// 如果当前行被激活编辑,则清除激活状态
|
|
259
|
-
if (actived.row &&
|
|
259
|
+
if (actived.row && this.findRowIndexOf(rows, actived.row) > -1) {
|
|
260
260
|
this.clearActived()
|
|
261
261
|
}
|
|
262
262
|
// 从新增中移除已删除的数据
|
|
263
263
|
rows.forEach(row => {
|
|
264
|
-
const iIndex =
|
|
264
|
+
const iIndex = this.findRowIndexOf(insertList, row)
|
|
265
265
|
if (iIndex > -1) {
|
|
266
266
|
insertList.splice(iIndex, 1)
|
|
267
267
|
}
|
|
@@ -516,7 +516,7 @@ export default {
|
|
|
516
516
|
const { $el, editStore, afterFullData } = this
|
|
517
517
|
const { actived } = editStore
|
|
518
518
|
const { args, row } = actived
|
|
519
|
-
if (args &&
|
|
519
|
+
if (args && this.findRowIndexOf(afterFullData, row) > -1 && $el.querySelectorAll('.vxe-body--column.col--actived').length) {
|
|
520
520
|
return Object.assign({}, args)
|
|
521
521
|
}
|
|
522
522
|
return null
|
|
@@ -618,7 +618,7 @@ export default {
|
|
|
618
618
|
const { tableData, editOpts, visibleColumn } = this
|
|
619
619
|
const column = XEUtils.isString(fieldOrColumn) ? this.getColumnByField(fieldOrColumn) : fieldOrColumn
|
|
620
620
|
if (row && column && editOpts.trigger !== 'manual') {
|
|
621
|
-
const rowIndex =
|
|
621
|
+
const rowIndex = this.findRowIndexOf(tableData, row)
|
|
622
622
|
if (rowIndex > -1) {
|
|
623
623
|
const cell = this.getCell(row, column)
|
|
624
624
|
const params = { row, rowIndex, column, columnIndex: visibleColumn.indexOf(column), cell }
|
|
@@ -265,7 +265,7 @@ export default {
|
|
|
265
265
|
if (compConf && compConf.itemResetMethod) {
|
|
266
266
|
compConf.itemResetMethod({ data, field, property: field, item, $form: this })
|
|
267
267
|
} else if (field) {
|
|
268
|
-
XEUtils.set(data, field, resetValue === null ? getResetValue(XEUtils.get(data, field), undefined) : resetValue)
|
|
268
|
+
XEUtils.set(data, field, resetValue === null ? getResetValue(XEUtils.get(data, field), undefined) : XEUtils.clone(resetValue, true))
|
|
269
269
|
}
|
|
270
270
|
}
|
|
271
271
|
})
|
|
@@ -299,7 +299,7 @@ function renderDatePanel (h, _vm) {
|
|
|
299
299
|
}
|
|
300
300
|
}, [
|
|
301
301
|
h('i', {
|
|
302
|
-
class: 'vxe-icon
|
|
302
|
+
class: 'vxe-icon-caret-left'
|
|
303
303
|
})
|
|
304
304
|
]),
|
|
305
305
|
h('span', {
|
|
@@ -309,7 +309,7 @@ function renderDatePanel (h, _vm) {
|
|
|
309
309
|
}
|
|
310
310
|
}, [
|
|
311
311
|
h('i', {
|
|
312
|
-
class: 'vxe-icon
|
|
312
|
+
class: 'vxe-icon-dot'
|
|
313
313
|
})
|
|
314
314
|
]),
|
|
315
315
|
h('span', {
|
|
@@ -321,7 +321,7 @@ function renderDatePanel (h, _vm) {
|
|
|
321
321
|
}
|
|
322
322
|
}, [
|
|
323
323
|
h('i', {
|
|
324
|
-
class: 'vxe-icon
|
|
324
|
+
class: 'vxe-icon-caret-right'
|
|
325
325
|
})
|
|
326
326
|
]),
|
|
327
327
|
multiple && supportMultiples ? h('span', {
|
|
@@ -217,9 +217,9 @@ export const Cell = {
|
|
|
217
217
|
return $table.callSlot(slots.icon, params, h, cellVNodes)
|
|
218
218
|
}
|
|
219
219
|
if (!isHidden) {
|
|
220
|
-
isAceived =
|
|
220
|
+
isAceived = $table.findRowIndexOf(treeExpandeds, row) > -1
|
|
221
221
|
if (lazy) {
|
|
222
|
-
isLazyLoaded =
|
|
222
|
+
isLazyLoaded = $table.findRowIndexOf(treeLazyLoadeds, row) > -1
|
|
223
223
|
hasLazyChilds = row[hasChild]
|
|
224
224
|
}
|
|
225
225
|
}
|
|
@@ -411,7 +411,7 @@ export const Cell = {
|
|
|
411
411
|
},
|
|
412
412
|
renderCheckboxCell (h, params) {
|
|
413
413
|
const { $table, row, column, isHidden } = params
|
|
414
|
-
const { treeConfig, treeIndeterminates } = $table
|
|
414
|
+
const { treeConfig, treeIndeterminates, selection } = $table
|
|
415
415
|
const { labelField, checkMethod, visibleMethod } = $table.checkboxOpts
|
|
416
416
|
const { slots } = column
|
|
417
417
|
const defaultSlot = slots ? slots.default : null
|
|
@@ -422,7 +422,7 @@ export const Cell = {
|
|
|
422
422
|
let isDisabled = !!checkMethod
|
|
423
423
|
let on
|
|
424
424
|
if (!isHidden) {
|
|
425
|
-
isChecked = $table.selection
|
|
425
|
+
isChecked = $table.findRowIndexOf(selection, row) > -1
|
|
426
426
|
on = {
|
|
427
427
|
click (evnt) {
|
|
428
428
|
if (!isDisabled && isVisible) {
|
|
@@ -434,7 +434,7 @@ export const Cell = {
|
|
|
434
434
|
isDisabled = !checkMethod({ row })
|
|
435
435
|
}
|
|
436
436
|
if (treeConfig) {
|
|
437
|
-
indeterminate =
|
|
437
|
+
indeterminate = $table.findRowIndexOf(treeIndeterminates, row) > -1
|
|
438
438
|
}
|
|
439
439
|
}
|
|
440
440
|
const checkboxParams = { ...params, checked: isChecked, disabled: isDisabled, visible: isVisible, indeterminate }
|
|
@@ -501,7 +501,7 @@ export const Cell = {
|
|
|
501
501
|
isDisabled = !checkMethod({ row })
|
|
502
502
|
}
|
|
503
503
|
if (treeConfig) {
|
|
504
|
-
indeterminate =
|
|
504
|
+
indeterminate = $table.findRowIndexOf(treeIndeterminates, row) > -1
|
|
505
505
|
}
|
|
506
506
|
}
|
|
507
507
|
const checkboxParams = { ...params, checked: isChecked, disabled: isDisabled, visible: isVisible, indeterminate }
|
|
@@ -559,9 +559,9 @@ export const Cell = {
|
|
|
559
559
|
return $table.callSlot(slots.icon, params, h)
|
|
560
560
|
}
|
|
561
561
|
if (!isHidden) {
|
|
562
|
-
isAceived =
|
|
562
|
+
isAceived = $table.findRowIndexOf(rowExpandeds, params.row) > -1
|
|
563
563
|
if (lazy) {
|
|
564
|
-
isLazyLoaded =
|
|
564
|
+
isLazyLoaded = $table.findRowIndexOf(expandLazyLoadeds, row) > -1
|
|
565
565
|
}
|
|
566
566
|
}
|
|
567
567
|
return [
|
|
@@ -1125,9 +1125,9 @@ const Methods = {
|
|
|
1125
1125
|
} else {
|
|
1126
1126
|
const { selection } = this
|
|
1127
1127
|
if (treeConfig) {
|
|
1128
|
-
rowList = XEUtils.filterTree(currTableData, row =>
|
|
1128
|
+
rowList = XEUtils.filterTree(currTableData, row => this.findRowIndexOf(selection, row) > -1, { children: transform ? mapChildren : children })
|
|
1129
1129
|
} else {
|
|
1130
|
-
rowList = currTableData.filter(row =>
|
|
1130
|
+
rowList = currTableData.filter(row => this.findRowIndexOf(selection, row) > -1)
|
|
1131
1131
|
}
|
|
1132
1132
|
}
|
|
1133
1133
|
return rowList
|
|
@@ -2727,7 +2727,7 @@ const Methods = {
|
|
|
2727
2727
|
getCheckboxIndeterminateRecords (isFull) {
|
|
2728
2728
|
const { treeConfig, treeIndeterminates, afterFullData } = this
|
|
2729
2729
|
if (treeConfig) {
|
|
2730
|
-
return isFull ? treeIndeterminates.slice(0) : treeIndeterminates.filter(row =>
|
|
2730
|
+
return isFull ? treeIndeterminates.slice(0) : treeIndeterminates.filter(row => this.findRowIndexOf(afterFullData, row) > -1)
|
|
2731
2731
|
}
|
|
2732
2732
|
return []
|
|
2733
2733
|
},
|
|
@@ -2762,14 +2762,16 @@ const Methods = {
|
|
|
2762
2762
|
return this.$nextTick()
|
|
2763
2763
|
},
|
|
2764
2764
|
isCheckedByCheckboxRow (row) {
|
|
2765
|
+
const { selection } = this
|
|
2765
2766
|
const { checkField } = this.checkboxOpts
|
|
2766
2767
|
if (checkField) {
|
|
2767
2768
|
return XEUtils.get(row, checkField)
|
|
2768
2769
|
}
|
|
2769
|
-
return this.selection
|
|
2770
|
+
return this.findRowIndexOf(selection, row) > -1
|
|
2770
2771
|
},
|
|
2771
2772
|
isIndeterminateByCheckboxRow (row) {
|
|
2772
|
-
|
|
2773
|
+
const { treeIndeterminates } = this
|
|
2774
|
+
return this.findRowIndexOf(treeIndeterminates, row) > -1 && !this.isCheckedByCheckboxRow(row)
|
|
2773
2775
|
},
|
|
2774
2776
|
/**
|
|
2775
2777
|
* 多选,行选中事件
|
|
@@ -2781,31 +2783,31 @@ const Methods = {
|
|
|
2781
2783
|
if (checkField) {
|
|
2782
2784
|
if (treeConfig && !checkStrictly) {
|
|
2783
2785
|
if (value === -1) {
|
|
2784
|
-
if (
|
|
2786
|
+
if (this.findRowIndexOf(treeIndeterminates, row) === -1) {
|
|
2785
2787
|
treeIndeterminates.push(row)
|
|
2786
2788
|
}
|
|
2787
2789
|
XEUtils.set(row, checkField, false)
|
|
2788
2790
|
} else {
|
|
2789
2791
|
// 更新子节点状态
|
|
2790
2792
|
XEUtils.eachTree([row], (item) => {
|
|
2791
|
-
if (row
|
|
2793
|
+
if (this.eqRow(item, row) || (!checkMethod || checkMethod({ row: item }))) {
|
|
2792
2794
|
XEUtils.set(item, checkField, value)
|
|
2793
|
-
XEUtils.remove(treeIndeterminates, half => half
|
|
2795
|
+
XEUtils.remove(treeIndeterminates, half => this.eqRow(half, item))
|
|
2794
2796
|
this.handleCheckboxReserveRow(row, value)
|
|
2795
2797
|
}
|
|
2796
2798
|
}, treeOpts)
|
|
2797
2799
|
}
|
|
2798
2800
|
// 如果存在父节点,更新父节点状态
|
|
2799
|
-
const matchObj = XEUtils.findTree(afterFullData, item => item
|
|
2801
|
+
const matchObj = XEUtils.findTree(afterFullData, item => this.eqRow(item, row), treeOpts)
|
|
2800
2802
|
if (matchObj && matchObj.parent) {
|
|
2801
2803
|
let parentStatus
|
|
2802
2804
|
const vItems = checkMethod ? matchObj.items.filter((item) => checkMethod({ row: item })) : matchObj.items
|
|
2803
|
-
const indeterminatesItem = XEUtils.find(matchObj.items, item =>
|
|
2805
|
+
const indeterminatesItem = XEUtils.find(matchObj.items, item => this.findRowIndexOf(treeIndeterminates, item) > -1)
|
|
2804
2806
|
if (indeterminatesItem) {
|
|
2805
2807
|
parentStatus = -1
|
|
2806
2808
|
} else {
|
|
2807
2809
|
const selectItems = matchObj.items.filter(item => XEUtils.get(item, checkField))
|
|
2808
|
-
parentStatus = selectItems.filter(item =>
|
|
2810
|
+
parentStatus = selectItems.filter(item => this.findRowIndexOf(vItems, item) > -1).length === vItems.length ? true : (selectItems.length || value === -1 ? -1 : false)
|
|
2809
2811
|
}
|
|
2810
2812
|
return this.handleSelectRow({ row: matchObj.parent }, parentStatus)
|
|
2811
2813
|
}
|
|
@@ -2818,46 +2820,46 @@ const Methods = {
|
|
|
2818
2820
|
} else {
|
|
2819
2821
|
if (treeConfig && !checkStrictly) {
|
|
2820
2822
|
if (value === -1) {
|
|
2821
|
-
if (
|
|
2823
|
+
if (this.findRowIndexOf(treeIndeterminates, row) === -1) {
|
|
2822
2824
|
treeIndeterminates.push(row)
|
|
2823
2825
|
}
|
|
2824
|
-
XEUtils.remove(selection, item => item
|
|
2826
|
+
XEUtils.remove(selection, item => this.eqRow(item, row))
|
|
2825
2827
|
} else {
|
|
2826
2828
|
// 更新子节点状态
|
|
2827
2829
|
XEUtils.eachTree([row], (item) => {
|
|
2828
|
-
if (row
|
|
2830
|
+
if (this.eqRow(item, row) || (!checkMethod || checkMethod({ row: item }))) {
|
|
2829
2831
|
if (value) {
|
|
2830
2832
|
selection.push(item)
|
|
2831
2833
|
} else {
|
|
2832
|
-
XEUtils.remove(selection, select => select
|
|
2834
|
+
XEUtils.remove(selection, select => this.eqRow(select, item))
|
|
2833
2835
|
}
|
|
2834
|
-
XEUtils.remove(treeIndeterminates, half => half
|
|
2836
|
+
XEUtils.remove(treeIndeterminates, half => this.eqRow(half, item))
|
|
2835
2837
|
this.handleCheckboxReserveRow(row, value)
|
|
2836
2838
|
}
|
|
2837
2839
|
}, treeOpts)
|
|
2838
2840
|
}
|
|
2839
2841
|
// 如果存在父节点,更新父节点状态
|
|
2840
|
-
const matchObj = XEUtils.findTree(afterFullData, item => item
|
|
2842
|
+
const matchObj = XEUtils.findTree(afterFullData, item => this.eqRow(item, row), treeOpts)
|
|
2841
2843
|
if (matchObj && matchObj.parent) {
|
|
2842
2844
|
let parentStatus
|
|
2843
2845
|
const vItems = checkMethod ? matchObj.items.filter((item) => checkMethod({ row: item })) : matchObj.items
|
|
2844
|
-
const indeterminatesItem = XEUtils.find(matchObj.items, item =>
|
|
2846
|
+
const indeterminatesItem = XEUtils.find(matchObj.items, item => this.findRowIndexOf(treeIndeterminates, item) > -1)
|
|
2845
2847
|
if (indeterminatesItem) {
|
|
2846
2848
|
parentStatus = -1
|
|
2847
2849
|
} else {
|
|
2848
|
-
const selectItems = matchObj.items.filter(item =>
|
|
2849
|
-
parentStatus = selectItems.filter(item =>
|
|
2850
|
+
const selectItems = matchObj.items.filter(item => this.findRowIndexOf(selection, item) > -1)
|
|
2851
|
+
parentStatus = selectItems.filter(item => this.findRowIndexOf(vItems, item) > -1).length === vItems.length ? true : (selectItems.length || value === -1 ? -1 : false)
|
|
2850
2852
|
}
|
|
2851
2853
|
return this.handleSelectRow({ row: matchObj.parent }, parentStatus)
|
|
2852
2854
|
}
|
|
2853
2855
|
} else {
|
|
2854
2856
|
if (!checkMethod || checkMethod({ row })) {
|
|
2855
2857
|
if (value) {
|
|
2856
|
-
if (
|
|
2858
|
+
if (this.findRowIndexOf(selection, row) === -1) {
|
|
2857
2859
|
selection.push(row)
|
|
2858
2860
|
}
|
|
2859
2861
|
} else {
|
|
2860
|
-
XEUtils.remove(selection, item => item
|
|
2862
|
+
XEUtils.remove(selection, item => this.eqRow(item, row))
|
|
2861
2863
|
}
|
|
2862
2864
|
this.handleCheckboxReserveRow(row, value)
|
|
2863
2865
|
}
|
|
@@ -2869,7 +2871,7 @@ const Methods = {
|
|
|
2869
2871
|
const { selection, checkboxOpts } = this
|
|
2870
2872
|
const { checkField } = checkboxOpts
|
|
2871
2873
|
const { row } = params
|
|
2872
|
-
const value = checkField ? !XEUtils.get(row, checkField) :
|
|
2874
|
+
const value = checkField ? !XEUtils.get(row, checkField) : this.findRowIndexOf(selection, row) === -1
|
|
2873
2875
|
if (evnt) {
|
|
2874
2876
|
this.triggerCheckRowEvent(evnt, params, value)
|
|
2875
2877
|
} else {
|
|
@@ -2880,7 +2882,12 @@ const Methods = {
|
|
|
2880
2882
|
const { checkMethod } = this.checkboxOpts
|
|
2881
2883
|
if (!checkMethod || checkMethod({ row: params.row })) {
|
|
2882
2884
|
this.handleSelectRow(params, value)
|
|
2883
|
-
this.emitEvent('checkbox-change', Object.assign({
|
|
2885
|
+
this.emitEvent('checkbox-change', Object.assign({
|
|
2886
|
+
records: this.getCheckboxRecords(),
|
|
2887
|
+
reserves: this.getCheckboxReserveRecords(),
|
|
2888
|
+
indeterminates: this.getCheckboxIndeterminateRecords(),
|
|
2889
|
+
checked: value
|
|
2890
|
+
}, params), evnt)
|
|
2884
2891
|
}
|
|
2885
2892
|
},
|
|
2886
2893
|
/**
|
|
@@ -2898,7 +2905,7 @@ const Methods = {
|
|
|
2898
2905
|
const { afterFullData, treeConfig, treeOpts, selection, checkboxReserveRowMap, checkboxOpts } = this
|
|
2899
2906
|
const { checkField, reserve, checkStrictly, checkMethod } = checkboxOpts
|
|
2900
2907
|
let selectRows = []
|
|
2901
|
-
const beforeSelection = treeConfig ? [] : selection.filter(row =>
|
|
2908
|
+
const beforeSelection = treeConfig ? [] : selection.filter(row => this.findRowIndexOf(afterFullData, row) === -1)
|
|
2902
2909
|
if (checkStrictly) {
|
|
2903
2910
|
this.isAllSelected = value
|
|
2904
2911
|
} else {
|
|
@@ -2945,7 +2952,7 @@ const Methods = {
|
|
|
2945
2952
|
*/
|
|
2946
2953
|
if (checkMethod) {
|
|
2947
2954
|
XEUtils.eachTree(afterFullData, (row) => {
|
|
2948
|
-
if (checkMethod({ row }) ? 0 :
|
|
2955
|
+
if (checkMethod({ row }) ? 0 : this.findRowIndexOf(selection, row) > -1) {
|
|
2949
2956
|
selectRows.push(row)
|
|
2950
2957
|
}
|
|
2951
2958
|
}, treeOpts)
|
|
@@ -2959,7 +2966,7 @@ const Methods = {
|
|
|
2959
2966
|
* 如果不存在选中方法,则添加所有数据到临时集合中
|
|
2960
2967
|
*/
|
|
2961
2968
|
if (checkMethod) {
|
|
2962
|
-
selectRows = afterFullData.filter((row) =>
|
|
2969
|
+
selectRows = afterFullData.filter((row) => this.findRowIndexOf(selection, row) > -1 || checkMethod({ row }))
|
|
2963
2970
|
} else {
|
|
2964
2971
|
selectRows = afterFullData.slice(0)
|
|
2965
2972
|
}
|
|
@@ -2970,7 +2977,7 @@ const Methods = {
|
|
|
2970
2977
|
* 如果不存在选中方法,无需处理,临时集合默认为空
|
|
2971
2978
|
*/
|
|
2972
2979
|
if (checkMethod) {
|
|
2973
|
-
selectRows = afterFullData.filter((row) => checkMethod({ row }) ? 0 :
|
|
2980
|
+
selectRows = afterFullData.filter((row) => checkMethod({ row }) ? 0 : this.findRowIndexOf(selection, row) > -1)
|
|
2974
2981
|
}
|
|
2975
2982
|
}
|
|
2976
2983
|
}
|
|
@@ -3017,9 +3024,9 @@ const Methods = {
|
|
|
3017
3024
|
isAllSelected = isAllResolve && afterFullData.length !== disableRows.length
|
|
3018
3025
|
if (treeConfig) {
|
|
3019
3026
|
if (halfField) {
|
|
3020
|
-
isIndeterminate = !isAllSelected && afterFullData.some(row => XEUtils.get(row, checkField) || XEUtils.get(row, halfField) ||
|
|
3027
|
+
isIndeterminate = !isAllSelected && afterFullData.some(row => XEUtils.get(row, checkField) || XEUtils.get(row, halfField) || this.findRowIndexOf(treeIndeterminates, row) > -1)
|
|
3021
3028
|
} else {
|
|
3022
|
-
isIndeterminate = !isAllSelected && afterFullData.some(row => XEUtils.get(row, checkField) ||
|
|
3029
|
+
isIndeterminate = !isAllSelected && afterFullData.some(row => XEUtils.get(row, checkField) || this.findRowIndexOf(treeIndeterminates, row) > -1)
|
|
3023
3030
|
}
|
|
3024
3031
|
} else {
|
|
3025
3032
|
if (halfField) {
|
|
@@ -3036,19 +3043,19 @@ const Methods = {
|
|
|
3036
3043
|
disableRows.push(row)
|
|
3037
3044
|
return true
|
|
3038
3045
|
}
|
|
3039
|
-
if (
|
|
3046
|
+
if (this.findRowIndexOf(selection, row) > -1) {
|
|
3040
3047
|
checkRows.push(row)
|
|
3041
3048
|
return true
|
|
3042
3049
|
}
|
|
3043
3050
|
return false
|
|
3044
3051
|
}
|
|
3045
|
-
: row =>
|
|
3052
|
+
: row => this.findRowIndexOf(selection, row) > -1
|
|
3046
3053
|
)
|
|
3047
3054
|
isAllSelected = isAllResolve && afterFullData.length !== disableRows.length
|
|
3048
3055
|
if (treeConfig) {
|
|
3049
|
-
isIndeterminate = !isAllSelected && afterFullData.some(row =>
|
|
3056
|
+
isIndeterminate = !isAllSelected && afterFullData.some(row => this.findRowIndexOf(treeIndeterminates, row) > -1 || this.findRowIndexOf(selection, row) > -1)
|
|
3050
3057
|
} else {
|
|
3051
|
-
isIndeterminate = !isAllSelected && afterFullData.some(row =>
|
|
3058
|
+
isIndeterminate = !isAllSelected && afterFullData.some(row => this.findRowIndexOf(selection, row) > -1)
|
|
3052
3059
|
}
|
|
3053
3060
|
}
|
|
3054
3061
|
this.isAllSelected = isAllSelected
|
|
@@ -3695,7 +3702,7 @@ const Methods = {
|
|
|
3695
3702
|
const rest = fullAllDataRowMap.get(row)
|
|
3696
3703
|
if (lazy && rest) {
|
|
3697
3704
|
rest.expandLoaded = false
|
|
3698
|
-
XEUtils.remove(expandLazyLoadeds, item => row
|
|
3705
|
+
XEUtils.remove(expandLazyLoadeds, item => this.eqRow(item, row))
|
|
3699
3706
|
}
|
|
3700
3707
|
return this.$nextTick()
|
|
3701
3708
|
},
|
|
@@ -3706,7 +3713,7 @@ const Methods = {
|
|
|
3706
3713
|
reloadRowExpand (row) {
|
|
3707
3714
|
const { expandOpts, expandLazyLoadeds } = this
|
|
3708
3715
|
const { lazy } = expandOpts
|
|
3709
|
-
if (lazy &&
|
|
3716
|
+
if (lazy && this.findRowIndexOf(expandLazyLoadeds, row) === -1) {
|
|
3710
3717
|
this.clearRowExpandLoaded(row)
|
|
3711
3718
|
.then(() => this.handleAsyncRowExpand(row))
|
|
3712
3719
|
}
|
|
@@ -3726,7 +3733,7 @@ const Methods = {
|
|
|
3726
3733
|
const { expandOpts, expandLazyLoadeds, expandColumn: column } = this
|
|
3727
3734
|
const { row } = params
|
|
3728
3735
|
const { lazy } = expandOpts
|
|
3729
|
-
if (!lazy ||
|
|
3736
|
+
if (!lazy || this.findRowIndexOf(expandLazyLoadeds, row) === -1) {
|
|
3730
3737
|
const expanded = !this.isExpandByRow(row)
|
|
3731
3738
|
const columnIndex = this.getColumnIndex(column)
|
|
3732
3739
|
const $columnIndex = this.getVMColumnIndex(column)
|
|
@@ -3775,7 +3782,7 @@ const Methods = {
|
|
|
3775
3782
|
}).catch(() => {
|
|
3776
3783
|
rest.expandLoaded = false
|
|
3777
3784
|
}).finally(() => {
|
|
3778
|
-
XEUtils.remove(this.expandLazyLoadeds, item => item
|
|
3785
|
+
XEUtils.remove(this.expandLazyLoadeds, item => this.eqRow(item, row))
|
|
3779
3786
|
resolve(this.$nextTick().then(this.recalculate))
|
|
3780
3787
|
})
|
|
3781
3788
|
})
|
|
@@ -3806,9 +3813,9 @@ const Methods = {
|
|
|
3806
3813
|
const validRows = toggleMethod ? rows.filter(row => toggleMethod({ expanded, column, columnIndex, $columnIndex, row, rowIndex: this.getRowIndex(row), $rowIndex: this.getVMRowIndex(row) })) : rows
|
|
3807
3814
|
if (expanded) {
|
|
3808
3815
|
validRows.forEach(row => {
|
|
3809
|
-
if (
|
|
3816
|
+
if (this.findRowIndexOf(rowExpandeds, row) === -1) {
|
|
3810
3817
|
const rest = fullAllDataRowMap.get(row)
|
|
3811
|
-
const isLoad = lazy && !rest.expandLoaded &&
|
|
3818
|
+
const isLoad = lazy && !rest.expandLoaded && this.findRowIndexOf(expandLazyLoadeds, row) === -1
|
|
3812
3819
|
if (isLoad) {
|
|
3813
3820
|
lazyRests.push(this.handleAsyncRowExpand(row))
|
|
3814
3821
|
} else {
|
|
@@ -3817,7 +3824,7 @@ const Methods = {
|
|
|
3817
3824
|
}
|
|
3818
3825
|
})
|
|
3819
3826
|
} else {
|
|
3820
|
-
XEUtils.remove(rowExpandeds, row =>
|
|
3827
|
+
XEUtils.remove(rowExpandeds, row => this.findRowIndexOf(validRows, row) > -1)
|
|
3821
3828
|
}
|
|
3822
3829
|
if (reserve) {
|
|
3823
3830
|
validRows.forEach(row => this.handleRowExpandReserve(row, expanded))
|
|
@@ -3831,7 +3838,8 @@ const Methods = {
|
|
|
3831
3838
|
* @param {Row} row 行对象
|
|
3832
3839
|
*/
|
|
3833
3840
|
isExpandByRow (row) {
|
|
3834
|
-
|
|
3841
|
+
const { rowExpandeds } = this
|
|
3842
|
+
return this.findRowIndexOf(rowExpandeds, row) > -1
|
|
3835
3843
|
},
|
|
3836
3844
|
/**
|
|
3837
3845
|
* 手动清空展开行状态,数据会恢复成未展开的状态
|
|
@@ -409,7 +409,7 @@ export default {
|
|
|
409
409
|
zoom && $xegrid ? h('vxe-button', {
|
|
410
410
|
props: {
|
|
411
411
|
circle: true,
|
|
412
|
-
icon: $xegrid.isMaximized() ? (zoomOpts.iconOut || GlobalConfig.icon.
|
|
412
|
+
icon: $xegrid.isMaximized() ? (zoomOpts.iconOut || GlobalConfig.icon.TOOLBAR_TOOLS_MINIMIZE) : (zoomOpts.iconIn || GlobalConfig.icon.TOOLBAR_TOOLS_FULLSCREEN)
|
|
413
413
|
},
|
|
414
414
|
attrs: {
|
|
415
415
|
title: GlobalConfig.i18n(`vxe.toolbar.zoom${$xegrid.isMaximized() ? 'Out' : 'In'}`)
|