@zgfe/business-lib 1.1.34-alpha.17 → 1.1.34-alpha.19

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/constants/apis.d.ts

@@ -8,5 +8,10 @@ declare const Apis: {
     queryDatasetList: string;
     queryDatasetDetail: string;
     getSocketToken: string;
+    bizDataTypeList: string;
+    orderAttributeMaster: string;
+    orderAttributeSon: string;
+    bizDataAttrList: string;
+    dataAttrValue: string;
 };
 export default Apis;

package/es/constants/apis.js

@@ -7,6 +7,11 @@ var Apis = {
   queryPanelGroup: '/apppanel/panels.jsp',
   queryDatasetList: '/zg/web/cdp/inner/dataset/list',
   queryDatasetDetail: '/zg/web/cdp/inner/dataset/detail',
-  getSocketToken: '/zg/web/v2/tracking/view/websocket/token'
+  getSocketToken: '/zg/web/v2/tracking/view/websocket/token',
+  bizDataTypeList: '/cep-console/api/v1/bizdata/type/list',
+  orderAttributeMaster: '/cep-console/api/v1/cdp/orderAttribute/master',
+  orderAttributeSon: '/cep-console/api/v1/cdp/orderAttribute/son',
+  bizDataAttrList: '/cep-console/api/v1/bizdata/attr/list',
+  dataAttrValue: '/cep-console/api/v1/es/data/attr/value'
 };
 export default Apis;

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;
@@ -25,6 +25,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?: {

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/userCondition/conditions/business/operatorCondition.js

@@ -17,8 +17,9 @@ import { classPrefix } from '../..';
 import { computeTypeList } from '../../../attrConditions/utils/operates';
 import request from '../../../utils/ajax';
 import BizGlobalDataContext from '../../../context';
+import Apis from '../../../constants/apis';
 var OperatorCondition = function OperatorCondition(props) {
-  var _condition$attrs$inde, _condition$paramsList;
+  var _condition$attrs$inde, _condition$attrs$inde2, _condition$paramsList;
   var condition = props.condition,
     index = props.index,
     stringOperateList = props.stringOperateList,
@@ -36,7 +37,7 @@ var OperatorCondition = function OperatorCondition(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     searchValue = _useState6[0],
     setSearchValue = _useState6[1];
-  var obj = (_condition$attrs$inde = condition.attrs[index]) === null || _condition$attrs$inde === void 0 ? void 0 : _condition$attrs$inde.params.map(function (item) {
+  var obj = (_condition$attrs$inde = condition.attrs[index]) === null || _condition$attrs$inde === void 0 ? void 0 : (_condition$attrs$inde2 = _condition$attrs$inde.params) === null || _condition$attrs$inde2 === void 0 ? void 0 : _condition$attrs$inde2.map(function (item) {
     return {
       name: item,
       value: item
@@ -59,7 +60,7 @@ var OperatorCondition = function OperatorCondition(props) {
   }, [queryValueObj]);
   function queryValueList(keyword, operate) {
     var fetch = function fetch() {
-      request('/cep-console/api/v1/es/data/attr/value', {
+      request(Apis.dataAttrValue, {
         method: 'post',
         data: {
           appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
@@ -73,10 +74,11 @@ var OperatorCondition = function OperatorCondition(props) {
         }
       }).then(function (res) {
         if (res.data) {
+          var _res$data;
           var isString = function isString(val) {
             return typeof val === 'string';
           };
-          var list = res.data.map(function (item) {
+          var list = (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.map(function (item) {
             return {
               name: !isString(item) ? JSON.stringify(item) : item,
               value: !isString(item) ? JSON.stringify(item) : item
@@ -112,13 +114,13 @@ var OperatorCondition = function OperatorCondition(props) {
   };
   var onParamsChange = function onParamsChange(operate) {
     if (operate.length > 0) {
-      var _obj = operate.map(function (item) {
+      var _obj = operate === null || operate === void 0 ? void 0 : operate.map(function (item) {
         return {
           name: item.name,
           value: item.value
         };
       });
-      var params = operate.map(function (item) {
+      var params = operate === null || operate === void 0 ? void 0 : operate.map(function (item) {
         return item.value;
       });
       if (!(condition === null || condition === void 0 ? void 0 : condition.typeId)) {

package/es/userCondition/conditions/business/paramsCondition.js

@@ -27,7 +27,7 @@ var ParamsCondition = function ParamsCondition(props) {
   function onDateChange(newData) {
     if (condition.attrs[index].operator === 'absolute') {
       var dateRange = newData;
-      var newValues = dateRange.map(function (date) {
+      var newValues = dateRange === null || dateRange === void 0 ? void 0 : dateRange.map(function (date) {
         return date.format('YYYY-MM-DD');
       });
       condition.attrs[index].params = newValues;

package/es/userCondition/conditions/businessCondition.js

@@ -22,8 +22,9 @@ import DataAttribute from './dataAttribute';
 import IconFont from '../../icon/iconFont';
 import BizGlobalDataContext from '../../context';
 import RunPeriodCondition from './order/runPeriodCondition';
+import Apis from '../../constants/apis';
 var BusinessCondition = function BusinessCondition(props) {
-  var _condition$timeDimens, _condition$timeDimens3, _condition$timeDimens4, _condition$attrs;
+  var _condition$timeDimens, _condition$timeDimens3, _condition$attrs, _condition$timeDimens4, _condition$attrs2;
   var condition = props.condition,
     dataId = props.dataId,
     label = props.label;
@@ -68,14 +69,12 @@ var BusinessCondition = function BusinessCondition(props) {
     serviceAttributeList = _useState6[0],
     setServiceAttributeList = _useState6[1];
   function queryServiceAttributeList() {
-    request("/cep-console/api/v1/bizdata/type/list/".concat(currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId), {
-      headers: {
-        'Content-Type': 'application/json'
-      },
+    request(Apis.bizDataTypeList + "/".concat(currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId), {
       method: 'get'
     }).then(function (res) {
       if (res.data) {
-        var list = res.data.map(function (item) {
+        var _res$data;
+        var list = (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.map(function (item) {
           return {
             name: item.typeName,
             value: item.id
@@ -203,10 +202,10 @@ var BusinessCondition = function BusinessCondition(props) {
       onClick: function onClick() {
         return onTimeDimensionsDelete(index);
       }
-    }, ' ', /*#__PURE__*/React.createElement(IconFont, {
+    }, /*#__PURE__*/React.createElement(IconFont, {
       type: "qingchu"
-    }), ' ')));
-  }), condition.attrs.map(function (_item, index) {
+    }))));
+  }), (_condition$attrs = condition.attrs) === null || _condition$attrs === void 0 ? void 0 : _condition$attrs.map(function (_item, index) {
     return /*#__PURE__*/React.createElement("div", {
       style: {
         margin: '10px 0 0 65px'
@@ -230,10 +229,10 @@ var BusinessCondition = function BusinessCondition(props) {
       onClick: function onClick() {
         return onAttrsDelete(index);
       }
-    }, ' ', /*#__PURE__*/React.createElement(IconFont, {
+    }, /*#__PURE__*/React.createElement(IconFont, {
       type: "qingchu"
-    }), ' ')));
-  }), condition.typeId && label === '业务数据' || label === '订单数据' ? /*#__PURE__*/React.createElement("div", null, ((_condition$timeDimens4 = condition.timeDimensions) === null || _condition$timeDimens4 === void 0 ? void 0 : _condition$timeDimens4.length) !== 3 || ((_condition$attrs = condition.attrs) === null || _condition$attrs === void 0 ? void 0 : _condition$attrs.length) !== 6 ? /*#__PURE__*/React.createElement("div", {
+    }))));
+  }), condition.typeId && label === '业务数据' || label === '订单数据' ? /*#__PURE__*/React.createElement("div", null, ((_condition$timeDimens4 = condition.timeDimensions) === null || _condition$timeDimens4 === void 0 ? void 0 : _condition$timeDimens4.length) !== 3 || ((_condition$attrs2 = condition.attrs) === null || _condition$attrs2 === void 0 ? void 0 : _condition$attrs2.length) !== 6 ? /*#__PURE__*/React.createElement("div", {
     style: {
       margin: '2px 0 0 65px',
       color: '#4075fd',
@@ -248,6 +247,6 @@ var BusinessCondition = function BusinessCondition(props) {
     onClick: function onClick(e) {
       return e.preventDefault();
     }
-  }, ' ', /*#__PURE__*/React.createElement(Space, null, "\u9AD8\u7EA7\u7B5B\u9009 ", /*#__PURE__*/React.createElement(DownOutlined, null), ' ')))) : null) : null);
+  }, /*#__PURE__*/React.createElement(Space, null, "\u9AD8\u7EA7\u7B5B\u9009 ", /*#__PURE__*/React.createElement(DownOutlined, null))))) : null) : null);
 };
 export default BusinessCondition;

package/es/userCondition/conditions/dataAttribute.js

@@ -20,6 +20,7 @@ import request from '../../utils/ajax';
 import BizGlobalDataContext from '../../context';
 import ParamsCondition from './business/paramsCondition';
 import OperatorCondition from './business/operatorCondition';
+import Apis from '../../constants/apis';
 var DataAttribute = function DataAttribute(props) {
   var _condition$paramsList, _condition$paramsList2;
   var condition = props.condition,
@@ -67,7 +68,7 @@ var DataAttribute = function DataAttribute(props) {
     }
   }, [condition === null || condition === void 0 ? void 0 : condition.typeId]);
   function queryAppList(type) {
-    request(type === 'master' ? '/cep-console/api/v1/cdp/orderAttribute/master' : '/cep-console/api/v1/cdp/orderAttribute/son', {
+    request(type === 'master' ? Apis.orderAttributeMaster : Apis.orderAttributeSon, {
       method: 'post',
       data: {
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
@@ -76,11 +77,10 @@ var DataAttribute = function DataAttribute(props) {
       }
     }).then(function (res) {
       if (res.data) {
-        var _list = res.data.map(function (item) {
+        var _res$data;
+        var _list = (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.map(function (item) {
           return _objectSpread(_objectSpread({}, item), {}, {
-            name: item.name,
-            value: item.id,
-            columnName: item.columnName
+            value: item.id
           });
         });
         setMasterList(_list);
@@ -96,14 +96,15 @@ var DataAttribute = function DataAttribute(props) {
     onChange(_objectSpread({}, condition));
   }
   function queryBizDataAttrList(bizDataTypeId) {
-    request('/cep-console/api/v1/bizdata/attr/list', {
+    request(Apis.bizDataAttrList, {
       method: 'post',
       data: {
         bizDataTypeId: bizDataTypeId
       }
     }).then(function (res) {
       if (res.data) {
-        var _list2 = res.data.map(function (item) {
+        var _res$data2;
+        var _list2 = (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.map(function (item) {
           return _objectSpread(_objectSpread({}, item), {}, {
             value: item.id
           });
@@ -122,9 +123,11 @@ var DataAttribute = function DataAttribute(props) {
   }
   var onOrderTypeListChange = function onOrderTypeListChange(operate) {
     if (condition === null || condition === void 0 ? void 0 : condition.typeId) {
-      condition.attrs[index].category = 'custom';
-      condition.attrs[index].attrId = operate.id;
-      condition.attrs[index].attrName = operate.name;
+      condition.attrs[index] = _objectSpread(_objectSpread({}, condition.attrs[index]), {}, {
+        category: 'custom',
+        attrId: operate.id,
+        attrName: operate.name
+      });
       switch (operate.propType) {
         case 1:
           setMasterList(typeList['cont-string']);
@@ -152,6 +155,7 @@ var DataAttribute = function DataAttribute(props) {
     onChange(_objectSpread({}, condition));
   };
   var onMasterListChange = function onMasterListChange(operate) {
+    condition.attrs[index].params = [];
     if (!(condition === null || condition === void 0 ? void 0 : condition.typeId)) {
       switch (operate.propType) {
         case 1:
@@ -176,18 +180,22 @@ var DataAttribute = function DataAttribute(props) {
           }
           break;
       }
-      condition.attrs[index].attrId = operate.id;
-      condition.attrs[index].computeType = 'origin';
-      condition.attrs[index].attrName = operate.name;
-      condition.attrs[index].attrMaping = operate.columnName;
-      condition.attrs[index].operator = '';
+      condition.attrs[index] = _objectSpread(_objectSpread({}, condition.attrs[index]), {}, {
+        attrId: operate.id,
+        computeType: 'origin',
+        attrName: operate.name,
+        attrMaping: operate.columnName,
+        operator: ''
+      });
     } else {
       switch (condition.attrs[index].attrType) {
         case 'cont-string':
         case 'cont-date':
-          condition.attrs[index].operator = operate.value;
-          condition.attrs[index].computeType = 'origin';
-          condition.attrs[index].params = [];
+          condition.attrs[index] = _objectSpread(_objectSpread({}, condition.attrs[index]), {}, {
+            operator: operate.value,
+            computeType: 'origin',
+            params: []
+          });
           if (condition.attrs[index].operator === 'absolute' && condition.attrs[index].attrType === 'cont-date') {
             var _endDate = moment().format('YYYY-MM-DD');
             var _startDate = moment().subtract(7, 'days').format('YYYY-MM-DD');
@@ -201,7 +209,7 @@ var DataAttribute = function DataAttribute(props) {
     }
     onChange(_objectSpread({}, condition));
   };
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-runtimes-condition")
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-period-condition-operator")
@@ -238,6 +246,6 @@ var DataAttribute = function DataAttribute(props) {
     index: index,
     condition: condition,
     onChange: onChange
-  })));
+  }));
 };
 export default DataAttribute;

package/es/userCondition/conditions/order/runTimesCondition.js

@@ -10,7 +10,7 @@ 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, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { Input } from 'antd';
 import '../styles/periodCondition.less';
 import { classPrefix } from '../..';
@@ -20,10 +20,17 @@ var RunTimesCondition = function RunTimesCondition(props) {
   var onChange = props.onChange,
     index = props.index,
     condition = props.condition;
-  var _useState = useState(index !== undefined ? condition === null || condition === void 0 ? void 0 : condition.timeDimensions[index].frequencyOperator : condition === null || condition === void 0 ? void 0 : condition.runTimes.operator),
+  var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     operator = _useState2[0],
     setOperator = _useState2[1];
+  useEffect(function () {
+    if (index !== undefined) {
+      setOperator(condition === null || condition === void 0 ? void 0 : condition.timeDimensions[index].frequencyOperator);
+    } else {
+      setOperator(condition === null || condition === void 0 ? void 0 : condition.runTimes.operator);
+    }
+  }, [index]);
   var onOperateChange = function onOperateChange(operate) {
     if (index !== undefined) {
       condition.timeDimensions[index].frequencyOperator = operate.value;
@@ -31,13 +38,10 @@ var RunTimesCondition = function RunTimesCondition(props) {
       onChange(_objectSpread({}, condition));
     } else {
       condition.runTimes.values = [Number(condition.runTimes.values[0])];
-      onChange(_objectSpread(_objectSpread({}, condition), {}, {
-        runTimes: _objectSpread(_objectSpread({}, condition.runTimes), {}, {
-          operator: operate.value
-        })
-      }));
+      condition.runTimes.operator = operate.value;
+      onChange(_objectSpread({}, condition));
     }
-    setOperator(index !== undefined ? condition.timeDimensions[index].frequencyOperator : condition.runTimes.operator);
+    setOperator(operate.value);
   };
   var onOperateInput0Change = function onOperateInput0Change(value) {
     var newValue = value.target.value;

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,63 +1,63 @@
 {
-    "name": "@zgfe/business-lib",
-    "version": "1.1.34-alpha.17",
-    "scripts": {
-        "start": "dumi dev",
-        "docs:build": "dumi build",
-        "docs:deploy": "gh-pages -d docs-dist",
-        "build": "father-build",
-        "deploy": "npm run docs:build && npm run docs:deploy",
-        "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
-        "test": "umi-test",
-        "test:coverage": "umi-test --coverage",
-        "prepublishOnly": "npm run build",
-        "pub": "lerna publish"
-    },
-    "module": "es/index.js",
-    "typings": "es/index.d.ts",
-    "gitHooks": {
-        "pre-commit": "lint-staged"
-    },
-    "files": [
-        "es"
+  "name": "@zgfe/business-lib",
+  "version": "1.1.34-alpha.19",
+  "scripts": {
+    "start": "dumi dev",
+    "docs:build": "dumi build",
+    "docs:deploy": "gh-pages -d docs-dist",
+    "build": "father-build",
+    "deploy": "npm run docs:build && npm run docs:deploy",
+    "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
+    "test": "umi-test",
+    "test:coverage": "umi-test --coverage",
+    "prepublishOnly": "npm run build",
+    "pub": "lerna publish"
+  },
+  "module": "es/index.js",
+  "typings": "es/index.d.ts",
+  "gitHooks": {
+    "pre-commit": "lint-staged"
+  },
+  "files": [
+    "es"
+  ],
+  "lint-staged": {
+    "*.{js,jsx,less,md,json}": [
+      "prettier --write"
     ],
-    "lint-staged": {
-        "*.{js,jsx,less,md,json}": [
-            "prettier --write"
-        ],
-        "*.ts?(x)": [
-            "prettier --parser=typescript --write"
-        ]
-    },
-    "dependencies": {
-        "@types/js-cookie": "^3.0.2",
-        "@types/qs": "^6.9.7",
-        "axios": "^0.26.1",
-        "babel-plugin-import": "^1.13.3",
-        "echarts": "^5.3.2",
-        "echarts-for-react": "^3.0.2",
-        "js-cookie": "^3.0.1",
-        "lerna": "^4.0.0",
-        "rc-virtual-list": "^3.4.8",
-        "react-infinite-scroll-component": "^6.1.0",
-        "umi-request": "^1.4.0"
-    },
-    "devDependencies": {
-        "@testing-library/jest-dom": "^5.15.1",
-        "@testing-library/react": "^12.1.2",
-        "@types/jest": "^27.0.3",
-        "@types/lodash": "^4.14.182",
-        "@umijs/fabric": "^2.8.1",
-        "@umijs/test": "^3.0.5",
-        "antd": "^4.22.8",
-        "dumi": "^1.1.0",
-        "father-build": "^1.17.2",
-        "gh-pages": "^3.0.0",
-        "lint-staged": "^10.0.7",
-        "lodash": "^4.17.21",
-        "prettier": "^2.2.1",
-        "react": "^16.12.0 || ^17.0.0",
-        "yorkie": "^2.0.0"
-    },
-    "gitHead": "b2e287ebcfeaa841e1f4e10bd9891e58f3223e95"
+    "*.ts?(x)": [
+      "prettier --parser=typescript --write"
+    ]
+  },
+  "dependencies": {
+    "@types/js-cookie": "^3.0.2",
+    "@types/qs": "^6.9.7",
+    "axios": "^0.26.1",
+    "babel-plugin-import": "^1.13.3",
+    "echarts": "^5.3.2",
+    "echarts-for-react": "^3.0.2",
+    "js-cookie": "^3.0.1",
+    "lerna": "^4.0.0",
+    "rc-virtual-list": "^3.4.8",
+    "react-infinite-scroll-component": "^6.1.0",
+    "umi-request": "^1.4.0"
+  },
+  "devDependencies": {
+    "@testing-library/jest-dom": "^5.15.1",
+    "@testing-library/react": "^12.1.2",
+    "@types/jest": "^27.0.3",
+    "@types/lodash": "^4.14.182",
+    "@umijs/fabric": "^2.8.1",
+    "@umijs/test": "^3.0.5",
+    "antd": "^4.22.8",
+    "dumi": "^1.1.0",
+    "father-build": "^1.17.2",
+    "gh-pages": "^3.0.0",
+    "lint-staged": "^10.0.7",
+    "lodash": "^4.17.21",
+    "prettier": "^2.2.1",
+    "react": "^16.12.0 || ^17.0.0",
+    "yorkie": "^2.0.0"
+  },
+  "gitHead": "b2e287ebcfeaa841e1f4e10bd9891e58f3223e95"
 }