@king-design/vue 2.0.8 → 2.0.9

package/components/datepicker/index.spec.js

@@ -234,7 +234,7 @@ describe('Datepicker', function () {
               }, _callee6);
             })));
             it('range date', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
-              var _mount6, instance, element, select, content, _content$querySelecto, panel1, panel2, _panel1$querySelector, nextMonth, nextYear, _content$querySelecto2, monthValues1, monthValues2, _panel2$querySelector, prevYear;
+              var _mount6, instance, element, select, content, _content$querySelecto, panel1, panel2, _panel1$querySelector, nextMonth, nextYear, _content$querySelecto2, monthValues1, monthValues2, monthStart, yearStart, monthEnd, yearEnd, _panel2$querySelector, prevYear, firstDecadeStart, secondDecadeStart;
 
               return _regeneratorRuntime.wrap(function _callee7$(_context7) {
                 while (1) {
@@ -252,45 +252,51 @@ describe('Datepicker', function () {
                       _panel1$querySelector = panel1.querySelectorAll('.k-next'), nextMonth = _panel1$querySelector[0], nextYear = _panel1$querySelector[1];
                       _content$querySelecto2 = content.querySelectorAll('.k-month-values'), monthValues1 = _content$querySelecto2[0], monthValues2 = _content$querySelecto2[1];
                       nextMonth.click();
-                      _context7.next = 12;
+                      monthStart = (month + 1) % 12 + 1;
+                      yearStart = year + Math.floor((month + 1) / 12);
+                      monthEnd = (month + 2) % 12 + 1;
+                      yearEnd = year + Math.floor((month + 2) / 12);
+                      _context7.next = 16;
                       return wait();
 
-                    case 12:
-                      expect(monthValues1.textContent).to.eql(year + "\u5E74" + (month + 1 + 1) + "\u6708");
-                      expect(monthValues2.textContent).to.eql(year + "\u5E74" + (month + 1 + 2) + "\u6708");
+                    case 16:
+                      expect(monthValues1.textContent).to.eql(yearStart + "\u5E74" + monthStart + "\u6708");
+                      expect(monthValues2.textContent).to.eql(yearEnd + "\u5E74" + monthEnd + "\u6708");
                       nextYear.click();
-                      _context7.next = 17;
+                      _context7.next = 21;
                       return wait();
 
-                    case 17:
-                      expect(monthValues1.textContent).to.eql(year + 1 + "\u5E74" + (month + 1 + 1) + "\u6708");
-                      expect(monthValues2.textContent).to.eql(year + 1 + "\u5E74" + (month + 1 + 2) + "\u6708");
+                    case 21:
+                      expect(monthValues1.textContent).to.eql(yearStart + 1 + "\u5E74" + monthStart + "\u6708");
+                      expect(monthValues2.textContent).to.eql(yearEnd + 1 + "\u5E74" + monthEnd + "\u6708");
                       _panel2$querySelector = panel2.querySelectorAll('.k-prev'), prevYear = _panel2$querySelector[0];
                       prevYear.click();
-                      _context7.next = 23;
+                      _context7.next = 27;
                       return wait();
 
-                    case 23:
-                      expect(monthValues1.textContent).to.eql(year + "\u5E74" + (month + 1 + 1) + "\u6708");
-                      expect(monthValues2.textContent).to.eql(year + "\u5E74" + (month + 1 + 2) + "\u6708"); // year panel
+                    case 27:
+                      expect(monthValues1.textContent).to.eql(yearStart + "\u5E74" + monthStart + "\u6708");
+                      expect(monthValues2.textContent).to.eql(yearEnd + "\u5E74" + monthEnd + "\u6708"); // year panel
 
                       dispatchEvent(monthValues1.firstElementChild, 'click');
                       dispatchEvent(monthValues2.firstElementChild, 'click');
-                      _context7.next = 29;
+                      _context7.next = 33;
                       return wait();
 
-                    case 29:
-                      expect(monthValues1.textContent).to.eql(startYear + "\u5E74 - " + (startYear + 9) + "\u5E74");
-                      expect(monthValues1.textContent).to.eql(monthValues2.textContent);
+                    case 33:
+                      firstDecadeStart = Math.floor(yearStart / 10) * 10;
+                      secondDecadeStart = Math.floor(yearEnd / 10) * 10;
+                      expect(monthValues1.textContent).to.eql(firstDecadeStart + "\u5E74 - " + (firstDecadeStart + 9) + "\u5E74");
+                      expect(monthValues1.textContent).to.eql(secondDecadeStart + "\u5E74 - " + (secondDecadeStart + 9) + "\u5E74");
                       nextYear.click();
-                      _context7.next = 34;
+                      _context7.next = 40;
                       return wait();
 
-                    case 34:
-                      expect(monthValues1.textContent).to.eql(startYear + 10 + "\u5E74 - " + (startYear + 19) + "\u5E74");
-                      expect(monthValues1.textContent).to.eql(monthValues2.textContent);
+                    case 40:
+                      expect(monthValues1.textContent).to.eql(firstDecadeStart + 10 + "\u5E74 - " + (secondDecadeStart + 19) + "\u5E74");
+                      expect(monthValues1.textContent).to.eql(secondDecadeStart + 10 + "\u5E74 - " + (secondDecadeStart + 19) + "\u5E74");
 
-                    case 36:
+                    case 42:
                     case "end":
                       return _context7.stop();
                   }

package/components/dialog/useEscClosable.js

@@ -1,3 +1,4 @@
+import _spliceInstanceProperty from "@babel/runtime-corejs3/core-js/instance/splice";
 import { useInstance, onUnmounted } from 'intact-vue-next';
 import { SHOW, HIDE } from './constants'; // only close the top dialog when press ESC
 
@@ -22,14 +23,19 @@ export function useEscClosable() {
   });
 
   function onHide() {
-    var dialog = dialogs.pop(); // const dialog = dialogs.shift();
+    // the order is uncertain in different frameworks
+    var index = dialogs.indexOf(instance); // const dialog = dialogs.pop();
+    // const dialog = dialogs.shift();
 
     if (process.env.NODE_ENV !== 'production') {
-      if (dialog !== instance) {
-        throw new Error('The dialog has handled hide callback. It is a bug of KPC');
+      // if (dialog !== instance) {
+      if (index === -1) {
+        throw new Error('The dialog has handled hide callback. Maybe it is a bug of KPC');
       }
     }
 
+    _spliceInstanceProperty(dialogs).call(dialogs, 0, index);
+
     if (!dialogs.length) {
       document.removeEventListener('keydown', escClose);
     }

package/components/portal.d.ts

@@ -10,6 +10,7 @@ export declare class Portal<T extends PortalProps = PortalProps> extends Compone
     private dialog;
     mountedQueue?: Function[];
     mountedDone?: boolean;
+    $isPortal: boolean;
     $render(lastVNode: VNodeComponentClass<this> | null, nextVNode: VNodeComponentClass<this>, parentDom: Element, anchor: IntactDom | null, mountedQueue: Function[]): void;
     $update(lastVNode: VNodeComponentClass<this>, nextVNode: VNodeComponentClass<this>, parentDom: Element, anchor: IntactDom | null, mountedQueue: Function[], force: boolean): void;
     $unmount(vNode: VNodeComponentClass<this>, nextVNode: VNodeComponentClass<this> | null): void;

package/components/portal.js

@@ -1,6 +1,6 @@
 import _inheritsLoose from "@babel/runtime-corejs3/helpers/inheritsLoose";
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js/instance/concat";
-import { Component, createCommentVNode, createTextVNode, mount, patch, remove, inject, callAll } from 'intact-vue-next';
+import { Component, createCommentVNode, createTextVNode, mount, patch, remove, inject } from 'intact-vue-next';
 import { isString } from 'intact-shared';
 import { DIALOG } from './dialog/constants';
 var typeDefs = {
@@ -23,6 +23,7 @@ export var Portal = /*#__PURE__*/function (_Component) {
     _this.dialog = inject(DIALOG, null);
     _this.mountedQueue = void 0;
     _this.mountedDone = void 0;
+    _this.$isPortal = true;
     return _this;
   }
 
@@ -39,41 +40,20 @@ export var Portal = /*#__PURE__*/function (_Component) {
   _proto.$render = function $render(lastVNode, nextVNode, parentDom, anchor, mountedQueue) {
     var _this2 = this;
 
+    /**
+     * In React, we cannot render real elements in mountedQueue.
+     * Because the rendering time of react element is uncontrollable
+     */
+    var nextProps = nextVNode.props;
+    var fakeContainer = document.createDocumentFragment();
     mountedQueue.push(function () {
-      var nextProps = nextVNode.props;
       var parentDom = _this2.$lastInput.dom.parentElement;
-      /**
-       * initialize a new mountedQueue to place the callbacks of sub-components to it,
-       * so that we can call them before the sibling components of the Portal
-       */
-
-      var mountedQueue = [];
 
       _this2.initContainer(nextProps.container, parentDom, anchor);
-      /**
-       * Because we render real elements following parent has rendered.
-       * In React, the $promises have done. Then we cannot add any promise to it.
-       * We should find the parent component who holds the $promises object, and
-       * reset it to let remaining element children add promise to it.
-       */
-
-
-      var parent = getParent(_this2);
-
-      if (parent) {
-        parent.$promises.reset();
-      }
-
-      mount(nextProps.children, _this2.container, _this2, _this2.$SVG, null, mountedQueue); // in react, we should wait for all promises to resolve
 
-      if (parent) {
-        Component.FakePromise.all(parent.$promises).then(function () {
-          callAll(mountedQueue);
-        });
-      } else {
-        callAll(mountedQueue);
-      }
+      _this2.container.appendChild(fakeContainer);
     });
+    mount(nextProps.children, fakeContainer, this, this.$SVG, null, mountedQueue);
 
     _Component.prototype.$render.call(this, lastVNode, nextVNode, parentDom, anchor, mountedQueue);
   };
@@ -119,7 +99,7 @@ export var Portal = /*#__PURE__*/function (_Component) {
       // find the closest dialog if exists
       var tmp;
 
-      if ((tmp = this.dialog) && (tmp = tmp.dialogRef.value)) {
+      if ((tmp = this.dialog) && tmp !== this.$senior && (tmp = tmp.dialogRef.value)) {
         this.container = tmp;
       } else {
         this.container = document.body;
@@ -129,14 +109,4 @@ export var Portal = /*#__PURE__*/function (_Component) {
 
   return Portal;
 }(Component);
-Portal.typeDefs = typeDefs;
-
-function getParent($senior) {
-  while ($senior = $senior.$senior) {
-    if ($senior._reactInternals) {
-      return $senior;
-    }
-  }
-
-  return null;
-}
+Portal.typeDefs = typeDefs;

package/index.d.ts

@@ -1,5 +1,5 @@
 /*!
- * @king-design v2.0.8
+ * @king-design v2.0.9
  *
  * Copyright (c) Kingsoft Cloud
  * Released under the MIT License
@@ -57,7 +57,7 @@ export * from './components/tree';
 export * from './components/treeSelect';
 export * from './components/upload';
 export * from './components/wave';
-export declare const version = "2.0.8";
+export declare const version = "2.0.9";
 
 
 export {normalize} from 'intact-vue-next';

package/index.js

@@ -1,5 +1,5 @@
 /*!
- * @king-design v2.0.8
+ * @king-design v2.0.9
  *
  * Copyright (c) Kingsoft Cloud
  * Released under the MIT License
@@ -59,7 +59,7 @@ export * from './components/tree';
 export * from './components/treeSelect';
 export * from './components/upload';
 export * from './components/wave';
-export var version = '2.0.8';
+export var version = '2.0.9';
 /* generate end */
 
 export {normalize} from 'intact-vue-next';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@king-design/vue",
-  "version": "2.0.8",
+  "version": "2.0.9",
   "description": "King-Design UI components for Vue3.0.",
   "keywords": [
     "component",
@@ -38,7 +38,7 @@
     "dayjs": "^1.10.7",
     "downloadjs": "^1.4.7",
     "enquire.js": "^2.1.6",
-    "intact-vue-next": "^3.0.9",
+    "intact-vue-next": "^3.0.10",
     "monaco-editor": "^0.26.1",
     "mxgraphx": "^4.0.7",
     "resize-observer-polyfill": "^1.5.1",