Merge pull request #3628 from illacloud/release/4.2.3

Release/4.2.3

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/custom.md

@@ -0,0 +1,10 @@
+---
+name: Custom issue template
+about: Describe this issue template's purpose here.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+

.github/ISSUE_TEMPLATE/feature_request.md

@@ -2,8 +2,9 @@
 name: Feature request
 about: Suggest an idea for this project
 title: "[Feature Requested] "
-labels: "feature"
-assignees: "wenzhuo2022"
+labels: feature
+assignees: wenzhuo2022
+
 ---
 
 **Is your feature request related to a problem? Please describe.** A clear and

README.md

@@ -10,13 +10,13 @@
 <p align="center">ILLA is a robust open source low-code platform for developers to build internal tools. By using ILLA's library of Components and Actions, developers can save massive amounts of time on building tools. </p>
 
 <div align="center">
-English | <a href="https://github.com/illacloud/illa-builder/blob/main/README-CN.md">简体中文</a> | <a href="https://github.com/illacloud/illa-builder/blob/main/README-DE.md">Deutsch</a> | <a href="https://github.com/illacloud/illa-builder/blob/main/README-JP.md">日本語</a>
+English | <a href="https://github.com/illacloud/illa-builder/blob/beta/README-CN.md">简体中文</a> | <a href="https://github.com/illacloud/illa-builder/blob/beta/README-DE.md">Deutsch</a> | <a href="https://github.com/illacloud/illa-builder/blob/beta/README-JP.md">日本語</a>
 </div>
 
 <br>
 <p align="center">
 <a href="https://cloud.illacloud.com?utm_source=github&utm_medium=readme&utm_campaign=github-readme">
-  <img width="800" alt="Github(1)" src="https://github.com/illacloud/illa-builder/assets/7929686/f136f457-6904-4cba-8ad6-a64adcdafe88">
+  <img width="800" alt="Github(1)" src="https://github.com/illacloud/.github/blob/main/assets/2024/Jan/GitHub%20-%20Readme.png">
 </a>
 </p>
 

apps/builder/src/widgetLibrary/StatisticsWidget/statistics.tsx

@@ -129,12 +129,13 @@ export const WrappedStatistic: FC<WrappedStatisticProps> = (props) => {
           <div css={getSecondaryStatisticContainerStyle(secondaryColor)}>
             {secondaryIcon}
             <Statistic
-              _css={getSecondaryStatisticStyle(secondaryColor)}
+              _css={getSecondaryStatisticStyle}
               groupSeparator={secondaryGroupSeparator}
               value={secondaryValue}
               precision={secondaryDecimalPlace}
               prefix={secondaryPrefixText}
               suffix={secondarySuffixText}
+              colorScheme={secondaryColor}
             />
           </div>
         )}
@@ -158,11 +159,12 @@ export const WrappedStatistic: FC<WrappedStatisticProps> = (props) => {
         <div css={primaryStatisticContainerStyle}>
           {icon}
           <Statistic
-            _css={getStatisticStyle(color)}
+            _css={getStatisticStyle}
             value={primaryValue}
             precision={decimalPlace}
             prefix={prefixText}
             suffix={suffixText}
+            colorScheme={color}
             groupSeparator={groupSeparator}
           />
         </div>

apps/builder/src/widgetLibrary/StatisticsWidget/style.ts

@@ -42,36 +42,22 @@ export const getStatisticWrapperStyle = (textAlign?: string) => {
     ${alignItemsStyle};
   `
 }
-export const getSecondaryStatisticStyle = (color?: string) => {
-  return css`
-    max-width: 100%;
-    overflow: hidden;
-    & > div:last-child > div,
-    & > div:last-child > div > span {
-      color: ${getSpecialThemeColor(color || "")};
-      max-width: 100%;
-    }
-    & span {
-      font-size: 12px;
-      font-weight: 500;
-      line-height: 18px;
-    }
-  `
-}
+export const getSecondaryStatisticStyle = css`
+  max-width: 100%;
+  overflow: hidden;
+  & span {
+    font-size: 12px;
+    font-weight: 500;
+    line-height: 18px;
+  }
+`
 
-export const getStatisticStyle = (color?: string) => {
-  return css`
-    max-width: 100%;
-    overflow: hidden;
-    white-space: nowrap;
-    & > div:last-child > div,
-    & > div:last-child > div > span {
-      color: ${getSpecialThemeColor(color || "")};
-      max-width: 100%;
-    }
-    line-height: 36px;
-  `
-}
+export const getStatisticStyle = css`
+  max-width: 100%;
+  overflow: hidden;
+  white-space: nowrap;
+  line-height: 36px;
+`
 
 export const getPrefixIconStyle = (color?: string, secondary?: boolean) => {
   const size = secondary ? 12 : 24
@@ -126,16 +112,6 @@ export const getSecondaryStatisticContainerStyle = (color?: string) => {
     padding: 0 4px;
     border-radius: 2px;
     background: ${getColor(color || "", "08")};
-    & span {
-      line-height: 18px;
-      font-size: 12px;
-      margin-right: 2px;
-      margin-left: 0;
-    }
-    & > div > div > div {
-      display: flex;
-      align-items: center;
-    }
   `
 }