@zgfe/business-lib 1.2.48-plat.0 → 1.2.48-plat.10

package/es/assets/iconfont/iconfont.json

@@ -5,6 +5,41 @@
   "css_prefix_text": "",
   "description": "诸葛业务平台",
   "glyphs": [
+    {
+      "icon_id": "41153342",
+      "name": "上传图片",
+      "font_class": "shangchuantupian",
+      "unicode": "e648",
+      "unicode_decimal": 58952
+    },
+    {
+      "icon_id": "41153408",
+      "name": "插入指标",
+      "font_class": "charuzhibiao",
+      "unicode": "e644",
+      "unicode_decimal": 58948
+    },
+    {
+      "icon_id": "41153407",
+      "name": "添加标题",
+      "font_class": "tianjiabiaoti",
+      "unicode": "e645",
+      "unicode_decimal": 58949
+    },
+    {
+      "icon_id": "41153406",
+      "name": "添加文本",
+      "font_class": "tianjiawenben",
+      "unicode": "e646",
+      "unicode_decimal": 58950
+    },
+    {
+      "icon_id": "41153405",
+      "name": "添加图片",
+      "font_class": "tianjiatupian",
+      "unicode": "e647",
+      "unicode_decimal": 58951
+    },
     {
       "icon_id": "41047713",
       "name": "js 2",

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,14 @@
+import React, { ReactNode } from 'react';
+import './styles/index.less';
+export interface platItemProp {
+    key: number;
+    value: string;
+    icon?: ReactNode;
+}
+declare const BizPlatformSelector: React.FC<{
+    onChange: (val: {
+        key: number;
+        value: string;
+    }) => void;
+}>;
+export default BizPlatformSelector;

package/es/platformSelector/index.js

@@ -0,0 +1,65 @@
+import React from 'react';
+import { IconFont, BizSelect } from '@zgfe/business-lib';
+import './styles/index.less';
+var BizPlatformSelector = function BizPlatformSelector(props) {
+  var classPrefix = 'biz-platform-selector';
+  var platformOption = [{
+    key: -1,
+    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: 0,
+    value: '其他'
+  }];
+  return /*#__PURE__*/React.createElement("div", {
+    className: classPrefix
+  }, /*#__PURE__*/React.createElement(BizSelect, {
+    className: "".concat(classPrefix, "-select"),
+    options: platformOption,
+    overlayWidth: 134,
+    keyField: "key",
+    labelField: "value",
+    defaultValue: {
+      value: '全部平台',
+      key: -1
+    },
+    onChange: function onChange(val) {
+      props.onChange(val);
+    }
+  }));
+};
+export default BizPlatformSelector;

package/es/platformSelector/styles/index.less

@@ -0,0 +1,9 @@
+@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;
+  }
+}

package/es/userCondition/conditions/cdpCondition.js

@@ -16,11 +16,12 @@ import { PropType } from '../types';
 import './styles/cdpCondition.less';
 import _ from 'lodash';
 import { dateOperate, numberOperate, stringOperate } from '../../attrConditions/utils/operates';
-import { DatePicker, Input } from 'antd';
+import { DatePicker, Input, Tooltip } from 'antd';
 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,12 @@ var CdpConditionItem = function CdpConditionItem(props) {
     keyField: "metaDatasetId",
     value: dataset,
     onChange: onTableChange
-  }), dataset ? /*#__PURE__*/React.createElement("div", {
+  }), /*#__PURE__*/React.createElement(Tooltip, {
+    title: "\u9009\u62E9\u660E\u7EC6\u6570\u636E\uFF0C\u589E\u52A0\u5E2E\u52A9\u5F15\u5BFC\u5165\u53E3"
+  }, /*#__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

@@ -16,11 +16,12 @@ import { PropType } from '../types';
 import './styles/cdpCshCondition.less';
 import _ from 'lodash';
 import { dateOperate, numberOperateCsh, numberTypeCsh, stringOperate, numberOperateCsh2 } from '../../attrConditions/utils/operates';
-import { DatePicker, Input } from 'antd';
+import { DatePicker, Input, Tooltip } from 'antd';
 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,12 @@ var CdpConditionItem = function CdpConditionItem(props) {
       keyField: "metaDatasetId",
       value: subDataset,
       onChange: onSubTableChange
-    }), /*#__PURE__*/React.createElement("div", {
+    }), /*#__PURE__*/React.createElement(Tooltip, {
+      title: "\u9009\u62E9\u660E\u7EC6\u6570\u636E\uFF0C\u589E\u52A0\u5E2E\u52A9\u5F15\u5BFC\u5165\u53E3"
+    }, /*#__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 +470,12 @@ var CdpConditionItem = function CdpConditionItem(props) {
     keyField: "metaDatasetId",
     value: dataset,
     onChange: onTableChange
-  }), dataset ? /*#__PURE__*/React.createElement("div", {
+  }), /*#__PURE__*/React.createElement(Tooltip, {
+    title: "\u9009\u62E9\u660E\u7EC6\u6570\u636E\uFF0C\u589E\u52A0\u5E2E\u52A9\u5F15\u5BFC\u5165\u53E3"
+  }, /*#__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, {
+  }), "\u65B0\u5EFA\u5206\u7FA4")), showList.length > 10 ? /*#__PURE__*/React.createElement(List, {
     data: showList || [],
     itemHeight: 32,
     itemKey: "id",

package/es/userGroupHeader/index.js

@@ -77,7 +77,7 @@ var BizUserGroupHeader = function BizUserGroupHeader(_ref) {
       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.48-plat.0",
+    "version": "1.2.48-plat.10",
     "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": "e7968ec3b8ef3fade40b691fea36a0f925949b56",
+    "gitHead": "9eb12ea12533922d504954aca060e35aeecc72e6",
     "gitHooks": {
         "pre-commit": "lint-staged"
     }