@zgfe/business-lib 1.1.35-idmapping.0 → 1.1.35

package/es/attrConditions/demo/group.js

@@ -7,11 +7,12 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useRef, useState } from 'react';
 import { BizConditionGroup, DemoWrapper } from '@zgfe/business-lib';
 import { Button } from 'antd';
+import { OperateTypes } from '../types';
 var conditions = [{
   propCategory: 'userProp',
   attrId: 0,
   type: 2,
-  operator: 'gt',
+  operator: OperateTypes.GT,
   values: ['25200', '1'],
   attrName: 'duration',
   category: 'fixed',
@@ -19,7 +20,7 @@ var conditions = [{
 }, {
   propCategory: 'eventProp',
   type: 1,
-  operator: 'equal',
+  operator: OperateTypes.Equal,
   values: ['Safari', 'Apple WebKit'],
   attrId: 30183426
 }];

package/es/attrConditions/index.d.ts

@@ -1,6 +1,8 @@
 import React from 'react';
+import { AttributeSelect } from '../attributeSelector/types';
 import './styles/index.less';
-import { AttrConditionTypes } from './types';
+import { AttrConditionTypes, OperateTypes } from './types';
 export declare const classPrefix = "biz-condition-item";
+export declare function getCondition(attr: AttributeSelect.Value, operate: OperateTypes, values: string[]): AttrConditionTypes.ItemValue | undefined;
 declare const BizConditionItem: React.FC<AttrConditionTypes.ItemProp>;
 export default BizConditionItem;

package/es/attrConditions/index.js

@@ -12,6 +12,28 @@ import BizOperateList from './components/operateList';
 import ValuesList from './components/valuesList';
 import { Skeleton } from 'antd';
 export var classPrefix = 'biz-condition-item';
+export function getCondition(attr, operate, values) {
+  if (!attr) return;
+  var responseData = {
+    attrId: attr.id,
+    propCategory: attr.propCategory,
+    type: attr.type,
+    operator: operate,
+    values: values || [],
+    dimensionSub: attr.dimensionSub,
+    label: attr.label
+  };
+  if (attr.propCategory === PropCategory.EventProp) {
+    responseData.attrName = attr.label;
+  } else {
+    responseData.attrName = attr.name;
+    responseData.category = attr.category;
+    if (attr.propCategory === PropCategory.UserProp && attr.subtype) {
+      responseData.subtype = attr.subtype;
+    }
+  }
+  return responseData;
+}
 var BizConditionItem = function BizConditionItem(props) {
   var _props$defaultValue, _props$value, _props$defaultValue2, _props$value2;
   var defaultValue = props.defaultValue,
@@ -79,25 +101,7 @@ var BizConditionItem = function BizConditionItem(props) {
   useEffect(function () {
     if (props.onChange) {
       if (!attr) return;
-      var responseData = {
-        attrId: attr.id,
-        propCategory: attr.propCategory,
-        type: attr.type,
-        operator: operate,
-        values: values || [],
-        dimensionSub: attr.dimensionSub,
-        label: attr.alias || attr.label
-      };
-      if (attr.propCategory === PropCategory.EventProp) {
-        responseData.attrName = attr.label;
-      } else {
-        responseData.attrName = attr.name;
-        responseData.category = attr.category;
-        if (attr.propCategory === PropCategory.UserProp && attr.subtype) {
-          responseData.subtype = attr.subtype;
-        }
-      }
-      props.onChange(responseData);
+      props.onChange(getCondition(attr, operate, values));
     }
   }, [attr, operate, values]);
   var onChangeAttr = function onChangeAttr(attrData) {

package/es/attrConditions/types.d.ts

@@ -18,7 +18,7 @@ export declare namespace AttrConditionTypes {
         propCategory?: 'userProp' | 'eventProp' | 'envProp';
         category?: 'fixed' | 'custom';
         dimensionSub?: string;
-        operator?: string;
+        operator?: OperateTypes;
         values?: string[];
     }
     interface GroupValue {

package/es/attributeSelector/types.d.ts

@@ -63,6 +63,8 @@ export interface PropGroups {
     eventGroupList?: EventGroup[];
     userPropList?: UserProp[];
     envPropList?: EnvProp[];
+    eventNameMap?: Record<string, AnalysisEvent>;
+    eventIdMap?: Record<number, AnalysisEvent>;
 }
 export declare namespace AttributeSelect {
     type Value = EventProp | UserProp | EnvProp | null;

package/es/attributeSelector/util.js

@@ -3,7 +3,9 @@ export default function convertAttributeData(store) {
   var res = {
     envPropList: [],
     eventGroupList: [],
-    userPropList: []
+    userPropList: [],
+    eventNameMap: {},
+    eventIdMap: {}
   };
   (_store$eventList = store.eventList) === null || _store$eventList === void 0 ? void 0 : _store$eventList.forEach(function (group_) {
     var _res$eventGroupList;
@@ -39,6 +41,8 @@ export default function convertAttributeData(store) {
         eventHidden: e.event_hidden,
         marked: Boolean(e.mark_type)
       };
+      res.eventNameMap[event.name] = event;
+      res.eventIdMap[event.id] = event;
       if (event.marked) {
         markList.push(event);
       } else {

package/es/context/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { EventGroup, UserProp, EnvProp } from '../attributeSelector/types';
+import { EventGroup, UserProp, EnvProp, AnalysisEvent } from '../attributeSelector/types';
 export interface AppInfoProps {
     appId?: string | number;
     platform?: string | number;
@@ -24,6 +24,8 @@ export interface Menu {
 export interface GlobalContextProps {
     userGroupList?: Array<any>;
     eventGroupList?: EventGroup[];
+    eventNameMap?: Record<string, AnalysisEvent>;
+    eventIdMap?: Record<number, AnalysisEvent>;
     userPropList?: UserProp[];
     eventEnvList?: EnvProp[];
     menuNameMap?: {
@@ -36,7 +38,6 @@ export interface GlobalContextProps {
     router?: any;
     routes?: any;
     envs?: Record<string, any>;
-    setPageLoading?: (isLoading: boolean) => void;
 }
 declare const BizGlobalDataContext: import("react").Context<GlobalContextProps>;
 export default BizGlobalDataContext;

package/es/demoWrapper/content.js

@@ -175,6 +175,8 @@ var DemoContent = function DemoContent(_ref3) {
       eventGroupList: store === null || store === void 0 ? void 0 : store.eventGroupList,
       userPropList: store === null || store === void 0 ? void 0 : store.userPropList,
       eventEnvList: store === null || store === void 0 ? void 0 : store.envPropList,
+      eventIdMap: store === null || store === void 0 ? void 0 : store.eventIdMap,
+      eventNameMap: store === null || store === void 0 ? void 0 : store.eventNameMap,
       userGroupList: userGroups
     }
   }, children));

package/es/dialog/index.js

@@ -23,7 +23,7 @@ var BizDialog = function BizDialog(props) {
 };
 BizDialog.defaultProps = {
   width: 520,
-  visible: false,
+  open: false,
   cancelText: '取消',
   okText: '确定',
   closable: false,

package/es/socket/index.d.ts

@@ -8,11 +8,12 @@ declare class SocketClient {
     private showLog;
     private pingTimer?;
     private appkey?;
+    private token?;
     constructor(url: string, appkey: string, params?: Record<string, any>);
     emit(event: string, payload?: SocketClientTypes.Message['data']['payload']): void;
     on<T>(type: SocketClientTypes.EventType | string, handle: (data?: T) => void): void;
-    onConnected(handle: () => void): void;
-    onDisconnected(handle: () => void): void;
+    onConnected(handle: (data?: any) => void): void;
+    onDisconnected(handle: (data?: any) => void): void;
     onError(handle: (data?: Error) => void): void;
     private _onError;
     private _onClose;
@@ -21,11 +22,12 @@ declare class SocketClient {
     private ping;
     removeAllListeners(): void;
     removeListener(event: string, handle?: (data?: any) => void): void;
-    private getToken;
+    private _getToken;
     open(url?: string, params?: Record<string, any>): void;
     close(): void;
     destroy(): void;
     private log;
     openLog(open: boolean): void;
+    getToken(): string | undefined;
 }
 export default SocketClient;

package/es/socket/index.js

@@ -29,6 +29,7 @@ var SocketClient = /*#__PURE__*/function () {
     this.showLog = false;
     this.pingTimer = void 0;
     this.appkey = void 0;
+    this.token = void 0;
     this.appkey = appkey;
     this.url = url;
     this.params = params;
@@ -122,7 +123,7 @@ var SocketClient = /*#__PURE__*/function () {
         _this = this;
       this.log('info', 'socket连接成功', event);
       (_this$listeners$conne = this.listeners['connected']) === null || _this$listeners$conne === void 0 ? void 0 : _this$listeners$conne.forEach(function (handle) {
-        handle.call(undefined);
+        handle.call(undefined, _this.token);
       });
       this.log('info', 'clear catch', this.catch);
       this.catch.forEach(function (_ref) {
@@ -137,7 +138,7 @@ var SocketClient = /*#__PURE__*/function () {
   }, {
     key: "onMessage",
     value: function onMessage(event) {
-      var _this$listeners$Socke, _this$listeners$Socke2, _this$listeners$Socke3;
+      var _this$listeners$Socke, _this$listeners$Socke2, _this$listeners$Socke3, _this$listeners$unkno;
       var res = JSON.parse(event.data);
       if (res.code) {
         switch (Number(res.code)) {
@@ -158,6 +159,10 @@ var SocketClient = /*#__PURE__*/function () {
             break;
           case SocketClientTypes.ResponseCode.paramError:
             this._onError(new Error('参数缺失或错误'));
+          default:
+            (_this$listeners$unkno = this.listeners['unknownCode']) === null || _this$listeners$unkno === void 0 ? void 0 : _this$listeners$unkno.forEach(function (handle) {
+              handle.call(undefined, res);
+            });
         }
       } else if (res.type === SocketClientTypes.RequestType.pong) {
         return;
@@ -191,7 +196,8 @@ var SocketClient = /*#__PURE__*/function () {
     value: function removeListener(event, handle) {
       var _this3 = this;
       if (handle) {
-        this.listeners[event].forEach(function (item, i) {
+        var _this$listeners$event;
+        (_this$listeners$event = this.listeners[event]) === null || _this$listeners$event === void 0 ? void 0 : _this$listeners$event.forEach(function (item, i) {
           if (item === handle) {
             _this3.listeners[event].splice(i, 1);
           }
@@ -201,9 +207,9 @@ var SocketClient = /*#__PURE__*/function () {
       }
     }
   }, {
-    key: "getToken",
+    key: "_getToken",
     value: function () {
-      var _getToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _getToken2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
         var res;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -224,21 +230,23 @@ var SocketClient = /*#__PURE__*/function () {
           }
         }, _callee, this);
       }));
-      function getToken() {
-        return _getToken.apply(this, arguments);
+      function _getToken() {
+        return _getToken2.apply(this, arguments);
       }
-      return getToken;
+      return _getToken;
     }()
   }, {
     key: "open",
     value: function open(url, params) {
       var _this4 = this;
-      this.getToken().then(function (token) {
+      this._getToken().then(function (token) {
         _this4.params = params || _this4.params;
+        _this4.token = token;
         if (_this4.client) _this4.close();
         var paramUrl = ["socketToken=".concat(token)];
         if (_this4.params) {
-          Object.keys(_this4.params || {}).forEach(function (key) {
+          var _Object$keys;
+          (_Object$keys = Object.keys(_this4.params || {})) === null || _Object$keys === void 0 ? void 0 : _Object$keys.forEach(function (key) {
             if (_.isObject(_this4.params[key]) || _.isArray(_this4.params[key])) {
               paramUrl.push("".concat(key, "=").concat(JSON.stringify(_this4.params[key])));
             } else {
@@ -285,6 +293,11 @@ var SocketClient = /*#__PURE__*/function () {
     value: function openLog(open) {
       this.showLog = open;
     }
+  }, {
+    key: "getToken",
+    value: function getToken() {
+      return this.token;
+    }
   }]);
   return SocketClient;
 }();

package/es/utils/ajax.js

@@ -62,7 +62,6 @@ function responseErrorHandler(url, apiResult, errorTitle, notifyType) {
   if (new RegExp("".concat(ResponseStatus.success, "$")).test(apiResult.code)) {
     flag = true;
   } else if (new RegExp("".concat(ResponseStatus.notLogin)).test(apiResult.code)) {
-    flag = true;
     message = '账户未登录或登录已失效';
   } else if (new RegExp("".concat(ResponseStatus.noPermission)).test(apiResult.code)) {
     window.location.href = '/webapp/app/noPermission';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.35-idmapping.0",
+  "version": "1.1.35",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -59,5 +59,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "b3f96c573e7f19d6979c7639058c1d1bd07382a1"
+  "gitHead": "3d79ca5a2961f8d7a99156d3a3cb71d6274bf83e"
 }