@zgfe/business-lib 1.2.54 → 1.2.55-heyh.1

package/es/assets/iconfont/demo_index.html

@@ -1398,9 +1398,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'bsicon';
-  src: url('iconfont.woff2?t=1724237872032') format('woff2'),
-       url('iconfont.woff?t=1724237872032') format('woff'),
-       url('iconfont.ttf?t=1724237872032') format('truetype');
+  src: url('iconfont.woff2?t=1724914693920') format('woff2'),
+       url('iconfont.woff?t=1724914693920') format('woff'),
+       url('iconfont.ttf?t=1724914693920') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>

package/es/assets/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "bsicon"; /* Project id 2545884 */
-  src: url('iconfont.woff2?t=1724237872032') format('woff2'),
-       url('iconfont.woff?t=1724237872032') format('woff'),
-       url('iconfont.ttf?t=1724237872032') format('truetype');
+  src: url('iconfont.woff2?t=1724914693920') format('woff2'),
+       url('iconfont.woff?t=1724914693920') format('woff'),
+       url('iconfont.ttf?t=1724914693920') format('truetype');
 }
 
 .bsicon {

package/es/chart/demo/data/data.d.ts

@@ -3,6 +3,8 @@ declare const _default: {
     series: {
         names: string[];
         values: number[];
+        minValues: (number | null)[];
+        maxValues: (number | null)[];
         orderNum: number;
     }[];
 };

package/es/chart/demo/data/data.js

@@ -1,49 +1,17 @@
 export default {
-  xAxis: ['2022-12-01', '2022-12-02', '2022-12-03', '2022-12-04', '2022-12-05', '2022-12-06', '2022-12-07', '2022-12-08', '2022-12-09', '2022-12-10', '2022-12-11', '2023-12-12', '2023-12-13', '2023-12-14'],
+  xAxis: ['2022-12-01', '2022-12-02', '2022-12-03', '2022-12-04', '2022-12-05', '2022-12-06', '2022-12-07', '2022-12-08', '2022-12-09', '2022-12-10', '2022-12-11', '2024-08-19', '2024-09-16', '2024-10-16'],
   series: [{
-    names: ['付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功'],
-    values: [26, 27, 43, 44, 40, 34, 33, 33, 34, 24, 30, 31, 31, 38],
-    orderNum: 1
-  }, {
-    names: ['注册-发送手机验证码'],
-    values: [11, 10, 7, 5, 13, 18, 14, 17, 11, 6, 10, 12, 15, 10],
-    orderNum: 1
-  }, {
-    names: ['搜索商品'],
-    values: [75, 68, 86, 80, 87, 71, 72, 81, 77, 74, 78, 76, 76, 79],
-    orderNum: 2
-  }, {
     names: ['pv'],
     values: [104, 89, 109, 103, 112, 93, 87, 101, 101, 97, 102, 110, 106, 98],
+    minValues: [null, null, null, null, null, null, null, null, null, null, null, 102, 0, 1, 2],
+    maxValues: [null, null, null, null, null, null, null, null, null, null, null, 666, 1111, 2222],
     orderNum: 3
   }, {
     names: ['申请退货2'],
     values: [5, 11, 14, 9, 8, 14, 9, 10, 12, 12, 14, 16, 12, 10],
+    minValues: [null, null, null, null, null, null, null, null, null, null, null, null, 44, 55, 66],
+    maxValues: [null, null, null, null, null, null, null, null, null, null, null, null, 888, 5555],
     orderNum: 4
-  }, {
-    names: ['搜索商品'],
-    values: [75, 68, 86, 80, 87, 71, 72, 81, 77, 74, 78, 76, 76, 79],
-    orderNum: 5
-  }, {
-    names: ['付款成功11付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功'],
-    values: [26, 27, 43, 44, 40, 34, 33, 33, 34, 24, 30, 31, 31, 38],
-    orderNum: 1
-  }, {
-    names: ['查看商品详情'],
-    values: [122, 107, 132, 113, 133, 115, 106, 127, 132, 117, 119, 123, 119, 117],
-    orderNum: 2
-  }, {
-    names: ['scroll'],
-    values: [98, 96, 106, 109, 113, 105, 91, 111, 99, 99, 104, 108, 116, 92],
-    orderNum: 3
-  }, {
-    names: ['click'],
-    values: [108, 102, 111, 90, 111, 105, 91, 129, 117, 101, 109, 109, 105, 96],
-    orderNum: 4
-  }, {
-    names: ['申请退货'],
-    values: [5, 11, 14, 9, 8, 14, 9, 10, 12, 12, 14, 16, 12, 10],
-    orderNum: 5
   }]
 };
 export var barData = {

package/es/chart/demo/line_bar_stack.js

@@ -146,7 +146,6 @@ export default (function () {
     htmlArray.push("<div class=\"biz-chart-tooltip-item\">\n        <div class=\"biz-chart-tooltip-content\">\n            <span class=\"biz-tooltip-order\" style=\"background:".concat(params.color, "\"></span>\n            <div class=\"biz-tooltip-name\">").concat(params.seriesName, "</div>\n        </div> \n        <span class=\"biz-chart-tooltip-value\">").concat(params.value, "</span>\n      </div>"));
     return htmlArray.join('');
   };
-  console.log('colorList', colorList);
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BizChart, {
     showList: showList,
     data: data,

package/es/chart/index.js

@@ -71,6 +71,16 @@ var BizChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
         option.series.forEach(function (series, seriesIndex) {
           var dashedItem = addDashedSeries(series, index - 1);
           dashedItem.itemStyle.normal.color = dashedItem.lineStyle.normal.color = option.color[seriesIndex];
+          dashedItem.markArea = {
+            itemStyle: {
+              color: 'rgba(22, 93, 255, 0.08)'
+            },
+            data: [[{
+              xAxis: option.xAxis.data[index]
+            }, {
+              xAxis: option.xAxis.data[option.xAxis.data.length - 1]
+            }]]
+          };
           dashedSeries.push(dashedItem);
         });
         option.series = option.series.concat(dashedSeries);

package/es/chart/styles/index.less

@@ -65,4 +65,49 @@
       font-weight: 500;
     }
   }
+
+  .biz-chart-tooltip-item-new {
+    min-height: @height-sm;
+    margin-bottom: 4px;
+    padding: 0px @padding-xs;
+    font-size: @font-size-sm;
+    background: @white;
+    border-radius: @border-radius-small;
+    box-shadow: @box-shadow-small;
+    .biz-chart-tooltip-content {
+      display: flex;
+      align-items: center;
+      color: @text-color-secondary;
+
+      .biz-tooltip-marker {
+        width: 8px;
+        height: 8px;
+        margin-right: @margin-xs;
+        border-radius: 50%;
+      }
+      .biz-tooltip-order {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 12.8px;
+        height: 12.8px;
+        margin-right: @margin-xs;
+        color: #fff;
+        font-weight: 500;
+        font-size: 8.96px;
+        background: #457dff;
+        border-radius: 50%;
+      }
+      .biz-tooltip-name {
+        max-width: 300px;
+        white-space: pre-wrap;
+        word-wrap: break-word;
+        word-break: break-all;
+      }
+    }
+    &-value {
+      font-weight: 700;
+      //  font-size: 14px;
+    }
+  }
 }

package/es/chart/util/chartOptionConfig.js

@@ -161,6 +161,7 @@ export var getChartOption = function getChartOption(chartType, data) {
     yAxis.minInterval = 1;
   }
   var series = [];
+  var seriesObject = {};
   if (chartType === 'bar') {
     seriesItem.barMaxWidth = 40;
   }
@@ -174,6 +175,9 @@ export var getChartOption = function getChartOption(chartType, data) {
         yAxisIndex: item.yAxisIndex
       } : {});
     });
