Merge remote-tracking branch 'origin/release/0.9.18' into feat/rax-miniapp

This commit is contained in:
wanying.jwy 2020-09-14 09:53:22 +08:00
commit d4f8467abd
783 changed files with 47324 additions and 45031 deletions

View File

@ -1,9 +1,9 @@
# http://editorconfig.org
root = true root = true
[*] [*]
indent_style = space indent_style = space
indent_size = 2 indent_size = 2
end_of_line = lf
charset = utf-8 charset = utf-8
trim_trailing_whitespace = true trim_trailing_whitespace = true
insert_final_newline = true insert_final_newline = true

View File

@ -1,7 +1,13 @@
.idea/ # 忽略目录
.vscode/ node_modules
build/ build
dist
es
lib
.* .*
~* ~*
node_modules
# 忽略文件
**/*.min.js
**/*-min.js
**/*.bundle.js

View File

@ -1,3 +0,0 @@
{
"extends": "./node_modules/@ali/lowcode-config/.eslintrc"
}

3
.eslintrc.js Normal file
View File

@ -0,0 +1,3 @@
module.exports = {
extends: 'eslint-config-ali/typescript/react',
};

View File

@ -1,4 +0,0 @@
**/test/**/*.ts
**/test/**/*.js
**/template/**/*.template
**/template/**/*.tpl

View File

@ -1,8 +0,0 @@
{
"trailingComma": "all",
"tabWidth": 2,
"semi": true,
"singleQuote": true,
"printWidth": 120,
"arrowParens": "always"
}

7
.prettierrc.js Normal file
View File

@ -0,0 +1,7 @@
module.exports = {
printWidth: 100,
tabWidth: 2,
semi: true,
singleQuote: true,
trailingComma: 'all',
};

9
.stylelintignore Normal file
View File

@ -0,0 +1,9 @@
# 忽略目录
node_modules/
build/
dist/
# 忽略文件
**/*.min.css
**/*-min.css
**/*.bundle.css

3
.stylelintrc.js Normal file
View File

@ -0,0 +1,3 @@
module.exports = {
extends: 'stylelint-config-ali',
};

View File

@ -1,22 +1,20 @@
## Ali Lowcode Engine阿里低代码引擎 ## Ali Lowcode Engine阿里低代码引擎
[Lerna](https://github.com/lerna/lerna) + [TS](https://www.typescriptlang.org/)
## 开发 ## 开发
#### 创建新包 #### 创建新包
- `./scripts/create.sh <package-name>` - `./scripts/create.sh <package-name>`
#### 跑起来: #### 运行示例
- `npm run setup` - `npm run setup`
- `npm start` - `npm start`
#### 开发提交 #### 开发提交
- `git add <your-files>` - `git add <your-files>`
- `npm run commit` # 在根目录 - `git commit -a "feat: xxx"`
## 发布 ## 发布
@ -24,7 +22,6 @@
## 注意 ## 注意
- Commit 动作尽量使用 `npm run commit`,其内部调用了 `git cz`,方便按语义化版本自动递增,以及自动生成 `CHANGELOG.md`
- `packages` 工程里一些开发时公共依赖(比如:`typescript``ava` 等)会放到工程顶层 - `packages` 工程里一些开发时公共依赖(比如:`typescript``ava` 等)会放到工程顶层
- 工程里的 `.md``test/` 等文件修改不会产生新的发布 - 工程里的 `.md``test/` 等文件修改不会产生新的发布
- 当工程里存在多个 ts 文件的目录时,最终产生的文件会按文件夹形式放到 `lib` - 当工程里存在多个 ts 文件的目录时,最终产生的文件会按文件夹形式放到 `lib`

3
commitlint.config.js Normal file
View File

@ -0,0 +1,3 @@
module.exports = {
extends: ['ali'],
};

View File

@ -12,40 +12,33 @@
"scripts": { "scripts": {
"build": "./scripts/build.sh", "build": "./scripts/build.sh",
"clean": "rm -rf ./packages/*/lib ./packages/*/es ./packages/*/dist ./packages/*/build", "clean": "rm -rf ./packages/*/lib ./packages/*/es ./packages/*/dist ./packages/*/build",
"commit": "git-cz", "lint": "eslint --ext .ts,.tsx,.js,.jsx ./ --quiet",
"lint:fix": "eslint --ext .ts,.tsx,.js,.jsx ./ --quiet --fix",
"pub": "lerna publish --force-publish --cd-version prepatch", "pub": "lerna publish --force-publish --cd-version prepatch",
"setup": "./scripts/setup.sh", "setup": "./scripts/setup.sh",
"start": "./scripts/start.sh", "start": "./scripts/start.sh",
"start:server": "./scripts/start-server.sh", "start:server": "./scripts/start-server.sh",
"test": "lerna run test --stream", "test": "lerna run test --stream",
"test:snapshot": "lerna run test:snapshot" "test:snapshot": "lerna run test:snapshot",
"xima:fix": "xima fix",
"xima:scan": "xima scan"
}, },
"lint-staged": { "husky": {
"*.{tsx,ts}": [ "hooks": {
"eslint --quiet", "commit-msg": "xima exec commitlint -E HUSKY_GIT_PARAMS"
"git add"
]
},
"config": {
"commitizen": {
"path": "node_modules/cz-conventional-changelog"
} }
}, },
"lint-staged": {
"**/*.{css,scss,less}": "xima exec stylelint",
"**/*.{js,jsx,ts,tsx}": "xima exec eslint"
},
"devDependencies": { "devDependencies": {
"@ali/lowcode-config": "^2.0.5",
"ava": "^1.0.1", "ava": "^1.0.1",
"babel-eslint": "^10.0.3",
"commitizen": "^3.0.5",
"cz-conventional-changelog": "^2.1.0",
"eslint": "^6.5.1",
"git-cz": "^4.3.1",
"husky": "^4.2.3",
"lerna": "^2.11.0", "lerna": "^2.11.0",
"lint-staged": "^8.1.0",
"prettier": "^1.15.3",
"ts-node": "^7.0.1", "ts-node": "^7.0.1",
"tslib": "^1.9.3", "tslib": "^1.9.3",
"typescript": "^3.2.2" "typescript": "^3.2.2",
"xima": "^0.2.15"
}, },
"engines": { "engines": {
"node": ">=10.0.0" "node": ">=10.0.0"

View File

@ -59,7 +59,7 @@ function main() {
builder.generateProject(schemaJson).then((result) => { builder.generateProject(schemaJson).then((result) => {
displayResultInConsole(result); displayResultInConsole(result);
writeResultToDisk(result, 'output/lowcodeDemo').then((response) => console.log('Write to disk: ', JSON.stringify(response)),); writeResultToDisk(result, 'output/lowcodeDemo').then((response) => console.log('Write to disk: ', JSON.stringify(response)));
return result; return result;
}); });
} }
@ -160,7 +160,7 @@ function exportProject() {
builder.generateProject(schemaJson).then((result) => { builder.generateProject(schemaJson).then((result) => {
displayResultInConsole(result); displayResultInConsole(result);
writeResultToDisk(result, 'output/lowcodeDemo').then((response) => console.log('Write to disk: ', JSON.stringify(response)),); writeResultToDisk(result, 'output/lowcodeDemo').then((response) => console.log('Write to disk: ', JSON.stringify(response)));
return result; return result;
}); });
} }

View File

