@oceanbase/ui 0.4.16 → 0.4.18

package/es/DateRanger/Ranger.js

@@ -5,6 +5,10 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 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); }
@@ -13,7 +17,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import React, { useEffect, useRef, useState, useImperativeHandle } from 'react';
+import React, { useEffect, useState, useImperativeHandle, useRef } from 'react';
 import { Button, DatePicker, Divider, Dropdown, Radio, Space, Tooltip, theme } from '@oceanbase/design';
 import { LeftOutlined, RightOutlined, ZoomOutOutlined, SyncOutlined } from '@oceanbase/icons';
 import dayjs from 'dayjs';
@@ -26,6 +30,7 @@ import { CUSTOMIZE, DATE_TIME_FORMAT, NEAR_1_MINUTES, NEAR_30_MINUTES, NEAR_1_HO
 import InternalPickerPanel from "./PickerPanel";
 import zhCN from "./locale/zh-CN";
 import "./index.less";
+import { useClickAway } from 'ahooks';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var prefix = getPrefix('date-ranger');
@@ -111,10 +116,9 @@ var Ranger = /*#__PURE__*/React.forwardRef(function (props, ref) {
     _useState10 = _slicedToArray(_useState9, 2),
     backRadioFocused = _useState10[0],
     setBackRadioFocused = _useState10[1];
-  var refState = useRef({
-    tooltipOpen: tooltipOpen
-  });
-  refState.current.tooltipOpen = tooltipOpen;
+  var rangeRef = useRef(null);
+  var popRef = useRef(null);
+  var labelRef = useRef(null);
 
   // 没有 selects 时，回退到普通 RangePicker, 当前时间选项为自定义时，应该显示 RangePicker
   var _useState11 = useState(rangeName !== CUSTOMIZE),
@@ -126,6 +130,9 @@ var Ranger = /*#__PURE__*/React.forwardRef(function (props, ref) {
     if (Array.isArray(m2) && !Array.isArray(m1)) return false;
     return value[0] === innerValue[0] || value[1] === innerValue[1];
   };
+  useClickAway(function () {
+    closeTooltip();
+  }, [].concat(_toConsumableArray(!simpleMode || !isPlay ? [rangeRef] : []), [popRef, labelRef]));
   useEffect(function () {
     if (isNil(value) && isNil(innerValue)) return;
     // FIXME: 当前存在值的时候赋空值给组件，不好处理先 workaround 绕过，后面再想一个整体的方案
@@ -265,17 +272,16 @@ var Ranger = /*#__PURE__*/React.forwardRef(function (props, ref) {
           getPopupContainer: getPopupContainer
           // 关闭后进行销毁，才可以将 Tooltip 进行同步关闭
           ,
-          destroyOnHidden: true
-          // 存在缓存，会锁死里面的值
-          ,
+          destroyOnHidden: true,
           onOpenChange: function onOpenChange(o) {
-            if (o === false && refState.current.tooltipOpen) {
+            if (o === false && tooltipOpen) {
               return;
             }
             setOpen(o);
           },
           popupRender: function popupRender(originNode) {
             return /*#__PURE__*/_jsxs("div", {
+              ref: popRef,
               className: classNames("".concat(prefix, "-dropdown-picker"), overlayClassName),
               style: overlayStyle,
               children: [originNode, /*#__PURE__*/_jsx(Divider, {
@@ -314,11 +320,6 @@ var Ranger = /*#__PURE__*/React.forwardRef(function (props, ref) {
             onClick: function onClick(_ref4) {
               var key = _ref4.key,
                 domEvent = _ref4.domEvent;
-              if (key === CUSTOMIZE) {
-                refState.current.tooltipOpen = true;
-              } else {
-                refState.current.tooltipOpen = false;
-              }
               var selected = selects.find(function (_item) {
                 return _item.name === key;
               });
@@ -348,7 +349,12 @@ var Ranger = /*#__PURE__*/React.forwardRef(function (props, ref) {
             })
           },
           children: /*#__PURE__*/_jsxs(Space, {
+            ref: labelRef,
             size: 0,
+            onClick: function onClick() {
+              setOpen(true);
+              setTooltipOpen(true);
+            },
             children: [/*#__PURE__*/_jsx("span", {
               className: "".concat(prefix, "-label"),
               style: {
@@ -361,8 +367,10 @@ var Ranger = /*#__PURE__*/React.forwardRef(function (props, ref) {
             })]
           })
         }), (!simpleMode || !isPlay) && /*#__PURE__*/_jsx("span", {
+          ref: rangeRef,
           onClick: function onClick() {
             setOpen(true);
+            setTooltipOpen(true);
           },
           children: /*#__PURE__*/_jsx(DatePicker.RangePicker, _objectSpread(_objectSpread({
             className: classNames("".concat(prefix, "-picker")),

package/es/DateRanger/constant/index.d.ts

@@ -24,6 +24,7 @@ export declare const TODAY: RangeOption;
 export declare const YESTERDAY: RangeOption;
 export declare const LAST_1_DAY: RangeOption;
 export declare const LAST_3_DAYS: RangeOption;
+export declare const LAST_7_DAYS: RangeOption;
 export declare const THIS_WEEK: RangeOption;
 export declare const LAST_WEEK: RangeOption;
 export declare const THIS_MONTH: RangeOption;

package/es/DateRanger/constant/index.js

@@ -159,6 +159,16 @@ export var LAST_3_DAYS = {
     return [current.clone().subtract(3, 'days'), current.clone()];
   }
 };
+export var LAST_7_DAYS = {
+  label: '近 7 天',
+  enLabel: 'Last 7 Days',
+  rangeLabel: '7d',
+  name: 'LAST_7_DAYS',
+  range: function range() {
+    var current = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : moment();
+    return [current.clone().subtract(7, 'days'), current.clone()];
+  }
+};
 export var THIS_WEEK = {
   label: '近一周',
   enLabel: 'Nearly a week',

package/es/DateRanger/index.d.ts

@@ -14,6 +14,7 @@ declare const DateRanger: import("react").ForwardRefExoticComponent<import("./Ra
     TODAY: import("./typing").RangeOption;
     LAST_1_DAY: import("./typing").RangeOption;
     LAST_3_DAYS: import("./typing").RangeOption;
+    LAST_7_DAYS: import("./typing").RangeOption;
     YESTERDAY: import("./typing").RangeOption;
     THIS_WEEK: import("./typing").RangeOption;
     LAST_WEEK: import("./typing").RangeOption;

package/es/DateRanger/index.js

@@ -1,4 +1,4 @@
-import { LAST_1_DAY, LAST_3_DAYS, LAST_MONTH, LAST_WEEK, LAST_YEAR, NEAR_10_MINUTES, NEAR_12_HOURS, NEAR_1_HOURS, NEAR_1_MINUTES, NEAR_20_MINUTES, NEAR_2_HOURS, NEAR_30_MINUTES, NEAR_3_HOURS, NEAR_5_MINUTES, NEAR_6_HOURS, NEXT_YEAR, THIS_MONTH, THIS_WEEK, THIS_YEAR, TODAY, YESTERDAY } from "./constant";
+import { LAST_1_DAY, LAST_3_DAYS, LAST_7_DAYS, LAST_MONTH, LAST_WEEK, LAST_YEAR, NEAR_10_MINUTES, NEAR_12_HOURS, NEAR_1_HOURS, NEAR_1_MINUTES, NEAR_20_MINUTES, NEAR_2_HOURS, NEAR_30_MINUTES, NEAR_3_HOURS, NEAR_5_MINUTES, NEAR_6_HOURS, NEXT_YEAR, THIS_MONTH, THIS_WEEK, THIS_YEAR, TODAY, YESTERDAY } from "./constant";
 import InternalDateRanger from "./Ranger";
 export * from "./Ranger";
 var DateRanger = Object.assign(InternalDateRanger, {
@@ -15,6 +15,7 @@ var DateRanger = Object.assign(InternalDateRanger, {
   TODAY: TODAY,
   LAST_1_DAY: LAST_1_DAY,
   LAST_3_DAYS: LAST_3_DAYS,
+  LAST_7_DAYS: LAST_7_DAYS,
   YESTERDAY: YESTERDAY,
   THIS_WEEK: THIS_WEEK,
   LAST_WEEK: LAST_WEEK,

package/es/Login/locale/en-US.d.ts

@@ -4,6 +4,7 @@ declare const _default: {
     passwordPlaceholder: string;
     passwordMessage: string;
     loginText: string;
+    otherLoginText: string;
     isLoadingWarn: string;
     usernameLabel: string;
     switchLoginLabel: string;

package/es/Login/locale/en-US.js

@@ -4,6 +4,7 @@ export default {
   passwordPlaceholder: 'Please input password',
   passwordMessage: 'Password is required',
   loginText: 'Login',
+  otherLoginText: 'Third-party Login',
   isLoadingWarn: 'In progress',
   usernameLabel: 'Username',
   switchLoginLabel: 'Already have an account',

package/lib/DateRanger/Ranger.js

@@ -45,6 +45,7 @@ var import_constant = require("./constant");
 var import_PickerPanel = __toESM(require("./PickerPanel"));
 var import_zh_CN = __toESM(require("./locale/zh-CN"));
 var import_index = require("./index.less");
+var import_ahooks = require("ahooks");
 var prefix = (0, import_util.getPrefix)("date-ranger");
 var Ranger = import_react.default.forwardRef((props, ref) => {
   var _a;
@@ -105,10 +106,9 @@ var Ranger = import_react.default.forwardRef((props, ref) => {
   const [open, setOpen] = (0, import_react.useState)(false);
   const [tooltipOpen, setTooltipOpen] = (0, import_react.useState)(false);
   const [backRadioFocused, setBackRadioFocused] = (0, import_react.useState)(false);
-  const refState = (0, import_react.useRef)({
-    tooltipOpen
-  });
-  refState.current.tooltipOpen = tooltipOpen;
+  const rangeRef = (0, import_react.useRef)(null);
+  const popRef = (0, import_react.useRef)(null);
+  const labelRef = (0, import_react.useRef)(null);
   const [isPlay, setIsPlay] = (0, import_react.useState)(rangeName !== import_constant.CUSTOMIZE);
   const compare = (m1, m2) => {
     if (Array.isArray(m1) && !Array.isArray(m2))
@@ -117,6 +117,14 @@ var Ranger = import_react.default.forwardRef((props, ref) => {
       return false;
     return value[0] === innerValue[0] || value[1] === innerValue[1];
   };
+  (0, import_ahooks.useClickAway)(() => {
+    closeTooltip();
+  }, [
+    // 有range输入框时才将其ref引用加入依赖（即极简模式不加入）
+    ...!simpleMode || !isPlay ? [rangeRef] : [],
+    popRef,
+    labelRef
+  ]);
   (0, import_react.useEffect)(() => {
     if ((0, import_lodash.isNil)(value) && (0, import_lodash.isNil)(innerValue))
       return;
@@ -255,7 +263,7 @@ var Ranger = import_react.default.forwardRef((props, ref) => {
           getPopupContainer,
           destroyOnHidden: true,
           onOpenChange: (o) => {
-            if (o === false && refState.current.tooltipOpen) {
+            if (o === false && tooltipOpen) {
               return;
             }
             setOpen(o);
@@ -264,6 +272,7 @@ var Ranger = import_react.default.forwardRef((props, ref) => {
             return /* @__PURE__ */ import_react.default.createElement(
               "div",
               {
+                ref: popRef,
                 className: (0, import_classnames.default)(`${prefix}-dropdown-picker`, overlayClassName),
                 style: overlayStyle
               },
@@ -300,11 +309,6 @@ var Ranger = import_react.default.forwardRef((props, ref) => {
             selectable: true,
             defaultSelectedKeys: [rangeName],
             onClick: ({ key, domEvent }) => {
-              if (key === import_constant.CUSTOMIZE) {
-                refState.current.tooltipOpen = true;
-              } else {
-                refState.current.tooltipOpen = false;
-              }
               const selected = selects.find((_item) => _item.name === key);
               if (selected == null ? void 0 : selected.range) {
                 handleNameChange(key);
@@ -322,22 +326,36 @@ var Ranger = import_react.default.forwardRef((props, ref) => {
             })
           }
         },
-        /* @__PURE__ */ import_react.default.createElement(import_design.Space, { size: 0 }, /* @__PURE__ */ import_react.default.createElement(
-          "span",
+        /* @__PURE__ */ import_react.default.createElement(
+          import_design.Space,
           {
-            className: `${prefix}-label`,
-            style: {
-              marginLeft: 8
+            ref: labelRef,
+            size: 0,
+            onClick: () => {
+              setOpen(true);
+              setTooltipOpen(true);
             }
           },
-          rangeLabel
-        ), simpleMode && isPlay && /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}-play` }, label))
+          /* @__PURE__ */ import_react.default.createElement(
+            "span",
+            {
+              className: `${prefix}-label`,
+              style: {
+                marginLeft: 8
+              }
+            },
+            rangeLabel
+          ),
+          simpleMode && isPlay && /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}-play` }, label)
+        )
       ),
       (!simpleMode || !isPlay) && /* @__PURE__ */ import_react.default.createElement(
         "span",
         {
+          ref: rangeRef,
           onClick: () => {
             setOpen(true);
+            setTooltipOpen(true);
           }
         },
         /* @__PURE__ */ import_react.default.createElement(

package/lib/DateRanger/constant/index.d.ts

@@ -24,6 +24,7 @@ export declare const TODAY: RangeOption;
 export declare const YESTERDAY: RangeOption;
 export declare const LAST_1_DAY: RangeOption;
 export declare const LAST_3_DAYS: RangeOption;
+export declare const LAST_7_DAYS: RangeOption;
 export declare const THIS_WEEK: RangeOption;
 export declare const LAST_WEEK: RangeOption;
 export declare const THIS_MONTH: RangeOption;

package/lib/DateRanger/constant/index.js

@@ -38,6 +38,7 @@ __export(constant_exports, {
   DATE_TIME_SECOND_FORMAT_CN: () => DATE_TIME_SECOND_FORMAT_CN,
   LAST_1_DAY: () => LAST_1_DAY,
   LAST_3_DAYS: () => LAST_3_DAYS,
+  LAST_7_DAYS: () => LAST_7_DAYS,
   LAST_MONTH: () => LAST_MONTH,
   LAST_WEEK: () => LAST_WEEK,
   LAST_YEAR: () => LAST_YEAR,
@@ -223,6 +224,16 @@ var LAST_3_DAYS = {
     current.clone()
   ]
 };
+var LAST_7_DAYS = {
+  label: "近 7 天",
+  enLabel: "Last 7 Days",
+  rangeLabel: "7d",
+  name: "LAST_7_DAYS",
+  range: (current = (0, import_moment.default)()) => [
+    current.clone().subtract(7, "days"),
+    current.clone()
+  ]
+};
 var THIS_WEEK = {
   label: "近一周",
   enLabel: "Nearly a week",
@@ -327,6 +338,7 @@ var NEAR_TIME_LIST = [
   DATE_TIME_SECOND_FORMAT_CN,
   LAST_1_DAY,
   LAST_3_DAYS,
+  LAST_7_DAYS,
   LAST_MONTH,
   LAST_WEEK,
   LAST_YEAR,

package/lib/DateRanger/index.d.ts

@@ -14,6 +14,7 @@ declare const DateRanger: import("react").ForwardRefExoticComponent<import("./Ra
     TODAY: import("./typing").RangeOption;
     LAST_1_DAY: import("./typing").RangeOption;
     LAST_3_DAYS: import("./typing").RangeOption;
+    LAST_7_DAYS: import("./typing").RangeOption;
     YESTERDAY: import("./typing").RangeOption;
     THIS_WEEK: import("./typing").RangeOption;
     LAST_WEEK: import("./typing").RangeOption;

package/lib/DateRanger/index.js

@@ -50,6 +50,7 @@ var DateRanger = Object.assign(import_Ranger.default, {
   TODAY: import_constant.TODAY,
   LAST_1_DAY: import_constant.LAST_1_DAY,
   LAST_3_DAYS: import_constant.LAST_3_DAYS,
+  LAST_7_DAYS: import_constant.LAST_7_DAYS,
   YESTERDAY: import_constant.YESTERDAY,
   THIS_WEEK: import_constant.THIS_WEEK,
   LAST_WEEK: import_constant.LAST_WEEK,

package/lib/Login/locale/en-US.d.ts

@@ -4,6 +4,7 @@ declare const _default: {
     passwordPlaceholder: string;
     passwordMessage: string;
     loginText: string;
+    otherLoginText: string;
     isLoadingWarn: string;
     usernameLabel: string;
     switchLoginLabel: string;

package/lib/Login/locale/en-US.js

@@ -28,6 +28,7 @@ var en_US_default = {
   passwordPlaceholder: "Please input password",
   passwordMessage: "Password is required",
   loginText: "Login",
+  otherLoginText: "Third-party Login",
   isLoadingWarn: "In progress",
   usernameLabel: "Username",
   switchLoginLabel: "Already have an account",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oceanbase/ui",
-  "version": "0.4.16",
+  "version": "0.4.18",
   "description": "The UI library based on OceanBase Design",
   "keywords": [
     "oceanbase",
@@ -39,10 +39,10 @@
     "build": "NODE_OPTIONS=--max_old_space_size=4096 father build"
   },
   "dependencies": {
-    "@ant-design/cssinjs": "^1.23.0",
-    "@ant-design/pro-components": "^2.8.9",
+    "@ant-design/cssinjs": "^1.24.0",
+    "@ant-design/pro-components": "^2.8.10",
     "@antv/g6": "3.4.10",
-    "@oceanbase/design": "^0.4.13",
+    "@oceanbase/design": "^0.4.15",
     "@oceanbase/icons": "^0.4.7",
     "@oceanbase/util": "^0.4.4",
     "ahooks": "^2.10.14",
@@ -64,12 +64,12 @@
     "screenfull": "^6.0.2"
   },
   "devDependencies": {
-    "@ant-design/pro-form": "^2.31.9",
-    "@ant-design/pro-layout": "^7.22.6"
+    "@ant-design/pro-form": "^2.32.0",
+    "@ant-design/pro-layout": "^7.22.7"
   },
   "peerDependencies": {
     "react": ">=16.9.0",
     "react-dom": ">=16.9.0"
   },
-  "gitHead": "2d9213d7c374b9dc207ebd40663f1c50828e72b7"
+  "gitHead": "b88518b0f25b30d616d829813ba50eff7830499a"
 }