+    series.map(function (item) {
+      seriesObject[item.name] = item;
+    });
   } else {
     series = [_objectSpread(_objectSpread(_objectSpread({
       name: seriesName || '',
@@ -189,6 +193,14 @@ export var getChartOption = function getChartOption(chartType, data) {
   tooltip.axisPointer = tooltip.axisPointer || {};
   tooltip.axisPointer.type = chartType === 'bar' || chartType === 'line_bar' || chartType === 'muit_y' ? 'shadow' : 'line';
   tooltip.formatter = function (params) {
+    if (Object.keys(seriesObject).length > 0) {
+      params.map(function (item) {
+        var _minValues = seriesObject[item.seriesName].minValues;
+        var _mixValues = seriesObject[item.seriesName].maxValues;
+        item.minValues = _minValues ? _minValues[item.dataIndex] : null;
+        item.maxValues = _mixValues ? _mixValues[item.dataIndex] : null;
+      });
+    }
     return tooltipFormatter ? tooltipFormatter(params) : tooltip.trigger === 'item' ? tooltipFormatterItemDefault(params, data.resultFormatMap, unit) : tooltipFormatterDefault(params, data.resultFormatMap, unit);
   };
   if (legendPosition === 'top') {

package/es/chart/util/formatData.js

@@ -66,7 +66,9 @@ export var formatChartData = function formatChartData(data, showAll, showList, r
       } else {
         sData.push(_objectSpread(_objectSpread({
           name: showName,
-          data: seriesItem.values
+          data: seriesItem.values,
+          minValues: seriesItem === null || seriesItem === void 0 ? void 0 : seriesItem.minValues,
+          maxValues: seriesItem === null || seriesItem === void 0 ? void 0 : seriesItem.maxValues
         }, seriesItem.stack ? {
           stack: seriesItem.stack
         } : {}), {}, {

package/es/chart/util/formatOption.js

@@ -20,16 +20,22 @@ var tooltipFormatterDefault = function tooltipFormatterDefault(params, resultFor
       return;
     }
     seriesMap[item.seriesName] = item.value;
-    var lineLabel = item.value;
-    if (item.seriesName.indexOf('CTR') > -1) {
-      lineLabel += '%';
-    } else if (resultFormatMap && resultFormatMap[item.seriesName] && /percent/.test(resultFormatMap[item.seriesName])) {
-      lineLabel = util.toThousands(lineLabel) + '%';
-    } else if (unit && unit === 'time') {
-      lineLabel = util.timeFormat(lineLabel, 'hhhmmmsss', 1);
-    } else {
-      lineLabel = util.toThousands(lineLabel) + (unit || '');
-    }
+    var unitHandle = function unitHandle(_value) {
+      var _data = _value;
+      if (item.seriesName.indexOf('CTR') > -1) {
+        _data += '%';
+      } else if (resultFormatMap && resultFormatMap[item.seriesName] && /percent/.test(resultFormatMap[item.seriesName])) {
+        _data = util.toThousands(_data) + '%';
+      } else if (unit && unit === 'time') {
+        _data = util.timeFormat(_data, 'hhhmmmsss', 1);
+      } else {
+        _data = util.toThousands(_data) + (unit || '');
+      }
+      return _data;
+    };
+    var lineLabel = unitHandle(item.value);
+    var minValues = (item.minValues || item.minValues === 0) && unitHandle(item.minValues);
+    var maxValues = (item.maxValues || item.maxValues === 0) && unitHandle(item.maxValues);
     var name = item.seriesName.trim();
     if (item.seriesType === 'bar' && params.length === 1 && !name) {
       name = (item.data && item.data.label ? item.data.label : item.name).trim();
@@ -37,7 +43,11 @@ var tooltipFormatterDefault = function tooltipFormatterDefault(params, resultFor
     var nameArr = name.split('|:|');
     name = nameArr[0];
     var orderNum = nameArr[1];
-    htmlArray.push("<div class=\"biz-chart-tooltip-item\">\n          <div class=\"biz-chart-tooltip-content\">\n              <span class=\"".concat(orderNum ? 'biz-tooltip-order' : 'biz-tooltip-marker', "\" style=\"background:").concat(item.color, "\">").concat(orderNum || '', "</span>\n              <div class=\"biz-tooltip-name\">").concat(name, "</div>\n          </div> \n          <span class=\"biz-chart-tooltip-value\">").concat(lineLabel, "</span>\n        </div>"));
+    if (item.minValues === null && item.maxValues === null) {
+      htmlArray.push("<div class=\"biz-chart-tooltip-item\">\n          <div class=\"biz-chart-tooltip-content\">\n              <span class=\"".concat(orderNum ? 'biz-tooltip-order' : 'biz-tooltip-marker', "\" style=\"background:").concat(item.color, "\">").concat(orderNum || '', "</span>\n              <div class=\"biz-tooltip-name\">").concat(name, "</div>\n          </div> \n          <span class=\"biz-chart-tooltip-value\">").concat(lineLabel, "</span>\n        </div>"));
+    } else {
+      htmlArray.push("<div class=\"biz-chart-tooltip-item-new\">\n            <div class=\"biz-chart-tooltip-content\">\n                <span class=\"".concat(orderNum ? 'biz-tooltip-order' : 'biz-tooltip-marker', "\" style=\"background:").concat(item.color, "\">").concat(orderNum || '', "</span>\n                <div class=\"biz-tooltip-name\">").concat(name, "</div>\n            </div> \n            <div>\n                <div>\n                  <span>\u9884\u6D4B\u503C\uFF1A</span>\n                  <span class=\"biz-chart-tooltip-item-new-value\">").concat(lineLabel, "</span>\n                </div>\n                <div>\n                  <span>\u9884\u6D4B\u6700\u5927\u503C\uFF1A</span>\n                  <span class=\"biz-chart-tooltip-item-new-value\">").concat(maxValues, "</span>\n                </div>\n                <div>\n                  <span>\u9884\u6D4B\u6700\u5C0F\u503C\uFF1A</span>\n                  <span class=\"biz-chart-tooltip-item-new-value\">").concat(minValues, "</span>\n                </div>\n            </div>\n        </div>"));
+    }
   });
   return htmlArray.join('');
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.2.54",
+  "version": "1.2.55-heyh.1",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -55,7 +55,7 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "6e72de47ad2eda5460c6e83d3c5eb66f28870500",
+  "gitHead": "60e6b906b6f96169010931f5d5bb398bd9b08c3b",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }