@zgfe/business-lib 1.1.55-beta.3 → 1.1.55-beta.6

package/es/index.d.ts

@@ -8,6 +8,7 @@ import BizTargetCondition from './targetConditionGroup';
 import BizConditionItem from './attrConditions';
 import BizConditionGroup from './attrConditions/group';
 import BizDatePicker from './datePicker';
+import BizQuickDatePicker from './quickDatePicker';
 import BizSelect from './select';
 import BizDialog from './dialog';
 import BizChart from './chart';
@@ -34,7 +35,7 @@ import BizAttrCondition from './attrCondition';
 import BizAttrConditionGroup from './attrCondition/group';
 import BizTargetFromPanel from './layout/optionTitle';
 import { BizTargetFromPanelContext } from './layout/optionTitle/types';
-export { BizTargetFromPanel, BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizDetailLayout, BizUserGroup, IconFont, ColorIcon, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetFromPanelContext, BizTargetCondition, BizDatePicker, BizConditionItem, BizConditionGroup, BizAttrCondition, BizAttrConditionGroup, BizUserCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, BizLoginForm, DemoWrapper, SocketClient, ajax, util, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig, };
+export { BizTargetFromPanel, BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizDetailLayout, BizUserGroup, IconFont, ColorIcon, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetFromPanelContext, BizTargetCondition, BizDatePicker, BizQuickDatePicker, BizConditionItem, BizConditionGroup, BizAttrCondition, BizAttrConditionGroup, BizUserCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, BizLoginForm, DemoWrapper, SocketClient, ajax, util, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig, };
 export type { UserGroupTypes } from './userGroup/types';
 export type { BizSelectTypes } from './select/types';
 export type { AttributeSelect } from './attributeSelector/types';

package/es/index.js

@@ -7,6 +7,7 @@ import BizTargetCondition from './targetConditionGroup';
 import BizConditionItem from './attrConditions';
 import BizConditionGroup from './attrConditions/group';
 import BizDatePicker from './datePicker';
+import BizQuickDatePicker from './quickDatePicker';
 import BizSelect from './select';
 import BizDialog from './dialog';
 import BizChart from './chart';
@@ -33,4 +34,4 @@ import BizAttrCondition from './attrCondition';
 import BizAttrConditionGroup from './attrCondition/group';
 import BizTargetFromPanel from './layout/optionTitle';
 import { BizTargetFromPanelContext } from './layout/optionTitle/types';
-export { BizTargetFromPanel, BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizDetailLayout, BizUserGroup, IconFont, ColorIcon, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetFromPanelContext, BizTargetCondition, BizDatePicker, BizConditionItem, BizConditionGroup, BizAttrCondition, BizAttrConditionGroup, BizUserCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, BizLoginForm, DemoWrapper, SocketClient, ajax, util, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig };
+export { BizTargetFromPanel, BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizDetailLayout, BizUserGroup, IconFont, ColorIcon, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetFromPanelContext, BizTargetCondition, BizDatePicker, BizQuickDatePicker, BizConditionItem, BizConditionGroup, BizAttrCondition, BizAttrConditionGroup, BizUserCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, BizLoginForm, DemoWrapper, SocketClient, ajax, util, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig };

package/es/quickDatePicker/demo/index.d.ts

@@ -0,0 +1,3 @@
+import '@zgfe/business-lib/es/assets/styles/resetAntd.less';
+declare const _default: () => JSX.Element;
+export default _default;

package/es/quickDatePicker/demo/index.js

@@ -0,0 +1,36 @@
+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 { BizQuickDatePicker } from '@zgfe/business-lib';
+import React, { useState } from 'react';
+import '@zgfe/business-lib/es/assets/styles/resetAntd.less';
+export default (function () {
+  var _useState = useState({
+      unit: 'day',
+      begin: '2023-06-23',
+      end: '2023-06-30',
+      relative: 7
+    }),
+    _useState2 = _slicedToArray(_useState, 2),
+    time = _useState2[0],
+    setTime = _useState2[1];
+  var onChange = function onChange(data) {
+    console.log('777', data);
+    setTime(data);
+  };
+  return /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: 'flex'
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      lineHeight: '32px'
+    }
+  }, "\u9009\u62E9\u65F6\u95F4\uFF1A"), /*#__PURE__*/React.createElement(BizQuickDatePicker, {
+    defaultValue: time,
+    onChange: onChange
+  }));
+});

package/es/quickDatePicker/index.d.ts

