vxe-table 3.5.9-beta.13 → 3.5.9-beta.14

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.
Files changed (48) hide show
  1. package/lib/form/src/form-config-item.js +4 -2
  2. package/lib/form/src/form-config-item.min.js +1 -1
  3. package/lib/form/src/form-item.js +4 -2
  4. package/lib/form/src/form-item.min.js +1 -1
  5. package/lib/form/src/form.js +3 -1
  6. package/lib/form/src/form.min.js +1 -1
  7. package/lib/grid/src/grid.js +3 -1
  8. package/lib/grid/src/grid.min.js +1 -1
  9. package/lib/grid/style/style.css +1 -1
  10. package/lib/grid/style/style.min.css +1 -1
  11. package/lib/index.css +1 -1
  12. package/lib/index.umd.js +46 -25
  13. package/lib/index.umd.min.js +1 -1
  14. package/lib/modal/src/modal.js +9 -7
  15. package/lib/modal/src/modal.min.js +1 -1
  16. package/lib/modal/style/style.css +2 -2
  17. package/lib/modal/style/style.min.css +1 -1
  18. package/lib/pager/style/style.css +1 -1
  19. package/lib/pager/style/style.min.css +1 -1
  20. package/lib/select/src/select.js +3 -1
  21. package/lib/select/src/select.min.js +1 -1
  22. package/lib/style.css +1 -1
  23. package/lib/style.min.css +1 -1
  24. package/lib/table/src/cell.js +14 -8
  25. package/lib/table/src/cell.min.js +1 -1
  26. package/lib/table/src/methods.js +3 -1
  27. package/lib/table/src/methods.min.js +1 -1
  28. package/lib/toolbar/style/style.css +1 -1
  29. package/lib/toolbar/style/style.min.css +1 -1
  30. package/lib/tools/log.js +1 -1
  31. package/lib/tools/log.min.js +1 -1
  32. package/lib/tools/vn.js +18 -0
  33. package/lib/tools/vn.min.js +1 -0
  34. package/lib/v-x-e-table/index.js +1 -1
  35. package/lib/v-x-e-table/index.min.js +1 -1
  36. package/lib/v-x-e-table/style/style.css +1 -1
  37. package/lib/v-x-e-table/style/style.min.css +1 -1
  38. package/package.json +1 -1
  39. package/packages/form/src/form-config-item.js +3 -2
  40. package/packages/form/src/form-item.js +3 -2
  41. package/packages/form/src/form.js +2 -1
  42. package/packages/grid/src/grid.js +2 -1
  43. package/packages/modal/src/modal.js +5 -4
  44. package/packages/select/src/select.js +2 -1
  45. package/packages/table/src/cell.js +9 -5
  46. package/packages/table/src/methods.js +2 -1
  47. package/packages/tools/vn.js +8 -0
  48. package/styles/variable.scss +1 -1
@@ -145,7 +145,7 @@
145
145
  -moz-user-select: none;
146
146
  -ms-user-select: none;
147
147
  user-select: none;
