@tmagic/table 1.5.0-beta.5 → 1.5.0-beta.7

package/dist/tmagic-table.js

@@ -107,9 +107,9 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
             size: "small",
             onClick: ($event) => save(scope.$index, _ctx.config)
           }, {
-            default: withCtx(() => [
+            default: withCtx(() => _cache[0] || (_cache[0] = [
               createTextVNode("保存")
-            ]),
+            ])),
             _: 2
           }, 1032, ["onClick"]), [
             [vShow, _ctx.editState[scope.$index]]
@@ -121,9 +121,9 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
             size: "small",
             onClick: ($event) => _ctx.editState[scope.$index] = void 0
           }, {
-            default: withCtx(() => [
+            default: withCtx(() => _cache[1] || (_cache[1] = [
               createTextVNode("取消")
-            ]),
+            ])),
             _: 2
           }, 1032, ["onClick"]), [
             [vShow, _ctx.editState[scope.$index]]
@@ -237,6 +237,7 @@ const formatter = (item, row) => {
     return row[item.prop];
   }
 };
+const createColumns = (columns) => columns;
 
 const _sfc_main$2 = /* @__PURE__ */ defineComponent({
   ...{
@@ -555,4 +556,4 @@ const index = {
   }
 };
 
-export { _sfc_main as MagicTable, index as default, formatter };
+export { _sfc_main as MagicTable, createColumns, index as default, formatter };

package/dist/tmagic-table.umd.cjs

@@ -108,9 +108,9 @@
               size: "small",
               onClick: ($event) => save(scope.$index, _ctx.config)
             }, {
-              default: vue.withCtx(() => [
+              default: vue.withCtx(() => _cache[0] || (_cache[0] = [
                 vue.createTextVNode("保存")
-              ]),
+              ])),
               _: 2
             }, 1032, ["onClick"]), [
               [vue.vShow, _ctx.editState[scope.$index]]
@@ -122,9 +122,9 @@
               size: "small",
               onClick: ($event) => _ctx.editState[scope.$index] = void 0
             }, {
-              default: vue.withCtx(() => [
+              default: vue.withCtx(() => _cache[1] || (_cache[1] = [
                 vue.createTextVNode("取消")
-              ]),
+              ])),
               _: 2
             }, 1032, ["onClick"]), [
               [vue.vShow, _ctx.editState[scope.$index]]
@@ -238,6 +238,7 @@
       return row[item.prop];
     }
   };
