feat:bug修改，新增指标卡组件

data-room-ui/packages/BasicComponents/IndexCard/index.vue

@@ -22,7 +22,7 @@
             width: customize.imgSize + 'px',
             height: customize.imgSize + 'px',
           }"
-          :src="customize.src"
+          :src="customize.src?customize.src:imgUrl"
           fit="contain"
         />
       </div>
@@ -79,6 +79,7 @@ export default {
   },
   data () {
     return {
+      imgUrl:require('data-room-ui/assets/images/cardImg/cardicon.png'),
       customClass: {}
     }
   },

data-room-ui/packages/BasicComponents/IndexCard/settingConfig.js

@@ -39,7 +39,7 @@ const customConfig = {
     loading: false
   },
   customize: {
-    src: 'http://60.174.249.206:11080/upload/webDesign/uiSucai/dir/icon/icon_top6.png',
+    src: '',
     borderRadius: 0,
     borderWidth: 0,
     lineDistance: 6,

data-room-ui/packages/BasicComponents/IndexCard2/index.vue

@@ -22,7 +22,7 @@
             width: customize.imgSize + 'px',
             height: customize.imgSize + 'px',
           }"
-          :src="customize.src"
+          :src="customize.src?customize.src:imgUrl"
           fit="contain"
         />
       </div>
@@ -77,6 +77,7 @@ export default {
   },
   data () {
     return {
+      imgUrl:require('data-room-ui/assets/images/cardImg/cardicon.png'),
       customClass: {}
     }
   },

data-room-ui/packages/BasicComponents/IndexCard2/settingConfig.js

@@ -39,7 +39,7 @@ const customConfig = {
     loading: false
   },
   customize: {
-    src: 'http://60.174.249.206:11080/upload/webDesign/uiSucai/dir/icon/icon_top6.png',
+    src: '',
     borderRadius: 0,
     borderWidth: 0,
     lineDistance: 6,

data-room-ui/packages/BigScreenDesign/ComponentDialog/index.vue

@@ -43,7 +43,6 @@
                 @keyup.enter.native="reSearch"
               />
               <el-button
-                size="small"
                 type="primary"
                 @click="reSearch"
               >
@@ -167,7 +166,6 @@
                 @keyup.enter.native="reSearch"
               />
               <el-button
-                size="small"
                 type="primary"
                 @click="reSearch"
               >

data-room-ui/packages/BigScreenDesign/SettingPanel.vue

@@ -74,7 +74,15 @@ export default {
       return this.rightVisiable && this.activeCode
     },
     title () {
-      return this.activeItem?.title || ''
+      if(this.activeItem.type=='customComponent'){
+        return this.activeItem?.category
+      }else if(this.activeItem.type=='"remoteComponent"'){
+        return this.activeItem?.title
+      }
+      else{
+        return this.activeItem?.name
+      }
+      // if(this.activeItem)
     }
   },
   mounted () { },

data-room-ui/packages/BigScreenDesign/SourceDialog/index.vue

@@ -37,7 +37,6 @@
             />
           </el-select>
           <el-button
-            size="small"
             type="primary"
             @click="reSearch"
           >

data-room-ui/packages/BorderComponents/GcBorder1/setting.js

