npm - giime - Versions diffs - 0.9.2 → 0.9.3 - Mend

giime 0.9.2 → 0.9.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (364) hide show

package/es/components/src/composite/tableCustom/index.d.ts CHANGED Viewed

@@ -68,14 +68,14 @@ export declare const GmTableCustom: import("../../../../utils").SFCWithInstall<{
             default: boolean;
         };
         size: {
-            readonly type: import("vue").PropType<import("element-plus/es/utils/index.js").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
+            readonly type: import("vue").PropType<import("element-plus/es/utils/index.js").EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", never>>;
             readonly required: false;
             readonly validator: ((val: unknown) => boolean) | undefined;
             __epPropKey: true;
         };
-        width: (StringConstructor | NumberConstructor)[];
-        height: (StringConstructor | NumberConstructor)[];
-        maxHeight: (StringConstructor | NumberConstructor)[];
+        width: (NumberConstructor | StringConstructor)[];
+        height: (NumberConstructor | StringConstructor)[];
+        maxHeight: (NumberConstructor | StringConstructor)[];
         fit: {
             type: BooleanConstructor;
             default: boolean;
@@ -98,7 +98,7 @@ export declare const GmTableCustom: import("../../../../utils").SFCWithInstall<{
         headerRowStyle: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults.js").ColumnStyle<any> | undefined>;
         headerCellClassName: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults.js").CellCls<any> | undefined>;
         highlightCurrentRow: BooleanConstructor;
-        currentRowKey: (StringConstructor | NumberConstructor)[];
+        currentRowKey: (NumberConstructor | StringConstructor)[];
         emptyText: StringConstructor;
         expandRowKeys: import("vue").PropType<string[] | undefined>;
         defaultExpandAll: BooleanConstructor;
@@ -149,7 +149,7 @@ export declare const GmTableCustom: import("../../../../utils").SFCWithInstall<{
         tooltipFormatter: import("vue").PropType<import("element-plus/es/components/table/src/util.js").TableOverflowTooltipFormatter<any> | undefined>;
         appendFilterPanelTo: StringConstructor;
         scrollbarTabindex: {
-            type: (StringConstructor | NumberConstructor)[];
+            type: (NumberConstructor | StringConstructor)[];
             default: undefined;
         };
         allowDragLastColumn: {
@@ -197,8 +197,8 @@ export declare const GmTableCustom: import("../../../../utils").SFCWithInstall<{
         doLayout: () => void;
         setChecked: unknown;
         colPropsList: import("vue").Ref<{
-            type: "" | "default" | "index" | "edit" | "selection" | "expand";
             fixed: string | boolean;
+            type: "" | "default" | "index" | "edit" | "selection" | "expand";
             minWidth: string | number;
             width: string | number;
             resizable: boolean;
@@ -445,14 +445,14 @@ export declare const GmTableCustom: import("../../../../utils").SFCWithInstall<{
             default: boolean;
         };
         size: {
-            readonly type: import("vue").PropType<import("element-plus/es/utils/index.js").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
+            readonly type: import("vue").PropType<import("element-plus/es/utils/index.js").EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", never>>;
             readonly required: false;
             readonly validator: ((val: unknown) => boolean) | undefined;
             __epPropKey: true;
         };
-        width: (StringConstructor | NumberConstructor)[];
-        height: (StringConstructor | NumberConstructor)[];
-        maxHeight: (StringConstructor | NumberConstructor)[];
+        width: (NumberConstructor | StringConstructor)[];
+        height: (NumberConstructor | StringConstructor)[];
+        maxHeight: (NumberConstructor | StringConstructor)[];
         fit: {
             type: BooleanConstructor;
             default: boolean;
@@ -475,7 +475,7 @@ export declare const GmTableCustom: import("../../../../utils").SFCWithInstall<{
         headerRowStyle: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults.js").ColumnStyle<any> | undefined>;
         headerCellClassName: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults.js").CellCls<any> | undefined>;
         highlightCurrentRow: BooleanConstructor;
-        currentRowKey: (StringConstructor | NumberConstructor)[];
+        currentRowKey: (NumberConstructor | StringConstructor)[];
         emptyText: StringConstructor;
         expandRowKeys: import("vue").PropType<string[] | undefined>;
         defaultExpandAll: BooleanConstructor;
@@ -526,7 +526,7 @@ export declare const GmTableCustom: import("../../../../utils").SFCWithInstall<{
         tooltipFormatter: import("vue").PropType<import("element-plus/es/components/table/src/util.js").TableOverflowTooltipFormatter<any> | undefined>;
         appendFilterPanelTo: StringConstructor;
         scrollbarTabindex: {
-            type: (StringConstructor | NumberConstructor)[];
+            type: (NumberConstructor | StringConstructor)[];
             default: undefined;
         };
         allowDragLastColumn: {
@@ -667,14 +667,14 @@ export declare const GmTableCustom: import("../../../../utils").SFCWithInstall<{
             default: boolean;
         };
         size: {
-            readonly type: import("vue").PropType<import("element-plus/es/utils/index.js").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
+            readonly type: import("vue").PropType<import("element-plus/es/utils/index.js").EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", never>>;
             readonly required: false;
             readonly validator: ((val: unknown) => boolean) | undefined;
             __epPropKey: true;
         };
-        width: (StringConstructor | NumberConstructor)[];
-        height: (StringConstructor | NumberConstructor)[];
-        maxHeight: (StringConstructor | NumberConstructor)[];
+        width: (NumberConstructor | StringConstructor)[];
+        height: (NumberConstructor | StringConstructor)[];
+        maxHeight: (NumberConstructor | StringConstructor)[];
         fit: {
             type: BooleanConstructor;
             default: boolean;
@@ -697,7 +697,7 @@ export declare const GmTableCustom: import("../../../../utils").SFCWithInstall<{
         headerRowStyle: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults.js").ColumnStyle<any> | undefined>;
         headerCellClassName: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults.js").CellCls<any> | undefined>;
         highlightCurrentRow: BooleanConstructor;
-        currentRowKey: (StringConstructor | NumberConstructor)[];
+        currentRowKey: (NumberConstructor | StringConstructor)[];
         emptyText: StringConstructor;
         expandRowKeys: import("vue").PropType<string[] | undefined>;
         defaultExpandAll: BooleanConstructor;
@@ -748,7 +748,7 @@ export declare const GmTableCustom: import("../../../../utils").SFCWithInstall<{
         tooltipFormatter: import("vue").PropType<import("element-plus/es/components/table/src/util.js").TableOverflowTooltipFormatter<any> | undefined>;
         appendFilterPanelTo: StringConstructor;
         scrollbarTabindex: {
-            type: (StringConstructor | NumberConstructor)[];
+            type: (NumberConstructor | StringConstructor)[];
             default: undefined;
         };
         allowDragLastColumn: {
@@ -796,8 +796,8 @@ export declare const GmTableCustom: import("../../../../utils").SFCWithInstall<{
         doLayout: () => void;
         setChecked: unknown;
         colPropsList: import("vue").Ref<{
-            type: "" | "default" | "index" | "edit" | "selection" | "expand";
             fixed: string | boolean;
+            type: "" | "default" | "index" | "edit" | "selection" | "expand";
             minWidth: string | number;
             width: string | number;
             resizable: boolean;
@@ -1062,14 +1062,14 @@ export declare const GmTableCustom: import("../../../../utils").SFCWithInstall<{
         default: boolean;
     };
     size: {
-        readonly type: import("vue").PropType<import("element-plus/es/utils/index.js").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
+        readonly type: import("vue").PropType<import("element-plus/es/utils/index.js").EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", never>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    width: (StringConstructor | NumberConstructor)[];
-    height: (StringConstructor | NumberConstructor)[];
-    maxHeight: (StringConstructor | NumberConstructor)[];
+    width: (NumberConstructor | StringConstructor)[];
+    height: (NumberConstructor | StringConstructor)[];
+    maxHeight: (NumberConstructor | StringConstructor)[];
     fit: {
         type: BooleanConstructor;
         default: boolean;
@@ -1092,7 +1092,7 @@ export declare const GmTableCustom: import("../../../../utils").SFCWithInstall<{
     headerRowStyle: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults.js").ColumnStyle<any> | undefined>;
     headerCellClassName: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults.js").CellCls<any> | undefined>;
     highlightCurrentRow: BooleanConstructor;
-    currentRowKey: (StringConstructor | NumberConstructor)[];
+    currentRowKey: (NumberConstructor | StringConstructor)[];
     emptyText: StringConstructor;
     expandRowKeys: import("vue").PropType<string[] | undefined>;
     defaultExpandAll: BooleanConstructor;
@@ -1143,7 +1143,7 @@ export declare const GmTableCustom: import("../../../../utils").SFCWithInstall<{
     tooltipFormatter: import("vue").PropType<import("element-plus/es/components/table/src/util.js").TableOverflowTooltipFormatter<any> | undefined>;
     appendFilterPanelTo: StringConstructor;
     scrollbarTabindex: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: (NumberConstructor | StringConstructor)[];
         default: undefined;
     };
     allowDragLastColumn: {
@@ -1191,8 +1191,8 @@ export declare const GmTableCustom: import("../../../../utils").SFCWithInstall<{
     doLayout: () => void;
     setChecked: unknown;
     colPropsList: import("vue").Ref<{
-        type: "" | "default" | "index" | "edit" | "selection" | "expand";
         fixed: string | boolean;
+        type: "" | "default" | "index" | "edit" | "selection" | "expand";
         minWidth: string | number;
         width: string | number;
         resizable: boolean;

package/es/components/src/composite/tableCustom/tableCustom.d.ts CHANGED Viewed

@@ -67,14 +67,14 @@ export declare const tableCustomProps: {
         default: boolean;
     };
     size: {
-        readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
+        readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", never>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    width: (StringConstructor | NumberConstructor)[];
-    height: (StringConstructor | NumberConstructor)[];
-    maxHeight: (StringConstructor | NumberConstructor)[];
+    width: (NumberConstructor | StringConstructor)[];
+    height: (NumberConstructor | StringConstructor)[];
+    maxHeight: (NumberConstructor | StringConstructor)[];
     fit: {
         type: BooleanConstructor;
         default: boolean;
@@ -97,7 +97,7 @@ export declare const tableCustomProps: {
     headerRowStyle: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").ColumnStyle<any> | undefined>;
     headerCellClassName: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").CellCls<any> | undefined>;
     highlightCurrentRow: BooleanConstructor;
-    currentRowKey: (StringConstructor | NumberConstructor)[];
+    currentRowKey: (NumberConstructor | StringConstructor)[];
     emptyText: StringConstructor;
     expandRowKeys: import("vue").PropType<string[] | undefined>;
     defaultExpandAll: BooleanConstructor;
@@ -148,7 +148,7 @@ export declare const tableCustomProps: {
     tooltipFormatter: import("vue").PropType<import("element-plus/es/components/table/src/util").TableOverflowTooltipFormatter<any> | undefined>;
     appendFilterPanelTo: StringConstructor;
     scrollbarTabindex: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: (NumberConstructor | StringConstructor)[];
         default: undefined;
     };
     allowDragLastColumn: {

package/es/components/src/composite/tablePro/TableColumnVNodeRenderer.mjs CHANGED Viewed

@@ -31,8 +31,11 @@ var TableColumnVNodeRenderer = /* @__PURE__ */ defineComponent({
     const processVNode = (vnode) => {
       if (!vnode) return null;
       if (vnode.type?.name === "GmTableColumnPro") {
+        if (vnode.props?.type === "edit") {
+          return null;
+        }
         const propsConfig = mergePropsList.value.find((it) => it.prop === vnode.props?.prop);
-        if (propsConfig && (!propsConfig.isShow || propsConfig.type === "edit")) {
+        if (propsConfig && !propsConfig.isShow) {
           return null;
         }
         if (propsConfig) {

package/es/components/src/composite/tablePro/TableColumnVNodeRenderer.mjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"TableColumnVNodeRenderer.mjs","sources":["../../../../../../../packages/components/src/composite/tablePro/TableColumnVNodeRenderer.tsx"],"sourcesContent":["// TableColumnVNodeRenderer - 支持多级表头\nimport { computed, defineComponent, h, cloneVNode } from 'vue';\nimport type { TableColumnProProps } from './tableColumnPro/tableColumnPro';\nimport type { PropType, VNode } from 'vue';\n\nexport default defineComponent({\n functional: true,\n props: {\n // 当前原始vnode vue模板中的attribute\n vnode: {\n type: [Object, Array],\n required: true,\n },\n // 真实渲染的propsList\n propsList: {\n type: Array as PropType<TableColumnProProps[]>,\n default: () => [],\n },\n defaultPropsList: {\n type: Array as PropType<TableColumnProProps[]>,\n default: () => [],\n },\n },\n setup(props) {\n /** 合并propsList和defaultPropsList /\n const mergePropsList = computed(() => {\n return props.defaultPropsList.map(it => {\n const findProp = props.propsList.find(item => item.prop === it.prop);\n if (findProp) {\n return findProp;\n }\n return it;\n });\n });\n\n /\n 递归处理 vnode 树，应用 propsList 配置\n * @param vnode 要处理的 vnode\n * @returns 处理后的 vnode\n */\n const processVNode = (vnode: any): any => {\n if (!vnode) return null;\n\n // 如果是 GmTableColumnPro，查找并应用配置\n if (vnode.type?.name === 'GmTableColumnPro') {\n const propsConfig = mergePropsList.value.find(it => it.prop === vnode.props?.prop);\n\n // ~~如果配置中标记为不显示或类型是 edit，跳过渲染\~~n if (propsConfig && (!propsConfig.isShow ~~\|\| propsConfig.type === 'edit'~~)) {\n return null;\n }\n\n // 应用配置到 vnode props\n if (propsConfig) {\n const newProps = {\n ...vnode.props,\n width: propsConfig.width,\n label: propsConfig.label,\n fixed: propsConfig.fixed,\n };\n return cloneVNode(vnode, newProps);\n }\n\n return vnode;\n }\n\n // 如果是其他组件（如 gm-table-column 用于多级表头），递归处理子节点\n if (vnode.children) {\n let newChildren = vnode.children;\n\n // 如果 children 是对象（包含 slots），递归处理 default slot\n if (typeof vnode.children === 'object' && vnode.children.default) {\n const originalDefault = vnode.children.default;\n newChildren = {\n ...vnode.children,\n default: (slotProps: any) => {\n const childVnodes = originalDefault(slotProps);\n if (Array.isArray(childVnodes)) {\n return childVnodes.map(processVNode).filter(Boolean);\n }\n return processVNode(childVnodes);\n },\n };\n }\n // 如果 children 是数组，递归处理每个子节点\n else if (Array.isArray(vnode.children)) {\n newChildren = vnode.children.map(processVNode).filter(Boolean);\n }\n\n return cloneVNode(vnode, vnode.props, newChildren);\n }\n\n return vnode;\n };\n\n const render = computed(() => {\n const vnodeArray = Array.isArray(props.vnode) ? props.vnode : [props.vnode];\n return vnodeArray\n .map(vnode => {\n const processed = processVNode(vnode);\n return processed ? h(processed) : null;\n })\n .filter(Boolean);\n });\n\n return () => render.value;\n },\n});\n"],"names":["functional","props","vnode","type","Object","Array","required","propsList","default","defaultPropsList","setup","mergePropsList","computed","map","it","findProp","find","item","prop","processVNode","name","propsConfig","value","isShow","newProps","width","label","fixed","cloneVNode","children","newChildren","originalDefault","slotProps","childVnodes","isArray","filter","Boolean","render","vnodeArray","processed","h"],"mappings":";;AAKA,+DAA+B;AAAA,EAC7BA,UAAAA,EAAY,IAAA;AAAA,EACZC,KAAAA,EAAO;AAAA;AAAA,IAELC,KAAAA,EAAO;AAAA,MACLC,IAAAA,EAAM,CAACC,MAAAA,EAAQC,KAAK,CAAA;AAAA,MACpBC,QAAAA,EAAU;AAAA,KACZ;AAAA;AAAA,IAEAC,SAAAA,EAAW;AAAA,MACTJ,IAAAA,EAAME,KAAAA;AAAAA,MACNG,OAAAA,EAASA,MAAM;AAAA,KACjB;AAAA,IACAC,gBAAAA,EAAkB;AAAA,MAChBN,IAAAA,EAAME,KAAAA;AAAAA,MACNG,OAAAA,EAASA,MAAM;AAAA;AACjB,GACF;AAAA,EACAE,MAAMT,KAAAA,EAAO;AAEX,IAAA,MAAMU,cAAAA,GAAiBC,SAAS,MAAM;AACpC,MAAA,OAAOX,KAAAA,CAAMQ,gBAAAA,CAAiBI,GAAAA,CAAIC,CAAAA,EAAAA,KAAM;AACtC,QAAA,MAAMC,QAAAA,GAAWd,MAAMM,SAAAA,CAAUS,IAAAA,CAAKC,UAAQA,IAAAA,CAAKC,IAAAA,KAASJ,GAAGI,IAAI,CAAA;AACnE,QAAA,IAAIH,QAAAA,EAAU;AACZ,UAAA,OAAOA,QAAAA;AAAAA,QACT;AACA,QAAA,OAAOD,EAAAA;AAAAA,MACT,CAAC,CAAA;AAAA,IACH,CAAC,CAAA;AAOD,IAAA,MAAMK,eAAgBjB,CAAAA,KAAAA,KAAoB;AACxC,MAAA,IAAI,CAACA,OAAO,OAAO,IAAA;AAGnB,MAAA,IAAIA,KAAAA,CAAMC,IAAAA,EAAMiB,IAAAA,KAAS,kBAAA,EAAoB;~~AAC3C~~,QAAA,~~MAAMC~~,WAAAA,GAAcV,eAAeW,KAAAA,CAAMN,IAAAA,CAAKF,QAAMA,EAAAA,CAAGI,IAAAA,KAAShB,KAAAA,CAAMD,KAAAA,EAAOiB,IAAI,CAAA;AAGjF,QAAA,IAAIG,~~gBAAgB~~,CAACA,WAAAA,CAAYE,MAAAA,~~IAAUF,WAAAA,CAAYlB,SAAS,MAAA,CAAA,EAAS~~;~~AACvE~~,UAAA,OAAO,IAAA;AAAA,QACT;AAGA,QAAA,~~IAAIkB~~,WAAAA,EAAa;AACf,UAAA,MAAMG,QAAAA,GAAW;AAAA,YACf,GAAGtB,KAAAA,CAAMD,KAAAA;AAAAA,YACTwB,OAAOJ,WAAAA,CAAYI,KAAAA;AAAAA,YACnBC,OAAOL,WAAAA,CAAYK,KAAAA;AAAAA,YACnBC,OAAON,WAAAA,CAAYM;AAAAA,WACrB;AACA,UAAA,OAAOC,UAAAA,CAAW1B,OAAOsB,QAAQ,CAAA;AAAA,QACnC;AAEA,QAAA,OAAOtB,KAAAA;AAAAA,MACT;AAGA,MAAA,IAAIA,MAAM2B,QAAAA,EAAU;AAClB,QAAA,IAAIC,cAAc5B,KAAAA,CAAM2B,QAAAA;AAGxB,QAAA,IAAI,OAAO3B,KAAAA,CAAM2B,QAAAA,KAAa,QAAA,IAAY3B,KAAAA,CAAM2B,SAASrB,OAAAA,EAAS;AAChE,UAAA,MAAMuB,eAAAA,GAAkB7B,MAAM2B,QAAAA,CAASrB,OAAAA;AACvCsB,UAAAA,WAAAA,GAAc;AAAA,YACZ,GAAG5B,KAAAA,CAAM2B,QAAAA;AAAAA,YACTrB,SAAUwB,CAAAA,SAAAA,KAAmB;AAC3B,cAAA,MAAMC,WAAAA,GAAcF,gBAAgBC,SAAS,CAAA;AAC7C,cAAA,IAAI3B,KAAAA,CAAM6B,OAAAA,CAAQD,WAAW,CAAA,EAAG;AAC9B,gBAAA,OAAOA,WAAAA,CAAYpB,GAAAA,CAAIM,YAAY,CAAA,CAAEgB,OAAOC,OAAO,CAAA;AAAA,cACrD;AACA,cAAA,OAAOjB,aAAac,WAAW,CAAA;AAAA,YACjC;AAAA,WACF;AAAA,QACF,CAAA,MAAA,IAES5B,KAAAA,CAAM6B,OAAAA,CAAQhC,KAAAA,CAAM2B,QAAQ,CAAA,EAAG;AACtCC,UAAAA,WAAAA,GAAc5B,MAAM2B,QAAAA,CAAShB,GAAAA,CAAIM,YAAY,CAAA,CAAEgB,OAAOC,OAAO,CAAA;AAAA,QAC/D;AAEA,QAAA,OAAOR,UAAAA,CAAW1B,KAAAA,EAAOA,KAAAA,CAAMD,KAAAA,EAAO6B,WAAW,CAAA;AAAA,MACnD;AAEA,MAAA,OAAO5B,KAAAA;AAAAA,IACT,CAAA;AAEA,IAAA,MAAMmC,MAAAA,GAASzB,SAAS,MAAM;AAC5B,MAAA,MAAM0B,UAAAA,GAAajC,KAAAA,CAAM6B,OAAAA,CAAQjC,KAAAA,CAAMC,KAAK,IAAID,KAAAA,CAAMC,KAAAA,GAAQ,CAACD,KAAAA,CAAMC,KAAK,CAAA;AAC1E,MAAA,OAAOoC,UAAAA,CACJzB,IAAIX,CAAAA,KAAAA,KAAS;AACZ,QAAA,MAAMqC,SAAAA,GAAYpB,aAAajB,KAAK,CAAA;AACpC,QAAA,OAAOqC,SAAAA,GAAYC,CAAAA,CAAED,SAAS,CAAA,GAAI,IAAA;AAAA,MACpC,CAAC,CAAA,CACAJ,MAAAA,CAAOC,OAAO,CAAA;AAAA,IACnB,CAAC,CAAA;AAED,IAAA,OAAO,MAAMC,MAAAA,CAAOf,KAAAA;AAAAA,EACtB;AACF,CAAC,CAAA;;;;"}
1	+ {"version":3,"file":"TableColumnVNodeRenderer.mjs","sources":["../../../../../../../packages/components/src/composite/tablePro/TableColumnVNodeRenderer.tsx"],"sourcesContent":["// TableColumnVNodeRenderer - 支持多级表头\nimport { computed, defineComponent, h, cloneVNode } from 'vue';\nimport type { TableColumnProProps } from './tableColumnPro/tableColumnPro';\nimport type { PropType, VNode } from 'vue';\n\nexport default defineComponent({\n functional: true,\n props: {\n // 当前原始vnode vue模板中的attribute\n vnode: {\n type: [Object, Array],\n required: true,\n },\n // 真实渲染的propsList\n propsList: {\n type: Array as PropType<TableColumnProProps[]>,\n default: () => [],\n },\n defaultPropsList: {\n type: Array as PropType<TableColumnProProps[]>,\n default: () => [],\n },\n },\n setup(props) {\n /** 合并propsList和defaultPropsList /\n const mergePropsList = computed(() => {\n return props.defaultPropsList.map(it => {\n const findProp = props.propsList.find(item => item.prop === it.prop);\n if (findProp) {\n return findProp;\n }\n return it;\n });\n });\n\n /\n 递归处理 vnode 树，应用 propsList 配置\n * @param vnode 要处理的 vnode\n * @returns 处理后的 vnode\n */\n const processVNode = (vnode: any): any => {\n if (!vnode) return null;\n\n // 如果是 GmTableColumnPro，查找并应用配置\n if (vnode.type?.name === 'GmTableColumnPro') {\n // type=\"edit\" 的列由 TablePro 的 gmEdit 列统一处理，这里跳过\n // 直接检查 vnode.props.type，避免因 prop 相同导致的误匹配\n if (vnode.props?.type === 'edit') {\n return null;\n }\n\n const propsConfig = mergePropsList.value.find(it => it.prop === vnode.props?.prop);\n\n // 如果配置中标记为不显示，跳过渲染\n if (propsConfig && !propsConfig.isShow) {\n return null;\n }\n\n // 应用配置到 vnode props\n if (propsConfig) {\n const newProps = {\n ...vnode.props,\n width: propsConfig.width,\n label: propsConfig.label,\n fixed: propsConfig.fixed,\n };\n return cloneVNode(vnode, newProps);\n }\n\n return vnode;\n }\n\n // 如果是其他组件（如 gm-table-column 用于多级表头），递归处理子节点\n if (vnode.children) {\n let newChildren = vnode.children;\n\n // 如果 children 是对象（包含 slots），递归处理 default slot\n if (typeof vnode.children === 'object' && vnode.children.default) {\n const originalDefault = vnode.children.default;\n newChildren = {\n ...vnode.children,\n default: (slotProps: any) => {\n const childVnodes = originalDefault(slotProps);\n if (Array.isArray(childVnodes)) {\n return childVnodes.map(processVNode).filter(Boolean);\n }\n return processVNode(childVnodes);\n },\n };\n }\n // 如果 children 是数组，递归处理每个子节点\n else if (Array.isArray(vnode.children)) {\n newChildren = vnode.children.map(processVNode).filter(Boolean);\n }\n\n return cloneVNode(vnode, vnode.props, newChildren);\n }\n\n return vnode;\n };\n\n const render = computed(() => {\n const vnodeArray = Array.isArray(props.vnode) ? props.vnode : [props.vnode];\n return vnodeArray\n .map(vnode => {\n const processed = processVNode(vnode);\n return processed ? h(processed) : null;\n })\n .filter(Boolean);\n });\n\n return () => render.value;\n },\n});\n"],"names":["functional","props","vnode","type","Object","Array","required","propsList","default","defaultPropsList","setup","mergePropsList","computed","map","it","findProp","find","item","prop","processVNode","name","propsConfig","value","isShow","newProps","width","label","fixed","cloneVNode","children","newChildren","originalDefault","slotProps","childVnodes","isArray","filter","Boolean","render","vnodeArray","processed","h"],"mappings":"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"}

package/es/components/src/composite/tablePro/TablePro.vue.d.ts CHANGED Viewed

@@ -69,14 +69,14 @@ declare const _default: __VLS_WithSlots<import("vue").DefineComponent<{
         default: boolean;
     };
     size: {
-        readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
+        readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", never>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    width: (StringConstructor | NumberConstructor)[];
-    height: (StringConstructor | NumberConstructor)[];
-    maxHeight: (StringConstructor | NumberConstructor)[];
+    width: (NumberConstructor | StringConstructor)[];
+    height: (NumberConstructor | StringConstructor)[];
+    maxHeight: (NumberConstructor | StringConstructor)[];
     fit: {
         type: BooleanConstructor;
         default: boolean;
@@ -99,7 +99,7 @@ declare const _default: __VLS_WithSlots<import("vue").DefineComponent<{
     headerRowStyle: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").ColumnStyle<any> | undefined>;
     headerCellClassName: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").CellCls<any> | undefined>;
     highlightCurrentRow: BooleanConstructor;
-    currentRowKey: (StringConstructor | NumberConstructor)[];
+    currentRowKey: (NumberConstructor | StringConstructor)[];
     emptyText: StringConstructor;
     expandRowKeys: import("vue").PropType<string[] | undefined>;
     defaultExpandAll: BooleanConstructor;
@@ -150,7 +150,7 @@ declare const _default: __VLS_WithSlots<import("vue").DefineComponent<{
     tooltipFormatter: import("vue").PropType<import("element-plus/es/components/table/src/util").TableOverflowTooltipFormatter<any> | undefined>;
     appendFilterPanelTo: StringConstructor;
     scrollbarTabindex: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: (NumberConstructor | StringConstructor)[];
         default: undefined;
     };
     allowDragLastColumn: {
@@ -178,8 +178,8 @@ declare const _default: __VLS_WithSlots<import("vue").DefineComponent<{
     doLayout: () => void;
     setChecked: unknown;
     colPropsList: import("vue").Ref<{
-        type: "" | "default" | "index" | "edit" | "selection" | "expand";
         fixed: string | boolean;
+        type: "" | "default" | "index" | "edit" | "selection" | "expand";
         minWidth: string | number;
         width: string | number;
         resizable: boolean;
@@ -422,14 +422,14 @@ declare const _default: __VLS_WithSlots<import("vue").DefineComponent<{
         default: boolean;
     };
     size: {
-        readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
+        readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", never>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    width: (StringConstructor | NumberConstructor)[];
-    height: (StringConstructor | NumberConstructor)[];
-    maxHeight: (StringConstructor | NumberConstructor)[];
+    width: (NumberConstructor | StringConstructor)[];
+    height: (NumberConstructor | StringConstructor)[];
+    maxHeight: (NumberConstructor | StringConstructor)[];
     fit: {
         type: BooleanConstructor;
         default: boolean;
@@ -452,7 +452,7 @@ declare const _default: __VLS_WithSlots<import("vue").DefineComponent<{
     headerRowStyle: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").ColumnStyle<any> | undefined>;
     headerCellClassName: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").CellCls<any> | undefined>;
     highlightCurrentRow: BooleanConstructor;
-    currentRowKey: (StringConstructor | NumberConstructor)[];
+    currentRowKey: (NumberConstructor | StringConstructor)[];
     emptyText: StringConstructor;
     expandRowKeys: import("vue").PropType<string[] | undefined>;
     defaultExpandAll: BooleanConstructor;
@@ -503,7 +503,7 @@ declare const _default: __VLS_WithSlots<import("vue").DefineComponent<{
     tooltipFormatter: import("vue").PropType<import("element-plus/es/components/table/src/util").TableOverflowTooltipFormatter<any> | undefined>;
     appendFilterPanelTo: StringConstructor;
     scrollbarTabindex: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: (NumberConstructor | StringConstructor)[];
         default: undefined;
     };
     allowDragLastColumn: {

package/es/components/src/composite/tablePro/index.d.ts CHANGED Viewed

@@ -64,14 +64,14 @@ export declare const GmTablePro: import("../../../../utils").SFCWithInstall<{
             default: boolean;
         };
         size: {
-            readonly type: import("vue").PropType<import("element-plus/es/utils/index.js").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
+            readonly type: import("vue").PropType<import("element-plus/es/utils/index.js").EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", never>>;
             readonly required: false;
             readonly validator: ((val: unknown) => boolean) | undefined;
             __epPropKey: true;
         };
-        width: (StringConstructor | NumberConstructor)[];
-        height: (StringConstructor | NumberConstructor)[];
-        maxHeight: (StringConstructor | NumberConstructor)[];
+        width: (NumberConstructor | StringConstructor)[];
+        height: (NumberConstructor | StringConstructor)[];
+        maxHeight: (NumberConstructor | StringConstructor)[];
         fit: {
             type: BooleanConstructor;
             default: boolean;
@@ -94,7 +94,7 @@ export declare const GmTablePro: import("../../../../utils").SFCWithInstall<{
         headerRowStyle: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults.js").ColumnStyle<any> | undefined>;
         headerCellClassName: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults.js").CellCls<any> | undefined>;
         highlightCurrentRow: BooleanConstructor;
-        currentRowKey: (StringConstructor | NumberConstructor)[];
+        currentRowKey: (NumberConstructor | StringConstructor)[];
         emptyText: StringConstructor;
         expandRowKeys: import("vue").PropType<string[] | undefined>;
         defaultExpandAll: BooleanConstructor;
@@ -145,7 +145,7 @@ export declare const GmTablePro: import("../../../../utils").SFCWithInstall<{
         tooltipFormatter: import("vue").PropType<import("element-plus/es/components/table/src/util.js").TableOverflowTooltipFormatter<any> | undefined>;
         appendFilterPanelTo: StringConstructor;
         scrollbarTabindex: {
-            type: (StringConstructor | NumberConstructor)[];
+            type: (NumberConstructor | StringConstructor)[];
             default: undefined;
         };
         allowDragLastColumn: {
@@ -193,8 +193,8 @@ export declare const GmTablePro: import("../../../../utils").SFCWithInstall<{
         doLayout: () => void;
         setChecked: unknown;
         colPropsList: import("vue").Ref<{
-            type: "" | "default" | "index" | "edit" | "selection" | "expand";
             fixed: string | boolean;
+            type: "" | "default" | "index" | "edit" | "selection" | "expand";
             minWidth: string | number;
             width: string | number;
             resizable: boolean;
@@ -437,14 +437,14 @@ export declare const GmTablePro: import("../../../../utils").SFCWithInstall<{
             default: boolean;
         };
         size: {
-            readonly type: import("vue").PropType<import("element-plus/es/utils/index.js").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
+            readonly type: import("vue").PropType<import("element-plus/es/utils/index.js").EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", never>>;
             readonly required: false;
             readonly validator: ((val: unknown) => boolean) | undefined;
             __epPropKey: true;
         };
-        width: (StringConstructor | NumberConstructor)[];
-        height: (StringConstructor | NumberConstructor)[];
-        maxHeight: (StringConstructor | NumberConstructor)[];
+        width: (NumberConstructor | StringConstructor)[];
+        height: (NumberConstructor | StringConstructor)[];
+        maxHeight: (NumberConstructor | StringConstructor)[];
         fit: {
             type: BooleanConstructor;
             default: boolean;
@@ -467,7 +467,7 @@ export declare const GmTablePro: import("../../../../utils").SFCWithInstall<{
         headerRowStyle: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults.js").ColumnStyle<any> | undefined>;
         headerCellClassName: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults.js").CellCls<any> | undefined>;
         highlightCurrentRow: BooleanConstructor;
-        currentRowKey: (StringConstructor | NumberConstructor)[];
+        currentRowKey: (NumberConstructor | StringConstructor)[];
         emptyText: StringConstructor;
         expandRowKeys: import("vue").PropType<string[] | undefined>;
         defaultExpandAll: BooleanConstructor;
@@ -518,7 +518,7 @@ export declare const GmTablePro: import("../../../../utils").SFCWithInstall<{
         tooltipFormatter: import("vue").PropType<import("element-plus/es/components/table/src/util.js").TableOverflowTooltipFormatter<any> | undefined>;
         appendFilterPanelTo: StringConstructor;
         scrollbarTabindex: {
-            type: (StringConstructor | NumberConstructor)[];
+            type: (NumberConstructor | StringConstructor)[];
             default: undefined;
         };
         allowDragLastColumn: {
@@ -654,14 +654,14 @@ export declare const GmTablePro: import("../../../../utils").SFCWithInstall<{
             default: boolean;
         };
         size: {
-            readonly type: import("vue").PropType<import("element-plus/es/utils/index.js").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
+            readonly type: import("vue").PropType<import("element-plus/es/utils/index.js").EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", never>>;
             readonly required: false;
             readonly validator: ((val: unknown) => boolean) | undefined;
             __epPropKey: true;
         };
-        width: (StringConstructor | NumberConstructor)[];
-        height: (StringConstructor | NumberConstructor)[];
-        maxHeight: (StringConstructor | NumberConstructor)[];
+        width: (NumberConstructor | StringConstructor)[];
+        height: (NumberConstructor | StringConstructor)[];
+        maxHeight: (NumberConstructor | StringConstructor)[];
         fit: {
             type: BooleanConstructor;
             default: boolean;
@@ -684,7 +684,7 @@ export declare const GmTablePro: import("../../../../utils").SFCWithInstall<{
         headerRowStyle: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults.js").ColumnStyle<any> | undefined>;
         headerCellClassName: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults.js").CellCls<any> | undefined>;
         highlightCurrentRow: BooleanConstructor;
-        currentRowKey: (StringConstructor | NumberConstructor)[];
+        currentRowKey: (NumberConstructor | StringConstructor)[];
         emptyText: StringConstructor;
         expandRowKeys: import("vue").PropType<string[] | undefined>;
         defaultExpandAll: BooleanConstructor;
@@ -735,7 +735,7 @@ export declare const GmTablePro: import("../../../../utils").SFCWithInstall<{
         tooltipFormatter: import("vue").PropType<import("element-plus/es/components/table/src/util.js").TableOverflowTooltipFormatter<any> | undefined>;
         appendFilterPanelTo: StringConstructor;
         scrollbarTabindex: {
-            type: (StringConstructor | NumberConstructor)[];
+            type: (NumberConstructor | StringConstructor)[];
             default: undefined;
         };
         allowDragLastColumn: {
@@ -783,8 +783,8 @@ export declare const GmTablePro: import("../../../../utils").SFCWithInstall<{
         doLayout: () => void;
         setChecked: unknown;
         colPropsList: import("vue").Ref<{
-            type: "" | "default" | "index" | "edit" | "selection" | "expand";
             fixed: string | boolean;
+            type: "" | "default" | "index" | "edit" | "selection" | "expand";
             minWidth: string | number;
             width: string | number;
             resizable: boolean;
@@ -1044,14 +1044,14 @@ export declare const GmTablePro: import("../../../../utils").SFCWithInstall<{
         default: boolean;
     };
     size: {
-        readonly type: import("vue").PropType<import("element-plus/es/utils/index.js").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
+        readonly type: import("vue").PropType<import("element-plus/es/utils/index.js").EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", never>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    width: (StringConstructor | NumberConstructor)[];
-    height: (StringConstructor | NumberConstructor)[];
-    maxHeight: (StringConstructor | NumberConstructor)[];
+    width: (NumberConstructor | StringConstructor)[];
+    height: (NumberConstructor | StringConstructor)[];
+    maxHeight: (NumberConstructor | StringConstructor)[];
     fit: {
         type: BooleanConstructor;
         default: boolean;
@@ -1074,7 +1074,7 @@ export declare const GmTablePro: import("../../../../utils").SFCWithInstall<{
     headerRowStyle: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults.js").ColumnStyle<any> | undefined>;
     headerCellClassName: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults.js").CellCls<any> | undefined>;
     highlightCurrentRow: BooleanConstructor;
-    currentRowKey: (StringConstructor | NumberConstructor)[];
+    currentRowKey: (NumberConstructor | StringConstructor)[];
     emptyText: StringConstructor;
     expandRowKeys: import("vue").PropType<string[] | undefined>;
     defaultExpandAll: BooleanConstructor;
@@ -1125,7 +1125,7 @@ export declare const GmTablePro: import("../../../../utils").SFCWithInstall<{
     tooltipFormatter: import("vue").PropType<import("element-plus/es/components/table/src/util.js").TableOverflowTooltipFormatter<any> | undefined>;
     appendFilterPanelTo: StringConstructor;
     scrollbarTabindex: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: (NumberConstructor | StringConstructor)[];
         default: undefined;
     };
     allowDragLastColumn: {
@@ -1173,8 +1173,8 @@ export declare const GmTablePro: import("../../../../utils").SFCWithInstall<{
     doLayout: () => void;
     setChecked: unknown;
     colPropsList: import("vue").Ref<{
-        type: "" | "default" | "index" | "edit" | "selection" | "expand";
         fixed: string | boolean;
+        type: "" | "default" | "index" | "edit" | "selection" | "expand";
         minWidth: string | number;
         width: string | number;
         resizable: boolean;

package/es/components/src/composite/tablePro/tableColumnPro/TableColumnPro.vue.d.ts CHANGED Viewed

@@ -18,7 +18,7 @@ declare const _default: __VLS_WithSlots<import("vue").DefineComponent<{
         default: true;
     };
     fixed: {
-        type: (BooleanConstructor | StringConstructor)[];
+        type: (StringConstructor | BooleanConstructor)[];
         default: false;
     };
     type: {
@@ -35,11 +35,11 @@ declare const _default: __VLS_WithSlots<import("vue").DefineComponent<{
     labelClassName: StringConstructor;
     property: StringConstructor;
     width: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: (NumberConstructor | StringConstructor)[];
         default: string;
     };
     minWidth: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: (NumberConstructor | StringConstructor)[];
         default: string;
     };
     renderHeader: import("vue").PropType<(data: {
@@ -51,7 +51,7 @@ declare const _default: __VLS_WithSlots<import("vue").DefineComponent<{
         [key: string]: any;
     }>>;
     sortable: {
-        type: (BooleanConstructor | StringConstructor)[];
+        type: (StringConstructor | BooleanConstructor)[];
         default: boolean;
     };
     sortMethod: import("vue").PropType<(a: any, b: any) => number>;
@@ -97,7 +97,7 @@ declare const _default: __VLS_WithSlots<import("vue").DefineComponent<{
         default: true;
     };
     fixed: {
-        type: (BooleanConstructor | StringConstructor)[];
+        type: (StringConstructor | BooleanConstructor)[];
         default: false;
     };
     type: {
@@ -114,11 +114,11 @@ declare const _default: __VLS_WithSlots<import("vue").DefineComponent<{
     labelClassName: StringConstructor;
     property: StringConstructor;
     width: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: (NumberConstructor | StringConstructor)[];
         default: string;
     };
     minWidth: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: (NumberConstructor | StringConstructor)[];
         default: string;
     };
     renderHeader: import("vue").PropType<(data: {
@@ -130,7 +130,7 @@ declare const _default: __VLS_WithSlots<import("vue").DefineComponent<{
         [key: string]: any;
     }>>;
     sortable: {
-        type: (BooleanConstructor | StringConstructor)[];
+        type: (StringConstructor | BooleanConstructor)[];
         default: boolean;
     };
     sortMethod: import("vue").PropType<(a: any, b: any) => number>;
@@ -163,8 +163,8 @@ declare const _default: __VLS_WithSlots<import("vue").DefineComponent<{
     filterClassName: StringConstructor;
     index: import("vue").PropType<number | ((index: number) => number)>;
 }>>, {
-    type: "" | "default" | "index" | "edit" | "selection" | "expand";
     fixed: string | boolean;
+    type: "" | "default" | "index" | "edit" | "selection" | "expand";
     minWidth: string | number;
     width: string | number;
     resizable: boolean;