Browse Source

feat:修改多颜色选择器被遮挡的问题

liu.shiyi 1 year ago
parent
commit
025f0df7df

+ 6 - 1
data-room-ui/packages/BigScreenDesign/RightSetting/G2CustomSetting.vue

@@ -71,9 +71,9 @@
                     style="
                     display: flex;
                     align-items: center;
-                    height: 42px;
                     flex-wrap: wrap;
                   "
+                    class="color-picker-box"
                   >
                     <el-color-picker
                       v-for="(colorItem, colorItemIndex) in colors"
@@ -336,4 +336,9 @@ export default {
 ::v-deep .el-color-picker__trigger {
   border-color: var(--bs-el-border);
 }
+.color-picker-box{
+  ::v-deep .el-color-picker__trigger {
+    width: 27px!important;
+  }
+}
 </style>

+ 2 - 1
data-room-ui/packages/BigScreenDesign/RightSetting/TextGradient/index.vue

@@ -26,7 +26,7 @@
       label-width="100px"
     >
       <div class="color-picker-box">
-        <el-color-picker v-model="startColor" /> <div class="el-icon-right" /> <el-color-picker v-model="endColor" />
+        <el-color-picker v-model="startColor" /> <div class="el-icon-right"/> <el-color-picker v-model="endColor" />
       </div>
     </el-form-item>
   </div>
@@ -109,6 +109,7 @@ export default {
   .el-icon-right{
     width: 40px;
     text-align: center;
+    /*color: #778390;*/
   }
  }
 </style>

+ 4 - 4
data-room-ui/packages/DataSetManagement/src/TypeTree.vue

@@ -235,7 +235,7 @@ export default {
         this.$refs.editForm.dialogFormVisible = true
         this.$refs.editForm.init({ parentId: 0 }, true)
         this.$refs.editForm.radio = 0
-        this.$refs.editForm.title = '节点新增'
+        this.$refs.editForm.title = '分组新增'
       })
     },
     addDiyDom (treeId, treeNode) {
@@ -382,7 +382,7 @@ export default {
           this.$refs.editForm.type = 'dataset'
           this.$refs.editForm.dialogFormVisible = true
           this.$refs.editForm.init(this.rightClickForm.org, false)
-          this.$refs.editForm.title = '节点编辑'
+          this.$refs.editForm.title = '分组编辑'
         })
         return
       }
@@ -393,7 +393,7 @@ export default {
           this.$refs.editForm.dialogFormVisible = true
           this.$refs.editForm.init(this.rightClickForm.org, true)
           this.$refs.editForm.radio = 0
-          this.$refs.editForm.title = '节点新增'
+          this.$refs.editForm.title = '分组新增'
         })
         return
       }
@@ -404,7 +404,7 @@ export default {
           this.$refs.editForm.dialogFormVisible = true
           this.$refs.editForm.init(this.rightClickForm.org, true)
           this.$refs.editForm.radio = 1
-          this.$refs.editForm.title = '节点新增'
+          this.$refs.editForm.title = '分组新增'
         })
       }
     },