test/amis
1
0
Fork 0
mirror of https://gitee.com/baidu/amis.git synced 2024-12-15 17:31:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

amis-saas-6716 feat:解决冲突 icon-picker=>select

Browse Source 
Change-Id: I8a798cd4bb80b0d08f53afe58f40f1787e367f01
This commit is contained in:
xujiahao01 2022-10-11 15:58:09 +08:00
commit 3d6afde60a
7 changed files with 30 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/amis-editor/src/component/BaseControl.ts
View File

@ -463,12 +463,10 @@ export function remarkTpl(config: {
}
]
},
{
getSchemaTpl('icon', {
name: 'icon',
label: '图标',
type: 'icon-picker',
className: 'fix-icon-picker-overflow'
},
label: '图标'
}),
{
name: 'className',
label: 'CSS 类名',

8
packages/amis-editor/src/plugin/Avatar.tsx
View File

@ -96,13 +96,11 @@ export class AvatarPlugin extends BasePlugin {
className: 'ae-ExtendMore mb-3',
body: [
// 图标
{
label: '图标',
getSchemaTpl('icon', {
name: 'icon',
type: 'icon-picker',
className: 'fix-icon-picker-overflow',
label: '图标',
visibleOn: 'data.showtype === "icon"'
},
}),
// 图片
getSchemaTpl('valueFormula', {
rendererSchema: {

8
packages/amis-editor/src/plugin/Breadcrumb.tsx
View File

@ -73,12 +73,10 @@ export class BreadcrumbPlugin extends BasePlugin {
name: 'href',
placeholder: '链接'
},
{
getSchemaTpl('icon', {
name: 'icon',
label: '图标',
type: 'icon-picker',
className: 'fix-icon-picker-overflow'
}
label: '图标'
})
]
}
]

8
packages/amis-editor/src/plugin/CollapseGroup.tsx
View File

@ -96,18 +96,16 @@ export class CollapseGroupPlugin extends BasePlugin {
autoFocus: false,
form: {
body: [
{
label: '图标',
getSchemaTpl('icon', {
name: 'expandIcon',
type: 'icon-picker',
className: 'fix-icon-picker-overflow',
label: '图标',
pipeIn: (value: any) => value?.icon,
pipeOut: (value: any) => ({
type: 'icon',
vendor: '',
icon: value
})
}
})
]
},
pipeIn: (value: string) => {

36
packages/amis-editor/src/plugin/Form/InputTable.tsx
View File

@ -189,13 +189,11 @@ export class TableControlPlugin extends BasePlugin {
visibleOn: 'data.addable',
pipeIn: defaultValue('')
},
{
getSchemaTpl('icon', {
name: 'addBtnIcon',
label: '增加按钮图标',
type: 'icon-picker',
className: 'fix-icon-picker-overflow',
visibleOn: 'data.addable'
},
}),
getSchemaTpl('api', {
name: 'addApi',
label: '新增时提交的 API',
@ -212,13 +210,11 @@ export class TableControlPlugin extends BasePlugin {
visibleOn: 'data.removable',
pipeIn: defaultValue('')
},
{
getSchemaTpl('icon', {
name: 'deleteBtnIcon',
label: '删除按钮图标',
type: 'icon-picker',
className: 'fix-icon-picker-overflow',
visibleOn: 'data.removable'
},
}),
getSchemaTpl('api', {
name: 'deleteApi',
label: '删除时提交的 API',
@ -235,13 +231,11 @@ export class TableControlPlugin extends BasePlugin {
visibleOn: 'data.editable',
pipeIn: defaultValue('')
},
{
getSchemaTpl('icon', {
name: 'editBtnIcon',
label: '编辑按钮图标',
type: 'icon-picker',
className: 'fix-icon-picker-overflow',
visibleOn: 'data.editable'
},
}),
getSchemaTpl('switch', {
label: '是否可复制',
name: 'copyable'
@ -253,13 +247,11 @@ export class TableControlPlugin extends BasePlugin {
visibleOn: 'data.copyable',
pipeIn: defaultValue('')
},
{
getSchemaTpl('icon', {
name: 'copyBtnIcon',
label: '复制按钮图标',
type: 'icon-picker',
className: 'fix-icon-picker-overflow',
visibleOn: 'data.copyable'
},
}),
getSchemaTpl('api', {
name: 'updateApi',
label: '修改时提交的 API',
@ -272,13 +264,11 @@ export class TableControlPlugin extends BasePlugin {
visibleOn: 'data.editable',
pipeIn: defaultValue('')
},
{
getSchemaTpl('icon', {
name: 'confirmBtnIcon',
label: '确认编辑按钮图标',
type: 'icon-picker',
className: 'fix-icon-picker-overflow',
visibleOn: 'data.editable'
},
}),
{
type: 'input-text',
name: 'cancelBtnLabel',
@ -286,13 +276,11 @@ export class TableControlPlugin extends BasePlugin {
visibleOn: 'data.editable',
pipeIn: defaultValue('')
},
{
getSchemaTpl('icon', {
name: 'cancelBtnIcon',
label: '取消编辑按钮图标',
type: 'icon-picker',
className: 'fix-icon-picker-overflow',
visibleOn: 'data.editable'
},
}),
getSchemaTpl('switch', {
label: '是否可拖拽排序',
name: 'draggable'

8
packages/amis-editor/src/plugin/Nav.tsx
View File

@ -66,12 +66,10 @@ export class NavPlugin extends BasePlugin {
required: true
},
{
type: 'icon-picker',
getSchemaTpl('icon', {
name: 'icon',
label: '图标',
className: 'fix-icon-picker-overflow'
},
label: '图标'
}),
{
type: 'group',

25
packages/amis-editor/src/tpl/common.tsx
View File

@ -509,9 +509,8 @@ setSchemaTpl('expression', {
setSchemaTpl('icon', {
label: '图标',
type: 'icon-picker',
type: 'icon-select',
name: 'icon',
className: 'fix-icon-picker-overflow',
placeholder: '点击选择图标',
clearable: true,
description: ''
@ -1047,31 +1046,13 @@ setSchemaTpl(
'iconLink',
(schema: {name: 'icon' | 'rightIcon'; visibleOn: boolean}) => {
const {name, visibleOn} = schema;
return {
return getSchemaTpl('icon', {
name: name,
visibleOn,
label: '图标',
type: 'icon-picker',
className: 'fix-icon-picker-overflow',
placeholder: '点击选择图标',
clearable: true,
description: ''
};
}
);
setSchemaTpl(
'iconLink',
(schema: {name: 'icon' | 'rightIcon'; visibleOn: boolean}) => {
const {name, visibleOn} = schema;
return {
name: name,
visibleOn,
label: '图标',
type: 'icon-picker',
placeholder: '点击选择图标',
clearable: true,
description: ''
};
});
}
);