diff --git a/package-lock.json b/package-lock.json index 7b243a4..08e0d7e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4773,6 +4773,22 @@ "safer-buffer": "^2.1.0" } }, + "echarts": { + "version": "5.1.2", + "resolved": "https://registry.nlark.com/echarts/download/echarts-5.1.2.tgz", + "integrity": "sha1-qhqwzvW3T6L3xiAmGl8oaJPTD9E=", + "requires": { + "tslib": "2.0.3", + "zrender": "5.1.1" + }, + "dependencies": { + "tslib": { + "version": "2.0.3", + "resolved": "https://registry.nlark.com/tslib/download/tslib-2.0.3.tgz", + "integrity": "sha1-jgdBrEX8DCJuWKF7/D5kubxsphw=" + } + } + }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npm.taobao.org/ee-first/download/ee-first-1.1.1.tgz", @@ -10228,6 +10244,11 @@ "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", "dev": true }, + "resize-detector": { + "version": "0.3.0", + "resolved": "https://registry.npm.taobao.org/resize-detector/download/resize-detector-0.3.0.tgz", + "integrity": "sha1-/klREuGEaVUAqPUeA4nxV3TLHPw=" + }, "resize-observer-polyfill": { "version": "1.5.1", "resolved": "https://registry.npm.taobao.org/resize-observer-polyfill/download/resize-observer-polyfill-1.5.1.tgz", @@ -12203,6 +12224,20 @@ "@vue/shared": "3.0.11" } }, + "vue-demi": { + "version": "0.9.1", + "resolved": "https://registry.nlark.com/vue-demi/download/vue-demi-0.9.1.tgz?cache=0&sync_timestamp=1622102566488&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fvue-demi%2Fdownload%2Fvue-demi-0.9.1.tgz", + "integrity": "sha1-Jdbh69TUAQdX/zVx4r9qHXvz3oI=" + }, + "vue-echarts": { + "version": "6.0.0-rc.6", + "resolved": "https://registry.nlark.com/vue-echarts/download/vue-echarts-6.0.0-rc.6.tgz", + "integrity": "sha1-wSr9vi6FjJQdQ0mW6bubevPIxjE=", + "requires": { + "resize-detector": "^0.3.0", + "vue-demi": "^0.9.1" + } + }, "vue-eslint-parser": { "version": "7.6.0", "resolved": "https://registry.npm.taobao.org/vue-eslint-parser/download/vue-eslint-parser-7.6.0.tgz?cache=0&sync_timestamp=1614679624052&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-eslint-parser%2Fdownload%2Fvue-eslint-parser-7.6.0.tgz", @@ -13306,6 +13341,21 @@ "dev": true } } + }, + "zrender": { + "version": "5.1.1", + "resolved": "https://registry.nlark.com/zrender/download/zrender-5.1.1.tgz", + "integrity": "sha1-BRX0+MwPR0LwKmuIGVUKbRPWTFw=", + "requires": { + "tslib": "2.0.3" + }, + "dependencies": { + "tslib": { + "version": "2.0.3", + "resolved": "https://registry.nlark.com/tslib/download/tslib-2.0.3.tgz", + "integrity": "sha1-jgdBrEX8DCJuWKF7/D5kubxsphw=" + } + } } } } diff --git a/package.json b/package.json index 6067d44..2716e21 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,9 @@ "ant-design-vue": "^2.0.0-rc.7", "axios": "^0.21.1", "core-js": "^3.6.5", + "echarts": "^5.1.2", "vue": "^3.0.0", + "vue-echarts": "^6.0.0-rc.6", "vue-router": "^4.0.4" }, "devDependencies": { diff --git a/public/ECharts_BasicBar.png b/public/ECharts_BasicBar.png new file mode 100644 index 0000000..950b5c4 Binary files /dev/null and b/public/ECharts_BasicBar.png differ diff --git a/public/ECharts_PieSvg.png b/public/ECharts_PieSvg.png new file mode 100644 index 0000000..9f8b1f6 Binary files /dev/null and b/public/ECharts_PieSvg.png differ diff --git a/public/InterfaceReturn.json b/public/InterfaceReturn.json index 62c9a78..981d99b 100644 --- a/public/InterfaceReturn.json +++ b/public/InterfaceReturn.json @@ -1,6 +1,7 @@ [{ "type": "AlternatorSvg", "title": "发电机", + "panelclass":"draggable", "template": "", "props": ["prop_data"], "default_attr":{ @@ -11,6 +12,7 @@ }, { "type": "ArrowDownSvg", "title": "箭头向下", + "panelclass":"draggable", "template": "", "props": ["prop_data"], "default_attr":{ @@ -21,6 +23,7 @@ }, { "type": "ArrowUpSvg", "title": "箭头向上", + "panelclass":"draggable", "template": "", "props": ["prop_data"], "default_attr":{ @@ -32,6 +35,7 @@ { "type": "ConnLineSvg", "title": "连接线", + "panelclass":"draw", "template": "", "props": ["prop_data"], "default_attr":{ @@ -39,4 +43,30 @@ }, "create_type":"click", "priview_img":"/VerticalLineSvg.png" +}, +{ + "type": "EchartsPieSvg", + "title": "Echart饼图", + "panelclass":"chart", + "template": " ", + "props": ["prop_data"], + "default_attr":{ + "color":"#000000", + "echarts_option":"{\"title\":{\"text\":\"某站点用户访问来源\",\"subtext\":\"纯属虚构\",\"left\":\"center\"},\"tooltip\":{\"trigger\":\"item\"},\"legend\":{\"orient\":\"vertical\",\"left\":\"left\"},\"series\":[{\"name\":\"访问来源\",\"type\":\"pie\",\"radius\":\"50%\",\"data\":[{\"value\":1048,\"name\":\"搜索引擎\"},{\"value\":735,\"name\":\"直接访问\"},{\"value\":580,\"name\":\"邮件营销\"},{\"value\":484,\"name\":\"联盟广告\"},{\"value\":300,\"name\":\"视频广告\"}],\"emphasis\":{\"itemStyle\":{\"shadowBlur\":10,\"shadowOffsetX\":0,\"shadowColor\":\"rgba(0, 0, 0, 0.5)\"}}}]}" + }, + "create_type":"draggable", + "priview_img":"/ECharts_PieSvg.png" +}, +{ + "type": "EchartsBasicBarSvg", + "title": "Echart基础柱状图", + "panelclass":"chart", + "template": " ", + "props": ["prop_data"], + "default_attr":{ + "color":"#000000", + "echarts_option":"{\"xAxis\":{\"type\":\"category\",\"data\":[\"Mon\",\"Tue\",\"Wed\",\"Thu\",\"Fri\",\"Sat\",\"Sun\"]},\"yAxis\":{\"type\":\"value\"},\"series\":[{\"data\":[120,200,150,80,70,110,130],\"type\":\"bar\"}]}" + }, + "create_type":"draggable", + "priview_img":"/ECharts_BasicBar.png" }] diff --git a/src/components/LeftToolBar.vue b/src/components/LeftToolBar.vue index 04b3b13..8e20099 100644 --- a/src/components/LeftToolBar.vue +++ b/src/components/LeftToolBar.vue @@ -22,7 +22,7 @@ header="绘制组件" :disabled="false">