From 7a77c55167865353273e0edeac65fd3e2a09aea4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=91=E7=A6=85?= Date: Mon, 18 May 2020 21:20:55 +0800 Subject: [PATCH] use registerSetter from lowcode-editor-core --- packages/demo/public/assets.json | 21 ++++++++++++++----- packages/demo/src/editor/index.tsx | 2 +- .../designer/src/designer/setting/utils.js | 2 +- packages/editor-preset-general/src/index.ts | 5 ++++- packages/editor-setters/src/index.tsx | 2 +- packages/plugin-source-editor/src/index.tsx | 2 +- 6 files changed, 24 insertions(+), 10 deletions(-) diff --git a/packages/demo/public/assets.json b/packages/demo/public/assets.json index a2eae1a6a..2008593ea 100644 --- a/packages/demo/public/assets.json +++ b/packages/demo/public/assets.json @@ -40,7 +40,13 @@ } }, { - "componentName": "Div", + "componentName": "Card", + "npm": { + "package": "@alifd/next", + "version": "1.19.18", + "destructuring": true, + "exportName": "Card" + }, "title": "容器", "configure": { "component": { @@ -197,6 +203,10 @@ "exportName": "Input" }, "props": [{ + "name": "value", + "propType": "string", + "description": "" + },{ "name": "label", "propType": "node", "description": "label" @@ -1503,7 +1513,7 @@ "children": [{ "componentName": "Button", "title": "按钮", - "icon": "", + "icon": "add", "package": "@alife/next", "library": "Next", "snippets": [{ @@ -1532,7 +1542,8 @@ "schema": { "componentName": "Button", "props": { - "type": "normal" + "type": "normal", + "value": "normal" }, "children": "normal" } @@ -1588,7 +1599,7 @@ "title": "其他", "icon": "", "children": [{ - "componentName": "Div", + "componentName": "Card", "library": "Next", "title": "容器", "icon": "", @@ -1596,7 +1607,7 @@ "title": "默认", "screenshot": "", "schema": { - "componentName": "Div", + "componentName": "Card", "props": {} } }] diff --git a/packages/demo/src/editor/index.tsx b/packages/demo/src/editor/index.tsx index 041acd148..554cb1e6b 100644 --- a/packages/demo/src/editor/index.tsx +++ b/packages/demo/src/editor/index.tsx @@ -1,5 +1,5 @@ import { render } from 'react-dom'; -import GeneralWorkbench from '@ali/lowcode-editor-preset-general'; +import GeneralWorkbench, { editor } from '../../../editor-preset-general/src'; import config from './config'; import components from './components'; import './global.scss'; diff --git a/packages/designer/src/designer/setting/utils.js b/packages/designer/src/designer/setting/utils.js index ab09545e6..055f2fb8b 100644 --- a/packages/designer/src/designer/setting/utils.js +++ b/packages/designer/src/designer/setting/utils.js @@ -48,7 +48,7 @@ export class Transducer { if (typeof setter === 'string') { setter = getSetter(setter)?.component; if (!setter) { - debugger; + // debugger; } } diff --git a/packages/editor-preset-general/src/index.ts b/packages/editor-preset-general/src/index.ts index c90cdbaeb..79f0dcc48 100644 --- a/packages/editor-preset-general/src/index.ts +++ b/packages/editor-preset-general/src/index.ts @@ -57,7 +57,10 @@ export default function GeneralWorkbench(props: any) { ...props, }); } - +window.__ctx = { + editor, + appHelper: editor, +}; export function init(container?: Element) { if (!container) { container = document.createElement('div'); diff --git a/packages/editor-setters/src/index.tsx b/packages/editor-setters/src/index.tsx index edbc26fd5..474aad89f 100644 --- a/packages/editor-setters/src/index.tsx +++ b/packages/editor-setters/src/index.tsx @@ -1,4 +1,4 @@ -import { registerSetter } from '@ali/lowcode-globals'; +import { registerSetter } from '@ali/lowcode-editor-core'; import { DatePicker, Input, Radio, Select, Switch, NumberPicker } from '@alifd/next'; import ExpressionSetter from './expression-setter'; import ColorSetter from './color-setter'; diff --git a/packages/plugin-source-editor/src/index.tsx b/packages/plugin-source-editor/src/index.tsx index 0a4aaefdb..7db14fce4 100644 --- a/packages/plugin-source-editor/src/index.tsx +++ b/packages/plugin-source-editor/src/index.tsx @@ -58,7 +58,7 @@ export default class SourceEditor extends Component<{ componentWillMount() { const { editor } = this.props; editor.on('leftPanel.show', (key: String) => { - debugger; + // debugger; if (key === 'sourceEditor' && !this.monocoEditor) { this.setState({ isShow: true,