@zgfe/business-lib 1.2.58-ljy.0 → 1.2.70-hxd.1

package/es/assets/iconfont/iconfont.json

@@ -5,6 +5,76 @@
   "css_prefix_text": "",
   "description": "诸葛业务平台",
   "glyphs": [
+    {
+      "icon_id": "42421332",
+      "name": "分享",
+      "font_class": "fenxiang",
+      "unicode": "e656",
+      "unicode_decimal": 58966
+    },
+    {
+      "icon_id": "42402282",
+      "name": "icon 注意",
+      "font_class": "a-iconzhuyi",
+      "unicode": "e655",
+      "unicode_decimal": 58965
+    },
+    {
+      "icon_id": "42390038",
+      "name": "姓名排序A-Z",
+      "font_class": "xingmingpaixuA-Z",
+      "unicode": "e7d9",
+      "unicode_decimal": 59353
+    },
+    {
+      "icon_id": "42390037",
+      "name": "姓名排序Z-A",
+      "font_class": "xingmingpaixuZ-A",
+      "unicode": "e7da",
+      "unicode_decimal": 59354
+    },
+    {
+      "icon_id": "42372608",
+      "name": "属性分析",
+      "font_class": "shuxingfenxi",
+      "unicode": "e654",
+      "unicode_decimal": 58964
+    },
+    {
+      "icon_id": "42169337",
+      "name": "放大镜",
+      "font_class": "fangdajing",
+      "unicode": "e652",
+      "unicode_decimal": 58962
+    },
+    {
+      "icon_id": "42169336",
+      "name": "缩小",
+      "font_class": "suoxiao1",
+      "unicode": "e653",
+      "unicode_decimal": 58963
+    },
+    {
+      "icon_id": "42132750",
+      "name": "关系图",
+      "font_class": "a-node-tree2",
+      "unicode": "e650",
+      "unicode_decimal": 58960
+    },
+    {
+      "icon_id": "42132749",
+      "name": "表格模式",
+      "font_class": "a-table-view1",
+      "unicode": "e651",
+      "unicode_decimal": 58961
+    },
+    {
+      "icon_id": "41866164",
+      "name": "提交",
+      "font_class": "tijiao",
+      "unicode": "e7d8",
+      "unicode_decimal": 59352
+    },
     {
       "icon_id": "41736285",
       "name": "更多",

package/es/assets/styles/resetAntd.less

@@ -12,6 +12,14 @@
     background-color: @background-color-base!important;
   }
 
+  > .ant-input:hover {
+    border-color: #165dff00 !important;
+  }
+
+  > .ant-input:focus {
+    border-color: #165dff00 !important;
+  }
+
   &:hover {
     border-color: @primary-color!important;
   }
@@ -46,15 +54,16 @@
 // 输入框
 .ant-input {
   background-color: @background-color-base!important;
+  border: 1px solid #ecedf000 !important;
   // border-color: @background-color-base!important;
   border-radius: @border-radius-small!important;
   &:hover {
-    border-color: @primary-color;
+    border-color: @primary-color !important;
   }
   &:focus,
   &-focused {
     background-color: #fff !important;
-    border-color: @primary-color;
+    border-color: @primary-color !important;
     box-shadow: 0 0 0 4px @custom-focus !important;
   }
   &.ant-input-status-error {
@@ -62,11 +71,16 @@
     &:focus,
     &-focused {
       &:not(.ant-input-disable):not(.ant-input-borderless) {
-        box-shadow: 0 0 0 4px rgba(#ff8170, 0.2) !important;
+        box-shadow: 0 0 0 4px rgba(#ff8170, 0) !important;
       }
     }
   }
 }
+.ant-input[disabled] {
+  color: rgba(2, 20, 41, 1) !important;
+  background-color: #f2f3f4 !important;
+  border-color: #ecedf000 !important;
+}
 
 .ant-input-group-addon {
   color: @text-color-secondary!important;
@@ -519,24 +533,23 @@
 }
 
 .ant-btn-text {
-  background-color: @background-color-gray!important;
+  background-color: none !important;
   border: none !important;
 
   &:hover {
     color: @text-color!important;
-    background-color: @btn-text-hover-bg!important;
+    background-color: none !important;
   }
 
   &:focus {
     color: @text-color!important;
-    background-color: #94a6ce !important;
+    background-color: none !important;
   }
 }
 .ant-form-item-explain-error {
   color: @error-color!important;
 }
 
-//dropdown
 .ant-dropdown,
 .ant-picker-dropdown,
 .ant-dropdown-menu-submenu-popup {

package/es/attrCondition/group.js

@@ -11,7 +11,8 @@ var BizAttrConditionGroup = /*#__PURE__*/React.forwardRef(function (props, ref)
     enableEnvProp = props.enableEnvProp,
     disableItemList = props.disableItemList,
     overlayClassName = props.overlayClassName,
-    extra = props.extra;
+    extra = props.extra,
+    relationConfig = props.relationConfig;
   var _useConditionGroup = useConditionGroup(props, ref),
     loading = _useConditionGroup.loading,
     conditions = _useConditionGroup.conditions,
@@ -61,7 +62,9 @@ var BizAttrConditionGroup = /*#__PURE__*/React.forwardRef(function (props, ref)
       },
       onDelete: function onDelete() {
         return _onDelete(index);
-      }
+      },
+      relationSup: index ? conditions[index - 1] : undefined,
+      relationConfig: relationConfig
     }));
   }))));
 });

