Browse Source

Merge branch 'master' into 0.3.x

master
smallstonesk 4 years ago
parent
commit
5a2ecef92b
  1. 4
      README.en-US.md
  2. 6
      README.md
  3. 4
      packages/cli/package.json
  4. 4
      packages/cli/src/cmd/dev/index.js
  5. 2
      packages/compile-code/package.json
  6. 2
      packages/core/package.json
  7. 25
      packages/core/src/mods/header/guide/guideModal.tsx
  8. 6
      packages/core/src/mods/settingBar/components/json/index.module.less
  9. 6
      packages/json-schema-editor/package-lock.json
  10. 2
      packages/json-schema-editor/package.json
  11. 2
      packages/plugin-store/package.json

4
README.en-US.md

@ -30,7 +30,9 @@
Download this project, install dependencies and start the project. Download this project, install dependencies and start the project.
```bash ```bash
$ git clone https://github.com/imgcook/imove.git $ git clone https://github.com/ykfe/imove.git
$ cd imove
$ npm install
$ npm run example $ npm run example
``` ```
<!-- markdown-link-check-disable --> <!-- markdown-link-check-disable -->

6
README.md

@ -23,8 +23,6 @@
- [x] **适用于JavaScript所有场景**:比如前端点击事件,Ajax 请求和 Node.js 后端 API等 - [x] **适用于JavaScript所有场景**:比如前端点击事件,Ajax 请求和 Node.js 后端 API等
- [ ] **多语言编译**:无语言编译出码限制(例:支持 JavaScript, Java 编译出码) - [ ] **多语言编译**:无语言编译出码限制(例:支持 JavaScript, Java 编译出码)
在线示例 https://oyg3y.sse.codesandbox.io/
## 使用场景 ## 使用场景
![usage](https://img.alicdn.com/imgextra/i1/O1CN01kRXnfQ1LFhesOA6cn_!!6000000001270-2-tps-2212-1166.png) ![usage](https://img.alicdn.com/imgextra/i1/O1CN01kRXnfQ1LFhesOA6cn_!!6000000001270-2-tps-2212-1166.png)
@ -40,7 +38,7 @@
下载仓库,安装并启动 下载仓库,安装并启动
```bash ```bash
$ git clone git@github.com:imgcook/imove.git $ git clone https://github.com/ykfe/imove.git
$ cd imove $ cd imove
$ npm install $ npm install
$ npm run example $ npm run example
@ -72,6 +70,8 @@ $ npm run example
* iloveyou11 - 冷卉「Core Team」 * iloveyou11 - 冷卉「Core Team」
* i5ting - 狼叔「Core Team」 * i5ting - 狼叔「Core Team」
团队博客,各种原理,设计初衷,实现,思考等都在这里: https://www.yuque.com/imove/blog
See also the list of [contributors](https://github.com/imgcook/imove/graphs/contributors) who participated in this project. See also the list of [contributors](https://github.com/imgcook/imove/graphs/contributors) who participated in this project.
## 贡献 ## 贡献

4
packages/cli/package.json

@ -1,6 +1,6 @@
{ {
"name": "@imove/cli", "name": "@imove/cli",
"version": "0.0.3", "version": "0.0.5",
"description": "imove client", "description": "imove client",
"main": "index.js", "main": "index.js",
"bin": { "bin": {
@ -20,7 +20,7 @@
"author": "smallstonesk", "author": "smallstonesk",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@imove/compile-code": "^0.0.1", "@imove/compile-code": "^0.1.0",
"body-parser": "^1.19.0", "body-parser": "^1.19.0",
"commander": "^6.0.0", "commander": "^6.0.0",
"cors": "^2.8.5", "cors": "^2.8.5",

4
packages/cli/src/cmd/dev/index.js

@ -2,7 +2,7 @@ const path = require('path');
const fs = require('fs-extra'); const fs = require('fs-extra');
const Base = require('../base'); const Base = require('../base');
const mergePkg = require('./mergePkg'); const mergePkg = require('./mergePkg');
const compileCode = require('@imove/compile-code'); const { compileForProject } = require('@imove/compile-code');
const { createServer } = require('../../utils/server'); const { createServer } = require('../../utils/server');
const noop = () => {}; const noop = () => {};
@ -37,7 +37,7 @@ class Dev extends Base {
// compile // compile
try { try {
const { dsl } = req.body; const { dsl } = req.body;
const output = compileCode(dsl, plugins); const output = compileForProject(dsl, plugins);
await this.writeOutputIntoFiles(outputPath, output); await this.writeOutputIntoFiles(outputPath, output);
await mergePkg(dsl, this.projectPath); await mergePkg(dsl, this.projectPath);
await fs.outputFile(CACHE_DSL_FILE, JSON.stringify(dsl, null, 2)); await fs.outputFile(CACHE_DSL_FILE, JSON.stringify(dsl, null, 2));

2
packages/compile-code/package.json

@ -1,6 +1,6 @@
{ {
"name": "@imove/compile-code", "name": "@imove/compile-code",
"version": "0.0.1", "version": "0.1.0",
"description": "imove compile code", "description": "imove compile code",
"main": "dist/core.common.js", "main": "dist/core.common.js",
"module": "dist/core.esm.js", "module": "dist/core.esm.js",

2
packages/core/package.json

@ -38,7 +38,7 @@
"dependencies": { "dependencies": {
"@ant-design/icons": "^4.0.6", "@ant-design/icons": "^4.0.6",
"@antv/x6": "^1.7.12", "@antv/x6": "^1.7.12",
"@imove/compile-code": "^0.0.1", "@imove/compile-code": "^0.1.0",
"@monaco-editor/react": "^3.7.4", "@monaco-editor/react": "^3.7.4",
"antd": "^4.5.3", "antd": "^4.5.3",
"axios": "^0.21.0", "axios": "^0.21.0",

25
packages/core/src/mods/header/guide/guideModal.tsx

@ -314,42 +314,27 @@ const Document: React.FC = () => {
</a> </a>
</div> </div>
<div> <div>
<a <a target="blank" href="https://www.yuque.com/imove/blog/bee1ki">
target="blank"
href="https://www.yuque.com/imove/blog/bee1ki"
>
2021 2021
</a> </a>
</div> </div>
<div> <div>
<a <a target="blank" href="https://www.yuque.com/imove/blog/tcdrps">
target="blank"
href="https://www.yuque.com/imove/blog/tcdrps"
>
F2C能否让前端像运营配置一样开发 F2C能否让前端像运营配置一样开发
</a> </a>
</div> </div>
<div> <div>
<a <a target="blank" href="https://www.yuque.com/imove/blog/qxq2mw">
target="blank"
href="https://www.yuque.com/imove/blog/qxq2mw"
>
Github iMove ! Github iMove !
</a> </a>
</div> </div>
<div> <div>
<a <a target="blank" href="https://www.yuque.com/imove/blog/ettxi8">
target="blank"
href="https://www.yuque.com/imove/blog/ettxi8"
>
iMove X6 + form-render iMove X6 + form-render
</a> </a>
</div> </div>
<div> <div>
<a <a target="blank" href="https://www.yuque.com/imove/blog/vgp6bb">
target="blank"
href="https://www.yuque.com/imove/blog/vgp6bb"
>
! iMove 线 ! iMove 线
</a> </a>
</div> </div>

6
packages/core/src/mods/settingBar/components/json/index.module.less

@ -19,6 +19,12 @@
height:600px; height:600px;
overflow-y: auto; overflow-y: auto;
margin:0 20px; margin:0 20px;
:global {
.fr-wrapper {
position: relative;
}
}
} }
.configInput{ .configInput{
height: 600px; height: 600px;

6
packages/json-schema-editor/package-lock.json

@ -620,9 +620,9 @@
} }
}, },
"immer": { "immer": {
"version": "6.0.5", "version": "8.0.1",
"resolved": "https://registry.npmjs.org/immer/-/immer-6.0.5.tgz", "resolved": "https://registry.npmjs.org/immer/-/immer-8.0.1.tgz",
"integrity": "sha512-Q2wd90qrgFieIpLzAO2q9NLEdmyp/sr76Ml4Vm5peUKgyTa2CQa3ey8zuzwSKOlKH7grCeGBGUcLLVCVW1aguA==" "integrity": "sha512-aqXhGP7//Gui2+UrEtvxZxSquQVXTpZ7KDxfCcKAF3Vysvw0CViVaW9RZ1j1xlIYqaaaipBoqdqeibkc18PNvA=="
}, },
"import-fresh": { "import-fresh": {
"version": "3.2.1", "version": "3.2.1",

2
packages/json-schema-editor/package.json

@ -58,7 +58,7 @@
"gitHead": "60b114ff262513544204f33a9bbcb6220d6c1c5d", "gitHead": "60b114ff262513544204f33a9bbcb6220d6c1c5d",
"dependencies": { "dependencies": {
"i18next": "^19.4.4", "i18next": "^19.4.4",
"immer": "^6.0.5", "immer": "^8.0.1",
"lodash-es": "^4.17.15", "lodash-es": "^4.17.15",
"react-i18next": "^11.4.0", "react-i18next": "^11.4.0",
"react-tracked": "^1.3.0" "react-tracked": "^1.3.0"

2
packages/plugin-store/package.json

@ -1,6 +1,6 @@
{ {
"name": "@imove/plugin-store", "name": "@imove/plugin-store",
"version": "0.0.1", "version": "0.0.3",
"description": "iMove plugin that supports persisting data", "description": "iMove plugin that supports persisting data",
"keywords": [ "keywords": [
"imove", "imove",

Loading…
Cancel
Save