@@ -0,0 +1,6 @@
+import React from 'react';
+import './styles/index.less';
+import { QuickDatePickerTypes } from './types';
+export declare const classPrefix = "biz-quick-date-picker-wrap";
+declare const BizQuickDatePicker: React.FC<QuickDatePickerTypes.Props>;
+export default BizQuickDatePicker;

package/es/quickDatePicker/index.js

@@ -0,0 +1,152 @@
+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 React, { useEffect, useState } from 'react';
+import './styles/index.less';
+import moment from 'moment';
+import { quickModuleOneOptions, quickModuleTwoOptions } from './utils';
+import IconFont from '../icon/iconFont';
+import { DatePicker } from 'antd';
+var RangePicker = DatePicker.RangePicker;
+export var classPrefix = 'biz-quick-date-picker-wrap';
+var changeCount = 0;
+var BizQuickDatePicker = function BizQuickDatePicker(props) {
+  var defaultValue = props.defaultValue;
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    show = _useState2[0],
+    setShow = _useState2[1];
+  var _useState3 = useState(-1),
+    _useState4 = _slicedToArray(_useState3, 2),
+    relative = _useState4[0],
+    setRelative = _useState4[1];
+  var _useState5 = useState('day'),
+    _useState6 = _slicedToArray(_useState5, 2),
+    unit = _useState6[0],
+    setUnit = _useState6[1];
+  var _useState7 = useState([moment().subtract(6, 'day'), moment()]),
+    _useState8 = _slicedToArray(_useState7, 2),
+    value = _useState8[0],
+    setValue = _useState8[1];
+  var _useState9 = useState('过去7天'),
+    _useState10 = _slicedToArray(_useState9, 2),
+    showText = _useState10[0],
+    setShowText = _useState10[1];
+  useEffect(function () {
+    var _value = defaultValue || props.value;
+    if (_value) {
+      setValue([moment(_value.begin), moment(_value.end)]);
+      _value.relative && setRelative(_value.relative);
+      _value.unit && setUnit(_value.unit);
+    }
+  }, [defaultValue, props.value]);
+  var onChange = function onChange(date, dateString) {
+    changeCount++;
+    setValue(date);
+    setShowText('自定义');
+    setRelative(-1);
+    if (changeCount >= 2) {
+      setShow(false);
+      var changeValue = {
+        unit: 'day',
+        begin: dateString[0],
+        end: dateString[1],
+        relative: -1
+      };
+      props.onChange && props.onChange(changeValue);
+    }
+  };
+  useEffect(function () {
+    if (!show) changeCount = 0;
+  }, [show]);
+  var onBlur = function onBlur() {
+    setShow(false);
+  };
+  var onClick = function onClick() {
+    setShow(true);
+  };
+  var disabledDate = function disabledDate(current) {
+    return current && current > moment().endOf('month');
+  };
+  var quickModuleHandle = function quickModuleHandle(item) {
+    var _value;
+    if (item.type === 'week' || item.type === 'month') {
+      switch (Number(item.value)) {
+        case 1:
+          _value = [moment().weekday(1), moment().weekday(7)];
+          break;
+        case 2:
+          _value = [moment().weekday(1).subtract(1, 'week'), moment().weekday(7).subtract(1, 'week')];
+          break;
+        case 3:
+          _value = [moment().startOf('month'), moment().endOf('month')];
+          break;
+        case 4:
+          _value = [moment().startOf('month').subtract(1, 'month'), moment().endOf('month').subtract(1, 'month')];
+          break;
+      }
+    } else {
+      _value = [moment().subtract(Number(item.value) - 1, 'day'), moment()];
+    }
+    setRelative(item.value);
+    setUnit(item.type);
+    setShowText(item.label);
+    setValue(_value);
+    setShow(false);
+    if (_value) {
+      var changeValue = {
+        unit: item.type,
+        begin: _value[0].format('YYYY-MM-DD'),
+        end: _value[1].format('YYYY-MM-DD'),
+        relative: item.value
+      };
+      props.onChange && props.onChange(changeValue);
+    }
+  };
+  var renderExtraFooter = function renderExtraFooter() {
+    return /*#__PURE__*/React.createElement("div", {
+      className: "".concat(classPrefix, "-content-options")
+    }, /*#__PURE__*/React.createElement("ol", null, quickModuleOneOptions.map(function (item) {
+      return /*#__PURE__*/React.createElement("li", {
+        className: "".concat(item.type === unit && item.value === relative ? 'active' : ''),
+        key: item.label,
+        onClick: function onClick() {
+          return quickModuleHandle(item);
+        }
+      }, item.label);
+    })), /*#__PURE__*/React.createElement("ol", null, quickModuleTwoOptions.map(function (item) {
+      return /*#__PURE__*/React.createElement("li", {
+        className: "".concat(item.type === unit && item.value === relative ? 'active' : ''),
+        key: item.label,
+        onClick: function onClick() {
+          return quickModuleHandle(item);
+        }
+      }, item.label);
+    })), /*#__PURE__*/React.createElement("div", {
+      className: "".concat(relative === -1 ? 'active' : '')
+    }, "\u81EA\u5B9A\u4E49\u65F6\u95F4", /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(IconFont, {
+      type: "fanhuiicon"
+    }))));
+  };
+  return /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, " clearfix")
+  }, /*#__PURE__*/React.createElement("div", {
+    onClick: function onClick() {
+      setShow(true);
+    }
+  }, showText), /*#__PURE__*/React.createElement(RangePicker, {
+    popupClassName: "".concat(classPrefix, "-content"),
+    separator: '至',
+    value: value,
+    onBlur: onBlur,
+    open: show,
+    onClick: onClick,
+    disabledDate: disabledDate,
+    onChange: onChange,
+    renderExtraFooter: renderExtraFooter
+  }));
+};
+export default BizQuickDatePicker;

