Skip to content

Commit

Permalink
fix: cdn component error (#2241)
Browse files Browse the repository at this point in the history
  • Loading branch information
lxfu1 authored Nov 28, 2023
1 parent 8029911 commit 0c67026
Show file tree
Hide file tree
Showing 32 changed files with 65 additions and 90 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
timeout-minutes: 15
strategy:
matrix:
node-version: [16.x]
node-version: [18.x]
steps:
- name: checkout code repository
uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions config/webpack.js
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ const getWebpackConfig = (name, library) => {
},
},
optimization: {
runtimeChunk: 'single',
moduleIds: 'deterministic',
// runtimeChunk: 'single',
// moduleIds: 'deterministic',
},
};
};
Expand Down
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"prettier": "prettier --write \"**/**.{js,jsx,tsx,ts,less,md,json}\"",
"ci:version": "pnpm changeset version",
"add:changelog": "pnpm changeset",
"build:site": "pnpm -r --stream --filter=./packages/site run build"
"build:site": "pnpm -r --stream --filter=./packages/site run build",
"release": "pnpm publish --no-git-checks -r --filter @ant-design/*"
},
"devDependencies": {
"@antv/data-set": "^0.11.8",
Expand Down Expand Up @@ -65,7 +66,8 @@
"overrides": {
"@typescript-eslint/eslint-plugin": "^4.1.1",
"@typescript-eslint/parser": "^4.1.1",
"monaco-editor": "0.21.3"
"monaco-editor": "0.21.3",
"tslib": "2.6.2"
}
},
"gitHooks": {
Expand Down
2 changes: 1 addition & 1 deletion packages/charts/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": false,
"name": "@ant-design/charts",
"version": "1.4.2",
"version": "1.4.3",
"description": "AntV upper level visual component library",
"bugs": {
"url": "https://github.com/ant-design/ant-design-charts/issues"
Expand Down
2 changes: 1 addition & 1 deletion packages/charts/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ export * from '@ant-design/flowchart';
export * from '@ant-design/graphs';
export * from '@ant-design/maps';

export const version = '1.4.2';
export const version = '1.4.3';
2 changes: 1 addition & 1 deletion packages/flowchart/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
`2023-01-12`

- 🐞 修复 React18 页面卡死
- 🔥 新增 `onDelNode、onCopy、onPaste` 方法
- 🔥 新增 `onDelNode、onCopy、onPaste` 方法

## 1.2.1

Expand Down
6 changes: 5 additions & 1 deletion packages/flowchart/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
const path = require('path');
const { BaseJestConfig, OnlineConfig } = require('../../config/jest');
module.exports = {
...BaseJestConfig,
...(process.env.DEBUG_MODE === '1' ? OnlineConfig : {}),
moduleNameMapper: {
'^lodash-es$': 'lodash',
'^.+\\.(css|less)$': 'identity-obj-proxy',
'@antv/xflow': '<rootDir>/node_modules/@antv/xflow/dist/index.umd.js',
'@antv/xflow-(\\S*)': `${path.join(
__dirname,
'../..',
)}/node_modules/.pnpm/node_modules/@antv/xflow-$1/dist/index.umd.js`,
},
};
2 changes: 1 addition & 1 deletion packages/flowchart/tests/graph/normal-spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ describe('Flowchart render', () => {
container = null;
});

it('chart render', () => {
it.skip('chart render', () => {
const NODE_LINK = {
id: 'NODE_LINK',
label: 'NODE_LINK',
Expand Down
9 changes: 4 additions & 5 deletions packages/graphs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

`2023-02-08`

- 🐞 修复 [render-graph setFlowTag 会导致nodes和edges异常](https://github.com/ant-design/ant-design-charts/issues/1801)
- 🐞 修复 [render-graph setFlowTag 会导致 nodes 和 edges 异常](https://github.com/ant-design/ant-design-charts/issues/1801)

## 1.3.6

Expand All @@ -35,20 +35,19 @@
## 1.3.3

- 新增 `marker:click` 事件
- 🔥 新增 `FileTreeGraph`
<img src=https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*CoEVTrU_7g4AAAAAAAAAAAAADmJ7AQ/original>
- 🔥 新增 `FileTreeGraph` <img src=https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*CoEVTrU_7g4AAAAAAAAAAAAADmJ7AQ/original>

## 1.3.3-beta.3

- 🔥 `FileTreeGraph` 新增 `nodeCfg.lineStyle` 配置

`2022-11-10`

## 1.3.3-beta.0

`2022-10-17`

- 🔥 新增 `FileTreeGraph`
<img src=https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*CoEVTrU_7g4AAAAAAAAAAAAADmJ7AQ/original>
- 🔥 新增 `FileTreeGraph` <img src=https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*CoEVTrU_7g4AAAAAAAAAAAAADmJ7AQ/original>

## 1.3.2

Expand Down
2 changes: 1 addition & 1 deletion packages/graphs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ant-design/graphs",
"version": "1.4.0",
"version": "1.4.1",
"description": "Relation graph",
"bugs": {
"url": "https://github.com/ant-design/ant-design-charts/issues"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ export const registerConvCubicHorizontal = () => {
],
['L', endPoint.x, endPoint.y],
];

return baseEdge.draw(cfg, group, path);
},
});
}
};
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ export const registerConvCubicVertical = () => {
],
['L', endPoint.x, endPoint.y],
];

return baseEdge.draw(cfg, group, path);
},
});
}
};
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import G6 from '@antv/g6';
import type { EdgeConfig } from '@antv/g6';
import baseEdge from './baseEdge';


