1. dialog 添加 rootSelector;

2. dialog  visible prop 的 setter 改为 JSEXpression;
3. 修改组件 icon 样式问题;
This commit is contained in:
金禅 2020-07-30 20:30:41 +08:00
parent dfca7c51e0
commit 85c7254c4e
4 changed files with 40 additions and 15 deletions

View File

@ -1364,6 +1364,7 @@
{ {
"componentName": "Button", "componentName": "Button",
"title": "Button", "title": "Button",
"icon": "https://img.alicdn.com/tfs/TB1rT0gPQL0gK0jSZFAXXcA9pXa-200-200.svg",
"docUrl": "", "docUrl": "",
"screenshot": "", "screenshot": "",
"npm": { "npm": {
@ -1386,6 +1387,7 @@
}, },
{ {
"name": "type", "name": "type",
"title": "类型",
"propType": { "propType": {
"type": "oneOf", "type": "oneOf",
"value": [ "value": [
@ -1399,6 +1401,7 @@
}, },
{ {
"name": "size", "name": "size",
"title": "尺寸",
"propType": { "propType": {
"type": "oneOf", "type": "oneOf",
"value": [ "value": [
@ -1412,6 +1415,7 @@
}, },
{ {
"name": "iconSize", "name": "iconSize",
"title": "Icon 尺寸",
"propType": { "propType": {
"type": "oneOf", "type": "oneOf",
"value": [ "value": [
@ -1425,10 +1429,12 @@
"xxxl" "xxxl"
] ]
}, },
"defaultValue": "small",
"description": "按钮中 Icon 的尺寸,用于替代 Icon 的默认大小" "description": "按钮中 Icon 的尺寸,用于替代 Icon 的默认大小"
}, },
{ {
"name": "htmlType", "name": "htmlType",
"title": "htmlType",
"propType": { "propType": {
"type": "oneOf", "type": "oneOf",
"value": [ "value": [
@ -1456,6 +1462,7 @@
}, },
{ {
"name": "loading", "name": "loading",
"title": "是否 loading",
"propType": "bool", "propType": "bool",
"description": "设置按钮的载入状态", "description": "设置按钮的载入状态",
"defaultValue": false "defaultValue": false
@ -1494,6 +1501,7 @@
}, },
{ {
"name": "onClick", "name": "onClick",
"title": "onClick",
"propType": "func", "propType": "func",
"description": "点击按钮的回调\n@param {Object} e Event Object" "description": "点击按钮的回调\n@param {Object} e Event Object"
}, },
@ -4375,7 +4383,7 @@
}, },
{ {
"name": "visible", "name": "visible",
"propType": "oneOfType", "propType": "JSExpression",
"description": "是否显示", "description": "是否显示",
"defaultValue": false "defaultValue": false
}, },
@ -4562,7 +4570,8 @@
"configure": { "configure": {
"component": { "component": {
"isContainer": true, "isContainer": true,
"isModel": true "isModel": true,
"rootSelector": "div.next-dialog"
} }
} }
}, },
@ -5018,11 +5027,8 @@
}, },
{ {
"name": "label", "name": "label",
"propType": { "propType": "string",
"type": "instanceOf", "description": "标签"
"value": "node"
},
"description": "label 标签的文本"
}, },
{ {
"name": "labelCol", "name": "labelCol",
@ -13152,9 +13158,9 @@
"type": "normal", "type": "normal",
"size": "medium", "size": "medium",
"htmlType": "button", "htmlType": "button",
"component": "button" "component": "button",
}, "children": ["取消"]
"children": "取消" }
} }
}, },
{ {
@ -13416,8 +13422,7 @@
"props": { "props": {
"prefix": "next-", "prefix": "next-",
"children": [ "children": [
"222", "一级"
"222111"
] ]
} }
} }
@ -13639,9 +13644,9 @@
"componentName": "Form.Item", "componentName": "Form.Item",
"props": { "props": {
"style":{ "style":{
"margin-bottom": "0", "marginBottom": "0",
"min-width": "200px", "minWidth": "200px",
"min-height": "28px" "minHeight": "28px"
} }
} }
} }

View File

@ -6,6 +6,11 @@
display: flex; display: flex;
align-items: center; align-items: center;
margin-right: 4px; margin-right: 4px;
img {
width: 16px;
height: 16px;
filter: brightness(0) invert(1)
}
} }
&.only-icon { &.only-icon {
.lc-title-icon { .lc-title-icon {

View File

@ -60,6 +60,14 @@ function propTypeToSetter(propType: PropType): SetterType {
isRequired, isRequired,
initialValue: false, initialValue: false,
}; };
case 'JSExpression':
return {
componentName: 'ExpressionSetter',
initialValue: {
type: 'JSExpression',
value: '',
},
};
case 'oneOf': case 'oneOf':
const dataSource = ((propType as OneOf).value || []).map((value, index) => { const dataSource = ((propType as OneOf).value || []).map((value, index) => {
const t = typeof value; const t = typeof value;

View File

@ -159,6 +159,13 @@
fill: var(--color-icon-normal, rgba(31, 56, 88, 0.4)); fill: var(--color-icon-normal, rgba(31, 56, 88, 0.4));
} }
} }
& > img {
width: 16px;
height: 16px;
* {
fill: var(--color-icon-normal, rgba(31, 56, 88, 0.4));
}
}
} }
.tree-node-title { .tree-node-title {