Merge pull request #339 from easyops-cn/steve/fix-time

fix(): use millisecond instead of microsecond
easyops-cn · Jul 12, 2024 · fdc7a27 · fdc7a27
2 parents c8a41d3 + db66432
commit fdc7a27
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 13 deletions.
diff --git a/bricks/presentational-bricks/src/brick-humanize-time/BrickHumanizeTime.spec.tsx b/bricks/presentational-bricks/src/brick-humanize-time/BrickHumanizeTime.spec.tsx
@@ -33,7 +33,7 @@ describe("BrickHumanizeTime", () => {
     const wrapper = shallow(
       <BrickHumanizeTime
         value={1563509000}
-        isMicrosecond={true}
+        isMillisecond={true}
         isCostTime={true}
       />
     );

diff --git a/bricks/presentational-bricks/src/brick-humanize-time/BrickHumanizeTime.tsx b/bricks/presentational-bricks/src/brick-humanize-time/BrickHumanizeTime.tsx
@@ -10,7 +10,7 @@ import { isNil } from "lodash";
 
 interface BrickHumanizeTimeProps {
   value: number | string;
-  isMicrosecond?: boolean;
+  isMillisecond?: boolean;
   formatter?: HumanizeTimeFormat;
   isCostTime?: boolean;
   inputFormat?: string;
@@ -26,7 +26,7 @@ export function BrickHumanizeTime(
 ): React.ReactElement {
   const {
     value,
-    isMicrosecond,
+    isMillisecond,
     inputFormat,
     outputFormat,
     isCostTime,
@@ -40,7 +40,7 @@ export function BrickHumanizeTime(
 
   let ts;
   if (typeof value === "number") {
-    ts = isMicrosecond ? value : Number(value) * 1000;
+    ts = isMillisecond ? value : Number(value) * 1000;
   } else {
     const time = moment(value, inputFormat);
     ts = time.unix() * 1000;

diff --git a/bricks/presentational-bricks/src/brick-humanize-time/index.spec.ts b/bricks/presentational-bricks/src/brick-humanize-time/index.spec.ts
@@ -1,12 +1,14 @@
 import ReactDOM from "react-dom";
 import "./";
 
-const spyOnRender = jest.spyOn(ReactDOM, "render").mockImplementation(() => {});
+const spyOnRender = jest
+  .spyOn(ReactDOM, "render")
+  .mockImplementation(() => void 0);
 const unmountComponentAtNode = jest
   .spyOn(ReactDOM, "unmountComponentAtNode")
-  .mockImplementation((() => {}) as any);
+  .mockImplementation((() => void 0) as any);
 
-  jest.spyOn(console, "warn").mockImplementation(() => void 0);
+jest.spyOn(console, "warn").mockImplementation(() => void 0);
 
 describe("presentational-bricks.brick-humanize-time", () => {
   it("should create a custom element", async () => {
@@ -17,8 +19,8 @@ describe("presentational-bricks.brick-humanize-time", () => {
       dataSource: {},
       fields: { value: "" },
       isCostTime: false,
-      isMicrosecond: true,
-      formatter: "accurate"
+      isMillisecond: true,
+      formatter: "accurate",
     });
     // Always waiting for async `(dis)connectedCallback`
     await jest.runAllTimers();

diff --git a/bricks/presentational-bricks/src/brick-humanize-time/index.tsx b/bricks/presentational-bricks/src/brick-humanize-time/index.tsx
@@ -99,7 +99,7 @@ export class BrickHumanizeTimeElement extends UpdatingElement {
           <BrickHumanizeTime
             value={value}
             formatter={this.formatter}
-            isMicrosecond={this.isMicrosecond}
+            isMillisecond={this.isMillisecond ?? this.isMicrosecond}
             isCostTime={this.isCostTime}
             link={link}
             inputFormat={this.inputFormat}
@@ -145,14 +145,21 @@ export class BrickHumanizeTimeElement extends UpdatingElement {
   formatter: HumanizeTimeFormat;
 
   /**
-   * @required false
-   * @default false
    * @description value 值的单位是否为毫秒
    * @group advanced
    */
   @property({
     type: Boolean,
   })
+  isMillisecond: boolean;
+
+  /**
+   * @description value 值的单位是否为毫秒（此处属性 id 写错，实际表达意义为 isMillisecond）
+   * @deprecated 请使用 `isMillisecond`
+   */
+  @property({
+    type: Boolean,
+  })
   isMicrosecond: boolean;
 
   /**

diff --git a/bricks/presentational-bricks/stories/chapters/brick-humanize-time.ts b/bricks/presentational-bricks/stories/chapters/brick-humanize-time.ts
@@ -71,7 +71,7 @@ export const BrickHumanizeTimeStory: Story = {
           brick: "presentational-bricks.brick-humanize-time",
           properties: {
             value: 1571017058000,
-            isMicrosecond: true,
+            isMillisecond: true,
             formatter: "relative",
           },
         },