diff --git a/report-ui/package.json b/report-ui/package.json index 28a9914f..c08b434a 100644 --- a/report-ui/package.json +++ b/report-ui/package.json @@ -21,6 +21,8 @@ "crypto-js": "^3.1.9-1", "echarts": "^5.5.1", "echarts-gl": "^2.0.9", + "echarts-liquidfill": "^3.1.0", + "echarts-wordcloud": "^2.1.0", "element-ui": "^2.15.14", "js-cookie": "2.2.0", "jsbarcode": "^3.11.4", diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/wordcloudCharts/widget-word-cloud.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/wordcloudCharts/widget-word-cloud.js index bf8e5998..4e469019 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/wordcloudCharts/widget-word-cloud.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/wordcloudCharts/widget-word-cloud.js @@ -197,7 +197,7 @@ export const widgetWordCloud = { ], }, { - name: '词云范围', + name: '词云设置', list: [ { type: 'el-input-number', @@ -215,11 +215,6 @@ export const widgetWordCloud = { placeholder: '', value: 2 }, - ], - }, - { - name: '词云角度', - list: [ { type: 'el-input-number', label: '最大角度', @@ -236,6 +231,34 @@ export const widgetWordCloud = { placeholder: '', value: -45 }, + { + type: 'el-select', + label: '字体粗细', + name: 'textFontWeight', + required: false, + placeholder: '', + selectOptions: [ + {code: 'normal', name: '正常'}, + {code: 'bold', name: '粗体'}, + {code: 'bolder', name: '特粗体'}, + {code: 'lighter', name: '细体'} + ], + value: 'normal' + }, + { + type: 'el-select', + label: '字体系列', + name: 'textFontFamily', + required: false, + placeholder: '', + selectOptions: [ + {code: 'sans-serif', name: 'sans-serif'}, + {code: 'serif', name: 'serif'}, + {code: 'Arial', name: 'Arial'}, + {code: 'Courier New', name: 'Courier New'}, + ], + value: 'sans-serif' + }, ], }, { diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/wordcloud/widgetWordCloud.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/wordcloud/widgetWordCloud.vue index 1a41a729..e91a3acf 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/wordcloud/widgetWordCloud.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/wordcloud/widgetWordCloud.vue @@ -1,10 +1,11 @@