vxe-pc-ui 3.0.1 → 3.0.2

package/lib/list/src/list.js

@@ -0,0 +1,415 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _comp = require("../../ui/src/comp");
+var _xeUtils = _interopRequireDefault(require("xe-utils"));
+var _ui = require("../../ui");
+var _dom = require("../../ui/src/dom");
+var _loading = _interopRequireDefault(require("../../loading/src/loading"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+var _default2 = exports.default = (0, _comp.defineVxeComponent)({
+  name: 'VxeList',
+  mixins: [_ui.globalMixins.sizeMixin],
+  props: {
+    data: Array,
+    height: [Number, String],
+    maxHeight: [Number, String],
+    loading: Boolean,
+    className: [String, Function],
+    size: {
+      type: String,
+      default: function _default() {
+        return (0, _ui.getConfig)().list.size || (0, _ui.getConfig)().size;
+      }
+    },
+    autoResize: {
+      type: Boolean,
+      default: function _default() {
+        return (0, _ui.getConfig)().list.autoResize;
+      }
+    },
+    syncResize: [Boolean, String, Number],
+    scrollY: Object
+  },
+  data: function data() {
+    var xID = _xeUtils.default.uniqueId();
+    var reactData = {
+      scrollYLoad: false,
+      bodyHeight: 0,
+      rowHeight: 0,
+      topSpaceHeight: 0,
+      items: []
+    };
+    var internalData = {
+      resizeObserver: undefined,
+      fullData: [],
+      lastScrollLeft: 0,
+      lastScrollTop: 0,
+      scrollYStore: {
+        startIndex: 0,
+        endIndex: 0,
+        visibleSize: 0,
+        offsetSize: 0,
+        rowHeight: 0
+      }
+    };
+    return {
+      xID: xID,
+      reactData: reactData,
+      internalData: internalData
+    };
+  },
+  computed: Object.assign(Object.assign({}, {}), {
+    computeSYOpts: function computeSYOpts() {
+      var $xeList = this;
+      var props = $xeList;
+      return Object.assign({}, (0, _ui.getConfig)().list.scrollY, props.scrollY);
+    },
+    computeStyles: function computeStyles() {
+      var $xeList = this;
+      var props = $xeList;
+      var height = props.height,
+        maxHeight = props.maxHeight;
+      var style = {};
+      if (height) {
+        style.height = "".concat(isNaN(height) ? height : "".concat(height, "px"));
+      } else if (maxHeight) {
+        style.height = 'auto';
+        style.maxHeight = "".concat(isNaN(maxHeight) ? maxHeight : "".concat(maxHeight, "px"));
+      }
+      return style;
+    }
+  }),
+  methods: {
+    //
+    // Method
+    //
+    dispatchEvent: function dispatchEvent(type, params, evnt) {
+      var $xeList = this;
+      $xeList.$emit(type, (0, _ui.createEvent)(evnt, {
+        $list: $xeList
+      }, params));
+    },
+    /**
+       * 加载数据
+       * @param {Array} datas 数据
+       */
+    loadData: function loadData(datas) {
+      var $xeList = this;
+      var reactData = $xeList.reactData;
+      var internalData = $xeList.internalData;
+      var scrollYStore = internalData.scrollYStore;
+      var sYOpts = $xeList.computeSYOpts;
+      var fullData = datas || [];
+      Object.assign(scrollYStore, {
+        startIndex: 0,
+        endIndex: 1,
+        visibleSize: 0
+      });
+      internalData.fullData = fullData;
+      // 如果gt为0，则总是启用
+      reactData.scrollYLoad = !!sYOpts.enabled && sYOpts.gt > -1 && (sYOpts.gt === 0 || sYOpts.gt <= fullData.length);
+      $xeList.handleData();
+      return $xeList.computeScrollLoad().then(function () {
+        $xeList.refreshScroll();
+      });
+    },
+    /**
+     * 重新加载数据
+     * @param {Array} datas 数据
+     */
+    reloadData: function reloadData(datas) {
+      var $xeList = this;
+      $xeList.clearScroll();
+      return $xeList.loadData(datas);
+    },
+    updateYSpace: function updateYSpace() {
+      var $xeList = this;
+      var reactData = $xeList.reactData;
+      var internalData = $xeList.internalData;
+      var scrollYLoad = reactData.scrollYLoad;
+      var scrollYStore = internalData.scrollYStore,
+        fullData = internalData.fullData;
+      reactData.bodyHeight = scrollYLoad ? fullData.length * scrollYStore.rowHeight : 0;
+      reactData.topSpaceHeight = scrollYLoad ? Math.max(scrollYStore.startIndex * scrollYStore.rowHeight, 0) : 0;
+    },
+    handleData: function handleData() {
+      var $xeList = this;
+      var reactData = $xeList.reactData;
+      var internalData = $xeList.internalData;
+      var scrollYLoad = reactData.scrollYLoad;
+      var fullData = internalData.fullData,
+        scrollYStore = internalData.scrollYStore;
+      reactData.items = scrollYLoad ? fullData.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullData.slice(0);
+      return $xeList.$nextTick();
+    },
+    updateYData: function updateYData() {
+      var $xeList = this;
+      $xeList.handleData();
+      $xeList.updateYSpace();
+    },
+    computeScrollLoad: function computeScrollLoad() {
+      var $xeList = this;
+      var reactData = $xeList.reactData;
+      var internalData = $xeList.internalData;
+      return $xeList.$nextTick().then(function () {
+        var scrollYLoad = reactData.scrollYLoad;
+        var scrollYStore = internalData.scrollYStore;
+        var virtualBodyElem = $xeList.$refs.refVirtualBody;
+        var sYOpts = $xeList.computeSYOpts;
+        var rowHeight = 0;
+        var firstItemElem;
+        if (virtualBodyElem) {
+          if (sYOpts.sItem) {
+            firstItemElem = virtualBodyElem.querySelector(sYOpts.sItem);
+          }
+          if (!firstItemElem) {
+            firstItemElem = virtualBodyElem.children[0];
+          }
+        }
+        if (firstItemElem) {
+          rowHeight = firstItemElem.offsetHeight;
+        }
+        rowHeight = Math.max(20, rowHeight);
+        scrollYStore.rowHeight = rowHeight;
+        // 计算 Y 逻辑
+        if (scrollYLoad) {
+          var scrollBodyElem = $xeList.$refs.refVirtualWrapper;
+          var visibleYSize = Math.max(8, Math.ceil(scrollBodyElem.clientHeight / rowHeight));
+          var offsetYSize = sYOpts.oSize ? _xeUtils.default.toNumber(sYOpts.oSize) : _dom.browse.edge ? 10 : 0;
+          scrollYStore.offsetSize = offsetYSize;
+          scrollYStore.visibleSize = visibleYSize;
+          scrollYStore.endIndex = Math.max(scrollYStore.startIndex, visibleYSize + offsetYSize, scrollYStore.endIndex);
+          $xeList.updateYData();
+        } else {
+          $xeList.updateYSpace();
+        }
+        reactData.rowHeight = rowHeight;
+      });
+    },
+    /**
+     * 清除滚动条
+     */
+    clearScroll: function clearScroll() {
+      var $xeList = this;
+      var scrollBodyElem = $xeList.$refs.refVirtualWrapper;
+      if (scrollBodyElem) {
+        scrollBodyElem.scrollTop = 0;
+      }
+      return $xeList.$nextTick();
+    },
+    /**
+     * 如果有滚动条，则滚动到对应的位置
+     * @param {Number} scrollLeft 左距离
+     * @param {Number} scrollTop 上距离
+     */
+    scrollTo: function scrollTo(scrollLeft, scrollTop) {
+      var $xeList = this;
+      var reactData = $xeList.reactData;
+      var scrollBodyElem = $xeList.$refs.refVirtualWrapper;
+      if (_xeUtils.default.isNumber(scrollLeft)) {
+        scrollBodyElem.scrollLeft = scrollLeft;
+      }
+      if (_xeUtils.default.isNumber(scrollTop)) {
+        scrollBodyElem.scrollTop = scrollTop;
+      }
+      if (reactData.scrollYLoad) {
+        return new Promise(function (resolve) {
+          setTimeout(function () {
+            $xeList.$nextTick(function () {
+              resolve();
+            });
+          }, 50);
+        });
+      }
+      return $xeList.$nextTick();
+    },
+    /**
+     * 刷新滚动条
+     */
+    refreshScroll: function refreshScroll() {
+      var $xeList = this;
+      var internalData = $xeList.internalData;
+      var lastScrollLeft = internalData.lastScrollLeft,
+        lastScrollTop = internalData.lastScrollTop;
+      return $xeList.clearScroll().then(function () {
+        if (lastScrollLeft || lastScrollTop) {
+          internalData.lastScrollLeft = 0;
+          internalData.lastScrollTop = 0;
+          return scrollTo(lastScrollLeft, lastScrollTop);
+        }
+      });
+    },
+    /**
+     * 重新计算列表
+     */
+    recalculate: function recalculate() {
+      var $xeList = this;
+      var el = $xeList.$refs.refElem;
+      if (el.clientWidth && el.clientHeight) {
+        return $xeList.computeScrollLoad();
+      }
+      return Promise.resolve();
+    },
+    loadYData: function loadYData(evnt) {
+      var $xeList = this;
+      var internalData = $xeList.internalData;
+      var scrollYStore = internalData.scrollYStore;
+      var startIndex = scrollYStore.startIndex,
+        endIndex = scrollYStore.endIndex,
+        visibleSize = scrollYStore.visibleSize,
+        offsetSize = scrollYStore.offsetSize,
+        rowHeight = scrollYStore.rowHeight;
+      var scrollBodyElem = evnt.target;
+      var scrollTop = scrollBodyElem.scrollTop;
+      var toVisibleIndex = Math.floor(scrollTop / rowHeight);
+      var offsetStartIndex = Math.max(0, toVisibleIndex - 1 - offsetSize);
+      var offsetEndIndex = toVisibleIndex + visibleSize + offsetSize;
+      if (toVisibleIndex <= startIndex || toVisibleIndex >= endIndex - visibleSize - 1) {
+        if (startIndex !== offsetStartIndex || endIndex !== offsetEndIndex) {
+          scrollYStore.startIndex = offsetStartIndex;
+          scrollYStore.endIndex = offsetEndIndex;
+          $xeList.updateYData();
+        }
+      }
+    },
+    scrollEvent: function scrollEvent(evnt) {
+      var $xeList = this;
+      var reactData = $xeList.reactData;
+      var internalData = $xeList.internalData;
+      var scrollBodyElem = evnt.target;
+      var scrollTop = scrollBodyElem.scrollTop;
+      var scrollLeft = scrollBodyElem.scrollLeft;
+      var isX = scrollLeft !== internalData.lastScrollLeft;
+      var isY = scrollTop !== internalData.lastScrollTop;
+      internalData.lastScrollTop = scrollTop;
+      internalData.lastScrollLeft = scrollLeft;
+      if (reactData.scrollYLoad) {
+        $xeList.loadYData(evnt);
+      }
+      $xeList.dispatchEvent('scroll', {
+        scrollLeft: scrollLeft,
+        scrollTop: scrollTop,
+        isX: isX,
+        isY: isY
+      }, evnt);
+    },
+    //
+    // Render
+    //
+    renderVN: function renderVN(h) {
+      var $xeList = this;
+      var props = $xeList;
+      var reactData = $xeList.reactData;
+      var slots = $xeList.$scopedSlots;
+      var className = props.className,
+        loading = props.loading;
+      var bodyHeight = reactData.bodyHeight,
+        topSpaceHeight = reactData.topSpaceHeight,
+        items = reactData.items;
+      var defaultSlot = slots.default;
+      var vSize = $xeList.computeSize;
+      var styles = $xeList.computeStyles;
+      return h('div', {
+        ref: 'refElem',
+        class: ['vxe-list', className ? _xeUtils.default.isFunction(className) ? className({
+          $list: $xeList
+        }) : className : '', _defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--loading', loading)]
+      }, [h('div', {
+        ref: 'refVirtualWrapper',
+        class: 'vxe-list--virtual-wrapper',
+        style: styles,
+        on: {
+          scroll: $xeList.scrollEvent
+        }
+      }, [h('div', {
+        class: 'vxe-list--y-space',
+        style: {
+          height: bodyHeight ? "".concat(bodyHeight, "px") : ''
+        }
+      }), h('div', {
+        ref: 'refVirtualBody',
+        class: 'vxe-list--body',
+        style: {
+          marginTop: topSpaceHeight ? "".concat(topSpaceHeight, "px") : ''
+        }
+      }, defaultSlot ? defaultSlot({
+        items: items,
+        $list: $xeList
+      }) : [])]),
+      /**
+       * 加载中
+       */
+      h(_loading.default, {
+        class: 'vxe-list--loading',
+        props: {
+          value: loading
+        }
+      })]);
+    }
+  },
+  watch: {
+    data: function data() {
+      var $xeList = this;
+      var props = $xeList;
+      $xeList.loadData(props.data || []);
+    },
+    syncResize: function syncResize(val) {
+      var $xeList = this;
+      if (val) {
+        $xeList.recalculate();
+        $xeList.$nextTick(function () {
+          return setTimeout(function () {
+            return $xeList.recalculate();
+          });
+        });
+      }
+    }
+  },
+  created: function created() {
+    var $xeList = this;
+    var props = $xeList;
+    _ui.globalEvents.on($xeList, 'resize', function () {
+      $xeList.recalculate();
+    });
+    $xeList.loadData(props.data || []);
+  },
+  mounted: function mounted() {
+    var $xeList = this;
+    var props = $xeList;
+    var internalData = $xeList.internalData;
+    if (props.autoResize) {
+      var el = $xeList.$refs.refElem;
+      var resizeObserver = _ui.globalResize.create(function () {
+        return $xeList.recalculate();
+      });
+      resizeObserver.observe(el);
+      internalData.resizeObserver = resizeObserver;
+    }
+  },
+  activated: function activated() {
+    var $xeList = this;
+    $xeList.recalculate().then(function () {
+      return $xeList.refreshScroll();
+    });
+  },
+  beforeDestroy: function beforeDestroy() {
+    var $xeList = this;
+    var internalData = $xeList.internalData;
+    var resizeObserver = internalData.resizeObserver;
+    if (resizeObserver) {
+      resizeObserver.disconnect();
+    }
+    _ui.globalEvents.off($xeList, 'resize');
+  },
+  render: function render(h) {
+    return this.renderVN(h);
+  }
+});

package/lib/list/src/list.min.js

@@ -0,0 +1 @@
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _comp=require("../../ui/src/comp"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_dom=require("../../ui/src/dom"),_loading=_interopRequireDefault(require("../../loading/src/loading"));function _interopRequireDefault(t){return t&&t.__esModule?t:{default:t}}function _typeof(t){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function _defineProperty(t,e,r){return(e=_toPropertyKey(e))in t?Object.defineProperty(t,e,{value:r,enumerable:!0,configurable:!0,writable:!0}):t[e]=r,t}function _toPropertyKey(t){t=_toPrimitive(t,"string");return"symbol"==_typeof(t)?t:t+""}function _toPrimitive(t,e){if("object"!=_typeof(t)||!t)return t;var r=t[Symbol.toPrimitive];if(void 0===r)return("string"===e?String:Number)(t);r=r.call(t,e||"default");if("object"!=_typeof(r))return r;throw new TypeError("@@toPrimitive must return a primitive value.")}var _default2=exports.default=(0,_comp.defineVxeComponent)({name:"VxeList",mixins:[_ui.globalMixins.sizeMixin],props:{data:Array,height:[Number,String],maxHeight:[Number,String],loading:Boolean,className:[String,Function],size:{type:String,default:function(){return(0,_ui.getConfig)().list.size||(0,_ui.getConfig)().size}},autoResize:{type:Boolean,default:function(){return(0,_ui.getConfig)().list.autoResize}},syncResize:[Boolean,String,Number],scrollY:Object},data:function(){return{xID:_xeUtils.default.uniqueId(),reactData:{scrollYLoad:!1,bodyHeight:0,rowHeight:0,topSpaceHeight:0,items:[]},internalData:{resizeObserver:void 0,fullData:[],lastScrollLeft:0,lastScrollTop:0,scrollYStore:{startIndex:0,endIndex:0,visibleSize:0,offsetSize:0,rowHeight:0}}}},computed:Object.assign(Object.assign({},{}),{computeSYOpts:function(){return Object.assign({},(0,_ui.getConfig)().list.scrollY,this.scrollY)},computeStyles:function(){var t=this.height,e=this.maxHeight,r={};return t?r.height="".concat(isNaN(t)?t:"".concat(t,"px")):e&&(r.height="auto",r.maxHeight="".concat(isNaN(e)?e:"".concat(e,"px"))),r}}),methods:{dispatchEvent:function(t,e,r){this.$emit(t,(0,_ui.createEvent)(r,{$list:this},e))},loadData:function(t){var e=this,r=e.reactData,i=e.internalData,a=i.scrollYStore,o=e.computeSYOpts,t=t||[];return Object.assign(a,{startIndex:0,endIndex:1,visibleSize:0}),i.fullData=t,r.scrollYLoad=!!o.enabled&&-1<o.gt&&(0===o.gt||o.gt<=t.length),e.handleData(),e.computeScrollLoad().then(function(){e.refreshScroll()})},reloadData:function(t){return this.clearScroll(),this.loadData(t)},updateYSpace:function(){var t=this.reactData,e=this.internalData,r=t.scrollYLoad,i=e.scrollYStore;t.bodyHeight=r?e.fullData.length*i.rowHeight:0,t.topSpaceHeight=r?Math.max(i.startIndex*i.rowHeight,0):0},handleData:function(){var t=this,e=t.reactData,r=t.internalData,i=e.scrollYLoad,a=r.fullData,r=r.scrollYStore;return e.items=i?a.slice(r.startIndex,r.endIndex):a.slice(0),t.$nextTick()},updateYData:function(){this.handleData(),this.updateYSpace()},computeScrollLoad:function(){var l=this,n=l.reactData,s=l.internalData;return l.$nextTick().then(function(){var t,e=n.scrollYLoad,r=s.scrollYStore,i=l.$refs.refVirtualBody,a=l.computeSYOpts,o=0;(t=i?(t=a.sItem?i.querySelector(a.sItem):t)||i.children[0]:t)&&(o=t.offsetHeight),o=Math.max(20,o),r.rowHeight=o,e?(i=l.$refs.refVirtualWrapper,t=Math.max(8,Math.ceil(i.clientHeight/o)),e=a.oSize?_xeUtils.default.toNumber(a.oSize):_dom.browse.edge?10:0,r.offsetSize=e,r.visibleSize=t,r.endIndex=Math.max(r.startIndex,t+e,r.endIndex),l.updateYData()):l.updateYSpace(),n.rowHeight=o})},clearScroll:function(){var t=this.$refs.refVirtualWrapper;return t&&(t.scrollTop=0),this.$nextTick()},scrollTo:function(t,e){var r=this,i=r.reactData,a=r.$refs.refVirtualWrapper;return _xeUtils.default.isNumber(t)&&(a.scrollLeft=t),_xeUtils.default.isNumber(e)&&(a.scrollTop=e),i.scrollYLoad?new Promise(function(t){setTimeout(function(){r.$nextTick(function(){t()})},50)}):r.$nextTick()},refreshScroll:function(){var t=this.internalData,e=t.lastScrollLeft,r=t.lastScrollTop;return this.clearScroll().then(function(){if(e||r)return t.lastScrollLeft=0,t.lastScrollTop=0,scrollTo(e,r)})},recalculate:function(){var t=this.$refs.refElem;return t.clientWidth&&t.clientHeight?this.computeScrollLoad():Promise.resolve()},loadYData:function(t){var e=this.internalData.scrollYStore,r=e.startIndex,i=e.endIndex,a=e.visibleSize,o=e.offsetSize,t=t.target.scrollTop,t=Math.floor(t/e.rowHeight),l=Math.max(0,t-1-o),o=t+a+o;!(t<=r||i-a-1<=t)||r===l&&i===o||(e.startIndex=l,e.endIndex=o,this.updateYData())},scrollEvent:function(t){var e=this.reactData,r=this.internalData,i=t.target,a=i.scrollTop,i=i.scrollLeft,o=i!==r.lastScrollLeft,l=a!==r.lastScrollTop;r.lastScrollTop=a,r.lastScrollLeft=i,e.scrollYLoad&&this.loadYData(t),this.dispatchEvent("scroll",{scrollLeft:i,scrollTop:a,isX:o,isY:l},t)},renderVN:function(t){var e=this,r=e.reactData,i=e.className,a=e.loading,o=r.bodyHeight,l=r.topSpaceHeight,r=r.items,n=e.$scopedSlots.default,s=e.computeSize,c=e.computeStyles;return t("div",{ref:"refElem",class:["vxe-list",i?_xeUtils.default.isFunction(i)?i({$list:e}):i:"",_defineProperty(_defineProperty({},"size--".concat(s),s),"is--loading",a)]},[t("div",{ref:"refVirtualWrapper",class:"vxe-list--virtual-wrapper",style:c,on:{scroll:e.scrollEvent}},[t("div",{class:"vxe-list--y-space",style:{height:o?"".concat(o,"px"):""}}),t("div",{ref:"refVirtualBody",class:"vxe-list--body",style:{marginTop:l?"".concat(l,"px"):""}},n?n({items:r,$list:e}):[])]),t(_loading.default,{class:"vxe-list--loading",props:{value:a}})])}},watch:{data:function(){this.loadData(this.data||[])},syncResize:function(t){var e=this;t&&(e.recalculate(),e.$nextTick(function(){return setTimeout(function(){return e.recalculate()})}))}},created:function(){var t=this,e=t;_ui.globalEvents.on(t,"resize",function(){t.recalculate()}),t.loadData(e.data||[])},mounted:function(){var t,e,r=this,i=r.internalData;r.autoResize&&(t=r.$refs.refElem,(e=_ui.globalResize.create(function(){return r.recalculate()})).observe(t),i.resizeObserver=e)},activated:function(){var t=this;t.recalculate().then(function(){return t.refreshScroll()})},beforeDestroy:function(){var t=this.internalData.resizeObserver;t&&t.disconnect(),_ui.globalEvents.off(this,"resize")},render:function(t){return this.renderVN(t)}});

package/lib/list/style/index.js

@@ -0,0 +1 @@
+require('./style.css')

package/lib/list/style/style.css

@@ -0,0 +1,28 @@
+.vxe-list {
+  position: relative;
+  display: block;
+  padding: 0;
+  color: var(--vxe-ui-font-color);
+  font-family: var(--vxe-ui-font-family);
+  direction: ltr;
+}
+.vxe-list .vxe-list--virtual-wrapper {
+  position: relative;
+  overflow: auto;
+  outline: 0;
+}
+.vxe-list .vxe-list--y-space {
+  width: 0;
+  float: left;
+}
+.vxe-list .vxe-list--virtual-wrapper,
+.vxe-list .vxe-list--body {
+  padding: 0;
+  margin: 0;
+  border: 0;
+  outline: 0;
+}
+
+.vxe-list--virtual-wrapper {
+  height: 100px;
+}

package/lib/list/style/style.min.css

@@ -0,0 +1 @@
+.vxe-list{position:relative;display:block;padding:0;color:var(--vxe-ui-font-color);font-family:var(--vxe-ui-font-family);direction:ltr}.vxe-list .vxe-list--virtual-wrapper{position:relative;overflow:auto;outline:0}.vxe-list .vxe-list--y-space{width:0;float:left}.vxe-list .vxe-list--body,.vxe-list .vxe-list--virtual-wrapper{padding:0;margin:0;border:0;outline:0}.vxe-list--virtual-wrapper{height:100px}

package/lib/loading/src/loading.js

@@ -88,6 +88,11 @@ var _default2 = exports.default = (0, _comp.defineVxeComponent)({
         $loading: $xeLoading
       }, params));
     },
+    emitModel: function emitModel(value) {
+      var $xeLoading = this;
+      $xeLoading.$emit('input', value);
+      $xeLoading.$emit('modelValue', value);
+    },
     handleInit: function handleInit() {
       var $xeLoading = this;
       var reactData = $xeLoading.reactData;

package/lib/loading/src/loading.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _comp=require("../../ui/src/comp"),_ui=require("../../ui"),_vn=require("../../ui/src/vn"),_xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function _defineProperty(e,t,i){return(t=_toPropertyKey(t))in e?Object.defineProperty(e,t,{value:i,enumerable:!0,configurable:!0,writable:!0}):e[t]=i,e}function _toPropertyKey(e){e=_toPrimitive(e,"string");return"symbol"==_typeof(e)?e:e+""}function _toPrimitive(e,t){if("object"!=_typeof(e)||!e)return e;var i=e[Symbol.toPrimitive];if(void 0===i)return("string"===t?String:Number)(e);i=i.call(e,t||"default");if("object"!=_typeof(i))return i;throw new TypeError("@@toPrimitive must return a primitive value.")}var _default2=exports.default=(0,_comp.defineVxeComponent)({name:"VxeLoading",mixins:[_ui.globalMixins.sizeMixin],props:{value:Boolean,icon:{type:String,default:function(){return(0,_ui.getConfig)().loading.icon}},showIcon:{type:Boolean,default:function(){return(0,_ui.getConfig)().loading.showIcon}},text:{type:String,default:function(){return(0,_ui.getConfig)().loading.text}},showText:{type:Boolean,default:function(){return(0,_ui.getConfig)().loading.showText}},status:String,size:{type:String,default:function(){return(0,_ui.getConfig)().loading.size||(0,_ui.getConfig)().size}}},data:function(){return{xID:_xeUtils.default.uniqueId(),reactData:{initialized:!1}}},computed:Object.assign(Object.assign({},{}),{computeLoadingIcon:function(){return this.icon||(0,_ui.getIcon)().LOADING},computeLoadingText:function(){var e=this.text;return _xeUtils.default.isString(e)?e:(0,_ui.getI18n)("vxe.loading.text")}}),watch:{value:function(){this.handleInit()}},methods:{dispatchEvent:function(e,t,i){this.$emit(e,(0,_ui.createEvent)(i,{$loading:this},t))},handleInit:function(){var e=this.reactData;e.initialized||(e.initialized=!!e.initialized)},renderVN:function(e){var t=this,i=t.$scopedSlots,n=t.value,o=t.showIcon,r=t.status,u=t.reactData.initialized,a=t.computeSize,l=i.default,c=i.text,i=i.icon,s=t.computeLoadingIcon,d=t.computeLoadingText;return u||n?e("div",{class:["vxe-loading",_defineProperty(_defineProperty(_defineProperty({},"size--".concat(a),a),"theme--".concat(r),r),"is--visible",n)]},l?[e("div",{class:"vxe-loading--wrapper"},(0,_vn.getSlotVNs)(l({})))]:[e("div",{class:"vxe-loading--chunk"},[o&&(i||s)?e("div",{class:"vxe-loading--icon"},i?(0,_vn.getSlotVNs)(i({})):[e("i",{class:s})]):e("div",{class:"vxe-loading--spinner"}),c||d?e("div",{class:"vxe-loading--text"},c?(0,_vn.getSlotVNs)(c({})):"".concat(d)):null])]):(0,_ui.renderEmptyElement)(t)}},render:function(e){return this.renderVN(e)}});
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _comp=require("../../ui/src/comp"),_ui=require("../../ui"),_vn=require("../../ui/src/vn"),_xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function _defineProperty(e,t,i){return(t=_toPropertyKey(t))in e?Object.defineProperty(e,t,{value:i,enumerable:!0,configurable:!0,writable:!0}):e[t]=i,e}function _toPropertyKey(e){e=_toPrimitive(e,"string");return"symbol"==_typeof(e)?e:e+""}function _toPrimitive(e,t){if("object"!=_typeof(e)||!e)return e;var i=e[Symbol.toPrimitive];if(void 0===i)return("string"===t?String:Number)(e);i=i.call(e,t||"default");if("object"!=_typeof(i))return i;throw new TypeError("@@toPrimitive must return a primitive value.")}var _default2=exports.default=(0,_comp.defineVxeComponent)({name:"VxeLoading",mixins:[_ui.globalMixins.sizeMixin],props:{value:Boolean,icon:{type:String,default:function(){return(0,_ui.getConfig)().loading.icon}},showIcon:{type:Boolean,default:function(){return(0,_ui.getConfig)().loading.showIcon}},text:{type:String,default:function(){return(0,_ui.getConfig)().loading.text}},showText:{type:Boolean,default:function(){return(0,_ui.getConfig)().loading.showText}},status:String,size:{type:String,default:function(){return(0,_ui.getConfig)().loading.size||(0,_ui.getConfig)().size}}},data:function(){return{xID:_xeUtils.default.uniqueId(),reactData:{initialized:!1}}},computed:Object.assign(Object.assign({},{}),{computeLoadingIcon:function(){return this.icon||(0,_ui.getIcon)().LOADING},computeLoadingText:function(){var e=this.text;return _xeUtils.default.isString(e)?e:(0,_ui.getI18n)("vxe.loading.text")}}),watch:{value:function(){this.handleInit()}},methods:{dispatchEvent:function(e,t,i){this.$emit(e,(0,_ui.createEvent)(i,{$loading:this},t))},emitModel:function(e){this.$emit("input",e),this.$emit("modelValue",e)},handleInit:function(){var e=this.reactData;e.initialized||(e.initialized=!!e.initialized)},renderVN:function(e){var t=this,i=t.$scopedSlots,n=t.value,o=t.showIcon,r=t.status,u=t.reactData.initialized,a=t.computeSize,l=i.default,c=i.text,i=i.icon,s=t.computeLoadingIcon,d=t.computeLoadingText;return u||n?e("div",{class:["vxe-loading",_defineProperty(_defineProperty(_defineProperty({},"size--".concat(a),a),"theme--".concat(r),r),"is--visible",n)]},l?[e("div",{class:"vxe-loading--wrapper"},(0,_vn.getSlotVNs)(l({})))]:[e("div",{class:"vxe-loading--chunk"},[o&&(i||s)?e("div",{class:"vxe-loading--icon"},i?(0,_vn.getSlotVNs)(i({})):[e("i",{class:s})]):e("div",{class:"vxe-loading--spinner"}),c||d?e("div",{class:"vxe-loading--text"},c?(0,_vn.getSlotVNs)(c({})):"".concat(d)):null])]):(0,_ui.renderEmptyElement)(t)}},render:function(e){return this.renderVN(e)}});

package/lib/menu/src/menu.js

@@ -93,6 +93,11 @@ var _default2 = exports.default = (0, _comp.defineVxeComponent)({
         $menu: $xeMenu
       }, params));
     },
+    emitModel: function emitModel(value) {
+      var $xeMenu = this;
+      $xeMenu.$emit('input', value);
+      $xeMenu.$emit('modelValue', value);
+    },
     getMenuTitle: function getMenuTitle(item) {
       return "".concat(item.title || item.name);
     },
@@ -192,8 +197,7 @@ var _default2 = exports.default = (0, _comp.defineVxeComponent)({
       if (routerLink) {
         var value = item.itemKey;
         reactData.activeName = value;
-        $xeMenu.$emit('input', value);
-        $xeMenu.$emit('modelValue', value);
+        $xeMenu.emitModel(value);
       } else {
         if (hasChild) {
           $xeMenu.handleClickIconCollapse(evnt, item);

package/lib/menu/src/menu.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _comp=require("../../ui/src/comp"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_index=_interopRequireDefault(require("../../loading/index"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function _defineProperty(e,t,i){return(t=_toPropertyKey(t))in e?Object.defineProperty(e,t,{value:i,enumerable:!0,configurable:!0,writable:!0}):e[t]=i,e}function _toPropertyKey(e){e=_toPrimitive(e,"string");return"symbol"==_typeof(e)?e:e+""}function _toPrimitive(e,t){if("object"!=_typeof(e)||!e)return e;var i=e[Symbol.toPrimitive];if(void 0===i)return("string"===t?String:Number)(e);i=i.call(e,t||"default");if("object"!=_typeof(i))return i;throw new TypeError("@@toPrimitive must return a primitive value.")}var _default2=exports.default=(0,_comp.defineVxeComponent)({name:"VxeMenu",mixins:[_ui.globalMixins.sizeMixin,_ui.globalMixins.permissionMixin],props:{value:[String,Number],expandAll:Boolean,collapsed:{type:Boolean,default:null},loading:Boolean,options:{type:Array,default:function(){return[]}},size:{type:String,default:function(){return(0,_ui.getConfig)().image.size||(0,_ui.getConfig)().size}}},inject:{$xeLayoutAside:{default:null}},data:function(){return{xID:_xeUtils.default.uniqueId(),reactData:{activeName:null,menuList:[],itemHeight:1}}},computed:Object.assign(Object.assign({},{}),{computeIsCollapsed:function(){var e=this.$xeLayoutAside,t=this.collapsed;return _xeUtils.default.isBoolean(t)?t:!!e&&e.collapsed}}),watch:{value:function(e){this.reactData.activeName=e},options:function(){this.updateMenuConfig(),this.updateActiveMenu(!0)},"reactData.activeName":function(){this.updateActiveMenu(!0)}},methods:{dispatchEvent:function(e,t,i){this.$emit(e,(0,_ui.createEvent)(i,{$menu:this},t))},getMenuTitle:function(e){return"".concat(e.title||e.name)},updateItemHeight:function(){var e=this.reactData,t=this.$refs.refWrapperElem,t=t?t.children:[];t.length&&(e.itemHeight=t[0].offsetHeight)},getExpandChildSize:function(e){var t=this,i=0;return e.isExpand&&e.childList.forEach(function(e){i+=t.getExpandChildSize(e)+1}),i},updateStyle:function(){var t=this,i=t.reactData;_xeUtils.default.eachTree(i.menuList,function(e){e.hasChild&&e.isExpand?e.childHeight=t.getExpandChildSize(e)*i.itemHeight:e.childHeight=0},{children:"childList"})},updateActiveMenu:function(l){var e=this.reactData,u=e.activeName;_xeUtils.default.eachTree(e.menuList,function(e,t,i,n,a,r){e.itemKey===u?(r.forEach(function(e){e.isActive=!0,l&&(e.isExpand=!0)}),e.isExactActive=!0):(e.isExactActive=!1,e.isActive=!1)},{children:"childList"})},updateMenuConfig:function(){var e=this.reactData,t=this.options,r=this.expandAll;e.menuList=_xeUtils.default.mapTree(t,function(e,t,i,n,a){return Object.assign(Object.assign({},e),{parentKey:a?a.name||n.slice(0,n.length-1).join(","):"",level:n.length,itemKey:e.name||n.join(","),isExactActive:!1,isActive:!1,isExpand:_xeUtils.default.isBoolean(e.expanded)?e.expanded:!!r,hasChild:e.children&&0<e.children.length,childHeight:0})},{children:"children",mapChildren:"childList"})},handleClickIconCollapse:function(e,t){var i=t.hasChild,n=t.isExpand;i&&(e.stopPropagation(),e.preventDefault(),t.isExpand=!n,this.updateItemHeight(),this.updateStyle())},handleClickMenu:function(e,t){var i=this,n=i.reactData,a=t.routerLink,r=t.hasChild;a?(a=t.itemKey,n.activeName=a,i.$emit("input",a),i.$emit("modelValue",a)):r&&i.handleClickIconCollapse(e,t),i.dispatchEvent("click",{menu:t},e)},renderMenuTitle:function(e,t){var i=this,n=t.icon,a=t.isExpand,r=t.hasChild,l=i.getMenuTitle(t);return[e("span",{class:"vxe-menu--item-link-icon"},n?[e("i",{class:n})]:[]),e("span",{class:"vxe-menu--item-link-title",attrs:{title:l}},l),r?e("span",{class:"vxe-menu--item-link-collapse",on:{click:function(e){i.handleClickIconCollapse(e,t)}}},[e("i",{class:a?(0,_ui.getIcon)().MENU_ITEM_EXPAND_OPEN:(0,_ui.getIcon)().MENU_ITEM_EXPAND_CLOSE})]):(0,_ui.renderEmptyElement)(i)]},renderChildren:function(t,i){var n=this,e=i.itemKey,a=i.level,r=i.hasChild,l=i.isActive,u=i.isExactActive,o=i.isExpand,s=i.routerLink,c=i.childList,d=n.computeIsCollapsed;return i.permissionCode&&!_ui.permission.checkVisible(i.permissionCode)?(0,_ui.renderEmptyElement)(n):t("div",{key:e,class:["vxe-menu--item-wrapper","vxe-menu--item-level".concat(a),{"is--exact-active":u,"is--active":l,"is--expand":!d&&o}]},[s?t("router-link",{class:"vxe-menu--item-link",props:{to:s},on:{click:function(e){n.handleClickMenu(e,i)}}},n.renderMenuTitle(t,i)):t("div",{class:"vxe-menu--item-link",on:{click:function(e){n.handleClickMenu(e,i)}}},n.renderMenuTitle(t,i)),r?t("div",{class:"vxe-menu--item-group",style:{}},c.map(function(e){return n.renderChildren(t,e)})):(0,_ui.renderEmptyElement)(n)])},renderVN:function(t){var i=this,e=i.reactData,n=i.loading,e=e.menuList,a=i.computeSize,r=i.computeIsCollapsed;return t("div",{ref:"refElem",class:["vxe-menu",_defineProperty(_defineProperty(_defineProperty({},"size--".concat(a),a),"is--collapsed",r),"is--loading",n)]},[t("div",{ref:"refWrapperElem",class:"vxe-menu--item-list"},e.map(function(e){return i.renderChildren(t,e)})),t(_index.default,{class:"vxe-list-view--loading",props:{value:n}})])}},mounted:function(){var e=this;this.$nextTick(function(){e.updateItemHeight()})},created:function(){this.reactData.activeName=this.value,this.updateMenuConfig(),this.updateActiveMenu(!0)},render:function(e){return this.renderVN(e)}});
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _comp=require("../../ui/src/comp"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_index=_interopRequireDefault(require("../../loading/index"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function _defineProperty(e,t,i){return(t=_toPropertyKey(t))in e?Object.defineProperty(e,t,{value:i,enumerable:!0,configurable:!0,writable:!0}):e[t]=i,e}function _toPropertyKey(e){e=_toPrimitive(e,"string");return"symbol"==_typeof(e)?e:e+""}function _toPrimitive(e,t){if("object"!=_typeof(e)||!e)return e;var i=e[Symbol.toPrimitive];if(void 0===i)return("string"===t?String:Number)(e);i=i.call(e,t||"default");if("object"!=_typeof(i))return i;throw new TypeError("@@toPrimitive must return a primitive value.")}var _default2=exports.default=(0,_comp.defineVxeComponent)({name:"VxeMenu",mixins:[_ui.globalMixins.sizeMixin,_ui.globalMixins.permissionMixin],props:{value:[String,Number],expandAll:Boolean,collapsed:{type:Boolean,default:null},loading:Boolean,options:{type:Array,default:function(){return[]}},size:{type:String,default:function(){return(0,_ui.getConfig)().image.size||(0,_ui.getConfig)().size}}},inject:{$xeLayoutAside:{default:null}},data:function(){return{xID:_xeUtils.default.uniqueId(),reactData:{activeName:null,menuList:[],itemHeight:1}}},computed:Object.assign(Object.assign({},{}),{computeIsCollapsed:function(){var e=this.$xeLayoutAside,t=this.collapsed;return _xeUtils.default.isBoolean(t)?t:!!e&&e.collapsed}}),watch:{value:function(e){this.reactData.activeName=e},options:function(){this.updateMenuConfig(),this.updateActiveMenu(!0)},"reactData.activeName":function(){this.updateActiveMenu(!0)}},methods:{dispatchEvent:function(e,t,i){this.$emit(e,(0,_ui.createEvent)(i,{$menu:this},t))},emitModel:function(e){this.$emit("input",e),this.$emit("modelValue",e)},getMenuTitle:function(e){return"".concat(e.title||e.name)},updateItemHeight:function(){var e=this.reactData,t=this.$refs.refWrapperElem,t=t?t.children:[];t.length&&(e.itemHeight=t[0].offsetHeight)},getExpandChildSize:function(e){var t=this,i=0;return e.isExpand&&e.childList.forEach(function(e){i+=t.getExpandChildSize(e)+1}),i},updateStyle:function(){var t=this,i=t.reactData;_xeUtils.default.eachTree(i.menuList,function(e){e.hasChild&&e.isExpand?e.childHeight=t.getExpandChildSize(e)*i.itemHeight:e.childHeight=0},{children:"childList"})},updateActiveMenu:function(l){var e=this.reactData,o=e.activeName;_xeUtils.default.eachTree(e.menuList,function(e,t,i,n,a,r){e.itemKey===o?(r.forEach(function(e){e.isActive=!0,l&&(e.isExpand=!0)}),e.isExactActive=!0):(e.isExactActive=!1,e.isActive=!1)},{children:"childList"})},updateMenuConfig:function(){var e=this.reactData,t=this.options,r=this.expandAll;e.menuList=_xeUtils.default.mapTree(t,function(e,t,i,n,a){return Object.assign(Object.assign({},e),{parentKey:a?a.name||n.slice(0,n.length-1).join(","):"",level:n.length,itemKey:e.name||n.join(","),isExactActive:!1,isActive:!1,isExpand:_xeUtils.default.isBoolean(e.expanded)?e.expanded:!!r,hasChild:e.children&&0<e.children.length,childHeight:0})},{children:"children",mapChildren:"childList"})},handleClickIconCollapse:function(e,t){var i=t.hasChild,n=t.isExpand;i&&(e.stopPropagation(),e.preventDefault(),t.isExpand=!n,this.updateItemHeight(),this.updateStyle())},handleClickMenu:function(e,t){var i=this.reactData,n=t.routerLink,a=t.hasChild;n?(n=t.itemKey,i.activeName=n,this.emitModel(n)):a&&this.handleClickIconCollapse(e,t),this.dispatchEvent("click",{menu:t},e)},renderMenuTitle:function(e,t){var i=this,n=t.icon,a=t.isExpand,r=t.hasChild,l=i.getMenuTitle(t);return[e("span",{class:"vxe-menu--item-link-icon"},n?[e("i",{class:n})]:[]),e("span",{class:"vxe-menu--item-link-title",attrs:{title:l}},l),r?e("span",{class:"vxe-menu--item-link-collapse",on:{click:function(e){i.handleClickIconCollapse(e,t)}}},[e("i",{class:a?(0,_ui.getIcon)().MENU_ITEM_EXPAND_OPEN:(0,_ui.getIcon)().MENU_ITEM_EXPAND_CLOSE})]):(0,_ui.renderEmptyElement)(i)]},renderChildren:function(t,i){var n=this,e=i.itemKey,a=i.level,r=i.hasChild,l=i.isActive,o=i.isExactActive,u=i.isExpand,s=i.routerLink,c=i.childList,d=n.computeIsCollapsed;return i.permissionCode&&!_ui.permission.checkVisible(i.permissionCode)?(0,_ui.renderEmptyElement)(n):t("div",{key:e,class:["vxe-menu--item-wrapper","vxe-menu--item-level".concat(a),{"is--exact-active":o,"is--active":l,"is--expand":!d&&u}]},[s?t("router-link",{class:"vxe-menu--item-link",props:{to:s},on:{click:function(e){n.handleClickMenu(e,i)}}},n.renderMenuTitle(t,i)):t("div",{class:"vxe-menu--item-link",on:{click:function(e){n.handleClickMenu(e,i)}}},n.renderMenuTitle(t,i)),r?t("div",{class:"vxe-menu--item-group",style:{}},c.map(function(e){return n.renderChildren(t,e)})):(0,_ui.renderEmptyElement)(n)])},renderVN:function(t){var i=this,e=i.reactData,n=i.loading,e=e.menuList,a=i.computeSize,r=i.computeIsCollapsed;return t("div",{ref:"refElem",class:["vxe-menu",_defineProperty(_defineProperty(_defineProperty({},"size--".concat(a),a),"is--collapsed",r),"is--loading",n)]},[t("div",{ref:"refWrapperElem",class:"vxe-menu--item-list"},e.map(function(e){return i.renderChildren(t,e)})),t(_index.default,{class:"vxe-list-view--loading",props:{value:n}})])}},mounted:function(){var e=this;this.$nextTick(function(){e.updateItemHeight()})},created:function(){this.reactData.activeName=this.value,this.updateMenuConfig(),this.updateActiveMenu(!0)},render:function(e){return this.renderVN(e)}});

package/lib/modal/src/modal.js

@@ -320,6 +320,11 @@ var _default2 = exports.default = (0, _comp.defineVxeComponent)({
         $modal: $xeModal
       }, params));
     },
+    emitModel: function emitModel(value) {
+      var $xeModal = this;
+      $xeModal.$emit('input', value);
+      $xeModal.$emit('modelValue', value);
+    },
     open: function open() {
       var $xeModal = this;
       return $xeModal.openModal();
@@ -506,8 +511,7 @@ var _default2 = exports.default = (0, _comp.defineVxeComponent)({
             $xeModal.dispatchEvent('before-hide', params, null);
             setTimeout(function () {
               reactData.visible = false;
-              $xeModal.$emit('input', false);
-              $xeModal.$emit('modelValue', false);
+              $xeModal.emitModel(false);
               $xeModal.dispatchEvent('hide', params, null);
             }, 200);
             $xeModal.removeBodyLockScroll();
@@ -847,8 +851,7 @@ var _default2 = exports.default = (0, _comp.defineVxeComponent)({
             var params = {
               type: type
             };
-            $xeModal.$emit('input', true);
-            $xeModal.$emit('modelValue', true);
+            $xeModal.emitModel(true);
             $xeModal.dispatchEvent('show', params, null);
           });
         }, 10);