diff --git a/packages/code-generator/package.json b/packages/code-generator/package.json index 339562cb2..9691e1b1e 100644 --- a/packages/code-generator/package.json +++ b/packages/code-generator/package.json @@ -1,5 +1,5 @@ { - "name": "@ali/lowcode-engine-code-generator", + "name": "@ali/lowcode-code-generator", "version": "0.8.0", "description": "出码引擎 for LowCode Engine", "main": "lib/index.js", diff --git a/packages/demo/package.json b/packages/demo/package.json index da204da97..4f592efb8 100644 --- a/packages/demo/package.json +++ b/packages/demo/package.json @@ -1,5 +1,6 @@ { "name": "@ali/lowcode-demo", + "private": true, "version": "0.8.0", "description": "低代码引擎 DEMO", "scripts": { diff --git a/packages/designer/src/builtin-simulator/bem-tools/insertion.less b/packages/designer/src/builtin-simulator/bem-tools/insertion.less index 19f4e5fa4..5c4ed708e 100644 --- a/packages/designer/src/builtin-simulator/bem-tools/insertion.less +++ b/packages/designer/src/builtin-simulator/bem-tools/insertion.less @@ -8,6 +8,9 @@ height: 5px; border: 2px solid var(--color-brand-light); border-radius: 2px; + &.invalid { + border-color: red; + } &.cover { top: 0; @@ -17,6 +20,9 @@ border: none; opacity: 0.3; border-radius: 0; + &.invalid { + background-color: red; + } } &.vertical { @@ -25,7 +31,4 @@ width: 5px; height: auto; } - &.invalid { - background-color: red; - } } diff --git a/packages/designer/src/builtin-simulator/host.ts b/packages/designer/src/builtin-simulator/host.ts index 444697f24..cda082b65 100644 --- a/packages/designer/src/builtin-simulator/host.ts +++ b/packages/designer/src/builtin-simulator/host.ts @@ -787,7 +787,6 @@ export class BuiltinSimulatorHost implements ISimulatorHost { + // this.sensors will change on dragstart + const sensors: ISensor[] = (masterSensors as ISensor[]).concat(this.sensors); let sensor = e.sensor && e.sensor.isEnter(e) ? e.sensor : sensors.find((s) => s.sensorAvailable && s.isEnter(e)); if (!sensor) { // TODO: enter some area like componentspanel cancel diff --git a/packages/globals/src/components/tip/embed-tip.tsx b/packages/globals/src/components/tip/embed-tip.tsx index df5748771..290cf2f9a 100644 --- a/packages/globals/src/components/tip/embed-tip.tsx +++ b/packages/globals/src/components/tip/embed-tip.tsx @@ -12,7 +12,6 @@ export default class EmbedTip extends Component { render() { saveTips(this.id, this.props); - console.info(this.props); return ; } } diff --git a/packages/plugin-outline-pane/src/helper/dwell-timer.ts b/packages/plugin-outline-pane/src/helper/dwell-timer.ts index 769f4d72c..64e5e0965 100644 --- a/packages/plugin-outline-pane/src/helper/dwell-timer.ts +++ b/packages/plugin-outline-pane/src/helper/dwell-timer.ts @@ -8,7 +8,7 @@ export default class DwellTimer { private previous?: NodeParent; private event?: LocateEvent; - constructor(private decide: (node: NodeParent, event: LocateEvent) => void, private timeout: number = 800) {} + constructor(private decide: (node: NodeParent, event: LocateEvent) => void, private timeout: number = 500) {} focus(node: NodeParent, event: LocateEvent) { this.event = event; diff --git a/packages/plugin-outline-pane/src/main.ts b/packages/plugin-outline-pane/src/main.ts index c4b1479b4..debd7a734 100644 --- a/packages/plugin-outline-pane/src/main.ts +++ b/packages/plugin-outline-pane/src/main.ts @@ -146,6 +146,7 @@ export class OutlineMain implements ISensor, IScrollBoard, IScrollable { } }; + // FIXME: dirty connect to others if (at === '__IN_SETTINGS__') { setup(); } else { diff --git a/packages/react-simulator-renderer/package.json b/packages/react-simulator-renderer/package.json index 95cb6c52c..3ee267221 100644 --- a/packages/react-simulator-renderer/package.json +++ b/packages/react-simulator-renderer/package.json @@ -1,4 +1,5 @@ { + "private": true, "name": "@ali/lowcode-react-simulator-renderer", "version": "0.8.0", "description": "react simulator renderer for alibaba lowcode designer", diff --git a/scripts/addowner.js b/scripts/addowner.js new file mode 100755 index 000000000..314005ac4 --- /dev/null +++ b/scripts/addowner.js @@ -0,0 +1,70 @@ +#!/usr/bin/env node +const fs = require('fs'); +const path = require('path'); +const process = require('process'); +const { execSync } = require('child_process'); + +let [ owner, pkg ] = process.argv.slice(2); + +const packages_dir = path.join(__dirname, '..', 'packages'); +function getPackageNames() { + const ls = fs.readdirSync(packages_dir, 'utf-8'); + const packageNames = []; + ls.forEach((item) => { + if (item.charAt(0) === '.') { + return; + } + const packageJsonFile = path.join(packages_dir, item, 'package.json'); + + if (fs.existsSync(packageJsonFile)) { + const json = require(packageJsonFile); + if (!json.private && json.name) { + packageNames.push(json.name) + } + } + }); + return packageNames; +} + +const owners_file = path.join(__dirname, './owners.json'); +const owners = require(owners_file); +function addPackageOwners(packageName) { + owners.forEach(owner => addOwner(packageName, owner)); +} + +function addOwner(packageName, owner) { + console.info(`addowner "${owner}" for "${packageName}"`); + try { + execSync(`tnpm owner add ${owner} ${packageName}`, { + encoding: 'utf-8' + }); + console.info('OK'); + } catch (e) { + console.info(e); + } +} + +if (pkg) { + const packageJsonFile = path.join(packages_dir, item, 'package.json'); + + if (fs.existsSync(packageJsonFile)) { + const json = require(packageJsonFile); + if (!json.private && json.name) { + pkg = json.name; + } + } + if (owner === '*') { + addPackageOwners(pkg); + } else { + addOwner(pkg, owner); + } +} else if (owner) { + getPackageNames().forEach(packageName => { + addOwner(packageName, owner); + }); +} else { + const pkgs = getPackageNames(); + pkgs.forEach(packageName => { + addPackageOwners(packageName); + }); +} diff --git a/scripts/addowner.sh b/scripts/addowner.sh deleted file mode 100644 index 4d9440604..000000000 --- a/scripts/addowner.sh +++ /dev/null @@ -1 +0,0 @@ -todo \ No newline at end of file diff --git a/scripts/owners.json b/scripts/owners.json new file mode 100644 index 000000000..68f1a40a8 --- /dev/null +++ b/scripts/owners.json @@ -0,0 +1,13 @@ +[ + "bingbing.yb", + "wuyue.xht", + "xiayang.xy", + "jianhui.fjh", + "armslave.yy", + "gengyang.gy", + "alex.mm", + "jianfang.rjf", + "zude.hzd", + "qianshan.wengqs", + "mario.gk" +]