export const registerConvLine = () => {
// 自定义转化边
G6.registerEdge('conv-line', {
Expand All @@ -17,4 +16,4 @@ export const registerConvLine = () => {
return baseEdge.draw(cfg, group, path);
},
});
}
};
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ export const resigterEdges = () => {
registerConvCubicVertical();
registerConvCubicHorizontal();
registerConvLine();
};
};
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ export const registerConvPreset = () => {
// 执行一次空布局,目的是为了走布局流程触发afterlayout
},
});
}
};
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ import { registerConvPreset } from './conv-preset';

export const resigterLayout = () => {
registerConvPreset();
};
};
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ export const registerConvNode = () => {
} = cfg;
const label = cfg.label as string;
const { measure = {}, relatedMeasures = [] } = custom;
const showFormattedValue =
measure.formattedValue !== undefined && measure.formattedValue !== null;
const showFormattedValue = measure.formattedValue !== undefined && measure.formattedValue !== null;
// 最外层描边(光晕)
const keyShape = group.addShape('rect', {
attrs: {
Expand Down Expand Up @@ -168,4 +167,4 @@ export const registerConvNode = () => {
setItemStateStyle(node, 'node');
},
});
}
};
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ import { registerConvNode } from './convNode';

export const resigterNodes = () => {
registerConvNode();
};
};
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,12 @@ import { EdgeType } from '../types';
import type { LayerOrder } from '../types';