package/es/quickDatePicker/styles/index.less

@@ -0,0 +1,108 @@
+@import '../../assets/styles/inner.less';
+
+.biz-quick-date-picker-wrap {
+  display: inline-block;
+  height: 34px;
+  padding: 4px 8px;
+  background: #fafafb;
+  border: 1px solid #165dff;
+  border-radius: 4px;
+  > :nth-child(1) {
+    float: left;
+    height: 24px;
+    margin-right: 8px;
+    padding: 2px 8px;
+    color: #165dff;
+    vertical-align: middle;
+    background: #e8efff;
+  }
+  .ant-picker {
+    padding: 0;
+    vertical-align: middle;
+    border: none;
+    border-radius: 0 !important;
+    .ant-picker-clear {
+      right: 0;
+    }
+  }
+  &-content {
+    float: left;
+    .ant-picker-panel-container {
+      display: flex;
+      flex-direction: row-reverse;
+      .ant-picker-footer {
+        width: auto;
+        min-width: auto;
+        border-bottom: 1px solid #e8efff;
+        box-shadow: 0px 4px 10px 0px rgba(0, 0, 0, 0.1);
+      }
+    }
+    &-options {
+      width: 170px;
+      padding-bottom: 25px;
+      color: #67727f;
+      ol,
+      li {
+        margin: 0;
+        padding: 0;
+        list-style: none;
+        list-style-type: none;
+      }
+      > :nth-child(1),
+      > :nth-child(2) {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: space-between;
+        margin-top: 8px;
+        padding-bottom: 4px;
+        border-bottom: 1px solid #ecedf0;
+        li {
+          width: 81px;
+          height: 24px;
+          margin-bottom: 8px;
+          line-height: 24px;
+          text-align: center;
+          background: #fafafb;
+          border-radius: 24px;
+          cursor: pointer;
+        }
+      }
+      > :nth-child(2) {
+        margin-top: 14px;
+        li {
+          border-radius: 0;
+        }
+      }
+      > :nth-child(3) {
+        display: flex;
+        justify-content: space-between;
+        width: 100%;
+        height: 32px;
+        margin-top: 12px;
+        padding: 0 12px;
+        line-height: 32px;
+        background: #fafafb;
+        > :first-child {
+          transform: rotate(180deg);
+        }
+      }
+      .active,
+      li.active {
+        color: #165dff;
+        background: #e8efff;
+      }
+    }
+  }
+}
+
+.clearfix:after {
+  display: block;
+  clear: both;
+  height: 0;
+  content: '';
+}
+
+.clearfix {
+  /* 触发 hasLayout */
+  zoom: 1;
+}

package/es/quickDatePicker/types.d.ts

@@ -0,0 +1,24 @@
+export declare namespace QuickDatePickerTypes {
+    interface Options {
+        label: string;
+        value: number;
+        type: 'week' | 'month' | 'day';
+    }
+    interface Range {
+        begin: string;
+        end: string;
+    }
+    interface Value extends Range {
+        unit: 'day' | 'week' | 'month';
+        relative?: number;
+    }
+    interface Props {
+        defaultValue?: Value;
+        value?: Value;
+        onChange?: (data: Value) => void;
+    }
+    interface ListOption {
+        count: number;
+        value: string;
+    }
+}

