@dovetail-v2/refine 0.0.35-beta.3 → 0.0.35-beta.4

package/dist/{MonacoYamlDiffEditor-bbf8d9dd.js → MonacoYamlDiffEditor-68b40e77.js}

@@ -1,4 +1,4 @@
-import { j as jsxRuntimeExports } from "./index-83577f15.js";
+import { j as jsxRuntimeExports } from "./index-8f13370f.js";
 import * as monaco from "monaco-editor";
 import { useRef, useEffect } from "react";
 import "i18next";

package/dist/{index-83577f15.js → index-8f13370f.js}

@@ -1322,6 +1322,7 @@ const default_backend = "默认后端";
 const ingress_class = "Ingress 类";
 const port = "端口";
 const pod_ready_num = "Pod 就绪数量";
+const pod_complete_num = "Pod 完成数量";
 const pod_replicas_num = "Pod 预期数量";
 const edit_replicas = "编辑预期副本数";
 const cert = "证书";
@@ -1472,6 +1473,7 @@ const dovetail = {
   ingress_class,
   port,
   pod_ready_num,
+  pod_complete_num,
   pod_replicas_num,
   edit_replicas,
   cert,
@@ -8115,7 +8117,7 @@ const useDeleteModal = (resource) => {
     openDeleteConfirmModal
   };
 };
-const index_r5625l = "";
+const index_wrn16i = "";
 const EMPTY_VALUES = [void 0, null, "", "-"];
 const EmptyStyle = "e5223w8";
 const ContentStyle$2 = "cdjsw14";
@@ -10416,7 +10418,7 @@ const EventsTable = ({}) => {
         sortable: true,
         sorter: CommonSorter(["note"])
       },
-      AgeColumnRenderer(i18n2, { title: i18n2.t("dovetail.last_seen") })
+      AgeColumnRenderer(i18n2, { title: i18n2.t("dovetail.last_seen"), width: 160 }, { isRelativeTime: false })
     ],
     [i18n2]
   );
@@ -10747,7 +10749,7 @@ function Tabs(props) {
     return /* @__PURE__ */ jsxRuntimeExports.jsx(kit.tabsTabPane, { tab: tab.title, children: tab.children }, tab.title);
   }) });
 }
-const ShowContent_1iepja4 = "";
+const ShowContent_1947rqs = "";
 const ShowContentWrapperStyle = "s9agep2";
 const BackButton = "bo89gfi";
 const ToolBarWrapper = "t1ohe42f";
