[fix] some Type detail bugs

wuhan2020 · Jun 19, 2024 · 3eb6aea · 3eb6aea · github-actions · Jun 19, 2024
1 parent 67954c1
commit 3eb6aea
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 34 deletions.
diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
     "dependencies": {
         "boot-cell": "^2.0.0-beta.29",
         "browser-unhandled-rejection": "^1.0.2",
-        "cell-router": "^3.0.0-rc.7",
+        "cell-router": "^3.0.0-rc.8",
         "classnames": "^2.5.1",
         "dom-renderer": "^2.1.8",
         "echarts": "^5.5.0",
@@ -34,7 +34,7 @@
         "@parcel/transformer-less": "~2.12.0",
         "@parcel/transformer-typescript-tsc": "~2.12.0",
         "@parcel/transformer-webmanifest": "~2.12.0",
-        "@types/node": "^18.19.36",
+        "@types/node": "^18.19.37",
         "@typescript-eslint/eslint-plugin": "^7.13.1",
         "@typescript-eslint/parser": "^7.13.1",
         "buffer": "^6.0.3",
@@ -72,7 +72,7 @@
     "browserslist": "> 0.5%, last 2 versions, not dead, IE 11",
     "scripts": {
         "prepare": "husky",
-        "test": "lint-staged",
+        "test": "lint-staged  &&  tsc --noEmit",
         "clean": "rm -rf .parcel-cache/ dist/",
         "start:local": "npm run clean  &&  cross-env HTTP_ENV=local  parcel source/index.html --open",
         "start:remote": "npm run clean  &&  cross-env HTTP_ENV=remote  parcel source/index.html --open",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/source/component/AuditBar.tsx b/source/component/AuditBar.tsx
@@ -4,11 +4,11 @@ import { Button, ButtonGroup } from 'boot-cell';
 
 import { TimeUnitName } from '../utility';
 import { DataItem, Organization } from '../service';
-import { session, BaseModel, VerifiableModel } from '../model';
+import { session, VerifiableModel } from '../model';
 
-export interface AuditBarProps extends DataItem, Organization {
+export interface AuditBarProps<T> extends DataItem, Organization {
     scope: string;
-    model: BaseModel;
+    model: VerifiableModel<T>;
 }
 
 const TimeStamp: FC<Record<'date' | 'phone' | 'label', string>> = ({
@@ -26,7 +26,7 @@ const TimeStamp: FC<Record<'date' | 'phone' | 'label', string>> = ({
     );
 };
 
-export const AuditBar: FC<AuditBarProps> = observer(props => {
+export const AuditBar = observer(function <T>(props: AuditBarProps<T>) {
     const {
         createdAt,
         updatedAt,

diff --git a/source/component/CardsPage.tsx b/source/component/CardsPage.tsx
@@ -7,26 +7,24 @@ import {
     TouchHandler
 } from 'boot-cell';
 import { CustomElement } from 'web-utility';
+import { Filter } from 'mobx-restful';
 
 import { DistrictEvent, DistrictFilter, District } from './DistrictFilter';
 import { VerifiableModel, session } from '../model';
+import { DataItem } from '../service';
 
-export abstract class CardsPage<T>
+export abstract class CardsPage<T extends DataItem>
     extends HTMLElement
     implements CustomElement
 {
     abstract scope: string;
-    abstract model: VerifiableModel;
+    abstract model: VerifiableModel<T>;
     abstract name: string;
     districtFilter = false;
 
-    filter: District & { verified?: boolean } = {
+    filter = {
         verified: !session.hasRole('Admin')
-    };
-
-    mountedCallback() {
-        this.model.getList(this.filter);
-    }
+    } as Filter<T> & District & { verified?: boolean };
 
     disconnectedCallback() {
         this.model.clear();
@@ -37,10 +35,7 @@ export abstract class CardsPage<T>
     };
 
     changeDistrict = ({ detail }: DistrictEvent) =>
-        this.model.getList(
-            (this.filter = { ...detail, verified: this.filter.verified }),
-            1
-        );
+        this.model.getList((this.filter = { ...this.filter, ...detail }), 1);
 
     changeVerified = ({ target }: Event) => {
         const { checked } = target as HTMLInputElement;

diff --git a/source/page/Map/index.tsx b/source/page/Map/index.tsx
@@ -3,7 +3,7 @@ import { observable } from 'mobx';
 import { SpinnerBox } from 'boot-cell';
 import { CustomElement, Hour } from 'web-utility';
 
-import { HierarchicalVirusMap, VirusChart } from './component';
+import { HierarchicalVirusMap } from './component';
 import {
     Series,
     ProvinceData,
@@ -65,7 +65,6 @@ export default class MapsPage extends HTMLElement implements CustomElement {
                         resolution={resolution}
                     />
                 )}
-                <VirusChart className="vh-100" />
             </SpinnerBox>
         );
     }

diff --git a/tsconfig.json b/tsconfig.json
@@ -7,7 +7,7 @@
         "useDefineForClassFields": true,
         "jsx": "react-jsx",
         "jsxImportSource": "dom-renderer",
-        "lib": ["ES2023", "DOM"]
+        "lib": ["ESNext", "DOM"]
     },
     "include": ["source/**/*", "*.ts"]
 }