cosey 0.11.5 → 0.11.7

package/components/table/index.d.ts

@@ -5,7 +5,7 @@ export * from './useTable';
 declare const _Table: {
     new (...args: any[]): import("vue").CreateComponentPublicInstanceWithMixins<Readonly<import("vue").ExtractPropTypes<{
         api: {
-            type: import("vue").PropType<(...args: any[]) => Promise<any> | any>;
+            type: import("vue").PropType<((...args: any[]) => Promise<any> | any) | boolean | null | undefined>;
         };
         immediate: {
             type: BooleanConstructor;
@@ -131,7 +131,7 @@ declare const _Table: {
             type: import("vue").PropType<(res: any) => any>;
         };
         parallelFetch: {
-            type: import("vue").PropType<(...args: any[]) => Promise<any> | any>;
+            type: import("vue").PropType<((...args: any[]) => Promise<any> | any) | boolean | null | undefined>;
         };
         toolbarConfig: {
             type: import("vue").PropType<import("./table").ToolbarConfig | boolean>;
@@ -141,7 +141,7 @@ declare const _Table: {
             type: import("vue").PropType<import("./table").TableConfig["keys"]>;
         };
         statsColumns: {
-            type: import("vue").PropType<import("vue").MaybeRef<import("./table-stats/table-stats.api").TableStatisticsColumn[]>>;
+            type: import("vue").PropType<import("vue").MaybeRef<import("./table-stats/table-stats.api").TableStatisticsColumn[] | null | undefined | boolean>>;
         };
         statsData: {
             type: import("vue").MaybeRef<any>;
@@ -316,7 +316,7 @@ declare const _Table: {
         Defaults: {};
     }, Readonly<import("vue").ExtractPropTypes<{
         api: {
-            type: import("vue").PropType<(...args: any[]) => Promise<any> | any>;
+            type: import("vue").PropType<((...args: any[]) => Promise<any> | any) | boolean | null | undefined>;
         };
         immediate: {
             type: BooleanConstructor;
@@ -442,7 +442,7 @@ declare const _Table: {
             type: import("vue").PropType<(res: any) => any>;
         };
         parallelFetch: {
-            type: import("vue").PropType<(...args: any[]) => Promise<any> | any>;
+            type: import("vue").PropType<((...args: any[]) => Promise<any> | any) | boolean | null | undefined>;
         };
         toolbarConfig: {
             type: import("vue").PropType<import("./table").ToolbarConfig | boolean>;
@@ -452,7 +452,7 @@ declare const _Table: {
             type: import("vue").PropType<import("./table").TableConfig["keys"]>;
         };
         statsColumns: {
-            type: import("vue").PropType<import("vue").MaybeRef<import("./table-stats/table-stats.api").TableStatisticsColumn[]>>;
+            type: import("vue").PropType<import("vue").MaybeRef<import("./table-stats/table-stats.api").TableStatisticsColumn[] | null | undefined | boolean>>;
         };
         statsData: {
             type: import("vue").MaybeRef<any>;
@@ -624,7 +624,7 @@ declare const _Table: {
     __isSuspense?: never;
 } & import("vue").ComponentOptionsBase<Readonly<import("vue").ExtractPropTypes<{
     api: {
-        type: import("vue").PropType<(...args: any[]) => Promise<any> | any>;
+        type: import("vue").PropType<((...args: any[]) => Promise<any> | any) | boolean | null | undefined>;
     };
     immediate: {
         type: BooleanConstructor;
@@ -654,7 +654,7 @@ declare const _Table: {
         type: import("vue").PropType<(res: any) => any>;
     };
     parallelFetch: {
-        type: import("vue").PropType<(...args: any[]) => Promise<any> | any>;
+        type: import("vue").PropType<((...args: any[]) => Promise<any> | any) | boolean | null | undefined>;
     };
     toolbarConfig: {
         type: import("vue").PropType<import("./table").ToolbarConfig | boolean>;
@@ -664,7 +664,7 @@ declare const _Table: {
         type: import("vue").PropType<import("./table").TableConfig["keys"]>;
     };
     statsColumns: {
-        type: import("vue").PropType<import("vue").MaybeRef<import("./table-stats/table-stats.api").TableStatisticsColumn[]>>;
+        type: import("vue").PropType<import("vue").MaybeRef<import("./table-stats/table-stats.api").TableStatisticsColumn[] | null | undefined | boolean>>;
     };
     statsData: {
         type: import("vue").MaybeRef<any>;

package/components/table/table.d.ts

@@ -18,7 +18,7 @@ export declare const tableEmitOnProps: Record<string, {
 }>;
 export declare const tableProps: {
     api: {
-        type: PropType<(...args: any[]) => Promise<any> | any>;
+        type: PropType<((...args: any[]) => Promise<any> | any) | boolean | null | undefined>;
     };
     immediate: {
         type: BooleanConstructor;
@@ -48,7 +48,7 @@ export declare const tableProps: {
         type: PropType<(res: any) => any>;
     };
     parallelFetch: {
-        type: PropType<(...args: any[]) => Promise<any> | any>;
+        type: PropType<((...args: any[]) => Promise<any> | any) | boolean | null | undefined>;
     };
     toolbarConfig: {
         type: PropType<ToolbarConfig | boolean>;
@@ -58,7 +58,7 @@ export declare const tableProps: {
         type: PropType<TableConfig["keys"]>;
     };
     statsColumns: {
-        type: PropType<MaybeRef<TableStatisticsColumn[]>>;
+        type: PropType<MaybeRef<TableStatisticsColumn[] | null | undefined | boolean>>;
     };
     statsData: {
         type: MaybeRef<any>;

package/components/table/table.js

@@ -37,7 +37,7 @@ const tableEmitOnProps = tableEmitOnEvents.reduce(
 );
 const tableExtraProps = {
   api: {
-    type: Function
+    type: null
   },
   immediate: {
     type: Boolean,
@@ -67,7 +67,7 @@ const tableExtraProps = {
     type: Function
   },
   parallelFetch: {
-    type: Function
+    type: null
   },
   toolbarConfig: {
     type: [Object, Boolean],
@@ -77,7 +77,7 @@ const tableExtraProps = {
     type: Object
   },
   statsColumns: {
-    type: Object
+    type: null
   },
   statsData: {
     type: Object

package/components/table/table.vue.d.ts

@@ -3,7 +3,7 @@ import { type TableSlots, type TableExpose, type ToolbarConfig } from './table';
 type __VLS_Slots = TableSlots;
 declare const __VLS_component: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     api: {
-        type: import("vue").PropType<(...args: any[]) => Promise<any> | any>;
+        type: import("vue").PropType<((...args: any[]) => Promise<any> | any) | boolean | null | undefined>;
     };
     immediate: {
         type: BooleanConstructor;
@@ -33,7 +33,7 @@ declare const __VLS_component: import("vue").DefineComponent<import("vue").Extra
         type: import("vue").PropType<(res: any) => any>;
     };
     parallelFetch: {
-        type: import("vue").PropType<(...args: any[]) => Promise<any> | any>;
+        type: import("vue").PropType<((...args: any[]) => Promise<any> | any) | boolean | null | undefined>;
     };
     toolbarConfig: {
         type: import("vue").PropType<ToolbarConfig | boolean>;
@@ -43,7 +43,7 @@ declare const __VLS_component: import("vue").DefineComponent<import("vue").Extra
         type: import("vue").PropType<import("./table").TableConfig["keys"]>;
     };
     statsColumns: {
-        type: import("vue").PropType<import("vue").MaybeRef<import("./table-stats/table-stats.api").TableStatisticsColumn[]>>;
+        type: import("vue").PropType<import("vue").MaybeRef<import("./table-stats/table-stats.api").TableStatisticsColumn[] | null | undefined | boolean>>;
     };
     statsData: {
         type: import("vue").MaybeRef<any>;
@@ -184,7 +184,7 @@ declare const __VLS_component: import("vue").DefineComponent<import("vue").Extra
     updateKeyChildren: (key: string, data: any[]) => void;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     api: {
-        type: import("vue").PropType<(...args: any[]) => Promise<any> | any>;
+        type: import("vue").PropType<((...args: any[]) => Promise<any> | any) | boolean | null | undefined>;
     };
     immediate: {
         type: BooleanConstructor;
@@ -214,7 +214,7 @@ declare const __VLS_component: import("vue").DefineComponent<import("vue").Extra
         type: import("vue").PropType<(res: any) => any>;
     };
     parallelFetch: {
-        type: import("vue").PropType<(...args: any[]) => Promise<any> | any>;
+        type: import("vue").PropType<((...args: any[]) => Promise<any> | any) | boolean | null | undefined>;
     };
     toolbarConfig: {
         type: import("vue").PropType<ToolbarConfig | boolean>;
@@ -224,7 +224,7 @@ declare const __VLS_component: import("vue").DefineComponent<import("vue").Extra
         type: import("vue").PropType<import("./table").TableConfig["keys"]>;
     };
     statsColumns: {
-        type: import("vue").PropType<import("vue").MaybeRef<import("./table-stats/table-stats.api").TableStatisticsColumn[]>>;
+        type: import("vue").PropType<import("vue").MaybeRef<import("./table-stats/table-stats.api").TableStatisticsColumn[] | null | undefined | boolean>>;
     };
     statsData: {
         type: import("vue").MaybeRef<any>;

package/components/table/table.vue.js

@@ -19,7 +19,7 @@ import { useLocale } from '../../hooks/useLocale.js';
 import { auid } from '../../utils/string.js';
 import { useComponentConfig, useConfig } from '../config-provider/config-provider.api.js';
 import { addPxUnit } from '../../utils/css.js';
-import { isNullish, isObject, isFunction } from '../../utils/is.js';
+import { isNullish, isFunction, isObject } from '../../utils/is.js';
 import { getVNodeText, createMergedExpose } from '../../utils/vue.js';
 import { useFetch } from '../../hooks/useFetch.js';
 import { useResizeObserver } from '../../hooks/useResizeObserver.js';
@@ -179,11 +179,11 @@ var stdin_default = /* @__PURE__ */defineComponent({
       execute
     } = useFetch(() => {
       const params = getFullFetchParams();
-      return Promise.all([props.api?.({
+      return Promise.all([isFunction(props.api) ? props.api({
         ...params
-      }), props.parallelFetch?.({
+      }) : null, isFunction(props.parallelFetch) ? props.parallelFetch({
         ...params
-      })]);
+      }) : null]);
     }, {
       immediate: false,
       onSuccess([res]) {
@@ -207,7 +207,7 @@ var stdin_default = /* @__PURE__ */defineComponent({
       }
     };
     onMounted(() => {
-      if (props.immediate && props.api) {
+      if (props.immediate && isFunction(props.api)) {
         validateExecute();
       }
     });
@@ -365,7 +365,10 @@ var stdin_default = /* @__PURE__ */defineComponent({
     };
     const statsColumns = computed(() => unref(props.statsColumns));
     const statsData = computed(() => unref(props.statsData));
-    const isStatsVisible = computed(() => statsColumns.value && statsColumns.value.length > 0);
+    const isStatsVisible = computed(() => Array.isArray(statsColumns.value) && statsColumns.value.length > 0);
+    const finalStatsColumns = computed(() => {
+      return Array.isArray(statsColumns.value) ? statsColumns.value : [];
+    });
     const rootRef = ref(null);
     const getRootEl = () => rootRef.value;
     const expose = createMergedExpose(tableExposeKeys, () => elTableRef.value, {
@@ -435,7 +438,7 @@ var stdin_default = /* @__PURE__ */defineComponent({
         key: 0,
         class: normalizeClass(`${unref(prefixCls)}-stats-wrapper`)
       }, [createVNode(unref(stdin_default$3), {
-        columns: statsColumns.value,
+        columns: finalStatsColumns.value,
         data: statsData.value
       }, null, 8, ["columns", "data"])], 2
       /* CLASS */)) : createCommentVNode("v-if", true)], 2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cosey",
-  "version": "0.11.5",
+  "version": "0.11.7",
   "description": "基于 Vue3 + vite 的后台管理系统框架",
   "type": "module",
   "main": "index.js",

package/utils/tree.js

@@ -109,8 +109,11 @@ function mapTreeExtra(tree, callback, options, _internalLevel = 1) {
 }
 function getNextSibling(node, mergeLast) {
   if (node) {
-    const nextSibling = node.nextSibling;
-    if (nextSibling && (!mergeLast || nextSibling.reverseLevel > 1 || nextSibling.prevSibling?.reverseLevel !== 1)) {
+    let nextSibling = node.nextSibling;
+    while (mergeLast && nextSibling && nextSibling.reverseLevel === 1 && nextSibling.prevSibling?.reverseLevel === 1) {
+      nextSibling = nextSibling.nextSibling;
+    }
+    if (nextSibling) {
       return nextSibling;
     } else {
       return getNextSibling(node.parent, mergeLast);