+  const createColumns = (columns) => columns;
 
   const _sfc_main$2 = /* @__PURE__ */ vue.defineComponent({
     ...{
@@ -557,6 +558,7 @@
   };
 
   exports.MagicTable = _sfc_main;
+  exports.createColumns = createColumns;
   exports.default = index;
   exports.formatter = formatter;
 

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.5.0-beta.5",
+  "version": "1.5.0-beta.7",
   "name": "@tmagic/table",
   "type": "module",
   "main": "dist/tmagic-table.umd.cjs",
@@ -36,18 +36,18 @@
   "devDependencies": {
     "@types/lodash-es": "^4.17.4",
     "@types/node": "^18.19.0",
-    "@vitejs/plugin-vue": "^5.1.1",
-    "@vue/compiler-sfc": "^3.4.27",
+    "@vitejs/plugin-vue": "^5.1.3",
+    "@vue/compiler-sfc": "^3.5.0",
     "@vue/test-utils": "^2.4.6",
     "rimraf": "^3.0.2",
-    "sass": "^1.77.0",
-    "vite": "^5.3.5"
+    "sass": "^1.78.0",
+    "vite": "^5.4.3"
   },
   "peerDependencies": {
-    "vue": "^3.4.35",
+    "vue": "^3.5.0",
     "typescript": "*",
-    "@tmagic/design": "1.5.0-beta.5",
-    "@tmagic/form": "1.5.0-beta.5"
+    "@tmagic/design": "1.5.0-beta.7",
+    "@tmagic/form": "1.5.0-beta.7"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/src/schema.ts

@@ -19,7 +19,7 @@
 import { FormConfig, FormValue } from '@tmagic/form';
 
 export interface ColumnActionConfig {
-  type?: 'delete' | 'copy' | 'edit';
+  type?: 'delete' | 'copy' | 'edit' | string;
   buttonType?: string;
   display?: (row: any) => boolean;
   text?: string | ((row: any) => string);
@@ -46,6 +46,7 @@ export interface ColumnConfig<T = any> {
   type?: 'popover' | 'expand' | 'component' | string | ((value: any, row: T) => string);
   text?: string;
   prop?: string;
+  name?: string;
   showHeader?: boolean;
   table?: ColumnConfig[];
   formatter?: 'datetime' | ((item: any, row: T) => any);

package/src/utils.ts

@@ -18,7 +18,7 @@
 
 import { datetimeFormatter } from '@tmagic/form';
 
-import { ColumnConfig } from './schema';
+import type { ColumnConfig } from './schema';
 
 export const formatter = (item: ColumnConfig, row: any) => {
   if (!item.prop) return '';
@@ -37,3 +37,5 @@ export const formatter = (item: ColumnConfig, row: any) => {
     return row[item.prop];
   }
 };
+
+export const createColumns = (columns: ColumnConfig[]) => columns;

package/types/index.d.ts

@@ -3,7 +3,7 @@ import { App } from 'vue';
 import { FormConfig, FormValue } from '@tmagic/form';
 
 interface ColumnActionConfig {
-    type?: 'delete' | 'copy' | 'edit';
+    type?: 'delete' | 'copy' | 'edit' | string;
     buttonType?: string;
     display?: (row: any) => boolean;
     text?: string | ((row: any) => string);
@@ -31,6 +31,7 @@ interface ColumnConfig<T = any> {
     type?: 'popover' | 'expand' | 'component' | string | ((value: any, row: T) => string);
     text?: string;
     prop?: string;
+    name?: string;
     showHeader?: boolean;
     table?: ColumnConfig[];
     formatter?: 'datetime' | ((item: any, row: T) => any);
@@ -56,7 +57,7 @@ interface ColumnConfig<T = any> {
     buttonText?: string;
 }
 
-declare const _default$1: vue.DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToOption<{
+declare const _default$1: vue.DefineComponent<{
     data: any[];
     columns?: ColumnConfig[];
     /** 合并行或列的计算方法 */
@@ -78,17 +79,11 @@ declare const _default$1: vue.DefineComponent<__VLS_WithDefaults<__VLS_TypeProps
     rowkeyName?: string;
     /** 是否带有纵向边框 */
     border?: boolean;
-}>, {
-    columns: () => never[];
-    loading: boolean;
-    showHeader: boolean;
-    defaultExpandAll: boolean;
-    border: boolean;
-}>, {
+}, {
     toggleRowSelection: (row: any, selected: boolean) => void;
     toggleRowExpansion: (row: any, expanded: boolean) => void;
     clearSelection: () => void;
-}, unknown, {}, {}, vue.ComponentOptionsMixin, vue.ComponentOptionsMixin, {
+}, {}, {}, {}, vue.ComponentOptionsMixin, vue.ComponentOptionsMixin, {
     select: (...args: any[]) => void;
     "sort-change": (...args: any[]) => void;
     "expand-change": (...args: any[]) => void;
@@ -96,7 +91,7 @@ declare const _default$1: vue.DefineComponent<__VLS_WithDefaults<__VLS_TypeProps
     "after-action": (...args: any[]) => void;
     "select-all": (...args: any[]) => void;
     "selection-change": (...args: any[]) => void;
-}, string, vue.PublicProps, Readonly<vue.ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToOption<{
+}, string, vue.PublicProps, Readonly<{
     data: any[];
     columns?: ColumnConfig[];
     /** 合并行或列的计算方法 */
@@ -118,13 +113,7 @@ declare const _default$1: vue.DefineComponent<__VLS_WithDefaults<__VLS_TypeProps
     rowkeyName?: string;
     /** 是否带有纵向边框 */
     border?: boolean;
-}>, {
-    columns: () => never[];
-    loading: boolean;
-    showHeader: boolean;
-    defaultExpandAll: boolean;
-    border: boolean;
-}>>> & {
+}> & Readonly<{
     onSelect?: ((...args: any[]) => any) | undefined;
     "onSort-change"?: ((...args: any[]) => any) | undefined;
     "onExpand-change"?: ((...args: any[]) => any) | undefined;
@@ -132,36 +121,19 @@ declare const _default$1: vue.DefineComponent<__VLS_WithDefaults<__VLS_TypeProps
     "onAfter-action"?: ((...args: any[]) => any) | undefined;
     "onSelect-all"?: ((...args: any[]) => any) | undefined;
     "onSelection-change"?: ((...args: any[]) => any) | undefined;
-}, {
+}>, {
     loading: boolean;
     border: boolean;
     defaultExpandAll: boolean;
     columns: ColumnConfig[];
     showHeader: boolean;
-}, {}>;
-
-type __VLS_WithDefaults<P, D> = {
-    [K in keyof Pick<P, keyof P>]: K extends keyof D ? __VLS_Prettify<P[K] & {
-        default: D[K];
-    }> : P[K];
-};
-type __VLS_Prettify<T> = {
-    [K in keyof T]: T[K];
-} & {};
-type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
-type __VLS_TypePropsToOption<T> = {
-    [K in keyof T]-?: {} extends Pick<T, K> ? {
-        type: vue.PropType<__VLS_NonUndefinedable<T[K]>>;
-    } : {
-        type: vue.PropType<T[K]>;
-        required: true;
-    };
-};
+}, {}, {}, {}, string, vue.ComponentProvideOptions, false, {}>;
 
 declare const formatter: (item: ColumnConfig, row: any) => any;
+declare const createColumns: (columns: ColumnConfig[]) => ColumnConfig<any>[];
 
 declare const _default: {
     install(app: App): void;
 };
 
-export { type ColumnActionConfig, type ColumnConfig, _default$1 as MagicTable, _default as default, formatter };
+export { type ColumnActionConfig, type ColumnConfig, _default$1 as MagicTable, createColumns, _default as default, formatter };