From 76fb0b37c353c317b5d68bc36b08611df9683d9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=A5=E5=B8=8C?= Date: Wed, 19 Aug 2020 11:21:06 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix:=20=F0=9F=90=9B=20after=20event=20name?= =?UTF-8?q?=20&=20TabItem=20parent=20limitation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/demo/public/assets.json | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/packages/demo/public/assets.json b/packages/demo/public/assets.json index f60a34342..fc53c273d 100644 --- a/packages/demo/public/assets.json +++ b/packages/demo/public/assets.json @@ -11224,7 +11224,10 @@ ], "configure": { "component": { - "isContainer": true + "isContainer": true, + "nestingRule": { + "parentWhitelist": ["Tab"] + } } } }, @@ -11323,6 +11326,11 @@ "propType": "bool", "description": "是否开启动效" }, + { + "name": "afterAppear", + "propType": "func", + "description": "标签出现动画结束后执行的回调" + }, { "name": "onClick", "propType": "func", @@ -11433,6 +11441,11 @@ "propType": "func", "description": "点击回调" }, + { + "name": "afterClose", + "propType": "func", + "description": "标签关闭后执行的回调" + }, { "name": "children", "propType": "string", @@ -12038,7 +12051,7 @@ "propType": "func", "description": "拖拽排序时触发的回调函数" } - + ], "configure": { "props": { From 5ecacef4a44d4d64a171d6f489254ecaf524277b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=A5=E5=B8=8C?= Date: Wed, 19 Aug 2020 15:15:59 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Menu=20Items?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/demo/public/assets.json | 295 ++++++++++++------------------- 1 file changed, 110 insertions(+), 185 deletions(-) diff --git a/packages/demo/public/assets.json b/packages/demo/public/assets.json index fc53c273d..e55fe5e35 100644 --- a/packages/demo/public/assets.json +++ b/packages/demo/public/assets.json @@ -7206,11 +7206,6 @@ "subName": "" }, "props": [ - { - "name": "prefix", - "propType": "string", - "defaultValue": "next-" - }, { "name": "pure", "propType": "bool", @@ -7224,14 +7219,6 @@ "name": "className", "propType": "string" }, - { - "name": "children", - "propType": { - "type": "instanceOf", - "value": "node" - }, - "description": "菜单项和子菜单" - }, { "name": "onItemClick", "propType": "func", @@ -7244,8 +7231,8 @@ "value": [ "string", { - "type": "instanceOf", - "value": "array" + "type": "arrayOf", + "value": "string" } ] }, @@ -7258,8 +7245,8 @@ "value": [ "string", { - "type": "instanceOf", - "value": "array" + "type": "arrayOf", + "value": "string" } ] }, @@ -7348,27 +7335,11 @@ "description": "弹层的对齐方式", "defaultValue": "follow" }, - { - "name": "popupProps", - "propType": { - "type": "oneOfType", - "value": [ - "object", - "func" - ] - }, - "description": "弹层自定义 props" - }, { "name": "popupClassName", "propType": "string", "description": "弹出子菜单自定义 className" }, - { - "name": "popupStyle", - "propType": "object", - "description": "弹出子菜单自定义 style" - }, { "name": "selectedKeys", "propType": { @@ -7376,8 +7347,8 @@ "value": [ "string", { - "type": "instanceOf", - "value": "array" + "type": "arrayOf", + "value": "string" } ] }, @@ -7390,8 +7361,8 @@ "value": [ "string", { - "type": "instanceOf", - "value": "array" + "type": "arrayOf", + "value": "string" } ] }, @@ -7467,24 +7438,14 @@ "description": "横向菜单模式下，是否维持在一行，即超出一行折叠成 SubMenu 显示， 仅在 direction='hoz' mode='popup' 时生效", "defaultValue": false }, - { - "name": "renderMore", - "propType": "func" - }, { "name": "header", - "propType": { - "type": "instanceOf", - "value": "node" - }, + "propType": "node", "description": "自定义菜单头部" }, { "name": "footer", - "propType": { - "type": "instanceOf", - "value": "node" - }, + "propType": "node", "description": "自定义菜单尾部" }, { @@ -7543,7 +7504,7 @@ }, { "componentName": "SubMenu", - "title": "SubMenu", + "title": "子菜单", "docUrl": "", "screenshot": "", "npm": { @@ -7557,36 +7518,12 @@ "props": [ { "name": "_key", - "propType": "string" - }, - { - "name": "root", - "propType": "object" - }, - { - "name": "level", - "propType": "number" - }, - { - "name": "inlineLevel", - "propType": "number" - }, - { - "name": "groupIndent", - "propType": "number", - "defaultValue": 0 - }, - { - "name": "noIcon", - "propType": "bool", - "defaultValue": false + "propType": "string", + "description": "子菜单标识符" }, { "name": "label", - "propType": { - "type": "instanceOf", - "value": "node" - }, + "propType": "node", "description": "标签内容" }, { @@ -7606,61 +7543,19 @@ }, "description": "子菜单打开方式，如果设置会覆盖 Menu 上的同名属性\n@default Menu 的 mode 属性值" }, - { - "name": "children", - "propType": { - "type": "instanceOf", - "value": "node" - }, - "description": "菜单项或下一级子菜单" - }, - { - "name": "onMouseEnter", - "propType": "func" - }, - { - "name": "onMouseLeave", - "propType": "func" - }, - { - "name": "subMenuContentClassName", - "propType": "string" - }, - { - "name": "triggerType", - "propType": { - "type": "oneOf", - "value": [ - "click", - "hover" - ] - } - }, - { - "name": "align", - "propType": { - "type": "oneOf", - "value": [ - "outside", - "follow" - ] - } - }, - { - "name": "parentMode", - "propType": { - "type": "oneOf", - "value": [ - "inline", - "popup" - ] - } - }, { "name": "style", "propType": "object" } - ] + ], + "configure": { + "component": { + "isContainer": true, + "nestingRule": { + "parentWhitelist": ["Menu", "SubMenu", "Menu.Group", "MenuButton"] + } + } + } }, { "componentName": "Menu.Item", @@ -7680,22 +7575,6 @@ "name": "_key", "propType": "string" }, - { - "name": "root", - "propType": "object" - }, - { - "name": "selected", - "propType": "bool" - }, - { - "name": "onSelect", - "propType": "func" - }, - { - "name": "inlineIndent", - "propType": "number" - }, { "name": "disabled", "propType": "bool", @@ -7710,44 +7589,19 @@ }, "description": "帮助文本" }, - { - "name": "children", - "propType": { - "type": "instanceOf", - "value": "node" - }, - "description": "菜单项标签内容" - }, - { - "name": "className", - "propType": "string" - }, - { - "name": "onKeyDown", - "propType": "func" - }, - { - "name": "onClick", - "propType": "func" - }, - { - "name": "needIndent", - "propType": "bool", - "defaultValue": true - }, - { - "name": "hasSelectedIcon", - "propType": "bool" - }, - { - "name": "isSelectIconRight", - "propType": "bool" - }, { "name": "style", "propType": "object" } - ] + ], + "configure": { + "component": { + "isContainer": true, + "nestingRule": { + "parentWhitelist": ["Menu", "SubMenu", "Menu.Group", "MenuButton"] + } + } + } }, { "componentName": "CheckboxItem", @@ -7811,7 +7665,15 @@ "name": "style", "propType": "object" } - ] + ], + "configure": { + "component": { + "isContainer": true, + "nestingRule": { + "parentWhitelist": ["Menu", "SubMenu", "Menu.Group", "MenuButton"] + } + } + } }, { "componentName": "RadioItem", @@ -7864,7 +7726,15 @@ "name": "style", "propType": "object" } - ] + ], + "configure": { + "component": { + "isContainer": true, + "nestingRule": { + "parentWhitelist": ["Menu", "SubMenu", "Menu.Group", "MenuButton"] + } + } + } }, { "componentName": "PopupItem", @@ -7958,7 +7828,15 @@ "name": "style", "propType": "object" } - ] + ], + "configure": { + "component": { + "isContainer": true, + "nestingRule": { + "parentWhitelist": ["Menu", "SubMenu", "Menu.Group", "MenuButton"] + } + } + } }, { "componentName": "Menu.Group", @@ -8012,7 +7890,15 @@ "name": "style", "propType": "object" } - ] + ], + "configure": { + "component": { + "isContainer": true, + "nestingRule": { + "parentWhitelist": ["Menu", "SubMenu", "Menu.Group", "MenuButton"] + } + } + } }, { "componentName": "Menu.Divider", @@ -8040,7 +7926,15 @@ "name": "style", "propType": "object" } - ] + ], + "configure": { + "component": { + "isContainer": false, + "nestingRule": { + "parentWhitelist": ["Menu", "SubMenu", "Menu.Group", "MenuButton"] + } + } + } }, { "componentName": "MenuButton", @@ -14143,7 +14037,6 @@ "schema": { "componentName": "Menu", "props": { - "prefix": "next-", "defaultOpenKeys": [], "mode": "inline", "triggerType": "click", @@ -14158,7 +14051,13 @@ "hozAlign": "left", "focusable": true, "expandAnimation": true - } + }, + "children": [{ + "componentName": "Menu.Item", + "props": { + }, + "children": "Option" + }] } } ] @@ -14182,6 +14081,32 @@ } ] }, + { + "componentName": "SubMenu", + "title": "菜单", + "icon": "", + "package": "@alifd/next", + "library": "Next", + "snippets": [ + { + "title": "菜单", + "screenshot": "https://alifd.oss-cn-hangzhou.aliyuncs.com/fusion-cool/icons/icon-light/ic_light_menu.png", + "schema": { + "componentName": "SubMenu", + "props": { + "label": "子菜单", + "mode": "inline" + }, + "children": [{ + "componentName": "Menu.Item", + "props": { + }, + "children": "Option" + }] + } + } + ] + }, { "componentName": "Progress", "title": "进度指示器", From 3d40aa22d28d27695aa5fd670ce0ae50a2d6018b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=A5=E5=B8=8C?= Date: Fri, 21 Aug 2020 11:58:09 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix:=20=F0=9F=90=9B=20fix=20Menu=20&=20Menu?= =?UTF-8?q?Button=20assets=20cfg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/demo/public/assets.json | 461 ++++++++++++++----------------- 1 file changed, 202 insertions(+), 259 deletions(-) diff --git a/packages/demo/public/assets.json b/packages/demo/public/assets.json index e55fe5e35..4165448e3 100644 --- a/packages/demo/public/assets.json +++ b/packages/demo/public/assets.json @@ -7206,53 +7206,11 @@ "subName": "" }, "props": [ - { - "name": "pure", - "propType": "bool", - "defaultValue": false - }, - { - "name": "rtl", - "propType": "bool" - }, - { - "name": "className", - "propType": "string" - }, { "name": "onItemClick", "propType": "func", "description": "点击菜单项触发的回调函数\n@param {String} key 点击的菜单项的 key 值\n@param {Object} item 点击的菜单项对象\n@param {Object} event 点击的事件对象" }, - { - "name": "openKeys", - "propType": { - "type": "oneOfType", - "value": [ - "string", - { - "type": "arrayOf", - "value": "string" - } - ] - }, - "description": "当前打开的子菜单的 key 值" - }, - { - "name": "defaultOpenKeys", - "propType": { - "type": "oneOfType", - "value": [ - "string", - { - "type": "arrayOf", - "value": "string" - } - ] - }, - "description": "初始打开的子菜单的 key 值", - "defaultValue": [] - }, { "name": "defaultOpenAll", "propType": "bool", @@ -7340,35 +7298,6 @@ "propType": "string", "description": "弹出子菜单自定义 className" }, - { - "name": "selectedKeys", - "propType": { - "type": "oneOfType", - "value": [ - "string", - { - "type": "arrayOf", - "value": "string" - } - ] - }, - "description": "当前选中菜单项的 key 值" - }, - { - "name": "defaultSelectedKeys", - "propType": { - "type": "oneOfType", - "value": [ - "string", - { - "type": "arrayOf", - "value": "string" - } - ] - }, - "description": "初始选中菜单项的 key 值", - "defaultValue": [] - }, { "name": "onSelect", "propType": "func", @@ -7494,6 +7423,64 @@ { "name": "style", "propType": "object" + }, + { + "name": "openKeys", + "propType": { + "type": "oneOfType", + "value": [ + "string", + { + "type": "arrayOf", + "value": "string" + } + ] + }, + "description": "当前打开的子菜单的 key 值" + }, + { + "name": "defaultOpenKeys", + "propType": { + "type": "oneOfType", + "value": [ + "string", + { + "type": "arrayOf", + "value": "string" + } + ] + }, + "description": "初始打开的子菜单的 key 值", + "defaultValue": [] + }, + { + "name": "selectedKeys", + "propType": { + "type": "oneOfType", + "value": [ + "string", + { + "type": "arrayOf", + "value": "string" + } + ] + }, + "description": "当前选中菜单项的 key 值" + }, + { + "name": "defaultSelectedKeys", + "propType": { + "type": "oneOfType", + "value": [ + "string", + { + "type": "arrayOf", + "value": "string" + } + ] + }, + "description": "初始选中菜单项的 key 值", + "defaultValue": [] } ], "configure": { @@ -7517,7 +7504,7 @@ }, "props": [ { - "name": "_key", + "name": "key", "propType": "string", "description": "子菜单标识符" }, @@ -7559,7 +7546,7 @@ }, { "componentName": "Menu.Item", - "title": "SelectableItem", + "title": "Menu.Item", "docUrl": "", "screenshot": "", "npm": { @@ -7572,8 +7559,9 @@ }, "props": [ { - "name": "_key", - "propType": "string" + "name": "key", + "propType": "string", + "description": "菜单项标识符" }, { "name": "disabled", @@ -7583,10 +7571,7 @@ }, { "name": "helper", - "propType": { - "type": "instanceOf", - "value": "node" - }, + "propType": "node", "description": "帮助文本" }, { @@ -7642,25 +7627,9 @@ }, { "name": "helper", - "propType": { - "type": "instanceOf", - "value": "node" - }, + "propType": "node", "description": "帮助文本" }, - { - "name": "children", - "propType": { - "type": "instanceOf", - "value": "node" - }, - "description": "标签内容" - }, - { - "name": "checkboxDisabled", - "propType": "bool", - "defaultValue": false - }, { "name": "style", "propType": "object" @@ -7708,20 +7677,9 @@ }, { "name": "helper", - "propType": { - "type": "instanceOf", - "value": "node" - }, + "propType": "node", "description": "帮助文本" }, - { - "name": "children", - "propType": { - "type": "instanceOf", - "value": "node" - }, - "description": "标签内容" - }, { "name": "style", "propType": "object" @@ -7737,8 +7695,8 @@ } }, { - "componentName": "PopupItem", - "title": "PopupItem", + "componentName": "Menu.PopupItem", + "title": "Menu.PopupItem", "docUrl": "", "screenshot": "", "npm": { @@ -7751,79 +7709,20 @@ }, "props": [ { - "name": "_key", - "propType": "string" - }, - { - "name": "root", - "propType": "object" - }, - { - "name": "level", - "propType": "number" - }, - { - "name": "hasSubMenu", - "propType": "bool" - }, - { - "name": "noIcon", - "propType": "bool", - "defaultValue": false - }, - { - "name": "rtl", - "propType": "bool" - }, - { - "name": "selectable", - "propType": "bool", - "defaultValue": false + "name": "key", + "propType": "string", + "description": "菜单项标识符" }, { "name": "label", - "propType": { - "type": "instanceOf", - "value": "node" - }, + "propType": "node", "description": "标签内容" }, { "name": "children", - "propType": { - "type": "instanceOf", - "value": "node" - }, + "propType": "node", "description": "自定义弹层内容" }, - { - "name": "className", - "propType": "string" - }, - { - "name": "triggerType", - "propType": { - "type": "oneOf", - "value": [ - "click", - "hover" - ] - } - }, - { - "name": "align", - "propType": { - "type": "oneOf", - "value": [ - "outside", - "follow" - ] - } - }, - { - "name": "autoWidth", - "propType": "bool" - }, { "name": "style", "propType": "object" @@ -7852,14 +7751,6 @@ "subName": "Group" }, "props": [ - { - "name": "root", - "propType": "object" - }, - { - "name": "className", - "propType": "string" - }, { "name": "label", "propType": { @@ -7868,24 +7759,6 @@ }, "description": "标签内容" }, - { - "name": "children", - "propType": { - "type": "instanceOf", - "value": "node" - }, - "description": "菜单项" - }, - { - "name": "parentMode", - "propType": { - "type": "oneOf", - "value": [ - "inline", - "popup" - ] - } - }, { "name": "style", "propType": "object" @@ -7914,14 +7787,6 @@ "subName": "Divider" }, "props": [ - { - "name": "root", - "propType": "object" - }, - { - "name": "className", - "propType": "string" - }, { "name": "style", "propType": "object" @@ -7950,17 +7815,9 @@ "subName": "" }, "props": [ - { - "name": "prefix", - "propType": "string", - "defaultValue": "next-" - }, { "name": "label", - "propType": { - "type": "instanceOf", - "value": "node" - }, + "propType": "string", "description": "按钮上的文本内容" }, { @@ -8024,8 +7881,8 @@ { "name": "defaultSelectedKeys", "propType": { - "type": "instanceOf", - "value": "array" + "type": "arrayOf", + "value": "string" }, "description": "默认激活的菜单项（用法同 Menu 非受控）", "defaultValue": [] @@ -8033,8 +7890,8 @@ { "name": "selectedKeys", "propType": { - "type": "instanceOf", - "value": "array" + "type": "arrayOf", + "value": "string" }, "description": "激活的菜单项（用法同 Menu 受控）" }, @@ -8067,16 +7924,13 @@ { "name": "style", "propType": "object" - }, - { - "name": "className", - "propType": "string" - }, - { - "name": "children", - "propType": "any" } - ] + ], + "configure": { + "component": { + "isContainer": true + } + } }, { "componentName": "Message", @@ -8206,34 +8060,13 @@ "subName": "" }, "props": [ - { - "name": "prefix", - "propType": "string", - "defaultValue": "next-" - }, - { - "name": "pure", - "propType": "bool", - "defaultValue": false - }, - { - "name": "rtl", - "propType": "bool" - }, - { - "name": "className", - "propType": "string" - }, { "name": "style", "propType": "object" }, { "name": "children", - "propType": { - "type": "instanceOf", - "value": "node" - }, + "propType": "node", "description": "导航项和子导航" }, { @@ -14062,6 +13895,32 @@ } ] }, + { + "componentName": "SubMenu", + "title": "子菜单", + "icon": "", + "package": "@alifd/next", + "library": "Next", + "snippets": [ + { + "title": "子菜单", + "screenshot": "https://alifd.oss-cn-hangzhou.aliyuncs.com/fusion-cool/icons/icon-light/ic_light_menu.png", + "schema": { + "componentName": "SubMenu", + "props": { + "label": "子菜单", + "mode": "inline" + }, + "children": [{ + "componentName": "Menu.Item", + "props": { + }, + "children": "Option" + }] + } + } + ] + }, { "componentName": "Menu.Item", "title": "菜单项", @@ -14082,20 +13941,81 @@ ] }, { - "componentName": "SubMenu", - "title": "菜单", + "componentName": "CheckboxItem", + "title": "可选中菜单项", "icon": "", "package": "@alifd/next", "library": "Next", "snippets": [ { - "title": "菜单", + "title": "可选中菜单项", "screenshot": "https://alifd.oss-cn-hangzhou.aliyuncs.com/fusion-cool/icons/icon-light/ic_light_menu.png", "schema": { - "componentName": "SubMenu", + "componentName": "CheckboxItem", "props": { - "label": "子菜单", - "mode": "inline" + }, + "children": "Check Option" + } + } + ] + }, + { + "componentName": "RadioItem", + "title": "单选菜单项", + "icon": "", + "package": "@alifd/next", + "library": "Next", + "snippets": [ + { + "title": "单选菜单项", + "screenshot": "https://alifd.oss-cn-hangzhou.aliyuncs.com/fusion-cool/icons/icon-light/ic_light_menu.png", + "schema": { + "componentName": "RadioItem", + "props": { + }, + "children": "Radio Option" + } + } + ] + }, + { + "componentName": "Menu.PopupItem", + "title": "自定义弹出内容", + "icon": "", + "package": "@alifd/next", + "library": "Next", + "snippets": [ + { + "title": "自定义弹出内容", + "screenshot": "https://alifd.oss-cn-hangzhou.aliyuncs.com/fusion-cool/icons/icon-light/ic_light_menu.png", + "schema": { + "componentName": "Menu.PopupItem", + "props": { + "label": "Popup item" + }, + "children": { + "componentName": "Box", + "props": {}, + "children": "Custom content" + } + } + } + ] + }, + { + "componentName": "Menu.Group", + "title": "菜单组", + "icon": "", + "package": "@alifd/next", + "library": "Next", + "snippets": [ + { + "title": "菜单组", + "screenshot": "https://alifd.oss-cn-hangzhou.aliyuncs.com/fusion-cool/icons/icon-light/ic_light_menu.png", + "schema": { + "componentName": "Menu.Group", + "props": { + "label": "菜单组" }, "children": [{ "componentName": "Menu.Item", @@ -14107,6 +14027,23 @@ } ] }, + { + "componentName": "Menu.Divider", + "title": "菜单分隔线", + "icon": "", + "package": "@alifd/next", + "library": "Next", + "snippets": [ + { + "title": "菜单分隔线", + "screenshot": "https://alifd.oss-cn-hangzhou.aliyuncs.com/fusion-cool/icons/icon-light/ic_light_menu.png", + "schema": { + "componentName": "Menu.Divider", + "props": {} + } + } + ] + }, { "componentName": "Progress", "title": "进度指示器", @@ -14664,7 +14601,13 @@ "autoWidth": true, "popupTriggerType": "click", "defaultSelectedKeys": [] - } + }, + "children": [{ + "componentName": "Menu.Item", + "props": { + }, + "children": "Option" + }] } } ] From 7efa52f43474e42cf8545402dbd1b761d889e242 Mon Sep 17 00:00:00 2001 From: "zude.hzd" Date: Fri, 21 Aug 2020 14:13:56 +0800 Subject: [PATCH 4/7] =?UTF-8?q?feat:=20tree=20=E7=BB=84=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/demo/public/assets.json | 53 ++++--------------- .../src/function-setter/index.tsx | 2 +- .../editor-setters/src/json-setter/index.tsx | 2 +- 3 files changed, 11 insertions(+), 46 deletions(-) diff --git a/packages/demo/public/assets.json b/packages/demo/public/assets.json index 61d6d848e..41ddd555b 100644 --- a/packages/demo/public/assets.json +++ b/packages/demo/public/assets.json @@ -12032,38 +12032,14 @@ "subName": "" }, "props": [ - { - "name": "prefix", - "propType": "string", - "defaultValue": "next-" - }, - { - "name": "rtl", - "propType": "bool", - "defaultValue": false - }, - { - "name": "pure", - "propType": "bool", - "defaultValue": false - }, { "name": "className", "propType": "string" }, - { - "name": "children", - "propType": { - "type": "instanceOf", - "value": "node" - }, - "description": "树节点" - }, { "name": "dataSource", "propType": { - "type": "instanceOf", - "value": "array" + "type": "Json" }, "description": "数据源，该属性优先级高于 children" }, @@ -12187,22 +12163,22 @@ { "name": "canDrop", "propType": "func", - "description": "节点是否可被作为拖拽的目标节点\n@param {Object} info 拖拽信息\n@param {Object} info.node 目标节点\n@param {Object} info.dragNode 拖拽的节点\n@param {Array} info.dragNodesKeys 拖拽的节点和其子节点 key 的数组\n@param {Number} info.dropPosition 放置位置，-1代表当前节点前，0代表当前节点里，1代表当前节点后\n@return {Boolean} 是否可以被当作目标节点" + "description": "节点是否可被作为拖拽的目标节点" }, { "name": "loadData", "propType": "func", - "description": "异步加载数据的函数\n@param {Object} node 被点击展开的节点" + "description": "异步加载数据的函数" }, { "name": "filterTreeNode", "propType": "func", - "description": "按需筛选高亮节点\n@param {Object} node 待筛选的节点\n@return {Boolean} 是否被筛选中" + "description": "按需筛选高亮节点" }, { "name": "onRightClick", "propType": "func", - "description": "右键点击节点时触发的回调函数\n@param {Object} info 信息对象\n@param {Object} info.event 事件对象\n@param {Object} info.node 点击的节点" + "description": "右键点击节点时触发的回调函数" }, { "name": "isLabelBlock", @@ -12212,13 +12188,7 @@ }, { "name": "isNodeBlock", - "propType": { - "type": "oneOfType", - "value": [ - "bool", - "object" - ] - }, + "propType": "bool", "description": "设置节点是否占满一行", "defaultValue": false }, @@ -12236,17 +12206,12 @@ { "name": "renderChildNodes", "propType": "func", - "description": "渲染子节点\n@param {Array} nodes 所有的子节点\n@return {ReactNode} 返回节点" + "description": "渲染子节点" }, { - "name": "focusable", + "name": "useVirtual", "propType": "bool", - "defaultValue": true - }, - { - "name": "autoFocus", - "propType": "bool", - "defaultValue": false + "description": "是否开启虚拟滚动" }, { "name": "onItemFocus", diff --git a/packages/editor-setters/src/function-setter/index.tsx b/packages/editor-setters/src/function-setter/index.tsx index a14ec6186..6e62ffdaa 100644 --- a/packages/editor-setters/src/function-setter/index.tsx +++ b/packages/editor-setters/src/function-setter/index.tsx @@ -72,7 +72,7 @@ export default class FunctionSetter extends PureComponent { - return + return } focusFunctionName = (functionName) => { diff --git a/packages/editor-setters/src/json-setter/index.tsx b/packages/editor-setters/src/json-setter/index.tsx index c455e232e..da91943fa 100644 --- a/packages/editor-setters/src/json-setter/index.tsx +++ b/packages/editor-setters/src/json-setter/index.tsx @@ -217,7 +217,7 @@ class MonacoEditorDefaultView extends PureComponent { width="100%" height="300" language={tarLanguage} - theme={theme || window.__monacoTheme || 'vs-dark'} + theme={theme || window.__monacoTheme} options={isFullScreen ? this.fullScreenOptions : this.options} onChange={this.onChange} editorWillMount={editorWillMount} From 8c3692858008a871dca6c7cc3ecf88e218db3ee1 Mon Sep 17 00:00:00 2001 From: "zude.hzd" Date: Fri, 21 Aug 2020 15:16:44 +0800 Subject: [PATCH 5/7] =?UTF-8?q?feat:=20=E9=80=82=E9=85=8DTreeNode=E8=8A=82?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/demo/public/assets.json | 81 +++----------------------------- 1 file changed, 7 insertions(+), 74 deletions(-) diff --git a/packages/demo/public/assets.json b/packages/demo/public/assets.json index 41ddd555b..0fcc94d0f 100644 --- a/packages/demo/public/assets.json +++ b/packages/demo/public/assets.json @@ -12250,19 +12250,6 @@ "subName": "Node" }, "props": [ - { - "name": "_key", - "propType": "string" - }, - { - "name": "prefix", - "propType": "string" - }, - { - "name": "rtl", - "propType": "bool", - "defaultValue": false - }, { "name": "className", "propType": "string" @@ -12278,8 +12265,11 @@ { "name": "label", "propType": { - "type": "instanceOf", - "value": "node" + "type": "oneOfType", + "value": [ + "string", + "node" + ] }, "description": "节点文本内容", "defaultValue": "---" @@ -12319,65 +12309,8 @@ { "name": "isLeaf", "propType": "bool", - "description": "是否是叶子节点，设置loadData时生效", + "description": "是否是叶子节点", "defaultValue": false - }, - { - "name": "root", - "propType": "object" - }, - { - "name": "eventKey", - "propType": "string" - }, - { - "name": "pos", - "propType": "string" - }, - { - "name": "expanded", - "propType": "bool" - }, - { - "name": "selected", - "propType": "bool" - }, - { - "name": "checked", - "propType": "bool" - }, - { - "name": "indeterminate", - "propType": "bool" - }, - { - "name": "dragOver", - "propType": "bool" - }, - { - "name": "dragOverGapTop", - "propType": "bool" - }, - { - "name": "dragOverGapBottom", - "propType": "bool" - }, - { - "name": "parentNode", - "propType": "object" - }, - { - "name": "onKeyDown", - "propType": "func" - }, - { - "name": "size", - "propType": "number", - "defaultValue": 1 - }, - { - "name": "style", - "propType": "object" } ] }, @@ -14348,7 +14281,7 @@ "schema": { "componentName": "TreeNode", "props": { - "prefix": "next-" + "label": "节点内容文本" } } } From 77b0b2ccecaf3248b8af5bfd4acf482d5d488439 Mon Sep 17 00:00:00 2001 From: "zude.hzd" Date: Fri, 21 Aug 2020 16:44:59 +0800 Subject: [PATCH 6/7] fix: add FaultComponent style --- packages/react-renderer/src/index.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/react-renderer/src/index.js b/packages/react-renderer/src/index.js index 75ceb844c..d2fcd1a55 100644 --- a/packages/react-renderer/src/index.js +++ b/packages/react-renderer/src/index.js @@ -30,7 +30,16 @@ class FaultComponent extends PureComponent { render() { // FIXME: errorlog console.error('render error', this.props); - return
RenderError
; + return
组件渲染异常，请查看控制台日志
; + } } From 436dadd73480f711de418b44acd4cf68aa4c6ca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=A5=E5=B8=8C?= Date: Fri, 21 Aug 2020 16:49:21 +0800 Subject: [PATCH 7/7] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Timeline=20asset=20co?= =?UTF-8?q?nfig?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/demo/public/assets.json | 117 +++++++++---------------------- 1 file changed, 35 insertions(+), 82 deletions(-) diff --git a/packages/demo/public/assets.json b/packages/demo/public/assets.json index 4165448e3..a6d2e836a 100644 --- a/packages/demo/public/assets.json +++ b/packages/demo/public/assets.json @@ -11449,44 +11449,28 @@ "subName": "" }, "props": [ - { - "name": "prefix", - "propType": "string", - "description": "样式的品牌前缀", - "defaultValue": "next-" - }, - { - "name": "rtl", - "propType": "bool", - "defaultValue": false - }, { "name": "fold", "propType": { - "type": "instanceOf", - "value": "array" + "type": "arrayOf", + "value": { + "type": "exact", + "value": [{ + "name": "foldArea", + "propType": { + "type": "arrayOf", + "value": "number" + } + }, { + "name": "foldShow", + "propType": "bool" + }] + + } }, "description": "自定义折叠选项 示例`[{foldArea: [startIndex, endIndex], foldShow: boolean}]`", "defaultValue": [] }, - { - "name": "className", - "propType": "string", - "description": "自定义类名" - }, - { - "name": "children", - "propType": "any" - }, - { - "name": "locale", - "propType": "object" - }, - { - "name": "animation", - "propType": "bool", - "defaultValue": true - }, { "name": "style", "propType": "object" @@ -11494,7 +11478,10 @@ ], "configure": { "component": { - "isContainer": true + "isContainer": true, + "nestingRule": { + "childWhitelist": ["TimelineItem"] + } } } }, @@ -11512,27 +11499,6 @@ "subName": "Item" }, "props": [ - { - "name": "prefix", - "propType": "string", - "defaultValue": "next-" - }, - { - "name": "index", - "propType": "number" - }, - { - "name": "total", - "propType": "number" - }, - { - "name": "folderIndex", - "propType": "number" - }, - { - "name": "foldShow", - "propType": "bool" - }, { "name": "state", "propType": { @@ -11554,56 +11520,35 @@ }, { "name": "dot", - "propType": { - "type": "instanceOf", - "value": "node" - }, + "propType": "node", "description": "自定义时间轴节点" }, { "name": "time", - "propType": { - "type": "instanceOf", - "value": "node" - }, + "propType": "string", "description": "格式化后的时间" }, { "name": "title", "propType": { - "type": "instanceOf", - "value": "node" + "type": "oneOfType", + "value": ["string", "node"] }, "description": "标题" }, { "name": "timeLeft", - "propType": { - "type": "instanceOf", - "value": "node" - }, + "propType": "string", "description": "左侧时间" }, { "name": "content", "propType": { - "type": "instanceOf", - "value": "node" + "type": "oneOfType", + "value": ["string", "node"] }, "description": "右侧内容" }, - { - "name": "toggleFold", - "propType": "func" - }, - { - "name": "className", - "propType": "string" - }, - { - "name": "locale", - "propType": "object" - }, { "name": "animation", "propType": "bool", @@ -11614,7 +11559,15 @@ "name": "style", "propType": "object" } - ] + ], + "configure": { + "component": { + "isContainer": false, + "nestingRule": { + "parentWhitelist": ["Timeline"] + } + } + } }, { "componentName": "Transfer",