diff --git a/uni_modules/cool-ui/components/cl-button/cl-button.uvue b/uni_modules/cool-ui/components/cl-button/cl-button.uvue index ff7963c..9e59ab2 100644 --- a/uni_modules/cool-ui/components/cl-button/cl-button.uvue +++ b/uni_modules/cool-ui/components/cl-button/cl-button.uvue @@ -312,7 +312,13 @@ const emit = defineEmits([ ]); const slots = useSlots(); -const { cache } = useCache(() => [props.type, props.text, props.disabled, props.loading]); +const { cache } = useCache(() => [ + props.type, + props.text, + props.disabled, + props.loading, + props.color +]); // 样式穿透类型 type PassThrough = { diff --git a/uni_modules/cool-ui/components/cl-loading/cl-loading.uvue b/uni_modules/cool-ui/components/cl-loading/cl-loading.uvue index 2c1b7aa..e185a49 100644 --- a/uni_modules/cool-ui/components/cl-loading/cl-loading.uvue +++ b/uni_modules/cool-ui/components/cl-loading/cl-loading.uvue @@ -3,7 +3,7 @@ class="cl-loading" :class="[ { - 'is-dark': isDark && color == '', + 'cl-loading--dark': isDark && color == '', 'cl-loading--spin': loading, '!border-primary-500': color == 'primary', '!border-green-500': color == 'success', @@ -23,7 +23,10 @@ // #endif height: parseRpx(size!), width: parseRpx(size!), - borderColor: color + borderTopColor: color, + borderRightColor: 'transparent', + borderBottomColor: color, + borderLeftColor: color }" v-if="loading" > @@ -113,8 +116,9 @@ onMounted(() => { @apply border-surface-700 border-solid; border-width: 2rpx; - &.is-dark { - @apply border-white; + &--dark { + border-color: white !important; + border-right-color: transparent !important; } // #ifdef H5 || MP