vxe-table 4.2.5 → 4.2.6-beta.2

package/es/table/src/table.js

@@ -29,6 +29,7 @@ import TableBodyComponent from './body';
 import TableHeaderComponent from '../../header';
 import tableProps from './props';
 import tableEmits from './emits';
+import VxeLoading from '../../loading/index';
 import { getRowUniqueId, clearTableAllStatus, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, restoreScrollListener } from './util';
 var isWebkit = browse['-webkit'] && !browse.edge;
 var resizableStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_WIDTH';
@@ -6037,15 +6038,10 @@ export default defineComponent({
                 /**
                  * 加载中
                  */
-                h('div', {
-                    class: ['vxe-table--loading vxe-loading', {
-                            'is--visible': loading
-                        }]
-                }, [
-                    h('div', {
-                        class: 'vxe-loading--spinner'
-                    })
-                ]),
+                h(VxeLoading, {
+                    class: 'vxe-table--loading',
+                    loading: loading
+                }),
                 /**
                  * 筛选
                  */

package/es/table/style.css

@@ -308,69 +308,6 @@
 .is--animat .vxe-radio > input:checked + span {
   transition: background-color 0.1s ease-in-out; }
 
-/*加载中*/
-.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, 0.2); }
-  .vxe-loading.is--visible {
-    display: block; }
-  .vxe-loading .vxe-loading--spinner {
-    width: 56px;
-    height: 56px;
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%); }
-    .vxe-loading .vxe-loading--spinner:before, .vxe-loading .vxe-loading--spinner:after {
-      content: "";
-      width: 100%;
-      height: 100%;
-      border-radius: 50%;
-      background-color: #409eff;
-      opacity: 0.6;
-      position: absolute;
-      top: 0;
-      left: 0;
-      -webkit-animation: bounce 2.0s infinite ease-in-out;
-              animation: bounce 2.0s infinite ease-in-out; }
-    .vxe-loading .vxe-loading--spinner:after {
-      -webkit-animation-delay: -1.0s;
-              animation-delay: -1.0s; }
-
-@-webkit-keyframes bounce {
-  0%, 100% {
-    transform: scale(0); }
-  50% {
-    transform: scale(1); } }
-
-@keyframes bounce {
-  0%, 100% {
-    transform: scale(0); }
-  50% {
-    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; }
-
 .vxe-table--render-default.vxe-editable .vxe-body--column, .vxe-table--render-default .vxe-header--column.col--ellipsis,
 .vxe-table--render-default .vxe-body--column.col--ellipsis,
 .vxe-table--render-default .vxe-footer--column.col--ellipsis {

package/es/tools/log.js

@@ -1,6 +1,6 @@
 import GlobalConfig from '../v-x-e-table/src/conf';
 export function getLog(message, params) {
-    return "[vxe-table v" + "4.2.5-beta.0" + "] " + GlobalConfig.i18n(message, params);
+    return "[vxe-table v" + "4.2.6-beta.1" + "] " + GlobalConfig.i18n(message, params);
 }
 function outLog(type) {
     return function (message, params) {

package/es/v-x-e-table/index.js

@@ -83,7 +83,7 @@ export var config = new VXETableConfig();
 export var v = 'v4';
 export var VXETable = {
     v: v,
-    version: "4.2.5-beta.0",
+    version: "4.2.6-beta.1",
     setup: setup,
     interceptor: interceptor,
     renderer: renderer,

package/es/v-x-e-table/src/conf.js

@@ -5,6 +5,7 @@ var GlobalConfig = {
     version: 0,
     // resizeInterval: 500,
     emptyCell: '　',
+    loadingText: null,
     table: {
         fit: true,
         showHeader: true,
@@ -122,6 +123,8 @@ var GlobalConfig = {
         types: {}
     },
     icon: {
+        // loading
+        // LOADING: iconPrefix + 'refresh roll vxe-loading--default-icon',
         // table
         TABLE_SORT_ASC: iconPrefix + 'caret-top',
         TABLE_SORT_DESC: iconPrefix + 'caret-bottom',

package/es/v-x-e-table/style.css

@@ -1,3 +1,4 @@
+@charset "UTF-8";
 /*font*/
 /*size*/
 /*icon*/
@@ -23,3 +24,560 @@
 /*select*/
 /*switch*/
 /*pulldown*/
+/**Variable**/
+[class*="vxe-icon--"] {
+  display: inline-block;
+  vertical-align: middle;
+  position: relative;
+  direction: ltr;
+  font-family: Verdana, Arial, Tahoma;
+  font-weight: normal;
+  -webkit-user-select: none;
+     -moz-user-select: none;
+      -ms-user-select: none;
+          user-select: none; }
+  [class*="vxe-icon--"].rotate45 {
+    transform: rotate(45deg); }
+  [class*="vxe-icon--"].rotate90 {
+    transform: rotate(90deg); }
+  [class*="vxe-icon--"].rotate180 {
+    transform: rotate(180deg); }
+
+.vxe-icon--square, .vxe-icon--zoomin, .vxe-icon--zoomout, .vxe-icon--menu, .vxe-icon--caret-top, .vxe-icon--caret-bottom, .vxe-icon--caret-left, .vxe-icon--caret-right, .vxe-icon--arrow-top, .vxe-icon--arrow-bottom, .vxe-icon--arrow-left, .vxe-icon--arrow-right, .vxe-icon--d-arrow-left, .vxe-icon--d-arrow-right, .vxe-icon--funnel, .vxe-icon--edit-outline, .vxe-icon--more, .vxe-icon--plus, .vxe-icon--check, .vxe-icon--close, .vxe-icon--minus, .vxe-icon--refresh, .vxe-icon--question, .vxe-icon--info, .vxe-icon--warning, .vxe-icon--success, .vxe-icon--circle-plus, .vxe-icon--remove, .vxe-icon--error, .vxe-icon--upload,
+.vxe-icon--download, .vxe-icon--eye,
+.vxe-icon--eye-slash, .vxe-icon--calendar, .vxe-icon--dot, .vxe-icon--print, .vxe-icon--search {
+  width: 1em;
+  height: 1em;
+  line-height: 1em; }
+
+.vxe-icon--square:before, .vxe-icon--zoomin:before, .vxe-icon--zoomin:after, .vxe-icon--zoomout:before, .vxe-icon--zoomout:after, .vxe-icon--caret-top:before, .vxe-icon--caret-bottom:before, .vxe-icon--caret-left:before, .vxe-icon--caret-right:before, .vxe-icon--arrow-top:before, .vxe-icon--arrow-bottom:before, .vxe-icon--arrow-left:before, .vxe-icon--arrow-right:before, .vxe-icon--d-arrow-left:before, .vxe-icon--d-arrow-right:before, .vxe-icon--d-arrow-left:after, .vxe-icon--d-arrow-right:after, .vxe-icon--funnel:before, .vxe-icon--funnel:after, .vxe-icon--edit-outline:before, .vxe-icon--edit-outline:after, .vxe-icon--more:before, .vxe-icon--plus:before, .vxe-icon--check:before, .vxe-icon--close:before, .vxe-icon--minus:before, .vxe-icon--refresh:before, .vxe-icon--refresh:after, .vxe-icon--question:after, .vxe-icon--info:after, .vxe-icon--warning:after, .vxe-icon--success:after, .vxe-icon--circle-plus:after, .vxe-icon--remove:after, .vxe-icon--error:after, .vxe-icon--upload:before,
+.vxe-icon--download:before, .vxe-icon--upload:after,
+.vxe-icon--download:after, .vxe-icon--eye:before,
+.vxe-icon--eye-slash:before, .vxe-icon--eye-slash:after, .vxe-icon--calendar:before, .vxe-icon--calendar:after, .vxe-icon--dot:before, .vxe-icon--print:before, .vxe-icon--print:after, .vxe-icon--search:before, .vxe-icon--search:after {
+  content: "";
+  position: absolute; }
+
+.vxe-icon--square:before {
+  left: 0.05em;
+  top: 0.05em;
+  width: 0.9em;
+  height: 0.9em;
+  border-width: 0.1em;
+  border-style: solid;
+  border-color: inherit; }
+
+.vxe-icon--zoomin {
+  border-width: 0.1em;
+  border-style: solid;
+  border-color: inherit;
+  background-color: #fff; }
+  .vxe-icon--zoomin:before, .vxe-icon--zoomin:after {
+    background-color: inherit; }
+  .vxe-icon--zoomin:before {
+    left: -0.1em;
+    top: 0.2em;
+    width: 1.1em;
+    height: 0.4em; }
+  .vxe-icon--zoomin:after {
+    top: -0.1em;
+    left: 0.2em;
+    width: 0.4em;
+    height: 1.1em; }
+
+.vxe-icon--zoomout {
+  position: relative; }
+  .vxe-icon--zoomout:before {
+    right: 0;
+    top: 0;
+    width: 0.7em;
+    height: 0.7em;
+    border-width: 0.1em;
+    border-style: solid;
+    border-color: inherit; }
+  .vxe-icon--zoomout:after {
+    left: 0.1em;
+    bottom: 0.1em;
+    width: 0.7em;
+    height: 0.7em;
+    border-width: 0.1em;
+    border-style: solid;
+    border-color: inherit;
+    background-color: #fff; }
+
+.vxe-icon--menu:before {
+  content: "";
+  display: inline-block;
+  width: 0.22em;
+  height: 0.22em;
+  box-shadow: 0 -0.36em 0, -0.36em -0.36em 0, 0.36em -0.36em 0, 0 0 0 1em inset, -0.36em 0 0, 0.36em 0 0, 0 0.36em 0, -0.36em 0.36em 0, 0.36em 0.36em 0;
+  margin: 0.26em; }
+
+.vxe-icon--caret-top:before, .vxe-icon--caret-bottom:before, .vxe-icon--caret-left:before, .vxe-icon--caret-right:before {
+  border-width: 0.4em;
+  border-style: solid;
+  border-color: transparent; }
+
+.vxe-icon--caret-top:before {
+  left: 0.1em;
+  bottom: 0.3em;
+  border-bottom-color: inherit; }
+
+.vxe-icon--caret-bottom:before {
+  left: 0.1em;
+  top: 0.3em;
+  border-top-color: inherit; }
+
+.vxe-icon--caret-left:before {
+  right: 0.3em;
+  bottom: 0.1em;
+  border-right-color: inherit; }
+
+.vxe-icon--caret-right:before {
+  left: 0.3em;
+  bottom: 0.1em;
+  border-left-color: inherit; }
+
+.vxe-icon--arrow-top:before, .vxe-icon--arrow-bottom:before, .vxe-icon--arrow-left:before, .vxe-icon--arrow-right:before {
+  top: 0.4em;
+  left: 0.14em;
+  width: 0.7em;
+  height: 0.7em;
+  border-width: 0.15em;
+  border-style: solid;
+  border-top-color: inherit;
+  border-right-color: inherit;
+  border-bottom-color: transparent;
+  border-left-color: transparent;
+  border-radius: 0.15em;
+  transform: rotate(-45deg); }
+
+.vxe-icon--arrow-bottom:before {
+  top: 0;
+  left: 0.14em;
+  transform: rotate(135deg); }
+
+.vxe-icon--arrow-left:before {
+  top: 0.18em;
+  left: 0.35em;
+  transform: rotate(-135deg); }
+
+.vxe-icon--arrow-right:before {
+  top: 0.18em;
+  left: 0;
+  transform: rotate(45deg); }
+
+.vxe-icon--d-arrow-left:before, .vxe-icon--d-arrow-right:before {
+  left: 0.15em; }
+
+.vxe-icon--d-arrow-left:after, .vxe-icon--d-arrow-right:after {
+  left: 0.58em; }
+
+.vxe-icon--d-arrow-left:before, .vxe-icon--d-arrow-right:before, .vxe-icon--d-arrow-left:after, .vxe-icon--d-arrow-right:after {
+  top: 0.18em;
+  width: 0.7em;
+  height: 0.7em;
+  border-width: 0.15em;
+  border-style: solid;
+  border-top-color: inherit;
+  border-right-color: transparent;
+  border-bottom-color: transparent;
+  border-left-color: inherit;
+  border-radius: 0.15em;
+  transform: rotate(-45deg); }
+
+.vxe-icon--d-arrow-right:before, .vxe-icon--d-arrow-right:after {
+  transform: rotate(135deg); }
+
+.vxe-icon--d-arrow-right:before {
+  left: -0.25em; }
+
+.vxe-icon--d-arrow-right:after {
+  left: 0.18em; }
+
+.vxe-icon--funnel:before {
+  top: 0.05em;
+  left: 0;
+  border-width: 0.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: 0.41em;
+  top: 0.4em;
+  width: 0;
+  height: 0.5em;
+  border-width: 0 0.2em 0 0;
+  border-style: solid;
+  border-right-color: inherit; }
+
+.vxe-icon--edit-outline:before {
+  height: 0.84em;
+  width: 0.86em;
+  top: 0.1em;
+  left: 0.02em;
+  border-radius: 0.2em;
+  border-width: 0.1em;
+  border-style: solid;
+  border-color: inherit; }
+
+.vxe-icon--edit-outline:after {
+  left: 0.6em;
+  bottom: 0.2em;
+  width: 0;
+  height: 0.8em;
+  border-radius: 0 0 80% 80%;
+  border-width: 0 0 0 0.22em;
+  border-style: solid;
+  border-color: inherit;
+  transform: rotate(45deg); }
+
+.vxe-icon--more:before {
+  content: "...";
+  top: 0;
+  left: 0.1em;
+  line-height: 0.5em;
+  font-weight: 700; }
+
+.vxe-icon--plus:before {
+  content: "+";
+  left: -0.12em;
+  bottom: -0.1em;
+  line-height: 1em;
+  font-size: 1.6em; }
+
+.vxe-icon--check:before {
+  left: 0.25em;
+  bottom: 0.2em;
+  width: 0.5em;
+  height: 0.9em;
+  border-width: 0.15em;
+  border-style: solid;
+  border-top-color: transparent;
+  border-right-color: inherit;
+  border-bottom-color: inherit;
+  border-radius: 0.15em;
+  border-left-color: transparent;
+  transform: rotate(45deg); }
+
+.vxe-icon--close:before {
+  content: "+";
+  left: -0.1em;
+  bottom: -0.16em;
+  line-height: 1em;
+  font-size: 1.8em;
+  transform: rotate(45deg); }
+
+.vxe-icon--minus:before {
+  content: "\2500";
+  left: 0;
+  bottom: 0;
+  width: 100%;
+  text-align: center;
+  line-height: 0.9em;
+  font-size: 1.2em; }
+
+.vxe-icon--refresh {
+  border-width: 0.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;
+    transform: translateX(50%) rotate(-45deg); }
+  .vxe-icon--refresh:after {
+    right: 50%;
+    bottom: 0;
+    transform: translateX(-50%) rotate(135deg); }
+  .vxe-icon--refresh:before, .vxe-icon--refresh:after {
+    width: 0;
+    height: 0;
+    border-width: 0.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% {
+    transform: rotate(0deg); }
+  100% {
+    transform: rotate(360deg); } }
+
+@keyframes rollCircle {
+  0% {
+    transform: rotate(0deg); }
+  100% {
+    transform: rotate(360deg); } }
+
+.vxe-icon--question:before, .vxe-icon--info:before, .vxe-icon--warning:before, .vxe-icon--success:before, .vxe-icon--circle-plus:before, .vxe-icon--remove:before, .vxe-icon--error:before {
+  content: "";
+  border-radius: 50%;
+  border-width: 0.5em;
+  border-style: solid;
+  border-color: inherit;
+  position: absolute;
+  top: 0;
+  left: 0;
+  transform: scale(0.95); }
+
+.vxe-icon--question:after, .vxe-icon--info:after, .vxe-icon--warning:after {
+  left: 0;
+  bottom: 0;
+  width: 100%;
+  text-align: center;
+  color: #fff;
+  transform: rotate(-10deg) scale(0.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: 0.25em;
+  bottom: 0;
+  color: #fff;
+  font-size: 0.65em; }
+
+.vxe-icon--circle-plus:after {
+  content: "+";
+  left: 0;
+  bottom: 0;
+  width: 100%;
+  text-align: center;
+  color: #fff;
+  line-height: 1.4em;
+  font-size: 0.8em; }
+
+.vxe-icon--remove:after {
+  content: "\2500";
+  left: 0;
+  bottom: 0;
+  width: 100%;
+  text-align: center;
+  line-height: 1.5em;
+  color: #fff;
+  font-size: 0.7em; }
+
+.vxe-icon--error:after {
+  content: "\D7";
+  left: 0;
+  bottom: 0;
+  width: 100%;
+  line-height: 1.4em;
+  text-align: center;
+  color: #fff;
+  font-size: 0.8em; }
+
+.vxe-icon--upload,
+.vxe-icon--download {
+  overflow: hidden; }
+  .vxe-icon--upload:before,
+  .vxe-icon--download:before {
+    left: 0;
+    width: 1em;
+    border-width: 0;
+    border-style: solid;
+    border-color: inherit; }
+  .vxe-icon--upload:after,
+  .vxe-icon--download:after {
+    width: 100%;
+    text-align: center;
+    font-size: 2em; }
+
+.vxe-icon--upload:before {
+  top: 0.1em;
+  border-top-width: 0.1em; }
+
+.vxe-icon--upload:after {
+  content: "\2191";
+  left: 0;
+  top: 0.15em; }
+
+.vxe-icon--download:before {
+  bottom: 0.05em;
+  border-bottom-width: 0.1em; }
+
+.vxe-icon--download:after {
+  content: "\2191";
+  left: 0;
+  bottom: 0.15em;
+  transform: rotate(180deg); }
+
+.vxe-icon--eye:before,
+.vxe-icon--eye-slash:before {
+  content: "\25CF";
+  top: 0.16em;
+  left: 0;
+  width: 1em;
+  height: 0.68em;
+  line-height: 0.25em;
+  border-radius: 50%;
+  border-width: 0.1em;
+  border-style: solid;
+  border-color: inherit;
+  text-align: center; }
+
+.vxe-icon--eye-slash:after {
+  top: -0.1em;
+  left: 0.45em;
+  width: 0;
+  height: 1.2em;
+  border-width: 0;
+  border-style: solid;
+  border-color: inherit;
+  border-left-width: 0.1em;
+  transform: rotate(45deg); }
+
+.vxe-icon--calendar:before {
+  top: 0.15em;
+  left: 0;
+  width: 1em;
+  height: 0.8em;
+  border-width: 0.2em 0.1em 0.1em 0.1em;
+  border-radius: 0.1em 0.1em 0 0;
+  border-style: solid;
+  border-color: inherit; }
+
+.vxe-icon--calendar:after {
+  left: 0.2em;
+  top: 0;
+  width: 0.6em;
+  height: 0.3em;
+  border-width: 0 0.1em;
+  border-style: solid;
+  border-color: inherit; }
+
+.vxe-icon--dot:before {
+  top: 0.25em;
+  left: 0.25em;
+  border-radius: 50%;
+  border-width: 0.25em;
+  border-style: solid;
+  border-color: inherit; }
+
+.vxe-icon--print {
+  box-shadow: inset 0 0 0 0.1em;
+  border-width: 0.2em 0;
+  border-style: solid;
+  border-color: transparent !important;
+  border-radius: 0.3em 0.3em 0 0; }
+  .vxe-icon--print:before {
+    width: 0.6em;
+    height: 0.3em;
+    top: -0.2em;
+    left: 0.2em;
+    box-shadow: inset 0 0 0 0.1em; }
+  .vxe-icon--print:after {
+    width: 0.6em;
+    height: 0.6em;
+    left: 0.2em;
+    bottom: -0.2em;
+    box-shadow: inset 0 0 0 0.1em;
+    background-color: #fff; }
+
+.vxe-icon--search:before {
+  top: 0;
+  left: 0;
+  width: 0.8em;
+  height: 0.8em;
+  border-width: 0.15em;
+  border-style: solid;
+  border-color: inherit;
+  border-radius: 50%; }
+
+.vxe-icon--search:after {
+  top: 0.75em;
+  left: 0.6em;
+  width: 0.35em;
+  height: 0;
+  border-width: 0.15em 0 0 0;
+  border-style: solid;
+  border-color: inherit;
+  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, 0.2); }
+  .vxe-loading.is--visible {
+    display: block; }
+  .vxe-loading > .vxe-loading--chunk {
+    width: 100%;
+    position: absolute;
+    top: 50%;
+    left: 0;
+    transform: translateY(-50%);
+    text-align: center;
+    color: #409eff; }
+  .vxe-loading .vxe-loading--default-icon {
+    font-size: 1.2em; }
+  .vxe-loading .vxe-loading--text {
+    padding: 0.4em 0; }
+  .vxe-loading .vxe-loading--spinner {
+    display: inline-block;
+    position: relative;
+    width: 56px;
+    height: 56px; }
+    .vxe-loading .vxe-loading--spinner:before, .vxe-loading .vxe-loading--spinner:after {
+      content: "";
+      width: 100%;
+      height: 100%;
+      border-radius: 50%;
+      background-color: #409eff;
+      opacity: 0.6;
+      position: absolute;
+      top: 0;
+      left: 0;
+      -webkit-animation: bounce 2.0s infinite ease-in-out;
+              animation: bounce 2.0s infinite ease-in-out; }
+    .vxe-loading .vxe-loading--spinner:after {
+      -webkit-animation-delay: -1.0s;
+              animation-delay: -1.0s; }
+
+@-webkit-keyframes bounce {
+  0%, 100% {
+    transform: scale(0); }
+  50% {
+    transform: scale(1); } }
+
+@keyframes bounce {
+  0%, 100% {
+    transform: scale(0); }
+  50% {
+    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; }