Merge pull request #2543 from VisActor/fix/vue-component-name

Fix/vue component name
VisActor · Sep 29, 2024 · 2bedb8d · 2bedb8d
2 parents 7e981e6 + 9d587a7
commit 2bedb8d
Show file tree

Hide file tree

Showing 21 changed files with 47 additions and 4 deletions.
diff --git a/common/changes/@visactor/vtable/feat-gantt-v2_2024-09-29-07-19.json b/common/changes/@visactor/vtable/feat-gantt-v2_2024-09-29-07-19.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "refactor: rename vue component name\n\n",
+      "type": "none",
+      "packageName": "@visactor/vtable"
+    }
+  ],
+  "packageName": "@visactor/vtable",
+  "email": "[email protected]"
+}
diff --git a/packages/vue-vtable/src/components/component/menu.tsx b/packages/vue-vtable/src/components/component/menu.tsx
@@ -11,3 +11,5 @@ export type MenuProps = {
 export default function Menu(props: MenuProps): VNode {
   return null;
 }
+
+Menu.symbol = 'Menu';
diff --git a/packages/vue-vtable/src/components/component/tooltip.tsx b/packages/vue-vtable/src/components/component/tooltip.tsx
@@ -9,3 +9,5 @@ export type TooltipProps = {
 export default function Tooltip(props: TooltipProps): VNode {
   return null;
 }
+
+Tooltip.symbol = 'Tooltip';
diff --git a/packages/vue-vtable/src/components/custom/checkBox.tsx b/packages/vue-vtable/src/components/custom/checkBox.tsx
@@ -19,3 +19,5 @@ export interface CheckboxProps {
 export default function CheckBox(props: CheckboxProps): VNode {
   return null;
 }
+
+CheckBox.symbol = 'CheckBox';
diff --git a/packages/vue-vtable/src/components/custom/custom-layout.tsx b/packages/vue-vtable/src/components/custom/custom-layout.tsx
@@ -25,3 +25,5 @@ export interface CustomComponentProps {
 export default function CustomLayout(props: CustomComponentProps): VNode {
   return null;
 }
+
+CustomLayout.symbol = 'CustomLayout';
diff --git a/packages/vue-vtable/src/components/custom/group.tsx b/packages/vue-vtable/src/components/custom/group.tsx
@@ -3,3 +3,5 @@ import type { VNode } from 'vue';
 export default function Group(): VNode {
   return null;
 }
+
+Group.symbol = 'Group';
diff --git a/packages/vue-vtable/src/components/custom/image.tsx b/packages/vue-vtable/src/components/custom/image.tsx
@@ -3,3 +3,5 @@ import type { VNode } from 'vue';
 export default function Image(): VNode {
   return null;
 }
+
+Image.symbol = 'Image';
diff --git a/packages/vue-vtable/src/components/custom/radio.tsx b/packages/vue-vtable/src/components/custom/radio.tsx
@@ -17,3 +17,5 @@ export interface RadioProps {
 export default function Radio(props: RadioProps): any {
   return null;
 }
+
+Radio.symbol = 'Radio';
diff --git a/packages/vue-vtable/src/components/custom/tag.tsx b/packages/vue-vtable/src/components/custom/tag.tsx
@@ -15,3 +15,5 @@ export interface TagProps {
 export default function Tag(props: TagProps): VNode {
   return null;
 }
+
+Tag.symbol = 'Tag';
diff --git a/packages/vue-vtable/src/components/custom/text.tsx b/packages/vue-vtable/src/components/custom/text.tsx
@@ -3,3 +3,5 @@ import type { VNode } from 'vue';
 export default function Text(): VNode {
   return null;
 }
+
+Text.symbol = 'Text';
diff --git a/packages/vue-vtable/src/components/list/list-column.tsx b/packages/vue-vtable/src/components/list/list-column.tsx
@@ -4,3 +4,5 @@ import type { ColumnDefine } from '@visactor/vtable';
 export default function ListColumn(props: ColumnDefine): VNode {
   return null;
 }
+
+ListColumn.symbol = 'ListColumn';
diff --git a/packages/vue-vtable/src/components/pivot/pivot-column-dimension.tsx b/packages/vue-vtable/src/components/pivot/pivot-column-dimension.tsx
@@ -10,3 +10,5 @@ export type PivotColumnDimensionProps = IDimension & ObjectHandler;
 export default function PivotColumnDimension(props: PivotColumnDimensionProps): VNode {
   return null;
 }
+
+PivotColumnDimension.symbol = 'PivotColumnDimension';
diff --git a/packages/vue-vtable/src/components/pivot/pivot-column-header-title.tsx b/packages/vue-vtable/src/components/pivot/pivot-column-header-title.tsx
@@ -4,3 +4,5 @@ import type { ITitleDefine } from '@visactor/vtable';
 export default function PivotColumnHeaderTitle(props: ITitleDefine): VNode {
   return null;
 }
+
+PivotColumnHeaderTitle.symbol = 'PivotColumnHeaderTitle';
diff --git a/packages/vue-vtable/src/components/pivot/pivot-corner.tsx b/packages/vue-vtable/src/components/pivot/pivot-corner.tsx
@@ -4,3 +4,5 @@ import type { ICornerDefine } from '@visactor/vtable';
 export default function PivotCorner(props: ICornerDefine): VNode {
   return null;
 }
+
+PivotCorner.symbol = 'PivotCorner';
diff --git a/packages/vue-vtable/src/components/pivot/pivot-indicator.tsx b/packages/vue-vtable/src/components/pivot/pivot-indicator.tsx
@@ -4,3 +4,5 @@ import type { IIndicator } from '@visactor/vtable';
 export default function PivotIndicator(props: IIndicator): VNode {
   return null;
 }
+
+PivotIndicator.symbol = 'PivotIndicator';
diff --git a/packages/vue-vtable/src/components/pivot/pivot-row-dimension.tsx b/packages/vue-vtable/src/components/pivot/pivot-row-dimension.tsx
@@ -10,3 +10,5 @@ export type PivotColumnDimensionProps = IDimension & ObjectHandler;
 export default function PivotRowDimension(props: PivotColumnDimensionProps): VNode {
   return null;
 }
+
+PivotRowDimension.symbol = 'PivotRowDimension';
diff --git a/packages/vue-vtable/src/components/pivot/pivot-row-header-title.tsx b/packages/vue-vtable/src/components/pivot/pivot-row-header-title.tsx
@@ -4,3 +4,5 @@ import type { ITitleDefine } from '@visactor/vtable';
 export default function PivotRowHeaderTitle(props: ITitleDefine): VNode {
   return null;
 }
+
+PivotRowHeaderTitle.symbol = 'PivotRowHeaderTitle';
diff --git a/packages/vue-vtable/src/tables/list-table.vue b/packages/vue-vtable/src/tables/list-table.vue
@@ -63,7 +63,7 @@ function extractSlotOptions(vnodes: any[]) {
   };
 
   vnodes.forEach(vnode => {
-    const typeName = vnode.type?.name || vnode.type?.__name;
+    const typeName =  vnode.type?.symbol || vnode.type?.name;
     const optionKey = typeMapping[typeName];
 
     if (optionKey) {

diff --git a/packages/vue-vtable/src/tables/pivot-chart.vue b/packages/vue-vtable/src/tables/pivot-chart.vue
@@ -57,7 +57,7 @@ const computedOptions = computed(() => {
   };
 
   flattenedSlots.forEach(vnode => {
-    const typeName = vnode.type?.name || vnode.type?.__name;
+    const typeName = vnode.type?.symbol || vnode.type?.name ;
     const optionKey = typeMapping[typeName];
 
     if (optionKey) {

diff --git a/packages/vue-vtable/src/tables/pivot-table.vue b/packages/vue-vtable/src/tables/pivot-table.vue
@@ -57,7 +57,7 @@ const computedOptions = computed(() => {
   };
 
   flattenedSlots.forEach(vnode => {
-    const typeName = vnode.type?.name || vnode.type?.__name;
+    const typeName = vnode.type?.symbol || vnode.type?.name ;
     const optionKey = typeMapping[typeName];
 
     if (optionKey) {

diff --git a/packages/vue-vtable/src/tables/utils.ts b/packages/vue-vtable/src/tables/utils.ts
@@ -35,7 +35,7 @@ export function createCustomLayout(children: any): any {
     }
 
     const { type, props, children: childChildren } = child;
-    const componentName = type?.name || type;
+    const componentName = type?.symbol || type?.name;
     const ComponentClass = componentMap[componentName];
 
     if (!ComponentClass) {