@@ -10997,7 +10999,7 @@ const WorkloadPodsTable = ({
   if ((dataSource == null ? void 0 : dataSource.length) === 0) {
     return /* @__PURE__ */ jsxRuntimeExports.jsx(WidgetErrorContent$1, {
       errorText: i18n2.t("dovetail.no_resource", {
-        kind: i18n2.t("dovetail.pod")
+        kind: ` ${i18n2.t("dovetail.pod")}`
       }),
       style: {
         padding: "15px 0"
@@ -11337,7 +11339,7 @@ function WorkloadReplicas({
       children: [/* @__PURE__ */ jsxRuntimeExports.jsxs("tr", {
         children: [/* @__PURE__ */ jsxRuntimeExports.jsx("td", {
           className: cx_default(LabelStyle, Typo.Label.l3_regular),
-          children: t2("dovetail.pod_ready_num")
+          children: record.kind === "Job" ? t2("dovetail.pod_complete_num") : t2("dovetail.pod_ready_num")
         }), /* @__PURE__ */ jsxRuntimeExports.jsx("td", {
           className: cx_default(ValueStyle, Typo.Label.l3_regular),
           children: readyReplicas
@@ -11527,7 +11529,7 @@ const EventsTableTabField = () => {
     key: "event",
     path: [],
     renderContent: () => {
-      return /* @__PURE__ */ jsxRuntimeExports.jsx(EventsTable, {});
+      return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { style: { padding: "0 24px", height: "100%" }, children: /* @__PURE__ */ jsxRuntimeExports.jsx(EventsTable, {}) });
     }
   };
 };
@@ -18319,7 +18321,7 @@ function ResourceList(props) {
     useTableParams: {},
     columns: [nameRenderer, ...(columns == null ? void 0 : columns()) || []],
     tableProps: {
-      currentSize: 10
+      currentSize: 50
     },
     formatter,
     Dropdown
@@ -22182,7 +22184,7 @@ const Separator = () => {
   });
 };
 const MonacoYamlEditor = React__default.lazy(() => Promise.resolve().then(() => MonacoYamlEditor$2));
-const MonacoYamlDiffEditor = React__default.lazy(() => import("./MonacoYamlDiffEditor-bbf8d9dd.js"));
+const MonacoYamlDiffEditor = React__default.lazy(() => import("./MonacoYamlDiffEditor-68b40e77.js"));
 const YamlEditorComponent = forwardRef(
   function YamlEditorComponent2(props, ref) {
     const {
@@ -23439,6 +23441,7 @@ const WorkloadRestartsColumnRenderer = (i18n2) => {
     display: true,
     width: 120,
     dataIndex,
+    align: "right",
     title: i18n2.t("dovetail.restarts"),
     sortable: false
   };
@@ -23467,7 +23470,9 @@ const ReplicasColumnRenderer = (i18n2) => {
     }
   };
 };
-const AgeColumnRenderer = (i18n2, config) => {
+const AgeColumnRenderer = (i18n2, config, {
+  isRelativeTime = true
+} = {}) => {
   const dataIndex = ["metadata", "creationTimestamp"];
   return {
     key: "creationTimestamp",
@@ -23486,8 +23491,10 @@ const AgeColumnRenderer = (i18n2, config) => {
       return -1;
     },
     render: (value2) => {
-      return /* @__PURE__ */ jsxRuntimeExports.jsx(Time, {
+      return isRelativeTime ? /* @__PURE__ */ jsxRuntimeExports.jsx(Time, {
         date: new Date(value2)
+      }) : /* @__PURE__ */ jsxRuntimeExports.jsx(ValueDisplay, {
+        value: dayjs(value2).format("YYYY-MM-DD hh:mm:ss")
       });
     },
     ...config
@@ -23548,6 +23555,7 @@ const DurationColumnRenderer = (i18n2) => {
     sortable: true,
     sorter: CommonSorter(dataIndex),
     width: 120,
+    align: "right",
     render: (v) => {
       return /* @__PURE__ */ jsxRuntimeExports.jsx(DurationTime, {
         value: v

package/dist/refine.js

@@ -1,4 +1,4 @@
-import { b3, A, aw, ay, ag, bj, aG, E, bx, bl, aq, t, C, g, bK, aj, aK, U, bM, Z, a4, bV, a8, bm, bk, bY, am, aQ, q, ae, aV, bX, bH, aZ, D, aD, a$, bW, aE, au, b6, bJ, bL, bv, ah, _, n, m, bN, I, aN, at, o, bn, bP, al, aM, a9, aa, M, ab, ax, af, aW, a_, O, bw, b2, N, F, b, av, K, b5, aS, aR, bO, bh, e, bp, Q, P, aI, p, V, bg, aF, bT, bS, aB, aO, l, ak, aH, s, aP, aC, c0, bI, b0, b7, b8, ai, R, Y, a2, a1, b1, $, bU, a0, a5, f, bC, bF, bB, bA, bD, bE, by, bq, bt, bu, bs, br, bo, b9, an, aL, ac, i, bc, az, b$, k, bd, aA, as, aJ, h, b_, ap, ar, aU, aT, ao, S, aY, aX, bZ, bz, bi, be, bf, T, bR, X, W, bQ, a3, a7, a6, c, bG, ad, ba, v, G, d, L, J, H, r, a, x, w, y, z, b4, B, bb, u } from "./index-83577f15.js";
+import { b3, A, aw, ay, ag, bj, aG, E, bx, bl, aq, t, C, g, bK, aj, aK, U, bM, Z, a4, bV, a8, bm, bk, bY, am, aQ, q, ae, aV, bX, bH, aZ, D, aD, a$, bW, aE, au, b6, bJ, bL, bv, ah, _, n, m, bN, I, aN, at, o, bn, bP, al, aM, a9, aa, M, ab, ax, af, aW, a_, O, bw, b2, N, F, b, av, K, b5, aS, aR, bO, bh, e, bp, Q, P, aI, p, V, bg, aF, bT, bS, aB, aO, l, ak, aH, s, aP, aC, c0, bI, b0, b7, b8, ai, R, Y, a2, a1, b1, $, bU, a0, a5, f, bC, bF, bB, bA, bD, bE, by, bq, bt, bu, bs, br, bo, b9, an, aL, ac, i, bc, az, b$, k, bd, aA, as, aJ, h, b_, ap, ar, aU, aT, ao, S, aY, aX, bZ, bz, bi, be, bf, T, bR, X, W, bQ, a3, a7, a6, c, bG, ad, ba, v, G, d, L, J, H, r, a, x, w, y, z, b4, B, bb, u } from "./index-8f13370f.js";
 import "@cloudtower/eagle";
 import "@refinedev/core";
 import "@cloudtower/icons-react";

package/dist/refine.umd.cjs

@@ -1328,6 +1328,7 @@ var __publicField = (obj, key, value) => {
   const ingress_class = "Ingress 类";
   const port = "端口";
   const pod_ready_num = "Pod 就绪数量";
+  const pod_complete_num = "Pod 完成数量";
   const pod_replicas_num = "Pod 预期数量";
   const edit_replicas = "编辑预期副本数";
   const cert = "证书";
@@ -1478,6 +1479,7 @@ var __publicField = (obj, key, value) => {
     ingress_class,
     port,
     pod_ready_num,
+    pod_complete_num,
     pod_replicas_num,
     edit_replicas,
     cert,
@@ -8121,7 +8123,7 @@ var __publicField = (obj, key, value) => {
       openDeleteConfirmModal
     };
   };
-  const index_r5625l = "";
+  const index_wrn16i = "";
   const EMPTY_VALUES = [void 0, null, "", "-"];
   const EmptyStyle = "e5223w8";
   const ContentStyle$2 = "cdjsw14";
@@ -10422,7 +10424,7 @@ var __publicField = (obj, key, value) => {
           sortable: true,
           sorter: CommonSorter(["note"])
         },
-        AgeColumnRenderer(i18n2, { title: i18n2.t("dovetail.last_seen") })
+        AgeColumnRenderer(i18n2, { title: i18n2.t("dovetail.last_seen"), width: 160 }, { isRelativeTime: false })
       ],
       [i18n2]
     );
@@ -10753,7 +10755,7 @@ var __publicField = (obj, key, value) => {
       return /* @__PURE__ */ jsxRuntimeExports.jsx(kit.tabsTabPane, { tab: tab.title, children: tab.children }, tab.title);
     }) });
   }
-  const ShowContent_1iepja4 = "";
+  const ShowContent_1947rqs = "";
   const ShowContentWrapperStyle = "s9agep2";
   const BackButton = "bo89gfi";
   const ToolBarWrapper = "t1ohe42f";
@@ -11003,7 +11005,7 @@ var __publicField = (obj, key, value) => {
     if ((dataSource == null ? void 0 : dataSource.length) === 0) {
       return /* @__PURE__ */ jsxRuntimeExports.jsx(WidgetErrorContent$1, {
         errorText: i18n2.t("dovetail.no_resource", {
-          kind: i18n2.t("dovetail.pod")
+          kind: ` ${i18n2.t("dovetail.pod")}`
         }),
         style: {
           padding: "15px 0"
@@ -11343,7 +11345,7 @@ var __publicField = (obj, key, value) => {
         children: [/* @__PURE__ */ jsxRuntimeExports.jsxs("tr", {
           children: [/* @__PURE__ */ jsxRuntimeExports.jsx("td", {
             className: cx_default(LabelStyle, eagle.Typo.Label.l3_regular),
-            children: t2("dovetail.pod_ready_num")
+            children: record.kind === "Job" ? t2("dovetail.pod_complete_num") : t2("dovetail.pod_ready_num")
           }), /* @__PURE__ */ jsxRuntimeExports.jsx("td", {
             className: cx_default(ValueStyle, eagle.Typo.Label.l3_regular),
             children: readyReplicas
@@ -11533,7 +11535,7 @@ var __publicField = (obj, key, value) => {
       key: "event",
       path: [],
       renderContent: () => {
-        return /* @__PURE__ */ jsxRuntimeExports.jsx(EventsTable, {});
+        return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { style: { padding: "0 24px", height: "100%" }, children: /* @__PURE__ */ jsxRuntimeExports.jsx(EventsTable, {}) });
       }
     };
   };
@@ -18325,7 +18327,7 @@ var __publicField = (obj, key, value) => {
       useTableParams: {},
       columns: [nameRenderer, ...(columns == null ? void 0 : columns()) || []],
       tableProps: {
-        currentSize: 10
+        currentSize: 50
       },
       formatter,
       Dropdown
@@ -23445,6 +23447,7 @@ var __publicField = (obj, key, value) => {
       display: true,
       width: 120,
       dataIndex,
+      align: "right",
       title: i18n2.t("dovetail.restarts"),
       sortable: false
     };
@@ -23473,7 +23476,9 @@ var __publicField = (obj, key, value) => {
       }
     };
   };
-  const AgeColumnRenderer = (i18n2, config) => {
+  const AgeColumnRenderer = (i18n2, config, {
+    isRelativeTime = true
+  } = {}) => {
     const dataIndex = ["metadata", "creationTimestamp"];
     return {
       key: "creationTimestamp",
@@ -23492,8 +23497,10 @@ var __publicField = (obj, key, value) => {
         return -1;
       },
       render: (value2) => {
-        return /* @__PURE__ */ jsxRuntimeExports.jsx(Time, {
+        return isRelativeTime ? /* @__PURE__ */ jsxRuntimeExports.jsx(Time, {
           date: new Date(value2)
+        }) : /* @__PURE__ */ jsxRuntimeExports.jsx(ValueDisplay, {
+          value: dayjs(value2).format("YYYY-MM-DD hh:mm:ss")
         });
       },
       ...config
@@ -23554,6 +23561,7 @@ var __publicField = (obj, key, value) => {
       sortable: true,
       sorter: CommonSorter(dataIndex),
       width: 120,
+      align: "right",
       render: (v) => {
         return /* @__PURE__ */ jsxRuntimeExports.jsx(DurationTime, {
           value: v

package/dist/style.css

@@ -1,7 +1,7 @@
 .t1vq0ett{margin-bottom:4px;}
 .t139onst{color:rgba(44,56,82,0.60);}
 .m18lzor8.ant-modal .ant-modal-content{border-radius:16px;}.m18lzor8.ant-modal .ant-modal-header{border-radius:16px 16px 0 0;}
-.e5223w8{color:rgba(0,21,64,.3);}
+.e5223w8.e5223w8{color:rgba(0,21,64,.3);}
 .cdjsw14{width:100%;}.cdjsw14.overflow{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}
 .b142d7q8{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;}.b142d7q8 .breadcrumb-item:not(:last-of-type):after{content:'>';margin:0 8px;}
 .egn3dbn{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:100%;}
@@ -34,7 +34,7 @@
 .nqm4qz0{color:#00122E;margin-right:8px;}
 .ticl0qc{-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;width:100%;}
 .so9uwk1{width:100%;}
-.ge26ou0{padding:12px 16px;border-radius:8px;border:1px solid rgba(211,218,235,0.6);box-shadow: 0px 0px 2.003px 0px rgba(107,125,153,0.15), 0px 0px 16px 0px rgba(107,125,153,0.08);background-color:#fff;margin:16px 24px;overflow:auto;margin-bottom:0;width:calc(100% - 48px);max-width:1592px;}.ge26ou0:not(:last-of-type){margin-bottom:24px;}
+.ge26ou0{padding:12px 16px;border-radius:8px;border:1px solid rgba(211,218,235,0.6);box-shadow: 0px 0px 2.003px 0px rgba(107,125,153,0.15), 0px 0px 16px 0px rgba(107,125,153,0.08);background-color:#fff;margin:0 24px;overflow:auto;margin-bottom:0;width:calc(100% - 48px);max-width:1592px;}.ge26ou0:first-of-type{margin-top:16px;}.ge26ou0:not(:last-of-type){margin-bottom:24px;}
 .g17f8vl9{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;color:#1d326c;margin-bottom:12px;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;}
 .fykgn2i{background-color:#fff;height:100%;}
 .fngr745{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:nowrap;-ms-flex-wrap:nowrap;flex-wrap:nowrap;}

package/lib/src/hooks/useEagleTable/columns.d.ts

@@ -11,6 +11,9 @@ export declare const WorkloadRestartsColumnRenderer: <Model extends WorkloadMode
 export declare const ReplicasColumnRenderer: <Model extends WorkloadModel>(i18n: I18nType) => Column<Model>;
 export declare const AgeColumnRenderer: <Model extends ResourceModel<import("k8s-api-provider").Unstructured>>(i18n: I18nType, config?: {
     title?: string;
+    width: number;
+}, { isRelativeTime }?: {
+    isRelativeTime?: boolean | undefined;
 }) => Column<Model>;
 export declare const NodeNameColumnRenderer: <Model extends PodModel>(i18n: I18nType, options?: Partial<Column<Model>> | undefined) => Column<Model>;
 export declare const RestartCountColumnRenderer: <Model extends PodModel>(i18n: I18nType) => Column<Model>;

package/lib/src/i18n.d.ts

@@ -208,6 +208,7 @@ export declare const resources: {
             ingress_class: string;
             port: string;
             pod_ready_num: string;
+            pod_complete_num: string;
             pod_replicas_num: string;
             edit_replicas: string;
             cert: string;

package/lib/src/locales/zh-CN/index.d.ts

@@ -82,6 +82,7 @@ declare const _default: {
         ingress_class: string;
         port: string;
         pod_ready_num: string;
+        pod_complete_num: string;
         pod_replicas_num: string;
         edit_replicas: string;
         cert: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dovetail-v2/refine",
-  "version": "0.0.35-beta.3",
+  "version": "0.0.35-beta.4",
   "type": "module",
   "files": [
     "dist",