mirror of
https://github.com/alibaba/lowcode-engine.git
synced 2025-12-18 16:02:52 +00:00
merge
This commit is contained in:
parent
ff64a86551
commit
f2c7f462da
@ -1,10 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@ali/lowcode-designer",
|
"name": "@ali/lowcode-designer",
|
||||||
<<<<<<< HEAD
|
|
||||||
"version": "0.8.4",
|
"version": "0.8.4",
|
||||||
=======
|
|
||||||
"version": "0.8.2",
|
|
||||||
>>>>>>> df955e1db90ff104cd11160def80113cfd6faccc
|
|
||||||
"description": "Designer for Ali LowCode Engine",
|
"description": "Designer for Ali LowCode Engine",
|
||||||
"main": "lib/index.js",
|
"main": "lib/index.js",
|
||||||
"module": "es/index.js",
|
"module": "es/index.js",
|
||||||
|
|||||||
@ -1,10 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@ali/lowcode-editor-skeleton",
|
"name": "@ali/lowcode-editor-skeleton",
|
||||||
<<<<<<< HEAD
|
|
||||||
"version": "0.8.4",
|
"version": "0.8.4",
|
||||||
=======
|
|
||||||
"version": "0.8.1",
|
|
||||||
>>>>>>> df955e1db90ff104cd11160def80113cfd6faccc
|
|
||||||
"description": "alibaba lowcode editor skeleton",
|
"description": "alibaba lowcode editor skeleton",
|
||||||
"main": "lib/index.js",
|
"main": "lib/index.js",
|
||||||
"module": "es/index.js",
|
"module": "es/index.js",
|
||||||
|
|||||||
@ -1,10 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@ali/lowcode-plugin-components-pane",
|
"name": "@ali/lowcode-plugin-components-pane",
|
||||||
<<<<<<< HEAD
|
|
||||||
"version": "0.8.3",
|
"version": "0.8.3",
|
||||||
=======
|
|
||||||
"version": "0.8.1",
|
|
||||||
>>>>>>> df955e1db90ff104cd11160def80113cfd6faccc
|
|
||||||
"description": "alibaba lowcode editor component-list plugin",
|
"description": "alibaba lowcode editor component-list plugin",
|
||||||
"files": [
|
"files": [
|
||||||
"es/",
|
"es/",
|
||||||
|
|||||||
@ -1,10 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@ali/lowcode-plugin-event-bind-dialog",
|
"name": "@ali/lowcode-plugin-event-bind-dialog",
|
||||||
<<<<<<< HEAD
|
|
||||||
"version": "0.8.4",
|
"version": "0.8.4",
|
||||||
=======
|
|
||||||
"version": "0.8.2",
|
|
||||||
>>>>>>> df955e1db90ff104cd11160def80113cfd6faccc
|
|
||||||
"description": "alibaba lowcode editor event bind dialog plugin",
|
"description": "alibaba lowcode editor event bind dialog plugin",
|
||||||
"files": [
|
"files": [
|
||||||
"es",
|
"es",
|
||||||
|
|||||||
@ -1,10 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@ali/lowcode-plugin-outline-pane",
|
"name": "@ali/lowcode-plugin-outline-pane",
|
||||||
<<<<<<< HEAD
|
|
||||||
"version": "0.8.4",
|
"version": "0.8.4",
|
||||||
=======
|
|
||||||
"version": "0.8.2",
|
|
||||||
>>>>>>> df955e1db90ff104cd11160def80113cfd6faccc
|
|
||||||
"description": "Outline pane for Ali lowCode engine",
|
"description": "Outline pane for Ali lowCode engine",
|
||||||
"files": [
|
"files": [
|
||||||
"es",
|
"es",
|
||||||
|
|||||||
@ -1,10 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@ali/lowcode-plugin-sample-logo",
|
"name": "@ali/lowcode-plugin-sample-logo",
|
||||||
<<<<<<< HEAD
|
|
||||||
"version": "0.8.3",
|
"version": "0.8.3",
|
||||||
=======
|
|
||||||
"version": "0.8.1",
|
|
||||||
>>>>>>> df955e1db90ff104cd11160def80113cfd6faccc
|
|
||||||
"description": "alibaba lowcode editor logo plugin",
|
"description": "alibaba lowcode editor logo plugin",
|
||||||
"files": [
|
"files": [
|
||||||
"es/",
|
"es/",
|
||||||
|
|||||||
@ -18,13 +18,8 @@
|
|||||||
"editor"
|
"editor"
|
||||||
],
|
],
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
<<<<<<< HEAD
|
|
||||||
"@ali/lowcode-designer": "^0.8.4",
|
"@ali/lowcode-designer": "^0.8.4",
|
||||||
"@ali/lowcode-editor-core": "^0.8.4",
|
"@ali/lowcode-editor-core": "^0.8.4",
|
||||||
=======
|
|
||||||
"@ali/lowcode-designer": "^0.8.2",
|
|
||||||
"@ali/lowcode-editor-core": "^0.8.1",
|
|
||||||
>>>>>>> df955e1db90ff104cd11160def80113cfd6faccc
|
|
||||||
"@alifd/next": "^1.x",
|
"@alifd/next": "^1.x",
|
||||||
"react": "^16.8.1"
|
"react": "^16.8.1"
|
||||||
},
|
},
|
||||||
|
|||||||
@ -19,11 +19,7 @@
|
|||||||
],
|
],
|
||||||
"author": "xiayang.xy",
|
"author": "xiayang.xy",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
<<<<<<< HEAD
|
|
||||||
"@ali/lowcode-editor-core": "^0.8.4",
|
"@ali/lowcode-editor-core": "^0.8.4",
|
||||||
=======
|
|
||||||
"@ali/lowcode-editor-core": "^0.8.1",
|
|
||||||
>>>>>>> df955e1db90ff104cd11160def80113cfd6faccc
|
|
||||||
"@alifd/next": "^1.x",
|
"@alifd/next": "^1.x",
|
||||||
"react": "^16.8.1"
|
"react": "^16.8.1"
|
||||||
},
|
},
|
||||||
|
|||||||
@ -1,10 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@ali/lowcode-plugin-settings-pane",
|
"name": "@ali/lowcode-plugin-settings-pane",
|
||||||
<<<<<<< HEAD
|
|
||||||
"version": "0.8.5",
|
"version": "0.8.5",
|
||||||
=======
|
|
||||||
"version": "0.8.3",
|
|
||||||
>>>>>>> df955e1db90ff104cd11160def80113cfd6faccc
|
|
||||||
"description": "Settings pane for Ali lowCode engine",
|
"description": "Settings pane for Ali lowCode engine",
|
||||||
"files": [
|
"files": [
|
||||||
"es",
|
"es",
|
||||||
|
|||||||
@ -19,13 +19,8 @@
|
|||||||
],
|
],
|
||||||
"author": "xiayang.xy",
|
"author": "xiayang.xy",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
<<<<<<< HEAD
|
|
||||||
"@ali/lowcode-editor-core": "^0.8.4",
|
"@ali/lowcode-editor-core": "^0.8.4",
|
||||||
"@ali/lowcode-editor-skeleton": "^0.8.4",
|
"@ali/lowcode-editor-skeleton": "^0.8.4",
|
||||||
=======
|
|
||||||
"@ali/lowcode-editor-core": "^0.8.1",
|
|
||||||
"@ali/lowcode-editor-skeleton": "^0.8.1",
|
|
||||||
>>>>>>> df955e1db90ff104cd11160def80113cfd6faccc
|
|
||||||
"react": "^16.8.1",
|
"react": "^16.8.1",
|
||||||
"react-dom": "^16.8.1"
|
"react-dom": "^16.8.1"
|
||||||
},
|
},
|
||||||
|
|||||||
@ -22,11 +22,7 @@
|
|||||||
"@ali/iceluna-comp-react-node": "^1.0.5",
|
"@ali/iceluna-comp-react-node": "^1.0.5",
|
||||||
"@ali/iceluna-sdk": "^1.0.5-beta.24",
|
"@ali/iceluna-sdk": "^1.0.5-beta.24",
|
||||||
"@ali/lc-style-setter": "^0.0.1",
|
"@ali/lc-style-setter": "^0.0.1",
|
||||||
<<<<<<< HEAD
|
|
||||||
"@ali/lowcode-globals": "^0.8.3",
|
"@ali/lowcode-globals": "^0.8.3",
|
||||||
=======
|
|
||||||
"@ali/lowcode-globals": "^0.8.1",
|
|
||||||
>>>>>>> df955e1db90ff104cd11160def80113cfd6faccc
|
|
||||||
"@alifd/next": "^1.19.16",
|
"@alifd/next": "^1.19.16",
|
||||||
"acorn": "^6.4.1",
|
"acorn": "^6.4.1",
|
||||||
"classnames": "^2.2.6",
|
"classnames": "^2.2.6",
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user