Skip to content

Commit 8ab1298

Browse files
authored
Merge branch 'main' into feat./grid-column-settings
2 parents 6a4c10c + 8502d64 commit 8ab1298

File tree

47 files changed

+917
-303
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+917
-303
lines changed

.github/workflows/sonarcloud.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ jobs:
2121
- uses: actions/checkout@v3
2222
with:
2323
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
24+
ref: ${{ github.event.pull_request.head.sha }}
2425
- name: Build Java
2526
run: |
2627
mvn clean compile -DskipTests -f ./server/api-service/pom.xml

client/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
"eslint-plugin-only-ascii@^0.0.0": "patch:eslint-plugin-only-ascii@npm%3A0.0.0#./.yarn/patches/eslint-plugin-only-ascii-npm-0.0.0-29e3417685.patch"
7474
},
7575
"dependencies": {
76+
"@lottiefiles/react-lottie-player": "^3.5.3",
7677
"antd-mobile": "^5.28.0",
7778
"chalk": "4",
7879
"number-precision": "^1.6.0",

client/packages/lowcoder/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
"eslint-plugin-only-ascii": "^0.0.0",
121121
"http-proxy-middleware": "^2.0.6",
122122
"lowcoder-dev-utils": "workspace:^",
123-
"rollup-plugin-visualizer": "^5.8.3",
123+
"rollup-plugin-visualizer": "^5.9.2",
124124
"typescript": "^4.8.4",
125125
"vite": "^4.3.9",
126126
"vite-plugin-checker": "^0.5.1",
Lines changed: 132 additions & 0 deletions
Loading

client/packages/lowcoder/src/assets/icons/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,6 @@ export { ReactComponent as DocIcon } from "./view-doc.svg";
1010
export { ReactComponent as TutorialIcon } from "./tutorial.svg";
1111
export { ReactComponent as ShortcutIcon } from "./icon-help-shortcut.svg";
1212

13+
export { ReactComponent as LottieIcon } from "./icon-lottie.svg"; //Added By Aqib Mirza
14+
1315
export { GoogleLoginIcon, GithubLoginIcon, GeneralLoginIcon, EmailLoginIcon };

0 commit comments

Comments
 (0)