@zgfe/business-lib 1.2.48-plat.9 → 1.2.50-alpha.0

package/es/assets/iconfont/iconfont.json

@@ -5,146 +5,6 @@
   "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",
-      "font_class": "a-js2",
-      "unicode": "e63f",
-      "unicode_decimal": 58943
-    },
-    {
-      "icon_id": "41047712",
-      "name": "微信小程序",
-      "font_class": "weixinxiaochengxu",
-      "unicode": "e640",
-      "unicode_decimal": 58944
-    },
-    {
-      "icon_id": "41047711",
-      "name": "ios",
-      "font_class": "ios1",
-      "unicode": "e641",
-      "unicode_decimal": 58945
-    },
-    {
-      "icon_id": "41047710",
-      "name": "android2",
-      "font_class": "android1",
-      "unicode": "e642",
-      "unicode_decimal": 58946
-    },
-    {
-      "icon_id": "41047709",
-      "name": "服务器",
-      "font_class": "fuwuqi",
-      "unicode": "e643",
-      "unicode_decimal": 58947
-    },
-    {
-      "icon_id": "40911670",
-      "name": "菜单-用户营销",
-      "font_class": "caidan-yonghuyingxiao",
-      "unicode": "e63a",
-      "unicode_decimal": 58938
-    },
-    {
-      "icon_id": "40624563",
-      "name": "菜单-理财业务分析",
-      "font_class": "licaiyewufenxi",
-      "unicode": "e7c8",
-      "unicode_decimal": 59336
-    },
-    {
-      "icon_id": "40533696",
-      "name": "菜单-信用卡业务",
-      "font_class": "xinyongkayewu1",
-      "unicode": "e7c6",
-      "unicode_decimal": 59334
-    },
-    {
-      "icon_id": "40533695",
-      "name": "菜单-信用卡分期",
-      "font_class": "xinyongkafenqi",
-      "unicode": "e7c7",
-      "unicode_decimal": 59335
-    },
-    {
-      "icon_id": "39969156",
-      "name": "LTV 分析",
-      "font_class": "a-LTVfenxi",
-      "unicode": "e7c5",
-      "unicode_decimal": 59333
-    },
-    {
-      "icon_id": "39962950",
-      "name": "导航二级箭头",
-      "font_class": "daohangerjijiantou",
-      "unicode": "e632",
-      "unicode_decimal": 58930
-    },
-    {
-      "icon_id": "39962949",
-      "name": "导航一级箭头收起",
-      "font_class": "daohangyijijiantoushouqi",
-      "unicode": "e634",
-      "unicode_decimal": 58932
-    },
-    {
-      "icon_id": "39962948",
-      "name": "角色交换",
-      "font_class": "jiaosejiaohuan",
-      "unicode": "e635",
-      "unicode_decimal": 58933
-    },
-    {
-      "icon_id": "39962947",
-      "name": "导航一级箭头展开",
-      "font_class": "daohangyijijiantouzhankai",
-      "unicode": "e636",
-      "unicode_decimal": 58934
-    },
-    {
-      "icon_id": "39799478",
-      "name": "菜单-存款业务分析",
-      "font_class": "cunkuanyewu",
-      "unicode": "e7c4",
-      "unicode_decimal": 59332
-    },
     {
       "icon_id": "39634357",
       "name": "埋点",
@@ -1064,8 +924,8 @@
     },
     {
       "icon_id": "31623999",
-      "name": "数据集-left",
-      "font_class": "shujuji_left",
+      "name": "left",
+      "font_class": "left",
       "unicode": "e6d2",
       "unicode_decimal": 59090
     },
@@ -1078,8 +938,8 @@
     },
     {
       "icon_id": "31624006",
-      "name": "数据集-right",
-      "font_class": "shujuji_right",
+      "name": "right",
+      "font_class": "right",
       "unicode": "e6d4",
       "unicode_decimal": 59092
     },

package/es/chart/index.js

@@ -141,6 +141,9 @@ var BizChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
     if (type === 'line') {
       eOption = dashedLineFormat(_.cloneDeep(eOption));
     }
+    if (data === null || data === void 0 ? void 0 : data.grid) {
+      eOption.grid = _objectSpread(_objectSpread({}, eOption.grid), data === null || data === void 0 ? void 0 : data.grid);
+    }
     setChartOption(function () {
       return _objectSpread({}, eOption);
     });

package/es/chart/types.d.ts

@@ -1,4 +1,5 @@
 import { EChartsOption } from 'echarts';
+import { GridOption } from 'echarts/types/dist/shared';
 export interface ChartItmProps {
     names: Array<string>;
     values: Array<number>;
@@ -26,6 +27,7 @@ export declare namespace ChartTypes {
         resultFormatMap?: {
             [key: string]: string;
         };
+        grid?: GridOption;
     }
     interface Props {
         type?: 'bar' | 'pie' | 'line' | 'map' | 'line_bar' | 'muit_y';

package/es/index.d.ts

@@ -46,9 +46,8 @@ 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, BizPlatformSelector, };
+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 type { UserGroupTypes } from './userGroup/types';
 export type { BizProductConditionT } from './productCondition/types';
 export type { BizSelectTypes } from './select/types';

package/es/index.js

@@ -45,6 +45,5 @@ 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, BizPlatformSelector };
+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 };

