浏览代码

合并分支

tongshangming 2 月之前
父节点
当前提交
f09e2815d8
共有 2 个文件被更改,包括 3 次插入4 次删除
  1. 2 2
      src/components/form/FormTitle.vue
  2. 1 2
      src/views/form/Basic.vue

+ 2 - 2
src/components/form/FormTitle.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 // 颜色  插槽
-import color from '@/utils/color'
+import colorUtil from '@/utils/color'
 
 const props: any = withDefaults(
   defineProps<{
@@ -15,7 +15,7 @@ const props: any = withDefaults(
 )
 
 const bgColor = computed(() => {
-  return props.color ? color.lighten(props.color, 0.6) : `var(--el-color-${props.type}-light-9)`
+  return props.color ? colorUtil.lighten(props.color, 0.6) : `var(--el-color-${props.type}-light-9)`
 })
 
 const titleColor = computed(() => {

+ 1 - 2
src/views/form/Basic.vue

@@ -36,8 +36,7 @@ const formConfig = reactive<BasicForm>({
       notFormItem: true,
       props: {
         title: '基础表单',
-        type: 'success',
-        color: '#0366d6'
+        type: 'success'
       },
       formItemProps: {
         labelWidth: '0px'