diff --git a/examples/sites/demos/mobile-first/app/tabs/show-echarts.vue b/examples/sites/demos/mobile-first/app/tabs/show-echarts.vue index 7bfb22a73..9c5fe60f6 100644 --- a/examples/sites/demos/mobile-first/app/tabs/show-echarts.vue +++ b/examples/sites/demos/mobile-first/app/tabs/show-echarts.vue @@ -10,14 +10,14 @@ diff --git a/packages/vue/src/chart/chart-map/src/map.ts b/packages/vue/src/huicharts/huicharts-map/src/map.ts similarity index 99% rename from packages/vue/src/chart/chart-map/src/map.ts rename to packages/vue/src/huicharts/huicharts-map/src/map.ts index bf78a57fb..586a4b2fd 100644 --- a/packages/vue/src/chart/chart-map/src/map.ts +++ b/packages/vue/src/huicharts/huicharts-map/src/map.ts @@ -1,4 +1,4 @@ -import { getFormatted, getMapJSON, itemPoint, itemLabel, itemContent, isNull } from '@opentiny/vue-chart-core' +import { getFormatted, getMapJSON, itemPoint, itemLabel, itemContent, isNull } from '@opentiny/vue-huicharts-core' const getLegendMap = (args, legendItemStyle) => { const { metrics, legendName, labelMap } = args diff --git a/packages/vue/src/chart/chart-map/src/types.ts b/packages/vue/src/huicharts/huicharts-map/src/types.ts similarity index 100% rename from packages/vue/src/chart/chart-map/src/types.ts rename to packages/vue/src/huicharts/huicharts-map/src/types.ts diff --git a/packages/vue/src/huicharts/huicharts-pie/index.ts b/packages/vue/src/huicharts/huicharts-pie/index.ts new file mode 100644 index 000000000..76872705e --- /dev/null +++ b/packages/vue/src/huicharts/huicharts-pie/index.ts @@ -0,0 +1,8 @@ +import HuiChartsPie from './src/chart-pie.vue' + +HuiChartsPie.install = function (Vue: any) { + Vue.component(HuiChartsPie.name, HuiChartsPie) +} + +export { HuiChartsPie } +export default HuiChartsPie diff --git a/packages/vue/src/chart/chart-candle/package.json b/packages/vue/src/huicharts/huicharts-pie/package.json similarity index 81% rename from packages/vue/src/chart/chart-candle/package.json rename to packages/vue/src/huicharts/huicharts-pie/package.json index 0309cf16d..e26800c71 100644 --- a/packages/vue/src/chart/chart-candle/package.json +++ b/packages/vue/src/huicharts/huicharts-pie/package.json @@ -1,5 +1,5 @@ { - "name": "@opentiny/vue-chart-candle", + "name": "@opentiny/vue-huicharts-pie", "version": "3.18.0", "description": "", "main": "lib/index.js", @@ -12,7 +12,7 @@ "//postversion": "pnpm build" }, "dependencies": { - "@opentiny/vue-chart-core": "workspace:~", + "@opentiny/vue-huicharts-core": "workspace:~", "@opentiny/vue-locale": "workspace:~", "@opentiny/vue-common": "workspace:~" }, diff --git a/packages/vue/src/huicharts/huicharts-pie/src/chart-pie.vue b/packages/vue/src/huicharts/huicharts-pie/src/chart-pie.vue new file mode 100644 index 000000000..ea873778a --- /dev/null +++ b/packages/vue/src/huicharts/huicharts-pie/src/chart-pie.vue @@ -0,0 +1,36 @@ + + + diff --git a/packages/vue/src/chart/chart-pie/src/pie.ts b/packages/vue/src/huicharts/huicharts-pie/src/pie.ts similarity index 99% rename from packages/vue/src/chart/chart-pie/src/pie.ts rename to packages/vue/src/huicharts/huicharts-pie/src/pie.ts index 2507b3c9e..63c4a4962 100644 --- a/packages/vue/src/chart/chart-pie/src/pie.ts +++ b/packages/vue/src/huicharts/huicharts-pie/src/pie.ts @@ -24,7 +24,7 @@ * tooltipVisible boolean 是否显示提示框,true */ -import { deepCopy, getFormatted, itemPoint, itemLabel, itemContent, isDefined } from '@opentiny/vue-chart-core' +import { deepCopy, getFormatted, itemPoint, itemLabel, itemContent, isDefined } from '@opentiny/vue-huicharts-core' const PIE_RADIUS = 100 const RING_RADIUS = [90, 100] diff --git a/packages/vue/src/chart/chart-pie/src/types.ts b/packages/vue/src/huicharts/huicharts-pie/src/types.ts similarity index 100% rename from packages/vue/src/chart/chart-pie/src/types.ts rename to packages/vue/src/huicharts/huicharts-pie/src/types.ts diff --git a/packages/vue/src/huicharts/huicharts-process/index.ts b/packages/vue/src/huicharts/huicharts-process/index.ts new file mode 100644 index 000000000..f879012d4 --- /dev/null +++ b/packages/vue/src/huicharts/huicharts-process/index.ts @@ -0,0 +1,9 @@ +import HuiChartsProcess from './src/chart-process.vue' +import type { VueConstructor } from 'vue' + +HuiChartsProcess.install = function (Vue: VueConstructor) { + Vue.component(HuiChartsProcess.name as string, HuiChartsProcess) +} + +export { HuiChartsProcess } +export default HuiChartsProcess diff --git a/packages/vue/src/huicharts/huicharts-process/package.json b/packages/vue/src/huicharts/huicharts-process/package.json new file mode 100644 index 000000000..5fbfcae69 --- /dev/null +++ b/packages/vue/src/huicharts/huicharts-process/package.json @@ -0,0 +1,19 @@ +{ + "name": "@opentiny/vue-huicharts-process", + "version": "3.18.0", + "description": "", + "main": "lib/index.js", + "module": "index.ts", + "sideEffects": false, + "type": "module", + "devDependencies": {}, + "scripts": { + "build": "pnpm -w build:ui $npm_package_name", + "//postversion": "pnpm build" + }, + "dependencies": { + "@opentiny/vue-huicharts-core": "workspace:~", + "@opentiny/vue-common": "workspace:~" + }, + "license": "MIT" +} \ No newline at end of file diff --git a/packages/vue/src/chart/chart-process/src/chart-process.vue b/packages/vue/src/huicharts/huicharts-process/src/chart-process.vue similarity index 90% rename from packages/vue/src/chart/chart-process/src/chart-process.vue rename to packages/vue/src/huicharts/huicharts-process/src/chart-process.vue index b95b7a6b0..a6df47fcc 100644 --- a/packages/vue/src/chart/chart-process/src/chart-process.vue +++ b/packages/vue/src/huicharts/huicharts-process/src/chart-process.vue @@ -6,7 +6,7 @@ diff --git a/packages/vue/src/chart/chart-radar/src/radar.ts b/packages/vue/src/huicharts/huicharts-radar/src/radar.ts similarity index 98% rename from packages/vue/src/chart/chart-radar/src/radar.ts rename to packages/vue/src/huicharts/huicharts-radar/src/radar.ts index c146c1a89..58c613da4 100644 --- a/packages/vue/src/chart/chart-radar/src/radar.ts +++ b/packages/vue/src/huicharts/huicharts-radar/src/radar.ts @@ -1,4 +1,4 @@ -import { getFormatted, itemPoint, itemLabel, itemContent, isNull } from '@opentiny/vue-chart-core' +import { getFormatted, itemPoint, itemLabel, itemContent, isNull } from '@opentiny/vue-huicharts-core' const getRadarLegend = (rows, dimension, legendName, legendVisible) => { let legendData = rows.map((row) => row[dimension]).filter((i) => i) diff --git a/packages/vue/src/huicharts/huicharts-ring/index.ts b/packages/vue/src/huicharts/huicharts-ring/index.ts new file mode 100644 index 000000000..2a34bf6cd --- /dev/null +++ b/packages/vue/src/huicharts/huicharts-ring/index.ts @@ -0,0 +1,8 @@ +import HuiChartsRing from './src/chart-ring.vue' + +HuiChartsRing.install = function (Vue: any) { + Vue.component(HuiChartsRing.name, HuiChartsRing) +} + +export { HuiChartsRing } +export default HuiChartsRing diff --git a/packages/vue/src/chart/chart-pie/package.json b/packages/vue/src/huicharts/huicharts-ring/package.json similarity index 80% rename from packages/vue/src/chart/chart-pie/package.json rename to packages/vue/src/huicharts/huicharts-ring/package.json index a9028f0ba..fd244ec05 100644 --- a/packages/vue/src/chart/chart-pie/package.json +++ b/packages/vue/src/huicharts/huicharts-ring/package.json @@ -1,5 +1,5 @@ { - "name": "@opentiny/vue-chart-pie", + "name": "@opentiny/vue-huicharts-ring", "version": "3.18.0", "description": "", "main": "lib/index.js", @@ -12,7 +12,7 @@ "//postversion": "pnpm build" }, "dependencies": { - "@opentiny/vue-chart-core": "workspace:~", + "@opentiny/vue-huicharts-core": "workspace:~", "@opentiny/vue-locale": "workspace:~", "@opentiny/vue-common": "workspace:~" }, diff --git a/packages/vue/src/huicharts/huicharts-ring/src/chart-ring.vue b/packages/vue/src/huicharts/huicharts-ring/src/chart-ring.vue new file mode 100644 index 000000000..2829a5750 --- /dev/null +++ b/packages/vue/src/huicharts/huicharts-ring/src/chart-ring.vue @@ -0,0 +1,35 @@ + + + diff --git a/packages/vue/src/chart/chart-ring/src/ring.ts b/packages/vue/src/huicharts/huicharts-ring/src/ring.ts similarity index 99% rename from packages/vue/src/chart/chart-ring/src/ring.ts rename to packages/vue/src/huicharts/huicharts-ring/src/ring.ts index 2507b3c9e..63c4a4962 100644 --- a/packages/vue/src/chart/chart-ring/src/ring.ts +++ b/packages/vue/src/huicharts/huicharts-ring/src/ring.ts @@ -24,7 +24,7 @@ * tooltipVisible boolean 是否显示提示框,true */ -import { deepCopy, getFormatted, itemPoint, itemLabel, itemContent, isDefined } from '@opentiny/vue-chart-core' +import { deepCopy, getFormatted, itemPoint, itemLabel, itemContent, isDefined } from '@opentiny/vue-huicharts-core' const PIE_RADIUS = 100 const RING_RADIUS = [90, 100] diff --git a/packages/vue/src/chart/chart-ring/src/types.ts b/packages/vue/src/huicharts/huicharts-ring/src/types.ts similarity index 100% rename from packages/vue/src/chart/chart-ring/src/types.ts rename to packages/vue/src/huicharts/huicharts-ring/src/types.ts diff --git a/packages/vue/src/huicharts/huicharts-sankey/index.ts b/packages/vue/src/huicharts/huicharts-sankey/index.ts new file mode 100644 index 000000000..96512e4f2 --- /dev/null +++ b/packages/vue/src/huicharts/huicharts-sankey/index.ts @@ -0,0 +1,8 @@ +import HuiChartsSankey from './src/chart-sankey.vue' + +HuiChartsSankey.install = function (Vue: any) { + Vue.component(HuiChartsSankey.name, HuiChartsSankey) +} + +export { HuiChartsSankey } +export default HuiChartsSankey diff --git a/packages/vue/src/huicharts/huicharts-sankey/package.json b/packages/vue/src/huicharts/huicharts-sankey/package.json new file mode 100644 index 000000000..dbd6df37f --- /dev/null +++ b/packages/vue/src/huicharts/huicharts-sankey/package.json @@ -0,0 +1,19 @@ +{ + "name": "@opentiny/vue-huicharts-sankey", + "version": "3.18.0", + "description": "", + "main": "lib/index.js", + "module": "index.ts", + "sideEffects": false, + "type": "module", + "devDependencies": {}, + "scripts": { + "build": "pnpm -w build:ui $npm_package_name", + "//postversion": "pnpm build" + }, + "dependencies": { + "@opentiny/vue-huicharts-core": "workspace:~", + "@opentiny/vue-common": "workspace:~" + }, + "license": "MIT" +} \ No newline at end of file diff --git a/packages/vue/src/huicharts/huicharts-sankey/src/chart-sankey.vue b/packages/vue/src/huicharts/huicharts-sankey/src/chart-sankey.vue new file mode 100644 index 000000000..ebbd6e110 --- /dev/null +++ b/packages/vue/src/huicharts/huicharts-sankey/src/chart-sankey.vue @@ -0,0 +1,37 @@ + + + diff --git a/packages/vue/src/chart/chart-sankey/src/sankey.ts b/packages/vue/src/huicharts/huicharts-sankey/src/sankey.ts similarity index 98% rename from packages/vue/src/chart/chart-sankey/src/sankey.ts rename to packages/vue/src/huicharts/huicharts-sankey/src/sankey.ts index bf15d5f96..d7b67e09f 100644 --- a/packages/vue/src/chart/chart-sankey/src/sankey.ts +++ b/packages/vue/src/huicharts/huicharts-sankey/src/sankey.ts @@ -1,4 +1,4 @@ -import { getFormatted, itemPoint, itemLabel, itemContent, isNull } from '@opentiny/vue-chart-core' +import { getFormatted, itemPoint, itemLabel, itemContent, isNull } from '@opentiny/vue-huicharts-core' const getTooltip = (args) => { const { digit, itemDataType, linksDataType } = args diff --git a/packages/vue/src/chart/chart-sankey/src/types.ts b/packages/vue/src/huicharts/huicharts-sankey/src/types.ts similarity index 100% rename from packages/vue/src/chart/chart-sankey/src/types.ts rename to packages/vue/src/huicharts/huicharts-sankey/src/types.ts diff --git a/packages/vue/src/huicharts/huicharts-scatter/index.ts b/packages/vue/src/huicharts/huicharts-scatter/index.ts new file mode 100644 index 000000000..462325ecf --- /dev/null +++ b/packages/vue/src/huicharts/huicharts-scatter/index.ts @@ -0,0 +1,8 @@ +import HuiChartsScatter from './src/chart-scatter.vue' + +HuiChartsScatter.install = function (Vue: any) { + Vue.component(HuiChartsScatter.name, HuiChartsScatter) +} + +export { HuiChartsScatter } +export default HuiChartsScatter diff --git a/packages/vue/src/huicharts/huicharts-scatter/package.json b/packages/vue/src/huicharts/huicharts-scatter/package.json new file mode 100644 index 000000000..ccfd553c0 --- /dev/null +++ b/packages/vue/src/huicharts/huicharts-scatter/package.json @@ -0,0 +1,19 @@ +{ + "name": "@opentiny/vue-huicharts-scatter", + "version": "3.18.0", + "description": "", + "main": "lib/index.js", + "module": "index.ts", + "sideEffects": false, + "type": "module", + "devDependencies": {}, + "scripts": { + "build": "pnpm -w build:ui $npm_package_name", + "//postversion": "pnpm build" + }, + "dependencies": { + "@opentiny/vue-huicharts-core": "workspace:~", + "@opentiny/vue-common": "workspace:~" + }, + "license": "MIT" +} \ No newline at end of file diff --git a/packages/vue/src/huicharts/huicharts-scatter/src/chart-scatter.vue b/packages/vue/src/huicharts/huicharts-scatter/src/chart-scatter.vue new file mode 100644 index 000000000..71dfbd115 --- /dev/null +++ b/packages/vue/src/huicharts/huicharts-scatter/src/chart-scatter.vue @@ -0,0 +1,35 @@ + + + diff --git a/packages/vue/src/chart/chart-scatter/src/scatter.ts b/packages/vue/src/huicharts/huicharts-scatter/src/scatter.ts similarity index 99% rename from packages/vue/src/chart/chart-scatter/src/scatter.ts rename to packages/vue/src/huicharts/huicharts-scatter/src/scatter.ts index 569fc0a6c..e7e375a61 100644 --- a/packages/vue/src/chart/chart-scatter/src/scatter.ts +++ b/packages/vue/src/huicharts/huicharts-scatter/src/scatter.ts @@ -23,7 +23,7 @@ * itemStyle 图形样式。series-scatter. itemStyle */ -import { getFormatted, itemLabel, itemPoint, itemContent, isDefined } from '@opentiny/vue-chart-core' +import { getFormatted, itemLabel, itemPoint, itemContent, isDefined } from '@opentiny/vue-huicharts-core' const getLegend = (args) => { const { legendVisible, legendName } = args diff --git a/packages/vue/src/chart/chart-scatter/src/types.ts b/packages/vue/src/huicharts/huicharts-scatter/src/types.ts similarity index 100% rename from packages/vue/src/chart/chart-scatter/src/types.ts rename to packages/vue/src/huicharts/huicharts-scatter/src/types.ts diff --git a/packages/vue/src/huicharts/huicharts-sunburst/index.ts b/packages/vue/src/huicharts/huicharts-sunburst/index.ts new file mode 100644 index 000000000..fb442cc3e --- /dev/null +++ b/packages/vue/src/huicharts/huicharts-sunburst/index.ts @@ -0,0 +1,9 @@ +import HuiChartsSunburst from './src/chart-sunburst.vue' + +HuiChartsSunburst.install = function (Vue: any) { + Vue.component(HuiChartsSunburst.name, HuiChartsSunburst) +} + +export { HuiChartsSunburst } + +export default HuiChartsSunburst diff --git a/packages/vue/src/huicharts/huicharts-sunburst/package.json b/packages/vue/src/huicharts/huicharts-sunburst/package.json new file mode 100644 index 000000000..14efe2020 --- /dev/null +++ b/packages/vue/src/huicharts/huicharts-sunburst/package.json @@ -0,0 +1,19 @@ +{ + "name": "@opentiny/vue-huicharts-sunburst", + "version": "3.18.0", + "description": "", + "main": "lib/index.js", + "module": "index.ts", + "sideEffects": false, + "type": "module", + "devDependencies": {}, + "scripts": { + "build": "pnpm -w build:ui $npm_package_name", + "//postversion": "pnpm build" + }, + "dependencies": { + "@opentiny/vue-huicharts-core": "workspace:~", + "@opentiny/vue-common": "workspace:~" + }, + "license": "MIT" +} \ No newline at end of file diff --git a/packages/vue/src/huicharts/huicharts-sunburst/src/chart-sunburst.vue b/packages/vue/src/huicharts/huicharts-sunburst/src/chart-sunburst.vue new file mode 100644 index 000000000..9f2c2f1c5 --- /dev/null +++ b/packages/vue/src/huicharts/huicharts-sunburst/src/chart-sunburst.vue @@ -0,0 +1,37 @@ + + + diff --git a/packages/vue/src/chart/chart-sunburst/src/sunburst.ts b/packages/vue/src/huicharts/huicharts-sunburst/src/sunburst.ts similarity index 97% rename from packages/vue/src/chart/chart-sunburst/src/sunburst.ts rename to packages/vue/src/huicharts/huicharts-sunburst/src/sunburst.ts index 6b74a7b7f..7faf00c03 100644 --- a/packages/vue/src/chart/chart-sunburst/src/sunburst.ts +++ b/packages/vue/src/huicharts/huicharts-sunburst/src/sunburst.ts @@ -1,4 +1,4 @@ -import { itemPoint, itemLabel, itemContent } from '@opentiny/vue-chart-core' +import { itemPoint, itemLabel, itemContent } from '@opentiny/vue-huicharts-core' const getTooltip = () => ({ trigger: 'item', diff --git a/packages/vue/src/chart/chart-sunburst/src/types.ts b/packages/vue/src/huicharts/huicharts-sunburst/src/types.ts similarity index 100% rename from packages/vue/src/chart/chart-sunburst/src/types.ts rename to packages/vue/src/huicharts/huicharts-sunburst/src/types.ts diff --git a/packages/vue/src/huicharts/huicharts-tree/index.ts b/packages/vue/src/huicharts/huicharts-tree/index.ts new file mode 100644 index 000000000..49c220dd8 --- /dev/null +++ b/packages/vue/src/huicharts/huicharts-tree/index.ts @@ -0,0 +1,9 @@ +import HuiChartsTree from './src/chart-tree.vue' + +HuiChartsTree.install = function (Vue: any) { + Vue.component(HuiChartsTree.name, HuiChartsTree) +} + +export { HuiChartsTree } + +export default HuiChartsTree diff --git a/packages/vue/src/chart/chart-bar/package.json b/packages/vue/src/huicharts/huicharts-tree/package.json similarity index 79% rename from packages/vue/src/chart/chart-bar/package.json rename to packages/vue/src/huicharts/huicharts-tree/package.json index 4fea76890..96b262803 100644 --- a/packages/vue/src/chart/chart-bar/package.json +++ b/packages/vue/src/huicharts/huicharts-tree/package.json @@ -1,5 +1,5 @@ { - "name": "@opentiny/vue-chart-bar", + "name": "@opentiny/vue-huicharts-tree", "version": "3.18.0", "description": "", "main": "lib/index.js", @@ -12,7 +12,7 @@ "//postversion": "pnpm build" }, "dependencies": { - "@opentiny/vue-chart-core": "workspace:~", + "@opentiny/vue-huicharts-core": "workspace:~", "@opentiny/vue-common": "workspace:~" }, "license": "MIT" diff --git a/packages/vue/src/huicharts/huicharts-tree/src/chart-tree.vue b/packages/vue/src/huicharts/huicharts-tree/src/chart-tree.vue new file mode 100644 index 000000000..dedf81f2c --- /dev/null +++ b/packages/vue/src/huicharts/huicharts-tree/src/chart-tree.vue @@ -0,0 +1,37 @@ + + + diff --git a/packages/vue/src/chart/chart-tree/src/tree.ts b/packages/vue/src/huicharts/huicharts-tree/src/tree.ts similarity index 96% rename from packages/vue/src/chart/chart-tree/src/tree.ts rename to packages/vue/src/huicharts/huicharts-tree/src/tree.ts index 3bcc45c0f..e35d6267c 100644 --- a/packages/vue/src/chart/chart-tree/src/tree.ts +++ b/packages/vue/src/huicharts/huicharts-tree/src/tree.ts @@ -1,4 +1,4 @@ -import { isObject, itemLabel, itemContent } from '@opentiny/vue-chart-core' +import { isObject, itemLabel, itemContent } from '@opentiny/vue-huicharts-core' const getTreeLegend = (args) => { const { dimension, rows } = args @@ -73,5 +73,5 @@ export const tree = (columns, rows, settings, extra) => { name: item.name, data: item.value })) - return { data, series, legend, tooltip, tipHtml: tooltip.formatter, type: 'LineTreeChart', initialTreeDepth: 3 } + return { data, series, legend, tooltip, tipHtml: tooltip.formatter, type: 'LineTreeHuiCharts', initialTreeDepth: 3 } } diff --git a/packages/vue/src/chart/chart-tree/src/types.ts b/packages/vue/src/huicharts/huicharts-tree/src/types.ts similarity index 100% rename from packages/vue/src/chart/chart-tree/src/types.ts rename to packages/vue/src/huicharts/huicharts-tree/src/types.ts diff --git a/packages/vue/src/huicharts/huicharts-waterfall/index.ts b/packages/vue/src/huicharts/huicharts-waterfall/index.ts new file mode 100644 index 000000000..ea5f061c3 --- /dev/null +++ b/packages/vue/src/huicharts/huicharts-waterfall/index.ts @@ -0,0 +1,8 @@ +import HuiChartsWaterfall from './src/chart-waterfall.vue' + +HuiChartsWaterfall.install = function (Vue: any) { + Vue.component(HuiChartsWaterfall.name, HuiChartsWaterfall) +} + +export { HuiChartsWaterfall } +export default HuiChartsWaterfall diff --git a/packages/vue/src/chart/chart-waterfall/package.json b/packages/vue/src/huicharts/huicharts-waterfall/package.json similarity index 80% rename from packages/vue/src/chart/chart-waterfall/package.json rename to packages/vue/src/huicharts/huicharts-waterfall/package.json index 0b6f799bd..319920abd 100644 --- a/packages/vue/src/chart/chart-waterfall/package.json +++ b/packages/vue/src/huicharts/huicharts-waterfall/package.json @@ -1,5 +1,5 @@ { - "name": "@opentiny/vue-chart-waterfall", + "name": "@opentiny/vue-huicharts-waterfall", "version": "3.18.0", "description": "", "main": "lib/index.js", @@ -12,7 +12,7 @@ "//postversion": "pnpm build" }, "dependencies": { - "@opentiny/vue-chart-core": "workspace:~", + "@opentiny/vue-huicharts-core": "workspace:~", "@opentiny/vue-locale": "workspace:~", "@opentiny/vue-common": "workspace:~" }, diff --git a/packages/vue/src/huicharts/huicharts-waterfall/src/chart-waterfall.vue b/packages/vue/src/huicharts/huicharts-waterfall/src/chart-waterfall.vue new file mode 100644 index 000000000..434c46691 --- /dev/null +++ b/packages/vue/src/huicharts/huicharts-waterfall/src/chart-waterfall.vue @@ -0,0 +1,38 @@ + + + diff --git a/packages/vue/src/chart/chart-waterfall/src/types.ts b/packages/vue/src/huicharts/huicharts-waterfall/src/types.ts similarity index 100% rename from packages/vue/src/chart/chart-waterfall/src/types.ts rename to packages/vue/src/huicharts/huicharts-waterfall/src/types.ts diff --git a/packages/vue/src/chart/chart-waterfall/src/waterfall.ts b/packages/vue/src/huicharts/huicharts-waterfall/src/waterfall.ts similarity index 99% rename from packages/vue/src/chart/chart-waterfall/src/waterfall.ts rename to packages/vue/src/huicharts/huicharts-waterfall/src/waterfall.ts index 78044b564..a22e30150 100644 --- a/packages/vue/src/chart/chart-waterfall/src/waterfall.ts +++ b/packages/vue/src/huicharts/huicharts-waterfall/src/waterfall.ts @@ -11,7 +11,7 @@ * labelMap 坐标轴名称映射, 设置别名 */ -import { itemLabel, itemContent, getFormatted } from '@opentiny/vue-chart-core' +import { itemLabel, itemContent, getFormatted } from '@opentiny/vue-huicharts-core' const getWaterfallTooltip = (dataType, digit) => { const formatter = (items) => { diff --git a/packages/vue/src/huicharts/huicharts-wordcloud/index.ts b/packages/vue/src/huicharts/huicharts-wordcloud/index.ts new file mode 100644 index 000000000..c33546e50 --- /dev/null +++ b/packages/vue/src/huicharts/huicharts-wordcloud/index.ts @@ -0,0 +1,8 @@ +import HuiChartsWordcloud from './src/chart-wordcloud.vue' + +HuiChartsWordcloud.install = function (Vue: any) { + Vue.component(HuiChartsWordcloud.name, HuiChartsWordcloud) +} + +export { HuiChartsWordcloud } +export default HuiChartsWordcloud diff --git a/packages/vue/src/chart/chart-wordcloud/package.json b/packages/vue/src/huicharts/huicharts-wordcloud/package.json similarity index 79% rename from packages/vue/src/chart/chart-wordcloud/package.json rename to packages/vue/src/huicharts/huicharts-wordcloud/package.json index ece1db2f3..bc717b6b0 100644 --- a/packages/vue/src/chart/chart-wordcloud/package.json +++ b/packages/vue/src/huicharts/huicharts-wordcloud/package.json @@ -1,5 +1,5 @@ { - "name": "@opentiny/vue-chart-wordcloud", + "name": "@opentiny/vue-huicharts-wordcloud", "version": "3.18.0", "description": "", "main": "lib/index.js", @@ -12,7 +12,7 @@ "//postversion": "pnpm build" }, "dependencies": { - "@opentiny/vue-chart-core": "workspace:~", + "@opentiny/vue-huicharts-core": "workspace:~", "echarts-wordcloud": "2.0.0", "@opentiny/vue-common": "workspace:~" }, diff --git a/packages/vue/src/huicharts/huicharts-wordcloud/src/chart-wordcloud.vue b/packages/vue/src/huicharts/huicharts-wordcloud/src/chart-wordcloud.vue new file mode 100644 index 000000000..bd94c205b --- /dev/null +++ b/packages/vue/src/huicharts/huicharts-wordcloud/src/chart-wordcloud.vue @@ -0,0 +1,37 @@ + + + diff --git a/packages/vue/src/chart/chart-wordcloud/src/types.ts b/packages/vue/src/huicharts/huicharts-wordcloud/src/types.ts similarity index 100% rename from packages/vue/src/chart/chart-wordcloud/src/types.ts rename to packages/vue/src/huicharts/huicharts-wordcloud/src/types.ts diff --git a/packages/vue/src/chart/chart-wordcloud/src/wordcloud.ts b/packages/vue/src/huicharts/huicharts-wordcloud/src/wordcloud.ts similarity index 96% rename from packages/vue/src/chart/chart-wordcloud/src/wordcloud.ts rename to packages/vue/src/huicharts/huicharts-wordcloud/src/wordcloud.ts index 7d23ffe85..5ce4ff2f3 100644 --- a/packages/vue/src/chart/chart-wordcloud/src/wordcloud.ts +++ b/packages/vue/src/huicharts/huicharts-wordcloud/src/wordcloud.ts @@ -7,7 +7,7 @@ * color 词云图字体颜色 Array[String], String, Function 默认为 "rgb(Math.round(Math.random * 160), Math.round(Math.random * 160), Math.round(Math.random * 160))" */ -import { itemLabel, itemContent } from '@opentiny/vue-chart-core' +import { itemLabel, itemContent } from '@opentiny/vue-huicharts-core' const getTooltip = (args) => { const { tooltipFormatter } = args diff --git a/packages/vue/src/huicharts/index.ts b/packages/vue/src/huicharts/index.ts new file mode 100644 index 000000000..a840d5b2f --- /dev/null +++ b/packages/vue/src/huicharts/index.ts @@ -0,0 +1,16 @@ +import HuiCharts from './src/index' +import { version } from './package.json' + +HuiCharts.install = function (Vue) { + Vue.component(HuiCharts.name, HuiCharts) +} + +HuiCharts.version = version + +if (process.env.BUILD_TARGET === 'runtime') { + if (typeof window !== 'undefined' && window.Vue) { + HuiCharts.install(window.Vue) + } +} + +export default HuiCharts diff --git a/packages/vue/src/huicharts/package.json b/packages/vue/src/huicharts/package.json new file mode 100644 index 000000000..4df732580 --- /dev/null +++ b/packages/vue/src/huicharts/package.json @@ -0,0 +1,52 @@ +{ + "name": "@opentiny/vue-huicharts", + "version": "3.18.0", + "description": "", + "main": "lib/index.js", + "module": "index.ts", + "files": [ + "index.js", + "lib", + "index.d.ts", + "src" + ], + "sideEffects": false, + "type": "module", + "devDependencies": { + "@opentiny-internal/vue-test-utils": "workspace:*", + "vitest": "^0.31.0" + }, + "scripts": { + "build": "pnpm -w build:ui $npm_package_name", + "//postversion": "pnpm build" + }, + "dependencies": { + "@opentiny/vue-huicharts-bar": "workspace:~", + "@opentiny/vue-huicharts-core": "workspace:~", + "@opentiny/vue-huicharts-histogram": "workspace:~", + "@opentiny/vue-huicharts-line": "workspace:~", + "@opentiny/vue-huicharts-pie": "workspace:~", + "@opentiny/vue-huicharts-radar": "workspace:~", + "@opentiny/vue-huicharts-ring": "workspace:~", + "@opentiny/vue-huicharts-waterfall": "workspace:~", + "@opentiny/vue-huicharts-funnel": "workspace:~", + "@opentiny/vue-huicharts-gauge": "workspace:~", + "@opentiny/vue-huicharts-scatter": "workspace:~", + "@opentiny/vue-huicharts-tree": "workspace:~", + "@opentiny/vue-huicharts-sankey": "workspace:~", + "@opentiny/vue-huicharts-candle": "workspace:~", + "@opentiny/vue-huicharts-heatmap": "workspace:~", + "@opentiny/vue-huicharts-liquidfill": "workspace:~", + "@opentiny/vue-huicharts-wordcloud": "workspace:~", + "@opentiny/vue-huicharts-map": "workspace:~", + "@opentiny/vue-huicharts-boxplot": "workspace:~", + "@opentiny/vue-huicharts-amap": "workspace:~", + "@opentiny/vue-huicharts-bmap": "workspace:~", + "@opentiny/vue-huicharts-graph": "workspace:~", + "@opentiny/vue-huicharts-sunburst": "workspace:~", + "@opentiny/vue-common": "workspace:~", + "@opentiny/vue-locale": "workspace:~", + "@opentiny/vue-theme": "workspace:~" + }, + "license": "MIT" +} \ No newline at end of file diff --git a/packages/vue/src/huicharts/src/index.ts b/packages/vue/src/huicharts/src/index.ts new file mode 100644 index 000000000..4c21a763c --- /dev/null +++ b/packages/vue/src/huicharts/src/index.ts @@ -0,0 +1,104 @@ +import { HuiChartsRing } from '../huicharts-ring' +import { HuiChartsPie } from '../huicharts-pie' +import { HuiChartsBar } from '../huicharts-bar' +import { HuiChartsHistogram } from '../huicharts-histogram' +import { HuiChartsRadar } from '../huicharts-radar' +import { HuiChartsLine } from '../huicharts-line' + +import { AutonaviMap } from '../huicharts-amap' +import { BaiduMap } from '../huicharts-bmap' +import { HuiChartsBoxplot } from '../huicharts-boxplot' +import { HuiChartsCandle } from '../huicharts-candle' +import { HuiChartsFunnel } from '../huicharts-funnel' +import { HuiChartsGauge } from '../huicharts-gauge' +import { HuiChartsGraph } from '../huicharts-graph' +import { HuiChartsHeatmap } from '../huicharts-heatmap' +import { HuiChartsLiquidfill } from '../huicharts-liquidfill' +import { HuiChartsMap } from '../huicharts-map' + +import { HuiChartsSankey } from '../huicharts-sankey' +import { HuiChartsScatter } from '../huicharts-scatter' +import { HuiChartsSunburst } from '../huicharts-sunburst' +import { HuiChartsTree } from '../huicharts-tree' +import { HuiChartsWaterfall } from '../huicharts-waterfall' +import { HuiChartsWordcloud } from '../huicharts-wordcloud' + +import Core from '@opentiny/vue-huicharts-core' + +import { $prefix, defineComponent, h } from '@opentiny/vue-common' + +export default defineComponent({ + name: $prefix + 'HuiCharts', + props: { + ...Core.props, + type: { + type: String + } + }, + data() { + this.chartLib = { + bar: HuiChartsBar, + histogram: HuiChartsHistogram, + line: HuiChartsLine, + pie: HuiChartsPie, + ring: HuiChartsRing, + radar: HuiChartsRadar, + autonaviMap: AutonaviMap, + baiduMap: BaiduMap, + boxplot: HuiChartsBoxplot, + candle: HuiChartsCandle, + funnel: HuiChartsFunnel, + gauge: HuiChartsGauge, + graph: HuiChartsGraph, + heatmap: HuiChartsHeatmap, + liquidfill: HuiChartsLiquidfill, + map: HuiChartsMap, + sankey: HuiChartsSankey, + scatter: HuiChartsScatter, + sunburst: HuiChartsSunburst, + tree: HuiChartsTree, + waterfall: HuiChartsWaterfall, + wordcloud: HuiChartsWordcloud + } + return {} + }, + methods: { + ready(val) { + this.$emit('ready', val) + }, + readyOnce(val) { + this.$emit('readyOnce', val) + }, + handleColor(val) { + this.$emit('handle-color', val) + }, + ...Core.methods + }, + render() { + return h( + 'div', + { + style: { + width: this.width, + height: this.height, + position: 'relative' + } + }, + [ + h(this.chartLib[this.settings.type || this.type], { + props: { + ...this.$props + }, + on: { + ready: this.ready, + readyOnce: this.readyOnce, + handleColor: this.handleColor + } + }), + + // eslint-disable-next-line vue/require-slots-as-functions + this.$slots.default + ] + ) + } +}) diff --git a/tsconfig.solid.json b/tsconfig.solid.json index f8c5e211d..cd7e82b0a 100644 --- a/tsconfig.solid.json +++ b/tsconfig.solid.json @@ -5,16 +5,36 @@ "noImplicitAny": false, "baseUrl": ".", "paths": { - "@opentiny/vue-autonavi-map": ["packages/vue/src/chart/autonavi-map"], - "@opentiny/vue-baidu-map": ["packages/vue/src/chart/baidu-map"], - "@opentiny/vue-chart-*": ["packages/vue/src/chart/chart-*"], - "@opentiny/vue-*": ["packages/vue-*", "packages/vue/src/*"], - "@opentiny/vue-renderless/types*": ["packages/renderless/types*"], - "@opentiny/vue-renderless*": ["packages/renderless/src*"], - "virtual:common/adapter/vue": ["packages/vue-common/src/adapter/vue3/index.ts"], - "virtual:locale/vue": ["packages/vue-locale/src/vue3/index.ts"] + "@opentiny/vue-huicharts-amap": [ + "packages/vue/src/chart/autonavi-map" + ], + "@opentiny/vue-huicharts-bmap": [ + "packages/vue/src/chart/baidu-map" + ], + "@opentiny/vue-huicharts-*": [ + "packages/vue/src/chart/chart-*" + ], + "@opentiny/vue-*": [ + "packages/vue-*", + "packages/vue/src/*" + ], + "@opentiny/vue-renderless/types*": [ + "packages/renderless/types*" + ], + "@opentiny/vue-renderless*": [ + "packages/renderless/src*" + ], + "virtual:common/adapter/vue": [ + "packages/vue-common/src/adapter/vue3/index.ts" + ], + "virtual:locale/vue": [ + "packages/vue-locale/src/vue3/index.ts" + ] }, - "types": ["node", "vite/client"] + "types": [ + "node", + "vite/client" + ] }, "vueCompilerOptions": { "target": 3 @@ -26,5 +46,9 @@ "examples/vue3/shims-app.d.ts", "examples/vue3/shims-vue.d.ts" ], - "exclude": ["**/node_modules", "**/dist*", "**/*.md"] -} + "exclude": [ + "**/node_modules", + "**/dist*", + "**/*.md" + ] +} \ No newline at end of file diff --git a/tsconfig.vue2.7.json b/tsconfig.vue2.7.json index 44e008795..e89137591 100644 --- a/tsconfig.vue2.7.json +++ b/tsconfig.vue2.7.json @@ -5,16 +5,36 @@ "noImplicitAny": false, "baseUrl": ".", "paths": { - "@opentiny/vue-autonavi-map": ["packages/vue/src/chart/autonavi-map"], - "@opentiny/vue-baidu-map": ["packages/vue/src/chart/baidu-map"], - "@opentiny/vue-chart-*": ["packages/vue/src/chart/chart-*"], - "@opentiny/vue-*": ["packages/vue-*", "packages/vue/src/*"], - "@opentiny/vue-renderless/types*": ["packages/renderless/types*"], - "@opentiny/vue-renderless*": ["packages/renderless/src*"], - "virtual:common/adapter/vue": ["packages/vue-common/src/adapter/vue2.7/index.ts"], - "virtual:locale/vue": ["packages/vue-locale/src/vue2.7/index.ts"] + "@opentiny/vue-huicharts-amap": [ + "packages/vue/src/chart/autonavi-map" + ], + "@opentiny/vue-huicharts-bmap": [ + "packages/vue/src/chart/baidu-map" + ], + "@opentiny/vue-huicharts-*": [ + "packages/vue/src/chart/chart-*" + ], + "@opentiny/vue-*": [ + "packages/vue-*", + "packages/vue/src/*" + ], + "@opentiny/vue-renderless/types*": [ + "packages/renderless/types*" + ], + "@opentiny/vue-renderless*": [ + "packages/renderless/src*" + ], + "virtual:common/adapter/vue": [ + "packages/vue-common/src/adapter/vue2.7/index.ts" + ], + "virtual:locale/vue": [ + "packages/vue-locale/src/vue2.7/index.ts" + ] }, - "types": ["node", "vite/client"] + "types": [ + "node", + "vite/client" + ] }, "vueCompilerOptions": { "target": 2.7 @@ -26,5 +46,9 @@ "examples/vue2.7/shims-app.d.ts", "examples/vue2.7/shims-vue.d.ts" ], - "exclude": ["**/node_modules", "**/dist*", "**/*.md"] -} + "exclude": [ + "**/node_modules", + "**/dist*", + "**/*.md" + ] +} \ No newline at end of file diff --git a/tsconfig.vue2.json b/tsconfig.vue2.json index 75a77145d..8346d2726 100644 --- a/tsconfig.vue2.json +++ b/tsconfig.vue2.json @@ -5,16 +5,36 @@ "noImplicitAny": false, "baseUrl": ".", "paths": { - "@opentiny/vue-autonavi-map": ["packages/vue/src/chart/autonavi-map"], - "@opentiny/vue-baidu-map": ["packages/vue/src/chart/baidu-map"], - "@opentiny/vue-chart-*": ["packages/vue/src/chart/chart-*"], - "@opentiny/vue-*": ["packages/vue-*", "packages/vue/src/*"], - "@opentiny/vue-renderless/types*": ["packages/renderless/types*"], - "@opentiny/vue-renderless*": ["packages/renderless/src*"], - "virtual:common/adapter/vue": ["packages/vue-common/src/adapter/vue2/index.ts"], - "virtual:locale/vue": ["packages/vue-locale/src/vue2/index.ts"] + "@opentiny/vue-huicharts-amap": [ + "packages/vue/src/chart/autonavi-map" + ], + "@opentiny/vue-huicharts-bmap": [ + "packages/vue/src/chart/baidu-map" + ], + "@opentiny/vue-huicharts-*": [ + "packages/vue/src/chart/chart-*" + ], + "@opentiny/vue-*": [ + "packages/vue-*", + "packages/vue/src/*" + ], + "@opentiny/vue-renderless/types*": [ + "packages/renderless/types*" + ], + "@opentiny/vue-renderless*": [ + "packages/renderless/src*" + ], + "virtual:common/adapter/vue": [ + "packages/vue-common/src/adapter/vue2/index.ts" + ], + "virtual:locale/vue": [ + "packages/vue-locale/src/vue2/index.ts" + ] }, - "types": ["node", "vite/client"] + "types": [ + "node", + "vite/client" + ] }, "vueCompilerOptions": { "target": 2 @@ -26,5 +46,9 @@ "examples/vue2/shims-app.d.ts", "examples/vue2/shims-vue.d.ts" ], - "exclude": ["**/node_modules", "**/dist*", "**/*.md"] -} + "exclude": [ + "**/node_modules", + "**/dist*", + "**/*.md" + ] +} \ No newline at end of file diff --git a/tsconfig.vue3.json b/tsconfig.vue3.json index f8c5e211d..be0622864 100644 --- a/tsconfig.vue3.json +++ b/tsconfig.vue3.json @@ -5,16 +5,36 @@ "noImplicitAny": false, "baseUrl": ".", "paths": { - "@opentiny/vue-autonavi-map": ["packages/vue/src/chart/autonavi-map"], - "@opentiny/vue-baidu-map": ["packages/vue/src/chart/baidu-map"], - "@opentiny/vue-chart-*": ["packages/vue/src/chart/chart-*"], - "@opentiny/vue-*": ["packages/vue-*", "packages/vue/src/*"], - "@opentiny/vue-renderless/types*": ["packages/renderless/types*"], - "@opentiny/vue-renderless*": ["packages/renderless/src*"], - "virtual:common/adapter/vue": ["packages/vue-common/src/adapter/vue3/index.ts"], - "virtual:locale/vue": ["packages/vue-locale/src/vue3/index.ts"] + "@opentiny/vue-huicharts-amap": [ + "packages/vue/src/huicharts/huicharts-amap" + ], + "@opentiny/vue-huicharts-bmap": [ + "packages/vue/src/huicharts/huicharts-bmap" + ], + "@opentiny/vue-huicharts-*": [ + "packages/vue/src/huicharts/chart-*" + ], + "@opentiny/vue-*": [ + "packages/vue-*", + "packages/vue/src/*" + ], + "@opentiny/vue-renderless/types*": [ + "packages/renderless/types*" + ], + "@opentiny/vue-renderless*": [ + "packages/renderless/src*" + ], + "virtual:common/adapter/vue": [ + "packages/vue-common/src/adapter/vue3/index.ts" + ], + "virtual:locale/vue": [ + "packages/vue-locale/src/vue3/index.ts" + ] }, - "types": ["node", "vite/client"] + "types": [ + "node", + "vite/client" + ] }, "vueCompilerOptions": { "target": 3 @@ -26,5 +46,9 @@ "examples/vue3/shims-app.d.ts", "examples/vue3/shims-vue.d.ts" ], - "exclude": ["**/node_modules", "**/dist*", "**/*.md"] -} + "exclude": [ + "**/node_modules", + "**/dist*", + "**/*.md" + ] +} \ No newline at end of file