Skip to content

Commit 1cb9f5e

FalkWolsky FalkWolsky

authored

Merge pull request #438 from lowcoder-org/dev

Dev > Main - 2.1.1 hot fixes

2 parents dcffd4d + 1c82bb9 commit 1cb9f5eCopy full SHA for 1cb9f5e

File tree

33 files changed

+108255

-58

lines changed

client
- packages
  - lowcoder-comps
    - jest.config.js
    - package.json
    - package
    - src/comps/chartComp
      - chartComp.tsx
      - chartConfigs
        chartUrls.tsx
      - chartConstants.tsx
      - chartUtils.ts
      - reactEcharts
        core.tsx
        types.ts
  - lowcoder
    - package.json
    - src/comps
      - comps/jsonSchemaFormComp
        jsonSchemaFormComp.tsx
      - controls
        labelControl.tsx
- yarn.lock
server/api-service
- lowcoder-domain/src/main/java/org/lowcoder/domain/user/model
  - APIKey.java
  - User.java
- lowcoder-plugins/sqlBasedPlugin/src/main/java/org/lowcoder/plugin/sql
  - SqlBasedConnector.java
- lowcoder-sdk/src/main/java/org/lowcoder/sdk
  - config
    - AuthProperties.java
  - util
    - CookieHelper.java
- lowcoder-server
  - pom.xml
  - src/main
    - java/org/lowcoder/api
      - authentication
        AuthenticationController.java
        dto
        APIKeyRequest.java
        service
        AuthenticationApiService.java
        AuthenticationApiServiceImpl.java
        util
        JWTUtils.java
      - framework
        filter
        APIKeyAuthFilter.java
        security
        SecurityConfig.java
      - home
        SessionUserService.java
        SessionUserServiceImpl.java
      - usermanagement/view
        APIKeyVO.java
    - resources
      - application-lowcoder.yml

33 files changed

+108255

-58

lines changed

`‎client/packages/lowcoder-comps/jest.config.js`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,5 @@ import config from "../../config/test/jest.config.js";`
`2`	`2`
`3`	`3`	`export default {`
`4`	`4`	`...config,`
	`5`	`+ setupFiles: [...config.setupFiles, 'jest-canvas-mock'],`
`5`	`6`	`};`

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

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "lowcoder-comps",`
`3`		`- "version": "0.0.15",`
	`3`	`+ "version": "0.0.16",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"dependencies": {`
`@@ -69,6 +69,7 @@`
`69`	`69`	`},`
`70`	`70`	`"devDependencies": {`
`71`	`71`	`"jest": "29.3.0",`
	`72`	`+ "jest-canvas-mock": "^2.5.2",`
`72`	`73`	`"vite": "^4.3.9",`
`73`	`74`	`"vite-tsconfig-paths": "^3.6.0"`
`74`	`75`	`}`

`‎client/packages/lowcoder-comps/package/icons/icon-chart.svg`

Lines changed: 15 additions & 0 deletions

Loading[フレーム]

`‎client/packages/lowcoder-comps/package/icons/icon-comp-calendar.svg`

Lines changed: 22 additions & 0 deletions

Loading[フレーム]

0 commit comments

Comments

(0)