From 14800f2d0586f355e24ad2d95189adc8e13a1174 Mon Sep 17 00:00:00 2001 From: "liu.tao3" Date: Tue, 19 Sep 2023 17:52:13 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E8=BE=B9=E6=A1=86=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BasicComponents/ChartTab/index.vue | 1 - .../BasicComponents/CurrentTime/index.vue | 1 - .../BasicComponents/DigitalFlop/index.vue | 1 - .../packages/BasicComponents/FlyMap/index.vue | 1 - .../BasicComponents/FlyMap/settingConfig.js | 2 +- .../BasicComponents/HorizontalLine/index.vue | 1 - .../BasicComponents/IframeChart/index.vue | 1 - .../BasicComponents/LinkChart/index.vue | 1 - .../packages/BasicComponents/Map/index.vue | 1 - .../BasicComponents/Map/settingConfig.js | 2 +- .../BasicComponents/Picture/index.vue | 1 - .../ScreenScrollBoard/index.vue | 1 - .../ScreenScrollRanking/index.vue | 1 - .../packages/BasicComponents/Tables/index.vue | 1 - .../packages/BasicComponents/Texts/index.vue | 1 - .../BasicComponents/ThemeSelect/index.vue | 1 - .../BasicComponents/ThemeSwitcher/index.vue | 1 - .../BasicComponents/TimeCountDown/index.vue | 1 - .../BasicComponents/VerticalLine/index.vue | 1 - .../packages/BasicComponents/Video/index.vue | 1 - .../BorderComponents/GcBorder1/index.vue | 1 - .../BorderComponents/GcBorder10/index.vue | 1 - .../BorderComponents/GcBorder14/component.png | Bin 0 -> 930 bytes .../BorderComponents/GcBorder14/index.vue | 125 +++++++++++++ .../BorderComponents/GcBorder14/setting.js | 177 ++++++++++++++++++ .../packages/BorderComponents/bordersList.js | 2 +- .../packages/assets/style/echartStyle.scss | 1 - .../js/config/basicComponentsConfig.js | 2 +- 28 files changed, 306 insertions(+), 25 deletions(-) create mode 100644 data-room-ui/packages/BorderComponents/GcBorder14/component.png create mode 100644 data-room-ui/packages/BorderComponents/GcBorder14/index.vue create mode 100644 data-room-ui/packages/BorderComponents/GcBorder14/setting.js diff --git a/data-room-ui/packages/BasicComponents/ChartTab/index.vue b/data-room-ui/packages/BasicComponents/ChartTab/index.vue index 56cfe158..1ba8bb8a 100644 --- a/data-room-ui/packages/BasicComponents/ChartTab/index.vue +++ b/data-room-ui/packages/BasicComponents/ChartTab/index.vue @@ -146,7 +146,6 @@ export default { diff --git a/data-room-ui/packages/BorderComponents/GcBorder14/setting.js b/data-room-ui/packages/BorderComponents/GcBorder14/setting.js new file mode 100644 index 00000000..056b19ab --- /dev/null +++ b/data-room-ui/packages/BorderComponents/GcBorder14/setting.js @@ -0,0 +1,177 @@ + +const type = 'GcBorder14' + +const name='边框十四' +// 右侧配置项 +const setting = [ + // 背景色 + + { + label:'边框线颜色', + // 设置组件类型， select / input / colorPicker + type: 'colorPicker', + // 字段 + field: 'borderColor', + optionField: 'borderColor', // 对应options中的字段 + // 是否多选 + multiple: false, + // 绑定的值 + value: 'rgba(135, 136, 142, 1)', + }, + { + label:'边框线宽度', + // 设置组件类型， select / input / colorPicker + type: 'inputNumber', + // 字段 + field: 'borderWidth', + optionField: 'borderWidth', // 对应options中的字段 + // 是否多选 + multiple: false, + // 绑定的值 + value: 2, + }, + { + label:'背景色一', + // 设置组件类型， select / input / colorPicker + type: 'colorPicker', + // 字段 + field: 'gradientColor0', + optionField: 'gradientColor0', // 对应options中的字段 + // 是否多选 + multiple: false, + // 绑定的值 + value: 'rgba(131, 191, 246, 1)', + }, + { + label:'背景色二', + // 设置组件类型， select / input / colorPicker + type: 'colorPicker', + // 字段 + field: 'gradientColor1', + optionField: 'gradientColor1', // 对应options中的字段 + // 是否多选 + multiple: false, + // 绑定的值 + value: 'rgba(24, 141, 240, 1)', + }, + { + label: '渐变色方向', + // 设置组件类型 + type: 'select', + // 字段 + field: 'gradientDirection', + // 对应options中的字段 + optionField: 'gradientDirection', + // 是否多选 + multiple: false, + value: 'to right', + options: [ + { + label: '从左到右', + value: 'to right' + }, + { + label: '从右到左', + value: 'to left' + }, + { + label: '从上到下', + value: 'to bottom' + }, + { + label: '从下到上', + value: 'to top' + }, + { + label: '从左上到右下', + value: 'to bottom right' + }, + { + label: '从右上到左下', + value: 'to bottom left' + }, + { + label: '从左下到右上', + value: 'to top right' + }, + { + label: '从右下到左上', + value: 'to top left' + } + ] + }, + { + label:'不透明度', + // 设置组件类型， select / input / colorPicker + type: 'inputNumber', + // 字段 + field: 'opacity', + optionField: 'opacity', // 对应options中的字段 + // 是否多选 + multiple: false, + // 绑定的值 + value: 100, + }, + { + label:'左上圆角值', + // 设置组件类型， select / input / colorPicker + type: 'inputNumber', + // 字段 + field: 'radiusLeftTop', + optionField: 'radiusLeftTop', // 对应options中的字段 + // 是否多选 + multiple: false, + // 绑定的值 + value: 2, + }, + { + label:'左下圆角值', + // 设置组件类型， select / input / colorPicker + type: 'inputNumber', + // 字段 + field: 'radiusLeftBottom', + optionField: 'radiusLeftBottom', // 对应options中的字段 + // 是否多选 + multiple: false, + // 绑定的值 + value: 2, + }, + { + label:'右上圆角值', + // 设置组件类型， select / input / colorPicker + type: 'inputNumber', + // 字段 + field: 'radiusRightTop', + optionField: 'radiusRightTop', // 对应options中的字段 + // 是否多选 + multiple: false, + // 绑定的值 + value: 2, + }, + { + label:'右下圆角值', + // 设置组件类型， select / input / colorPicker + type: 'inputNumber', + // 字段 + field: 'radiusRightBottom', + optionField: 'radiusRightBottom', // 对应options中的字段 + // 是否多选 + multiple: false, + // 绑定的值 + value: 2, + }, + + + + + +] + + + + +export default { + setting, + type, + name +} diff --git a/data-room-ui/packages/BorderComponents/bordersList.js b/data-room-ui/packages/BorderComponents/bordersList.js index 35447063..9d864500 100644 --- a/data-room-ui/packages/BorderComponents/bordersList.js +++ b/data-room-ui/packages/BorderComponents/bordersList.js @@ -12,5 +12,5 @@ files.keys().forEach(key => { img, }) }) -// 抛出内置系统组件 +// 抛出边框组件 export default borderComponents diff --git a/data-room-ui/packages/assets/style/echartStyle.scss b/data-room-ui/packages/assets/style/echartStyle.scss index 74e9531e..54e90225 100644 --- a/data-room-ui/packages/assets/style/echartStyle.scss +++ b/data-room-ui/packages/assets/style/echartStyle.scss @@ -2,7 +2,6 @@ position: relative; width: 100%; height: 100%; - padding: 0 16px; background-color: rgba(0,0,0,0); border-radius: 4px; box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.1); diff --git a/data-room-ui/packages/js/config/basicComponentsConfig.js b/data-room-ui/packages/js/config/basicComponentsConfig.js index 6b9c64e4..1c1251e9 100644 --- a/data-room-ui/packages/js/config/basicComponentsConfig.js +++ b/data-room-ui/packages/js/config/basicComponentsConfig.js @@ -44,7 +44,7 @@ basicConfigList = basicConfigList.map((item) => { export function basicComponentsConfig (item) { return { ...item, - border:{type:'',titleHeight:60,fontSize:30,isTitle:true,padding:[16,16,16,16]}, + border:{type:'',titleHeight:60,fontSize:30,isTitle:true,padding:[0,0,0,0]}, option: cloneDeep(setModules[item.type]), ...cloneDeep(dataModules[item.type]) }