Merge pull request #12846 from dataease/pr@dev-v2_st

fix(数据大屏): 边框-颜色的下拉样式不对

core/core-frontend/src/custom-component/common/CommonBorderSetting.vue

@@ -135,6 +135,7 @@ watch(
               class="color-picker-style"
               :triggerWidth="65"
               is-custom
+              :effect="themes"
               :predefine="state.predefineColors"
               @change="changeStylePre('borderColor')"
             >
@@ -205,5 +206,3 @@ watch(
     </el-form>
   </el-row>
 </template>
-
-<style scoped lang="less"></style>

core/core-frontend/src/style/index.less

@@ -596,3 +596,10 @@ strong {
   overflow-x: auto;
   overflow-y: hidden;
 }
+
+.form-item-dark {
+  .ed-input-number__decrease,
+  .ed-input-number__increase {
+    color: #a6a6a6;
+  }
+}