@tsingroc/tsingroc-components 5.0.0-alpha.17 → 5.0.0-alpha.19

package/dist/components/Auth.d.ts

@@ -175,9 +175,13 @@ interface CommonAuth {
     logout(redirect?: string): void;
     /**
      * 以当前用户的 access token 作为 bearer token 发起请求。
-     * 用法与正常的 {@linkcode fetch} 完全一致。未登录时，返回的 Promise 会立即失败。
+     * 用法与正常的 {@linkcode fetch} 完全一致。未登录时，返回的 Promise 会立即抛出异常。
+     * 如果请求返回的状态码是 401，则会自动跳转到登录页。可以使用 `options.redirectOn401`
+     * 选项关闭这个行为。
      */
-    fetchWithAuth(resource: RequestInfo | URL, options?: RequestInit): Promise<Response>;
+    fetchWithAuth(resource: RequestInfo | URL, options?: RequestInit & {
+        redirectOn401?: boolean;
+    }): Promise<Response>;
     /** 用户的个人信息，未经过 {@linkcode AuthCheck} 验证时为空。*/
     userInfo?: UserInfo;
     /** Access Token，未登录时为空。*/

package/dist/components/Auth.js

@@ -19,10 +19,16 @@ const commonAuth = (user, setUser) => ({
     if (!headers.has("Authorization")) {
       headers.set("Authorization", `Bearer ${token}`);
     }
-    return await fetch(resource, {
+    const resp = await fetch(resource, {
       ...options,
       headers
     });
+    if ((options?.redirectOn401 ?? true) && resp.status === 401) {
+      localStorage.removeItem("access_token");
+      setUser({});
+      throw new Error("登陆状态无效！");
+    }
+    return resp;
   }
 });
 function casdoorAuth(user, setUser, sdkConfig, signinOrigin, signinPath) {

package/dist/components/SelectableECharts.js

@@ -226,7 +226,7 @@ export const withSelectable = ECharts => function SelectableECharts(props) {
   if (inputSeries) {
     const series = {
       ...inputSeries,
-      showSymbol: selectedIndices.size > 0,
+      showSymbol: false,
       markArea: {
         itemStyle: {
           ...DEFAULT_MARK_AREA_STYLE,
@@ -240,7 +240,7 @@ export const withSelectable = ECharts => function SelectableECharts(props) {
     };
     if (inputSeries.data && (selectedIndices.size > 0 || mode === "add" && mouseState?.end)) {
       const allSelectedIndices = new Set();
-      series.data = inputSeries.data.map((point_1, i_2) => {
+      const data = inputSeries.data.map((point_1, i_2) => {
         const destructured_1 = destructureLineDataItem(point_1, i_2);
         if (destructured_1 == null) {
           return point_1;
@@ -273,26 +273,30 @@ export const withSelectable = ECharts => function SelectableECharts(props) {
           };
         }
       });
-      if (markArea) {
-        debugAssert(markAreaWidth !== undefined, "when markArea === true, markAreaWidth is guaranteed to be defined at the beginning of this function");
-        const markAreas = [];
-        for (const i_3 of allSelectedIndices) {
-          const destructured_2 = destructureLineDataItem(inputSeries.data[i_3], i_3);
-          if (destructured_2 == null) {
-            continue;
-          }
-          const [t6] = destructured_2;
-          const [xValue] = t6;
-          if (typeof xValue !== "number") {
-            continue;
+      if (allSelectedIndices.size > 0) {
+        series.data = data;
+        series.showSymbol = true;
+        if (markArea) {
+          debugAssert(markAreaWidth !== undefined, "when markArea === true, markAreaWidth is guaranteed to be defined at the beginning of this function");
+          const markAreas = [];
+          for (const i_3 of allSelectedIndices) {
+            const destructured_2 = destructureLineDataItem(inputSeries.data[i_3], i_3);
+            if (destructured_2 == null) {
+              continue;
+            }
+            const [t6] = destructured_2;
+            const [xValue] = t6;
+            if (typeof xValue !== "number") {
+              continue;
+            }
+            markAreas.push([{
+              coord: [xValue - markAreaWidth / 2]
+            }, {
+              coord: [xValue + markAreaWidth / 2]
+            }]);
           }
-          markAreas.push([{
-            coord: [xValue - markAreaWidth / 2]
-          }, {
-            coord: [xValue + markAreaWidth / 2]
-          }]);
+          series.markArea.data = markAreas;
         }
-        series.markArea.data = markAreas;
       }
     }
     const seriesArray = [...inputSeriesArray];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsingroc/tsingroc-components",
-  "version": "5.0.0-alpha.17",
+  "version": "5.0.0-alpha.19",
   "author": "",
   "license": "ISC",
   "description": "",