148
- background-color: rgba(0, 0, 0, 0.2); }
148
+ background-color: rgba(0, 0, 0, 0.3); }
149
149
  .vxe-toolbar .vxe-buttons--wrapper {
150
150
  -webkit-box-flex: 1;
151
151
  -ms-flex-positive: 1;
@@ -1 +1 @@
1
- .vxe-custom--option{position:relative;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:pointer}.vxe-custom--option .vxe-checkbox--icon{display:none;position:absolute;height:1em;width:1em}.vxe-custom--option .vxe-checkbox--icon{font-size:16px}.vxe-custom--option .vxe-checkbox--icon:before{content:"";position:absolute;height:1em;width:1em;top:0;left:0;background-color:#fff;border-radius:2px;border:2px solid #dcdfe6}.vxe-custom--option .vxe-checkbox--unchecked-icon{display:inline-block}.vxe-custom--option .vxe-checkbox--checked-icon:after{content:"";position:absolute;height:.64em;width:.32em;top:50%;left:50%;border:2px solid #fff;border-left:0;border-top:0;-webkit-transform:translate(-50%,-50%) rotate(45deg);transform:translate(-50%,-50%) rotate(45deg)}.vxe-custom--option .vxe-checkbox--indeterminate-icon:after{content:"";position:absolute;top:50%;left:50%;height:2px;width:.6em;background-color:#fff;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.is--checked.vxe-custom--option,.is--indeterminate.vxe-custom--option{color:#409eff}.is--checked.vxe-custom--option .vxe-checkbox--unchecked-icon,.is--indeterminate.vxe-custom--option .vxe-checkbox--unchecked-icon{display:none}.is--checked.vxe-custom--option .vxe-checkbox--icon:before,.is--indeterminate.vxe-custom--option .vxe-checkbox--icon:before{border-color:#409eff;background-color:#409eff}.is--checked.vxe-custom--option .vxe-checkbox--checked-icon{display:inline-block}.is--indeterminate.vxe-custom--option .vxe-checkbox--indeterminate-icon{display:inline-block}.vxe-custom--option:not(.is--disabled):hover .vxe-checkbox--icon:before{border-color:#409eff}.is--disabled.vxe-custom--option{cursor:not-allowed;color:#bfbfbf}.is--disabled.vxe-custom--option .vxe-checkbox--icon:before{border-color:#dcdfe6;background-color:#f3f3f3}.is--disabled.vxe-custom--option .vxe-checkbox--icon:after{border-color:#c0c4cc}.is--disabled.vxe-custom--option .vxe-checkbox--indeterminate-icon:after{background-color:#c0c4cc}.vxe-toolbar{position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:.6em 0;color:#606266;font-family:-apple-system,BlinkMacSystemFont,Segoe UI,PingFang SC,Hiragino Sans GB,Microsoft YaHei,Helvetica Neue,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol;background-color:#fff}.vxe-toolbar:after{content:"";display:block;clear:both;height:0;overflow:hidden;visibility:hidden}.vxe-toolbar.is--perfect{border:1px solid #e8eaec;border-bottom-width:0;background-color:#f8f8f9}.vxe-toolbar.is--loading:before{content:"";position:absolute;top:0;left:0;width:100%;height:100%;z-index:999;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-color:rgba(0,0,0,.2)}.vxe-toolbar .vxe-buttons--wrapper{-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1}.vxe-toolbar .vxe-buttons--wrapper>.vxe-button+.vxe-button--item,.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item+.vxe-button,.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item+.vxe-button--item{margin-left:.8em}.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item{display:inline-block}.vxe-toolbar .vxe-tools--wrapper>.vxe-button+.vxe-tool--item,.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item+.vxe-button,.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item+.vxe-tool--item{margin-left:.8em}.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item{display:inline-block}.vxe-toolbar .vxe-tools--wrapper>.vxe-button{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.vxe-toolbar .vxe-buttons--wrapper,.vxe-toolbar .vxe-tools--operate,.vxe-toolbar .vxe-tools--wrapper{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.vxe-toolbar .vxe-buttons--wrapper,.vxe-toolbar .vxe-tools--wrapper{-ms-flex-wrap:wrap;flex-wrap:wrap}.vxe-toolbar .vxe-tools--operate{-ms-flex-negative:0;flex-shrink:0}.vxe-toolbar .vxe-custom--wrapper{position:relative;margin-left:.8em}.vxe-toolbar .vxe-custom--wrapper.is--active>.vxe-button{background-color:#d9dadb;border-radius:50%}.vxe-toolbar .vxe-custom--wrapper.is--active .vxe-custom--option-wrapper{display:block}.vxe-toolbar .vxe-custom--option-wrapper{display:none;position:absolute;right:2px;text-align:left;background-color:#fff;z-index:19;border:1px solid #e8eaec;border-radius:4px;-webkit-box-shadow:0 1px 6px rgba(0,0,0,.2);box-shadow:0 1px 6px rgba(0,0,0,.2)}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header{padding:.28em 0;font-weight:700;border-bottom:1px solid #dadce0}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body{padding:.2em 0;max-height:17.6em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body .vxe-custom--option:hover{background-color:#f5f7fa}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li{max-width:16em;min-width:12.5em;padding:.2em 1em .2em 2.3em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--2,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--2{padding-left:3.5em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--2 .vxe-checkbox--icon,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--2 .vxe-checkbox--icon{left:1.8em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--3,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--3{padding-left:4.5em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--3 .vxe-checkbox--icon,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--3 .vxe-checkbox--icon{left:2.8em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--4,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--4{padding-left:5.5em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--4 .vxe-checkbox--icon,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--4 .vxe-checkbox--icon{left:3.8em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--5,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--5{padding-left:6.5em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--5 .vxe-checkbox--icon,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--5 .vxe-checkbox--icon{left:4.8em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--6,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--6{padding-left:7.5em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--6 .vxe-checkbox--icon,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--6 .vxe-checkbox--icon{left:5.8em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--7,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--7{padding-left:8.5em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--7 .vxe-checkbox--icon,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--7 .vxe-checkbox--icon{left:6.8em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--8,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--8{padding-left:9.5em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--8 .vxe-checkbox--icon,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--8 .vxe-checkbox--icon{left:7.8em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--footer{border-top:1px solid #dadce0;text-align:right}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--footer button{background-color:transparent;width:50%;height:2.5em;border:0;color:#606266;text-align:center;cursor:pointer}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--footer button:focus{outline:0}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--footer button:hover{color:#409eff}.vxe-custom--option-wrapper .vxe-custom--body,.vxe-custom--option-wrapper .vxe-custom--header{list-style-type:none;overflow-x:hidden;overflow-y:auto;margin:0;padding:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vxe-custom--option-wrapper .vxe-custom--body>li,.vxe-custom--option-wrapper .vxe-custom--header>li{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.vxe-custom--option .vxe-checkbox--icon{left:.6em;top:.38em}.vxe-toolbar{font-size:14px}.vxe-toolbar .vxe-custom--option>.vxe-checkbox--icon{font-size:16px}.vxe-toolbar.size--medium{font-size:14px}.vxe-toolbar.size--medium .vxe-custom--option>.vxe-checkbox--icon{font-size:15px}.vxe-toolbar.size--small{font-size:13px}.vxe-toolbar.size--small .vxe-custom--option>.vxe-checkbox--icon{font-size:14px}.vxe-toolbar.size--mini{font-size:12px}.vxe-toolbar.size--mini .vxe-custom--option>.vxe-checkbox--icon{font-size:14px}
1
+ .vxe-custom--option{position:relative;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:pointer}.vxe-custom--option .vxe-checkbox--icon{display:none;position:absolute;height:1em;width:1em}.vxe-custom--option .vxe-checkbox--icon{font-size:16px}.vxe-custom--option .vxe-checkbox--icon:before{content:"";position:absolute;height:1em;width:1em;top:0;left:0;background-color:#fff;border-radius:2px;border:2px solid #dcdfe6}.vxe-custom--option .vxe-checkbox--unchecked-icon{display:inline-block}.vxe-custom--option .vxe-checkbox--checked-icon:after{content:"";position:absolute;height:.64em;width:.32em;top:50%;left:50%;border:2px solid #fff;border-left:0;border-top:0;-webkit-transform:translate(-50%,-50%) rotate(45deg);transform:translate(-50%,-50%) rotate(45deg)}.vxe-custom--option .vxe-checkbox--indeterminate-icon:after{content:"";position:absolute;top:50%;left:50%;height:2px;width:.6em;background-color:#fff;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.is--checked.vxe-custom--option,.is--indeterminate.vxe-custom--option{color:#409eff}.is--checked.vxe-custom--option .vxe-checkbox--unchecked-icon,.is--indeterminate.vxe-custom--option .vxe-checkbox--unchecked-icon{display:none}.is--checked.vxe-custom--option .vxe-checkbox--icon:before,.is--indeterminate.vxe-custom--option .vxe-checkbox--icon:before{border-color:#409eff;background-color:#409eff}.is--checked.vxe-custom--option .vxe-checkbox--checked-icon{display:inline-block}.is--indeterminate.vxe-custom--option .vxe-checkbox--indeterminate-icon{display:inline-block}.vxe-custom--option:not(.is--disabled):hover .vxe-checkbox--icon:before{border-color:#409eff}.is--disabled.vxe-custom--option{cursor:not-allowed;color:#bfbfbf}.is--disabled.vxe-custom--option .vxe-checkbox--icon:before{border-color:#dcdfe6;background-color:#f3f3f3}.is--disabled.vxe-custom--option .vxe-checkbox--icon:after{border-color:#c0c4cc}.is--disabled.vxe-custom--option .vxe-checkbox--indeterminate-icon:after{background-color:#c0c4cc}.vxe-toolbar{position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:.6em 0;color:#606266;font-family:-apple-system,BlinkMacSystemFont,Segoe UI,PingFang SC,Hiragino Sans GB,Microsoft YaHei,Helvetica Neue,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol;background-color:#fff}.vxe-toolbar:after{content:"";display:block;clear:both;height:0;overflow:hidden;visibility:hidden}.vxe-toolbar.is--perfect{border:1px solid #e8eaec;border-bottom-width:0;background-color:#f8f8f9}.vxe-toolbar.is--loading:before{content:"";position:absolute;top:0;left:0;width:100%;height:100%;z-index:999;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-color:rgba(0,0,0,.3)}.vxe-toolbar .vxe-buttons--wrapper{-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1}.vxe-toolbar .vxe-buttons--wrapper>.vxe-button+.vxe-button--item,.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item+.vxe-button,.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item+.vxe-button--item{margin-left:.8em}.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item{display:inline-block}.vxe-toolbar .vxe-tools--wrapper>.vxe-button+.vxe-tool--item,.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item+.vxe-button,.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item+.vxe-tool--item{margin-left:.8em}.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item{display:inline-block}.vxe-toolbar .vxe-tools--wrapper>.vxe-button{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.vxe-toolbar .vxe-buttons--wrapper,.vxe-toolbar .vxe-tools--operate,.vxe-toolbar .vxe-tools--wrapper{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.vxe-toolbar .vxe-buttons--wrapper,.vxe-toolbar .vxe-tools--wrapper{-ms-flex-wrap:wrap;flex-wrap:wrap}.vxe-toolbar .vxe-tools--operate{-ms-flex-negative:0;flex-shrink:0}.vxe-toolbar .vxe-custom--wrapper{position:relative;margin-left:.8em}.vxe-toolbar .vxe-custom--wrapper.is--active>.vxe-button{background-color:#d9dadb;border-radius:50%}.vxe-toolbar .vxe-custom--wrapper.is--active .vxe-custom--option-wrapper{display:block}.vxe-toolbar .vxe-custom--option-wrapper{display:none;position:absolute;right:2px;text-align:left;background-color:#fff;z-index:19;border:1px solid #e8eaec;border-radius:4px;-webkit-box-shadow:0 1px 6px rgba(0,0,0,.2);box-shadow:0 1px 6px rgba(0,0,0,.2)}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header{padding:.28em 0;font-weight:700;border-bottom:1px solid #dadce0}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body{padding:.2em 0;max-height:17.6em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body .vxe-custom--option:hover{background-color:#f5f7fa}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li{max-width:16em;min-width:12.5em;padding:.2em 1em .2em 2.3em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--2,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--2{padding-left:3.5em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--2 .vxe-checkbox--icon,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--2 .vxe-checkbox--icon{left:1.8em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--3,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--3{padding-left:4.5em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--3 .vxe-checkbox--icon,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--3 .vxe-checkbox--icon{left:2.8em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--4,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--4{padding-left:5.5em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--4 .vxe-checkbox--icon,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--4 .vxe-checkbox--icon{left:3.8em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--5,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--5{padding-left:6.5em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--5 .vxe-checkbox--icon,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--5 .vxe-checkbox--icon{left:4.8em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--6,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--6{padding-left:7.5em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--6 .vxe-checkbox--icon,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--6 .vxe-checkbox--icon{left:5.8em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--7,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--7{padding-left:8.5em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--7 .vxe-checkbox--icon,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--7 .vxe-checkbox--icon{left:6.8em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--8,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--8{padding-left:9.5em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--8 .vxe-checkbox--icon,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--8 .vxe-checkbox--icon{left:7.8em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--footer{border-top:1px solid #dadce0;text-align:right}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--footer button{background-color:transparent;width:50%;height:2.5em;border:0;color:#606266;text-align:center;cursor:pointer}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--footer button:focus{outline:0}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--footer button:hover{color:#409eff}.vxe-custom--option-wrapper .vxe-custom--body,.vxe-custom--option-wrapper .vxe-custom--header{list-style-type:none;overflow-x:hidden;overflow-y:auto;margin:0;padding:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vxe-custom--option-wrapper .vxe-custom--body>li,.vxe-custom--option-wrapper .vxe-custom--header>li{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.vxe-custom--option .vxe-checkbox--icon{left:.6em;top:.38em}.vxe-toolbar{font-size:14px}.vxe-toolbar .vxe-custom--option>.vxe-checkbox--icon{font-size:16px}.vxe-toolbar.size--medium{font-size:14px}.vxe-toolbar.size--medium .vxe-custom--option>.vxe-checkbox--icon{font-size:15px}.vxe-toolbar.size--small{font-size:13px}.vxe-toolbar.size--small .vxe-custom--option>.vxe-checkbox--icon{font-size:14px}.vxe-toolbar.size--mini{font-size:12px}.vxe-toolbar.size--mini .vxe-custom--option>.vxe-checkbox--icon{font-size:14px}
package/lib/tools/log.js CHANGED
@@ -12,7 +12,7 @@ var _conf = _interopRequireDefault(require("../v-x-e-table/src/conf"));
12
12
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
13
13
 
14
14
  function getLog(message, params) {
15
- return "[vxe-table v".concat("3.5.9-beta.13", "] ", _conf.default.i18n(message, params));
15
+ return "[vxe-table v".concat("3.5.9-beta.14", "] ", _conf.default.i18n(message, params));
16
16
  }
17
17
 
18
18
  function outLog(type) {
@@ -1 +1 @@
1
- "use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.errLog=void 0,exports.getLog=getLog,exports.warnLog=void 0;var _conf=_interopRequireDefault(require("../v-x-e-table/src/conf"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getLog(e,r){return"[vxe-table v".concat("3.5.9-beta.13","] ",_conf.default.i18n(e,r))}function outLog(o){return function(e,r){r=getLog(e,r);return console[o](r),r}}var warnLog=outLog("warn");exports.warnLog=warnLog;var errLog=outLog("error");exports.errLog=errLog;
1
+ "use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.errLog=void 0,exports.getLog=getLog,exports.warnLog=void 0;var _conf=_interopRequireDefault(require("../v-x-e-table/src/conf"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getLog(e,r){return"[vxe-table v".concat("3.5.9-beta.14","] ",_conf.default.i18n(e,r))}function outLog(o){return function(e,r){r=getLog(e,r);return console[o](r),r}}var warnLog=outLog("warn");exports.warnLog=warnLog;var errLog=outLog("error");exports.errLog=errLog;
@@ -0,0 +1,18 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.getSlotVNs = getSlotVNs;
7
+
8
+ var _xeUtils = _interopRequireDefault(require("xe-utils"));
9
+
10
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
11
+
12
+ function getSlotVNs(vns) {
13
+ if (_xeUtils.default.isArray(vns)) {
14
+ return vns;
15
+ }
16
+
17
+ return [vns];
18
+ }
@@ -0,0 +1 @@
1
+ "use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.getSlotVNs=getSlotVNs;var _xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getSlotVNs(e){return _xeUtils.default.isArray(e)?e:[e]}
@@ -221,7 +221,7 @@ var v = 'v3';
221
221
  exports.v = v;
222
222
  var VXETable = {
223
223
  v: v,
224
- version: "3.5.9-beta.13",
224
+ version: "3.5.9-beta.14",
225
225
  reg: reg,
226
226
  use: use,
227
227
  setup: _setup.setup,
@@ -1 +1 @@
1
- "use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={use:!0,config:!0,t:!0,_t:!0,v:!0,VXETable:!0};exports.VXETable=void 0,exports._t=_t,exports.default=exports.config=void 0,exports.t=t,exports.use=use,exports.v=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../v-x-e-table/src/conf")),_interceptor=require("./src/interceptor");Object.keys(_interceptor).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_interceptor[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _interceptor[e]}}))});var _renderer=require("./src/renderer");Object.keys(_renderer).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_renderer[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _renderer[e]}}))});var _commands=require("./src/commands");Object.keys(_commands).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_commands[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _commands[e]}}))});var _menus=require("./src/menus");Object.keys(_menus).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_menus[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _menus[e]}}))});var _formats=require("./src/formats");Object.keys(_formats).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_formats[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _formats[e]}}))});var _setup=require("./src/setup");Object.keys(_setup).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_setup[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _setup[e]}}))});var _utils=require("../tools/utils"),_log=require("../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function _defineProperties(e,t){for(var r=0;r<t.length;r++){var o=t[r];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}function _createClass(e,t,r){return t&&_defineProperties(e.prototype,t),r&&_defineProperties(e,r),e}var installedPlugins=[];function use(e,t){return e&&e.install&&-1===installedPlugins.indexOf(e)&&(e.install(VXETable,t),installedPlugins.push(e)),VXETable}function reg(e){"development"===process.env.NODE_ENV&&VXETable.Table&&(0,_log.errLog)("vxe.error.useErr",[e]),VXETable["_".concat(e)]=1}function getExportOrImpotType(e,r){var o=[];return _xeUtils.default.objectEach(e,function(e,t){0!==e&&e!==r||o.push(t)}),o}var VXETableConfig=function(){function e(){_classCallCheck(this,e)}return _createClass(e,[{key:"zIndex",get:function(){return _utils.UtilTools.getLastZIndex()}},{key:"nextZIndex",get:function(){return _utils.UtilTools.nextZIndex()}},{key:"exportTypes",get:function(){return getExportOrImpotType(_conf.default.export.types,1)}},{key:"importTypes",get:function(){return getExportOrImpotType(_conf.default.export.types,2)}}]),e}(),config=new VXETableConfig;function t(e,t){return _conf.default.i18n(e,t)}function _t(e,t){return e?_xeUtils.default.toValueString(_conf.default.translate?_conf.default.translate(e,t):e):""}exports.config=config;var v="v3",VXETable={v:exports.v=v,version:"3.5.9-beta.13",reg:reg,use:use,setup:_setup.setup,interceptor:_interceptor.interceptor,renderer:_renderer.renderer,commands:_commands.commands,formats:_formats.formats,menus:_menus.menus,config:config,t:t,_t:_t},_default=exports.VXETable=VXETable;exports.default=_default;
1
+ "use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={use:!0,config:!0,t:!0,_t:!0,v:!0,VXETable:!0};exports.VXETable=void 0,exports._t=_t,exports.default=exports.config=void 0,exports.t=t,exports.use=use,exports.v=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../v-x-e-table/src/conf")),_interceptor=require("./src/interceptor");Object.keys(_interceptor).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_interceptor[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _interceptor[e]}}))});var _renderer=require("./src/renderer");Object.keys(_renderer).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_renderer[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _renderer[e]}}))});var _commands=require("./src/commands");Object.keys(_commands).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_commands[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _commands[e]}}))});var _menus=require("./src/menus");Object.keys(_menus).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_menus[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _menus[e]}}))});var _formats=require("./src/formats");Object.keys(_formats).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_formats[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _formats[e]}}))});var _setup=require("./src/setup");Object.keys(_setup).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_setup[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _setup[e]}}))});var _utils=require("../tools/utils"),_log=require("../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function _defineProperties(e,t){for(var r=0;r<t.length;r++){var o=t[r];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}function _createClass(e,t,r){return t&&_defineProperties(e.prototype,t),r&&_defineProperties(e,r),e}var installedPlugins=[];function use(e,t){return e&&e.install&&-1===installedPlugins.indexOf(e)&&(e.install(VXETable,t),installedPlugins.push(e)),VXETable}function reg(e){"development"===process.env.NODE_ENV&&VXETable.Table&&(0,_log.errLog)("vxe.error.useErr",[e]),VXETable["_".concat(e)]=1}function getExportOrImpotType(e,r){var o=[];return _xeUtils.default.objectEach(e,function(e,t){0!==e&&e!==r||o.push(t)}),o}var VXETableConfig=function(){function e(){_classCallCheck(this,e)}return _createClass(e,[{key:"zIndex",get:function(){return _utils.UtilTools.getLastZIndex()}},{key:"nextZIndex",get:function(){return _utils.UtilTools.nextZIndex()}},{key:"exportTypes",get:function(){return getExportOrImpotType(_conf.default.export.types,1)}},{key:"importTypes",get:function(){return getExportOrImpotType(_conf.default.export.types,2)}}]),e}(),config=new VXETableConfig;function t(e,t){return _conf.default.i18n(e,t)}function _t(e,t){return e?_xeUtils.default.toValueString(_conf.default.translate?_conf.default.translate(e,t):e):""}exports.config=config;var v="v3",VXETable={v:exports.v=v,version:"3.5.9-beta.14",reg:reg,use:use,setup:_setup.setup,interceptor:_interceptor.interceptor,renderer:_renderer.renderer,commands:_commands.commands,formats:_formats.formats,menus:_menus.menus,config:config,t:t,_t:_t},_default=exports.VXETable=VXETable;exports.default=_default;
@@ -549,7 +549,7 @@
549
549
  -moz-user-select: none;
550
550
  -ms-user-select: none;
551
551
  user-select: none;
552
- background-color: rgba(0, 0, 0, 0.2); }
552
+ background-color: rgba(0, 0, 0, 0.3); }
553
553
  .vxe-loading.is--visible {
554
554
  display: block; }