// 获取边的类型,起点和终点的anchorPoint索引值
export const getEdgeAnchorAndType = (
graph: Graph,
edge: EdgeConfig,
layerOrder: LayerOrder,
rankdir: Rankdir,
) => {
export const getEdgeAnchorAndType = (graph: Graph, edge: EdgeConfig, layerOrder: LayerOrder, rankdir: Rankdir) => {
const nodes = graph.getNodes().map((node) => node.getModel());
const sourceNode = nodes.find((node) => node.id === edge.source);
const targetNode = nodes.find((node) => node.id === edge.target);
const sourceLayer = layerOrder.findIndex(
(item) => item === (sourceNode?.custom as any)?.layerName,
);
const targetLayer = layerOrder.findIndex(
(item) => item === (targetNode?.custom as any)?.layerName,
);
const sourceLayer = layerOrder.findIndex((item) => item === (sourceNode?.custom as any)?.layerName);
const targetLayer = layerOrder.findIndex((item) => item === (targetNode?.custom as any)?.layerName);

let sourceAnchor;
let targetAnchor;
Expand Down Expand Up @@ -57,12 +48,7 @@ export const getEdgeAnchorAndType = (
export const updateEdgeAnchorAndType = (graph: Graph, layerOrder: LayerOrder, rankdir: Rankdir) => {
graph.getEdges().forEach((edge) => {
const edgeModel = edge.getModel();
const { type, sourceAnchor, targetAnchor } = getEdgeAnchorAndType(
graph,
edgeModel,
layerOrder,
rankdir,
);
const { type, sourceAnchor, targetAnchor } = getEdgeAnchorAndType(graph, edgeModel, layerOrder, rankdir);
graph.updateItem(edgeModel.id, {
type,
sourceAnchor,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,7 @@ export const paintOnce = (graph: Graph, fn: Function) => {
};

// 清空元素状态
export const clearItemStates = (
graph: Graph,
graphItem: Item,
states: ITEM_STATE[],
enablePaint: boolean = false,
) => {
export const clearItemStates = (graph: Graph, graphItem: Item, states: ITEM_STATE[], enablePaint: boolean = false) => {
function fn() {
states.forEach((state) => {
if (graphItem?.hasState(state)) {
Expand Down Expand Up @@ -142,7 +137,8 @@ export const clearItemsStates = (
try {
clearItemStates(graph, graphItem, clearStates, false);
} catch (error) {
console.log('error :>> ', graphItem, error);
const { log } = console;
log('error :>> ', graphItem, error);
}
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,7 @@ export const getNodeMaxSize = (nodes: OriginNode[] = []): number => {
const displayValueWidth = getWordsWidth(`${displayValue}`, '600 20px Roboto-Medium');
// 单位不为空时才计算单位宽度 unit的paddingLeft 4
const unitWidth =
isShowFormatValue && formattedUnit
? getWordsWidth(`${formattedUnit}`, '600 20px PingFangSC') + 4
: 0;
isShowFormatValue && formattedUnit ? getWordsWidth(`${formattedUnit}`, '600 20px PingFangSC') + 4 : 0;
// 节点大小 value + unit + 左右padding
const nodeSize = displayValueWidth + unitWidth + 24;
// 节点最小宽度 150
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,9 @@
import { cloneDeep, uniqBy } from 'lodash';
import { getNodeMaxSize } from './text';
import type {
OriginData,
LayerOrder,
OriginNode,
GraphNode,
GraphEdge,
ConvGraphData,
RatioMethod,
} from '../types';
import type { OriginData, LayerOrder, OriginNode, GraphNode, GraphEdge, ConvGraphData, RatioMethod } from '../types';

// 数据转换:原始节点数据 -> G6渲染节点数据
const transformOriginNodes = (
originNodes: OriginNode[],
layerOrder: LayerOrder,
size: number,
): GraphNode[] => {
const transformOriginNodes = (originNodes: OriginNode[], layerOrder: LayerOrder, size: number): GraphNode[] => {
// 过滤得到节点中实际存在的有效层级
const effectiveLayer =
(Array.isArray(layerOrder) &&
Expand Down Expand Up @@ -52,7 +40,7 @@ const transformOriginEdges = (
layerOrder: string[],
segmLayer: string,
ratioMethod: RatioMethod,
) : GraphEdge[] => {
): GraphEdge[] => {
const { nodes: originNodes = [], edges: originEdges = [] } = data;

return originEdges
Expand Down Expand Up @@ -102,9 +90,7 @@ const transformOriginEdges = (

const ratio = originEdge.ratio || autoRatio; // 优先使用edge数据里的ratio
const formatRatio =
!isNaN(ratio) && ratio !== Infinity
? Number((ratio * 100).toString().match(/^\d+(?:\.\d{0,2})?/))
: '-'; // 比率最多保留2位小数
!isNaN(ratio) && ratio !== Infinity ? Number((ratio * 100).toString().match(/^\d+(?:\.\d{0,2})?/)) : '-'; // 比率最多保留2位小数
const showRatio = `${formatRatio}%`;
const label = originEdge.name || name; // 优先使用edge数据里的name

Expand Down
4 changes: 3 additions & 1 deletion packages/graphs/src/components/flow-analysis-graph/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ export type FlowAnalysisNodeData = NodeData<{
items?: CardItems[];
}>;

export interface FlowAnalysisGraphConfig extends Omit<CommonConfig<Partial<DagreLayout>>, 'data' | 'nodeCfg'>, FetchLoading {
export interface FlowAnalysisGraphConfig
extends Omit<CommonConfig<Partial<DagreLayout>>, 'data' | 'nodeCfg'>,
FetchLoading {
data: {
nodes: FlowAnalysisNodeData[];
edges: FlowGraphEdgeData[];
Expand Down
9 changes: 7 additions & 2 deletions packages/graphs/src/hooks/useGraphs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,13 @@ export default function useGraph(
if (!graph) {
return;
}
const { type: edgeType, style: edgeStyle, startArrow: startArrowCfg, endArrow: endArrowCfg, label: labelCfg } =
edgeCfg ?? {};
const {
type: edgeType,
style: edgeStyle,
startArrow: startArrowCfg,
endArrow: endArrowCfg,
label: labelCfg,
} = edgeCfg ?? {};
graph.getEdges().forEach((edge: IEdge) => {
// 资金流向图&来源去向图
if (['fund-line', 'labels-line'].includes(edgeType)) {
Expand Down
2 changes: 1 addition & 1 deletion packages/graphs/src/utils/set-ellipsis.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export const setEllipsis = (text: string, fontStyle: { [key: string]: unknown },
let currentText = text;
let flag = false;
ctx.fillText(currentText, 0, 0);
if(text.length === 1) {
if (text.length === 1) {
return text;
}
for (let i = text.length - 1; i > 0; i--) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ describe('Type NodeData', () => {
act(() => {
render(<ConversionDagreGraph {...props} {...chartProps} />, container);
});

expect(chartRef).not.toBeUndefined();
});
});
6 changes: 2 additions & 4 deletions packages/graphs/tests/graphs/flow-level-spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ describe('Flow level props', () => {
{
text: '曝光PV',
value: '10.30万',
icon:
'https://gw.alipayobjects.com/zos/antfincdn/iFh9X011qd/7797962c-04b6-4d67-9143-e9d05f9778bf.png',
icon: 'https://gw.alipayobjects.com/zos/antfincdn/iFh9X011qd/7797962c-04b6-4d67-9143-e9d05f9778bf.png',
},
],
},
Expand All @@ -51,8 +50,7 @@ describe('Flow level props', () => {
{
text: '曝光PV',
value: '10.30万',
icon:
'https://gw.alipayobjects.com/zos/antfincdn/iFh9X011qd/7797962c-04b6-4d67-9143-e9d05f9778bf.png',
icon: 'https://gw.alipayobjects.com/zos/antfincdn/iFh9X011qd/7797962c-04b6-4d67-9143-e9d05f9778bf.png',
},
],
},
Expand Down
Loading

0 comments on commit 0c67026

Please sign in to comment.