diff --git a/src/_common b/src/_common index a71cdcae4..d2d878e8c 160000 --- a/src/_common +++ b/src/_common @@ -1 +1 @@ -Subproject commit a71cdcae443325613834fbe9a1259c927bd14154 +Subproject commit d2d878e8cb64cb110f383a6177d3af99f372811b diff --git a/src/color-picker/panel/alpha.tsx b/src/color-picker/panel/alpha.tsx index c0048ece1..97e809037 100644 --- a/src/color-picker/panel/alpha.tsx +++ b/src/color-picker/panel/alpha.tsx @@ -48,6 +48,7 @@ export default defineComponent({ rail-style={this.railStyle} max-value={100} disabled={this.disabled} + type="alpha" /> ); }, diff --git a/src/color-picker/panel/format/index.tsx b/src/color-picker/panel/format/index.tsx index 3ff0d5f05..3b3c9e198 100644 --- a/src/color-picker/panel/format/index.tsx +++ b/src/color-picker/panel/format/index.tsx @@ -72,7 +72,8 @@ export default defineComponent({
{ - props.togglePopup?.(false); - }; watch( () => props.mode, (v) => { @@ -44,10 +41,12 @@ export default defineComponent({ return { baseClassName, modeValue, - handleClosePopup, }; }, render() { + if (this.colorModes?.length === 1) { + return null; + } const { baseClassName } = this; return (
@@ -69,15 +68,6 @@ export default defineComponent({ )}
- {this.closeBtn ? ( - - - - ) : null}
); }, diff --git a/src/color-picker/panel/hue.tsx b/src/color-picker/panel/hue.tsx index 427ba0815..e043a014b 100644 --- a/src/color-picker/panel/hue.tsx +++ b/src/color-picker/panel/hue.tsx @@ -26,6 +26,7 @@ export default defineComponent({ value={this.color.hue} handleChange={this.handleChange} disabled={this.disabled} + type="hue" /> ); }, diff --git a/src/color-picker/panel/index.tsx b/src/color-picker/panel/index.tsx index 7ff93c06e..8d1d65847 100644 --- a/src/color-picker/panel/index.tsx +++ b/src/color-picker/panel/index.tsx @@ -323,6 +323,8 @@ export default defineComponent({ ); }; + const isGradient = this.mode === 'linear-gradient'; + return (
- {this.mode === 'linear-gradient' ? ( + {isGradient ? ( ) : null} - - {this.enableAlpha ? ( - - ) : null} +
+
+ + {this.enableAlpha ? ( + + ) : null} +
+
+ +
+
+ , }, + type: { + type: String as PropType<'hue' | 'alpha'>, + default: 'hue', + }, }, setup(props, { emit }) { const baseClassName = useBaseClassName(); @@ -96,12 +100,18 @@ export default defineComponent({ }, render() { const { - baseClassName, className, railStyle, styles, + baseClassName, className, railStyle, styles, type, color, } = this; + const paddingStyle = { + background: `linear-gradient(90deg, rgba(0,0,0,.0) 0%, rgba(0,0,0,.0) 93%, ${color.rgb} 93%, ${color.rgb} 100%)`, + }; return ( -
-
- +
+ {type === 'alpha' &&
} +
+
+ +
); }, diff --git a/test/ssr/__snapshots__/ssr.test.js.snap b/test/ssr/__snapshots__/ssr.test.js.snap index 19066d464..6e1fe1745 100644 --- a/test/ssr/__snapshots__/ssr.test.js.snap +++ b/test/ssr/__snapshots__/ssr.test.js.snap @@ -3309,19 +3309,29 @@ exports[`ssr snapshot test renders ./examples/color-picker/demos/enable-alpha.vu
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
RGB +
+
@@ -3329,28 +3339,28 @@ exports[`ssr snapshot test renders ./examples/color-picker/demos/enable-alpha.vu
-
+
-
+
-
+
-
+
@@ -3508,16 +3518,23 @@ exports[`ssr snapshot test renders ./examples/color-picker/demos/panel.vue corre
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
-
RGB +
+
@@ -3525,21 +3542,21 @@ exports[`ssr snapshot test renders ./examples/color-picker/demos/panel.vue corre
-
+
-
+
-
+
@@ -3699,16 +3716,23 @@ exports[`ssr snapshot test renders ./examples/color-picker/demos/recent-color.vu
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
-
RGB +
+
@@ -3716,21 +3740,21 @@ exports[`ssr snapshot test renders ./examples/color-picker/demos/recent-color.vu
-
+
-
+
-
+
@@ -3911,16 +3935,23 @@ exports[`ssr snapshot test renders ./examples/color-picker/demos/recent-color.vu
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
-
RGB +
+
@@ -3928,21 +3959,21 @@ exports[`ssr snapshot test renders ./examples/color-picker/demos/recent-color.vu
-
+
-
+
-
+
@@ -4111,16 +4142,23 @@ exports[`ssr snapshot test renders ./examples/color-picker/demos/status-readonly
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
-
RGB +
+
@@ -4128,21 +4166,21 @@ exports[`ssr snapshot test renders ./examples/color-picker/demos/status-readonly
-
+
-
+
-
+
@@ -4302,16 +4340,23 @@ exports[`ssr snapshot test renders ./examples/color-picker/demos/swatch-color.vu
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
-
RGB +
+
@@ -4319,21 +4364,21 @@ exports[`ssr snapshot test renders ./examples/color-picker/demos/swatch-color.vu
-
+
-
+
-
+
@@ -4384,16 +4429,23 @@ exports[`ssr snapshot test renders ./examples/color-picker/demos/swatch-color.vu
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
-
RGB +
+
@@ -4401,21 +4453,21 @@ exports[`ssr snapshot test renders ./examples/color-picker/demos/swatch-color.vu
-
+
-
+
-
+
diff --git a/test/unit/color-picker/__snapshots__/demo.test.js.snap b/test/unit/color-picker/__snapshots__/demo.test.js.snap index 7804276a6..6b3861590 100644 --- a/test/unit/color-picker/__snapshots__/demo.test.js.snap +++ b/test/unit/color-picker/__snapshots__/demo.test.js.snap @@ -225,35 +225,62 @@ exports[`ColorPicker ColorPicker enableAlphaVue demo works fine 1`] = `
- -
-
+ class="t-color-picker__sliders" + > +
+
+
+ +
+
+
+
+
+
+ +
+
+
- + class="t-color-picker__sliders-preview t-color-picker--bg-alpha" + > + +
- - RGB - @@ -320,7 +342,7 @@ exports[`ColorPicker ColorPicker enableAlphaVue demo works fine 1`] = ` style="flex: 1;" >
- + class="t-color-picker__sliders" + > +
+
+
+ +
+
+
+
+ +
- - RGB - @@ -1113,7 +1150,7 @@ exports[`ColorPicker ColorPicker panelVue demo works fine 1`] = ` style="flex: 1;" >
- + class="t-color-picker__sliders" + > +
+
+
+ +
+
+
+
+ +
- - RGB - @@ -1885,7 +1937,7 @@ exports[`ColorPicker ColorPicker recentColorVue demo works fine 1`] = ` style="flex: 1;" >
- + class="t-color-picker__sliders" + > +
+
+
+ +
+
+
+
+ +
- - RGB - @@ -2769,7 +2836,7 @@ exports[`ColorPicker ColorPicker recentColorVue demo works fine 1`] = ` style="flex: 1;" >
- + class="t-color-picker__sliders" + > +
+
+
+ +
+
+
+
+ +
- - RGB - @@ -3549,7 +3631,7 @@ exports[`ColorPicker ColorPicker statusReadonlyVue demo works fine 1`] = ` style="flex: 1;" >
- + class="t-color-picker__sliders" + > +
+
+
+ +
+
+
+
+ +
- - RGB - @@ -4324,7 +4421,7 @@ exports[`ColorPicker ColorPicker swatchColorVue demo works fine 1`] = ` style="flex: 1;" >
- + class="t-color-picker__sliders" + > +
+
+
+ +
+
+
+
+ +
- - RGB - @@ -4671,7 +4783,7 @@ exports[`ColorPicker ColorPicker swatchColorVue demo works fine 1`] = ` style="flex: 1;" >