555
555
  .vxe-loading > .vxe-loading--chunk {
@@ -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,.2)}.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";[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}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vxe-table",
3
- "version": "3.5.9-beta.13",
3
+ "version": "3.5.9-beta.14",
4
4
  "description": "一个基于 vue 的 PC 端表格组件,支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、贼灵活的配置项、扩展接口等...",
5
5
  "scripts": {
6
6
  "serve": "vue-cli-service serve",
@@ -4,6 +4,7 @@ import VXETable from '../../v-x-e-table'
4
4
  import { isEnableConf, getFuncText } from '../../tools/utils'
5
5
  import { renderTitle } from './render'
6
6
  import { isActivetem } from './util'
7
+ import { getSlotVNs } from '../../tools/vn'
7
8
 
8
9
  /**
9
10
  * 配置式项
@@ -71,9 +72,9 @@ const VxeFormConfigItem = {
71
72
  if (slots && slots.default) {
72
73
  contentVNs = $xeform.callSlot(slots.default, params, h)
73
74
  } else if (compConf && compConf.renderItemContent) {
74
- contentVNs = compConf.renderItemContent.call($xeform, h, itemRender, params)
75
+ contentVNs = getSlotVNs(compConf.renderItemContent.call($xeform, h, itemRender, params))
75
76
  } else if (compConf && compConf.renderItem) {
76
- contentVNs = compConf.renderItem.call($xeform, h, itemRender, params)
77
+ contentVNs = getSlotVNs(compConf.renderItem.call($xeform, h, itemRender, params))
77
78
  } else if (field) {
78
79
  contentVNs = [XEUtils.toValueString(XEUtils.get(data, field))]
79
80
  }
@@ -4,6 +4,7 @@ import VXETable from '../../v-x-e-table'
4
4
  import { isEnableConf, getFuncText } from '../../tools/utils'
5
5
  import { createItem, destroyItem, assemItem, isActivetem } from './util'
6
6
  import { renderTitle } from './render'
7
+ import { getSlotVNs } from '../../tools/vn'
7
8
 
8
9
  const props = {
9
10
  title: String,
@@ -69,9 +70,9 @@ const renderItem = (h, _vm, item, slots) => {
69
70
  if (slots && slots.default) {
70
71
  contentVNs = _vm.callSlot(slots.default, params, h)
71
72
  } else if (compConf && compConf.renderItemContent) {
72
- contentVNs = compConf.renderItemContent.call(_vm, h, itemRender, params)
73
+ contentVNs = getSlotVNs(compConf.renderItemContent.call(_vm, h, itemRender, params))
73
74
  } else if (compConf && compConf.renderItem) {
74
- contentVNs = compConf.renderItem.call(_vm, h, itemRender, params)
75
+ contentVNs = getSlotVNs(compConf.renderItem.call(_vm, h, itemRender, params))
75
76
  } else if (field) {
76
77
  contentVNs = [`${XEUtils.get(data, field)}`]
77
78
  }
@@ -8,6 +8,7 @@ import { createItem, handleFieldOrItem, isHiddenItem, isActivetem } from './util
8
8
  import { errLog } from '../../tools/log'
9
9
  import VxeFormConfigItem from './form-config-item'
10
10
  import VxeLoading from '../../loading/index'
11
+ import { getSlotVNs } from '../../tools/vn'
11
12
 
12
13
  class Rule {
13
14
  constructor (rule) {
@@ -193,7 +194,7 @@ export default {
193
194
  slotFunc = $scopedSlots[slotFunc] || null
194
195
  }
195
196
  if (XEUtils.isFunction(slotFunc)) {
196
- return slotFunc.call(this, params, h)
197
+ return getSlotVNs(slotFunc.call(this, params, h))
197
198
  }
198
199
  }
199
200
  return []
@@ -7,6 +7,7 @@ import UtilTools, { isEnableConf } from '../../tools/utils'
7
7
  import DomTools, { getOffsetHeight, getPaddingTopBottomSize } from '../../tools/dom'
8
8
  import { GlobalEvent } from '../../tools/event'
9
9
  import { warnLog, errLog } from '../../tools/log'
10
+ import { getSlotVNs } from '../../tools/vn'
10
11
 
11
12
  const methods = {}
12
13
  const propKeys = Object.keys(Table.props)
@@ -372,7 +373,7 @@ export default {
372
373
  slotFunc = $scopedSlots[slotFunc] || null
373
374
  }
374
375
  if (XEUtils.isFunction(slotFunc)) {
375
- return slotFunc.call(this, params, h, vNodes)
376
+ return getSlotVNs(slotFunc.call(this, params, h, vNodes))
376
377
  }
377
378
  }
378
379
  return []
@@ -5,6 +5,7 @@ import UtilTools, { getFuncText } from '../../tools/utils'
5
5
  import DomTools from '../../tools/dom'
6
6
  import { GlobalEvent } from '../../tools/event'
7
7
  import { errLog } from '../../tools/log'
8
+ import { getSlotVNs } from '../../tools/vn'
8
9
  import VxeLoading from '../../loading/index'
9
10
 
10
11
  export const allActivedModals = []
@@ -168,8 +169,8 @@ export default {
168
169
  'is--ellipsis': !isMsg && showTitleOverflow
169
170
  }],
170
171
  on: headerOns
171
- }, headerSlot ? (!inited || (destroyOnClose && !visible) ? [] : headerSlot.call(this, { $modal: this }, h)) : [
172
- titleSlot ? titleSlot.call(this, { $modal: this }, h) : h('span', {
172
+ }, headerSlot ? (!inited || (destroyOnClose && !visible) ? [] : getSlotVNs(headerSlot.call(this, { $modal: this }, h))) : [
173
+ titleSlot ? getSlotVNs(titleSlot.call(this, { $modal: this }, h)) : h('span', {
173
174
  class: 'vxe-modal--title'
174
175
  }, title ? getFuncText(title) : GlobalConfig.i18n('vxe.alert.title')),
175
176
  showZoom ? h('i', {
@@ -203,7 +204,7 @@ export default {
203
204
  ]) : null,
204
205
  h('div', {
205
206
  class: 'vxe-modal--content'
206
- }, defaultSlot ? (!inited || (destroyOnClose && !visible) ? [] : defaultSlot.call(this, { $modal: this }, h)) : getFuncText(content)),
207
+ }, defaultSlot ? (!inited || (destroyOnClose && !visible) ? [] : getSlotVNs.call(defaultSlot(this, { $modal: this }, h))) : getFuncText(content)),
207
208
  /**
208
209
  * 加载中
209
210
  */
@@ -216,7 +217,7 @@ export default {
216
217
  ]),
