Commit 5d03d01

authored

Merge pull request #1184 from lowcoder-org/dev

Dev -> Main - v2.4.7 preparation

2 parents 8a9b88e + 834f47e commit 5d03d01Copy full SHA for 5d03d01

File tree

9 files changed

+29

-327

lines changed

client
- packages
  - lowcoder-cli-template-typescript
    - package.json
  - lowcoder-cli
    - package.json
  - lowcoder-comps
    - package.json
  - lowcoder-plugin-demo
    - package.json
  - lowcoder-sdk
    - package.json
  - lowcoder
    - package.json
    - src/pages/editor
      - AppEditor.tsx
- yarn.lock
server/node-service
- yarn.lock

9 files changed

+29

-327

lines changed

`‎client/packages/lowcoder-cli-template-typescript/package.json‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`"react-dom": "^18.2.0",`
`33`	`33`	`"react-resize-detector": "^7.0.0",`
`34`	`34`	`"typescript": "5.3.3",`
`35`		`- "vite": "^4.5.2"`
	`35`	`+ "vite": "^4.5.5"`
`36`	`36`	`},`
`37`	`37`	`"keywords": [`
`38`	`38`	`"Lowcoder, Component, Template, Plugin, Demonstrator"`

`‎client/packages/lowcoder-cli/package.json‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`"react-dom": "^18.2.0",`
`34`	`34`	`"react-json-view": "^1.21.3",`
`35`	`35`	`"rollup-plugin-external-globals": "^0.7.1",`
`36`		`- "vite": "^4.5.2",`
	`36`	`+ "vite": "^4.5.5",`
`37`	`37`	`"vite-plugin-css-injected-by-js": "^2.1.1",`
`38`	`38`	`"vite-plugin-svgr": "^2.2.2"`
`39`	`39`	`},`

`‎client/packages/lowcoder-comps/package.json‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@`
`205`	`205`	`},`
`206`	`206`	`"devDependencies": {`
`207`	`207`	`"jest": "29.3.0",`
`208`		`- "vite": "^5.0.12",`
	`208`	`+ "vite": "^4.5.5",`
`209`	`209`	`"vite-tsconfig-paths": "^3.6.0"`
`210`	`210`	`}`
`211`	`211`	`}`

`‎client/packages/lowcoder-plugin-demo/package.json‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,6 @@`
`35`	`35`	`"lowcoder-cli": "workspace:^",`
`36`	`36`	`"lowcoder-sdk": "workspace:^",`
`37`	`37`	`"typescript": "4.8.4",`
`38`		`- "vite": "^4.5.2"`
	`38`	`+ "vite": "^4.5.5"`
`39`	`39`	`}`
`40`	`40`	`}`

`‎client/packages/lowcoder-sdk/package.json‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@`
`47`	`47`	`"rollup-plugin-terser": "^7.0.2",`
`48`	`48`	`"rollup-plugin-typescript": "^1.0.1",`
`49`	`49`	`"typescript": "^4.8.4",`
`50`		`- "vite": "^4.5.2",`
	`50`	`+ "vite": "^4.5.5",`
`51`	`51`	`"vite-plugin-svgr": "^2.2.2",`
`52`	`52`	`"vite-tsconfig-paths": "^3.6.0"`
`53`	`53`	`},`

`‎client/packages/lowcoder/package.json‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@`
`125`	`125`	`"http-proxy-middleware": "^2.0.6",`
`126`	`126`	`"rollup-plugin-visualizer": "^5.9.2",`
`127`	`127`	`"typescript": "^4.8.4",`
`128`		`- "vite": "^4.5.2",`
	`128`	`+ "vite": "^4.5.5",`
`129`	`129`	`"vite-plugin-checker": "^0.5.1",`
`130`	`130`	`"vite-plugin-dynamic-import": "^1.5.0",`
`131`	`131`	`"vite-plugin-html": "^3.2.0",`

`‎client/packages/lowcoder/src/pages/editor/AppEditor.tsx‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ const AppEditor = React.memo(() => {`
`115`	`115`	`if (currentUser && application) {`
`116`	`116`	`const lastEditedAt = dayjs(application?.lastEditedAt);`
`117`	`117`	`const lastEditedDiff = dayjs().diff(lastEditedAt, 'minutes');`
`118`		`- const shouldBlockEditing = currentUser.id !== application?.editingUserId && lastEditedDiff < 3;`
	`118`	`+ const shouldBlockEditing = Boolean(application?.editingUserId)&&currentUser.id !== application?.editingUserId && lastEditedDiff < 3;`
`119`	`119`	`setBlockEditing(shouldBlockEditing);`
`120`	`120`	`}`
`121`	`121`	`}, [application, currentUser]);`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 5d03d01

File tree

9 files changed

9 files changed

`‎client/packages/lowcoder-cli-template-typescript/package.json‎`

`‎client/packages/lowcoder-cli/package.json‎`

`‎client/packages/lowcoder-comps/package.json‎`

`‎client/packages/lowcoder-plugin-demo/package.json‎`

`‎client/packages/lowcoder-sdk/package.json‎`

`‎client/packages/lowcoder/package.json‎`

`‎client/packages/lowcoder/src/pages/editor/AppEditor.tsx‎`

0 commit comments