@zgfe/business-lib 1.1.82-user.3 → 1.1.82-user.5

package/es/attrCondition/group.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import useConditionGroup from './useConditionGroup';
-import { Skeleton, Space } from 'antd';
+import { Skeleton } from 'antd';
 import BizAttrCondition from '.';
 var BizAttrConditionGroup = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var showHandle = props.showHandle,
@@ -38,11 +38,12 @@ var BizAttrConditionGroup = /*#__PURE__*/React.forwardRef(function (props, ref)
     className: "".concat(classPrefix, "-operate-text ").concat(relation === 'and' || props.onlyAnd ? 'active' : '', " ").concat(props.onlyAnd ? 'only-and' : '')
   }, /*#__PURE__*/React.createElement("span", null, "\u4E14")), !props.onlyAnd && /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-operate-text ").concat(relation === 'or' ? 'active' : '')
-  }, /*#__PURE__*/React.createElement("span", null, "\u6216")))) : null, /*#__PURE__*/React.createElement(Space, {
-    className: "".concat(classPrefix, "-container"),
-    direction: "vertical"
+  }, /*#__PURE__*/React.createElement("span", null, "\u6216")))) : null, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-container")
   }, conditions.map(function (item, index) {
-    return /*#__PURE__*/React.createElement(BizAttrCondition, {
+    return /*#__PURE__*/React.createElement("div", {
+      className: "".concat(classPrefix, "-container-item")
+    }, /*#__PURE__*/React.createElement(BizAttrCondition, {
       key: item.key,
       value: item.data,
       eventIdList: eventIdList,
@@ -57,7 +58,7 @@ var BizAttrConditionGroup = /*#__PURE__*/React.forwardRef(function (props, ref)
       onDelete: function onDelete() {
         return _onDelete(index);
       }
-    });
+    }));
   }))));
 });
 BizAttrConditionGroup.defaultProps = {

package/es/attrCondition/styles/index.less

@@ -29,14 +29,22 @@
     }
     &-container {
       flex: 1;
-      gap: 12px !important;
       width: 100%;
+      max-width: calc(100% + 24px);
+      margin-left: -24px;
+
+      &-item {
+        padding: 4px 0 4px 48px;
+        &:hover {
+          background: @primary-color-hover;
+        }
+      }
     }
     &-handle {
       position: relative;
       width: 1px;
-      margin-right: 20px;
-      margin-left: 8px;
+      margin-right: 0;
+      margin-left: 32px;
       background: @border-color-base;
     }
     &-operate {

package/es/userGroup/styles/index.less

@@ -8,6 +8,7 @@
     .__select-handle();
     display: flex;
     flex-direction: row;
+    align-items: center;
     width: 100%;
     min-height: @height-base;
     padding: 4px 4px 4px 12px;
@@ -50,6 +51,8 @@
     display: none;
     flex: none;
     width: 16px;
+    max-height: 24px;
+    margin-left: 6px;
     text-align: center;
     border-radius: @border-radius-small;
     &:hover {

package/es/userGroupHeader/demo/index.js

@@ -11,7 +11,7 @@ export default (function () {
   }, /*#__PURE__*/React.createElement(BizUserGroupHeader, {
     max: 3,
     enableTags: true,
-    value: [['4061:679558480527360'], 786, 758],
+    value: [['4077:685001635528704'], 836, 837],
     onChange: function onChange(value) {
       console.log('>>>>>>>>回传值', value);
     }

package/es/userGroupHeader/index.js

@@ -10,7 +10,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect } from 'react';
 import './styles/index.less';
-import { Space } from 'antd';
+import { Space, Tooltip } from 'antd';
 import BizUserGroup from '../userGroup';
 import IconFont from '../icon/iconFont';
 import _ from 'lodash';
@@ -22,16 +22,8 @@ var BizUserGroupHeader = function BizUserGroupHeader(_ref) {
   var classPrefix = 'biz-user-group-header';
   var _React$useState = React.useState([]),
     _React$useState2 = _slicedToArray(_React$useState, 2),
-    groupList = _React$useState2[0],
-    setGroupList = _React$useState2[1];
-  var _React$useState3 = React.useState([]),
-    _React$useState4 = _slicedToArray(_React$useState3, 2),
-    tempValue = _React$useState4[0],
-    setTempValue = _React$useState4[1];
-  var _React$useState5 = React.useState(false),
-    _React$useState6 = _slicedToArray(_React$useState5, 2),
-    showBtn = _React$useState6[0],
-    setShowBtn = _React$useState6[1];
+    tempValue = _React$useState2[0],
+    setTempValue = _React$useState2[1];
   useEffect(function () {
     var defaultValue = (value === null || value === void 0 ? void 0 : value.map(function (item) {
       return {
@@ -41,22 +33,14 @@ var BizUserGroupHeader = function BizUserGroupHeader(_ref) {
     })) || [{
       id: Math.random().toString()
     }];
-    setGroupList(defaultValue);
     setTempValue(_.cloneDeep(defaultValue));
   }, []);
   useEffect(function () {
     if (!onChange) return;
-    onChange(groupList.map(function (item) {
+    onChange(tempValue.map(function (item) {
       return item.value;
     }));
-  }, [groupList]);
-  useEffect(function () {
-    setShowBtn(!_.isEqual(groupList.map(function (item) {
-      return item.value;
-    }), tempValue.map(function (item) {
-      return item.value;
-    })));
-  }, [groupList, tempValue]);
+  }, [tempValue]);
   function onAdd() {
     if (max && tempValue.length >= max) return;
     var list = _toConsumableArray(tempValue);
@@ -65,32 +49,13 @@ var BizUserGroupHeader = function BizUserGroupHeader(_ref) {
     });
     setTempValue(list);
   }
-  function onSure() {
-    setGroupList(_.cloneDeep(tempValue));
-  }
-  function onCancel() {
-    setTempValue(_.cloneDeep(groupList).map(function (item) {
-      item.id = Math.random().toString();
-      return item;
-    }));
-  }
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
-  }, /*#__PURE__*/React.createElement(Space, {
-    direction: "vertical",
-    size: 12
-  }, /*#__PURE__*/React.createElement(Space, {
-    size: 16
-  }, /*#__PURE__*/React.createElement("label", {
+  }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-title")
-  }, "\u5206\u6790\u7528\u6237\u7FA4"), showBtn && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("a", {
-    className: "".concat(classPrefix, "-sure"),
-    onClick: onSure
-  }, "\u786E\u5B9A"), /*#__PURE__*/React.createElement("a", {
-    className: "".concat(classPrefix, "-cancel"),
-    onClick: onCancel
-  }, "\u53D6\u6D88"))), /*#__PURE__*/React.createElement(Space, {
-    size: 16
+  }, "\u5206\u6790\u7528\u6237\u7FA4"), /*#__PURE__*/React.createElement(Space, {
+    size: 16,
+    className: "".concat(classPrefix, "-container")
   }, [tempValue.map(function (item, i) {
     return /*#__PURE__*/React.createElement(BizUserGroup, {
       key: item.id,
@@ -108,7 +73,9 @@ var BizUserGroupHeader = function BizUserGroupHeader(_ref) {
         setTempValue(list);
       }
     });
-  })], /*#__PURE__*/React.createElement(IconFont, {
+  })], /*#__PURE__*/React.createElement(Tooltip, {
+    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' : ''),
     onClick: onAdd

package/es/userGroupHeader/styles/index.less

@@ -1,21 +1,16 @@
 @import '../../assets/styles/inner.less';
 .biz-user-group-header {
-  padding: 6px @margin-lg;
   background: #fff;
   &-title {
+    margin-bottom: @margin-xs;
+    padding-left: @padding-lg;
     color: @text-color-secondary;
     font-weight: 500;
   }
-  &-sure {
-    display: none;
-    color: @primary-color;
-  }
-  &-cancel {
-    display: none;
-    color: @text-color-secondary;
-  }
+
   &-add {
     color: @primary-color;
+    font-size: 20px !important;
     cursor: pointer;
     &.disabled {
       display: none;
@@ -24,11 +19,12 @@
   .biz-user {
     width: 208px;
   }
-  &:hover {
-    background: #e8efff;
-    .biz-user-group-header-sure,
-    .biz-user-group-header-cancel {
-      display: inline-block;
+  &-container {
+    width: 100%;
+    padding: @padding-xss @padding-lg;
+
+    &:hover {
+      background: #e8efff;
     }
   }
 }

package/es/utils/ajax.js

@@ -36,7 +36,9 @@ var errorHandler = function errorHandler(error) {
     });
   } else if (!response) {
     if (Request.isCancel(error) || (error === null || error === void 0 ? void 0 : error.type) === 'AbortError') {
-      throw error;
+      var abortError = new Error('AbortError');
+      abortError.isCancel = true;
+      throw abortError;
     }
     notification.error({
       description: '您的网络发生异常，无法连接服务器',
@@ -161,14 +163,20 @@ function _request() {
         case 26:
           _context.prev = 26;
           _context.t0 = _context["catch"](0);
-          if (!(_context.t0.message === 'Request Interruption')) {
+          if (!_context.t0.isCancel) {
             _context.next = 30;
             break;
           }
-          throw new Error('Request Interruption');
+          throw _context.t0;
         case 30:
+          if (!(_context.t0.message === 'Request Interruption')) {
+            _context.next = 32;
+            break;
+          }
+          throw new Error('Request Interruption');
+        case 32:
           return _context.abrupt("return", null);
-        case 31:
+        case 33:
         case "end":
           return _context.stop();
       }

package/es/utils/demo/interruption.js

@@ -1,38 +1,40 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+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 { Button, message } from 'antd';
 import React from 'react';
 import { ajax } from '@zgfe/business-lib';
-import Request from 'umi-request';
-var CancelToken = Request.CancelToken;
-var cancel;
+import InnerDemo from '../../demoWrapper/innerDemo';
 export default (function () {
+  var _React$useState = React.useState(),
+    _React$useState2 = _slicedToArray(_React$useState, 2),
+    controller = _React$useState2[0],
+    setController = _React$useState2[1];
   var getPanels = function getPanels() {
-    if (typeof cancel === 'function') {
-      cancel();
-    }
+    var control = new AbortController();
+    var signal = control.signal;
+    controller === null || controller === void 0 ? void 0 : controller.abort();
+    setController(control);
     ajax('/zg/web/v2/apppanel/panels', {
       method: 'post',
       data: {
         appId: 501648,
         platform: 0
       },
-      cancelToken: new CancelToken(function executor(c) {
-        cancel = c;
-      }),
-      responseWrapper: function responseWrapper(_url, res) {
-        if (/07$/.test(res.code)) {
-          console.log('reLogin-----');
-          throw new Error('reLogin');
-        }
-        return res;
-      }
+      signal: signal
     }).then(function (res) {
       if (!res) return;
       message.success('请求成功');
     }).catch(function (e) {
-      console.log(e);
+      if (e.isCancel) {
+        console.log('请求被取消了');
+      }
     });
   };
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Button, {
+  return /*#__PURE__*/React.createElement(InnerDemo, null, /*#__PURE__*/React.createElement(Button, {
     onClick: getPanels
   }, "\u8BF7\u6C42\u63A5\u53E3"));
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.82-user.3",
+  "version": "1.1.82-user.5",
   "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": "16fb86446971d7caf7832ab1f46d204f95c514aa",
+  "gitHead": "aeea8df5432a158d085d299f4e525166b117b2b3",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }