@bchr/bchr-front-lib 0.3.85 → 0.3.86

package/lib/base/layout/ui_tpl/grid/GridForBrowse.js

@@ -186,7 +186,18 @@ var GridForBrowse = /*#__PURE__*/function (_React$Component) {
             dangerouslySetInnerHTML: {
               __html: dataItem.column_header_prefix
             }
-          })), /*#__PURE__*/_react["default"].createElement("span", {
+          })), dataItem.field_label_badge && dataItem.field_label_badge.trim().length > 0 && /*#__PURE__*/_react["default"].createElement(_antd.Badge, {
+            count: /*#__PURE__*/_react["default"].createElement("span", {
+              style: {
+                zIndex: '1'
+              },
+              dangerouslySetInnerHTML: {
+                __html: dataItem.field_label_badge
+              }
+            })
+          }, /*#__PURE__*/_react["default"].createElement("span", {
+            className: b_required ? "k-grid-column-required" : ""
+          }, name)), (!dataItem.field_label_badge || dataItem.field_label_badge.trim().length == 0) && /*#__PURE__*/_react["default"].createElement("span", {
             className: b_required ? "k-grid-column-required" : ""
           }, name), tip_message && /*#__PURE__*/_react["default"].createElement(_antd.Tooltip, {
             className: "ui-tpl-tool-tip",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bchr/bchr-front-lib",
-  "version": "0.3.85",
+  "version": "0.3.86",
   "description": "bchr front lib",
   "main": "lib/index.js",
   "scripts": {

package/src/base/layout/ui_tpl/grid/GridForBrowse.js

@@ -1,7 +1,7 @@
 import React, {Fragment} from 'react';
 import {Grid, GridColumn} from "@progress/kendo-react-grid";
 import {ExcelExport, ExcelExportColumn} from "@progress/kendo-react-excel-export";
-import {ConfigProvider, Tooltip} from "antd";
+import {Badge, ConfigProvider, Tooltip} from "antd";
 import {DownloadOutlined, QuestionCircleOutlined} from '@ant-design/icons';
 import moment from "moment";
 import {EXPORT_GRID_CELL_OPTIONS, EXPORT_GRID_HEADER_CELL_OPTIONS, UI_RENDER_TYPE} from "../consts";
@@ -180,9 +180,23 @@ class GridForBrowse extends React.Component{
                                     <span style={{marginRight: '5px'}} dangerouslySetInnerHTML={{__html: dataItem.column_header_prefix}}></span>
                                 </Tooltip>
                             }
-                            <span className={b_required ? "k-grid-column-required" : ""}>
-                                {name}
-                            </span>
+
+                            {
+                                dataItem.field_label_badge && dataItem.field_label_badge.trim().length > 0 &&
+                                <Badge count={<span style={{zIndex: '1'}} dangerouslySetInnerHTML={{__html: dataItem.field_label_badge}}></span>}>
+                                    <span className={b_required ? "k-grid-column-required" : ""}>
+                                        {name}
+                                    </span>
+                                </Badge>
+                            }
+
+                            {
+                                (!dataItem.field_label_badge || dataItem.field_label_badge.trim().length == 0) &&
+                                <span className={b_required ? "k-grid-column-required" : ""}>
+                                    {name}
+                                </span>
+                            }
+
                             {
                                 tip_message && <Tooltip className="ui-tpl-tool-tip" title={tip_message}> <QuestionCircleOutlined /> </Tooltip>
                             }