package/es/userCondition/conditions/cdpCondition.js

@@ -16,12 +16,11 @@ import { PropType } from '../types';
 import './styles/cdpCondition.less';
 import _ from 'lodash';
 import { dateOperate, numberOperate, stringOperate } from '../../attrConditions/utils/operates';
-import { DatePicker, Input, Tooltip } from 'antd';
+import { DatePicker, Input } 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),
@@ -264,12 +263,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
     keyField: "metaDatasetId",
     value: dataset,
     onChange: onTableChange
-  }), /*#__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", {
+  }), 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,12 +16,11 @@ import { PropType } from '../types';
 import './styles/cdpCshCondition.less';
 import _ from 'lodash';
 import { dateOperate, numberOperateCsh, numberTypeCsh, stringOperate, numberOperateCsh2 } from '../../attrConditions/utils/operates';
-import { DatePicker, Input, Tooltip } from 'antd';
+import { DatePicker, Input } 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),
@@ -408,12 +407,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
       keyField: "metaDatasetId",
       value: subDataset,
       onChange: onSubTableChange
-    }), /*#__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", {
+    }), /*#__PURE__*/React.createElement("div", {
       className: "".concat(classPrefix, "-item")
     }, /*#__PURE__*/React.createElement(BizSelect, {
       className: "".concat(classPrefix, "-select-field"),
@@ -470,12 +464,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
     keyField: "metaDatasetId",
     value: dataset,
     onChange: onTableChange
-  }), /*#__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", {
+  }), 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,12 +21,6 @@
   &-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,12 +27,6 @@
   &-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

@@ -32,7 +32,6 @@ var GroupItem = function GroupItem(_ref) {
   }, item.name);
 };
 var Overlay = function Overlay(_ref2) {
-  var _basicConfig$publicCo, _basicConfig$publicCo2, _basicConfig$publicCo3, _basicConfig$publicCo4;
   var onClose = _ref2.onClose,
     onClickCreate = _ref2.onClickCreate;
   var _useState = useState('userGroup'),
@@ -46,8 +45,7 @@ var Overlay = function Overlay(_ref2) {
   var _useContext = useContext(BizGlobalDataContext),
     userGroupList = _useContext.userGroupList,
     showUserGroupModal = _useContext.showUserGroupModal,
-    setUserGroupList = _useContext.setUserGroupList,
-    basicConfig = _useContext.basicConfig;
+    setUserGroupList = _useContext.setUserGroupList;
   var _useState5 = useState(),
     _useState6 = _slicedToArray(_useState5, 2),
     currentGroup = _useState6[0],
@@ -98,10 +96,10 @@ var Overlay = function Overlay(_ref2) {
     className: "".concat(classPrefix, "-typelist")
   }, [{
     type: 'userGroup',
-    label: (basicConfig === null || basicConfig === void 0 ? void 0 : (_basicConfig$publicCo = basicConfig.publicConfig) === null || _basicConfig$publicCo === void 0 ? void 0 : (_basicConfig$publicCo2 = _basicConfig$publicCo.subject) === null || _basicConfig$publicCo2 === void 0 ? void 0 : _basicConfig$publicCo2.isOpen) === 1 ? '主体分群' : '用户分群'
+    label: '用户分群'
   }, {
     type: 'tag',
-    label: (basicConfig === null || basicConfig === void 0 ? void 0 : (_basicConfig$publicCo3 = basicConfig.publicConfig) === null || _basicConfig$publicCo3 === void 0 ? void 0 : (_basicConfig$publicCo4 = _basicConfig$publicCo3.subject) === null || _basicConfig$publicCo4 === void 0 ? void 0 : _basicConfig$publicCo4.isOpen) === 1 ? '主体标签' : '用户标签'
+    label: '用户标签'
   }].map(function (item) {
     return /*#__PURE__*/React.createElement("div", {
       key: item.type,
@@ -125,13 +123,13 @@ var Overlay = function Overlay(_ref2) {
   }, /*#__PURE__*/React.createElement(Search, {
     show: true,
     onChange: onSearch,
-    placeholder: "\u641C\u7D22\u5206\u7FA4\u540D\u79F0"
+    placeholder: "\u641C\u7D22\u7528\u6237\u7FA4\u540D\u79F0"
   }), /*#__PURE__*/React.createElement("a", {
     className: "".concat(classPrefix, "-add"),
     onClick: onClickAdd
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "zengjia"
-  }), "\u65B0\u5EFA\u5206\u7FA4")), showList.length > 10 ? /*#__PURE__*/React.createElement(List, {
+  }), "\u65B0\u5EFA\u7528\u6237\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\u5206\u7FA4\u505A\u5BF9\u6BD4"
+    title: "\u6DFB\u52A0\u7528\u6237\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.9",
+    "version": "1.2.50-alpha.0",
     "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": "d7546cd6a2c26fa5a8b29f6b803bcb76f8757d8a",
+    "gitHead": "5195d9785e2f396799ee6a84eec84ff09f013ea2",
     "gitHooks": {
         "pre-commit": "lint-staged"
     }

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

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

package/es/platformSelector/demo/index.js

@@ -1,16 +0,0 @@
-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

@@ -1,14 +0,0 @@
-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

@@ -1,65 +0,0 @@
-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

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