cosey 0.6.32 → 0.6.34

package/components/table/index.d.ts

@@ -12,11 +12,11 @@ declare const _Table: {
             default: boolean;
         };
         columns: {
-            type: import("vue").PropType<import("..").TableColumnProps[]>;
+            type: import("vue").PropType<import("..").MayBeTableColumnProps[]>;
             default: () => never[];
         };
         actionColumn: {
-            type: import("vue").PropType<import("..").TableColumnProps>;
+            type: import("vue").PropType<import("..").MayBeTableColumnProps>;
         };
         pagination: {
             type: import("vue").PropType<boolean | import("element-plus").PaginationProps>;
@@ -319,7 +319,7 @@ declare const _Table: {
     }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, import("vue").PublicProps, {
         tableLayout: "auto" | "fixed";
         border: boolean;
-        columns: import("..").TableColumnProps[];
+        columns: import("..").MayBeTableColumnProps[];
         data: any[];
         immediate: boolean;
         className: string;
@@ -358,11 +358,11 @@ declare const _Table: {
             default: boolean;
         };
         columns: {
-            type: import("vue").PropType<import("..").TableColumnProps[]>;
+            type: import("vue").PropType<import("..").MayBeTableColumnProps[]>;
             default: () => never[];
         };
         actionColumn: {
-            type: import("vue").PropType<import("..").TableColumnProps>;
+            type: import("vue").PropType<import("..").MayBeTableColumnProps>;
         };
         pagination: {
             type: import("vue").PropType<boolean | import("element-plus").PaginationProps>;
@@ -665,7 +665,7 @@ declare const _Table: {
     }, {}, {}, {}, {
         tableLayout: "auto" | "fixed";
         border: boolean;
-        columns: import("..").TableColumnProps[];
+        columns: import("..").MayBeTableColumnProps[];
         data: any[];
         immediate: boolean;
         className: string;
@@ -701,11 +701,11 @@ declare const _Table: {
         default: boolean;
     };
     columns: {
-        type: import("vue").PropType<import("..").TableColumnProps[]>;
+        type: import("vue").PropType<import("..").MayBeTableColumnProps[]>;
         default: () => never[];
     };
     actionColumn: {
-        type: import("vue").PropType<import("..").TableColumnProps>;
+        type: import("vue").PropType<import("..").MayBeTableColumnProps>;
     };
     pagination: {
         type: import("vue").PropType<boolean | import("element-plus").PaginationProps>;
@@ -866,7 +866,7 @@ declare const _Table: {
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, {
     tableLayout: "auto" | "fixed";
     border: boolean;
-    columns: import("..").TableColumnProps[];
+    columns: import("..").MayBeTableColumnProps[];
     data: any[];
     immediate: boolean;
     className: string;

package/components/table/table-column/table-column.d.ts

@@ -32,6 +32,7 @@ export type TableColumnProps<T = any> = Partial<Omit<ExtractPropTypes<typeof elT
     tooltip?: string;
     format?: (cellValue: any, row: any, column: TableColumnCtx<any>, index: number) => VNode | string;
 };
+export type MayBeTableColumnProps = TableColumnProps | null | undefined | boolean;
 export declare const tableColumnProps: {
     slots: {
         type: PropType<TableColumnProps["slots"]>;

package/components/table/table.d.ts

@@ -1,6 +1,6 @@
 import { TableColumnCtx, type PaginationProps } from 'element-plus';
 import { type PropType, type ExtractPropTypes, MaybeRef } from 'vue';
-import { type TableColumnProps } from './table-column/table-column';
+import { type MayBeTableColumnProps } from './table-column/table-column';
 import { TableQueryExpose, type TableQueryProps } from './table-query/table-query';
 import { TableStatisticsColumn } from './table-stats/table-stats';
 export interface ToolbarConfig {
@@ -25,11 +25,11 @@ export declare const tableProps: {
         default: boolean;
     };
     columns: {
-        type: PropType<TableColumnProps[]>;
+        type: PropType<MayBeTableColumnProps[]>;
         default: () => never[];
     };
     actionColumn: {
-        type: PropType<TableColumnProps>;
+        type: PropType<MayBeTableColumnProps>;
     };
     pagination: {
         type: PropType<boolean | PaginationProps>;

package/components/table/table.js

@@ -48,7 +48,7 @@ const tableExtraProps = {
     default: () => []
   },
   actionColumn: {
-    type: Object
+    type: null
   },
   pagination: {
     type: [Object, Boolean],

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

@@ -1,6 +1,5 @@
 import { type PaginationProps, type TableColumnCtx } from 'element-plus';
 import { type TableSlots, type TableExpose, type ToolbarConfig } from './table';
-import { type TableColumnProps } from './table-column/table-column';
 type __VLS_Slots = TableSlots;
 declare const __VLS_component: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     api: {
@@ -11,11 +10,11 @@ declare const __VLS_component: import("vue").DefineComponent<import("vue").Extra
         default: boolean;
     };
     columns: {
-        type: import("vue").PropType<TableColumnProps[]>;
+        type: import("vue").PropType<import("..").MayBeTableColumnProps[]>;
         default: () => never[];
     };
     actionColumn: {
-        type: import("vue").PropType<TableColumnProps>;
+        type: import("vue").PropType<import("..").MayBeTableColumnProps>;
     };
     pagination: {
         type: import("vue").PropType<boolean | PaginationProps>;
@@ -182,11 +181,11 @@ declare const __VLS_component: import("vue").DefineComponent<import("vue").Extra
         default: boolean;
     };
     columns: {
-        type: import("vue").PropType<TableColumnProps[]>;
+        type: import("vue").PropType<import("..").MayBeTableColumnProps[]>;
         default: () => never[];
     };
     actionColumn: {
-        type: import("vue").PropType<TableColumnProps>;
+        type: import("vue").PropType<import("..").MayBeTableColumnProps>;
     };
     pagination: {
         type: import("vue").PropType<boolean | PaginationProps>;
@@ -308,7 +307,7 @@ declare const __VLS_component: import("vue").DefineComponent<import("vue").Extra
 }>> & Readonly<{}>, {
     tableLayout: "auto" | "fixed";
     border: boolean;
-    columns: TableColumnProps[];
+    columns: import("..").MayBeTableColumnProps[];
     data: any[];
     immediate: boolean;
     className: string;

package/components/table/table.vue.js

@@ -107,7 +107,7 @@ var stdin_default = /* @__PURE__ */defineComponent({
     });
     const renderedColumns = ref([]);
     const setRenderedColumns = () => {
-      renderedColumns.value = cloneDeep([...props.columns, props.actionColumn].filter(Boolean));
+      renderedColumns.value = cloneDeep([...props.columns, props.actionColumn].filter(isObject));
     };
     const exportColumns = computed(() => {
       return renderedColumns.value?.filter(column => {

package/config/index.d.ts

@@ -41,8 +41,10 @@ export interface LayoutComponents {
 }
 export interface LayoutSlots {
     topbarRight?: () => VNodeChild;
+    topbarWidget?: () => VNodeChild;
     authWidget?: () => VNodeChild;
     userMenu?: () => VNodeChild;
+    afterToggle?: () => VNodeChild;
 }
 type FilterRouteHandler = (route: RouteRecordRaw) => RouteRecordRaw | void | boolean | undefined | null;
 export type CoseyOptions = {

package/hooks/useUpsert.d.ts

@@ -18,7 +18,7 @@ export interface UseUpsertOptions<Model, Row = Model> {
     onShow?: () => void;
     onShown?: () => void;
     onShownAdd?: (...args: any[]) => void;
-    onShownEdit?: (...args: any[]) => void;
+    onShownEdit?: (row: Row, ...args: any[]) => void;
     detailsFetch?: (row: Row) => any;
     beforeFill?: (row: Row) => any;
     addFetch?: (...args: any[]) => any;

package/layout/layout-base/layout-base.vue.js

@@ -37,6 +37,8 @@ var stdin_default = /* @__PURE__ */defineComponent({
     const layoutStore = useLayoutStore();
     const slotsConfig = useGlobalConfig().slots;
     const TopbarRight = defineTemplate(() => slotsConfig.topbarRight?.());
+    const TopbarWidget = defineTemplate(() => slotsConfig.topbarWidget?.());
+    const AfterToggle = defineTemplate(() => slotsConfig.afterToggle?.());
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", {
         class: normalizeClass([unref(hashId), unref(prefixCls)])
@@ -60,7 +62,7 @@ var stdin_default = /* @__PURE__ */defineComponent({
               "is-horizontal": ""
             })) : createCommentVNode("v-if", true), unref(layoutStore).isMobile || unref(layoutStore).isVertical || unref(layoutStore).isBiserial ? (openBlock(), createBlock(unref(stdin_default$d), {
               key: 1
-            })) : createCommentVNode("v-if", true), !unref(layoutStore).isMobile && (unref(layoutStore).isVertical || unref(layoutStore).isBiserial) ? (openBlock(), createBlock(unref(stdin_default$e), {
+            })) : createCommentVNode("v-if", true), (openBlock(), createBlock(resolveDynamicComponent(unref(AfterToggle)))), !unref(layoutStore).isMobile && (unref(layoutStore).isVertical || unref(layoutStore).isBiserial) ? (openBlock(), createBlock(unref(stdin_default$e), {
               key: 2
             })) : createCommentVNode("v-if", true), !unref(layoutStore).isMobile && (unref(layoutStore).isHorizontalVertical || unref(layoutStore).isHorizontalBiserial) ? (openBlock(), createBlock(unref(stdin_default$f), {
               key: 3
@@ -71,7 +73,7 @@ var stdin_default = /* @__PURE__ */defineComponent({
                 "flex": "1"
               }
             })) : createCommentVNode("v-if", true)]),
-            right: withCtx(() => [createVNode(unref(stdin_default$9)), (openBlock(), createBlock(resolveDynamicComponent(unref(TopbarRight)))), createVNode(unref(stdin_default$a)), createVNode(unref(stdin_default$b))]),
+            right: withCtx(() => [createVNode(unref(stdin_default$9)), (openBlock(), createBlock(resolveDynamicComponent(unref(TopbarWidget)))), createVNode(unref(stdin_default$a)), createVNode(unref(stdin_default$b)), (openBlock(), createBlock(resolveDynamicComponent(unref(TopbarRight))))]),
             _: 1
             /* STABLE */
           }), createVNode(unref(stdin_default$h))]),

package/package.json

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

package/utils/excel/index.d.ts

@@ -1,10 +1,10 @@
 import { bookFormats } from './bookFormats';
 import type { ExportBookType, ExportExcelScheme } from './type';
-import { type TableColumnProps } from '../../components/table/table-column/table-column';
+import { type MayBeTableColumnProps, type TableColumnProps } from '../../components/table/table-column/table-column';
 /**
  * 只取最底层的列组成表头
  */
-export declare function flatColumns(columns: TableColumnProps[]): TableColumnProps[];
+export declare function flatColumns(columns: MayBeTableColumnProps[]): TableColumnProps[];
 export interface ExportExcelOptions {
     footerCount?: number;
 }

package/utils/excel/index.js

@@ -7,6 +7,7 @@ import { wb2xlsx } from './xlsx.js';
 import { wb2xml } from './xml.js';
 import { wb2csv } from './csv.js';
 import { wb2txt } from './txt.js';
+import { isObject } from '../is.js';
 
 function downloadByUrl(url, filename) {
   const link = document.createElement("a");
@@ -59,8 +60,10 @@ async function writeFile(wb, bookType) {
 }
 function flatColumns(columns) {
   return columns.reduce((result, column) => {
-    return result.concat(Array.isArray(column.columns) ? flatColumns(column.columns) : column);
-  }, []);
+    return result.concat(
+      isObject(column) && Array.isArray(column.columns) ? flatColumns(column.columns) : column
+    );
+  }, []).filter(isObject);
 }
 function columns2aoa(columns) {
   let aoa = [];