From d2fe776eff48617f5812c91d80b57ee2aed1ae5f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Jul 2022 01:46:09 +0000 Subject: [PATCH 01/17] chore(deps): bump terser from 4.8.0 to 4.8.1 in /editor Bumps [terser](https://github.com/terser/terser) from 4.8.0 to 4.8.1. - [Release notes](https://github.com/terser/terser/releases) - [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md) - [Commits](https://github.com/terser/terser/commits) --- updated-dependencies: - dependency-name: terser dependency-type: indirect ... Signed-off-by: dependabot[bot] --- editor/package-lock.json | 82 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 74 insertions(+), 8 deletions(-) diff --git a/editor/package-lock.json b/editor/package-lock.json index 581257537..9a22732c1 100644 --- a/editor/package-lock.json +++ b/editor/package-lock.json @@ -1176,6 +1176,55 @@ } } }, + "@jridgewell/gen-mapping": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", + "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "dev": true, + "requires": { + "@jridgewell/set-array": "^1.0.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" + } + }, + "@jridgewell/resolve-uri": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", + "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", + "dev": true + }, + "@jridgewell/set-array": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", + "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", + "dev": true + }, + "@jridgewell/source-map": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", + "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", + "dev": true, + "requires": { + "@jridgewell/gen-mapping": "^0.3.0", + "@jridgewell/trace-mapping": "^0.3.9" + } + }, + "@jridgewell/sourcemap-codec": { + "version": "1.4.14", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", + "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==", + "dev": true + }, + "@jridgewell/trace-mapping": { + "version": "0.3.14", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz", + "integrity": "sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==", + "dev": true, + "requires": { + "@jridgewell/resolve-uri": "^3.0.3", + "@jridgewell/sourcemap-codec": "^1.4.10" + } + }, "@nodelib/fs.scandir": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz", @@ -13187,9 +13236,9 @@ "dev": true }, "terser": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz", - "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==", + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.1.tgz", + "integrity": "sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==", "dev": true, "requires": { "commander": "^2.20.0", @@ -13222,6 +13271,12 @@ "webpack-sources": "^1.4.3" }, "dependencies": { + "acorn": { + "version": "8.7.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz", + "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==", + "dev": true + }, "find-cache-dir": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz", @@ -13317,15 +13372,26 @@ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true }, + "source-map-support": { + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, "terser": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.2.1.tgz", - "integrity": "sha512-/AOtjRtAMNGO0fIF6m8HfcvXTw/2AKpsOzDn36tA5RfhRdeXyb4RvHxJ5Pah7iL6dFkLk+gOnCaNHGwJPl6TrQ==", + "version": "5.14.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz", + "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==", "dev": true, "requires": { + "@jridgewell/source-map": "^0.3.2", + "acorn": "^8.5.0", "commander": "^2.20.0", - "source-map": "~0.6.1", - "source-map-support": "~0.5.12" + "source-map-support": "~0.5.20" } } } From b0fa28e6a05d8de84504262d06c5937162124543 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Jul 2022 18:58:51 +0000 Subject: [PATCH 02/17] chore(deps): bump terser from 4.7.0 to 4.8.1 Bumps [terser](https://github.com/terser/terser) from 4.7.0 to 4.8.1. - [Release notes](https://github.com/terser/terser/releases) - [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md) - [Commits](https://github.com/terser/terser/commits) --- updated-dependencies: - dependency-name: terser dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6bfa0bea7..bc25d7916 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11695,9 +11695,9 @@ "dev": true }, "terser": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-4.7.0.tgz", - "integrity": "sha512-Lfb0RiZcjRDXCC3OSHJpEkxJ9Qeqs6mp2v4jf2MHfy8vGERmVDuvjXdd/EnP5Deme5F2yBRBymKmKHCBg2echw==", + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.1.tgz", + "integrity": "sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==", "dev": true, "requires": { "commander": "^2.20.0", From a61a3b6b3d014edb7a1efae589dfd1d1d29a668e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Jul 2022 08:34:27 +0000 Subject: [PATCH 03/17] chore(deps): bump moment from 2.29.2 to 2.29.4 in /editor Bumps [moment](https://github.com/moment/moment) from 2.29.2 to 2.29.4. - [Release notes](https://github.com/moment/moment/releases) - [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md) - [Commits](https://github.com/moment/moment/compare/2.29.2...2.29.4) --- updated-dependencies: - dependency-name: moment dependency-type: indirect ... Signed-off-by: dependabot[bot] --- editor/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/editor/package-lock.json b/editor/package-lock.json index 9a22732c1..ea0f81db9 100644 --- a/editor/package-lock.json +++ b/editor/package-lock.json @@ -9204,9 +9204,9 @@ } }, "moment": { - "version": "2.29.2", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.2.tgz", - "integrity": "sha512-UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg==", + "version": "2.29.4", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", + "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==", "dev": true }, "move-concurrently": { From 88b38eaaf41c753e5bde83b3dcee3dc3930efddc Mon Sep 17 00:00:00 2001 From: Ovilia Date: Thu, 28 Jul 2022 16:27:31 +0800 Subject: [PATCH 04/17] doc: add doc for graphroam, georoam, and treeroam --- en/api/events.md | 54 +++++++++++++++++++++++++++++++++++++++++++++++- zh/api/events.md | 54 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 106 insertions(+), 2 deletions(-) diff --git a/en/api/events.md b/en/api/events.md index f7a497b48..1ef9c41bb 100644 --- a/en/api/events.md +++ b/en/api/events.md @@ -235,6 +235,59 @@ Event emitted after range is changed in visualMap. } ``` +## graphroam(Event) +Event emitted after [series-graph](option.html#series-graph) is roamed. + +```ts +{ + type: 'graphroam', + seriesId: string, + zoom: number, // zoom ratio of roaming once + originX: number, + originY: number +} +``` + +## georoam(Event) +Event emitted after [geo](option.html#geo) is roamed. + +```ts +{ + type: 'georoam', + componentType: 'geo' | 'series', + seriesId: string, + zoom: number, // zoom ratio of roaming once + originX: number, + originY: number +} +``` + +## treeroam(Event) +Event emitted after [series-tree](option.html#series-tree) is roamed. + +`treeroam` events include two types. One is triggered by panning and the parameters are: + +```ts +{ + type: 'treeroam', + seriesId: string, + dx: number, + dy: number +} +``` + +The other type is triggered by zooming and the parameters are: + +```ts +{ + type: 'treeroam', + seriesId: string, + zoom: number, // zoom ratio of roaming once + originX: number, + originY: number +} +``` + ## timelinechanged(Event) **ACTION:** [timelineChange](~action.timeline.timelineChange) Event emitted after time point in timeline is changed. @@ -540,4 +593,3 @@ Use `dispatchAction` will trigger this event, but user clicking won't trigger it } } ``` - diff --git a/zh/api/events.md b/zh/api/events.md index a91c5f359..4f79f6113 100644 --- a/zh/api/events.md +++ b/zh/api/events.md @@ -233,6 +233,59 @@ chart.on('mouseover', {seriesIndex: 1, name: 'xx'}, function (params) { } ``` +## graphroam(Event) +关系图 [series-graph](option.html#series-graph) 的缩放和平移漫游事件。 + +```ts +{ + type: 'graphroam', + seriesId: string, + zoom: number, // 单次缩放倍数 + originX: number, + originY: number +} +``` + +## georoam(Event) +地理坐标系 [geo](option.html#geo) 的缩放和平移漫游事件。 + +```ts +{ + type: 'georoam', + componentType: 'geo' | 'series', + seriesId: string, + zoom: number, // 单次缩放倍数 + originX: number, + originY: number +} +``` + +## treeroam(Event) +树图 [series-tree](option.html#series-tree) 的缩放和平移漫游事件。 + +`treeroam` 事件包括两种，其中一种是平移，事件参数为： + +```ts +{ + type: 'treeroam', + seriesId: string, + dx: number, + dy: number +} +``` + +另一种是缩放，参数为： + +```ts +{ + type: 'treeroam', + seriesId: string, + zoom: number, // 单次缩放倍数 + originX: number, + originY: number +} +``` + ## timelinechanged(Event) **ACTION:** [timelineChange](~action.timeline.timelineChange) 时间轴中的时间点改变后的事件。 @@ -526,4 +579,3 @@ chart.on('finished', function () { } } ``` - From 77aa1ef86ac0e5153da94082be880dc2b6481e85 Mon Sep 17 00:00:00 2001 From: plainheart Date: Wed, 3 Aug 2022 12:14:36 +0800 Subject: [PATCH 05/17] chore: update dependencies --- build.js | 4 +- editor/src/components/Target.vue | 8 +- editor/src/store/store.js | 12 +- package-lock.json | 19979 ++++++++++++++++++++--------- package.json | 13 +- src/components/LiveExample.vue | 5 +- src/components/SearchResult.vue | 2 +- src/directive/mark.js | 2 +- src/main.js | 5 +- 9 files changed, 13963 insertions(+), 6067 deletions(-) diff --git a/build.js b/build.js index 1d1071cf5..09c0cbc23 100644 --- a/build.js +++ b/build.js @@ -13,7 +13,7 @@ */ const md2json = require('./tool/md2json'); -const {extractDesc, extractOptionKeys} = require('./tool/schemaHelper'); +const {extractDesc} = require('./tool/schemaHelper'); const fs = require('fs'); const fse = require('fs-extra'); const marked = require('marked'); @@ -24,7 +24,7 @@ const argv = require('yargs').argv; const path = require('path'); const assert = require('assert'); const chokidar = require('chokidar'); -const debounce = require('lodash.debounce'); +const {debounce} = require('lodash'); const {getDocJSONPVarNname} = require('./src/shared'); const projectDir = __dirname; diff --git a/editor/src/components/Target.vue b/editor/src/components/Target.vue index c253a758f..63893236d 100644 --- a/editor/src/components/Target.vue +++ b/editor/src/components/Target.vue @@ -90,7 +90,7 @@