@zgfe/business-lib 1.2.51-heyh.0 → 1.2.51-heyh.3

package/es/assets/iconfont/iconfont.json

@@ -5,6 +5,20 @@
   "css_prefix_text": "",
   "description": "诸葛业务平台",
   "glyphs": [
+    {
+      "icon_id": "41442688",
+      "name": "quanping 1",
+      "font_class": "a-quanping1",
+      "unicode": "e64f",
+      "unicode_decimal": 58959
+    },
+    {
+      "icon_id": "41214661",
+      "name": "鸿蒙",
+      "font_class": "hongmeng",
+      "unicode": "e64a",
+      "unicode_decimal": 58954
+    },
     {
       "icon_id": "41358802",
       "name": "帮助中心",
@@ -54,13 +68,6 @@
       "unicode": "e7cc",
       "unicode_decimal": 59340
     },
-    {
-      "icon_id": "41214661",
-      "name": "鸿蒙",
-      "font_class": "hongmeng",
-      "unicode": "e64a",
-      "unicode_decimal": 58954
-    },
     {
       "icon_id": "41211242",
       "name": "其他",

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

@@ -3,6 +3,8 @@ declare const _default: {
     series: {
         names: string[];
         values: number[];
+        minValues: (number | null)[];
+        mixValues: (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],
+    mixValues: [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],
+    mixValues: [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].mixValues;
+        item.minValues = _minValues ? _minValues[item.dataIndex] : null;
+        item.mixValues = _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,
+          mixValues: seriesItem === null || seriesItem === void 0 ? void 0 : seriesItem.mixValues
         }, 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 && unitHandle(item.minValues);
+    var mixValues = item.mixValues && unitHandle(item.mixValues);
     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.mixValues === 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(mixValues, "</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/es/index.d.ts

@@ -46,8 +46,9 @@ import { chartColors } from './chart/util/color';
 import useBizStore from './hooks/useBizStore';
 import useChanged from './hooks/useChanged';
 import useSubject from './hooks/useSubject';
+import BizPlatformSelector from './platformSelector';
 import DataSetGroup from './dataSetGroup';
-export { BizTargetDimension, BizTargetFromPanel, BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizLayout, BizAnalysisLayout, BizDetailLayout, BizUserGroup, BizUserGroupHeader, IconFont, ColorIcon, BizFormulaTarget, BizAUMFormulaTarget, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetFromPanelContext, BizTargetCondition, BizDatePicker, BizQuickDatePicker, BizLoading, BizConditionItem, BizConditionGroup, BizAttrCondition, BizAttrConditionGroup, BizUserCondition, BizProductCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, BizLoginForm, DemoWrapper, SocketClient, ajax, util, base64, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig, chartColors, useBizStore, useChanged, useSubject, DataSetGroup, };
+export { BizTargetDimension, BizTargetFromPanel, BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizLayout, BizAnalysisLayout, BizDetailLayout, BizUserGroup, BizUserGroupHeader, IconFont, ColorIcon, BizFormulaTarget, BizAUMFormulaTarget, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetFromPanelContext, BizTargetCondition, BizDatePicker, BizQuickDatePicker, BizLoading, BizConditionItem, BizConditionGroup, BizAttrCondition, BizAttrConditionGroup, BizUserCondition, BizProductCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, BizLoginForm, DemoWrapper, SocketClient, ajax, util, base64, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig, chartColors, useBizStore, useChanged, useSubject, DataSetGroup, BizPlatformSelector, };
 export type { UserGroupTypes } from './userGroup/types';
 export type { BizProductConditionT } from './productCondition/types';
 export type { BizSelectTypes } from './select/types';

package/es/index.js

@@ -45,5 +45,6 @@ import { chartColors } from './chart/util/color';
 import useBizStore from './hooks/useBizStore';
 import useChanged from './hooks/useChanged';
 import useSubject from './hooks/useSubject';
+import BizPlatformSelector from './platformSelector';
 import DataSetGroup from './dataSetGroup';
-export { BizTargetDimension, BizTargetFromPanel, BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizLayout, BizAnalysisLayout, BizDetailLayout, BizUserGroup, BizUserGroupHeader, IconFont, ColorIcon, BizFormulaTarget, BizAUMFormulaTarget, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetFromPanelContext, BizTargetCondition, BizDatePicker, BizQuickDatePicker, BizLoading, BizConditionItem, BizConditionGroup, BizAttrCondition, BizAttrConditionGroup, BizUserCondition, BizProductCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, BizLoginForm, DemoWrapper, SocketClient, ajax, util, base64, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig, chartColors, useBizStore, useChanged, useSubject, DataSetGroup };
+export { BizTargetDimension, BizTargetFromPanel, BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizLayout, BizAnalysisLayout, BizDetailLayout, BizUserGroup, BizUserGroupHeader, IconFont, ColorIcon, BizFormulaTarget, BizAUMFormulaTarget, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetFromPanelContext, BizTargetCondition, BizDatePicker, BizQuickDatePicker, BizLoading, BizConditionItem, BizConditionGroup, BizAttrCondition, BizAttrConditionGroup, BizUserCondition, BizProductCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, BizLoginForm, DemoWrapper, SocketClient, ajax, util, base64, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig, chartColors, useBizStore, useChanged, useSubject, DataSetGroup, BizPlatformSelector };

package/es/platformSelector/demo/index.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const _default: () => React.JSX.Element;
+export default _default;

package/es/platformSelector/demo/index.js

@@ -0,0 +1,16 @@
+import React from 'react';
+import { BizPlatformSelector } from '@zgfe/business-lib';
+import InnerDemo from '../../demoWrapper/innerDemo';
+export default (function () {
+  return /*#__PURE__*/React.createElement(InnerDemo, null, /*#__PURE__*/React.createElement("div", {
+    style: {
+      padding: '16px',
+      border: '1px solid #eee',
+      background: '#ddd'
+    }
+  }, /*#__PURE__*/React.createElement(BizPlatformSelector, {
+    onChange: function onChange(value) {
+      console.log('>>>>>>>>回传值', value);
+    }
+  })));
+});

package/es/platformSelector/index.d.ts

@@ -0,0 +1,16 @@
+import React from 'react';
+import { platItemProp } from './types';
+import './styles/index.less';
+declare const BizPlatformSelector: React.FC<{
+    onChange: (val: {
+        key: number;
+        value: string;
+    }) => void;
+    defaultValue?: {
+        key: number;
+        value: string;
+    };
+    value?: number;
+    valueOption?: platItemProp[];
+}>;
+export default BizPlatformSelector;

package/es/platformSelector/index.js

@@ -0,0 +1,44 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import React, { useState, useEffect } from 'react';
+import { BizSelect } from '@zgfe/business-lib';
+import { platformOption } from './util';
+import './styles/index.less';
+var BizPlatformSelector = function BizPlatformSelector(props) {
+  var classPrefix = 'biz-platform-selector';
+  var _useState = useState(),
+    _useState2 = _slicedToArray(_useState, 2),
+    currentValue = _useState2[0],
+    setCurrentValue = _useState2[1];
+  useEffect(function () {
+    if (props.value) {
+      var selectValue = platformOption.find(function (item) {
+        return item.key === props.value;
+      });
+      setCurrentValue(selectValue || platformOption[0]);
+    }
+  }, [props.value]);
+  return /*#__PURE__*/React.createElement("div", {
+    className: classPrefix
+  }, /*#__PURE__*/React.createElement(BizSelect, {
+    className: "".concat(classPrefix, "-select"),
+    overlayClassName: "".concat(classPrefix, "-select-overlay"),
+    options: props.valueOption && props.valueOption.length ? props.valueOption : platformOption,
+    overlayWidth: 134,
+    keyField: "key",
+    labelField: "value",
+    value: currentValue,
+    defaultValue: props.defaultValue ? props.defaultValue : {
+      value: '全部平台',
+      key: 0
+    },
+    onChange: function onChange(val) {
+      props.onChange(val);
+    }
+  }));
+};
+export default BizPlatformSelector;

package/es/platformSelector/styles/index.less

@@ -0,0 +1,22 @@
+@import '../../assets/styles/inner.less';
+.biz-platform-selector {
+  width: 134px;
+  border: 1px solid #f2f3f4;
+  border-radius: 4px;
+  .biz-platform-selector-select .biz-select-handle-input {
+    background-color: #fff;
+    .biz-select-handle-content .biz-select-handle-icon .bsicon {
+      color: #9aa1a9;
+    }
+  }
+}
+.biz-platform-selector-select-overlay .biz-select-list-panel .biz-select-option {
+  .biz-select-option-icon .bsicon {
+    color: #9aa1a9;
+  }
+  &:hover {
+    .biz-select-option-icon .bsicon {
+      color: #165dff;
+    }
+  }
+}

package/es/platformSelector/types.d.ts

@@ -0,0 +1,6 @@
+import { ReactNode } from 'react';
+export interface platItemProp {
+    key: number;
+    value: string;
+    icon?: ReactNode;
+}

package/es/platformSelector/types.js

@@ -0,0 +1 @@
+export {};

package/es/platformSelector/util.d.ts

@@ -0,0 +1,2 @@
+import { platItemProp } from './types';
+export declare const platformOption: platItemProp[];

package/es/platformSelector/util.js

@@ -0,0 +1,44 @@
+import React from 'react';
+import { IconFont } from '@zgfe/business-lib';
+export var platformOption = [{
+  key: 0,
+  value: '全部平台'
+}, {
+  key: 1,
+  value: 'Android',
+  icon: /*#__PURE__*/React.createElement(IconFont, {
+    type: "android1",
+    size: 16
+  })
+}, {
+  key: 2,
+  value: 'IOS',
+  icon: /*#__PURE__*/React.createElement(IconFont, {
+    type: "ios1",
+    size: 16
+  })
+}, {
+  key: 3,
+  value: 'JS',
+  icon: /*#__PURE__*/React.createElement(IconFont, {
+    type: "a-js2",
+    size: 16
+  })
+}, {
+  key: 4,
+  value: '微信小程序',
+  icon: /*#__PURE__*/React.createElement(IconFont, {
+    type: "weixinxiaochengxu",
+    size: 16
+  })
+}, {
+  key: 5,
+  value: '服务端',
+  icon: /*#__PURE__*/React.createElement(IconFont, {
+    type: "fuwuqi",
+    size: 16
+  })
+}, {
+  key: -1,
+  value: '其他'
+}];

package/es/userCondition/conditions/cdpCondition.js

@@ -21,6 +21,7 @@ import moment from 'moment';
 import { BizUserConditionContext } from '..';
 import request from '../../utils/ajax';
 import Apis from '../../constants/apis';
+import IconFont from '../../icon/iconFont';
 var classPrefix = 'biz-user-condition-cdp';
 var CdpConditionItem = function CdpConditionItem(props) {
   var _useContext = useContext(BizUserConditionContext),
@@ -263,7 +264,13 @@ var CdpConditionItem = function CdpConditionItem(props) {
     keyField: "metaDatasetId",
     value: dataset,
     onChange: onTableChange
-  }), dataset ? /*#__PURE__*/React.createElement("div", {
+  }), /*#__PURE__*/React.createElement("a", {
+    target: "_blank",
+    href: "https://docs.zhugeio.com/datamanager/detail_data.html"
+  }, /*#__PURE__*/React.createElement(IconFont, {
+    type: "bangzhu",
+    className: "".concat(classPrefix, "-select-tips")
+  })), dataset ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-item")
   }, /*#__PURE__*/React.createElement(BizSelect, {
     className: "".concat(classPrefix, "-select-field"),

package/es/userCondition/conditions/cdpCshCondition.js

@@ -21,6 +21,7 @@ import moment from 'moment';
 import { BizUserConditionContext } from '..';
 import request from '../../utils/ajax';
 import Apis from '../../constants/apis';
+import IconFont from '../../icon/iconFont';
 var classPrefix = 'biz-user-condition-cdp-csh';
 var CdpConditionItem = function CdpConditionItem(props) {
   var _useContext = useContext(BizUserConditionContext),
@@ -407,7 +408,13 @@ var CdpConditionItem = function CdpConditionItem(props) {
       keyField: "metaDatasetId",
       value: subDataset,
       onChange: onSubTableChange
-    }), /*#__PURE__*/React.createElement("div", {
+    }), /*#__PURE__*/React.createElement("a", {
+      target: "_blank",
+      href: "https://docs.zhugeio.com/datamanager/detail_data.html"
+    }, /*#__PURE__*/React.createElement(IconFont, {
+      type: "bangzhu",
+      className: "".concat(classPrefix, "-select-tips")
+    })), /*#__PURE__*/React.createElement("div", {
       className: "".concat(classPrefix, "-item")
     }, /*#__PURE__*/React.createElement(BizSelect, {
       className: "".concat(classPrefix, "-select-field"),
@@ -464,7 +471,13 @@ var CdpConditionItem = function CdpConditionItem(props) {
     keyField: "metaDatasetId",
     value: dataset,
     onChange: onTableChange
-  }), dataset ? /*#__PURE__*/React.createElement("div", {
+  }), /*#__PURE__*/React.createElement("a", {
+    target: "_blank",
+    href: "https://docs.zhugeio.com/datamanager/detail_data.html"
+  }, /*#__PURE__*/React.createElement(IconFont, {
+    type: "bangzhu",
+    className: "".concat(classPrefix, "-select-tips")
+  })), dataset ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-item")
   }, /*#__PURE__*/React.createElement(BizSelect, {
     className: "".concat(classPrefix, "-select-field"),

package/es/userCondition/conditions/styles/cdpCondition.less

@@ -21,6 +21,12 @@
   &-select-dataset {
     width: 255px;
   }
+  &-select-tips {
+    height: 32px;
+    margin-left: 8px;
+    color: #9aa1a9;
+    line-height: 32px;
+  }
   &-select-field {
     width: 129px;
   }

package/es/userCondition/conditions/styles/cdpCshCondition.less

@@ -27,6 +27,12 @@
   &-select-dataset {
     width: 150px;
   }
+  &-select-tips {
+    height: 32px;
+    margin-left: 8px;
+    color: #9aa1a9;
+    line-height: 32px;
+  }
   &-select-field {
     width: 129px;
   }

package/es/userGroup/overlay.js

@@ -45,7 +45,8 @@ var Overlay = function Overlay(_ref2) {
   var _useContext = useContext(BizGlobalDataContext),
     userGroupList = _useContext.userGroupList,
     showUserGroupModal = _useContext.showUserGroupModal,
-    setUserGroupList = _useContext.setUserGroupList;
+    setUserGroupList = _useContext.setUserGroupList,
+    currentApp = _useContext.currentApp;
   var _useState5 = useState(),
     _useState6 = _slicedToArray(_useState5, 2),
     currentGroup = _useState6[0],
@@ -96,10 +97,10 @@ var Overlay = function Overlay(_ref2) {
     className: "".concat(classPrefix, "-typelist")
   }, [{
     type: 'userGroup',
-    label: '用户分群'
+    label: "".concat((currentApp === null || currentApp === void 0 ? void 0 : currentApp.type) === 'user' ? '用户' : '主体', "\u5206\u7FA4")
   }, {
     type: 'tag',
-    label: '用户标签'
+    label: "".concat((currentApp === null || currentApp === void 0 ? void 0 : currentApp.type) === 'user' ? '用户' : '主体', "\u6807\u7B7E")
   }].map(function (item) {
     return /*#__PURE__*/React.createElement("div", {
       key: item.type,
@@ -123,13 +124,13 @@ var Overlay = function Overlay(_ref2) {
   }, /*#__PURE__*/React.createElement(Search, {
     show: true,
     onChange: onSearch,
-    placeholder: "\u641C\u7D22\u7528\u6237\u7FA4\u540D\u79F0"
+    placeholder: "\u641C\u7D22\u5206\u7FA4\u540D\u79F0"
   }), /*#__PURE__*/React.createElement("a", {
     className: "".concat(classPrefix, "-add"),
     onClick: onClickAdd
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "zengjia"
-  }), "\u65B0\u5EFA\u7528\u6237\u7FA4")), showList.length > 10 ? /*#__PURE__*/React.createElement(List, {
+  }), "\u6DFB\u52A0\u5206\u7FA4")), showList.length > 10 ? /*#__PURE__*/React.createElement(List, {
     data: showList || [],
     itemHeight: 32,
     itemKey: "id",