@zgfe/business-lib 1.2.70-hxd.9 → 1.2.71-hxd.1

package/es/userTagsSelector/components/search/index.less

@@ -1,6 +1,6 @@
-@import '../../../assets/styles/variable.less';
-.biz-user-tags-selector {
-  &-drop-panel-search {
-    margin-bottom: @margin-xs;
-  }
-}
+@import '../../../assets/styles/variable.less';
+.biz-user-tags-selector {
+  &-drop-panel-search {
+    margin-bottom: @margin-xs;
+  }
+}

package/es/userTagsSelector/components/tagList/index.d.ts

@@ -1,7 +1,10 @@
 import React from 'react';
 import { UserTagsSelectorTypes } from '../../types';
 import './index.less';
-declare const TagListScroll: React.FC<{
+type FCWithDefaultProps<P> = React.FC<P> & {
+    defaultProps?: Partial<P>;
+};
+declare const TagListScroll: FCWithDefaultProps<{
     id: number;
     value: UserTagsSelectorTypes.TagValue[];
     total: number;

package/es/userTagsSelector/components/tagList/index.less

@@ -1,13 +1,13 @@
-@import '../../../assets/styles/variable.less';
-.biz-user-tags-selector {
-  &-list-container {
-    max-height: 360px;
-    overflow: auto;
-  }
-  &-list-container-loading {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 40px;
-  }
-}
+@import '../../../assets/styles/variable.less';
+.biz-user-tags-selector {
+  &-list-container {
+    max-height: 360px;
+    overflow: auto;
+  }
+  &-list-container-loading {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 40px;
+  }
+}

package/es/userTagsSelector/groups/index.d.ts

@@ -1,4 +1,7 @@
 import React from 'react';
 import { UserTagsSelectorTypes } from '../types';
-declare const Groups: React.FC<UserTagsSelectorTypes.Groups>;
+type FCWithDefaultProps<P> = React.FC<P> & {
+    defaultProps?: Partial<P>;
+};
+declare const Groups: FCWithDefaultProps<UserTagsSelectorTypes.Groups>;
 export default Groups;

package/es/userTagsSelector/groups/styles/option.less

@@ -1,55 +1,55 @@
-@import '../../../assets/styles/inner.less';
-.biz-user-tags-selector {
-  &-group-option {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    height: @height-base;
-    padding: 0 16px;
-    border-radius: @border-radius-normal;
-
-    cursor: pointer;
-    &-label {
-      .__default-overflow();
-      margin-right: @margin-xs;
-    }
-    &-count {
-      .ant-badge-count {
-        color: @text-color;
-        background: none;
-      }
-    }
-    &.checked {
-      color: @primary-color;
-      .biz-user-tags-selector-group-option-count {
-        .ant-badge-count {
-          color: @primary-color;
-        }
-      }
-    }
-    &:hover {
-      .__default-hover();
-      .biz-user-tags-selector-group-option-count {
-        .ant-badge-count {
-          color: #fff;
-          background: @primary-color;
-        }
-      }
-    }
-    &.active {
-      color: #fff !important;
-      background: @primary-color;
-      .biz-user-tags-selector-group-option-count {
-        .ant-badge-count {
-          color: #fff;
-          background: @primary-color;
-        }
-      }
-      .biz-user-tags-selector-group-option-label {
-        * {
-          color: #fff !important;
-        }
-      }
-    }
-  }
-}
+@import '../../../assets/styles/inner.less';
+.biz-user-tags-selector {
+  &-group-option {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    height: @height-base;
+    padding: 0 16px;
+    border-radius: @border-radius-normal;
+
+    cursor: pointer;
+    &-label {
+      .__default-overflow();
+      margin-right: @margin-xs;
+    }
+    &-count {
+      .ant-badge-count {
+        color: @text-color;
+        background: none;
+      }
+    }
+    &.checked {
+      color: @primary-color;
+      .biz-user-tags-selector-group-option-count {
+        .ant-badge-count {
+          color: @primary-color;
+        }
+      }
+    }
+    &:hover {
+      .__default-hover();
+      .biz-user-tags-selector-group-option-count {
+        .ant-badge-count {
+          color: #fff;
+          background: @primary-color;
+        }
+      }
+    }
+    &.active {
+      color: #fff !important;
+      background: @primary-color;
+      .biz-user-tags-selector-group-option-count {
+        .ant-badge-count {
+          color: #fff;
+          background: @primary-color;
+        }
+      }
+      .biz-user-tags-selector-group-option-label {
+        * {
+          color: #fff !important;
+        }
+      }
+    }
+  }
+}

package/es/userTagsSelector/index.d.ts

@@ -2,5 +2,8 @@ import React from 'react';
 import './styles/index.less';
 import { UserTagsSelectorTypes } from './types';
 export declare const classPrefix = "biz-user-tags-selector";
-declare const UserTagsSelect: React.FC<UserTagsSelectorTypes.Props>;
+type FCWithDefaultProps<P> = React.FC<P> & {
+    defaultProps?: Partial<P>;
+};
+declare const UserTagsSelect: FCWithDefaultProps<UserTagsSelectorTypes.Props>;
 export default UserTagsSelect;

package/es/userTagsSelector/index.js

@@ -11,12 +11,13 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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, { useEffect, useState } from 'react';
-import { Dropdown } from 'antd';
+import { Dropdown, Tooltip } from 'antd';
 import SelectHandle from '../select/handle';
 import CascaderOverlay from './cascaderOverlay';
 import './styles/index.less';
 import { useMemo } from 'react';
 import { util } from '../utils';
+import IconFont from '../icon/iconFont';
 import _ from 'lodash';
 import { LabelCreateType } from '../userCondition/types';
 export var classPrefix = 'biz-user-tags-selector';
@@ -36,6 +37,10 @@ var UserTagsSelect = function UserTagsSelect(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     visible = _useState4[0],
     setVisible = _useState4[1];
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    errorTextShow = _useState6[0],
+    setErrorTextShow = _useState6[1];
   var handleValue = useMemo(function () {
     return currentValue.map(function (item) {
       var pre = item[item.length - 2];
@@ -48,6 +53,21 @@ var UserTagsSelect = function UserTagsSelect(props) {
       return res;
     });
   }, [currentValue]);
+  useEffect(function () {
+    if (handleValue.length > 0) {
+      var _error = 0;
+      handleValue.map(function (item) {
+        if (item.ancestryState && item.ancestryState !== 1) {
+          _error++;
+        }
+      });
+      if (_error !== 0) {
+        setErrorTextShow(true);
+      } else {
+        setErrorTextShow(false);
+      }
+    }
+  }, [handleValue]);
   useEffect(function () {
     setCurrentValue(util.isArray(defaultValue) ? defaultValue : []);
   }, [defaultValue]);
@@ -104,7 +124,17 @@ var UserTagsSelect = function UserTagsSelect(props) {
     size: "middle",
     placeholder: "\u9009\u62E9\u6807\u7B7E",
     onDelete: onDelete
-  }))));
+  }), errorTextShow && /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-handle-errortext")
+  }, /*#__PURE__*/React.createElement(Tooltip, {
+    title: "\u6807\u7B7E\u5F02\u5E38\u5B58\u5728\u591A\u79CD\u539F\u56E0\uFF08\u5982\u6807\u7B7E\u88AB\u5220\u9664\uFF09\uFF0C\u5177\u4F53\u539F\u56E0\u8BF7\u524D\u5F80\u6807\u7B7E\u5217\u8868\u67E5\u8BE2"
+  }, "\u6807\u7B7E\u5F02\u5E38\uFF0C\u8BF7\u91CD\u65B0\u9009\u62E9", /*#__PURE__*/React.createElement(IconFont, {
+    style: {
+      color: '#FB5547',
+      cursor: 'pointer'
+    },
+    type: "a-iconzhuyi"
+  }))))));
 };
 UserTagsSelect.defaultProps = {
   destroyPopupOnHide: false,

package/es/userTagsSelector/multipleCheckPanel/styles/option.less

@@ -1,40 +1,40 @@
-@import '../../../assets/styles/inner.less';
-.biz-user-tags-selector {
-  &-check-option {
-    display: flex;
-    align-items: center;
-    height: @height-base;
-    padding: 0 12px;
-    border-radius: @border-radius-normal;
-    &:hover {
-      .__default-hover();
-    }
-    &-label {
-      flex: 1;
-      min-width: 0;
-      height: @height-base;
-      line-height: @height-base;
-      .__default-overflow();
-    }
-    &&-disabled {
-      .__default-disabled();
-    }
-    .ant-checkbox-wrapper {
-      width: 100%;
-      min-width: 0;
-      > span {
-        &:not(.ant-checkbox) {
-          flex: 1;
-          min-width: 0;
-        }
-      }
-      .ant-checkbox-checked {
-        & + span {
-          .biz-user-tags-selector-check-option-label {
-            color: @primary-color;
-          }
-        }
-      }
-    }
-  }
-}
+@import '../../../assets/styles/inner.less';
+.biz-user-tags-selector {
+  &-check-option {
+    display: flex;
+    align-items: center;
+    height: @height-base;
+    padding: 0 12px;
+    border-radius: @border-radius-normal;
+    &:hover {
+      .__default-hover();
+    }
+    &-label {
+      flex: 1;
+      min-width: 0;
+      height: @height-base;
+      line-height: @height-base;
+      .__default-overflow();
+    }
+    &&-disabled {
+      .__default-disabled();
+    }
+    .ant-checkbox-wrapper {
+      width: 100%;
+      min-width: 0;
+      > span {
+        &:not(.ant-checkbox) {
+          flex: 1;
+          min-width: 0;
+        }
+      }
+      .ant-checkbox-checked {
+        & + span {
+          .biz-user-tags-selector-check-option-label {
+            color: @primary-color;
+          }
+        }
+      }
+    }
+  }
+}

package/es/userTagsSelector/styles/cascaderOverlay.less

@@ -1,34 +1,34 @@
-@import '../../assets/styles/inner.less';
-.biz-user-tags-selector {
-  &-overlay {
-    max-height: 425px;
-    background-color: #fff;
-    border-radius: @border-radius-normal;
-    box-shadow: @box-shadow-base;
-    &-search {
-      padding: @margin-xs @margin-xs 0;
-    }
-    &-panel {
-      display: flex;
-    }
-    &-groups {
-      width: 204px;
-      padding: @margin-xs;
-      border-right: 1px solid @border-color-base;
-      &:last-of-type {
-        border-right: none;
-      }
-    }
-    &-selections {
-      width: 204px;
-      min-width: 0;
-      padding: @padding-xs;
-    }
-    // .rc-virtual-list-scrollbar {
-    //   display: block !important;
-    // }
-    // .rc-virtual-list-scrollbar-thumb {
-    //   background-color: #cacdd4 !important;
-    // }
-  }
-}
+@import '../../assets/styles/inner.less';
+.biz-user-tags-selector {
+  &-overlay {
+    max-height: 425px;
+    background-color: #fff;
+    border-radius: @border-radius-normal;
+    box-shadow: @box-shadow-base;
+    &-search {
+      padding: @margin-xs @margin-xs 0;
+    }
+    &-panel {
+      display: flex;
+    }
+    &-groups {
+      width: 204px;
+      padding: @margin-xs;
+      border-right: 1px solid @border-color-base;
+      &:last-of-type {
+        border-right: none;
+      }
+    }
+    &-selections {
+      width: 204px;
+      min-width: 0;
+      padding: @padding-xs;
+    }
+    // .rc-virtual-list-scrollbar {
+    //   display: block !important;
+    // }
+    // .rc-virtual-list-scrollbar-thumb {
+    //   background-color: #cacdd4 !important;
+    // }
+  }
+}

package/es/userTagsSelector/styles/index.less

@@ -1,10 +1,20 @@
-@import '../../assets/styles/inner.less';
-.biz-user-tags-selector {
-  > .ant-dropdown-trigger.biz-user-tags-selector-handle {
-    > .biz-select-handle-input-multiple {
-      .ant-input.biz-select-handle-search {
-        height: auto !important;
-      }
-    }
-  }
-}
+@import '../../assets/styles/inner.less';
+.biz-user-tags-selector {
+  > .ant-dropdown-trigger.biz-user-tags-selector-handle {
+    > .biz-select-handle-input-multiple {
+      .ant-input.biz-select-handle-search {
+        height: auto !important;
+      }
+    }
+  }
+  &-handle-errortext {
+    display: flex;
+    gap: 2px;
+    align-items: center;
+    color: #fb5547;
+    font-size: 12px;
+    .bsicon {
+      font-size: 14px;
+    }
+  }
+}

package/es/userTagsSelector/types.d.ts

@@ -11,6 +11,7 @@ export declare namespace UserTagsSelectorTypes {
         layers?: Layer[];
         labelGroup?: string;
         labelGroupId?: number;
+        ancestryState?: number;
     }
     interface Layer {
         layerLabelId?: number | string;
@@ -18,6 +19,7 @@ export declare namespace UserTagsSelectorTypes {
         layerRemark?: string;
         layerCondition?: any[][];
         sequence?: number;
+        ancestryState?: any;
     }
     type Value = [BaseGroup, Tag, Layer?][];
     interface Props {

package/es/userTagsSelector/util.d.ts

@@ -1,3 +1,4 @@
+export declare function repeatMergeHandle(userTagsData: any, oldData: any, newData: any): any;
 export declare function curry(fn: Function): (...arg1: any[]) => (...arg2: any[]) => any;
 export declare function filterFactory(labelField: string, searchValue: string): (item: any) => boolean;
 export declare function isCheckedFactory(currentValue: any[], level: number): (option: any, valueFiled: string) => boolean;

package/es/userTagsSelector/util.js

@@ -1,5 +1,25 @@
 import _ from 'lodash';
 import { LabelCreateType } from '../userCondition/types';
+export function repeatMergeHandle(userTagsData, oldData, newData) {
+  var _ids = [],
+    data = [];
+  userTagsData.map(function (item) {
+    _ids.push(item.id);
+  });
+  oldData.map(function (item) {
+    if (_ids.indexOf(item.id) === -1) {
+      _ids.push(item.id);
+      data.push(item);
+    }
+  });
+  newData.map(function (item) {
+    if (_ids.indexOf(item.id) === -1) {
+      _ids.push(item.id);
+      data.push(item);
+    }
+  });
+  return data;
+}
 export function curry(fn) {
   return function () {
     for (var _len = arguments.length, arg1 = new Array(_len), _key = 0; _key < _len; _key++) {

package/es/utils/ajax.js

@@ -7,6 +7,7 @@ import { notification, message } from 'antd';
 import { globalConfig } from '../config';
 import { ResponseStatus } from './type';
 import util from './util';
+import _ from 'lodash';
 var codeMessage = {
   200: '服务器成功返回请求的数据。',
   201: '新建或修改数据成功。',
@@ -26,6 +27,7 @@ var codeMessage = {
 };
 var errorHandler = function errorHandler(error) {
   var response = error.response;
+  console.error('请求异常', error);
   if (response && response.status) {
     var errorText = codeMessage[response.status] || response.statusText;
     var status = response.status,
@@ -84,9 +86,11 @@ export function responseErrorHandler(url, apiResult, errorTitle, notifyType, int
     return apiResult;
   }
   if (!apiResult.code) {
-    notification.error({
-      message: "\u63A5\u53E3\u54CD\u5E94\u7ED3\u6784\u5F02\u5E38"
-    });
+    if (apiResult.status == 200) {
+      notification.error({
+        message: "\u63A5\u53E3\u54CD\u5E94\u7ED3\u6784\u5F02\u5E38"
+      });
+    }
     throw new Error('接口响应结构异常，缺少code');
   }
   var flag = false;
@@ -102,7 +106,8 @@ export function responseErrorHandler(url, apiResult, errorTitle, notifyType, int
   }
   if (!flag && intercept !== false) {
     msg = apiResult.msg || msg;
-    notification[notifyType || 'error']({
+    !notifyType && message.error(msg);
+    notifyType && notification[notifyType]({
       message: errorTitle || "\u8BF7\u6C42\u9519\u8BEF",
       description: msg
     });
@@ -119,7 +124,7 @@ function request(_x, _x2) {
 }
 function _request() {
   _request = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(url, options) {
-    var _globalConfig$request, _globalConfig$request2, _params$options, _params$options2, err, option, list, optionsWrapper, responseWrapper, params, res, _params$options3, _params$options4;
+    var _globalConfig$request, _globalConfig$request2, _params$options, _params$options2, _params$options5, _params$options6, err, option, list, optionsWrapper, responseWrapper, params, reqData, res, blobError, _params$options3, reader, _params$options4;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -152,59 +157,91 @@ function _request() {
           if (((_params$options = params.options) === null || _params$options === void 0 ? void 0 : _params$options.responseType) === 'blob') {
             params.options.getResponse = true;
           }
-          _context.next = 14;
-          return req(params.url, params.options);
-        case 14:
+          reqData = _.cloneDeepWith(params.options, function (value) {
+            if (value === null || value === void 0 ? void 0 : value.__ob__) {
+              Reflect.deleteProperty(value, '__ob__');
+              return value;
+            }
+          });
+          _context.next = 15;
+          return req(params.url, reqData);
+        case 15:
           res = _context.sent;
           if (res) {
-            _context.next = 17;
+            _context.next = 18;
             break;
           }
           throw new Error('Request Interruption');
-        case 17:
+        case 18:
+          blobError = false;
           if (!(((_params$options2 = params.options) === null || _params$options2 === void 0 ? void 0 : _params$options2.responseType) === 'blob')) {
-            _context.next = 27;
+            _context.next = 36;
             break;
           }
           if (!util.isBlob(res.data)) {
-            _context.next = 26;
+            _context.next = 35;
             break;
           }
           if (!(((_params$options3 = params.options) === null || _params$options3 === void 0 ? void 0 : _params$options3.downloadFile) === false)) {
-            _context.next = 23;
+            _context.next = 25;
             break;
           }
           return _context.abrupt("return", res.data);
-        case 23:
+        case 25:
+          if (!(res.data.type === 'application/json')) {
+            _context.next = 32;
+            break;
+          }
+          blobError = true;
+          reader = new FileReader();
+          reader.onload = function () {
+            var _JSON$parse = JSON.parse(reader === null || reader === void 0 ? void 0 : reader.result),
+              code = _JSON$parse.code,
+              msg = _JSON$parse.msg;
+            if (code !== 200) {
+              return message.error(msg);
+            }
+          };
+          reader.readAsText(res.data);
+          _context.next = 33;
+          break;
+        case 32:
           return _context.abrupt("return", ((_params$options4 = params.options) === null || _params$options4 === void 0 ? void 0 : _params$options4.isExcel) ? downloadFile1(res, params.options.fileName) : downloadFile(res, params.options.fileName));
-        case 24:
-          _context.next = 27;
+        case 33:
+          _context.next = 36;
           break;
-        case 26:
+        case 35:
           res = res.data;
-        case 27:
+        case 36:
+          if (!(((_params$options5 = params.options) === null || _params$options5 === void 0 ? void 0 : _params$options5.responseType) === 'blob' && ((_params$options6 = params.options) === null || _params$options6 === void 0 ? void 0 : _params$options6.downloadFile) !== false && blobError)) {
+            _context.next = 39;
+            break;
+          }
+          res.data = 'error';
+          return _context.abrupt("return", res.data);
+        case 39:
           return _context.abrupt("return", responseWrapper ? responseWrapper(url, responseErrorHandler(url, res, options === null || options === void 0 ? void 0 : options.errorTitle, options === null || options === void 0 ? void 0 : options.notifyType, options === null || options === void 0 ? void 0 : options.intercept)) : responseErrorHandler(url, res, options === null || options === void 0 ? void 0 : options.errorTitle, options === null || options === void 0 ? void 0 : options.notifyType, options === null || options === void 0 ? void 0 : options.intercept));
-        case 30:
-          _context.prev = 30;
+        case 42:
+          _context.prev = 42;
           _context.t0 = _context["catch"](0);
           if (!_context.t0.isCancel) {
-            _context.next = 34;
+            _context.next = 46;
             break;
           }
           throw _context.t0;
-        case 34:
+        case 46:
           if (!(_context.t0.message === 'Request Interruption')) {
-            _context.next = 36;
+            _context.next = 48;
             break;
           }
           throw new Error('Request Interruption');
-        case 36:
+        case 48:
           return _context.abrupt("return", null);
-        case 37:
+        case 49:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[0, 30]]);
+    }, _callee, null, [[0, 42]]);
   }));
   return _request.apply(this, arguments);
 }

package/es/utils/eventApi.d.ts

@@ -0,0 +1,14 @@
+export declare function fetchAllEvents(appId: string | number | undefined, platform?: number, isAll?: boolean): Promise<{}>;
+export declare function fetchEventAttrs(eventId: number, appId: string | number | undefined): Promise<{
+    alias: any;
+    eventId: number;
+    id: any;
+    isHidden: any;
+    key: string;
+    label: any;
+    propCategory: "eventProp";
+    type: any;
+    realTime: boolean;
+    dimensionSub: any;
+}[]>;
+export declare function fetchEventAttrByAttrId(attrId: string | number | undefined): Promise<{}>;