Merge pull request #439 from entrylabs/develop

Master v2.02
entrylabs · Jul 16, 2024 · 67aa707 · 67aa707
2 parents 116a9ac + 2daf450
commit 67aa707
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@entrylabs/tool",
-    "version": "2.0.1",
+    "version": "2.0.2",
     "license": "MIT",
     "repository": {
         "type": "git",

diff --git a/src/components/popup/Contents/Select/BigICON/index.jsx b/src/components/popup/Contents/Select/BigICON/index.jsx
@@ -10,7 +10,7 @@ import { EMIT_TYPES as Types } from '@constants';
 
 const Index = (props) => {
     const theme = Theme.getStyle('popup');
-    const { data = [], imageBaseUrl, applySelected, submit, selected, HeaderButtonPortal } = props;
+    const { data = [], imageBaseUrl, applySelected, submit, selected, HeaderButtonPortal, popupAlertMessage } = props;
 
     useEffect(() => {
         applySelected(data.filter((item) => item.active));
@@ -38,7 +38,7 @@ const Index = (props) => {
     return (
         <div className={classname(theme.section_content, theme.extend_content)}>
             <h2 className={theme.blind}>BIG ICON LIST</h2>
-            <p className={theme.caution_dsc}>{CommonUtils.getLang(alertMsgKey)}</p>
+            <p className={theme.caution_dsc}>{popupAlertMessage || CommonUtils.getLang(alertMsgKey)}</p>
             <div className={theme.extend_block}>
                 <ul className={theme.list}>
                     {data.map((item) => (

diff --git a/src/components/popup/Contents/Select/CardCategoryView/index.jsx b/src/components/popup/Contents/Select/CardCategoryView/index.jsx
@@ -43,6 +43,7 @@ const CardCategoryView = (props) => {
         selected,
         popupType,
         HeaderButtonPortal,
+        popupAlertMessage,
     } = props;
 
     useEffect(() => {
@@ -82,7 +83,7 @@ const CardCategoryView = (props) => {
     return (
         <div className={classname(theme.card_content, theme.extend_content)}>
             <h2 className={theme.blind}>CARD CATEGORY LIST</h2>
-            <p className={theme.caution_dsc}>{CommonUtils.getLang(alertMsgKey)}</p>
+            <p className={theme.caution_dsc}>{popupAlertMessage || CommonUtils.getLang(alertMsgKey)}</p>
             <div className={theme.extend_block}>
                 <div className={theme.categoryList}>
                     {categoryTypes.map((category) => {

diff --git a/src/components/popup/index.jsx b/src/components/popup/index.jsx
@@ -63,7 +63,7 @@ class Popup extends Component {
     }
 
     setContent() {
-        const { opt = {}, writeBoxOption, data: dataObj, uploads: uploaded, type } = this.property;
+        const { opt = {}, writeBoxOption, data: dataObj, uploads: uploaded, type, popupAlertMessage } = this.property;
         const { imageBaseUrl: expsnsionIconBaseUrl } = this.property;
         const { isDrawVector, multiSelect, showSelected, search, searchByType } = opt;
         const { navigation: selected } = this.state;
@@ -139,6 +139,7 @@ class Popup extends Component {
                         imageBaseUrl={url}
                         data={data}
                         HeaderButtonPortal={HeaderButtonPortal}
+                        popupAlertMessage={popupAlertMessage}
                     />
                 );
                 break;
@@ -153,6 +154,7 @@ class Popup extends Component {
                         imageBaseUrl={aiImageurl}
                         data={data}
                         HeaderButtonPortal={HeaderButtonPortal}
+                        popupAlertMessage={popupAlertMessage}
                     />
                 );
                 break;
@@ -166,6 +168,7 @@ class Popup extends Component {
                         imageBaseUrl={hwLiteImageurl}
                         data={data}
                         HeaderButtonPortal={HeaderButtonPortal}
+                        popupAlertMessage={popupAlertMessage}
                     />
                 );
                 break;