diff --git a/.gitignore b/.gitignore index 3308fcbcd..72b3f8225 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ packages/*/es/ packages/*/dist/ package-lock.json yarn.lock +deploy-space/packages # IDE diff --git a/html/index.html b/deploy-space/html/index.html similarity index 100% rename from html/index.html rename to deploy-space/html/index.html diff --git a/html/preview.html b/deploy-space/html/preview.html similarity index 100% rename from html/preview.html rename to deploy-space/html/preview.html diff --git a/deploy-space/lerna.json b/deploy-space/lerna.json new file mode 100644 index 000000000..31d37d2d3 --- /dev/null +++ b/deploy-space/lerna.json @@ -0,0 +1,9 @@ +{ + "version": "independent", + "npmClient": "yarn", + "registry": "http://registry.npm.alibaba-inc.com", + "useWorkspaces": true, + "packages": [ + "packages/*" + ] +} diff --git a/deploy-space/package.json b/deploy-space/package.json new file mode 100644 index 000000000..29417f461 --- /dev/null +++ b/deploy-space/package.json @@ -0,0 +1,16 @@ +{ + "private": true, + "dependencies": { + "tslib": "^1.9.3", + "typescript": "^3.2.2" + }, + "workspaces": { + "packages": [ + "packages/*" + ], + "nohoist": [ + "**/css-modules-typescript-loader", + "**/@alife/theme-lowcode-*" + ] + } +} diff --git a/packages/demo/demo b/packages/demo/demo new file mode 120000 index 000000000..633f8aa7e --- /dev/null +++ b/packages/demo/demo @@ -0,0 +1 @@ +/Users/onbing/Code/ali-lowcode-engine/packages/demo \ No newline at end of file diff --git a/packages/designer/src/designer/designer-view.tsx b/packages/designer/src/designer/designer-view.tsx index 0a26aef2d..7155188da 100644 --- a/packages/designer/src/designer/designer-view.tsx +++ b/packages/designer/src/designer/designer-view.tsx @@ -1,5 +1,6 @@ import { Component } from 'react'; import classNames from 'classnames'; +import { TipContainer } from '@ali/lowcode-globals'; import BuiltinDragGhostComponent from './drag-ghost'; import { Designer, DesignerProps } from './designer'; import { ProjectView } from '../project'; @@ -46,6 +47,7 @@ export class DesignerView extends Component {
+
); } diff --git a/packages/globals/globals b/packages/globals/globals new file mode 120000 index 000000000..fca35cb6c --- /dev/null +++ b/packages/globals/globals @@ -0,0 +1 @@ +/Users/onbing/Code/ali-lowcode-engine/packages/globals \ No newline at end of file diff --git a/packages/globals/src/components/tip/style.less b/packages/globals/src/components/tip/style.less index ccdd71e35..3c02e5313 100644 --- a/packages/globals/src/components/tip/style.less +++ b/packages/globals/src/components/tip/style.less @@ -147,7 +147,7 @@ z-index: 2; position: fixed; box-sizing: border-box; - background: #57a672; + background: rgba(0, 0, 0, 0.7); max-height: 400px; color: var(--color-text-reverse, rgba(255, 255, 255, 0.8)); left: 0; @@ -178,7 +178,7 @@ height: 8px; &:after { border: 6px solid transparent; - border-top-color: #57a672; + border-top-color: rgba(0, 0, 0, 0.7); } } &.lc-theme-black { diff --git a/packages/plugin-outline-pane/src/views/tree-title.tsx b/packages/plugin-outline-pane/src/views/tree-title.tsx index 462248211..1669ddd71 100644 --- a/packages/plugin-outline-pane/src/views/tree-title.tsx +++ b/packages/plugin-outline-pane/src/views/tree-title.tsx @@ -57,7 +57,8 @@ export default class TreeTitle extends Component<{ } input.focus(); input.select(); - input.selectionStart = input.selectionEnd; + // 光标定位最后一个 + // input.selectionStart = input.selectionEnd; }; render() { @@ -195,7 +196,6 @@ class ExpandBtn extends Component<{ treeNode: TreeNode }> { }} > - {treeNode.expanded ? intl('Collapse') : intl('Expand')} ); } diff --git a/packages/plugin-settings-pane/src/index.tsx b/packages/plugin-settings-pane/src/index.tsx index ecf1b79f7..1bb8d8c9f 100644 --- a/packages/plugin-settings-pane/src/index.tsx +++ b/packages/plugin-settings-pane/src/index.tsx @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { Tab, Breadcrumb } from '@alifd/next'; -import { Title, TipContainer, createIcon } from '@ali/lowcode-globals'; +import { Title, createIcon } from '@ali/lowcode-globals'; import { Node } from '@ali/lowcode-designer'; import { SettingsMain, SettingField, isSettingField } from './main'; import SettingsPane, { createSettingFieldView } from './settings-pane'; @@ -99,7 +99,6 @@ export default class SettingsMainView extends Component { return (
- ${BUILD_DEST} ..." + +# build globals +echo "build globals" +cd packages/globals +tnpm ii +tnpm run cloud-build +cd $WORK_DIR + +# build simulator-renderer +echo "build simulator-renderer" +cd packages/react-simulator-renderer +tnpm ii +tnpm run cloud-build +cd $WORK_DIR + +# build lowcode demo +echo "build lowcode demo" +cd packages/demo +# FIXME! npm is slow, but tnpm has a depends bug +npm i --registry=http://registry.npm.alibaba-inc.com +npm run cloud-build +cd $WORK_DIR + +mv packages/demo/build $BUILD_DEST +mv packages/react-simulator-renderer/dist/* $BUILD_DEST +mv packages/globals/dist/* $BUILD_DEST + +cp html/* $BUILD_DEST +echo "complete" diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 04e041fe4..f67d9c78b 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -5,26 +5,15 @@ BUILD_DEST=$1 echo "Deploy ${PWD} -> ${BUILD_DEST} ..." -# build globals -echo "build globals" -cd packages/globals -tnpm ii -tnpm run cloud-build -cd $WORK_DIR - -# build simulator-renderer -echo "build simulator-renderer" -cd packages/react-simulator-renderer -tnpm ii -tnpm run cloud-build -cd $WORK_DIR - -# build lowcode demo -echo "build lowcode demo" -cd packages/demo -npm i --registry=http://registry.npm.alibaba-inc.com -npm run cloud-build -cd $WORK_DIR +tnpm install -g yarn lerna +yarn config set registry https://registry.npm.alibaba-inc.com +cd deploy-space +mkdir packages +ln -s $WORK_DIR/packages/demo packages/demo +ln -s $WORK_DIR/packages/react-simulator-renderer packages/react-simulator-renderer +ln -s $WORK_DIR/packages/globals packages/globals +lerna bootstrap +lerna run cloud-build --stream mv packages/demo/build $BUILD_DEST mv packages/react-simulator-renderer/dist/* $BUILD_DEST diff --git a/scripts/setup.sh b/scripts/setup.sh index 3bf6a68ba..e012d9b8d 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -rm -rf node_modules package-lock.json +rm -rf node_modules package-lock.json yarn.lock lerna clean -y find ./packages -type f -name "package-lock.json" -exec rm -f {} \;