@opentiny/vue-renderless 3.16.0 → 3.16.1

package/common/index.js

@@ -237,7 +237,7 @@ const CASCADER = {
   PropsHover: "hoverThreshold",
   MenuConnector: "cascader-menu-"
 };
-const version = "3.16.0";
+const version = "3.16.1";
 const log = (data, type = "log") => {
   uLog.logger[type](data);
 };

package/common/runtime.js

@@ -22,7 +22,7 @@ import vuePopup from "./deps/vue-popup";
 import validate from "./validate";
 import memorize from "./deps/memorize";
 import * as common from ".";
-const version = "3.16.0";
+const version = "3.16.1";
 const Renderless = {
   browser,
   array,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/vue-renderless",
-  "version": "3.16.0",
+  "version": "3.16.1",
   "description": "An enterprise-class UI component library, support both Vue.js 2 and Vue.js 3, as well as PC and mobile.",
   "homepage": "https://opentiny.design/tiny-vue",
   "keywords": [

package/tabs/index.js

@@ -1,4 +1,40 @@
 import "../chunk-G2ADBYYC.js";
+const getOrderedPanes = (parent, panes) => {
+  const slotDefault = parent.$slots.default;
+  let orders;
+  if (typeof slotDefault === "function") {
+    orders = [];
+    const tabVnodes = slotDefault();
+    const handler = ({ type, componentOptions, props }) => {
+      let componentName = type && type.componentName;
+      if (!componentName)
+        componentName = componentOptions && componentOptions.Ctor.extendOptions.componentName;
+      if (componentName === "TabItem") {
+        const paneName = props && props.name || componentOptions && componentOptions.propsData.name;
+        orders.push(paneName);
+      }
+    };
+    tabVnodes.forEach(({ type, componentOptions, props, children }) => {
+      if (type && (type.toString() === "Symbol(Fragment)" || // vue@3.3之前的开发模式
+      type.toString() === "Symbol(v-fgt)" || //   vue@3.3.1 的变更
+      type.toString() === "Symbol()")) {
+        Array.isArray(children) && children.forEach(({ type: type2, componentOptions: componentOptions2, props: props2 }) => handler({ type: type2, componentOptions: componentOptions2, props: props2 }));
+      } else {
+        handler({ type, componentOptions, props });
+      }
+    });
+  }
+  if (orders.length > 0) {
+    let tmpPanes = [];
+    orders.forEach((paneName) => {
+      let pane = panes.find((pane2) => pane2.name === paneName);
+      if (pane)
+        tmpPanes.push(pane);
+    });
+    panes = tmpPanes;
+  }
+  return panes;
+};
 const calcPaneInstances = ({
   constants,
   parent,
@@ -28,19 +64,7 @@ const calcPaneInstances = ({
         index > -1 ? currentPanes[index] = vm : currentPanes.push(vm);
       }
     });
-    const currentPaneStates = currentPanes.map((pane) => pane.state);
-    const paneStates = state.panes.map((pane) => pane.state);
-    let newPanes = [];
-    for (let i = 0; i < paneStates.length; i++) {
-      const paneState = paneStates[i];
-      const index = currentPaneStates.indexOf(paneState);
-      if (index > -1) {
-        newPanes.push(state.panes[i]);
-        currentPanes.splice(index, 1);
-        currentPaneStates.splice(index, 1);
-      }
-    }
-    newPanes = newPanes.concat(currentPanes);
+    const newPanes = getOrderedPanes(parent, currentPanes);
     const panesChanged = !(newPanes.length === state.panes.length && newPanes.every((pane, index) => pane.state === state.panes[index].state));
     if (isForceUpdate || panesChanged) {
       state.panes = newPanes;

package/types/action-menu.type.d.ts

@@ -87,14 +87,22 @@ declare const visibleChange: (emit: IActionMenuRenderlessParams['emit']) => (sta
  *
  */
 
+interface IActonMenuOptionsItem {
+    label?: string;
+    disabled?: boolean;
+    divided?: boolean;
+    children?: IActonMenuOptionsItem[];
+    icon?: any;
+    [key: string]: any;
+}
 interface IActionMenuState {
-    visibleOptions: object;
-    moreOptions: object;
+    visibleOptions: IActonMenuOptionsItem[];
+    moreOptions: IActonMenuOptionsItem[];
     isCardMode: boolean;
     spacing: string | number;
     maxShowNum: number;
     moreText: string;
-    suffixIcon: string | Object;
+    suffixIcon: string | object;
 }
 type IActionMenuProps = ExtractPropTypes<typeof actionMenuProps>;
 type IActionMenuRenderlessParams = ISharedRenderlessFunctionParams<null> & {
@@ -118,4 +126,4 @@ interface IActionMenuApi {
 }
 type IActionMenuRenderlessParamUtils = ISharedRenderlessParamUtils<null>;
 
-export { IActionMenuApi, IActionMenuItemData, IActionMenuProps, IActionMenuRenderlessParamUtils, IActionMenuRenderlessParams, IActionMenuState };
+export { IActionMenuApi, IActionMenuItemData, IActionMenuProps, IActionMenuRenderlessParamUtils, IActionMenuRenderlessParams, IActionMenuState, IActonMenuOptionsItem };