Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: 复选框\单选框支持更换图标 #11191

Merged
merged 8 commits into from
Nov 15, 2024
Merged

feat: 复选框\单选框支持更换图标 #11191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e249f93
feat: 复选框\单选框支持更换图标
qkiroc Nov 12, 2024
1b8b101
bugfix
qkiroc Nov 13, 2024
b383224
更新快照
qkiroc Nov 13, 2024
eb91ae1
bugfix
qkiroc Nov 13, 2024
736a997
bugfix
qkiroc Nov 13, 2024
ca2ac21
bugfix
qkiroc Nov 13, 2024
8f2a323
bugfix
qkiroc Nov 14, 2024
071bf3d
更新快照
qkiroc Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions packages/amis-core/src/utils/helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2404,9 +2404,9 @@ export function formateCheckThemeCss(themeCss: any, type: string) {
Object.keys(className).forEach(key => {
if (key.includes('checked-')) {
const newKey = key.replace('checked-', '');
checkedThemeCss[newKey] = className;
} else if (key.includes('checkbox-')) {
const newKey = key.replace('checkbox-', '');
checkedThemeCss[newKey] = className[key];
} else if (key.includes(`${type}-`)) {
const newKey = key.replace(`${type}-`, '');
defaultThemeCss[newKey] = className[key];
} else {
defaultThemeCss[key] = className[key];
Expand All @@ -2416,9 +2416,11 @@ export function formateCheckThemeCss(themeCss: any, type: string) {
if (key.includes('checked-')) {
const newKey = key.replace('checked-', '');
checkedControlThemeCss[newKey] = controlClassName[key];
} else if (key.includes('checkbox-')) {
const newKey = key.replace('checkbox-', '');
} else if (key.includes(`${type}-`)) {
const newKey = key.replace(`${type}-`, '');
defaultControlThemeCss[newKey] = controlClassName[key];
} else {
defaultControlThemeCss[key] = controlClassName[key];
}
});
return {
Expand Down
101 changes: 91 additions & 10 deletions packages/amis-editor/src/plugin/Form/Checkbox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,53 @@ export class CheckboxControlPlugin extends BasePlugin {
title: '选项样式',
body: [
...inputStateTpl('themeCss.checkboxControlClassName', '', {
fontToken(state) {
const s = state.split('-');
if (s[0] === 'checked') {
return {
'color': `--checkbox-\${optionType}-checked-${s[1]}-text-color`,
'*': '--checkbox-${optionType}-default'
};
}
return {
'color': `--checkbox-\${optionType}-${s[1]}-text-color`,
'*': '--checkbox-${optionType}-default'
};
},
backgroundToken(state) {
const s = state.split('-');
if (s[0] === 'checked') {
return `\${optionType === "button" ? "--checkbox-" + optionType + "-checked-${s[1]}-bg-color" : ""}`;
}
return `\${optionType === "button" ? "--checkbox-" + optionType + "-${s[1]}-bg-color" : ""}`;
},
borderToken(state) {
const s = state.split('-');
const fn = (type: string, checked?: boolean) => {
return `\${optionType === "button" ? "--checkbox-" + optionType + "${
checked ? '-checked' : ''
}-${s[1]}-${type}" : ""}`;
};
if (s[0] === 'checked') {
return {
'topBorderColor': fn('top-border-color', true),
'rightBorderColor': fn('right-border-color', true),
'bottomBorderColor': fn('bottom-border-color', true),
'leftBorderColor': fn('left-border-color', true),
'*': '--checkbox-${optionType}-default'
};
}
return {
'topBorderColor': fn('top-border-color'),
'rightBorderColor': fn('right-border-color'),
'bottomBorderColor': fn('bottom-border-color'),
'leftBorderColor': fn('left-border-color'),
'*': '--checkbox-${optionType}-default'
};
},
radiusToken(state) {
return '${optionType === "button" ? "--checkbox-" + optionType + "-default": "-"}';
},
state: [
{
label: '常规',
Expand Down Expand Up @@ -294,11 +341,32 @@ export class CheckboxControlPlugin extends BasePlugin {
name: 'themeCss.checkboxShowClassName.display',
trueValue: 'none'
},
...inputStateTpl('themeCss.checkboxClassName', '--checkbox', {
...inputStateTpl('themeCss.checkboxClassName', '', {
hideFont: true,
hideMargin: true,
hidePadding: true,
hiddenOn: 'themeCss.checkboxShowClassName.display === "none"',
backgroundToken(state) {
const s = state.split('-');
if (s[0] === 'checked') {
return `--checkbox-\${optionType}-checked-${s[1]}-\${optionType ==='button' ? 'icon-' : ''}bg-color`;
}
return `--checkbox-\${optionType}-${s[1]}-\${optionType ==='button' ? 'icon-' : ''}bg-color`;
},
borderToken(state) {
const s = state.split('-');
if (s[0] === 'checked') {
return `--checkbox-\${optionType}-checked-${s[1]}\${optionType ==='button' ? '-icon' : ''}`;
}
return `--checkbox-\${optionType}-${s[1]}\${optionType ==='button' ? '-icon' : ''}`;
},
radiusToken(state) {
const s = state.split('-');
if (s[0] === 'checked') {
return `--checkbox-\${optionType}-checked-${s[1]}`;
}
return `--checkbox-\${optionType}-${s[1]}\${optionType ==='button' ? '-icon' : ''}`;
},
state: [
{
label: '常规',
Expand Down Expand Up @@ -326,34 +394,47 @@ export class CheckboxControlPlugin extends BasePlugin {
}
],
schema: [
{
name: 'themeCss.checkboxShowClassName.--checkbox-default-checked-default-icon',
visibleOn:
'${__editorStatethemeCss.checkboxClassName == "checked-default" || __editorStatethemeCss.checkboxClassName == "checked-hover" || __editorStatethemeCss.checkboxClassName == "checked-disabled"}',
label: '图标',
type: 'icon-select',
returnSvg: true,
noSize: true
},
getSchemaTpl('theme:colorPicker', {
name: 'themeCss.checkboxInnerClassName.border-color:default',
name: 'themeCss.checkboxInnerClassName.color:default',
visibleOn:
'${__editorStatethemeCss.checkboxClassName == "checked-default"}',
label: '对勾颜色',
label: '图标颜色',
labelMode: 'input',
editorValueToken: '--checkbox-button-checked-icon-i-color'
editorValueToken:
'--checkbox-${optionType}-checked-default-icon-color'
}),
getSchemaTpl('theme:colorPicker', {
name: 'themeCss.checkboxInnerClassName.border-color:hover',
name: 'themeCss.checkboxInnerClassName.color:hover',
visibleOn:
'${__editorStatethemeCss.checkboxClassName == "checked-hover"}',
label: '对勾颜色',
label: '图标颜色',
labelMode: 'input',
editorValueToken: '--checkbox-button-checked-icon-i-color'
editorValueToken:
'--checkbox-${optionType}-checked-default-icon-color'
}),
getSchemaTpl('theme:colorPicker', {
name: 'themeCss.checkboxInnerClassName.border-color:disabled',
name: 'themeCss.checkboxInnerClassName.color:disabled',
visibleOn:
'${__editorStatethemeCss.checkboxClassName == "checked-disabled"}',
label: '对勾颜色',
label: '图标颜色',
labelMode: 'input',
editorValueToken: '--checkbox-button-checked-icon-i-color'
editorValueToken:
'--checkbox-${optionType}-checked-disabled-icon-color'
})
]
})
]
},

getSchemaTpl('theme:cssCode'),
getSchemaTpl('style:classNames')
])
Expand Down
100 changes: 90 additions & 10 deletions packages/amis-editor/src/plugin/Form/Checkboxes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,53 @@ export class CheckboxesControlPlugin extends BasePlugin {
title: '选项样式',
body: [
...inputStateTpl('themeCss.checkboxesControlClassName', '', {
fontToken(state) {
const s = state.split('-');
if (s[0] === 'checked') {
return {
'color': `--checkbox-\${optionType}-checked-${s[1]}-text-color`,
'*': '--checkbox-${optionType}-default'
};
}
return {
'color': `--checkbox-\${optionType}-${s[1]}-text-color`,
'*': '--checkbox-${optionType}-default'
};
},
backgroundToken(state) {
const s = state.split('-');
if (s[0] === 'checked') {
return `\${optionType === "button" ? "--checkbox-" + optionType + "-checked-${s[1]}-bg-color" : ""}`;
}
return `\${optionType === "button" ? "--checkbox-" + optionType + "-${s[1]}-bg-color" : ""}`;
},
borderToken(state) {
const s = state.split('-');
const fn = (type: string, checked?: boolean) => {
return `\${optionType === "button" ? "--checkbox-" + optionType + "${
checked ? '-checked' : ''
}-${s[1]}-${type}" : ""}`;
};
if (s[0] === 'checked') {
return {
'topBorderColor': fn('top-border-color', true),
'rightBorderColor': fn('right-border-color', true),
'bottomBorderColor': fn('bottom-border-color', true),
'leftBorderColor': fn('left-border-color', true),
'*': '--checkbox-${optionType}-default'
};
}
return {
'topBorderColor': fn('top-border-color'),
'rightBorderColor': fn('right-border-color'),
'bottomBorderColor': fn('bottom-border-color'),
'leftBorderColor': fn('left-border-color'),
'*': '--checkbox-${optionType}-default'
};
},
radiusToken(state) {
return '${optionType === "button" ? "--checkbox-" + optionType + "-default": "-"}';
},
state: [
{
label: '常规',
Expand Down Expand Up @@ -311,12 +358,33 @@ export class CheckboxesControlPlugin extends BasePlugin {
name: 'themeCss.checkboxesShowClassName.display',
trueValue: 'none'
},
...inputStateTpl('themeCss.checkboxesClassName', '--checkbox', {
...inputStateTpl('themeCss.checkboxesClassName', '', {
hideFont: true,
hideMargin: true,
hidePadding: true,
hiddenOn:
'themeCss.checkboxesShowClassName.display === "none"',
backgroundToken(state) {
const s = state.split('-');
if (s[0] === 'checked') {
return `--checkbox-\${optionType}-checked-${s[1]}-\${optionType ==='button' ? 'icon-' : ''}bg-color`;
}
return `--checkbox-\${optionType}-${s[1]}-\${optionType ==='button' ? 'icon-' : ''}bg-color`;
},
borderToken(state) {
const s = state.split('-');
if (s[0] === 'checked') {
return `--checkbox-\${optionType}-checked-${s[1]}\${optionType ==='button' ? '-icon' : ''}`;
}
return `--checkbox-\${optionType}-${s[1]}\${optionType ==='button' ? '-icon' : ''}`;
},
radiusToken(state) {
const s = state.split('-');
if (s[0] === 'checked') {
return `--checkbox-\${optionType}-checked-${s[1]}`;
}
return `--checkbox-\${optionType}-${s[1]}\${optionType ==='button' ? '-icon' : ''}`;
},
state: [
{
label: '常规',
Expand Down Expand Up @@ -344,29 +412,41 @@ export class CheckboxesControlPlugin extends BasePlugin {
}
],
schema: [
{
name: 'themeCss.checkboxesShowClassName.--checkbox-default-checked-default-icon',
visibleOn:
'${__editorStatethemeCss.checkboxesClassName == "checked-default" || __editorStatethemeCss.checkboxesClassName == "checked-hover" || __editorStatethemeCss.checkboxesClassName == "checked-disabled"}',
label: '图标',
type: 'icon-select',
returnSvg: true,
noSize: true
},
getSchemaTpl('theme:colorPicker', {
name: 'themeCss.checkboxesInnerClassName.border-color:default',
name: 'themeCss.checkboxesInnerClassName.color:default',
visibleOn:
'${__editorStatethemeCss.checkboxesClassName == "checked-default"}',
label: '对勾颜色',
label: '图标颜色',
labelMode: 'input',
editorValueToken: '--checkbox-button-checked-icon-i-color'
editorValueToken:
'--checkbox-${optionType}-checked-default-icon-color'
}),
getSchemaTpl('theme:colorPicker', {
name: 'themeCss.checkboxesInnerClassName.border-color:hover',
name: 'themeCss.checkboxesInnerClassName.color:hover',
visibleOn:
'${__editorStatethemeCss.checkboxesClassName == "checked-hover"}',
label: '对勾颜色',
label: '图标颜色',
labelMode: 'input',
editorValueToken: '--checkbox-button-checked-icon-i-color'
editorValueToken:
'--checkbox-${optionType}-checked-default-icon-color'
}),
getSchemaTpl('theme:colorPicker', {
name: 'themeCss.checkboxesInnerClassName.border-color:disabled',
name: 'themeCss.checkboxesInnerClassName.color:disabled',
visibleOn:
'${__editorStatethemeCss.checkboxesClassName == "checked-disabled"}',
label: '对勾颜色',
label: '图标颜色',
labelMode: 'input',
editorValueToken: '--checkbox-button-checked-icon-i-color'
editorValueToken:
'--checkbox-${optionType}-checked-disabled-icon-color'
})
]
})
Expand Down
Loading
Loading