@@ -57,7 +57,7 @@ const setting = [
     optionField: 'gradientDirection',
     // 是否多选
     multiple: false,
-    value: '',
+    value: 'to right',
     options: [
       {
         label: '从左到右',

data-room-ui/packages/BorderComponents/GcBorder10/setting.js

@@ -56,7 +56,7 @@ const setting = [
     optionField: 'gradientDirection',
     // 是否多选
     multiple: false,
-    value: '',
+    value: 'to right',
     options: [
       {
         label: '从左到右',

data-room-ui/packages/BorderComponents/GcBorder11/setting.js

@@ -67,7 +67,7 @@ const setting = [
     optionField: 'gradientDirection',
     // 是否多选
     multiple: false,
-    value: '',
+    value: 'to right',
     options: [
       {
         label: '从左到右',

data-room-ui/packages/BorderComponents/GcBorder12/setting.js

@@ -57,7 +57,7 @@ const setting = [
     optionField: 'gradientDirection',
     // 是否多选
     multiple: false,
-    value: '',
+    value: 'to right',
     options: [
       {
         label: '从左到右',

data-room-ui/packages/BorderComponents/GcBorder13/setting.js

@@ -56,7 +56,7 @@ const setting = [
     optionField: 'gradientDirection',
     // 是否多选
     multiple: false,
-    value: '',
+    value: 'to right',
     options: [
       {
         label: '从左到右',

data-room-ui/packages/BorderComponents/GcBorder2/setting.js

@@ -55,7 +55,7 @@ const setting = [
     optionField: 'gradientDirection',
     // 是否多选
     multiple: false,
-    value: '',
+    value: 'to right',
     options: [
       {
         label: '从左到右',

data-room-ui/packages/BorderComponents/GcBorder3/setting.js

@@ -56,7 +56,7 @@ const setting = [
     optionField: 'gradientDirection',
     // 是否多选
     multiple: false,
-    value: '',
+    value: 'to right',
     options: [
       {
         label: '从左到右',

data-room-ui/packages/BorderComponents/GcBorder4/setting.js

@@ -55,7 +55,7 @@ const setting = [
     optionField: 'gradientDirection',
     // 是否多选
     multiple: false,
-    value: '',
+    value: 'to right',
     options: [
       {
         label: '从左到右',

data-room-ui/packages/BorderComponents/GcBorder5/setting.js

@@ -56,7 +56,7 @@ const setting = [
     optionField: 'gradientDirection',
     // 是否多选
     multiple: false,
-    value: '',
+    value: 'to right',
     options: [
       {
         label: '从左到右',

data-room-ui/packages/BorderComponents/GcBorder6/setting.js

@@ -56,7 +56,7 @@ const setting = [
     optionField: 'gradientDirection',
     // 是否多选
     multiple: false,
-    value: '',
+    value: 'to right',
     options: [
       {
         label: '从左到右',

data-room-ui/packages/BorderComponents/GcBorder7/setting.js

@@ -56,7 +56,7 @@ const setting = [
     optionField: 'gradientDirection',
     // 是否多选
     multiple: false,
-    value: '',
+    value: 'to right',
     options: [
       {
         label: '从左到右',

data-room-ui/packages/BorderComponents/GcBorder8/setting.js

@@ -56,7 +56,7 @@ const setting = [
     optionField: 'gradientDirection',
     // 是否多选
     multiple: false,
-    value: '',
+    value: 'to right',
     options: [
       {
         label: '从左到右',

data-room-ui/packages/BorderComponents/GcBorder9/setting.js

@@ -56,7 +56,7 @@ const setting = [
     optionField: 'gradientDirection',
     // 是否多选
     multiple: false,
-    value: '',
+    value: 'to right',
     options: [
       {
         label: '从左到右',

data-room-ui/packages/Borders/Border14/settingConfig.js

@@ -15,26 +15,26 @@ const customConfig = {
     // 边框线颜色
     borderColor: '#87888e',
     // 边框线宽度
-    borderWidth: 2,
+    borderWidth: 10,
     // 边框背景颜色
     backgroundColor: '#232832',
     colorType: 'single',
     // 渐变色0值
-    gradientColor0: '#83bff6',
+    gradientColor0: '',
     // 渐变色1值
-    gradientColor1: '#188df0',
+    gradientColor1: '',
     // 渐变色色值改变方向
     gradientDirection: 'to right',
     // 透明度
     opacity: 100,
     // 左上圆角
-    radiusLeftTop: 2,
+    radiusLeftTop: 14,
     // 右上圆角
-    radiusRightTop: 2,
+    radiusRightTop: 14,
     // 左下圆角
-    radiusLeftBottom: 2,
+    radiusLeftBottom: 14,
     // 右下圆角
-    radiusRightBottom: 2
+    radiusRightBottom: 14
   }
 }
 export const dataConfig = {

data-room-ui/packages/Borders/Border15/settingConfig.js

@@ -15,14 +15,14 @@ const customConfig = {
     // 边框线颜色
     borderColor: '#87888e',
     // 边框线宽度
-    borderWidth: 2,
+    borderWidth: 10,
     // 边框背景颜色
     backgroundColor: '#232832',
     colorType: 'single',
     // 渐变色0值
-    gradientColor0: '#83bff6',
+    gradientColor0: '',
     // 渐变色1值
-    gradientColor1: '#188df0',
+    gradientColor1: '',
     // 渐变色色值改变方向
     gradientDirection: 'to right',
     // 透明度
@@ -34,7 +34,7 @@ const customConfig = {
     // 字体粗细
     fontWeight: 500,
     // 中心文本
-    text: '文本'
+    text: ''
   }
 }
 export const dataConfig = {

data-room-ui/packages/Decorations/Decoration1/settingConfig.js

@@ -20,8 +20,8 @@ const customConfig = {
     contribution: false
   },
   customize: {
-    decorationColor1: '',
+    decorationColor1: '#fff',
-    decorationColor2: '',
+    decorationColor2: '#0de7c2',
     reverse: false,
     dur: 3,
     scanDur: 3,

data-room-ui/packages/Decorations/Decoration10/settingConfig.js

@@ -20,8 +20,8 @@ const customConfig = {
     contribution: false
   },
   customize: {
-    decorationColor1: null,
+    decorationColor1: '#00c2ff',
-    decorationColor2: null,
+    decorationColor2:'rgba(0, 194, 255, 0.3)' ,
     reverse: false,
     dur: 3,
     scanDur: 3,

data-room-ui/packages/Decorations/Decoration11/settingConfig.js

@@ -20,8 +20,8 @@ const customConfig = {
     contribution: false
   },
   customize: {
-    decorationColor1: null,
+    decorationColor1: '#1a98fc',
-    decorationColor2: null,
+    decorationColor2: '#2cf7fe',
     reverse: false,
     dur: 3,
     scanDur: 3,

data-room-ui/packages/Decorations/Decoration2/settingConfig.js

@@ -20,8 +20,8 @@ const customConfig = {
     contribution: false
   },
   customize: {
-    decorationColor1: null,
+    decorationColor1: '#3faacb',
-    decorationColor2: null,
+    decorationColor2: '#fff',
     reverse: false,
     dur: 3,
     scanDur: 3,

data-room-ui/packages/Decorations/Decoration2Reverse/settingConfig.js

@@ -20,7 +20,7 @@ const customConfig = {
     contribution: false
   },
   customize: {
-    decorationColor1: null,
+    decorationColor1: '#3faacb',
     decorationColor2: null,
     reverse: false,
     dur: 3,

data-room-ui/packages/Decorations/Decoration3/settingConfig.js

@@ -20,8 +20,8 @@ const customConfig = {
     contribution: false
   },
   customize: {
-    decorationColor1: null,
+    decorationColor1: '#7acaec',
-    decorationColor2: null,
+    decorationColor2: '#000',
     reverse: false,
     dur: 3,
     scanDur: 3,

data-room-ui/packages/Decorations/Decoration4/settingConfig.js

@@ -20,8 +20,8 @@ const customConfig = {
     contribution: false
   },
   customize: {
-    decorationColor1: null,
+    decorationColor1: 'rgba(255, 255, 255, 0.3)',
-    decorationColor2: null,
+    decorationColor2: 'rgba(255, 255, 255, 0.3)',
     reverse: false,
     dur: 3,
     scanDur: 3,

data-room-ui/packages/Decorations/Decoration4Reverse/settingConfig.js

@@ -20,8 +20,8 @@ const customConfig = {
     contribution: false
   },
   customize: {
-    decorationColor1: null,
+    decorationColor1: 'rgba(255, 255, 255, 0.3)',
-    decorationColor2: null,
+    decorationColor2: 'rgba(255, 255, 255, 0.3)',
     reverse: false,
     dur: 3,
     scanDur: 3,

data-room-ui/packages/Decorations/Decoration5/settingConfig.js

@@ -20,8 +20,8 @@ const customConfig = {
     contribution: false
   },
   customize: {
-    decorationColor1: null,
+    decorationColor1: '#3f96a5',
-    decorationColor2: null,
+    decorationColor2: '#3f96a5',
     reverse: false,
     dur: 3,
     scanDur: 3,

data-room-ui/packages/Decorations/Decoration6/settingConfig.js

@@ -20,8 +20,8 @@ const customConfig = {
     contribution: false
   },
   customize: {
-    decorationColor1: null,
+    decorationColor1:'#7acaec',
-    decorationColor2: null,
+    decorationColor2: '#7acaec',
     reverse: false,
     dur: 3,
     scanDur: 3,

data-room-ui/packages/Decorations/Decoration8/settingConfig.js

@@ -20,8 +20,8 @@ const customConfig = {
     contribution: false
   },
   customize: {
-    decorationColor1: null,
+    decorationColor1: '#3f96a5',
-    decorationColor2: null,
+    decorationColor2: '#3f96a5',
     reverse: false,
     dur: 3,
     scanDur: 3,

data-room-ui/packages/Decorations/Decoration8Reverse/settingConfig.js

@@ -20,8 +20,8 @@ const customConfig = {
     contribution: false
   },
   customize: {
-    decorationColor1: null,
+    decorationColor1: '#3f96a5',
-    decorationColor2: null,
+    decorationColor2: '#3f96a5',
     reverse: false,
     dur: 3,
     scanDur: 3,

data-room-ui/packages/Decorations/Decoration9/settingConfig.js

@@ -20,8 +20,8 @@ const customConfig = {
     contribution: false
   },
   customize: {
-    decorationColor1: null,
+    decorationColor1: 'rgba(3, 166, 224, 0.8)',
-    decorationColor2: null,
+    decorationColor2: 'rgba(3, 166, 224, 0.5)',
     reverse: false,
     dur: 3,
     scanDur: 3,

data-room-ui/packages/assets/style/settingWrap.scss

@@ -102,7 +102,7 @@
   }
 }
 .data-form-item {
-  padding: 12px;
+  padding: 4px 12px;
 }
 
 ::v-deep .select-item {

data-room-ui/packages/js/utils/getComponentConfig.js

@@ -287,8 +287,8 @@ export default function getComponentConfig (type) {
       }
       case 'indicatorCard':
         return {
-          name: '指标卡',
+          name: '指标卡一',
-          title: '指标卡',
+          title: '指标卡一',
           icon: null,
           img: require('data-room-ui/assets/images/cardImg/card.png'),
           className: 'com.gccloud.dataroom.core.module.chart.components.ScreenIndicatorCardChart',
@@ -298,20 +298,6 @@ export default function getComponentConfig (type) {
           y: 0,
           type
       }
-
-      case 'indexCard':
-        return {
-          name: '指标卡一',
-          title: '指标卡一',
-          icon: null,
-          img: require('data-room-ui/assets/images/cardImg/indicard.png'),
-          className: 'com.gccloud.dataroom.core.module.chart.components.ScreenIndexCardChart',
-          w: 400,
-          h: 200,
-          x: 0,
-          y: 0,
-          type
-      }
       case 'indicatorCard2':
         return {
           name: '指标卡二',
@@ -325,11 +311,24 @@ export default function getComponentConfig (type) {
           y: 0,
           type
       }
-        case 'indexCard2':
+      case 'indexCard':
         return {
           name: '指标卡三',
           title: '指标卡三',
           icon: null,
+          img: require('data-room-ui/assets/images/cardImg/indicard.png'),
+          className: 'com.gccloud.dataroom.core.module.chart.components.ScreenIndexCardChart',
+          w: 400,
+          h: 200,
+          x: 0,
+          y: 0,
+          type
+      }
+        case 'indexCard2':
+          return {
+            name: '指标卡四',
+            title: '指标卡四',
+            icon: null,
             img: require('data-room-ui/assets/images/cardImg/indcard2.png'),
             className: 'com.gccloud.dataroom.core.module.chart.components.ScreenIndexCardChart',
             w: 400,