From 69711c510f57fee1aba9e51881c6c6ed2a444413 Mon Sep 17 00:00:00 2001 From: "liu.tao3" Date: Wed, 20 Sep 2023 18:01:10 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E8=BE=B9=E6=A1=86=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RightSetting/BorderSetting.vue | 44 ++-- .../BorderComponents/GcBorder1/setting.js | 5 +- .../BorderComponents/GcBorder10/setting.js | 7 +- .../BorderComponents/GcBorder11/index.vue | 2 +- .../BorderComponents/GcBorder11/setting.js | 19 +- .../BorderComponents/GcBorder12/setting.js | 5 +- .../BorderComponents/GcBorder13/setting.js | 7 +- .../BorderComponents/GcBorder14/index.vue | 7 +- .../BorderComponents/GcBorder14/setting.js | 13 +- .../BorderComponents/GcBorder15/component.png | Bin 0 -> 930 bytes .../BorderComponents/GcBorder15/index.vue | 149 ++++++++++++ .../BorderComponents/GcBorder15/setting.js | 227 ++++++++++++++++++ .../BorderComponents/GcBorder2/setting.js | 5 +- .../BorderComponents/GcBorder3/setting.js | 7 +- .../BorderComponents/GcBorder4/setting.js | 5 +- .../BorderComponents/GcBorder5/setting.js | 7 +- .../BorderComponents/GcBorder6/setting.js | 5 +- .../BorderComponents/GcBorder7/setting.js | 7 +- .../BorderComponents/GcBorder8/setting.js | 7 +- .../BorderComponents/GcBorder9/setting.js | 7 +- .../packages/BorderComponents/settingList.js | 3 +- 21 files changed, 479 insertions(+), 59 deletions(-) create mode 100644 data-room-ui/packages/BorderComponents/GcBorder15/component.png create mode 100644 data-room-ui/packages/BorderComponents/GcBorder15/index.vue create mode 100644 data-room-ui/packages/BorderComponents/GcBorder15/setting.js diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/BorderSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/BorderSetting.vue index 77c24006..6ee132a7 100644 --- a/data-room-ui/packages/BigScreenDesign/RightSetting/BorderSetting.vue +++ b/data-room-ui/packages/BigScreenDesign/RightSetting/BorderSetting.vue @@ -72,7 +72,6 @@ />
-
@@ -97,7 +96,7 @@ /> @@ -109,7 +108,7 @@ /> @@ -120,9 +119,8 @@ show-alpha /> -
{ + if(item.value){ + this.config[item.field]=item.value? item.value:this.config[item.field] + } + }) + } + } + },immediate: true + }, + }, computed:{ title:{ set(){ @@ -298,23 +318,17 @@ export default { yield [k,plotList[k]] } } - let arr=[] + let obj={} for(let [key,value] of plotList){ if(value.type==this.config.type){ - arr=value.setting - value.setting.forEach((item)=>{ - if(item.value){ - this.config[item.field]=this.config[item.field]||item.value - } - }) + obj={setting:value.setting,isTitle:value.isTitle} } } - return arr + return obj } }, data () { return { - } }, mounted () { diff --git a/data-room-ui/packages/BorderComponents/GcBorder1/setting.js b/data-room-ui/packages/BorderComponents/GcBorder1/setting.js index 2cb5f1b6..878a1a98 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder1/setting.js +++ b/data-room-ui/packages/BorderComponents/GcBorder1/setting.js @@ -3,6 +3,8 @@ const type = 'GcBorder1' const name = '边框一' +const isTitle=false + // 右侧配置项 const setting = [ // 背景色 @@ -123,5 +125,6 @@ const setting = [ export default { setting, type, - name + name, + isTitle } diff --git a/data-room-ui/packages/BorderComponents/GcBorder10/setting.js b/data-room-ui/packages/BorderComponents/GcBorder10/setting.js index cbd33a92..9e356a7f 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder10/setting.js +++ b/data-room-ui/packages/BorderComponents/GcBorder10/setting.js @@ -1,7 +1,9 @@ const type = 'GcBorder10' -const name='边框十' +const name = '边框十' + +const isTitle=false // 右侧配置项 const setting = [ // 背景色 @@ -122,5 +124,6 @@ const setting = [ export default { setting, type, - name + name, + isTitle } diff --git a/data-room-ui/packages/BorderComponents/GcBorder11/index.vue b/data-room-ui/packages/BorderComponents/GcBorder11/index.vue index 2e6c634f..83da3d5c 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder11/index.vue +++ b/data-room-ui/packages/BorderComponents/GcBorder11/index.vue @@ -8,7 +8,7 @@ :background-color="(config.border.gradientColor0||config.border.gradientColor1)?`url(#${borderBgId})`:'transparent'" :color='borderColor' :key="updateKey" - :title="config.border.title" + :title="config.border.isTitle?config.title:''" :title-width="config.border.titleWidth" >