From 86a896c4db9c5a779fe5186101020b585ba3e75e Mon Sep 17 00:00:00 2001 From: qianlishi <1432731663@qq.com> Date: Sun, 29 Aug 2021 08:00:26 +0800 Subject: [PATCH] update tool.js --- .../report/bigscreen/designer/tools/index.js | 62 ++++--------------- .../bigscreen/designer/tools/toolMain.js | 61 ++++++++++++++++++ 2 files changed, 72 insertions(+), 51 deletions(-) create mode 100644 report-ui/src/views/report/bigscreen/designer/tools/toolMain.js diff --git a/report-ui/src/views/report/bigscreen/designer/tools/index.js b/report-ui/src/views/report/bigscreen/designer/tools/index.js index dacdcb81..ae301f96 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools/index.js +++ b/report-ui/src/views/report/bigscreen/designer/tools/index.js @@ -1,27 +1,12 @@ -import { widgetText } from "./componentsJSON/widget-text" -import { widgetMarquee } from "./componentsJSON/widget-marquee" -import { widgetHref } from "./componentsJSON/widget-href" -import { widgetTime } from "./componentsJSON/widget-time" -import { widgetImage } from "./componentsJSON/widget-image" -import { widgetSliders } from "./componentsJSON/widget-slider" -import { widgetVideo } from "./componentsJSON/widget-video" -import { widgetTable } from "./componentsJSON/widget-table" -import { widgetIframe } from "./componentsJSON/widget-iframe" -import { widgetUniversal } from "./componentsJSON/widget-universal" -import { widgetBarchart } from "./componentsJSON/widget-barchart" -import { widgetGradientBarchart } from "./componentsJSON/widget-gradient-barchart" -import { widgetLinechart } from "./componentsJSON/widget-linechart" -import { widgetBarlinechart } from "./componentsJSON/widget-barlinechart" -import { widgetPiechart } from "./componentsJSON/widget-piechart" -import { widgetFunnel } from "./componentsJSON/widget-funnel" -import { widgetGauge } from "./componentsJSON/widget-gauge" -import { widgetMap } from "./componentsJSON/widget-map" -import { WidgetPieNightingale } from "./componentsJSON/widget-pie-nightingale" -import { widgetPiePercentage } from "./componentsJSON/widget-pie-percentage" -import { widgetAirbubbleMap } from "./componentsJSON/widget-airbubble-map" -import { widgetBarStack } from "./componentsJSON/widget-bar-stack" -import { widgetLineStack } from "./componentsJSON/widget-line-stack" -import { widgetBarCompare } from "./componentsJSON/widget-bar-compare" +/* + * @Descripttion: + * @version: + * @Author: qianlishi + * @Date: 2021-08-29 06:43:07 + * @LastEditors: qianlishi + * @LastEditTime: 2021-08-29 07:57:24 + */ +import { widgetTool } from "./toolMain" const screenConfig = { code: 'screen', type: 'screen', @@ -79,35 +64,10 @@ const screenConfig = { ], data: [], position: [], - }, + } } - const widgetTools = [ - // type=html类型的组件 - widgetText, - widgetMarquee, - widgetHref, - widgetTime, - widgetImage, - // widgetSliders, - widgetVideo, - widgetTable, - widgetIframe, - // widgetUniversal, - widgetBarchart, - widgetGradientBarchart, - widgetLinechart, - widgetBarlinechart, - widgetPiechart, - widgetFunnel, - widgetGauge, - widgetMap, - WidgetPieNightingale, - widgetPiePercentage, - widgetAirbubbleMap, - widgetBarStack, - widgetLineStack, - widgetBarCompare + ...widgetTool ] const getToolByCode = function (code) { diff --git a/report-ui/src/views/report/bigscreen/designer/tools/toolMain.js b/report-ui/src/views/report/bigscreen/designer/tools/toolMain.js new file mode 100644 index 00000000..12525036 --- /dev/null +++ b/report-ui/src/views/report/bigscreen/designer/tools/toolMain.js @@ -0,0 +1,61 @@ +/* + * @Descripttion: json 入口文件 + * @version: + * @Author: qianlishi + * @Date: 2021-08-29 07:46:46 + * @LastEditors: qianlishi + * @LastEditTime: 2021-08-29 07:54:41 + */ + +import { widgetText } from "./componentsJSON/widget-text" +import { widgetMarquee } from "./componentsJSON/widget-marquee" +import { widgetHref } from "./componentsJSON/widget-href" +import { widgetTime } from "./componentsJSON/widget-time" +import { widgetImage } from "./componentsJSON/widget-image" +import { widgetSliders } from "./componentsJSON/widget-slider" +import { widgetVideo } from "./componentsJSON/widget-video" +import { widgetTable } from "./componentsJSON/widget-table" +import { widgetIframe } from "./componentsJSON/widget-iframe" +import { widgetUniversal } from "./componentsJSON/widget-universal" +import { widgetBarchart } from "./componentsJSON/widget-barchart" +import { widgetGradientBarchart } from "./componentsJSON/widget-gradient-barchart" +import { widgetLinechart } from "./componentsJSON/widget-linechart" +import { widgetBarlinechart } from "./componentsJSON/widget-barlinechart" +import { widgetPiechart } from "./componentsJSON/widget-piechart" +import { widgetFunnel } from "./componentsJSON/widget-funnel" +import { widgetGauge } from "./componentsJSON/widget-gauge" +import { widgetMap } from "./componentsJSON/widget-map" +import { WidgetPieNightingale } from "./componentsJSON/widget-pie-nightingale" +import { widgetPiePercentage } from "./componentsJSON/widget-pie-percentage" +import { widgetAirbubbleMap } from "./componentsJSON/widget-airbubble-map" +import { widgetBarStack } from "./componentsJSON/widget-bar-stack" +import { widgetLineStack } from "./componentsJSON/widget-line-stack" +import { widgetBarCompare } from "./componentsJSON/widget-bar-compare" + +export const widgetTool = [ + // type=html类型的组件 + widgetText, + widgetMarquee, + widgetHref, + widgetTime, + widgetImage, + // widgetSliders, + widgetVideo, + widgetTable, + widgetIframe, + // widgetUniversal, + widgetBarchart, + widgetGradientBarchart, + widgetLinechart, + widgetBarlinechart, + widgetPiechart, + widgetFunnel, + widgetGauge, + widgetMap, + WidgetPieNightingale, + widgetPiePercentage, + widgetAirbubbleMap, + widgetBarStack, + widgetLineStack, + widgetBarCompare +] \ No newline at end of file