refactor: set @typescript-eslint/no-non-null-assertion to error only …

…for ui
DevCloudFE · Mar 16, 2023 · 7e3d257 · 7e3d257
1 parent 1b5ec00
commit 7e3d257
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 20 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -81,7 +81,6 @@
             "ignoreProperties": true
           }
         ],
-        "@typescript-eslint/no-non-null-assertion": "error",
         "no-unused-vars": "off",
         "@typescript-eslint/no-unused-vars": [
           "error",

diff --git a/packages/platform/src/app/components/map/MapMarkerCluster.tsx b/packages/platform/src/app/components/map/MapMarkerCluster.tsx
@@ -103,7 +103,6 @@ export function AppMapMarkerCluster<T extends MarkerClusterDataOption>(props: Ap
               if (!isUndefined(color)) {
                 content.style.color = color;
               }
-              // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
               content.firstElementChild!.innerHTML = String(context.count);
 
               context.marker.setOffset(new AMap.Pixel(-size / 2, -size / 2));

diff --git a/packages/platform/src/app/components/table/Table.tsx b/packages/platform/src/app/components/table/Table.tsx
@@ -174,7 +174,6 @@ export function AppTable<T = any>(props: AppTableProps<T>): JSX.Element | null {
                                     dPlacement="bottom-right"
                                     onItemClick={(id) => {
                                       if (actions[id].link) {
-                                        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                                         navigate(actions[id].link!);
                                       } else {
                                         return actions[id].onclick?.();
@@ -262,7 +261,6 @@ export function AppTable<T = any>(props: AppTableProps<T>): JSX.Element | null {
                                 dPlacement="bottom-right"
                                 onItemClick={(id) => {
                                   if (actions[id].link) {
-                                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                                     navigate(actions[id].link!);
                                   } else {
                                     return actions[id].onclick?.();
@@ -315,7 +313,6 @@ export function AppTable<T = any>(props: AppTableProps<T>): JSX.Element | null {
                         <DCard.Action
                           title="edit"
                           onClick={() => {
-                            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                             navigate(action.link!);
                           }}
                         >
@@ -344,7 +341,6 @@ export function AppTable<T = any>(props: AppTableProps<T>): JSX.Element | null {
                                   dPlacement="bottom-right"
                                   onItemClick={(id) => {
                                     if (actions[id].link) {
-                                      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                                       navigate(actions[id].link!);
                                     } else {
                                       return actions[id].onclick?.();

diff --git a/packages/platform/src/app/core/http/mock.ts b/packages/platform/src/app/core/http/mock.ts
@@ -127,7 +127,6 @@ if (environment.http.mock) {
   mock.onGet(/\/api\/v1\/device\/[0-9]+/).reply((config) => {
     return new Promise((resolve) => {
       setTimeout(() => {
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         resolve([200, deviceList.find((device) => device.id === Number(config.url!.match(/[0-9]+$/)![0]))]);
       }, 500);
     });

diff --git a/packages/platform/src/app/routes/list/standard-table/DeviceModal.tsx b/packages/platform/src/app/routes/list/standard-table/DeviceModal.tsx
@@ -30,7 +30,10 @@ export function AppDeviceModal(props: AppDeviceModalProps): JSX.Element | null {
       model: new FormControl<string | null>(null, Validators.required),
     });
     if (aDevice) {
-      form.reset({ name: aDevice.name });
+      form.reset({
+        name: aDevice.name,
+        model: aDevice.model,
+      });
     }
     return form;
   });
@@ -47,10 +50,6 @@ export function AppDeviceModal(props: AppDeviceModalProps): JSX.Element | null {
             disabled: model.disabled,
           }))
         );
-        if (aDevice) {
-          form.patchValue({ model: aDevice.model });
-          updateForm();
-        }
       },
     });
   });

diff --git a/packages/platform/src/app/routes/list/standard-table/StandardTable.tsx b/packages/platform/src/app/routes/list/standard-table/StandardTable.tsx
@@ -41,7 +41,7 @@ export default AppRoute(() => {
     page: 1,
     pageSize: 10,
   });
-  const [deviceQuery, setDeviceQuery] = useImmer<DeviceQueryParams>({ ...deviceQuerySaved, model: [] });
+  const [deviceQuery, setDeviceQuery] = useImmer(deviceQuerySaved);
   const queryEmptyStatus = (() => {
     const getEmptyStatus = (query: DeviceQueryParams) => ({
       keyword: query.keyword.length === 0,
@@ -80,9 +80,6 @@ export default AppRoute(() => {
             disabled: model.disabled,
           }))
         );
-        setDeviceQuery((draft) => {
-          draft.model = deviceQuerySaved.model;
-        });
       },
     });
   });
@@ -198,8 +195,8 @@ export default AppRoute(() => {
                   node: (
                     <DSelect
                       style={{ width: '16em' }}
-                      dList={modelList ?? []}
                       dModel={deviceQuery.model}
+                      dList={modelList ?? []}
                       dLoading={isUndefined(modelList)}
                       dPlaceholder="Model"
                       dMultiple

diff --git a/packages/platform/src/app/routes/list/standard-table/detail/Detail.tsx b/packages/platform/src/app/routes/list/standard-table/detail/Detail.tsx
@@ -22,7 +22,6 @@ export default AppRoute(() => {
   const deviceApi = useAPI(http, '/device');
 
   const { id: _id } = useParams();
-  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   const id = Number(_id!);
 
   const [deviceLoading, setDeviceLoading] = useState(true);

diff --git a/packages/site/src/app/components/route/component/Icon.tsx b/packages/site/src/app/components/route/component/Icon.tsx
@@ -48,7 +48,6 @@ export function AppIcon() {
           dType="success"
           onClose={() => {
             setToasts((draft) => {
-              // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
               draft.find((n) => n.key === key)!.visible = false;
             });
           }}

diff --git a/packages/ui/.eslintrc.json b/packages/ui/.eslintrc.json
@@ -15,7 +15,9 @@
     },
     {
       "files": ["*.ts", "*.tsx"],
-      "rules": {}
+      "rules": {
+        "@typescript-eslint/no-non-null-assertion": "error"
+      }
     },
     {
       "files": ["*.js", "*.jsx"],