Merge branch 'main' of http://git.xlyprint.cn/zhangz/xlyUmi into main

陈鑫涛
2 parents 55b06789 f37bcf4c
Showing 1 changed file with 7 additions and 4 deletions
src/components/Common/CommonTable/colorInfo.jsx
@@ -3,7 +3,8 @@ import React, { PureComponent } from &quot;react&quot;;
 import styles from "./index.less";
  
 export default class ColorInfo extends PureComponent {
-  colorContentItem = item => {
+  colorContentItem = (item,language) => {
+
     const title = item?.sName;
     const info = Array.isArray(item?.sColor) ? item.sColor.filter(Boolean) : [];
     return (
@@ -28,7 +29,7 @@ export default class ColorInfo extends PureComponent {
                   }}
                 />
                 <label for={index} style={{ fontSize: 10 }}>
-                  {i?.sName}
+                  {language ==='sEnglish'? i.sEnglishName : language === 'sBig5'? i.sBig5Name: i.sName}
                 </label>
               </div>
             ))}
@@ -39,11 +40,13 @@ export default class ColorInfo extends PureComponent {
   };
  
   colorContent = () => {
-    const { masterConfig } = this.props;
+    const { masterConfig, app } = this.props;
+    const {userinfo} = app;
+    const language = userinfo.sLanguage;
     try {
       const result = JSON.parse(masterConfig.sTableColorTs);
       if (!Array.isArray(result)) return;
-      return result.map(i => this.colorContentItem(i));
+      return result.map(i => this.colorContentItem(i, language));
     } catch (error) {
       return [];
     }