Merge pull request #3700 from illacloud/release/4.5.2

Release/4.5.2
illacloud · Feb 18, 2024 · e288b49 · e288b49
2 parents d8bcf7c + fda77e7
commit e288b49
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -11,8 +11,7 @@ RUN apk add --no-cache \
 ## copy frontend
 COPY nginx.conf /etc/nginx/nginx.conf
 COPY illa-builder-frontend.conf /etc/nginx/conf.d/illa-builder-frontend.conf
-COPY ./apps/builder/dist/index.html /opt/illa/illa-builder-frontend/index.html
-COPY ./apps/builder/dist/assets /opt/illa/illa-builder-frontend/assets
+COPY ./apps/builder/dist /opt/illa/illa-builder-frontend
 RUN rm /etc/nginx/conf.d/default.conf
 
 # test nginx

diff --git a/README-CN.md b/README-CN.md
@@ -95,7 +95,12 @@ ILLA CLI 使您能够以超乎想象的速度部署 ILLA Builder。 [单击此
 
 加入微信群：  
 
+<<<<<<< HEAD
 ![img_v3_0286_e3c1da11-83a3-46bc-bea1-eb11228e6c8h](https://github.com/illacloud/illa-builder/assets/73595134/81fdb2bc-61b9-474c-b385-556dfc13c274)
+=======
+![IMG_5468](https://github.com/illacloud/illa-builder/assets/112603073/bbdc47f4-97bd-4258-bc89-893ce28cbe53)
+
+>>>>>>> beta
 
 
 Discord与Github社区入口

diff --git a/apps/builder/package.json b/apps/builder/package.json
@@ -5,7 +5,7 @@
   "private": true,
   "author": "ILLA Cloud <[email protected]>",
   "license": "Apache-2.0",
-  "version": "4.5.1",
+  "version": "4.5.2",
   "scripts": {
     "dev": "vite --strictPort --force",
     "build-cloud": "NODE_OPTIONS=--max-old-space-size=12288  vite build --mode cloud",

diff --git a/packages/illa-design b/packages/illa-design
diff --git a/packages/illa-public-component b/packages/illa-public-component
+0 −1		README.md
+3 −1		apps/storybook/stories/input-number/input-number.stories.tsx
+261 −0		packages/input-number/src/Decimal.ts
+141 −137		packages/input-number/src/input-number.tsx
+3 −2		packages/input-number/src/interface.ts
+122 −0		packages/input-number/src/utils.ts
+3 −3		locales/cs-CZ.json
+3 −3		locales/da-DK.json
+3 −3		locales/de-DE.json
+3 −3		locales/el-GR.json
+3 −3		locales/en-US.json
+3 −3		locales/es-ES.json
+3 −3		locales/fi-FI.json
+3 −3		locales/fr-FR.json
+3 −3		locales/it-IT.json
+3 −3		locales/ja-JP.json
+3 −3		locales/ko-KR.json
+3 −3		locales/nl-NL.json
+3 −3		locales/no-NO.json
+3 −3		locales/pl-PL.json
+3 −3		locales/pt-PT.json
+3 −3		locales/ro-RO.json
+3 −3		locales/ru-RU.json
+3 −3		locales/sv-SE.json
+3 −3		locales/uk-UA.json
+3 −3		locales/zh-CN.json