From 7efa52f43474e42cf8545402dbd1b761d889e242 Mon Sep 17 00:00:00 2001 From: "zude.hzd" Date: Fri, 21 Aug 2020 14:13:56 +0800 Subject: [PATCH] =?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}