217
218
  showFooter ? h('div', {
218
219
  class: 'vxe-modal--footer'
219
- }, footerSlot ? (!inited || (destroyOnClose && !visible) ? [] : footerSlot.call(this, { $modal: this }, h)) : [
220
+ }, footerSlot ? (!inited || (destroyOnClose && !visible) ? [] : getSlotVNs.call(footerSlot(this, { $modal: this }, h))) : [
220
221
  type === 'confirm' ? h('vxe-button', {
221
222
  ref: 'cancelBtn',
222
223
  on: {
@@ -5,6 +5,7 @@ import vSize from '../../mixins/size'
5
5
  import UtilTools, { getFuncText } from '../../tools/utils'
6
6
  import DomTools from '../../tools/dom'
7
7
  import { GlobalEvent, hasEventKey, EVENT_KEYS } from '../../tools/event'
8
+ import { getSlotVNs } from '../../tools/vn'
8
9
 
9
10
  function isOptionVisible (option) {
10
11
  return option.visible !== false
@@ -474,7 +475,7 @@ export default {
474
475
  slotFunc = $scopedSlots[slotFunc] || null
475
476
  }
476
477
  if (XEUtils.isFunction(slotFunc)) {
477
- return slotFunc.call(this, params, h)
478
+ return getSlotVNs(slotFunc.call(this, params, h))
478
479
  }
479
480
  }
480
481
  return []
@@ -4,6 +4,7 @@ import VXETable from '../../v-x-e-table'
4
4
  import DomTools from '../../tools/dom'
5
5
  import UtilTools, { eqEmptyValue, isEnableConf, getFuncText } from '../../tools/utils'
6
6
  import { getColumnConfig } from './util'
7
+ import { getSlotVNs } from '../../tools/vn'
7
8
 
8
9
  function renderHelpIcon (h, params) {
9
10
  const { $table, column } = params
@@ -78,7 +79,7 @@ function getFooterContent (h, params) {
78
79
  if (renderOpts) {
79
80
  const compConf = VXETable.renderer.get(renderOpts.name)
80
81
  if (compConf && compConf.renderFooter) {
81
- return compConf.renderFooter.call($table, h, renderOpts, params)
82
+ return getSlotVNs(compConf.renderFooter.call($table, h, renderOpts, params))
82
83
  }
83
84
  }
84
85
  return [UtilTools.formatText(items[_columnIndex], 1)]
@@ -152,7 +153,7 @@ export const Cell = {
152
153
  if (renderOpts) {
153
154
  const compConf = VXETable.renderer.get(renderOpts.name)
154
155
  if (compConf && compConf.renderHeader) {
155
- return renderTitleContent(h, params, compConf.renderHeader.call($table, h, renderOpts, params))
156
+ return getSlotVNs(renderTitleContent(h, params, compConf.renderHeader.call($table, h, renderOpts, params)))
156
157
  }
157
158
  }
158
159
  return renderTitleContent(h, params, UtilTools.formatText(column.getTitle(), 1))
@@ -171,7 +172,7 @@ export const Cell = {
171
172
  const funName = editRender ? 'renderCell' : 'renderDefault'
172
173
  const compConf = VXETable.renderer.get(renderOpts.name)
173
174
  if (compConf && compConf[funName]) {
174
- return compConf[funName].call($table, h, renderOpts, Object.assign({ $type: editRender ? 'edit' : 'cell' }, params))
175
+ return getSlotVNs(compConf[funName].call($table, h, renderOpts, Object.assign({ $type: editRender ? 'edit' : 'cell' }, params)))
175
176
  }
176
177
  }
177
178
  const cellValue = $table.getCellLabel(row, column)
@@ -592,7 +593,7 @@ export const Cell = {
592
593
  if (contentRender) {
593
594
  const compConf = VXETable.renderer.get(contentRender.name)
594
595
  if (compConf && compConf.renderExpand) {
595
- return compConf.renderExpand.call($table, h, contentRender, params)
596
+ return getSlotVNs(compConf.renderExpand.call($table, h, contentRender, params))
596
597
  }
597
598
  }
598
599
  return []
@@ -756,7 +757,10 @@ export const Cell = {
756
757
  if (slots && slots.edit) {
757
758
  return $table.callSlot(slots.edit, params, h)
758
759
  }
759
- return compConf && compConf.renderEdit ? compConf.renderEdit.call($table, h, editRender, Object.assign({ $type: 'edit' }, params)) : []
760
+ if (compConf && compConf.renderEdit) {
761
+ return getSlotVNs(compConf.renderEdit.call($table, h, editRender, Object.assign({ $type: 'edit' }, params)))
762
+ }
763
+ return []
760
764
  }
761
765
  if (slots && slots.default) {
762
766
  return $table.callSlot(slots.default, params, h)
@@ -7,6 +7,7 @@ import UtilTools, { eqEmptyValue, isEnableConf, getFuncText } from '../../tools/
7
7
  import DomTools, { browse, getPaddingTopBottomSize, setScrollTop, setScrollLeft } from '../../tools/dom'
8
8
  import { formats } from '../../v-x-e-table/src/formats'
9
9
  import { warnLog, errLog } from '../../tools/log'
10
+ import { getSlotVNs } from '../../tools/vn'
10
11
 
11
12
  const { setCellValue, hasChildrenList, getColumnList } = UtilTools
12
13
  const { calcHeight, hasClass, addClass, removeClass, getEventTargetNode, isNodeElement } = DomTools
@@ -245,7 +246,7 @@ const Methods = {
245
246
  return $xegrid.callSlot(slotFunc, params, h, vNodes)
246
247
  }
247
248
  if (XEUtils.isFunction(slotFunc)) {
248
- return slotFunc.call(this, params, h, vNodes)
249
+ return getSlotVNs(slotFunc.call(this, params, h, vNodes))
249
250
  }
250
251
  }
251
252
  return []
@@ -0,0 +1,8 @@
1
+ import XEUtils from 'xe-utils'
2
+
3
+ export function getSlotVNs (vns) {
4
+ if (XEUtils.isArray(vns)) {
5
+ return vns
6
+ }
7
+ return [vns]
8
+ }
@@ -108,7 +108,7 @@ $vxe-table-menu-item-width: 178px !default;
108
108
  $vxe-table-menu-background-color: #fff !default;
109
109
 
110
110
  /*loading*/
111
- $vxe-loading-background-color: rgba(0, 0, 0, 0.2) !default;
111
+ $vxe-loading-background-color: rgba(0, 0, 0, 0.3) !default;
112
112
  $vxe-loading-z-index: 999 !default;
113
113
 
114
114
  /*validate*/