@ -1,4 +1,4 @@
/// <reference types="node" /> // / <reference types="node" />
declare module '@ali/my-prettier' { declare module '@ali/my-prettier' {
function format(text: string, type: string): string; function format(text: string, type: string): string;

View File

@ -109,6 +109,6 @@ export const DEFAULT_LINK_AFTER = {
[COMMON_CHUNK_NAME.StyleDepsImport]: [], [COMMON_CHUNK_NAME.StyleDepsImport]: [],
[COMMON_CHUNK_NAME.StyleCssContent]: [COMMON_CHUNK_NAME.StyleDepsImport], [COMMON_CHUNK_NAME.StyleCssContent]: [COMMON_CHUNK_NAME.StyleDepsImport],
[COMMON_CHUNK_NAME.HtmlContent]: [], [COMMON_CHUNK_NAME.HtmlContent]: [],
} };
export const COMMON_SUB_MODULE_NAME = 'index'; export const COMMON_SUB_MODULE_NAME = 'index';

View File

@ -1,4 +1,4 @@
export const NATIVE_ELE_PKG: string = 'native'; export const NATIVE_ELE_PKG = 'native';
export const CONTAINER_TYPE = { export const CONTAINER_TYPE = {
COMPONENT: 'Component', COMPONENT: 'Component',

View File

@ -58,7 +58,7 @@ export default class Builder implements ICodeBuilder {
const { type, content, name } = unprocessedChunks[indexToRemove]; const { type, content, name } = unprocessedChunks[indexToRemove];
const compiledContent = this.generateByType(type, content); const compiledContent = this.generateByType(type, content);
if (compiledContent) { if (compiledContent) {
resultingString.push(compiledContent + '\n'); resultingString.push(`${compiledContent }\n`);
} }
unprocessedChunks.splice(indexToRemove, 1); unprocessedChunks.splice(indexToRemove, 1);
@ -95,8 +95,6 @@ export default class Builder implements ICodeBuilder {
// remove invalid chunks (which did not end up being created) from the linkAfter fields // remove invalid chunks (which did not end up being created) from the linkAfter fields
// one use-case is when you want to remove the import plugin // one use-case is when you want to remove the import plugin
private cleanupInvalidChunks(linkAfter: string[], chunks: ICodeChunk[]) { private cleanupInvalidChunks(linkAfter: string[], chunks: ICodeChunk[]) {
return linkAfter.filter(chunkName => return linkAfter.filter(chunkName => chunks.some(chunk => chunk.name === chunkName));
chunks.some(chunk => chunk.name === chunkName),
);
} }
} }

View File

@ -51,7 +51,7 @@ export function createModuleBuilder(
if (options.postProcessors.length > 0) { if (options.postProcessors.length > 0) {
files = files.map((file) => { files = files.map((file) => {
let content = file.content; let { content } = file;
const type = file.ext; const type = file.ext;
options.postProcessors.forEach((processer) => { options.postProcessors.forEach((processer) => {
content = processer(content, type); content = processer(content, type);

View File

@ -40,7 +40,9 @@ function getDirFromRoot(root: IResultDir, path: string[]): IResultDir {
export class ProjectBuilder implements IProjectBuilder { export class ProjectBuilder implements IProjectBuilder {
private template: IProjectTemplate; private template: IProjectTemplate;
private plugins: IProjectPlugins; private plugins: IProjectPlugins;
private postProcessors: PostProcessor[]; private postProcessors: PostProcessor[];
constructor({ constructor({

View File

@ -2,7 +2,9 @@ import { CodeGeneratorError, IResultDir, IResultFile } from '../types';
export default class ResultDir implements IResultDir { export default class ResultDir implements IResultDir {
public name: string; public name: string;
public dirs: IResultDir[]; public dirs: IResultDir[];
public files: IResultFile[]; public files: IResultFile[];
constructor(name: string) { constructor(name: string) {

View File

@ -2,10 +2,12 @@ import { IResultFile } from '../types';
export default class ResultFile implements IResultFile { export default class ResultFile implements IResultFile {
public name: string; public name: string;
public ext: string; public ext: string;
public content: string; public content: string;
constructor(name: string, ext: string = 'jsx', content: string = '') { constructor(name: string, ext = 'jsx', content = '') {
this.name = name; this.name = name;
this.ext = ext; this.ext = ext;
this.content = content; this.content = content;

View File

@ -95,7 +95,7 @@ class SchemaParser implements ISchemaParser {
}); });
} }
} else { } else {
throw new CodeGeneratorError(`Can't find anything to generate.`); throw new CodeGeneratorError('Can\'t find anything to generate.');
} }
// 建立所有容器的内部依赖索引 // 建立所有容器的内部依赖索引

View File

@ -19,7 +19,7 @@ const pluginFactory: BuilderComponentPluginFactory<unknown> = () => {
type: ChunkType.STRING, type: ChunkType.STRING,
fileType: FileType.JSX, fileType: FileType.JSX,
name: COMMON_CHUNK_NAME.InternalDepsImport, name: COMMON_CHUNK_NAME.InternalDepsImport,
content: `import * from 'react';`, content: 'import * from \'react\';',
linkAfter: [], linkAfter: [],
}); });

View File

@ -35,7 +35,7 @@ const pluginFactory: BuilderComponentPluginFactory<unknown> = () => {
type: ChunkType.STRING, type: ChunkType.STRING,
fileType: FileType.JSX, fileType: FileType.JSX,
name: CLASS_DEFINE_CHUNK_NAME.End, name: CLASS_DEFINE_CHUNK_NAME.End,
content: `}`, content: '}',
linkAfter: [CLASS_DEFINE_CHUNK_NAME.Start, REACT_CHUNK_NAME.ClassRenderEnd], linkAfter: [CLASS_DEFINE_CHUNK_NAME.Start, REACT_CHUNK_NAME.ClassRenderEnd],
}); });

View File

@ -29,7 +29,7 @@ const pluginFactory: BuilderComponentPluginFactory<PluginConfig> = (config?) =>
const ir = next.ir as IContainerInfo; const ir = next.ir as IContainerInfo;
if (ir.state) { if (ir.state) {
const state = ir.state; const { state } = ir;
const fields = Object.keys(state).map<string>((stateName) => { const fields = Object.keys(state).map<string>((stateName) => {
const value = generateCompositeType(state[stateName]); const value = generateCompositeType(state[stateName]);
return `${stateName}: ${value},`; return `${stateName}: ${value},`;

View File

@ -31,7 +31,7 @@ const pluginFactory: BuilderComponentPluginFactory<PluginConfig> = (config?) =>
const ir = next.ir as IContainerInfo; const ir = next.ir as IContainerInfo;
if (ir.state) { if (ir.state) {
const state = ir.state; const { state } = ir;
const fields = Object.keys(state).map<string>((stateName) => { const fields = Object.keys(state).map<string>((stateName) => {
const value = generateCompositeType(state[stateName]); const value = generateCompositeType(state[stateName]);
return `${stateName}: ${value},`; return `${stateName}: ${value},`;

View File

@ -10,7 +10,7 @@ import {
type PluginConfig = { type PluginConfig = {
fileType: string; fileType: string;
} };
const pluginFactory: BuilderComponentPluginFactory<PluginConfig> = (config?) => { const pluginFactory: BuilderComponentPluginFactory<PluginConfig> = (config?) => {
const cfg: PluginConfig = { const cfg: PluginConfig = {
@ -27,7 +27,7 @@ const pluginFactory: BuilderComponentPluginFactory<PluginConfig> = (config?) =>
type: ChunkType.STRING, type: ChunkType.STRING,
fileType: cfg.fileType, fileType: cfg.fileType,
name: CLASS_DEFINE_CHUNK_NAME.ConstructorContent, name: CLASS_DEFINE_CHUNK_NAME.ConstructorContent,
content: `this.utils = utils;`, content: 'this.utils = utils;',
linkAfter: [CLASS_DEFINE_CHUNK_NAME.ConstructorStart], linkAfter: [CLASS_DEFINE_CHUNK_NAME.ConstructorStart],
}); });

View File

@ -35,7 +35,7 @@ const pluginFactory: BuilderComponentPluginFactory<PluginConfig> = (config?) =>
const ir = next.ir as IContainerInfo; const ir = next.ir as IContainerInfo;
if (ir.lifeCycles) { if (ir.lifeCycles) {
const lifeCycles = ir.lifeCycles; const { lifeCycles } = ir;
const chunks = Object.keys(lifeCycles).map<ICodeChunk>((lifeCycleName) => { const chunks = Object.keys(lifeCycles).map<ICodeChunk>((lifeCycleName) => {
const normalizeName = cfg.normalizeNameMapping[lifeCycleName] || lifeCycleName; const normalizeName = cfg.normalizeNameMapping[lifeCycleName] || lifeCycleName;
const exportName = cfg.exportNameMapping[lifeCycleName] || lifeCycleName; const exportName = cfg.exportNameMapping[lifeCycleName] || lifeCycleName;

View File

@ -30,7 +30,7 @@ const pluginFactory: BuilderComponentPluginFactory<PluginConfig> = (config?) =>
const ir = next.ir as IContainerInfo; const ir = next.ir as IContainerInfo;
if (ir.methods) { if (ir.methods) {
const methods = ir.methods; const { methods } = ir;
const chunks = Object.keys(methods).map<ICodeChunk>((methodName) => ({ const chunks = Object.keys(methods).map<ICodeChunk>((methodName) => ({
type: ChunkType.STRING, type: ChunkType.STRING,
fileType: cfg.fileType, fileType: cfg.fileType,

View File

@ -14,7 +14,7 @@ import { createReactNodeGenerator } from '../../../utils/nodeToJSX';
type PluginConfig = { type PluginConfig = {
fileType?: string; fileType?: string;
nodeTypeMapping?: Record<string, string>; nodeTypeMapping?: Record<string, string>;
} };
const pluginFactory: BuilderComponentPluginFactory<PluginConfig> = (config?) => { const pluginFactory: BuilderComponentPluginFactory<PluginConfig> = (config?) => {
const cfg = { const cfg = {

View File

@ -19,7 +19,7 @@ const pluginFactory: BuilderComponentPluginFactory<unknown> = () => {
type: ChunkType.STRING, type: ChunkType.STRING,
fileType: FileType.JSX, fileType: FileType.JSX,
name: COMMON_CHUNK_NAME.ExternalDepsImport, name: COMMON_CHUNK_NAME.ExternalDepsImport,
content: `import React from 'react';`, content: 'import React from \'react\';',
linkAfter: [], linkAfter: [],
}); });

View File

@ -21,7 +21,7 @@ const pluginFactory: BuilderComponentPluginFactory<unknown> = () => {
type: ChunkType.STRING, type: ChunkType.STRING,
fileType: FileType.TS, fileType: FileType.TS,
name: COMMON_CHUNK_NAME.ExternalDepsImport, name: COMMON_CHUNK_NAME.ExternalDepsImport,
content: `import { BaseController } from '@ali/recore-renderer';`, content: 'import { BaseController } from \'@ali/recore-renderer\';',
linkAfter: [], linkAfter: [],
}); });
@ -37,7 +37,7 @@ const pluginFactory: BuilderComponentPluginFactory<unknown> = () => {
type: ChunkType.STRING, type: ChunkType.STRING,
fileType: FileType.TS, fileType: FileType.TS,
name: CLASS_DEFINE_CHUNK_NAME.End, name: CLASS_DEFINE_CHUNK_NAME.End,
content: `}`, content: '}',
linkAfter: [...DEFAULT_LINK_AFTER[CLASS_DEFINE_CHUNK_NAME.End]], linkAfter: [...DEFAULT_LINK_AFTER[CLASS_DEFINE_CHUNK_NAME.End]],
}); });

View File

@ -17,7 +17,7 @@ const pluginFactory: BuilderComponentPluginFactory<unknown> = () => {
type: ChunkType.STRING, type: ChunkType.STRING,
fileType: 'vx', fileType: 'vx',
name: COMMON_CHUNK_NAME.CustomContent, name: COMMON_CHUNK_NAME.CustomContent,
content: `<div {...globalProps.div} className="recore-loading" x-if={this.__loading} />`, content: '<div {...globalProps.div} className="recore-loading" x-if={this.__loading} />',
linkAfter: [], linkAfter: [],
}); });

View File

@ -12,7 +12,7 @@ import {
type PluginConfig = { type PluginConfig = {
fileType: string; fileType: string;
moduleFileType: string; moduleFileType: string;
} };
const pluginFactory: BuilderComponentPluginFactory<PluginConfig> = (config?) => { const pluginFactory: BuilderComponentPluginFactory<PluginConfig> = (config?) => {
const cfg: PluginConfig = { const cfg: PluginConfig = {

View File

@ -25,4 +25,3 @@ export default function getFile(): [string[], IResultFile] {
return [[], file]; return [[], file];
} }

View File

@ -29,4 +29,3 @@ export default function getFile(): [string[], IResultFile] {
return [[], file]; return [[], file];
} }

View File

@ -63,4 +63,3 @@ export default function getFile(): [string[], IResultFile] {
return [[], file]; return [[], file];
} }

View File

@ -48,4 +48,3 @@ export default function getFile(): [string[], IResultFile] {
return [['public'], file]; return [['public'], file];
} }

View File

@ -72,6 +72,5 @@ export default {
`, `,
); );
return [['src','config'], file]; return [['src', 'config'], file];
} }

View File

@ -38,6 +38,5 @@ export default componentsMap;
`, `,
); );
return [['src','config'], file]; return [['src', 'config'], file];
} }

View File

@ -24,6 +24,5 @@ export default {
`, `,
); );
return [['src','config'], file]; return [['src', 'config'], file];
} }

View File

@ -98,4 +98,3 @@ app.run();
return [['src'], file]; return [['src'], file];
} }

View File

@ -50,4 +50,3 @@ export default function getFile(): [string[], IResultFile] {
return [[], file]; return [[], file];
} }

View File

@ -7,7 +7,7 @@ const PARSERS = ['css', 'scss', 'less', 'json', 'html', 'vue'];
type ProcessorConfig = { type ProcessorConfig = {
customFileTypeParser: Record<string, string>; customFileTypeParser: Record<string, string>;
} };
const factory: PostProcessorFactory<ProcessorConfig> = (config?: ProcessorConfig) => { const factory: PostProcessorFactory<ProcessorConfig> = (config?: ProcessorConfig) => {
const cfg: ProcessorConfig = { const cfg: ProcessorConfig = {
@ -23,7 +23,7 @@ const factory: PostProcessorFactory<ProcessorConfig> = (config?: ProcessorConfig
parser = 'typescript'; parser = 'typescript';
} else if (PARSERS.indexOf(fileType) >= 0) { } else if (PARSERS.indexOf(fileType) >= 0) {
parser = fileType as prettier.BuiltInParserName; parser = fileType as prettier.BuiltInParserName;
} else if (cfg.customFileTypeParser[fileType]){ } else if (cfg.customFileTypeParser[fileType]) {
parser = cfg.customFileTypeParser[fileType] as prettier.BuiltInParserName; parser = cfg.customFileTypeParser[fileType] as prettier.BuiltInParserName;
} else if (fileType === 'vx') { } else if (fileType === 'vx') {
return mypretter(content, fileType); return mypretter(content, fileType);

View File

@ -19,8 +19,8 @@ export interface IDiskPublisher extends IPublisher<IDiskFactoryParams, string> {
} }
export const createDiskPublisher: PublisherFactory< export const createDiskPublisher: PublisherFactory<
IDiskFactoryParams, IDiskFactoryParams,
IDiskPublisher IDiskPublisher
> = (params: IDiskFactoryParams = {}): IDiskPublisher => { > = (params: IDiskFactoryParams = {}): IDiskPublisher => {
let { project, outputPath = './' } = params; let { project, outputPath = './' } = params;

View File

@ -61,7 +61,7 @@ const createDirectory = (pathToDir: string): Promise<void> => {
const writeContentToFile = ( const writeContentToFile = (
filePath: string, filePath: string,
fileContent: string, fileContent: string,
encoding: string = 'utf8', encoding = 'utf8',
): Promise<void> => { ): Promise<void> => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
writeFile(filePath, fileContent, encoding, err => { writeFile(filePath, fileContent, encoding, err => {

View File

@ -5,7 +5,7 @@ import {
IPublisherFactoryParams, IPublisherFactoryParams,
PublisherError, PublisherError,
} from '../../types'; } from '../../types';
import { isNodeProcess, writeZipToDisk, generateProjectZip } from './utils' import { isNodeProcess, writeZipToDisk, generateProjectZip } from './utils';
// export type ZipBuffer = Buffer | Blob; // export type ZipBuffer = Buffer | Blob;
export type ZipBuffer = Buffer; export type ZipBuffer = Buffer;
@ -30,12 +30,12 @@ export const createZipPublisher: PublisherFactory<ZipFactoryParams, ZipPublisher
const getProject = () => project; const getProject = () => project;
const setProject = (projectToSet: IResultDir) => { const setProject = (projectToSet: IResultDir) => {
project = projectToSet; project = projectToSet;
} };
const getOutputPath = () => outputPath; const getOutputPath = () => outputPath;
const setOutputPath = (path: string) => { const setOutputPath = (path: string) => {
outputPath = path; outputPath = path;
} };
const publish = async (options: ZipFactoryParams = {}) => { const publish = async (options: ZipFactoryParams = {}) => {
const projectToPublish = options.project || project; const projectToPublish = options.project || project;
@ -57,7 +57,7 @@ export const createZipPublisher: PublisherFactory<ZipFactoryParams, ZipPublisher
} catch (error) { } catch (error) {
throw new PublisherError(error); throw new PublisherError(error);
} }
} };
return { return {
publish, publish,
@ -66,4 +66,4 @@ export const createZipPublisher: PublisherFactory<ZipFactoryParams, ZipPublisher
getOutputPath, getOutputPath,
setOutputPath, setOutputPath,
}; };
} };

View File

@ -8,7 +8,7 @@ export const isNodeProcess = (): boolean => {
typeof process.versions === 'object' && typeof process.versions === 'object' &&
typeof process.versions.node !== 'undefined' typeof process.versions.node !== 'undefined'
); );
} };
export const writeZipToDisk = ( export const writeZipToDisk = (
zipFolderPath: string, zipFolderPath: string,
@ -27,7 +27,7 @@ export const writeZipToDisk = (
const writeStream = fs.createWriteStream(zipPath); const writeStream = fs.createWriteStream(zipPath);
writeStream.write(content); writeStream.write(content);
writeStream.end(); writeStream.end();
} };
export const generateProjectZip = async (project: IResultDir): Promise<ZipBuffer> => { export const generateProjectZip = async (project: IResultDir): Promise<ZipBuffer> => {
let zip = new JSZip(); let zip = new JSZip();
@ -35,12 +35,12 @@ export const generateProjectZip = async (project: IResultDir): Promise<ZipBuffer
// const zipType = isNodeProcess() ? 'nodebuffer' : 'blob'; // const zipType = isNodeProcess() ? 'nodebuffer' : 'blob';
const zipType = 'nodebuffer'; // 目前先只支持 node 调用 const zipType = 'nodebuffer'; // 目前先只支持 node 调用
return zip.generateAsync({ type: zipType }); return zip.generateAsync({ type: zipType });
} };
const writeFolderToZip = ( const writeFolderToZip = (
folder: IResultDir, folder: IResultDir,
parentFolder: JSZip, parentFolder: JSZip,
ignoreFolder: boolean = false, ignoreFolder = false,
) => { ) => {
const zipFolder = ignoreFolder ? parentFolder : parentFolder.folder(folder.name); const zipFolder = ignoreFolder ? parentFolder : parentFolder.folder(folder.name);
if (zipFolder !== null) { if (zipFolder !== null) {
@ -57,4 +57,4 @@ const writeFolderToZip = (
} }
return parentFolder; return parentFolder;
} };

View File

@ -236,7 +236,7 @@ export function linkPieces(pieces: CodePiece[]): string {
.map((p) => p.value) .map((p) => p.value)
.join(' '); .join(' ');
attrsParts = !!attrsParts ? ` ${attrsParts}` : ''; attrsParts = attrsParts ? ` ${attrsParts}` : '';
if (childrenParts) { if (childrenParts) {
return `${beforeParts}<${tagName}${attrsParts}>${childrenParts}</${tagName}>${afterParts}`; return `${beforeParts}<${tagName}${attrsParts}>${childrenParts}</${tagName}>${afterParts}`;

View File

@ -1,4 +1,4 @@
const fs = require("fs"); const fs = require('fs');
const path = require('path'); const path = require('path');
console.log(process.argv); console.log(process.argv);
@ -15,7 +15,7 @@ if (!root) {
function cloneStr(str, times) { function cloneStr(str, times) {
let count = times; let count = times;
const arr = []; const arr = [];
while(count > 0) { while (count > 0) {
arr.push(str); arr.push(str);
count -= 1; count -= 1;
} }
@ -23,7 +23,7 @@ function cloneStr(str, times) {
} }
function createTemplateFile(root, internalPath, fileName) { function createTemplateFile(root, internalPath, fileName) {
//不是文件夹,则添加type属性为文件后缀名 // 不是文件夹,则添加type属性为文件后缀名
const fileTypeSrc = path.extname(fileName); const fileTypeSrc = path.extname(fileName);
const fileType = fileTypeSrc.substring(1); const fileType = fileTypeSrc.substring(1);
const baseName = path.basename(fileName, fileTypeSrc); const baseName = path.basename(fileName, fileTypeSrc);
@ -62,24 +62,24 @@ ${content}
function fileDisplay(root, internalPath) { function fileDisplay(root, internalPath) {
const dirPath = path.join(root, internalPath); const dirPath = path.join(root, internalPath);
const filesList = fs.readdirSync(dirPath); const filesList = fs.readdirSync(dirPath);
for(let i = 0; i < filesList.length; i++){ for (let i = 0; i < filesList.length; i++) {
//描述此文件/文件夹的对象 // 描述此文件/文件夹的对象
const fileName = filesList[i]; const fileName = filesList[i];
//拼接当前文件的路径(上一层路径+当前file的名字) // 拼接当前文件的路径(上一层路径+当前file的名字)
const filePath = path.join(dirPath, fileName); const filePath = path.join(dirPath, fileName);
//根据文件路径获取文件信息返回一个fs.Stats对象 // 根据文件路径获取文件信息返回一个fs.Stats对象
const stats = fs.statSync(filePath); const stats = fs.statSync(filePath);
if(stats.isDirectory()){ if (stats.isDirectory()) {
//递归调用 // 递归调用
fileDisplay(root, path.join(internalPath, fileName)); fileDisplay(root, path.join(internalPath, fileName));
}else{ } else {
createTemplateFile(root, internalPath, fileName); createTemplateFile(root, internalPath, fileName);
} }
} }
} }
//调用函数遍历根目录,同时传递 文件夹路径和对应的数组 // 调用函数遍历根目录,同时传递 文件夹路径和对应的数组
//请使用同步读取 // 请使用同步读取
fileDisplay(root, ''); fileDisplay(root, '');
//读取完毕则写入到txt文件中 // 读取完毕则写入到txt文件中
// fs.writeFileSync('./data.txt', JSON.stringify(arr)); // fs.writeFileSync('./data.txt', JSON.stringify(arr));

View File

@ -1,24 +0,0 @@
module.exports = {
parser: '@typescript-eslint/parser',
parserOptions: {
project: 'tsconfig.json',
sourceType: 'module',
},
plugins: ['@typescript-eslint/eslint-plugin'],
extends: [
'plugin:@typescript-eslint/eslint-recommended',
'plugin:@typescript-eslint/recommended',
'prettier',
'prettier/@typescript-eslint',
],
root: true,
env: {
node: true,
jest: true,
},
rules: {
'@typescript-eslint/interface-name-prefix': 'off',
'@typescript-eslint/explicit-function-return-type': 'off',
'@typescript-eslint/no-explicit-any': 'off',
},
};

View File

@ -1,4 +0,0 @@
{
"singleQuote": true,
"trailingComma": "all"
}

View File

@ -5,8 +5,6 @@
"description": "低代码引擎 DEMO Server 端", "description": "低代码引擎 DEMO Server 端",
"scripts": { "scripts": {
"prebuild": "rimraf dist", "prebuild": "rimraf dist",
"format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
"lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
"start": "nest start", "start": "nest start",
"start:debug": "nest start --debug --watch", "start:debug": "nest start --debug --watch",
"start:dev": "nest start --watch", "start:dev": "nest start --watch",
@ -49,13 +47,7 @@
"@types/jest": "25.2.3", "@types/jest": "25.2.3",
"@types/node": "^13.9.1", "@types/node": "^13.9.1",
"@types/supertest": "^2.0.8", "@types/supertest": "^2.0.8",
"@typescript-eslint/eslint-plugin": "3.0.2",
"@typescript-eslint/parser": "3.0.2",
"eslint": "7.1.0",
"eslint-config-prettier": "^6.10.0",
"eslint-plugin-import": "^2.20.1",
"jest": "26.0.1", "jest": "26.0.1",
"prettier": "^1.19.1",
"supertest": "^4.0.2", "supertest": "^4.0.2",
"ts-jest": "26.1.0", "ts-jest": "26.1.0",
"ts-loader": "^6.2.1", "ts-loader": "^6.2.1",

View File

@ -5,7 +5,7 @@ import { GenerateProjectDto } from '../dto/generate-project.dto';
@Controller('api') @Controller('api')
export class ApiController { export class ApiController {
constructor(private readonly apiService: ApiService) {} private readonly apiService: ApiService;
@Get('generate/test') @Get('generate/test')
generateTest() { generateTest() {

View File

@ -3,7 +3,7 @@ import { AppService } from './app.service';
@Controller() @Controller()
export class AppController { export class AppController {
constructor(private readonly appService: AppService) {} private readonly appService: AppService;
@Get() @Get()
getHello(): string { getHello(): string {

View File

@ -1,5 +1,5 @@
import { IResultDir } from '@ali/lowcode-code-generator'; import { IResultDir } from '@ali/lowcode-code-generator';
import { isNodeProcess, writeZipToDisk, generateProjectZip } from './utils' import { isNodeProcess, writeZipToDisk, generateProjectZip } from './utils';
export type PublisherFactory<T, U> = (configuration?: Partial<T>) => U; export type PublisherFactory<T, U> = (configuration?: Partial<T>) => U;
@ -17,7 +17,7 @@ export interface IPublisherResponse<T> {
payload?: T; payload?: T;
} }
declare type ZipPublisherResponse = string | Buffer | Blob declare type ZipPublisherResponse = string | Buffer | Blob;
export interface ZipFactoryParams extends IPublisherFactoryParams { export interface ZipFactoryParams extends IPublisherFactoryParams {
outputPath?: string outputPath?: string
@ -32,39 +32,39 @@ export interface ZipPublisher extends IPublisher<ZipFactoryParams, ZipPublisherR
export const createZipPublisher: PublisherFactory<ZipFactoryParams, ZipPublisher> = ( export const createZipPublisher: PublisherFactory<ZipFactoryParams, ZipPublisher> = (
params: ZipFactoryParams = {} params: ZipFactoryParams = {}
): ZipPublisher => { ): ZipPublisher => {
let { project, outputPath } = params let { project, outputPath } = params;
const getProject = () => project const getProject = () => project;
const setProject = (projectToSet: IResultDir) => { const setProject = (projectToSet: IResultDir) => {
project = projectToSet project = projectToSet;
} };
const getOutputPath = () => outputPath const getOutputPath = () => outputPath;
const setOutputPath = (path: string) => { const setOutputPath = (path: string) => {
outputPath = path outputPath = path;
} };
const publish = async (options: ZipFactoryParams = {}) => { const publish = async (options: ZipFactoryParams = {}) => {
const projectToPublish = options.project || project const projectToPublish = options.project || project;
if (!projectToPublish) { if (!projectToPublish) {
throw new Error('MissingProject'); throw new Error('MissingProject');
} }
const zipName = options.projectSlug || params.projectSlug || projectToPublish.name const zipName = options.projectSlug || params.projectSlug || projectToPublish.name;
try { try {
const zipContent = await generateProjectZip(projectToPublish) const zipContent = await generateProjectZip(projectToPublish);
// If not output path is provided, zip is not written to disk // If not output path is provided, zip is not written to disk
const projectOutputPath = options.outputPath || outputPath const projectOutputPath = options.outputPath || outputPath;
if (projectOutputPath && isNodeProcess()) { if (projectOutputPath && isNodeProcess()) {
await writeZipToDisk(projectOutputPath, zipContent, zipName) await writeZipToDisk(projectOutputPath, zipContent, zipName);
} }
return { success: true, payload: zipContent } return { success: true, payload: zipContent };
} catch (error) { } catch (error) {
throw new Error('ZipUnexpected'); throw new Error('ZipUnexpected');
} }
} };
return { return {
publish, publish,
@ -72,5 +72,5 @@ export const createZipPublisher: PublisherFactory<ZipFactoryParams, ZipPublisher
setProject, setProject,
getOutputPath, getOutputPath,
setOutputPath, setOutputPath,
} };
} };

View File

@ -6,52 +6,52 @@ export const isNodeProcess = (): boolean => {
typeof process === 'object' && typeof process === 'object' &&
typeof process.versions === 'object' && typeof process.versions === 'object' &&
typeof process.versions.node !== 'undefined' typeof process.versions.node !== 'undefined'
) );
} };
export const writeZipToDisk = ( export const writeZipToDisk = (
zipFolderPath: string, zipFolderPath: string,
content: Buffer | Blob, content: Buffer | Blob,
zipName: string zipName: string
): void => { ): void => {
const fs = require('fs') const fs = require('fs');
const path = require('path') const path = require('path');
if (!fs.existsSync(zipFolderPath)) { if (!fs.existsSync(zipFolderPath)) {
fs.mkdirSync(zipFolderPath, { recursive: true }) fs.mkdirSync(zipFolderPath, { recursive: true });
} }
const zipPath = path.join(zipFolderPath, `${zipName}.zip`) const zipPath = path.join(zipFolderPath, `${zipName}.zip`);
const writeStream = fs.createWriteStream(zipPath) const writeStream = fs.createWriteStream(zipPath);
writeStream.write(content) writeStream.write(content);
writeStream.end() writeStream.end();
} };
export const generateProjectZip = async (project: IResultDir): Promise<Buffer | Blob> => { export const generateProjectZip = async (project: IResultDir): Promise<Buffer | Blob> => {
let zip = new JSZip() let zip = new JSZip();
zip = writeFolderToZip(project, zip, true) zip = writeFolderToZip(project, zip, true);
const zipType = isNodeProcess() ? 'nodebuffer' : 'blob' const zipType = isNodeProcess() ? 'nodebuffer' : 'blob';
return zip.generateAsync({ type: zipType }) return zip.generateAsync({ type: zipType });
} };
const writeFolderToZip = ( const writeFolderToZip = (
folder: IResultDir, folder: IResultDir,
parentFolder: JSZip, parentFolder: JSZip,
ignoreFolder: boolean = false ignoreFolder = false
) => { ) => {
const zipFolder = ignoreFolder ? parentFolder : parentFolder.folder(folder.name) const zipFolder = ignoreFolder ? parentFolder : parentFolder.folder(folder.name);
folder.files.forEach((file: IResultFile) => { folder.files.forEach((file: IResultFile) => {
// const options = file.contentEncoding === 'base64' ? { base64: true } : {} // const options = file.contentEncoding === 'base64' ? { base64: true } : {}
const options = {}; const options = {};
const fileName = file.ext ? `${file.name}.${file.ext}` : file.name const fileName = file.ext ? `${file.name}.${file.ext}` : file.name;
zipFolder.file(fileName, file.content, options) zipFolder.file(fileName, file.content, options);
}) });
folder.dirs.forEach((subFolder: IResultDir) => { folder.dirs.forEach((subFolder: IResultDir) => {
writeFolderToZip(subFolder, zipFolder) writeFolderToZip(subFolder, zipFolder);
}) });
return parentFolder return parentFolder;
} };

View File

@ -13107,30 +13107,6 @@
} }
], ],
"componentList": [ "componentList": [
{
"title": "Util",
"children": [
{
"componentName": "Dropdown",
"title": "下拉菜单",
"icon": "",
"package": "@alifd/next",
"library": "Next",
"snippets": [
{
"title": "下拉菜单",
"screenshot": "",
"schema": {
"componentName": "Dropdown",
"props": { "trigger": [{ "componentName": "Button", "props": { "type": "primary" }, "children": "确定" }], "triggerType": "click"},
"children": [{ "componentName": "Menu", "props": { "style": { "width": 200 } }, "children": [{ "componentName": "Menu.Item", "props": {}, "children": "Option 1" }, { "componentName": "Menu.Item", "props": { "disabled": false }, "children": "option 2" }, { "componentName": "Menu.Item", "props": { "disabled": false }, "children": "option 3" }]}]
}
}
]
}
],
"icon": ""
},
{ {
"title": "DataDisplay", "title": "DataDisplay",
"children": [ "children": [
@ -15388,5 +15364,31 @@
], ],
"icon": "" "icon": ""
} }
],
"bizComponentList": [
{
"title": "Util",
"children": [
{
"componentName": "Dropdown",
"title": "下拉菜单",
"icon": "",
"package": "@alifd/next",
"library": "Next",
"snippets": [
{
"title": "下拉菜单",
"screenshot": "",
"schema": {
"componentName": "Dropdown",
"props": { "trigger": [{ "componentName": "Button", "props": { "type": "primary" }, "children": "确定" }], "triggerType": "click"},
"children": [{ "componentName": "Menu", "props": { "style": { "width": 200 } }, "children": [{ "componentName": "Menu.Item", "props": {}, "children": "Option 1" }, { "componentName": "Menu.Item", "props": { "disabled": false }, "children": "option 2" }, { "componentName": "Menu.Item", "props": { "disabled": false }, "children": "option 3" }]}]
}
}
]
}
],
"icon": ""
}
] ]
} }

View File

@ -34,7 +34,7 @@ export default class Preview extends ReactProvider {
containerId, containerId,
components: { ...builtInComps, ...buildComponents({ '@alifd/next': 'Next' }, componentsMap) }, components: { ...builtInComps, ...buildComponents({ '@alifd/next': 'Next' }, componentsMap) },
componentsMap, componentsMap,
utils: utils, utils,
constants, constants,
}; };
} }
@ -44,7 +44,7 @@ export default class Preview extends ReactProvider {
const appSchemaStr = localStorage.getItem('lce-dev-store'); const appSchemaStr = localStorage.getItem('lce-dev-store');
const appSchema = JSON.parse(appSchemaStr || ''); const appSchema = JSON.parse(appSchemaStr || '');
const idx = appSchema.componentsTree.findIndex( const idx = appSchema.componentsTree.findIndex(
(page: any, idx: number) => (page.fileName || `page${idx}`) === pageId, (page: any, index: number) => (page.fileName || `page${index}`) === pageId,
); );
const schema = appSchema.componentsTree[idx]; const schema = appSchema.componentsTree[idx];
return schema; return schema;

View File

@ -2,7 +2,7 @@ import logo from '@ali/lowcode-plugin-sample-logo';
import samplePreview from '@ali/lowcode-plugin-sample-preview'; import samplePreview from '@ali/lowcode-plugin-sample-preview';
import undoRedo from '@ali/lowcode-plugin-undo-redo'; import undoRedo from '@ali/lowcode-plugin-undo-redo';
import componentsPane from '@ali/lowcode-plugin-components-pane'; import componentsPane from '@ali/lowcode-plugin-components-pane';
import outline, { OutlinePane } from '@ali/lowcode-plugin-outline-pane'; import outline from '@ali/lowcode-plugin-outline-pane';
import zhEn from '@ali/lowcode-plugin-zh-en'; import zhEn from '@ali/lowcode-plugin-zh-en';
import eventBindDialog from '@ali/lowcode-plugin-event-bind-dialog'; import eventBindDialog from '@ali/lowcode-plugin-event-bind-dialog';
import variableBindDialog from '@ali/lowcode-plugin-variable-bind-dialog'; import variableBindDialog from '@ali/lowcode-plugin-variable-bind-dialog';

View File

@ -123,9 +123,6 @@ export default {
const simulatorUrl = [ const simulatorUrl = [
'https://dev.g.alicdn.com/ali-lowcode/ali-lowcode-engine/0.9.50/react-simulator-renderer.css', 'https://dev.g.alicdn.com/ali-lowcode/ali-lowcode-engine/0.9.50/react-simulator-renderer.css',
'https://dev.g.alicdn.com/ali-lowcode/ali-lowcode-engine/0.9.50/react-simulator-renderer.js', 'https://dev.g.alicdn.com/ali-lowcode/ali-lowcode-engine/0.9.50/react-simulator-renderer.js',
// for debug simulator
// 'http://localhost:3333/js/react-simulator-renderer.js',
]; ];
editor.set('simulatorUrl', simulatorUrl); editor.set('simulatorUrl', simulatorUrl);
// editor.set('renderEnv', 'rax'); // editor.set('renderEnv', 'rax');

View File

@ -1,5 +1,5 @@
import { render } from 'react-dom'; import { render } from 'react-dom';
import GeneralWorkbench, { editor } from '@ali/lowcode-editor-preset-general'; import GeneralWorkbench from '@ali/lowcode-editor-preset-general';
import config from './config'; import config from './config';
import components from './components'; import components from './components';
import './global.scss'; import './global.scss';

View File

@ -28,7 +28,7 @@ const Codeout = ({ editor }: PluginProps) => {
const designer = editor.get(Designer); const designer = editor.get(Designer);
if (designer) { if (designer) {
const assets = editor.get('assets') as { components: BasicSection[] }; const assets = editor.get('assets') as { components: BasicSection[] };
const components = assets.components; const { components } = assets;
const componentsMap = components const componentsMap = components
.filter((c) => !!c.npm) .filter((c) => !!c.npm)

View File

@ -22,10 +22,7 @@ interface BasicSection {
const Codeout = ({ editor }: PluginProps) => { const Codeout = ({ editor }: PluginProps) => {
const handleSaveClick = () => { const handleSaveClick = () => {
const schema = editor.get('designer').project.getSchema();
debugger;
let schema = editor.get('designer').project.getSchema();
console.log(schema); console.log(schema);

View File

@ -9,5 +9,5 @@ declare module '@ali/ve-page-history';
declare module '@ali/ve-i18n-manage-pane'; declare module '@ali/ve-i18n-manage-pane';
declare module '@ali/ve-action-pane'; declare module '@ali/ve-action-pane';
declare module '@ali/vu-legao-design-fetch-context'; declare module '@ali/vu-legao-design-fetch-context';
declare module "@ali/vu-function-parser"; declare module '@ali/vu-function-parser';
declare module "compare-versions"; declare module 'compare-versions';

View File

@ -0,0 +1,16 @@
module.exports = {
extends: 'eslint-config-ali/typescript/react',
rules: {
'react/no-multi-comp': 1,
'no-unused-expressions': 1,
'implicit-arrow-linebreak': 1,
'no-nested-ternary': 1,
'no-mixed-operators': 1,
'@typescript-eslint/no-parameter-properties': 1,
'@typescript-eslint/ban-types': 1,
'no-shadow': 1,
'no-prototype-builtins': 1,
'no-useless-constructor': 1,
'no-empty-function': 1,
}
}

View File

@ -38,6 +38,7 @@ export class BorderDetectingInstance extends PureComponent<{
} }
@observer @observer
// eslint-disable-next-line react/no-multi-comp
export class BorderDetecting extends Component<{ host: BuiltinSimulatorHost }> { export class BorderDetecting extends Component<{ host: BuiltinSimulatorHost }> {
shouldComponentUpdate() { shouldComponentUpdate() {
return false; return false;
@ -56,14 +57,15 @@ export class BorderDetecting extends Component<{ host: BuiltinSimulatorHost }> {
} }
@computed get current() { @computed get current() {
const host = this.props.host; const { host } = this.props;
const doc = host.currentDocument; const doc = host.currentDocument;
console.info(doc); console.info(doc);
if (!doc) { if (!doc) {
return null; return null;
} }
const selection = doc.selection; const { selection } = doc;
const current = host.designer.detecting.current; const { current } = host.designer.detecting;
if (!current || current.document !== doc || selection.has(current.id)) { if (!current || current.document !== doc || selection.has(current.id)) {
return null; return null;
} }
@ -71,8 +73,8 @@ export class BorderDetecting extends Component<{ host: BuiltinSimulatorHost }> {
} }
render() { render() {
const host = this.props.host; const { host } = this.props;
const current = this.current; const { current } = this;
if (!current || host.viewport.scrolling || host.liveEditing.editing) { if (!current || host.viewport.scrolling || host.liveEditing.editing) {
return null; return null;
} }

View File

@ -24,7 +24,7 @@ export default class BoxResizing extends Component<{ host: BuiltinSimulatorHost
if (!doc || doc.suspensed) { if (!doc || doc.suspensed) {
return null; return null;
} }
const selection = doc.selection; const { selection } = doc;
return this.dragging ? selection.getTopNodes() : selection.getNodes(); return this.dragging ? selection.getTopNodes() : selection.getNodes();
} }
@ -38,7 +38,7 @@ export default class BoxResizing extends Component<{ host: BuiltinSimulatorHost
} }
render() { render() {
const selecting = this.selecting; const { selecting } = this;
if (!selecting || selecting.length < 1) { if (!selecting || selecting.length < 1) {
// DIRTY FIX, recore has a bug! // DIRTY FIX, recore has a bug!
return <Fragment />; return <Fragment />;
@ -58,6 +58,7 @@ export default class BoxResizing extends Component<{ host: BuiltinSimulatorHost
} }
@observer @observer
// eslint-disable-next-line react/no-multi-comp
export class BoxResizingForNode extends Component<{ host: BuiltinSimulatorHost; node: Node }> { export class BoxResizingForNode extends Component<{ host: BuiltinSimulatorHost; node: Node }> {
static contextType = SimulatorContext; static contextType = SimulatorContext;
@ -80,7 +81,7 @@ export class BoxResizingForNode extends Component<{ host: BuiltinSimulatorHost;
render() { render() {
const { instances } = this; const { instances } = this;
const { node } = this.props; const { node } = this.props;
const designer = this.host.designer; const { designer } = this.host;
if (!instances || instances.length < 1) { if (!instances || instances.length < 1) {
return null; return null;
@ -105,6 +106,7 @@ export class BoxResizingForNode extends Component<{ host: BuiltinSimulatorHost;
} }
@observer @observer
// eslint-disable-next-line react/no-multi-comp
export class BoxResizingInstance extends Component<{ export class BoxResizingInstance extends Component<{
observed: OffsetObserver; observed: OffsetObserver;
highlight?: boolean; highlight?: boolean;
@ -113,8 +115,11 @@ export class BoxResizingInstance extends Component<{
}> { }> {
// private outline: any; // private outline: any;
private willUnbind: () => any; private willUnbind: () => any;
private outlineRight: any; private outlineRight: any;
private outlineLeft: any; private outlineLeft: any;
private dragEngine: DragResizeEngine; private dragEngine: DragResizeEngine;
constructor(props: any) { constructor(props: any) {

View File

@ -55,10 +55,12 @@ export class BorderSelectingInstance extends Component<{
} }
@observer @observer
// eslint-disable-next-line react/no-multi-comp
class Toolbar extends Component<{ observed: OffsetObserver }> { class Toolbar extends Component<{ observed: OffsetObserver }> {
shouldComponentUpdate() { shouldComponentUpdate() {
return false; return false;
} }
render() { render() {
const { observed } = this.props; const { observed } = this.props;
const { height, width } = observed.viewport; const { height, width } = observed.viewport;
@ -149,6 +151,7 @@ function createAction(content: ReactNode | ComponentType<any> | ActionContentObj
} }
@observer @observer
// eslint-disable-next-line react/no-multi-comp
export class BorderSelectingForNode extends Component<{ host: BuiltinSimulatorHost; node: Node }> { export class BorderSelectingForNode extends Component<{ host: BuiltinSimulatorHost; node: Node }> {
get host(): BuiltinSimulatorHost { get host(): BuiltinSimulatorHost {
return this.props.host; return this.props.host;
@ -169,7 +172,7 @@ export class BorderSelectingForNode extends Component<{ host: BuiltinSimulatorHo
render() { render() {
const { instances } = this; const { instances } = this;
const { node } = this.props; const { node } = this.props;
const designer = this.host.designer; const { designer } = this.host;
if (!instances || instances.length < 1) { if (!instances || instances.length < 1) {
return null; return null;
@ -192,6 +195,7 @@ export class BorderSelectingForNode extends Component<{ host: BuiltinSimulatorHo
} }
@observer @observer
// eslint-disable-next-line react/no-multi-comp
export class BorderSelecting extends Component<{ host: BuiltinSimulatorHost }> { export class BorderSelecting extends Component<{ host: BuiltinSimulatorHost }> {
get host(): BuiltinSimulatorHost { get host(): BuiltinSimulatorHost {
return this.props.host; return this.props.host;
@ -206,7 +210,7 @@ export class BorderSelecting extends Component<{ host: BuiltinSimulatorHost }> {
if (!doc || doc.suspensed || this.host.liveEditing.editing) { if (!doc || doc.suspensed || this.host.liveEditing.editing) {
return null; return null;
} }
const selection = doc.selection; const { selection } = doc;
return this.dragging ? selection.getTopNodes() : selection.getNodes(); return this.dragging ? selection.getTopNodes() : selection.getNodes();
} }
@ -215,7 +219,7 @@ export class BorderSelecting extends Component<{ host: BuiltinSimulatorHost }> {
} }
render() { render() {
const selecting = this.selecting; const { selecting } = this;
if (!selecting || selecting.length < 1) { if (!selecting || selecting.length < 1) {
return null; return null;
} }

View File

@ -1,7 +1,7 @@
import { EventEmitter } from 'events'; import { EventEmitter } from 'events';
import { ISimulatorHost, isSimulatorHost } from '../../simulator'; import { ISimulatorHost } from '../../simulator';
import { Designer, Point } from '../../designer'; import { Designer, Point } from '../../designer';
import { setNativeSelection, cursor } from '@ali/lowcode-utils'; import { cursor } from '@ali/lowcode-utils';
// import Cursor from './cursor'; // import Cursor from './cursor';
// import Pages from './pages'; // import Pages from './pages';
@ -19,7 +19,7 @@ function makeEventsHandler(
// } // }
docs.add(sourceDoc); docs.add(sourceDoc);
// if (sourceDoc !== topDoc || isDragEvent(boostEvent)) { // if (sourceDoc !== topDoc || isDragEvent(boostEvent)) {
sensors.forEach((sim) => { sensors.forEach(sim => {
const sdoc = sim.contentDocument; const sdoc = sim.contentDocument;
if (sdoc) { if (sdoc) {
docs.add(sdoc); docs.add(sdoc);
@ -28,32 +28,21 @@ function makeEventsHandler(
// } // }
return (handle: (sdoc: Document) => void) => { return (handle: (sdoc: Document) => void) => {
docs.forEach((doc) => handle(doc)); docs.forEach(doc => handle(doc));
}; };
} }
// 拖动缩放 // 拖动缩放
export default class DragResizeEngine { export default class DragResizeEngine {
private emitter: EventEmitter; private emitter: EventEmitter;
private dragResizing = false; private dragResizing = false;
constructor(readonly designer: Designer) { constructor(designer: Designer) {
this.designer = designer; this.designer = designer;
this.emitter = new EventEmitter(); this.emitter = new EventEmitter();
} }
private getMasterSensors(): ISimulatorHost[] {
return this.designer.project.documents
.map((doc) => {
// TODO: not use actived,
if (doc.actived && doc.simulator?.sensorAvailable) {
return doc.simulator;
}
return null;
})
.filter(Boolean) as any;
}
isDragResizing() { isDragResizing() {
return this.dragResizing; return this.dragResizing;
} }
@ -83,14 +72,12 @@ export default class DragResizeEngine {
const masterSensors = this.getMasterSensors(); const masterSensors = this.getMasterSensors();
const createResizeEvent = (e: MouseEvent | DragEvent): Point => { const createResizeEvent = (e: MouseEvent | DragEvent): Point => {
const evt: any = {};
const sourceDocument = e.view?.document; const sourceDocument = e.view?.document;
if (!sourceDocument || sourceDocument === document) { if (!sourceDocument || sourceDocument === document) {
return e; return e;
} }
const srcSim = masterSensors.find((sim) => sim.contentDocument === sourceDocument); const srcSim = masterSensors.find(sim => sim.contentDocument === sourceDocument);
if (srcSim) { if (srcSim) {
return srcSim.viewport.toGlobalPoint(e); return srcSim.viewport.toGlobalPoint(e);
} }
@ -99,7 +86,7 @@ export default class DragResizeEngine {
const over = (e: MouseEvent) => { const over = (e: MouseEvent) => {
const handleEvents = makeEventsHandler(e, masterSensors); const handleEvents = makeEventsHandler(e, masterSensors);
handleEvents((doc) => { handleEvents(doc => {
doc.removeEventListener('mousemove', move, true); doc.removeEventListener('mousemove', move, true);
doc.removeEventListener('mouseup', over, true); doc.removeEventListener('mouseup', over, true);
}); });
@ -114,7 +101,7 @@ export default class DragResizeEngine {
node = boost(e); node = boost(e);
startEvent = createResizeEvent(e); startEvent = createResizeEvent(e);
const handleEvents = makeEventsHandler(e, masterSensors); const handleEvents = makeEventsHandler(e, masterSensors);
handleEvents((doc) => { handleEvents(doc => {
doc.addEventListener('mousemove', move, true); doc.addEventListener('mousemove', move, true);
doc.addEventListener('mouseup', over, true); doc.addEventListener('mouseup', over, true);
}); });
@ -136,7 +123,9 @@ export default class DragResizeEngine {
}; };
} }
onResize(func: (e: MouseEvent, direction: string, node: any, moveX: number, moveY: number) => any) { onResize(
func: (e: MouseEvent, direction: string, node: any, moveX: number, moveY: number) => any,
) {
this.emitter.on('resize', func); this.emitter.on('resize', func);
return () => { return () => {
this.emitter.removeListener('resize', func); this.emitter.removeListener('resize', func);
@ -149,6 +138,18 @@ export default class DragResizeEngine {
this.emitter.removeListener('resizeEnd', func); this.emitter.removeListener('resizeEnd', func);
}; };
} }
private getMasterSensors(): ISimulatorHost[] {
return this.designer.project.documents
.map(doc => {
// TODO: not use actived,
if (doc.actived && doc.simulator?.sensorAvailable) {
return doc.simulator;
}
return null;
})
.filter(Boolean) as any;
}
} }
// new DragResizeEngine(); // new DragResizeEngine();

View File

@ -1,15 +1,14 @@
import { Component } from 'react'; import { Component } from 'react';
import { computed, observer } from '@ali/lowcode-editor-core'; import { observer } from '@ali/lowcode-editor-core';
import { SimulatorContext } from '../context';
import { BuiltinSimulatorHost } from '../host'; import { BuiltinSimulatorHost } from '../host';
import { import {
DropLocation, DropLocation,
Rect, Rect,
isLocationChildrenDetail, isLocationChildrenDetail,
LocationChildrenDetail, LocationChildrenDetail,
isVertical isVertical,
} from '../../designer'; } from '../../designer';
import { ISimulatorHost, } from '../../simulator'; import { ISimulatorHost } from '../../simulator';
import { ParentalNode } from '../../document'; import { ParentalNode } from '../../document';
import './insertion.less'; import './insertion.less';

View File

@ -8,8 +8,8 @@ import {
isAssetItem, isAssetItem,
AssetType, AssetType,
assetItem, assetItem,
} from '@ali/lowcode-utils'; isCSSUrl } from '@ali/lowcode-utils';
import { isCSSUrl } from '@ali/lowcode-utils';
import { BuiltinSimulatorRenderer } from './renderer'; import { BuiltinSimulatorRenderer } from './renderer';
export function createSimulator( export function createSimulator(
@ -65,7 +65,7 @@ export function createSimulator(
const styleFrags = Object.keys(styles) const styleFrags = Object.keys(styles)
.map((key) => { .map((key) => {
return styles[key].join('\n') + `<meta level="${key}" />`; return `${styles[key].join('\n') }<meta level="${key}" />`;
}) })
.join(''); .join('');
const scriptFrags = Object.keys(scripts) const scriptFrags = Object.keys(scripts)

View File

@ -20,31 +20,36 @@ type SimulatorHostProps = BuiltinSimulatorProps & {
export class BuiltinSimulatorHostView extends Component<SimulatorHostProps> { export class BuiltinSimulatorHostView extends Component<SimulatorHostProps> {
readonly host: BuiltinSimulatorHost; readonly host: BuiltinSimulatorHost;
constructor(props: any) { constructor(props: any) {
super(props); super(props);
const { project } = this.props; const { project } = this.props;
this.host = (project.simulator as BuiltinSimulatorHost) || new BuiltinSimulatorHost(project); this.host = (project.simulator as BuiltinSimulatorHost) || new BuiltinSimulatorHost(project);
this.host.setProps(this.props); this.host.setProps(this.props);
} }
shouldComponentUpdate(nextProps: BuiltinSimulatorProps) { shouldComponentUpdate(nextProps: BuiltinSimulatorProps) {
this.host.setProps(nextProps); this.host.setProps(nextProps);
return false; return false;
} }
componentDidMount() { componentDidMount() {
if (this.props.onMount) { if (this.props.onMount) {
this.props.onMount(this.host); this.props.onMount(this.host);
} }
} }
render() { render() {
return ( return (
<div className="lc-simulator"> <div className="lc-simulator">
{/*progressing.visible ? <PreLoaderView /> : null*/} {/* progressing.visible ? <PreLoaderView /> : null */}
<Canvas host={this.host} /> <Canvas host={this.host} />
</div> </div>
); );
} }
} }
// eslint-disable-next-line react/no-multi-comp
@observer @observer
class Canvas extends Component<{ host: BuiltinSimulatorHost }> { class Canvas extends Component<{ host: BuiltinSimulatorHost }> {
render() { render() {
@ -67,11 +72,12 @@ class Canvas extends Component<{ host: BuiltinSimulatorHost }> {
} }
} }
// eslint-disable-next-line react/no-multi-comp
@observer @observer
class Content extends Component<{ host: BuiltinSimulatorHost }> { class Content extends Component<{ host: BuiltinSimulatorHost }> {
render() { render() {
const sim = this.props.host; const sim = this.props.host;
const viewport = sim.viewport; const { viewport } = sim;
const frameStyle = { const frameStyle = {
transform: `scale(${viewport.scale})`, transform: `scale(${viewport.scale})`,
height: viewport.contentHeight, height: viewport.contentHeight,

View File

@ -34,13 +34,15 @@ function addLiveEditingSpecificRule(rule: SpecificRule) {
export class LiveEditing { export class LiveEditing {
static addLiveEditingSpecificRule = addLiveEditingSpecificRule; static addLiveEditingSpecificRule = addLiveEditingSpecificRule;
static addLiveEditingSaveHandler = addLiveEditingSaveHandler; static addLiveEditingSaveHandler = addLiveEditingSaveHandler;
@obx.ref private _editing: Prop | null = null; @obx.ref private _editing: Prop | null = null;
apply(target: EditingTarget) { apply(target: EditingTarget) {
const { node, event, rootElement } = target; const { node, event, rootElement } = target;
const targetElement = event.target as HTMLElement; const targetElement = event.target as HTMLElement;
const liveTextEditing = node.componentMeta.liveTextEditing; const { liveTextEditing } = node.componentMeta;
const editor = globalContext.get(Editor); const editor = globalContext.get(Editor);
const npm = node?.componentMeta?.npm; const npm = node?.componentMeta?.npm;
@ -64,14 +66,14 @@ export class LiveEditing {
return false; return false;
} }
setterPropElement = queryPropElement(rootElement, targetElement, config.selector); setterPropElement = queryPropElement(rootElement, targetElement, config.selector);
return setterPropElement ? true : false; return !!setterPropElement;
}); });
propTarget = matched?.propTarget; propTarget = matched?.propTarget;
} }
} else { } else {
specificRules.some((rule) => { specificRules.some((rule) => {
matched = rule(target); matched = rule(target);
return matched ? true : false; return !!matched;
}); });
if (matched) { if (matched) {
propTarget = matched.propTarget; propTarget = matched.propTarget;
@ -79,15 +81,15 @@ export class LiveEditing {
} }
} }
if (!propTarget) { // if (!propTarget) {
// 自动纯文本编辑满足一下情况: // // 自动纯文本编辑满足一下情况:
// 1. children 内容都是 Leaf 且都是文本(一期) // // 1. children 内容都是 Leaf 且都是文本(一期)
// 2. DOM 节点是单层容器,子集都是文本节点 (已满足) // // 2. DOM 节点是单层容器,子集都是文本节点 (已满足)
const isAllText = node.children?.every(item => { // const isAllText = node.children?.every(item => {
return item.isLeaf() && item.getProp('children')?.type === 'literal'; // return item.isLeaf() && item.getProp('children')?.type === 'literal';
}); // });
// TODO: // // TODO:
} // }
if (propTarget && setterPropElement) { if (propTarget && setterPropElement) {
const prop = node.getProp(propTarget, true)!; const prop = node.getProp(propTarget, true)!;
@ -119,8 +121,10 @@ export class LiveEditing {
console.info(e.code); console.info(e.code);
switch (e.code) { switch (e.code) {
case 'Enter': case 'Enter':
break;
// TODO: check is richtext? // TODO: check is richtext?
case 'Escape': case 'Escape':
break;
case 'Tab': case 'Tab':
setterPropElement?.blur(); setterPropElement?.blur();
} }
@ -128,7 +132,7 @@ export class LiveEditing {
// enter // enter
// tab // tab
}; };
const focusout = (e: FocusEvent) => { const focusout = (/* e: FocusEvent */) => {
this.saveAndDispose(); this.saveAndDispose();
}; };
setterPropElement.addEventListener('focusout', focusout); setterPropElement.addEventListener('focusout', focusout);
@ -147,8 +151,6 @@ export class LiveEditing {
// TODO: process enter | esc events & joint the FocusTracker // TODO: process enter | esc events & joint the FocusTracker
// TODO: upward testing for b/i/a html elements // TODO: upward testing for b/i/a html elements
} }
get editing() { get editing() {
@ -156,7 +158,9 @@ export class LiveEditing {
} }
private _dispose?: () => void; private _dispose?: () => void;
private _save?: () => void; private _save?: () => void;
saveAndDispose() { saveAndDispose() {
if (this._save) { if (this._save) {
this._save(); this._save();

View File

@ -58,17 +58,20 @@ export default class InstanceNodeSelector extends React.Component<IProps, IState
}); });
} }
}; };
onMouseOver = (node: Node) => (_: any, flag = true) => { onMouseOver = (node: Node) => (_: any, flag = true) => {
if (node && typeof node.hover === 'function') { if (node && typeof node.hover === 'function') {
node.hover(flag); node.hover(flag);
} }
}; };
onMouseOut = (node: Node) => (_: any, flag = false) => { onMouseOut = (node: Node) => (_: any, flag = false) => {
if (node && typeof node.hover === 'function') { if (node && typeof node.hover === 'function') {
node.hover(flag); node.hover(flag);
} }
}; };
renderNodes = (node: Node) => {
renderNodes = (/* node: Node */) => {
const nodes = this.state.parentNodes || []; const nodes = this.state.parentNodes || [];
const children = nodes.map((node, key) => { const children = nodes.map((node, key) => {
return ( return (

View File

@ -21,16 +21,19 @@ export type RendererConsumer<T> = (renderer: BuiltinSimulatorRenderer, data: T)
export default class ResourceConsumer<T = any> { export default class ResourceConsumer<T = any> {
private emitter = new EventEmitter(); private emitter = new EventEmitter();
@obx.ref private _data: T | typeof UNSET = UNSET; @obx.ref private _data: T | typeof UNSET = UNSET;
private _providing?: () => void; private _providing?: () => void;
private _consuming?: () => void;
constructor(provider: () => T, private consumer?: RendererConsumer<T>) { constructor(provider: () => T, private consumer?: RendererConsumer<T>) {
this._providing = autorun(() => { this._providing = autorun(() => {
this._data = provider(); this._data = provider();
}); });
} }
private _consuming?: () => void;
consume(consumerOrRenderer: BuiltinSimulatorRenderer | ((data: T) => any)) { consume(consumerOrRenderer: BuiltinSimulatorRenderer | ((data: T) => any)) {
if (this._consuming) { if (this._consuming) {
return; return;
@ -72,6 +75,7 @@ export default class ResourceConsumer<T = any> {
} }
private _firstConsumed = false; private _firstConsumed = false;
private resovleFirst?: () => void; private resovleFirst?: () => void;
waitFirstConsume(): Promise<any> { waitFirstConsume(): Promise<any> {

View File

@ -16,6 +16,7 @@ export const primitiveTypes = [
'any', 'any',
]; ];
// eslint-disable-next-line @typescript-eslint/ban-types
function makeRequired(propType: any, lowcodeType: string | object) { function makeRequired(propType: any, lowcodeType: string | object) {
function lowcodeCheckTypeIsRequired(...rest: any[]) { function lowcodeCheckTypeIsRequired(...rest: any[]) {
return propType.isRequired(...rest); return propType.isRequired(...rest);
@ -32,6 +33,7 @@ function makeRequired(propType: any, lowcodeType: string | object) {
return lowcodeCheckTypeIsRequired; return lowcodeCheckTypeIsRequired;
} }
// eslint-disable-next-line @typescript-eslint/ban-types
function define(propType: any = PropTypes.any, lowcodeType: string | object = {}) { function define(propType: any = PropTypes.any, lowcodeType: string | object = {}) {
if (!propType._inner && propType.name !== 'lowcodeCheckType') { if (!propType._inner && propType.name !== 'lowcodeCheckType') {
propType.lowcodeType = lowcodeType; propType.lowcodeType = lowcodeType;
@ -136,7 +138,7 @@ export function parseProps(component: any): PropConfig[] {
Object.keys(propTypes).forEach(key => { Object.keys(propTypes).forEach(key => {
const propTypeItem = propTypes[key]; const propTypeItem = propTypes[key];
const defaultValue = defaultProps[key]; const defaultValue = defaultProps[key];
const lowcodeType = propTypeItem.lowcodeType; const { lowcodeType } = propTypeItem;
if (lowcodeType) { if (lowcodeType) {
result[key] = { result[key] = {
name: key, name: key,

View File

@ -158,7 +158,7 @@ export function joinPath(...segments: string[]) {
if (path === '') { if (path === '') {
path += seg; path += seg;
} else { } else {
path += '/' + seg; path += `/${ seg}`;
} }
} }
} }

View File

@ -1,5 +1,6 @@
const useRAF = typeof requestAnimationFrame === 'function'; const useRAF = typeof requestAnimationFrame === 'function';
// eslint-disable-next-line @typescript-eslint/ban-types
export function throttle(func: Function, delay: number) { export function throttle(func: Function, delay: number) {
let lastArgs: any; let lastArgs: any;
let lastThis: any; let lastThis: any;

View File

@ -4,7 +4,9 @@ import { AutoFit, IViewport } from '../simulator';
export default class Viewport implements IViewport { export default class Viewport implements IViewport {
@obx.ref private rect?: DOMRect; @obx.ref private rect?: DOMRect;
private _bounds?: DOMRect; private _bounds?: DOMRect;
get bounds(): DOMRect { get bounds(): DOMRect {
if (this._bounds) { if (this._bounds) {
return this._bounds; return this._bounds;
@ -17,12 +19,13 @@ export default class Viewport implements IViewport {
} }
get contentBounds(): DOMRect { get contentBounds(): DOMRect {
const bounds = this.bounds; const { bounds } = this;
const scale = this.scale; const { scale } = this;
return new DOMRect(0, 0, bounds.width / scale, bounds.height / scale); return new DOMRect(0, 0, bounds.width / scale, bounds.height / scale);
} }
private viewportElement?: HTMLElement; private viewportElement?: HTMLElement;
mount(viewportElement: HTMLElement | null) { mount(viewportElement: HTMLElement | null) {
if (!viewportElement || this.viewportElement === viewportElement) { if (!viewportElement || this.viewportElement === viewportElement) {
return; return;
@ -67,7 +70,7 @@ export default class Viewport implements IViewport {
} }
} }
@obx.ref private _scale: number = 1; @obx.ref private _scale = 1;
/** /**
* *
@ -87,6 +90,7 @@ export default class Viewport implements IViewport {
} }
@obx.ref private _contentWidth: number | AutoFit = AutoFit; @obx.ref private _contentWidth: number | AutoFit = AutoFit;
@obx.ref private _contentHeight: number | AutoFit = AutoFit; @obx.ref private _contentHeight: number | AutoFit = AutoFit;
@computed get contentHeight(): number | AutoFit { @computed get contentHeight(): number | AutoFit {
@ -106,15 +110,19 @@ export default class Viewport implements IViewport {
} }
@obx.ref private _scrollX = 0; @obx.ref private _scrollX = 0;
@obx.ref private _scrollY = 0; @obx.ref private _scrollY = 0;
get scrollX() { get scrollX() {
return this._scrollX; return this._scrollX;
} }
get scrollY() { get scrollY() {
return this._scrollY; return this._scrollY;
} }
private _scrollTarget?: ScrollTarget; private _scrollTarget?: ScrollTarget;
/** /**
* *
*/ */
@ -123,6 +131,7 @@ export default class Viewport implements IViewport {
} }
@obx private _scrolling = false; @obx private _scrolling = false;
get scrolling(): boolean { get scrolling(): boolean {
return this._scrolling; return this._scrolling;
} }

View File

@ -13,7 +13,7 @@ import {
FieldConfig, FieldConfig,
} from '@ali/lowcode-types'; } from '@ali/lowcode-types';
import { computed } from '@ali/lowcode-editor-core'; import { computed } from '@ali/lowcode-editor-core';
import { Node, ParentalNode, TransformStage } from './document'; import { Node, ParentalNode } from './document';
import { Designer } from './designer'; import { Designer } from './designer';
import { intlNode } from './locale'; import { intlNode } from './locale';
import { IconContainer } from './icons/container'; import { IconContainer } from './icons/container';
@ -63,45 +63,62 @@ function buildFilter(rule?: string | string[] | RegExp | NestingFilter) {
export class ComponentMeta { export class ComponentMeta {
readonly isComponentMeta = true; readonly isComponentMeta = true;
private _npm?: NpmInfo; private _npm?: NpmInfo;
get npm() { get npm() {
return this._npm; return this._npm;
} }
private _componentName?: string; private _componentName?: string;
get componentName(): string { get componentName(): string {
return this._componentName!; return this._componentName!;
} }
private _isContainer?: boolean; private _isContainer?: boolean;
get isContainer(): boolean { get isContainer(): boolean {
return this._isContainer! || this.isRootComponent(); return this._isContainer! || this.isRootComponent();
} }
private _isModal?: boolean; private _isModal?: boolean;
get isModal(): boolean { get isModal(): boolean {
return this._isModal!; return this._isModal!;
} }
private _descriptor?: string; private _descriptor?: string;
get descriptor(): string | undefined { get descriptor(): string | undefined {
return this._descriptor; return this._descriptor;
} }
private _rootSelector?: string; private _rootSelector?: string;
get rootSelector(): string | undefined { get rootSelector(): string | undefined {
return this._rootSelector; return this._rootSelector;
} }
private _transformedMetadata?: TransformedComponentMetadata; private _transformedMetadata?: TransformedComponentMetadata;
get configure() { get configure() {
const config = this._transformedMetadata?.configure; const config = this._transformedMetadata?.configure;
return config?.combined || config?.props || []; return config?.combined || config?.props || [];
} }
private _liveTextEditing?: LiveTextEditingConfig[]; private _liveTextEditing?: LiveTextEditingConfig[];
get liveTextEditing() { get liveTextEditing() {
return this._liveTextEditing; return this._liveTextEditing;
} }
private parentWhitelist?: NestingFilter | null; private parentWhitelist?: NestingFilter | null;
private childWhitelist?: NestingFilter | null; private childWhitelist?: NestingFilter | null;
private _title?: TitleContent; private _title?: TitleContent;
get title(): string | I18nData | ReactElement { get title(): string | I18nData | ReactElement {
// TODO: 标记下。这块需要康师傅加一下API页面正常渲染。 // TODO: 标记下。这块需要康师傅加一下API页面正常渲染。
// string | i18nData | ReactElement // string | i18nData | ReactElement
@ -123,6 +140,7 @@ export class ComponentMeta {
} }
private _acceptable?: boolean; private _acceptable?: boolean;
get acceptable(): boolean { get acceptable(): boolean {
return this._acceptable!; return this._acceptable!;
} }
@ -145,7 +163,7 @@ export class ComponentMeta {
// 额外转换逻辑 // 额外转换逻辑
this._transformedMetadata = this.transformMetadata(metadata); this._transformedMetadata = this.transformMetadata(metadata);
const title = this._transformedMetadata.title; const { title } = this._transformedMetadata;
if (title) { if (title) {
this._title = this._title =
typeof title === 'string' typeof title === 'string'
@ -182,8 +200,8 @@ export class ComponentMeta {
const { component } = configure; const { component } = configure;
if (component) { if (component) {
this._isContainer = component.isContainer ? true : false; this._isContainer = !!component.isContainer;
this._isModal = component.isModal ? true : false; this._isModal = !!component.isModal;
this._descriptor = component.descriptor; this._descriptor = component.descriptor;
this._rootSelector = component.rootSelector; this._rootSelector = component.rootSelector;
if (component.nestingRule) { if (component.nestingRule) {
@ -208,11 +226,12 @@ export class ComponentMeta {
return result as any; return result as any;
} }
isRootComponent(includeBlock: boolean = true) { isRootComponent(includeBlock = true) {
return this.componentName === 'Page' || this.componentName === 'Component' || (includeBlock && this.componentName === 'Block'); return this.componentName === 'Page' || this.componentName === 'Component' || (includeBlock && this.componentName === 'Block');
} }
@computed get availableActions() { @computed get availableActions() {
// eslint-disable-next-line prefer-const
let { disableBehaviors, actions } = this._transformedMetadata?.configure.component || {}; let { disableBehaviors, actions } = this._transformedMetadata?.configure.component || {};
const disabled = ensureAList(disableBehaviors) || (this.isRootComponent(false) ? ['copy', 'remove'] : null); const disabled = ensureAList(disableBehaviors) || (this.isRootComponent(false) ? ['copy', 'remove'] : null);
actions = builtinComponentActions.concat(this.designer.getGlobalComponentActions() || [], actions || []); actions = builtinComponentActions.concat(this.designer.getGlobalComponentActions() || [], actions || []);
@ -313,6 +332,7 @@ registerMetadataTransducer((metadata) => {
if (!component.nestingRule) { if (!component.nestingRule) {
let m; let m;
// uri match xx.Group set subcontrolling: true, childWhiteList // uri match xx.Group set subcontrolling: true, childWhiteList
// eslint-disable-next-line no-cond-assign
if ((m = /^(.+)\.Group$/.exec(componentName))) { if ((m = /^(.+)\.Group$/.exec(componentName))) {
// component.subControlling = true; // component.subControlling = true;
if (!component.nestingRule) { if (!component.nestingRule) {
@ -320,16 +340,16 @@ registerMetadataTransducer((metadata) => {
childWhitelist: [`${m[1]}`], childWhitelist: [`${m[1]}`],
}; };
} }
} // eslint-disable-next-line no-cond-assign
} else if ((m = /^(.+)\.Node$/.exec(componentName))) {
// uri match xx.Node set selfControlled: false, parentWhiteList // uri match xx.Node set selfControlled: false, parentWhiteList
else if ((m = /^(.+)\.Node$/.exec(componentName))) {
// component.selfControlled = false; // component.selfControlled = false;
component.nestingRule = { component.nestingRule = {
parentWhitelist: [`${m[1]}`, componentName], parentWhitelist: [`${m[1]}`, componentName],
}; };
} // eslint-disable-next-line no-cond-assign
} else if ((m = /^(.+)\.(Item|Node|Option)$/.exec(componentName))) {
// uri match .Item .Node .Option set parentWhiteList // uri match .Item .Node .Option set parentWhiteList
else if ((m = /^(.+)\.(Item|Node|Option)$/.exec(componentName))) {
component.nestingRule = { component.nestingRule = {
parentWhitelist: [`${m[1]}`], parentWhitelist: [`${m[1]}`],
}; };

View File

@ -107,7 +107,7 @@ hotkey.bind(['command+c', 'ctrl+c', 'command+x', 'ctrl+x'], (e, action) => {
let selected = doc.selection.getTopNodes(true); let selected = doc.selection.getTopNodes(true);
selected = selected.filter((node) => { selected = selected.filter((node) => {
return node.canPerformAction('copy'); return node.canPerformAction('copy');
}) });
if (!selected || selected.length < 1) { if (!selected || selected.length < 1) {
return; return;
} }
@ -242,11 +242,10 @@ hotkey.bind(['option+left', 'option+right'], (e, action) => {
parent.insertAfter(firstNode, silbing); parent.insertAfter(firstNode, silbing);
} }
firstNode?.select(); firstNode?.select();
return;
} }
}); });
hotkey.bind(['option+up'], (e, action) => { hotkey.bind(['option+up'], (e) => {
const designer = focusing.focusDesigner; const designer = focusing.focusDesigner;
const doc = designer?.currentDocument; const doc = designer?.currentDocument;
if (isFormEvent(e) || !doc) { if (isFormEvent(e) || !doc) {
@ -275,7 +274,6 @@ hotkey.bind(['option+up'], (e, action) => {
parent.insertBefore(firstNode, silbing); parent.insertBefore(firstNode, silbing);
} }
firstNode?.select(); firstNode?.select();
return;
} else { } else {
const place = parent.getSuitablePlace(firstNode, null); // upwards const place = parent.getSuitablePlace(firstNode, null); // upwards
if (place) { if (place) {
@ -285,7 +283,7 @@ hotkey.bind(['option+up'], (e, action) => {
} }
}); });
hotkey.bind(['option+down'], (e, action) => { hotkey.bind(['option+down'], (e) => {
const designer = focusing.focusDesigner; const designer = focusing.focusDesigner;
const doc = designer?.currentDocument; const doc = designer?.currentDocument;
if (isFormEvent(e) || !doc) { if (isFormEvent(e) || !doc) {
@ -315,7 +313,6 @@ hotkey.bind(['option+down'], (e, action) => {
parent.insertAfter(firstNode, silbing); parent.insertAfter(firstNode, silbing);
} }
firstNode?.select(); firstNode?.select();
return;
} else { } else {
const place = parent.getSuitablePlace(firstNode, null); // upwards const place = parent.getSuitablePlace(firstNode, null); // upwards
if (place) { if (place) {

View File

@ -1,5 +1,5 @@
function getDataFromPasteEvent(event: ClipboardEvent) { function getDataFromPasteEvent(event: ClipboardEvent) {
const clipboardData = event.clipboardData; const { clipboardData } = event;
if (!clipboardData) { if (!clipboardData) {
return null; return null;
} }
@ -14,7 +14,7 @@ function getDataFromPasteEvent(event: ClipboardEvent) {
return data; return data;
} else if (data.componentName) { } else if (data.componentName) {
return { return {
componentsTree: [ data ] componentsTree: [data],
}; };
} }
} catch (error) { } catch (error) {
@ -34,12 +34,13 @@ function getDataFromPasteEvent(event: ClipboardEvent) {
return { return {
code: clipboardData.getData('text/plain'), code: clipboardData.getData('text/plain'),
maps: {}, maps: {},
};*/ }; */
} }
} }
class Clipboard { class Clipboard {
private copyPasters: HTMLTextAreaElement[] = []; private copyPasters: HTMLTextAreaElement[] = [];
private waitFn?: (data: any, e: ClipboardEvent) => void; private waitFn?: (data: any, e: ClipboardEvent) => void;
isCopyPasteEvent(e: Event) { isCopyPasteEvent(e: Event) {

View File

@ -24,7 +24,7 @@ export class DesignerView extends Component<DesignerProps & {
shouldComponentUpdate(nextProps: DesignerProps) { shouldComponentUpdate(nextProps: DesignerProps) {
this.designer.setProps(nextProps); this.designer.setProps(nextProps);
const props = this.props; const { props } = this;
if ( if (
nextProps.className !== props.className || nextProps.className !== props.className ||
nextProps.style !== props.style || nextProps.style !== props.style ||
@ -44,7 +44,7 @@ export class DesignerView extends Component<DesignerProps & {
this.designer.postEvent('mount', this.designer); this.designer.postEvent('mount', this.designer);
} }
componentWillMount() { UNSAFE_componentWillMount() {
this.designer.purge(); this.designer.purge();
} }

View File

@ -44,9 +44,13 @@ export interface DesignerProps {
export class Designer { export class Designer {
readonly dragon = new Dragon(this); readonly dragon = new Dragon(this);
readonly activeTracker = new ActiveTracker(); readonly activeTracker = new ActiveTracker();
readonly detecting = new Detecting(); readonly detecting = new Detecting();
readonly project: Project; readonly project: Project;
readonly editor: IEditor; readonly editor: IEditor;
get currentDocument() { get currentDocument() {
@ -132,6 +136,7 @@ export class Designer {
[npm?.package, npm?.componentName].filter((item) => !!item).join('-') || [npm?.package, npm?.componentName].filter((item) => !!item).join('-') ||
parent?.componentMeta?.componentName || parent?.componentMeta?.componentName ||
''; '';
// eslint-disable-next-line no-unused-expressions
this.editor?.emit('designer.drag', { this.editor?.emit('designer.drag', {
time: (endTime - startTime).toFixed(2), time: (endTime - startTime).toFixed(2),
selected: nodes selected: nodes
@ -139,6 +144,7 @@ export class Designer {
if (!n) { if (!n) {
return; return;
} }
// eslint-disable-next-line no-shadow
const npm = n?.componentMeta?.npm; const npm = n?.componentMeta?.npm;
return ( return (
[npm?.package, npm?.componentName].filter((item) => !!item).join('-') || [npm?.package, npm?.componentName].filter((item) => !!item).join('-') ||
@ -171,9 +177,8 @@ export class Designer {
selectionDispose(); selectionDispose();
selectionDispose = undefined; selectionDispose = undefined;
} }
// TODO: 加开关控制(yiyi)
// 避免选中 Page 组件,默认选中第一个子节点
const currentSelection = this.currentSelection; const currentSelection = this.currentSelection;
// TODO: yiyi 加开关控制,避免选中 Page 组件,默认选中第一个子节点
if (currentSelection && currentSelection.selected.length === 0) { if (currentSelection && currentSelection.selected.length === 0) {
const rootNodeChildrens = this.currentDocument.getRoot().getChildren().children; const rootNodeChildrens = this.currentDocument.getRoot().getChildren().children;
if (rootNodeChildrens.length > 0) { if (rootNodeChildrens.length > 0) {
@ -195,7 +200,7 @@ export class Designer {
} }
this.postEvent('history.change', this.currentHistory); this.postEvent('history.change', this.currentHistory);
if (this.currentHistory) { if (this.currentHistory) {
const currentHistory = this.currentHistory; const { currentHistory } = this;
historyDispose = currentHistory.onStateChange(() => { historyDispose = currentHistory.onStateChange(() => {
this.postEvent('history.change', currentHistory); this.postEvent('history.change', currentHistory);
}); });
@ -225,6 +230,7 @@ export class Designer {
get dropLocation() { get dropLocation() {
return this._dropLocation; return this._dropLocation;
} }
/** /**
* dragon * dragon
*/ */
@ -254,6 +260,7 @@ export class Designer {
} }
private oobxList: OffsetObserver[] = []; private oobxList: OffsetObserver[] = [];
createOffsetObserver(nodeInstance: INodeSelector): OffsetObserver | null { createOffsetObserver(nodeInstance: INodeSelector): OffsetObserver | null {
const oobx = createOffsetObserver(nodeInstance); const oobx = createOffsetObserver(nodeInstance);
this.clearOobxList(); this.clearOobxList();
@ -310,6 +317,7 @@ export class Designer {
} }
private props?: DesignerProps; private props?: DesignerProps;
setProps(nextProps: DesignerProps) { setProps(nextProps: DesignerProps) {
const props = this.props ? { ...this.props, ...nextProps } : nextProps; const props = this.props ? { ...this.props, ...nextProps } : nextProps;
if (this.props) { if (this.props) {
@ -388,6 +396,7 @@ export class Designer {
} }
@obx.val private _componentMetasMap = new Map<string, ComponentMeta>(); @obx.val private _componentMetasMap = new Map<string, ComponentMeta>();
private _lostComponentMetasMap = new Map<string, ComponentMeta>(); private _lostComponentMetasMap = new Map<string, ComponentMeta>();
private buildComponentMetasMap(metas: ComponentMetadata[]) { private buildComponentMetasMap(metas: ComponentMetadata[]) {
@ -459,6 +468,7 @@ export class Designer {
} }
private propsReducers = new Map<TransformStage, PropsReducer[]>(); private propsReducers = new Map<TransformStage, PropsReducer[]>();
transformProps(props: CompositeObject | PropsList, node: Node, stage: TransformStage) { transformProps(props: CompositeObject | PropsList, node: Node, stage: TransformStage) {
if (Array.isArray(props)) { if (Array.isArray(props)) {
// current not support, make this future // current not support, make this future
@ -472,7 +482,7 @@ export class Designer {
return reducers.reduce((xprops, reducer) => { return reducers.reduce((xprops, reducer) => {
try { try {
return reducer(xprops, node) return reducer(xprops, node);
} catch (e) { } catch (e) {
// todo: add log // todo: add log
console.warn(e); console.warn(e);

View File

@ -3,18 +3,22 @@ import { Node, DocumentModel } from '../document';
export class Detecting { export class Detecting {
@obx.ref private _enable = true; @obx.ref private _enable = true;
get enable() { get enable() {
return this._enable; return this._enable;
} }
set enable(flag: boolean) { set enable(flag: boolean) {
this._enable = flag; this._enable = flag;
if (!flag) { if (!flag) {
this._current = null; this._current = null;
} }
} }
@obx.ref xRayMode = false; @obx.ref xRayMode = false;
@obx.ref private _current: Node | null = null; @obx.ref private _current: Node | null = null;
get current() { get current() {
return this._current; return this._current;
} }

View File

@ -9,9 +9,13 @@ type offBinding = () => any;
@observer @observer
export default class DragGhost extends Component<{ designer: Designer }> { export default class DragGhost extends Component<{ designer: Designer }> {
private dispose: offBinding[] = []; private dispose: offBinding[] = [];
@obx.ref private dragObject: DragObject | null = null; @obx.ref private dragObject: DragObject | null = null;
@obx.ref private x = 0; @obx.ref private x = 0;
@obx.ref private y = 0; @obx.ref private y = 0;
private dragon = this.props.designer.dragon; private dragon = this.props.designer.dragon;
constructor(props: any) { constructor(props: any) {
@ -48,7 +52,7 @@ export default class DragGhost extends Component<{ designer: Designer }> {
} }
renderGhostGroup() { renderGhostGroup() {
const dragObject = this.dragObject; const { dragObject } = this;
if (isDragNodeObject(dragObject)) { if (isDragNodeObject(dragObject)) {
return dragObject.nodes.map(node => { return dragObject.nodes.map(node => {
const ghost = ( const ghost = (

View File

@ -77,6 +77,7 @@ export interface ISensor {
export type DragObject = DragNodeObject | DragNodeDataObject | DragAnyObject; export type DragObject = DragNodeObject | DragNodeDataObject | DragAnyObject;
export enum DragObjectType { export enum DragObjectType {
// eslint-disable-next-line no-shadow
Node = 'node', Node = 'node',
NodeData = 'nodedata', NodeData = 'nodedata',
} }
@ -191,11 +192,13 @@ export class Dragon {
* current actived sensor, * current actived sensor,
*/ */
@obx.ref private _activeSensor: ISensor | undefined; @obx.ref private _activeSensor: ISensor | undefined;
get activeSensor(): ISensor | undefined { get activeSensor(): ISensor | undefined {
return this._activeSensor; return this._activeSensor;
} }
@obx.ref private _dragging = false; @obx.ref private _dragging = false;
get dragging(): boolean { get dragging(): boolean {
return this._dragging; return this._dragging;
} }
@ -237,7 +240,7 @@ export class Dragon {
* @param boostEvent * @param boostEvent
*/ */
boost(dragObject: DragObject, boostEvent: MouseEvent | DragEvent) { boost(dragObject: DragObject, boostEvent: MouseEvent | DragEvent) {
const designer = this.designer; const { designer } = this;
const masterSensors = this.getMasterSensors(); const masterSensors = this.getMasterSensors();
const handleEvents = makeEventsHandler(boostEvent, masterSensors); const handleEvents = makeEventsHandler(boostEvent, masterSensors);
const newBie = !isDragNodeObject(dragObject); const newBie = !isDragNodeObject(dragObject);

View File

@ -1,4 +1,5 @@
import './builtin-hotkey'; import './builtin-hotkey';
export * from './designer'; export * from './designer';
export * from './designer-view'; export * from './designer-view';
export * from './dragon'; export * from './dragon';

View File

@ -127,9 +127,13 @@ export function getWindow(elem: Element | Document): Window {
export class DropLocation { export class DropLocation {
readonly target: ParentalNode; readonly target: ParentalNode;
readonly detail: LocationDetail; readonly detail: LocationDetail;
readonly event: LocateEvent; readonly event: LocateEvent;
readonly source: string; readonly source: string;
get document(): DocumentModel { get document(): DocumentModel {
return this.target.document; return this.target.document;
} }

View File

@ -7,14 +7,23 @@ export class OffsetObserver {
readonly id = uniqueId('oobx'); readonly id = uniqueId('oobx');
private lastOffsetLeft?: number; private lastOffsetLeft?: number;
private lastOffsetTop?: number; private lastOffsetTop?: number;
private lastOffsetHeight?: number; private lastOffsetHeight?: number;
private lastOffsetWidth?: number; private lastOffsetWidth?: number;
@obx private _height = 0; @obx private _height = 0;
@obx private _width = 0; @obx private _width = 0;
@obx private _left = 0; @obx private _left = 0;
@obx private _top = 0; @obx private _top = 0;
@obx private _right = 0; @obx private _right = 0;
@obx private _bottom = 0; @obx private _bottom = 0;
@computed get height() { @computed get height() {
@ -42,6 +51,7 @@ export class OffsetObserver {
} }
@obx hasOffset = false; @obx hasOffset = false;
@computed get offsetLeft() { @computed get offsetLeft() {
if (this.isRoot) { if (this.isRoot) {
return this.viewport.scrollX * this.scale; return this.viewport.scrollX * this.scale;
@ -51,6 +61,7 @@ export class OffsetObserver {
} }
return this.lastOffsetLeft; return this.lastOffsetLeft;
} }
@computed get offsetTop() { @computed get offsetTop() {
if (this.isRoot) { if (this.isRoot) {
return this.viewport.scrollY * this.scale; return this.viewport.scrollY * this.scale;
@ -60,12 +71,14 @@ export class OffsetObserver {
} }
return this.lastOffsetTop; return this.lastOffsetTop;
} }
@computed get offsetHeight() { @computed get offsetHeight() {
if (!this.viewport.scrolling || this.lastOffsetHeight == null) { if (!this.viewport.scrolling || this.lastOffsetHeight == null) {
this.lastOffsetHeight = this.isRoot ? this.viewport.height : this.height; this.lastOffsetHeight = this.isRoot ? this.viewport.height : this.height;
} }
return this.lastOffsetHeight; return this.lastOffsetHeight;
} }
@computed get offsetWidth() { @computed get offsetWidth() {
if (!this.viewport.scrolling || this.lastOffsetWidth == null) { if (!this.viewport.scrolling || this.lastOffsetWidth == null) {
this.lastOffsetWidth = this.isRoot ? this.viewport.width : this.width; this.lastOffsetWidth = this.isRoot ? this.viewport.width : this.width;
@ -78,8 +91,11 @@ export class OffsetObserver {
} }
private pid: number | undefined; private pid: number | undefined;
readonly viewport: IViewport; readonly viewport: IViewport;
private isRoot: boolean; private isRoot: boolean;
readonly node: Node; readonly node: Node;
readonly compute: () => void; readonly compute: () => void;
@ -109,8 +125,7 @@ export class OffsetObserver {
if (!rect) { if (!rect) {
this.hasOffset = false; this.hasOffset = false;
} else { } else if (!this.viewport.scrolling || !this.hasOffset) {
if (!this.viewport.scrolling || !this.hasOffset) {
this._height = rect.height; this._height = rect.height;
this._width = rect.width; this._width = rect.width;
this._left = rect.left; this._left = rect.left;
@ -119,8 +134,8 @@ export class OffsetObserver {
this._bottom = rect.bottom; this._bottom = rect.bottom;
this.hasOffset = true; this.hasOffset = true;
} }
} this.pid = (window as any).requestIdleCallback(compute);
this.pid = pid = (window as any).requestIdleCallback(compute); pid = this.pid;
}; };
this.compute = compute; this.compute = compute;
@ -128,7 +143,8 @@ export class OffsetObserver {
// try first // try first
compute(); compute();
// try second, ensure the dom mounted // try second, ensure the dom mounted
this.pid = pid = (window as any).requestIdleCallback(compute); this.pid = (window as any).requestIdleCallback(compute);
pid = this.pid;
} }
purge() { purge() {

View File

@ -4,9 +4,11 @@ export class ScrollTarget {
get left() { get left() {
return 'scrollX' in this.target ? this.target.scrollX : this.target.scrollLeft; return 'scrollX' in this.target ? this.target.scrollX : this.target.scrollLeft;
} }
get top() { get top() {
return 'scrollY' in this.target ? this.target.scrollY : this.target.scrollTop; return 'scrollY' in this.target ? this.target.scrollY : this.target.scrollTop;
} }
scrollTo(options: { left?: number; top?: number }) { scrollTo(options: { left?: number; top?: number }) {
this.target.scrollTo(options); this.target.scrollTo(options);
} }
@ -24,6 +26,7 @@ export class ScrollTarget {
} }
private doe?: HTMLElement; private doe?: HTMLElement;
constructor(private target: Window | Element) { constructor(private target: Window | Element) {
if (isWindow(target)) { if (isWindow(target)) {
this.doe = target.document.documentElement; this.doe = target.document.documentElement;
@ -50,6 +53,8 @@ export interface IScrollable {
export class Scroller { export class Scroller {
private pid: number | undefined; private pid: number | undefined;
constructor(private scrollable: IScrollable) {}
get scrollTarget(): ScrollTarget | null { get scrollTarget(): ScrollTarget | null {
let target = this.scrollable.scrollTarget; let target = this.scrollable.scrollTarget;
if (!target) { if (!target) {
@ -62,19 +67,17 @@ export class Scroller {
return target; return target;
} }
constructor(private scrollable: IScrollable) {}
scrollTo(options: { left?: number; top?: number }) { scrollTo(options: { left?: number; top?: number }) {
this.cancel(); this.cancel();
const scrollTarget = this.scrollTarget; const { scrollTarget } = this;
if (!scrollTarget) { if (!scrollTarget) {
return; return;
} }
let pid: number; let pid: number;
const left = scrollTarget.left; const { left } = scrollTarget;
const top = scrollTarget.top; const { top } = scrollTarget;
const end = () => { const end = () => {
this.cancel(); this.cancel();
}; };
@ -106,20 +109,22 @@ export class Scroller {
scrollTarget.scrollTo(opt); scrollTarget.scrollTo(opt);
if (time < 1) { if (time < 1) {
this.pid = pid = requestAnimationFrame(animate); this.pid = requestAnimationFrame(animate);
pid = this.pid;
} else { } else {
end(); end();
} }
}; };
this.pid = pid = requestAnimationFrame(animate); this.pid = requestAnimationFrame(animate);
pid = this.pid;
} }
scrolling(point: { globalX: number; globalY: number }) { scrolling(point: { globalX: number; globalY: number }) {
this.cancel(); this.cancel();
const { bounds, scale = 1 } = this.scrollable; const { bounds, scale = 1 } = this.scrollable;
const scrollTarget = this.scrollTarget; const { scrollTarget } = this;
if (!scrollTarget || !bounds) { if (!scrollTarget || !bounds) {
return; return;
} }

View File

@ -19,29 +19,37 @@ function getSettingFieldCollectorKey(parent: SettingEntry, config: FieldConfig)
export class SettingField extends SettingPropEntry implements SettingEntry { export class SettingField extends SettingPropEntry implements SettingEntry {
readonly isSettingField = true; readonly isSettingField = true;
readonly isRequired: boolean; readonly isRequired: boolean;
readonly transducer: Transducer; readonly transducer: Transducer;
private _config: FieldConfig; private _config: FieldConfig;
extraProps: FieldExtraProps; extraProps: FieldExtraProps;
// ==== dynamic properties ==== // ==== dynamic properties ====
private _title?: TitleContent; private _title?: TitleContent;
get title() { get title() {
// FIXME! intl // FIXME! intl
return this._title || (typeof this.name === 'number' ? `项目 ${this.name}` : this.name); return this._title || (typeof this.name === 'number' ? `项目 ${this.name}` : this.name);
} }
private _setter?: SetterType | DynamicSetter; private _setter?: SetterType | DynamicSetter;
@computed get setter(): SetterType | null { @computed get setter(): SetterType | null {
if (!this._setter) { if (!this._setter) {
return null; return null;
} }
if (isDynamicSetter(this._setter)) { if (isDynamicSetter(this._setter)) {
return this._setter.call(this,this); return this._setter.call(this, this);
} }
return this._setter; return this._setter;
} }
@obx.ref private _expanded = true; @obx.ref private _expanded = true;
get expanded(): boolean { get expanded(): boolean {
return this._expanded; return this._expanded;
} }
@ -62,7 +70,7 @@ export class SettingField extends SettingPropEntry implements SettingEntry {
...extraProps, ...extraProps,
}; };
this.isRequired = config.isRequired || (setter as any)?.isRequired; this.isRequired = config.isRequired || (setter as any)?.isRequired;
this._expanded = extraProps?.defaultCollapsed ? false : true; this._expanded = !extraProps?.defaultCollapsed;
// initial items // initial items
if (items && items.length > 0) { if (items && items.length > 0) {

View File

@ -1,4 +1,4 @@
import { obx, computed, autorun } from '@ali/lowcode-editor-core'; import { obx, computed } from '@ali/lowcode-editor-core';
import { IEditor, isJSExpression } from '@ali/lowcode-types'; import { IEditor, isJSExpression } from '@ali/lowcode-types';
import { uniqueId } from '@ali/lowcode-utils'; import { uniqueId } from '@ali/lowcode-utils';
import { SettingEntry } from './setting-entry'; import { SettingEntry } from './setting-entry';
@ -10,24 +10,36 @@ import { EventEmitter } from 'events';
export class SettingPropEntry implements SettingEntry { export class SettingPropEntry implements SettingEntry {
// === static properties === // === static properties ===
readonly editor: IEditor; readonly editor: IEditor;
readonly isSameComponent: boolean; readonly isSameComponent: boolean;
readonly isMultiple: boolean; readonly isMultiple: boolean;
readonly isSingle: boolean; readonly isSingle: boolean;
readonly nodes: Node[]; readonly nodes: Node[];
readonly componentMeta: ComponentMeta | null; readonly componentMeta: ComponentMeta | null;
readonly designer: Designer; readonly designer: Designer;
readonly top: SettingEntry; readonly top: SettingEntry;
readonly isGroup: boolean; readonly isGroup: boolean;
readonly type: 'field' | 'group'; readonly type: 'field' | 'group';
readonly id = uniqueId('entry'); readonly id = uniqueId('entry');
readonly emitter = new EventEmitter(); readonly emitter = new EventEmitter();
// ==== dynamic properties ==== // ==== dynamic properties ====
@obx.ref private _name: string | number; @obx.ref private _name: string | number;
get name() { get name() {
return this._name; return this._name;
} }
@computed get path() { @computed get path() {
const path = this.parent.path.slice(); const path = this.parent.path.slice();
if (this.type === 'field') { if (this.type === 'field') {
@ -133,7 +145,7 @@ export class SettingPropEntry implements SettingEntry {
* *
*/ */
@computed getValue(): any { @computed getValue(): any {
let val: any = undefined; let val: any;
if (this.type === 'field') { if (this.type === 'field') {
val = this.parent.getPropValue(this.name); val = this.parent.getPropValue(this.name);
} }
@ -271,6 +283,7 @@ export class SettingPropEntry implements SettingEntry {
isIgnore() { isIgnore() {
return false; return false;
} }
/* /*
getConfig<K extends keyof IPropConfig>(configName?: K): IPropConfig[K] | IPropConfig { getConfig<K extends keyof IPropConfig>(configName?: K): IPropConfig[K] | IPropConfig {
if (configName) { if (configName) {
@ -287,6 +300,7 @@ export class SettingPropEntry implements SettingEntry {
} }
return ''; return '';
} }
setVariableValue(value: string) { setVariableValue(value: string) {
const v = this.getValue(); const v = this.getValue();
this.setValue({ this.setValue({
@ -295,6 +309,7 @@ export class SettingPropEntry implements SettingEntry {
mock: isJSExpression(v) ? v.mock : v, mock: isJSExpression(v) ? v.mock : v,
}); });
} }
setUseVariable(flag: boolean) { setUseVariable(flag: boolean) {
if (this.isUseVariable() === flag) { if (this.isUseVariable() === flag) {
return; return;
@ -310,12 +325,15 @@ export class SettingPropEntry implements SettingEntry {
}); });
} }
} }
isUseVariable() { isUseVariable() {
return isJSExpression(this.getValue()); return isJSExpression(this.getValue());
} }
get useVariable() { get useVariable() {
return this.isUseVariable(); return this.isUseVariable();
} }
getMockOrValue() { getMockOrValue() {
const v = this.getValue(); const v = this.getValue();
if (isJSExpression(v)) { if (isJSExpression(v)) {

View File

@ -2,7 +2,7 @@ import { EventEmitter } from 'events';
import { CustomView, isCustomView, IEditor } from '@ali/lowcode-types'; import { CustomView, isCustomView, IEditor } from '@ali/lowcode-types';
import { computed } from '@ali/lowcode-editor-core'; import { computed } from '@ali/lowcode-editor-core';
import { SettingEntry } from './setting-entry'; import { SettingEntry } from './setting-entry';
import { SettingField, isSettingField } from './setting-field'; import { SettingField } from './setting-field';
import { SettingPropEntry } from './setting-prop-entry'; import { SettingPropEntry } from './setting-prop-entry';
import { Node } from '../../document'; import { Node } from '../../document';
import { ComponentMeta } from '../../component-meta'; import { ComponentMeta } from '../../component-meta';
@ -17,12 +17,19 @@ function generateSessionId(nodes: Node[]) {
export class SettingTopEntry implements SettingEntry { export class SettingTopEntry implements SettingEntry {
private emitter = new EventEmitter(); private emitter = new EventEmitter();
private _items: Array<SettingField | CustomView> = []; private _items: Array<SettingField | CustomView> = [];
private _componentMeta: ComponentMeta | null = null; private _componentMeta: ComponentMeta | null = null;
private _isSame: boolean = true;
private _isSame = true;
private _settingFieldMap: { [prop: string]: SettingField } = {}; private _settingFieldMap: { [prop: string]: SettingField } = {};
readonly path = []; readonly path = [];
readonly top = this; readonly top = this;
readonly parent = this; readonly parent = this;
get componentMeta() { get componentMeta() {
@ -55,7 +62,9 @@ export class SettingTopEntry implements SettingEntry {
} }
readonly id: string; readonly id: string;
readonly first: Node; readonly first: Node;
readonly designer: Designer; readonly designer: Designer;
constructor(readonly editor: IEditor, readonly nodes: Node[]) { constructor(readonly editor: IEditor, readonly nodes: Node[]) {
@ -75,7 +84,7 @@ export class SettingTopEntry implements SettingEntry {
private setupComponentMeta() { private setupComponentMeta() {
// todo: enhance compile a temp configure.compiled // todo: enhance compile a temp configure.compiled
const first = this.first; const { first } = this;
const meta = first.componentMeta; const meta = first.componentMeta;
const l = this.nodes.length; const l = this.nodes.length;
let theSame = true; let theSame = true;
@ -100,7 +109,7 @@ export class SettingTopEntry implements SettingEntry {
const settingFieldMap: { [prop: string]: SettingField } = {}; const settingFieldMap: { [prop: string]: SettingField } = {};
const settingFieldCollector = (name: string | number, field: SettingField) => { const settingFieldCollector = (name: string | number, field: SettingField) => {
settingFieldMap[name] = field; settingFieldMap[name] = field;
} };
this._items = this.componentMeta.configure.map((item) => { this._items = this.componentMeta.configure.map((item) => {
if (isCustomView(item)) { if (isCustomView(item)) {
return item; return item;
@ -209,18 +218,23 @@ export class SettingTopEntry implements SettingEntry {
getStatus() { getStatus() {
} }
setStatus() { setStatus() {
} }
getChildren() { getChildren() {
// this.nodes.map() // this.nodes.map()
} }
getDOMNode() { getDOMNode() {
} }
getId() { getId() {
return this.id; return this.id;
} }
getPage() { getPage() {
return this.first.document; return this.first.document;
} }
@ -231,6 +245,7 @@ export class SettingTopEntry implements SettingEntry {
get node() { get node() {
return this.getNode(); return this.getNode();
} }
getNode() { getNode() {
return this.nodes[0]; return this.nodes[0];
} }

View File

@ -8,10 +8,8 @@ import { isDragNodeDataObject, DragNodeObject, DragNodeDataObject, DropLocation
import { Node, insertChildren, insertChild, isNode, RootNode, ParentalNode } from './node/node'; import { Node, insertChildren, insertChild, isNode, RootNode, ParentalNode } from './node/node';
import { Selection } from './selection'; import { Selection } from './selection';
import { History } from './history'; import { History } from './history';
import { TransformStage } from './node'; import { TransformStage, ModalNodesManager } from './node';
import { uniqueId } from '@ali/lowcode-utils'; import { uniqueId } from '@ali/lowcode-utils';
import { ModalNodesManager } from './node';
import { foreachReverse } from '../utils/tree';
export type GetDataType<T, NodeType> = T extends undefined export type GetDataType<T, NodeType> = T extends undefined
? NodeType extends { ? NodeType extends {
@ -35,27 +33,37 @@ export class DocumentModel {
* Page/Component/Block * Page/Component/Block
*/ */
rootNode: RootNode | null; rootNode: RootNode | null;
/** /**
* *
*/ */
id: string = uniqueId('doc'); id: string = uniqueId('doc');
/** /**
* *
*/ */
readonly selection: Selection = new Selection(this); readonly selection: Selection = new Selection(this);
/** /**
* *
*/ */
readonly history: History; readonly history: History;
/** /**
* *
*/ */
readonly modalNodesManager: ModalNodesManager; readonly modalNodesManager: ModalNodesManager;
private _nodesMap = new Map<string, Node>(); private _nodesMap = new Map<string, Node>();
@obx.val private nodes = new Set<Node>(); @obx.val private nodes = new Set<Node>();
private seqId = 0; private seqId = 0;
private _simulator?: ISimulatorHost;
private emitter: EventEmitter; private emitter: EventEmitter;
private rootNodeVisitorMap: { [visitorName: string]: any } = {}; private rootNodeVisitorMap: { [visitorName: string]: any } = {};
/** /**
@ -83,7 +91,9 @@ export class DocumentModel {
} }
private _modalNode?: ParentalNode; private _modalNode?: ParentalNode;
private _blank?: boolean; private _blank?: boolean;
get modalNode() { get modalNode() {
return this._modalNode; return this._modalNode;
} }
@ -93,6 +103,7 @@ export class DocumentModel {
} }
private inited = false; private inited = false;
constructor(readonly project: Project, schema?: RootSchema) { constructor(readonly project: Project, schema?: RootSchema) {
/* /*
// TODO // TODO
@ -128,9 +139,11 @@ export class DocumentModel {
} }
@obx.val private willPurgeSpace: Node[] = []; @obx.val private willPurgeSpace: Node[] = [];
addWillPurge(node: Node) { addWillPurge(node: Node) {
this.willPurgeSpace.push(node); this.willPurgeSpace.push(node);
} }
removeWillPurge(node: Node) { removeWillPurge(node: Node) {
const i = this.willPurgeSpace.indexOf(node); const i = this.willPurgeSpace.indexOf(node);
if (i > -1) { if (i > -1) {
@ -150,8 +163,8 @@ export class DocumentModel {
nextId() { nextId() {
let id; let id;
do { do {
id = 'node_' + (this.id.slice(-10) + (++this.seqId).toString(36)).toLocaleLowerCase(); id = `node_${ (this.id.slice(-10) + (++this.seqId).toString(36)).toLocaleLowerCase()}`;
} while (this.nodesMap.get(id)) } while (this.nodesMap.get(id));
return id; return id;
} }
@ -280,6 +293,7 @@ export class DocumentModel {
} }
@obx.ref private _dropLocation: DropLocation | null = null; @obx.ref private _dropLocation: DropLocation | null = null;
/** /**
* *
*/ */
@ -357,6 +371,27 @@ export class DocumentModel {
return !this.history.isSavePoint(); return !this.history.isSavePoint();
} }
/**
*
*/
@computed get simulatorProps(): object {
let { simulatorProps } = this.designer;
if (typeof simulatorProps === 'function') {
simulatorProps = simulatorProps(this);
}
return {
...simulatorProps,
documentContext: this,
onMount: this.mountSimulator.bind(this),
};
}
private mountSimulator(simulator: ISimulatorHost) {
// TODO: 多设备 simulator 支持
this._simulator = simulator;
// TODO: emit simulator mounted
}
// FIXME: does needed? // FIXME: does needed?
getComponent(componentName: string): any { getComponent(componentName: string): any {
return this.simulator!.getComponent(componentName); return this.simulator!.getComponent(componentName);
@ -370,6 +405,7 @@ export class DocumentModel {
} }
@obx.ref private _opened = false; @obx.ref private _opened = false;
@obx.ref private _suspensed = false; @obx.ref private _suspensed = false;
/** /**
@ -549,8 +585,9 @@ export class DocumentModel {
acceptRootNodeVisitor( acceptRootNodeVisitor(
visitorName: string = 'default', visitorName = 'default',
visitorFn: (node: RootNode) => any ) { visitorFn: (node: RootNode) => any,
) {
let visitorResult = {}; let visitorResult = {};
if (!visitorName) { if (!visitorName) {
/* tslint:disable no-console */ /* tslint:disable no-console */
@ -573,7 +610,7 @@ export class DocumentModel {
const componentsMap: ComponentMap[] = []; const componentsMap: ComponentMap[] = [];
// 组件去重 // 组件去重
const map: any = {}; const map: any = {};
for (let node of this._nodesMap.values()) { for (const node of this._nodesMap.values()) {
const { componentName } = node || {}; const { componentName } = node || {};
if (!map[componentName] && node?.componentMeta?.npm?.package) { if (!map[componentName] && node?.componentMeta?.npm?.package) {
map[componentName] = true; map[componentName] = true;
@ -624,7 +661,7 @@ export class DocumentModel {
/** /**
* @deprecated * @deprecated
*/ */
onRefresh(func: () => void) { onRefresh(/* func: () => void */) {
console.warn('onRefresh method is deprecated'); console.warn('onRefresh method is deprecated');
} }
} }

View File

@ -0,0 +1,37 @@
import { Component } from 'react';
import classNames from 'classnames';
import { observer } from '@ali/lowcode-editor-core';
import { DocumentModel } from './document-model';
import { BuiltinSimulatorHostView } from '../builtin-simulator';
@observer
export class DocumentView extends Component<{ document: DocumentModel }> {
shouldComponentUpdate() {
return false;
}
render() {
const { document } = this.props;
const { simulatorProps } = document;
const Simulator = document.designer.simulatorComponent || BuiltinSimulatorHostView;
return (
<div
className={classNames('lc-document', {
'lc-document-hidden': document.suspensed,
})}
>
{/* 这一层将来做缩放用途 */}
<div className="lc-simulator-shell">
<Simulator {...simulatorProps} />
</div>
<DocumentInfoView document={document} />
</div>
);
}
}
class DocumentInfoView extends Component<{ document: DocumentModel }> {
render() {
return null;
}
}

Some files were not shown because too many files have changed in this diff Show More