diff --git a/packages/client/package.json b/packages/client/package.json index bd3f717a2..3d3808064 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -18,7 +18,7 @@ }, "gitHead": "f0b335ac30f29f25c95d7d137655fa64d8d67f1e", "dependencies": { - "@ant-design/charts": "^1.2.3", + "@antv/g2plot": "^2.3.27", "@formily/antd": "^2.0.0-beta.72", "@formily/core": "^2.0.0-beta.72", "@formily/react": "^2.0.0-beta.72", diff --git a/packages/client/src/components/schema-renderer/index.tsx b/packages/client/src/components/schema-renderer/index.tsx index a5547afa9..de9c67b3f 100644 --- a/packages/client/src/components/schema-renderer/index.tsx +++ b/packages/client/src/components/schema-renderer/index.tsx @@ -51,7 +51,7 @@ import { CardItem } from '../../schemas/card-item'; import { DragAndDrop } from '../../schemas/drag-and-drop'; import { TreeSelect } from '../../schemas/tree-select'; import { Page } from '../../schemas/page'; -// import { Chart } from '../../schemas/chart'; +import { Chart } from '../../schemas/chart'; import { useCollectionContext, useSwithDesignableContext } from '../../schemas'; export const BlockContext = createContext({ dragRef: null }); @@ -72,7 +72,7 @@ export const SchemaField = createSchemaField({ Div, Space, Page, - // Chart, + Chart, ArrayCollapse, ArrayTable, diff --git a/packages/client/src/schemas/chart/G2Plot.tsx b/packages/client/src/schemas/chart/G2Plot.tsx new file mode 100644 index 000000000..70c25ba41 --- /dev/null +++ b/packages/client/src/schemas/chart/G2Plot.tsx @@ -0,0 +1,49 @@ +import React, { useEffect, useRef, forwardRef } from 'react'; +import cls from 'classnames'; + +export type ReactG2PlotProps = { + readonly className?: string; + readonly plot: any; + readonly config: O; +}; + +export default forwardRef(function(props: ReactG2PlotProps, ref: any) { + const { className, plot, config } = props; + + const containerRef = useRef(undefined); + const plotRef = useRef(undefined); + + function syncRef(source, target) { + if (typeof target === 'function') { + target(source.current); + } else if (target) { + target.current = source.current; + } + } + + function renderPlot() { + if (plotRef.current) { + plotRef.current.update(config); + } else { + plotRef.current = new plot(containerRef.current, config); + plotRef.current.render(); + } + + syncRef(plotRef, ref); + } + + function destoryPlot() { + if (plotRef.current) { + plotRef.current.destroy(); + plotRef.current = undefined; + } + } + + useEffect(() => { + renderPlot(); + + return () => destoryPlot(); + }, [config, plot]); + + return
; +}); diff --git a/packages/client/src/schemas/chart/index.tsx b/packages/client/src/schemas/chart/index.tsx index 72b2be700..7c7f828e6 100644 --- a/packages/client/src/schemas/chart/index.tsx +++ b/packages/client/src/schemas/chart/index.tsx @@ -1,111 +1,101 @@ -// import React, { useContext } from 'react'; -// import { -// Column, -// ColumnConfig, -// Line, -// LineConfig, -// Pie, -// PieConfig, -// Bar, -// BarConfig, -// } from '@ant-design/charts'; -// import { -// connect, -// mapProps, -// observer, -// useField, -// useFieldSchema, -// mapReadPretty, -// } from '@formily/react'; -// import { Button, Dropdown, Input as AntdInput, Menu, Space } from 'antd'; -// import { InputProps, TextAreaProps } from 'antd/lib/input'; -// import { Display } from '../display'; -// import { LoadingOutlined, MenuOutlined, DragOutlined } from '@ant-design/icons'; -// import micromark from 'micromark'; -// import { useDesignable } from '../../components/schema-renderer'; -// import { useState } from 'react'; -// import AddNew from '../add-new'; -// import cls from 'classnames'; -// import { DraggableBlockContext } from '../../components/drag-and-drop'; -// import { uid } from '@formily/shared'; -// import { removeSchema, updateSchema } from '..'; -// import { isGridRowOrCol } from '../grid'; +import React, { useContext } from 'react'; -// export const Chart: any = {}; +import { + connect, + mapProps, + observer, + useField, + useFieldSchema, + mapReadPretty, +} from '@formily/react'; +import { Button, Dropdown, Input as AntdInput, Menu, Space } from 'antd'; +import { LoadingOutlined, MenuOutlined, DragOutlined } from '@ant-design/icons'; +import { useDesignable } from '../../components/schema-renderer'; +import { useState } from 'react'; +import AddNew from '../add-new'; +import cls from 'classnames'; +import { DraggableBlockContext } from '../../components/drag-and-drop'; +import { uid } from '@formily/shared'; +import { removeSchema, updateSchema } from '..'; +import { isGridRowOrCol } from '../grid'; +import G2Plot from './G2Plot'; +import { Column, Line, Pie, Bar } from '@antv/g2plot'; -// Chart.Column = observer((props: any) => { -// return ; -// }); +export const Chart: any = {}; -// Chart.Line = observer((props: any) => { -// return ; -// }); +Chart.Column = observer((props: any) => { + return ; +}); -// Chart.Pie = observer((props: any) => { -// return ; -// }); +Chart.Line = observer((props: any) => { + return ; +}); -// Chart.Bar = observer((props: any) => { -// return ; -// }); +Chart.Pie = observer((props: any) => { + return ; +}); -// Chart.DesignableBar = observer((props) => { -// const field = useField(); -// const { designable, schema, refresh, deepRemove } = useDesignable(); -// const [visible, setVisible] = useState(false); -// const { dragRef } = useContext(DraggableBlockContext); -// if (!designable) { -// return null; -// } -// return ( -//
-// { -// e.stopPropagation(); -// }} -// className={cls('designable-bar-actions', { active: visible })} -// > -// -// -// {dragRef && } -// { -// setVisible(visible); -// }} -// overlay={ -// -// { -// field.readPretty = false; -// setVisible(false); -// }} -// > -// 修改文本段 -// -// -// { -// const removed = deepRemove(); -// // console.log({ removed }) -// const last = removed.pop(); -// if (isGridRowOrCol(last)) { -// await removeSchema(last); -// } -// }} -// > -// 删除当前文本 -// -// -// } -// > -// -// -// -// -//
-// ); -// }); \ No newline at end of file +Chart.Bar = observer((props: any) => { + return ; +}); + +Chart.DesignableBar = observer((props) => { + const field = useField(); + const { designable, schema, refresh, deepRemove } = useDesignable(); + const [visible, setVisible] = useState(false); + const { dragRef } = useContext(DraggableBlockContext); + if (!designable) { + return null; + } + return ( +
+ { + e.stopPropagation(); + }} + className={cls('designable-bar-actions', { active: visible })} + > + + + {dragRef && } + { + setVisible(visible); + }} + overlay={ + + { + field.readPretty = false; + setVisible(false); + }} + > + 修改文本段 + + + { + const removed = deepRemove(); + // console.log({ removed }) + const last = removed.pop(); + if (isGridRowOrCol(last)) { + await removeSchema(last); + } + }} + > + 删除当前文本 + + + } + > + + + + +
+ ); +}); diff --git a/yarn.lock b/yarn.lock index 9cefc6725..1c4ff0118 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10,23 +10,6 @@ lodash.debounce "^4.0.8" lodash.throttle "^4.1.1" -"@ant-design/charts@^1.2.3": - version "1.2.3" - resolved "https://registry.npmjs.org/@ant-design/charts/-/charts-1.2.3.tgz#09d86e9c4575f46b9ec6be78df8607cdf90ff93b" - integrity sha512-ShBbohvs1vlLheUlm94rwdF7gorhh1KPeW1ix9dy8P3PC4Z/Mx/91cpc3p+7qlMRZKO8wLP5Lo6/P+lKfp070A== - dependencies: - "@antv/g2plot" "^2.2.11" - "@antv/g6" "^4.2.4" - "@antv/util" "^2.0.9" - react-content-loader "^5.0.4" - -"@ant-design/colors@^4.0.5": - version "4.0.5" - resolved "https://registry.npmjs.org/@ant-design/colors/-/colors-4.0.5.tgz#d7d100d7545cca8f624954604a6892fc48ba5aae" - integrity sha512-3mnuX2prnWOWvpFTS2WH2LoouWlOgtnIpc6IarWN6GOzzLF8dW/U8UctuvIPhoboETehZfJ61XP+CGakBEPJ3Q== - dependencies: - tinycolor2 "^1.4.1" - "@ant-design/colors@^6.0.0": version "6.0.0" resolved "https://registry.npmjs.org/@ant-design/colors/-/colors-6.0.0.tgz#9b9366257cffcc47db42b9d0203bb592c13c0298" @@ -69,13 +52,6 @@ "@antv/util" "~2.0.0" tslib "^1.10.0" -"@antv/algorithm@^0.1.8": - version "0.1.9" - resolved "https://registry.npmjs.org/@antv/algorithm/-/algorithm-0.1.9.tgz#532ee5311e43f5be2ed1ac2b8f3504683fddeb5e" - integrity sha512-z+nds19uteXOP/Rxyrz5jRj5yDQZGvaHF/e/5phaQClGuYaiwcherTCWneWFq69LlVai2hNqC7lqr5B+GmcRLg== - dependencies: - "@antv/util" "^2.0.13" - "@antv/attr@^0.3.1": version "0.3.2" resolved "https://registry.npmjs.org/@antv/attr/-/attr-0.3.2.tgz#e5866b64870c62f3a9c25b8a61f654ba2bfda051" @@ -116,7 +92,7 @@ "@antv/util" "~2.0.12" tslib "^2.1.0" -"@antv/dom-util@^2.0.1", "@antv/dom-util@^2.0.2", "@antv/dom-util@~2.0.1": +"@antv/dom-util@^2.0.2", "@antv/dom-util@~2.0.1": version "2.0.3" resolved "https://registry.npmjs.org/@antv/dom-util/-/dom-util-2.0.3.tgz#cbd158b1c88e0e8a4d865871a5969b1190554ff5" integrity sha512-dUHsUT4U9X1T1/Y9bH3jRMe0MzvWJk2jSQm1vm3w9NX+Ra0ftq5VUBiGTNbthm3nFwG0fFFjip904rYjl50g4A== @@ -145,7 +121,7 @@ detect-browser "^5.1.0" tslib "^2.0.3" -"@antv/g-base@^0.5.1", "@antv/g-base@^0.5.3", "@antv/g-base@~0.5.6": +"@antv/g-base@^0.5.3", "@antv/g-base@~0.5.6": version "0.5.9" resolved "https://registry.npmjs.org/@antv/g-base/-/g-base-0.5.9.tgz#58d0e11d85157ada1408fbdf24f4f468f40e59cd" integrity sha512-IAzuCLRmz9cKCWUKR3cKWgLZ/6OQYpTCIOgxAP8Bc+HRw0mu8iC3OTz+tWKGv9L8unpvCvpQd1H+OTTjdg/TpQ== @@ -162,7 +138,7 @@ detect-browser "^5.1.0" tslib "^2.0.3" -"@antv/g-canvas@^0.5.2", "@antv/g-canvas@~0.5.10": +"@antv/g-canvas@~0.5.10": version "0.5.11" resolved "https://registry.npmjs.org/@antv/g-canvas/-/g-canvas-0.5.11.tgz#04264516dfd13856b543185cc5a784a3b527c7bb" integrity sha512-4V3ExLdYI49VJ4gqL3+QX4D/4CVdNzcpu+09Lw2QycsxEHhjHaUcFdArybgmIEdFhB1xk1/qNx2jZTN3zdMLwg== @@ -175,7 +151,7 @@ gl-matrix "^3.0.0" tslib "^2.0.3" -"@antv/g-math@^0.1.1", "@antv/g-math@^0.1.6": +"@antv/g-math@^0.1.6": version "0.1.7" resolved "https://registry.npmjs.org/@antv/g-math/-/g-math-0.1.7.tgz#6ec2769269f7ccb67e58140d5739df74046cc04e" integrity sha512-xGyXaloD1ynfp7gS4VuV+MjSptZIwHvLHr8ekXJSFAeWPYLu84yOW2wOZHDdp1bzDAIuRv6xDBW58YGHrWsFcA== @@ -183,7 +159,7 @@ "@antv/util" "~2.0.0" gl-matrix "^3.0.0" -"@antv/g-svg@^0.5.1", "@antv/g-svg@^0.5.2", "@antv/g-svg@~0.5.6": +"@antv/g-svg@~0.5.6": version "0.5.6" resolved "https://registry.npmjs.org/@antv/g-svg/-/g-svg-0.5.6.tgz#70b2fa980c431b39ad3c5b4b53e36a1d60957d65" integrity sha512-Xve1EUGk4HMbl2nq4ozR4QLh6GyoZ8Xw/+9kHYI4B5P2lIUQU95MuRsaLFfW5NNpZDx85ZeH97tqEmC9L96E7A== @@ -194,52 +170,6 @@ detect-browser "^5.0.0" tslib "^2.0.3" -"@antv/g-webgpu-core@^0.5.5", "@antv/g-webgpu-core@^0.5.6": - version "0.5.6" - resolved "https://registry.npmjs.org/@antv/g-webgpu-core/-/g-webgpu-core-0.5.6.tgz#68cde0b5d0b44b5794371c2523682f4734da3c6c" - integrity sha512-DPiH3GkAUiT0Q+LAKeImpI+IOQ/gP2w6HstYKivpFIpBPIvZ/9equM3icVrn1iDfDkZANVXQ1PppcO3xBv1ZTw== - dependencies: - eventemitter3 "^4.0.0" - gl-matrix "^3.1.0" - inversify "^5.0.1" - inversify-inject-decorators "^3.1.0" - probe.gl "^3.1.1" - reflect-metadata "^0.1.13" - -"@antv/g-webgpu-engine@^0.5.5": - version "0.5.6" - resolved "https://registry.npmjs.org/@antv/g-webgpu-engine/-/g-webgpu-engine-0.5.6.tgz#be7c1bf8e4b1822d72a302d628034345e0577bbd" - integrity sha512-D311qYUefdEFwLayutIHqucrAY3cAGH3BdnXS37nq+0nsglrHcNP0Ab1YTinn9RihLoY3yXFTLzrYkJHJbZXDg== - dependencies: - "@antv/g-webgpu-core" "^0.5.6" - "@webgpu/glslang" "^0.0.15" - "@webgpu/types" "^0.0.31" - gl-matrix "^3.1.0" - hammerjs "^2.0.8" - inversify "^5.0.1" - inversify-inject-decorators "^3.1.0" - probe.gl "^3.1.1" - reflect-metadata "^0.1.13" - regl "^1.3.11" - -"@antv/g-webgpu@0.5.5": - version "0.5.5" - resolved "https://registry.npmjs.org/@antv/g-webgpu/-/g-webgpu-0.5.5.tgz#003d411453ed03e7dd916bd6c6db26a2b53d1991" - integrity sha512-TxtBniINFq1jFGEPo46xjJfrbJbUqkFd5wmsRs3tcg/7J7xoldOP1kEadpI3AJG9knMYdE92VpILw1VPd6DgzQ== - dependencies: - "@antv/g-webgpu-core" "^0.5.5" - "@antv/g-webgpu-engine" "^0.5.5" - "@webgpu/types" "^0.0.31" - gl-matrix "^3.1.0" - gl-vec2 "^1.3.0" - hammerjs "^2.0.8" - inversify "^5.0.1" - inversify-inject-decorators "^3.1.0" - polyline-miter-util "^1.0.1" - polyline-normals "^2.0.2" - probe.gl "^3.1.1" - reflect-metadata "^0.1.13" - "@antv/g2@^4.1.19": version "4.1.21" resolved "https://registry.npmjs.org/@antv/g2/-/g2-4.1.21.tgz#c713022c19affbfffc98d1a5f40437da33f7c64a" @@ -261,7 +191,7 @@ "@antv/util" "~2.0.5" tslib "^2.0.0" -"@antv/g2plot@^2.2.11": +"@antv/g2plot@^2.3.27": version "2.3.27" resolved "https://registry.npmjs.org/@antv/g2plot/-/g2plot-2.3.27.tgz#043441627727e521151c905814acaec247bf59a5" integrity sha512-e1+NQ2egiPu1HHOuKdAHKmyE5ceqzlDNfpnxH3pYNXxaXdhRjJ90x5XvMLZ3YYXyzC594SkYKTbja5NNGSPuwg== @@ -274,106 +204,6 @@ size-sensor "^1.0.1" tslib "^2.0.3" -"@antv/g6-core@0.3.4": - version "0.3.4" - resolved "https://registry.npmjs.org/@antv/g6-core/-/g6-core-0.3.4.tgz#810bf1e1a2b0b14e54e1ca57b3827e2a008dadc5" - integrity sha512-LLThPrWGfgiu/UaS96AygaeCyNdekxEXrlHku8KRk6tQChdtgF+3KmYyjrhtbM6GgclL3G3bvo06wCueh+HFaQ== - dependencies: - "@antv/algorithm" "^0.1.8" - "@antv/dom-util" "^2.0.1" - "@antv/event-emitter" "~0.1.0" - "@antv/g-base" "^0.5.1" - "@antv/g-math" "^0.1.1" - "@antv/matrix-util" "^3.1.0-beta.2" - "@antv/path-util" "^2.0.3" - "@antv/util" "~2.0.5" - ml-matrix "^6.5.0" - tslib "^2.1.0" - -"@antv/g6-element@0.3.4": - version "0.3.4" - resolved "https://registry.npmjs.org/@antv/g6-element/-/g6-element-0.3.4.tgz#b475af8e385c4885c6a46210e22f8c68d4fa268e" - integrity sha512-Ji7Wkxnov3GsSov8XHIHHxUJYTDfE2uV0HYYuJLeiBgLcyesWa4YaoA3tKxa7HS5cizNKf/I31ZrPBeLE1lewA== - dependencies: - "@antv/g-base" "^0.5.1" - "@antv/g6-core" "0.3.4" - "@antv/util" "~2.0.5" - -"@antv/g6-pc@0.3.4": - version "0.3.4" - resolved "https://registry.npmjs.org/@antv/g6-pc/-/g6-pc-0.3.4.tgz#52e18022ef62f4f932dbb42daceba979d698ac89" - integrity sha512-TgDaH1Sz6HLWZycmVlZoWtYNxIVY5HMKfmrbFmdrsv4ZU+i8R3jW55Gza8YcF+olIZTyc0AeqYDOKQCReHlNtg== - dependencies: - "@ant-design/colors" "^4.0.5" - "@antv/algorithm" "^0.1.8" - "@antv/dom-util" "^2.0.1" - "@antv/event-emitter" "~0.1.0" - "@antv/g-base" "^0.5.1" - "@antv/g-canvas" "^0.5.2" - "@antv/g-math" "^0.1.1" - "@antv/g-svg" "^0.5.1" - "@antv/g6-core" "0.3.4" - "@antv/g6-element" "0.3.4" - "@antv/g6-plugin" "0.3.4" - "@antv/hierarchy" "^0.6.7" - "@antv/layout" "^0.1.14" - "@antv/matrix-util" "^3.0.4" - "@antv/path-util" "^2.0.3" - "@antv/util" "~2.0.5" - color "^3.1.3" - d3-force "^2.0.1" - dagre "^0.8.5" - insert-css "^2.0.0" - ml-matrix "^6.5.0" - -"@antv/g6-plugin@0.3.4": - version "0.3.4" - resolved "https://registry.npmjs.org/@antv/g6-plugin/-/g6-plugin-0.3.4.tgz#42cbe79bfdcfef63a3a02162944a766e5d231adc" - integrity sha512-w0eMGMATEBnRGBthqTBTDyQiNtZdwytH8VfoyBttLZv3iYchOE0+3MBYVU5Luxx9hliXy5reR+BDPbpMLF1aQg== - dependencies: - "@antv/dom-util" "^2.0.2" - "@antv/g-base" "^0.5.1" - "@antv/g-canvas" "^0.5.2" - "@antv/g-svg" "^0.5.2" - "@antv/g6-core" "0.3.4" - "@antv/matrix-util" "^3.0.4" - "@antv/scale" "^0.3.4" - "@antv/util" "^2.0.9" - insert-css "^2.0.0" - -"@antv/g6@^4.2.4": - version "4.3.4" - resolved "https://registry.npmjs.org/@antv/g6/-/g6-4.3.4.tgz#5d4faf453ff077463388adf5d613083a4f637277" - integrity sha512-/Mq6jx82mniT2X9b7KpaHZlpD/J5bJsm2Im3ce0oknwjBTOdCkWjmypdG1RWmzLRC/CLmu1H10NBSdcEHBGbDA== - dependencies: - "@antv/g6-pc" "0.3.4" - -"@antv/hierarchy@^0.6.7": - version "0.6.7" - resolved "https://registry.npmjs.org/@antv/hierarchy/-/hierarchy-0.6.7.tgz#bccd57a21764c5b71ed8c1cba52817b235b19c5c" - integrity sha512-Te2fJCq5W80990gCUiUazp1BOloushOEnbgaD+z5z/m0ntjVEhJzQJDyTNG7NT30CO4iskv4R0Jmh5u9kxAznQ== - dependencies: - "@antv/util" "^2.0.7" - -"@antv/layout@^0.1.14": - version "0.1.17" - resolved "https://registry.npmjs.org/@antv/layout/-/layout-0.1.17.tgz#05f8592a16399d555e1ab47806c9662a25cd9781" - integrity sha512-kH7O/lePgTBQuJEHULax2/MzzfmvMFJ82+dQQZT9A2KGLnfZnArYueo7zyOjDwreKdJpki7WNd8H71EYpwJInA== - dependencies: - "@antv/g-webgpu" "0.5.5" - d3-force "^2.0.1" - dagre "^0.8.5" - ml-matrix "^6.5.0" - -"@antv/matrix-util@^3.0.4": - version "3.0.4" - resolved "https://registry.npmjs.org/@antv/matrix-util/-/matrix-util-3.0.4.tgz#ea13f158aa2fb4ba2fb8d6b6b561ec467ea3ac20" - integrity sha512-BAPyu6dUliHcQ7fm9hZSGKqkwcjEDVLVAstlHULLvcMZvANHeLXgHEgV7JqcAV/GIhIz8aZChIlzM1ZboiXpYQ== - dependencies: - "@antv/util" "^2.0.9" - gl-matrix "^3.3.0" - tslib "^2.0.3" - "@antv/matrix-util@^3.1.0-beta.1", "@antv/matrix-util@^3.1.0-beta.2": version "3.1.0-beta.2" resolved "https://registry.npmjs.org/@antv/matrix-util/-/matrix-util-3.1.0-beta.2.tgz#b4afafb70dbdf52affca308d3546c8a090fd23ca" @@ -391,7 +221,7 @@ "@antv/util" "^2.0.9" tslib "^2.0.3" -"@antv/scale@^0.3.4", "@antv/scale@^0.3.7", "@antv/scale@~0.3.1": +"@antv/scale@^0.3.7", "@antv/scale@~0.3.1": version "0.3.12" resolved "https://registry.npmjs.org/@antv/scale/-/scale-0.3.12.tgz#47dbba3e30f230bd6d27ca31d4204106608650db" integrity sha512-ov0cQy5VsYUVFTwKZ3/sXcIKJK1msXye6xie6h+1McwvgmM+rZdKvGCbfGIXVmV9JBc9zksa2ke4E0sI0TawjQ== @@ -400,7 +230,7 @@ fecha "~4.2.0" tslib "^2.0.0" -"@antv/util@^2.0.13", "@antv/util@^2.0.7", "@antv/util@^2.0.9", "@antv/util@~2.0.0", "@antv/util@~2.0.12", "@antv/util@~2.0.3", "@antv/util@~2.0.5": +"@antv/util@^2.0.9", "@antv/util@~2.0.0", "@antv/util@~2.0.12", "@antv/util@~2.0.3", "@antv/util@~2.0.5": version "2.0.14" resolved "https://registry.npmjs.org/@antv/util/-/util-2.0.14.tgz#1ac8c4f790beaf6572daecf62df6aa55fa0a31df" integrity sha512-iwM4XKRzW7pbBnMnSGKqcNGo3FdDzMGbRojAiMQ2KC0bTwtLEphQ+hYWa1c+O9BuHtcMkVvTVDylHNESL5vE5g== @@ -3397,13 +3227,6 @@ dependencies: "@octokit/openapi-types" "^7.3.2" -"@probe.gl/stats@3.4.0": - version "3.4.0" - resolved "https://registry.npmjs.org/@probe.gl/stats/-/stats-3.4.0.tgz#9315c4726ea031661daa6a1771b8e978684a8b9b" - integrity sha512-Gl37r9qGuiKadIvTZdSZvzCNOttJYw6RcY1oT0oDuB8r2uhuZAdSMQRQTy9FTinp6MY6O9wngGnV6EpQ8wSBAw== - dependencies: - "@babel/runtime" "^7.0.0" - "@qixian.cs/path-to-regexp@^6.1.0": version "6.1.0" resolved "https://registry.npmjs.org/@qixian.cs/path-to-regexp/-/path-to-regexp-6.1.0.tgz#6b84ad01596332aba95fa29d2e70104698cd5c45" @@ -4548,16 +4371,6 @@ dependencies: "@umijs/deps" "3.4.25" -"@webgpu/glslang@^0.0.15": - version "0.0.15" - resolved "https://registry.npmjs.org/@webgpu/glslang/-/glslang-0.0.15.tgz#f5ccaf6015241e6175f4b90906b053f88483d1f2" - integrity sha512-niT+Prh3Aff8Uf1MVBVUsaNjFj9rJAKDXuoHIKiQbB+6IUP/3J3JIhBNyZ7lDhytvXxw6ppgnwKZdDJ08UMj4Q== - -"@webgpu/types@^0.0.31": - version "0.0.31" - resolved "https://registry.npmjs.org/@webgpu/types/-/types-0.0.31.tgz#c05ec6e60024bf1836f31236ecd7677a969a2a2c" - integrity sha512-cvvCMSZBT4VsRNtt0lI6XQqvOIIWw6+NRUtnPUMDVDgsI4pCZColz3qzF5QcP9wIYOHEc3jssIBse8UWONKhlQ== - "@zkochan/cmd-shim@^3.1.0": version "3.1.0" resolved "https://registry.npmjs.org/@zkochan/cmd-shim/-/cmd-shim-3.1.0.tgz#2ab8ed81f5bb5452a85f25758eb9b8681982fd2e" @@ -6427,7 +6240,7 @@ collection-visit@^1.0.0: map-visit "^1.0.0" object-visit "^1.0.0" -color-convert@^1.9.0, color-convert@^1.9.1, color-convert@^1.9.3: +color-convert@^1.9.0, color-convert@^1.9.1: version "1.9.3" resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== @@ -6459,14 +6272,6 @@ color-string@^1.5.4: color-name "^1.0.0" simple-swizzle "^0.2.2" -color-string@^1.6.0: - version "1.6.0" - resolved "https://registry.npmjs.org/color-string/-/color-string-1.6.0.tgz#c3915f61fe267672cb7e1e064c9d692219f6c312" - integrity sha512-c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA== - dependencies: - color-name "^1.0.0" - simple-swizzle "^0.2.2" - color-support@^1.1.3: version "1.1.3" resolved "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" @@ -6480,14 +6285,6 @@ color@^3.0.0: color-convert "^1.9.1" color-string "^1.5.4" -color@^3.1.3: - version "3.2.1" - resolved "https://registry.npmjs.org/color/-/color-3.2.1.tgz#3544dc198caf4490c3ecc9a790b54fe9ff45e164" - integrity sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA== - dependencies: - color-convert "^1.9.3" - color-string "^1.6.0" - colorette@^1.2.1, colorette@^1.2.2: version "1.2.2" resolved "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94" @@ -7257,25 +7054,11 @@ d3-color@1: resolved "https://registry.npmjs.org/d3-color/-/d3-color-1.4.1.tgz#c52002bf8846ada4424d55d97982fef26eb3bc8a" integrity sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q== -"d3-dispatch@1 - 2": - version "2.0.0" - resolved "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-2.0.0.tgz#8a18e16f76dd3fcaef42163c97b926aa9b55e7cf" - integrity sha512-S/m2VsXI7gAti2pBoLClFFTMOO1HTtT0j99AuXLoGFKO6deHDdnv6ZGTxSTTUTgO1zVcv82fCOtDjYK4EECmWA== - d3-ease@^1.0.5: version "1.0.7" resolved "https://registry.npmjs.org/d3-ease/-/d3-ease-1.0.7.tgz#9a834890ef8b8ae8c558b2fe55bd57f5993b85e2" integrity sha512-lx14ZPYkhNx0s/2HX5sLFUI3mbasHjSSpwO/KaaNACweVwxUruKyWVcb293wMv1RqTPZyZ8kSZ2NogUZNcLOFQ== -d3-force@^2.0.1: - version "2.1.1" - resolved "https://registry.npmjs.org/d3-force/-/d3-force-2.1.1.tgz#f20ccbf1e6c9e80add1926f09b51f686a8bc0937" - integrity sha512-nAuHEzBqMvpFVMf9OX75d00OxvOXdxY+xECIXjW6Gv8BRrXu6gAWbv/9XKrvfJ5i5DCokDW7RYE50LRoK092ew== - dependencies: - d3-dispatch "1 - 2" - d3-quadtree "1 - 2" - d3-timer "1 - 2" - d3-hierarchy@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-2.0.0.tgz#dab88a58ca3e7a1bc6cab390e89667fcc6d20218" @@ -7288,21 +7071,11 @@ d3-interpolate@^1.3.2: dependencies: d3-color "1" -"d3-quadtree@1 - 2": - version "2.0.0" - resolved "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-2.0.0.tgz#edbad045cef88701f6fee3aee8e93fb332d30f9d" - integrity sha512-b0Ed2t1UUalJpc3qXzKi+cPGxeXRr4KU9YSlocN74aTzp6R/Ud43t79yLLqxHRWZfsvWXmbDWPpoENK1K539xw== - d3-regression@^1.3.5: version "1.3.9" resolved "https://registry.npmjs.org/d3-regression/-/d3-regression-1.3.9.tgz#61c34acb9b6bbd9172ede89f05d0b7fbd57ccdc0" integrity sha512-PoMpToIvxSnVpgAZTCERVseRend40JIBICJxwATJ/T4laWGaI5dpRdRxrPITxD8hk8W455fKonVChwSmDyWEyg== -"d3-timer@1 - 2": - version "2.0.0" - resolved "https://registry.npmjs.org/d3-timer/-/d3-timer-2.0.0.tgz#055edb1d170cfe31ab2da8968deee940b56623e6" - integrity sha512-TO4VLh0/420Y/9dO3+f9abDEFYeCUr2WZRlxJvbp4HPTQcSylXNiL6yZa9FIUvV1yRiFufl1bszTCLDqv9PWNA== - d3-timer@^1.0.9: version "1.0.10" resolved "https://registry.npmjs.org/d3-timer/-/d3-timer-1.0.10.tgz#dfe76b8a91748831b13b6d9c793ffbd508dd9de5" @@ -7316,14 +7089,6 @@ d@1, d@^1.0.1: es5-ext "^0.10.50" type "^1.0.1" -dagre@^0.8.5: - version "0.8.5" - resolved "https://registry.npmjs.org/dagre/-/dagre-0.8.5.tgz#ba30b0055dac12b6c1fcc247817442777d06afee" - integrity sha512-/aTqmnRta7x7MCCpExk7HQL2O4owCT2h8NT//9I1OQ9vt29Pa0BzSAkR5lwFUcQ7491yVi/3CXU9jQ5o0Mn2Sw== - dependencies: - graphlib "^2.1.8" - lodash "^4.17.15" - dargs@^4.0.1: version "4.1.0" resolved "https://registry.npmjs.org/dargs/-/dargs-4.1.0.tgz#03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17" @@ -8495,7 +8260,7 @@ eventemitter3@^3.1.0: resolved "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7" integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q== -eventemitter3@^4.0.0, eventemitter3@^4.0.4: +eventemitter3@^4.0.4: version "4.0.7" resolved "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== @@ -9300,16 +9065,11 @@ github-slugger@^1.3.0: dependencies: emoji-regex ">=6.0.0 <=6.1.1" -gl-matrix@^3.0.0, gl-matrix@^3.1.0, gl-matrix@^3.3.0: +gl-matrix@^3.0.0, gl-matrix@^3.3.0: version "3.3.0" resolved "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.3.0.tgz#232eef60b1c8b30a28cbbe75b2caf6c48fd6358b" integrity sha512-COb7LDz+SXaHtl/h4LeaFcNdJdAQSDeVqjiIihSXNrkWObZLhDI4hIkZC11Aeqp7bcE72clzB0BnDXr2SmslRA== -gl-vec2@^1.0.0, gl-vec2@^1.3.0: - version "1.3.0" - resolved "https://registry.npmjs.org/gl-vec2/-/gl-vec2-1.3.0.tgz#83d472ed46034de8e09cbc857123fb6c81c51199" - integrity sha512-YiqaAuNsheWmUV0Sa8k94kBB0D6RWjwZztyO+trEYS8KzJ6OQB/4686gdrf59wld4hHFIvaxynO3nRxpk1Ij/A== - glob-parent@^3.1.0: version "3.1.0" resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" @@ -9447,13 +9207,6 @@ graceful-fs@4.X, graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.15, g resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== -graphlib@^2.1.8: - version "2.1.8" - resolved "https://registry.npmjs.org/graphlib/-/graphlib-2.1.8.tgz#5761d414737870084c92ec7b5dbcb0592c9d35da" - integrity sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A== - dependencies: - lodash "^4.17.15" - growly@^1.3.0: version "1.3.0" resolved "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" @@ -9527,11 +9280,6 @@ gulp-typescript@5.0.1: vinyl "^2.1.0" vinyl-fs "^3.0.3" -hammerjs@^2.0.8: - version "2.0.8" - resolved "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz#04ef77862cff2bb79d30f7692095930222bf60f1" - integrity sha1-BO93hiz/K7edMPdpIJWTAiK/YPE= - handlebars@^4.7.6: version "4.7.7" resolved "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1" @@ -10273,11 +10021,6 @@ inquirer@^6.2.0: strip-ansi "^5.1.0" through "^2.3.6" -insert-css@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/insert-css/-/insert-css-2.0.0.tgz#eb5d1097b7542f4c79ea3060d3aee07d053880f4" - integrity sha1-610Ql7dUL0x56jBg067gfQU4gPQ= - internal-slot@^1.0.3: version "1.0.3" resolved "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" @@ -10324,16 +10067,6 @@ invariant@^2.2.1, invariant@^2.2.2, invariant@^2.2.4: dependencies: loose-envify "^1.0.0" -inversify-inject-decorators@^3.1.0: - version "3.1.0" - resolved "https://registry.npmjs.org/inversify-inject-decorators/-/inversify-inject-decorators-3.1.0.tgz#d9941080bad77cec8a65ee29d905e4d5d73e1e95" - integrity sha512-/seBlVp5bXrLQS3DpKEmlgeZL6C7Tf/QITd+IMQrbBBGuCbxb7k3hRAWu9XSreNpFzLgSboz3sClLSEmGwHphw== - -inversify@^5.0.1: - version "5.1.1" - resolved "https://registry.npmjs.org/inversify/-/inversify-5.1.1.tgz#6fbd668c591337404e005a1946bfe0d802c08730" - integrity sha512-j8grHGDzv1v+8T1sAQ+3boTCntFPfvxLCkNcxB1J8qA0lUN+fAlSyYd+RXKvaPRL4AGyPxViutBEJHNXOyUdFQ== - ip@1.1.5, ip@^1.1.5: version "1.1.5" resolved "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" @@ -10379,11 +10112,6 @@ is-alphanumerical@^1.0.0: is-alphabetical "^1.0.0" is-decimal "^1.0.0" -is-any-array@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/is-any-array/-/is-any-array-1.0.0.tgz#bcb2c7e2d28aaa2fa02ee8f6b604b0b3a957bba7" - integrity sha512-0o0ZsgObnylv72nO39P6M+PL7jPUEx39O6BEfZuX36IKPy/RpdudxluAIaRn/LZi5eVPDMlMBaLABzOK6bwPlw== - is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" @@ -13174,36 +12902,6 @@ mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1: dependencies: minimist "^1.2.5" -ml-array-max@^1.2.3: - version "1.2.3" - resolved "https://registry.npmjs.org/ml-array-max/-/ml-array-max-1.2.3.tgz#92d1ffef667432d1451d35817a7276c528635e64" - integrity sha512-49YwnLlAf4/E/VyezUz+SNfSBhPE8JTahxRPuyM9S9Uv+ft5x0C8A4trtkDgrttMxoxbhudTA1yg8zgJZaYtpA== - dependencies: - is-any-array "^1.0.0" - -ml-array-min@^1.2.2: - version "1.2.2" - resolved "https://registry.npmjs.org/ml-array-min/-/ml-array-min-1.2.2.tgz#abd68512a57fe8499513e6f2265533807e2bbe6b" - integrity sha512-yidQcOHFaGEuVr6FcwAn+QvKXJv1Lxel5fyKrO+aXGJGp97Mt+p8r21WYtikS/PTVbxdSrliQ0UK4wSHYHHgzQ== - dependencies: - is-any-array "^1.0.0" - -ml-array-rescale@^1.3.5: - version "1.3.5" - resolved "https://registry.npmjs.org/ml-array-rescale/-/ml-array-rescale-1.3.5.tgz#a41a98535e5b3bcdcde2f1ef532f4453feb11104" - integrity sha512-czK+faN7kYrF48SgVQeXGkxUjDEas6BA4EzF4jJNh8UEtzpSvHW3RllZCJCCyrAqeFc+Y/LhgYUzuHFpevM3qA== - dependencies: - is-any-array "^1.0.0" - ml-array-max "^1.2.3" - ml-array-min "^1.2.2" - -ml-matrix@^6.5.0: - version "6.8.0" - resolved "https://registry.npmjs.org/ml-matrix/-/ml-matrix-6.8.0.tgz#55429ea9625def03ba34e7c8e6ca490409127aa6" - integrity sha512-c29k/gtyzLeNs0vLB2u4hHYcKr8PdyIs4oB0OsVhlgKiHbYyFkC2e98FcUPKhcnzn234jeZk42No+6d4bXBDNg== - dependencies: - ml-array-rescale "^1.3.5" - mockjs@^1.1.0: version "1.1.0" resolved "https://registry.npmjs.org/mockjs/-/mockjs-1.1.0.tgz#e6a0c378e91906dbaff20911cc0273b3c7d75b06" @@ -14578,20 +14276,6 @@ pn@^1.1.0: resolved "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb" integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA== -polyline-miter-util@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/polyline-miter-util/-/polyline-miter-util-1.0.1.tgz#b693f2389ea0ded36a6bcf5ecd2ece4b6917d957" - integrity sha1-tpPyOJ6g3tNqa89ezS7OS2kX2Vc= - dependencies: - gl-vec2 "^1.0.0" - -polyline-normals@^2.0.2: - version "2.0.2" - resolved "https://registry.npmjs.org/polyline-normals/-/polyline-normals-2.0.2.tgz#a1737e75d8c0dccb1a591f9cb27f09eef4b7d135" - integrity sha1-oXN+ddjA3MsaWR+csn8J7vS30TU= - dependencies: - polyline-miter-util "^1.0.1" - posix-character-classes@^0.1.0: version "0.1.1" resolved "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" @@ -15372,14 +15056,6 @@ prismjs@^1.21.0: optionalDependencies: clipboard "^2.0.0" -probe.gl@^3.1.1: - version "3.4.0" - resolved "https://registry.npmjs.org/probe.gl/-/probe.gl-3.4.0.tgz#f35029b0041fb909caff493ab23feae53339261e" - integrity sha512-9CLByZATuhuG/Viq3ckfWU+dAhb7dMmjzsyCy4s7ds9ueTejcVRENxL197/XacOK/AN61YrEERB0QnouB0Qc0Q== - dependencies: - "@babel/runtime" "^7.0.0" - "@probe.gl/stats" "3.4.0" - process-nextick-args@^2.0.0, process-nextick-args@~2.0.0: version "2.0.1" resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" @@ -16150,11 +15826,6 @@ react-attr-converter@^0.3.1: resolved "https://registry.npmjs.org/react-attr-converter/-/react-attr-converter-0.3.1.tgz#4a2abf6d907b7ddae4d862dfec80e489ce41ad6e" integrity sha512-dSxo2Mn6Zx4HajeCeQNLefwEO4kNtV/0E682R1+ZTyFRPqxDa5zYb5qM/ocqw9Bxr/kFQO0IUiqdV7wdHw+Cdg== -react-content-loader@^5.0.4: - version "5.1.4" - resolved "https://registry.npmjs.org/react-content-loader/-/react-content-loader-5.1.4.tgz#854bafe4415dd9de07174621375bc308edd0ebb5" - integrity sha512-hTq7pZi2GKCK6a9d3u6XStozm0QGCEjw8cSqQReiWnh2up6IwCha5R5TF0o6SY5qUDpByloEZEZtnFxpJyENFw== - react-dnd-html5-backend@^14.0.0: version "14.0.0" resolved "https://registry.npmjs.org/react-dnd-html5-backend/-/react-dnd-html5-backend-14.0.0.tgz#28d660a2ad1e07447c34a65cd25f7de8f1657194" @@ -16613,11 +16284,6 @@ redux@^4.0.0, redux@^4.0.1, redux@^4.0.5: dependencies: "@babel/runtime" "^7.9.2" -reflect-metadata@^0.1.13: - version "0.1.13" - resolved "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08" - integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg== - reflect.ownkeys@^0.2.0: version "0.2.0" resolved "https://registry.npmjs.org/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz#749aceec7f3fdf8b63f927a04809e90c5c0b3460" @@ -16721,11 +16387,6 @@ regjsparser@^0.6.4: dependencies: jsesc "~0.5.0" -regl@^1.3.11: - version "1.7.0" - resolved "https://registry.npmjs.org/regl/-/regl-1.7.0.tgz#0d185431044a356bf80e9b775b11b935ef2746d3" - integrity sha512-bEAtp/qrtKucxXSJkD4ebopFZYP0q1+3Vb2WECWv/T8yQEgKxDxJ7ztO285tAMaYZVR6mM1GgI6CCn8FROtL1w== - rehype-autolink-headings@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/rehype-autolink-headings/-/rehype-autolink-headings-4.0.0.tgz#9d5d78c9fb9c787b40efdc95e99cbeb573133e47" @@ -18699,11 +18360,6 @@ tiny-warning@^1.0.0, tiny-warning@^1.0.3: resolved "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA== -tinycolor2@^1.4.1: - version "1.4.2" - resolved "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.2.tgz#3f6a4d1071ad07676d7fa472e1fac40a719d8803" - integrity sha512-vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA== - tmp@^0.0.33: version "0.0.33" resolved "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"