package/es/quickDatePicker/types.js

@@ -0,0 +1 @@
+export {};

package/es/quickDatePicker/utils.d.ts

@@ -0,0 +1,10 @@
+export declare const quickModuleOneOptions: {
+    label: string;
+    value: number;
+    type: 'week' | 'month' | 'day';
+}[];
+export declare const quickModuleTwoOptions: {
+    label: string;
+    value: number;
+    type: 'week' | 'month' | 'day';
+}[];

package/es/quickDatePicker/utils.js

@@ -0,0 +1,42 @@
+export var quickModuleOneOptions = [{
+  label: '本周',
+  value: 1,
+  type: 'week'
+}, {
+  label: '上周',
+  value: 2,
+  type: 'week'
+}, {
+  label: '本月',
+  value: 3,
+  type: 'month'
+}, {
+  label: '上月',
+  value: 4,
+  type: 'month'
+}];
+export var quickModuleTwoOptions = [{
+  label: '过去5天',
+  value: 5,
+  type: 'day'
+}, {
+  label: '过去7天',
+  value: 7,
+  type: 'day'
+}, {
+  label: '过去14天',
+  value: 14,
+  type: 'day'
+}, {
+  label: '过去30天',
+  value: 30,
+  type: 'day'
+}, {
+  label: '过去60天',
+  value: 60,
+  type: 'day'
+}, {
+  label: '过去180天',
+  value: 180,
+  type: 'day'
+}];

package/es/utils/ajax.js

@@ -77,10 +77,11 @@ export 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)) {
-    msg = '账户未登录或登录已失效';
+    message.error('账户未登录或登录已失效');
+    flag = true;
   } else if (new RegExp("".concat(ResponseStatus.noPermission)).test(apiResult.code)) {
-    msg = '账户没有权限';
-    throw new Error(apiResult.msg);
+    message.error('账户没有权限');
+    flag = true;
   }
   if (!flag) {
     msg = apiResult.msg || msg;
@@ -139,28 +140,40 @@ function _request() {
           return req(params.url, params.options);
         case 14:
           res = _context.sent;
+          if (res) {
+            _context.next = 17;
+            break;
+          }
+          throw new Error('Request Interruption');
+        case 17:
           if (!(((_params$options2 = params.options) === null || _params$options2 === void 0 ? void 0 : _params$options2.responseType) === 'blob')) {
-            _context.next = 21;
+            _context.next = 23;
             break;
           }
           if (!util.isBlob(res.data)) {
-            _context.next = 20;
+            _context.next = 22;
             break;
           }
           return _context.abrupt("return", downloadFile(res, params.options.fileName));
-        case 20:
+        case 22:
           res = res.data;
-        case 21:
+        case 23:
           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)) : responseErrorHandler(url, res, options === null || options === void 0 ? void 0 : options.errorTitle, options === null || options === void 0 ? void 0 : options.notifyType));
-        case 24:
-          _context.prev = 24;
+        case 26:
+          _context.prev = 26;
           _context.t0 = _context["catch"](0);
+          if (!(_context.t0.message === 'Request Interruption')) {
+            _context.next = 30;
+            break;
+          }
+          throw new Error('Request Interruption');
+        case 30:
           return _context.abrupt("return", null);
-        case 27:
+        case 31:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[0, 24]]);
+    }, _callee, null, [[0, 26]]);
   }));
   return _request.apply(this, arguments);
 }

package/es/utils/demo/interruption.d.ts

@@ -0,0 +1,2 @@
+declare const _default: () => JSX.Element;
+export default _default;

package/es/utils/demo/interruption.js

@@ -0,0 +1,38 @@
+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;
+export default (function () {
+  var getPanels = function getPanels() {
+    if (typeof cancel === 'function') {
+      cancel();
+    }
+    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;
+      }
+    }).then(function (res) {
+      if (!res) return;
+      message.success('请求成功');
+    }).catch(function (e) {
+      console.log(e);
+    });
+  };
+  return /*#__PURE__*/React.createElement("div", 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.55-beta.3",
+  "version": "1.1.55-beta.6",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -60,5 +60,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "3f8dd3f342640c4c26f28852a2b22cdff07d358b"
+  "gitHead": "ef3cee53b89f098aca2adfa5196bb8695bdb00e1"
 }