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

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/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",

package/es/userGroupHeader/index.js

@@ -8,11 +8,12 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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, { useEffect } from 'react';
+import React, { useEffect, useContext } from 'react';
 import './styles/index.less';
 import { Space, Tooltip } from 'antd';
 import BizUserGroup from '../userGroup';
 import IconFont from '../icon/iconFont';
+import BizGlobalDataContext from '../context';
 import _ from 'lodash';
 var BizUserGroupHeader = function BizUserGroupHeader(_ref) {
   var max = _ref.max,
@@ -21,6 +22,8 @@ var BizUserGroupHeader = function BizUserGroupHeader(_ref) {
     enableTags = _ref.enableTags,
     title = _ref.title,
     placeholder = _ref.placeholder;
+  var _useContext = useContext(BizGlobalDataContext),
+    currentApp = _useContext.currentApp;
   var classPrefix = 'biz-user-group-header';
   var _React$useState = React.useState([]),
     _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -55,7 +58,7 @@ var BizUserGroupHeader = function BizUserGroupHeader(_ref) {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-title")
-  }, title || '分析用户群'), /*#__PURE__*/React.createElement(Space, {
+  }, title || (currentApp === null || currentApp === void 0 ? void 0 : currentApp.type) === 'user' ? '分析用户群' : '主体分群'), /*#__PURE__*/React.createElement(Space, {
     size: 16,
     className: "".concat(classPrefix, "-container")
   }, [tempValue.map(function (item, i) {
@@ -74,10 +77,10 @@ var BizUserGroupHeader = function BizUserGroupHeader(_ref) {
         list[i].value = val;
         setTempValue(list);
       },
-      placeholder: placeholder
+      placeholder: placeholder || '请选择分群'
     });
   })], /*#__PURE__*/React.createElement(Tooltip, {
-    title: "\u6DFB\u52A0\u7528\u6237\u7FA4\u505A\u5BF9\u6BD4"
+    title: "\u6DFB\u52A0\u5206\u7FA4\u505A\u5BF9\u6BD4"
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "tianjia",
     className: "".concat(classPrefix, "-add ").concat(max && tempValue.length >= max ? 'disabled' : ''),

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zgfe/business-lib",
-    "version": "1.2.51-heyh.0",
+    "version": "1.2.51-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": "e55ca3a4e52f26b97894c3df9b0dffe165f70f73",
+    "gitHead": "b470f53cee3a0c88ac6d1fa6cf4fe05d67e11fe1",
     "gitHooks": {
         "pre-commit": "lint-staged"
     }