hotfix/2.9.42310.01

pc4mobx/hrmSalary/components/excelEditor/components/codeAction.js

@@ -7,6 +7,7 @@
 import React, { Component } from "react";
 import { WeaInputSearch, WeaLocaleProvider } from "ecCom";
 import { Tree } from "antd";
+import cs from "classnames";
 import { formualSearchField, formualSearchGroup, getFormulaDes } from "../../../apis/item";
 import "../index.less";
 
@@ -139,7 +140,7 @@ class CodeAction extends Component {
                   return <TreeNode title={value} key={key}>
                     {
                       _.map([...children.slice(0, 1), ...itemChildren], (child, childIndex) => {
-                        const { name, fieldId } = child;
+                        const { name, fieldId, fieldType } = child;
                         return (
                           fieldId === "searchInput" ?
                             <TreeNode
@@ -151,7 +152,17 @@ class CodeAction extends Component {
                                 />
                               }
                               key={fieldId + "_" + childIndex}/> :
-                            <TreeNode title={name} key={fieldId}/>
+                            <TreeNode title={
+                              <div className="weapp-excel-code-action-list-variable">
+                                <span className="weapp-excel-code-action-list-variable-name">{name}</span>
+                                {
+                                  fieldType ?
+                                    <span
+                                      className={cs("weapp-excel-code-action-list-variable-tip", { "danger": fieldType === "string" })}>{fieldType === "number" ? "数字" : "文本"}</span> :
+                                    <span></span>
+                                }
+                              </div>
+                            } key={fieldId}/>
                         );
                       })
                     }

pc4mobx/hrmSalary/components/excelEditor/index.less

@@ -186,14 +186,53 @@
 
       .code-action-list {
         padding: 10px 0;
-        .code-action-tips-title{
+
+        .code-action-tips-title {
           height: 22px;
           line-height: 22px;
         }
-        .code-action-tips-info{
+
+        .code-action-tips-info {
           color: #999
         }
       }
+
+      .weapp-excel-code-action-list-variable {
+        width: 100%;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+
+        .weapp-excel-code-action-list-variable-name {
+          height: 20px;
+          line-height: 18px;
+          -webkit-flex: 1 1;
+          flex: 1 1;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          word-break: keep-all;
+          white-space: nowrap;
+          cursor: pointer;
+        }
+
+        .danger {
+          color: rgb(255, 102, 106)!important;
+          border: 1px solid rgb(255, 193, 195)!important;
+          background-color: rgb(255, 223, 224)!important;
+        }
+
+        .weapp-excel-code-action-list-variable-tip {
+          width: 40px;
+          height: 20px;
+          line-height: 18px;
+          text-align: center;
+          vertical-align: middle;
+          color: rgb(255, 205, 80);
+          border: 1px solid rgb(255, 222, 138);
+          background-color: rgb(255, 245, 219);
+          border-radius: 2px;
+        }
+      }
     }
   }
 }