package/es/attrCondition/index.js

@@ -23,7 +23,9 @@ var BizAttrCondition = function BizAttrCondition(props) {
     enableEnvProp = props.enableEnvProp,
     disableItemList = props.disableItemList,
     theme = props.theme,
-    overlayClassName = props.overlayClassName;
+    overlayClassName = props.overlayClassName,
+    relationSup = props.relationSup,
+    relationConfig = props.relationConfig;
   var _useAttrCondition = useAttrCondition(props),
     loading = _useAttrCondition.loading,
     attr = _useAttrCondition.attr,
@@ -85,7 +87,9 @@ var BizAttrCondition = function BizAttrCondition(props) {
     defaultValue: values,
     onChange: onChangeValues,
     theme: theme,
-    status: isValueError ? 'error' : ''
+    status: isValueError ? 'error' : '',
+    relationSup: relationSup,
+    relationConfig: relationConfig
   }), isValueError ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-error")
   }, "\u5C5E\u6027\u503C\u4E0D\u53EF\u4E3A\u7A7A") : null), enableDelete && /*#__PURE__*/React.createElement(IconFont, {

package/es/attrConditions/components/operateList.js

@@ -35,9 +35,9 @@ var BizOperateList = function BizOperateList(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     ready = _useState8[0],
     setReady = _useState8[1];
-  var specialOperateHandle = function specialOperateHandle(label) {
-    var _special = ['平台', '网络', '运营商', '设备型号'];
-    return label && _special.indexOf(label) !== -1 ? true : false;
+  var specialOperateHandle = function specialOperateHandle(name) {
+    var _special = ['platform', 'network', 'mccmnc', 'device_model'];
+    return name && _special.indexOf(name) !== -1 ? true : false;
   };
   useEffect(function () {
     if (/place/.test(props.defaultValue || '')) {
@@ -63,7 +63,7 @@ var BizOperateList = function BizOperateList(props) {
       var _props$attr2, _props$attr3;
       if (((_props$attr2 = props.attr) === null || _props$attr2 === void 0 ? void 0 : _props$attr2.id) == 31415926) {
         optionData = stringBusinessOperate;
-      } else if (specialOperateHandle((_props$attr3 = props.attr) === null || _props$attr3 === void 0 ? void 0 : _props$attr3.label)) {
+      } else if (specialOperateHandle((_props$attr3 = props.attr) === null || _props$attr3 === void 0 ? void 0 : _props$attr3.name)) {
         optionData = specialOperate;
       } else {
         optionData = stringOperate;

package/es/attrConditions/components/stringList.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import { AttributeSelect } from '../../attributeSelector/types';
+import { AttrConditionTypes } from '../types';
 import { BizSelectTypes } from '../../select/types';
 declare const StringList: React.FC<{
     attr: AttributeSelect.Value;
@@ -8,5 +9,14 @@ declare const StringList: React.FC<{
     onChange?: (value: string[]) => void;
     theme: BizSelectTypes.Props['theme'];
     status?: string;
+    relationSup?: AttrConditionTypes.GroupAddKey;
+    relationConfig?: {
+        eventId: number;
+        eventName: string;
+        eventAttrIdSup: number;
+        eventAttrNameSup: string;
+        eventAttrIdSub: number;
+        eventAttrNameSub: string;
+    }[];
 }>;
 export default StringList;

package/es/attrConditions/components/stringList.js

@@ -86,34 +86,64 @@ var StringList = function StringList(props) {
           case 0:
             fetch = function fetch() {
               var attrData = props.attr;
-              var requestData = {
-                app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-                platform: 0,
-                limit: 20,
-                attr: (attrData === null || attrData === void 0 ? void 0 : attrData.id) || 0,
-                dimension_sub: attrData === null || attrData === void 0 ? void 0 : attrData.dimensionSub,
-                v: searchValue || ''
-              };
-              var formData = util.transformRequest(requestData);
-              request(Apis.esQuery, {
-                method: 'post',
-                data: formData,
-                headers: {
-                  'Content-Type': 'application/x-www-form-urlencoded'
-                }
-              }).then(function (result) {
-                setOptions(function () {
-                  return result && result.sources ? result.sources.map(function (item) {
-                    return {
-                      name: item,
-                      value: item
-                    };
-                  }) : [];
-                });
-              }).catch(function (e) {
-                console.error(e);
-                setOptions([]);
+              var relationSup = props.relationSup;
+              var relationConfig = props.relationConfig || [];
+              var dealConfig = relationConfig.filter(function (item) {
+                return attrData && item.eventId === attrData.eventId && relationSup && relationSup.data && item.eventAttrIdSup === relationSup.data.attrId && item.eventAttrIdSub === (attrData === null || attrData === void 0 ? void 0 : attrData.id);
               });
+              if (dealConfig && dealConfig.length && relationSup.data.values && relationSup.data.values.length) {
+                request(Apis.queryRelationResult, {
+                  method: 'post',
+                  data: {
+                    app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+                    eventId: attrData.eventId,
+                    attrId: relationSup.data.attrId,
+                    attrValues: relationSup.data.values,
+                    subAttrId: attrData === null || attrData === void 0 ? void 0 : attrData.id
+                  }
+                }).then(function (result) {
+                  setOptions(function () {
+                    return result && result.data ? result.data.map(function (item) {
+                      return {
+                        name: item,
+                        value: item
+                      };
+                    }) : [];
+                  });
+                }).catch(function (e) {
+                  console.error(e);
+                  setOptions([]);
+                });
+              } else {
+                var requestData = {
+                  app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+                  platform: 0,
+                  limit: 20,
+                  attr: (attrData === null || attrData === void 0 ? void 0 : attrData.id) || 0,
+                  dimension_sub: attrData === null || attrData === void 0 ? void 0 : attrData.dimensionSub,
+                  v: searchValue || ''
+                };
+                var formData = util.transformRequest(requestData);
+                request(Apis.esQuery, {
+                  method: 'post',
+                  data: formData,
+                  headers: {
+                    'Content-Type': 'application/x-www-form-urlencoded'
+                  }
+                }).then(function (result) {
+                  setOptions(function () {
+                    return result && result.sources ? result.sources.map(function (item) {
+                      return {
+                        name: item,
+                        value: item
+                      };
+                    }) : [];
+                  });
+                }).catch(function (e) {
+                  console.error(e);
+                  setOptions([]);
+                });
+              }
             };
             if (timer) clearTimeout(timer);
             setTimer(setTimeout(function () {

package/es/attrConditions/components/valuesList.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import { AttributeSelect } from '../../attributeSelector/types';
+import { AttrConditionTypes } from '../types';
 import { BizSelectTypes } from '../../select/types';
 declare const ValuesList: React.FC<{
     attr?: AttributeSelect.Value;
@@ -8,5 +9,14 @@ declare const ValuesList: React.FC<{
     onChange?: (value: string[]) => void;
     theme: BizSelectTypes.Props['theme'];
     status?: string;
+    relationSup?: AttrConditionTypes.GroupAddKey;
+    relationConfig?: {
+        eventId: number;
+        eventName: string;
+        eventAttrIdSup: number;
+        eventAttrNameSup: string;
+        eventAttrIdSub: number;
+        eventAttrNameSub: string;
+    }[];
 }>;
 export default ValuesList;

package/es/attrConditions/components/valuesList.js

@@ -21,7 +21,9 @@ var ValuesList = function ValuesList(props) {
     defaultValue = props.defaultValue,
     operate = props.operate,
     theme = props.theme,
-    status = props.status;
+    status = props.status,
+    relationSup = props.relationSup,
+    relationConfig = props.relationConfig;
   var initValue = [moment().subtract(1, 'weeks').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')];
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
@@ -116,7 +118,9 @@ var ValuesList = function ValuesList(props) {
       operate: operate,
       value: current,
       status: status,
-      onChange: onChange
+      onChange: onChange,
+      relationSup: relationSup,
+      relationConfig: relationConfig
     });
   } else if (attr.type === PropType.NUMBER) {
     var numberAfter = /*#__PURE__*/React.createElement(BizSelect, {
@@ -166,7 +170,7 @@ var ValuesList = function ValuesList(props) {
     } else {
       return /*#__PURE__*/React.createElement(Input, {
         className: "".concat(classPrefix, "-input"),
-        value: current && current[0] ? current[0] : 30,
+        value: current && current[0] ? current[0] : '',
         placeholder: "\u8BF7\u8F93\u5165\u5C5E\u6027\u503C",
         type: "number",
         suffix: "\u5929",

package/es/attrConditions/types.d.ts

@@ -38,6 +38,15 @@ export declare namespace AttrConditionTypes {
         destroyPopupOnHide?: boolean;
         overlayClassName?: string;
         supportNPlace?: boolean;
+        relationSup?: GroupAddKey;
+        relationConfig?: {
+            eventId: number;
+            eventName: string;
+            eventAttrIdSup: number;
+            eventAttrNameSup: string;
+            eventAttrIdSub: number;
+            eventAttrNameSub: string;
+        }[];
     }
     interface GroupProp extends BasicAttrTypes {
         defaultValue?: GroupValue;
@@ -47,6 +56,14 @@ export declare namespace AttrConditionTypes {
         onChange?: (value: GroupValue) => void;
         onConditionsCount?: (value: number) => void;
         overlayClassName?: string;
+        relationConfig?: {
+            eventId: number;
+            eventName: string;
+            eventAttrIdSup: number;
+            eventAttrNameSup: string;
+            eventAttrIdSub: number;
+            eventAttrNameSub: string;
+        }[];
     }
     interface Option {
         name: string;

package/es/attributeSelector/index.js

@@ -23,9 +23,12 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
     placeholder = props.placeholder,
     theme = props.theme,
     extra = props.extra,
+    extraUser = props.extraUser,
     isNumber = props.isNumber,
     overlayClassName = props.overlayClassName,
-    isStrNum = props.isStrNum;
+    isStrNum = props.isStrNum,
+    isString = props.isString,
+    isHideYeWu = props.isHideYeWu;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     currentAttr = _useState2[0],
@@ -71,7 +74,8 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
       });
       if (res && param.step !== undefined) res.step = param.step;
     } else if ((param === null || param === void 0 ? void 0 : param.propCategory) === 'userProp') {
-      userPropList === null || userPropList === void 0 ? void 0 : userPropList.forEach(function (attr) {
+      var _concat;
+      (_concat = (extraUser ? extraUser : []).concat(userPropList ? userPropList : [])) === null || _concat === void 0 ? void 0 : _concat.forEach(function (attr) {
         if (attr.id === param.id && attr.category === param.category && attr.name === (param.name || param.value)) res = attr;
       });
     } else {
@@ -107,7 +111,9 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
         value: currentAttr,
         onChange: onChange,
         isNumber: isNumber,
-        isStrNum: isStrNum
+        isStrNum: isStrNum,
+        isString: isString,
+        isHideYeWu: isHideYeWu
       }));
     },
     trigger: ['click'],

package/es/attributeSelector/listPanel.js

@@ -24,8 +24,11 @@ var AttrListPanel = function AttrListPanel(props) {
     eventIdList = props.eventIdList,
     funnelEventIdList = props.funnelEventIdList,
     extra = props.extra,
+    extraUser = props.extraUser,
     isNumber = props.isNumber,
-    isStrNum = props.isStrNum;
+    isStrNum = props.isStrNum,
+    isString = props.isString,
+    isHideYeWu = props.isHideYeWu;
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     searchValue = _useState2[0],
@@ -160,7 +163,9 @@ var AttrListPanel = function AttrListPanel(props) {
             anchor: hasAnchor ? String(Math.random()) : anchor.event,
             key: "event-".concat(event.id),
             children: event.attrList.slice().filter(function (item) {
-              return isStrNum ? item.type === 2 || item.type === 1 : isNumber ? item.type === 2 : true;
+              return isHideYeWu ? item.id != 31415926 : true;
+            }).filter(function (item) {
+              return isStrNum ? item.type === 2 || item.type === 1 : isNumber ? item.type === 2 : isString ? item.type === 1 : true;
             })
           };
           list.push(group);
@@ -191,7 +196,7 @@ var AttrListPanel = function AttrListPanel(props) {
         groupName: "".concat((currentApp === null || currentApp === void 0 ? void 0 : currentApp.type) === 'user' ? '用户' : '主体', "\u5C5E\u6027"),
         key: 'userProps',
         anchor: anchor.user,
-        children: userPropList
+        children: (extraUser ? extraUser : []).concat(userPropList)
       });
     }
     if (enableEnvProp) {
@@ -206,7 +211,6 @@ var AttrListPanel = function AttrListPanel(props) {
     setOptionList(list);
   }, [anchor, eventIdMap, userPropList, eventEnvList, eventIdList, props.showCommonProp]);
   useEffect(function () {
-    console.log('currentAttr', props.value);
     setCurrentAttr(props.value);
   }, [props.value]);
   function onClick(option) {

package/es/attributeSelector/types.d.ts

@@ -96,8 +96,11 @@ export declare namespace AttributeSelect {
         size?: SizeType;
         status?: string;
         extra?: AttributeExtra[];
+        extraUser?: ExtraProp[];
         isNumber?: Boolean;
         isStrNum?: Boolean;
+        isString?: Boolean;
+        isHideYeWu?: Boolean;
     }
     interface AttributeExtra {
         type: string;

package/es/attributeSelector/util.js

@@ -115,6 +115,7 @@ export function getIcon(name) {
     device_brand: 'overall',
     device_model: 'overall',
     event_duration: 'time',
+    userCount: 'web',
     first_visit_time: 'time',
     last_visit_time: 'time',
     visit_times: 'time',

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

@@ -0,0 +1,54 @@
+declare const _default: {
+    delEventName: null;
+    huanbi: never[];
+    md5: string;
+    numberCard: number;
+    series: {
+        diyTarget: boolean;
+        duration: never[];
+        groupId: number;
+        index: string;
+        names: string[];
+        orderNum: null;
+        originalNames: never[];
+        pNext: never[];
+        pTotal: never[];
+        proMd5: null;
+        resultFormat: null;
+        sum: null;
+        total: never[];
+        values: number[];
+    }[];
+    table: string;
+    tongbi: never[];
+    total: never[];
+    updateTime: string;
+    xAxis: string[];
+    yesterDay: never[];
+    seriesOriginal: {
+        diyTarget: boolean;
+        duration: never[];
+        groupId: number;
+        index: string;
+        names: string[];
+        orderNum: null;
+        originalNames: never[];
+        pNext: never[];
+        pTotal: never[];
+        proMd5: null;
+        resultFormat: null;
+        sum: null;
+        total: never[];
+        values: number[];
+    }[];
+};
+export default _default;
+export declare const barData: {
+    xAxis: string[];
+    series: {
+        names: string[];
+        values: number[];
+        orderNum: number;
+    }[];
+};
+export declare const showCharts: string[];