Merge pull request #23 from fantasticit/feat/version

close #3

packages/client/src/components/data-render/index.tsx

@@ -1,13 +1,16 @@
 import React from 'react';
 import { Spin, Typography } from '@douyinfe/semi-ui';
+import { Empty } from 'illustrations/empty';
 
 type RenderProps = React.ReactNode | (() => React.ReactNode);
 
 interface IProps {
   loading: boolean;
   error: Error | null;
+  empty?: boolean;
   loadingContent?: RenderProps;
   errorContent?: RenderProps;
+  emptyContent?: RenderProps;
   normalContent: RenderProps;
 }
 
@@ -21,13 +24,37 @@ const defaultRenderError = (error) => {
   return <Text>{(error && error.message) || '未知错误'}</Text>;
 };
 
+const defaultEmpty = () => {
+  return (
+    <div
+      style={{
+        display: 'flex',
+        alignItems: 'center',
+        justifyContent: 'center',
+        flexDirection: 'column',
+        position: 'relative',
+        top: '50%',
+        left: '50%',
+        transform: 'translate(-50%, -50%)',
+      }}
+    >
+      <div>
+        <Empty />
+      </div>
+      <Text type="tertiary">暂无数据</Text>
+    </div>
+  );
+};
+
 const runRender = (fn, ...args) => (typeof fn === 'function' ? fn.apply(null, args) : fn);
 
 export const DataRender: React.FC<IProps> = ({
   loading,
   error,
+  empty,
   loadingContent = defaultLoading,
   errorContent = defaultRenderError,
+  emptyContent = defaultEmpty,
   normalContent,
 }) => {
   if (loading) {
@@ -38,5 +65,9 @@ export const DataRender: React.FC<IProps> = ({
     return runRender(errorContent, error);
   }
 
+  if (empty) {
+    return runRender(emptyContent);
+  }
+
   return runRender(normalContent);
 };

packages/client/src/components/document/version/index.tsx

@@ -6,6 +6,7 @@ import cls from 'classnames';
 import { DEFAULT_EXTENSION, DocumentWithTitle } from 'tiptap';
 import { safeJSONParse } from 'helpers/json';
 import { DataRender } from 'components/data-render';
+import { LocaleTime } from 'components/locale-time';
 import { useToggle } from 'hooks/use-toggle';
 import { useDocumentVersion } from 'data/document';
 import styles from './index.module.scss';
@@ -102,6 +103,7 @@ export const DocumentVersion: React.FC<IProps> = ({ documentId, onSelect }) => {
         <DataRender
           loading={loading}
           error={error}
+          empty={!loading && !data.length}
           normalContent={() => (
             <div className={styles.contentWrap}>
               <aside>
@@ -113,7 +115,7 @@ export const DocumentVersion: React.FC<IProps> = ({ documentId, onSelect }) => {
                         className={cls(selectedVersion && selectedVersion.version === version && styles.selected)}
                         onClick={() => select({ version, data })}
                       >
-                        {version}
+                        <LocaleTime date={+version} />
                       </li>
                     );
                   })}

packages/client/src/hooks/use-dragable-width.ts

@@ -40,7 +40,9 @@ export const useDragableWidth = () => {
 
   useEffect(() => {
     if (!windowSize.width) return;
-    toggleCollapsed(windowSize.width <= 765);
+    if (windowSize.width <= 765) {
+      toggleCollapsed(true);
+    }
   }, [windowSize.width]);
 
   return {

packages/client/src/illustrations/empty.tsx

@@ -0,0 +1,158 @@
+import React from 'react';
+
+export const Empty = () => {
+  return (
+    <svg xmlns="http://www.w3.org/2000/svg" width="20em" height="17em" viewBox="0 0 1120.59226 777.91584">
+      <title>not found</title>
+      <circle cx="212.59226" cy="103" r="64" fill="#ff6584" />
+      <path
+        d="M563.68016,404.16381c0,151.01141-89.77389,203.73895-200.51559,203.73895S162.649,555.17522,162.649,404.16381,363.16457,61.04208,363.16457,61.04208,563.68016,253.1524,563.68016,404.16381Z"
+        transform="translate(-39.70387 -61.04208)"
+        fill="#f2f2f2"
+      />
+      <polygon
+        points="316.156 523.761 318.21 397.378 403.674 241.024 318.532 377.552 319.455 320.725 378.357 207.605 319.699 305.687 319.699 305.687 321.359 203.481 384.433 113.423 321.621 187.409 322.658 0 316.138 248.096 316.674 237.861 252.547 139.704 315.646 257.508 309.671 371.654 309.493 368.625 235.565 265.329 309.269 379.328 308.522 393.603 308.388 393.818 308.449 394.99 293.29 684.589 313.544 684.589 315.974 535.005 389.496 421.285 316.156 523.761"
+        fill="#3f3d56"
+      />
+      <path
+        d="M1160.29613,466.01367c0,123.61-73.4842,166.77-164.13156,166.77s-164.13156-43.16-164.13156-166.77S996.16457,185.15218,996.16457,185.15218,1160.29613,342.40364,1160.29613,466.01367Z"
+        transform="translate(-39.70387 -61.04208)"
+        fill="#f2f2f2"
+      />
+      <polygon
+        points="950.482 552.833 952.162 449.383 1022.119 321.4 952.426 433.154 953.182 386.639 1001.396 294.044 953.382 374.329 953.382 374.329 954.741 290.669 1006.369 216.952 954.954 277.514 955.804 124.11 950.467 327.188 950.906 318.811 898.414 238.464 950.064 334.893 945.173 428.327 945.027 425.847 884.514 341.294 944.844 434.608 944.232 446.293 944.123 446.469 944.173 447.428 931.764 684.478 948.343 684.478 950.332 562.037 1010.514 468.952 950.482 552.833"
+        fill="#3f3d56"
+      />
+      <ellipse cx="554.59226" cy="680.47903" rx="554.59226" ry="28.03433" fill="#3f3d56" />
+      <ellipse cx="892.44491" cy="726.79663" rx="94.98858" ry="4.80162" fill="#3f3d56" />
+      <ellipse cx="548.71959" cy="773.11422" rx="94.98858" ry="4.80162" fill="#3f3d56" />
+      <ellipse cx="287.94432" cy="734.27887" rx="217.01436" ry="10.96996" fill="#3f3d56" />
+      <circle cx="97.08375" cy="566.26982" r="79" fill="#2f2e41" />
+      <rect
+        x="99.80546"
+        y="689.02332"
+        width="24"
+        height="43"
+        transform="translate(-31.32451 -62.31008) rotate(0.67509)"
+        fill="#2f2e41"
+      />
+      <rect
+        x="147.80213"
+        y="689.58887"
+        width="24"
+        height="43"
+        transform="translate(-31.31452 -62.87555) rotate(0.67509)"
+        fill="#2f2e41"
+      />
+      <ellipse
+        cx="119.54569"
+        cy="732.61606"
+        rx="7.5"
+        ry="20"
+        transform="translate(-654.1319 782.47948) rotate(-89.32491)"
+        fill="#2f2e41"
+      />
+      <ellipse
+        cx="167.55414"
+        cy="732.18168"
+        rx="7.5"
+        ry="20"
+        transform="translate(-606.25475 830.05533) rotate(-89.32491)"
+        fill="#2f2e41"
+      />
+      <circle cx="99.31925" cy="546.29477" r="27" fill="#fff" />
+      <circle cx="99.31925" cy="546.29477" r="9" fill="#3f3d56" />
+      <path
+        d="M61.02588,552.94636c-6.04185-28.64075,14.68758-57.26483,46.30049-63.93367s62.13813,11.14292,68.18,39.78367-14.97834,38.93-46.59124,45.59886S67.06774,581.58712,61.02588,552.94636Z"
+        transform="translate(-39.70387 -61.04208)"
+        fill="#6c63ff"
+      />
+      <path
+        d="M257.29613,671.38411c0,55.07585-32.73985,74.3063-73.13,74.3063q-1.40351,0-2.80255-.0312c-1.87139-.04011-3.72494-.1292-5.55619-.254-36.45135-2.57979-64.77127-22.79937-64.77127-74.02113,0-53.00843,67.73872-119.89612,72.827-124.84633l.00892-.00889c.19608-.19159.29409-.28516.29409-.28516S257.29613,616.30827,257.29613,671.38411Z"
+        transform="translate(-39.70387 -61.04208)"
+        fill="#6c63ff"
+      />
+      <path
+        d="M181.50168,737.26482l26.747-37.37367-26.81386,41.4773-.07125,4.29076c-1.87139-.04011-3.72494-.1292-5.55619-.254l2.88282-55.10258-.0223-.42775.049-.0802.27179-5.20415-26.88076-41.5798,26.96539,37.67668.06244,1.105,2.17874-41.63324-23.0132-42.96551,23.29391,35.6583,2.26789-86.31419.00892-.294v.28516l-.37871,68.064,22.91079-26.98321-23.00435,32.84678-.60595,37.27566L204.18523,621.958l-21.4805,41.259-.33863,20.723,31.05561-49.79149-31.17146,57.023Z"
+        transform="translate(-39.70387 -61.04208)"
+        fill="#3f3d56"
+      />
+      <circle cx="712.48505" cy="565.41532" r="79" fill="#2f2e41" />
+      <rect
+        x="741.77716"
+        y="691.82355"
+        width="24"
+        height="43"
+        transform="translate(-215.99457 191.86399) rotate(-17.08345)"
+        fill="#2f2e41"
+      />
+      <rect
+        x="787.6593"
+        y="677.72286"
+        width="24"
+        height="43"
+        transform="matrix(0.95588, -0.29376, 0.29376, 0.95588, -209.82788, 204.72037)"
+        fill="#2f2e41"
+      />
+      <ellipse
+        cx="767.887"
+        cy="732.00275"
+        rx="20"
+        ry="7.5"
+        transform="translate(-220.8593 196.83312) rotate(-17.08345)"
+        fill="#2f2e41"
+      />
+      <ellipse
+        cx="813.47537"
+        cy="716.94619"
+        rx="20"
+        ry="7.5"
+        transform="translate(-214.42477 209.56103) rotate(-17.08345)"
+        fill="#2f2e41"
+      />
+      <circle cx="708.52153" cy="545.71023" r="27" fill="#fff" />
+      <circle cx="708.52153" cy="545.71023" r="9" fill="#3f3d56" />
+      <path
+        d="M657.35526,578.74316c-14.48957-25.43323-3.47841-59.016,24.59412-75.0092s62.57592-8.34055,77.06549,17.09268-2.39072,41.6435-30.46325,57.63671S671.84483,604.17639,657.35526,578.74316Z"
+        transform="translate(-39.70387 -61.04208)"
+        fill="#6c63ff"
+      />
+      <path
+        d="M611.29613,661.29875c0,50.55711-30.05368,68.20979-67.13,68.20979q-1.28835,0-2.57261-.02864c-1.71785-.03682-3.41933-.1186-5.10033-.23313-33.46068-2.36813-59.45707-20.92878-59.45707-67.948,0-48.65932,62.18106-110.05916,66.85186-114.60322l.00819-.00817c.18-.17587.27-.26177.27-.26177S611.29613,610.74164,611.29613,661.29875Z"
+        transform="translate(-39.70387 -61.04208)"
+        fill="#6c63ff"
+      />
+      <path
+        d="M541.72029,721.77424l24.55253-34.30732-24.6139,38.07426-.0654,3.93872c-1.71785-.03682-3.41933-.1186-5.10033-.23313l2.6463-50.58165-.02047-.39266.045-.07361.24949-4.77718-24.67531-38.16836,24.753,34.58547.05731,1.01433,2-38.21741-21.12507-39.44039L541.80616,625.928l2.08182-79.23247.00819-.26994v.26177l-.34764,62.47962,21.031-24.76934-21.11693,30.15184-.55624,34.21735,19.63634-32.839-19.71812,37.87389-.31085,19.0228,28.50763-45.70631-28.614,52.34448Z"
+        transform="translate(-39.70387 -61.04208)"
+        fill="#3f3d56"
+      />
+      <path
+        d="M875.29613,682.38411c0,55.07585-32.73985,74.3063-73.13,74.3063q-1.4035,0-2.80255-.0312c-1.87139-.04011-3.72494-.1292-5.55619-.254-36.45135-2.57979-64.77127-22.79937-64.77127-74.02113,0-53.00843,67.73872-119.89612,72.827-124.84633l.00892-.00889c.19608-.19159.29409-.28516.29409-.28516S875.29613,627.30827,875.29613,682.38411Z"
+        transform="translate(-39.70387 -61.04208)"
+        fill="#6c63ff"
+      />
+      <path
+        d="M799.50168,748.26482l26.747-37.37367-26.81386,41.4773-.07125,4.29076c-1.87139-.04011-3.72494-.1292-5.55619-.254l2.88282-55.10258-.0223-.42775.049-.0802.27179-5.20415L770.108,654.01076l26.96539,37.67668.06244,1.105,2.17874-41.63324-23.0132-42.96551,23.29391,35.6583,2.26789-86.31419.00892-.294v.28516l-.37871,68.064,22.91079-26.98321-23.00435,32.84678-.606,37.27566L822.18523,632.958l-21.4805,41.259-.33863,20.723,31.05561-49.79149-31.17146,57.023Z"
+        transform="translate(-39.70387 -61.04208)"
+        fill="#3f3d56"
+      />
+      <ellipse
+        cx="721.51694"
+        cy="656.82212"
+        rx="12.40027"
+        ry="39.5"
+        transform="translate(-220.83517 966.22323) rotate(-64.62574)"
+        fill="#2f2e41"
+      />
+      <ellipse
+        cx="112.51694"
+        cy="651.82212"
+        rx="12.40027"
+        ry="39.5"
+        transform="translate(-574.07936 452.71367) rotate(-68.15829)"
+        fill="#2f2e41"
+      />
+    </svg>
+  );
+};

packages/client/src/styles/globals.scss

@@ -27,13 +27,13 @@
 
 .Resizer {
   z-index: 1;
-  background: var(--semi-color-border);
   opacity: 0.2;
   box-sizing: border-box;
   background-clip: padding;
 }
 
 .Resizer:hover {
+  background: var(--semi-color-border);
   transition: all 2s ease;
 }
 

packages/server/src/services/document-version.service.ts

@@ -14,12 +14,10 @@ export class DocumentVersionService {
     this.init();
   }
 
-  private versionDataToArray(
+  private versionDataToArray(data: Record<string, string>): Array<{ version: string; data: string }> {
-    data: Record<string, string>
-  ): Array<{ originVerison: string; version: string; data: string }> {
     return Object.keys(data)
       .sort((a, b) => +b - +a)
-      .map((key) => ({ originVerison: key, version: new Date(+key).toLocaleString(), data: data[key] }));
+      .map((key) => ({ version: key, data: data[key] }));
   }
 
   private async init() {
@@ -67,7 +65,7 @@ export class DocumentVersionService {
     const data = this.versionDataToArray(res);
 
     while (data.length > this.max) {
-      const lastVersion = data.pop().originVerison;
+      const lastVersion = data.pop().version;
       await this.redis.hdel(documentId, lastVersion);
     }
   }