@kanaries/graphic-walker 0.3.12 → 0.3.14

package/src/locales/en-US.json

@@ -83,9 +83,12 @@
             "variance": "Variance"
         },
         "filter_type": {
-            "one_of": "One-Of",
+            "one_of": "Value set",
+            "one_of_desc": "Select values specified",
             "range": "Range",
-            "temporal_range": "Date Range"
+            "range_desc": "Select values in a range [start, end]",
+            "temporal_range": "Date Range",
+            "temporal_range_desc": "Select values in a date range [start, end]"
         }
     },
     "App": {
@@ -165,7 +168,7 @@
     "filters": {
         "to_edit": "Edit This Rule",
         "empty_rule": "! (empty rule)",
-        "editing": "Edit Rule",
+        "editing": "Filter Rule Settings",
         "form": {
             "name": "Field",
             "rule": "Rule"
@@ -182,6 +185,10 @@
             "reverse": "Reverse Selection",
             "confirm": "Confirm",
             "cancel": "Cancel"
+        },
+        "range": {
+            "start_value": "Start Value",
+            "end_value": "End Value"
         }
     },
     "explain": {

package/src/locales/ja-JP.json

@@ -82,9 +82,12 @@
             "variance": "分散"
         },
         "filter_type": {
-            "one_of": "1つ以上",
+            "one_of": "値のセット",
+            "one_of_desc": "指定された値を選択します",
             "range": "範囲",
-            "temporal_range": "日付範囲"
+            "range_desc": "範囲 [開始, 終了] 内の値を選択します",
+            "temporal_range": "日付範囲",
+            "temporal_range_desc": "日付範囲 [開始, 終了] 内の値を選択します"
         }
     },
     "App": {
@@ -164,7 +167,7 @@
     "filters": {
         "to_edit": "このルールを編集",
         "empty_rule": "! (空のルール)",
-        "editing": "ルールを編集",
+        "editing": "フィルタールールの設定",
         "form": {
             "name": "フィールド",
             "rule": "ルール"
@@ -181,6 +184,10 @@
             "reverse": "選択を反転する",
             "confirm": "確認",
             "cancel": "キャンセル"
+        },
+        "range": {
+            "start_value": "開始値",
+            "end_value": "終了値"
         }
     },
     "explain": {

package/src/locales/zh-CN.json

@@ -84,8 +84,11 @@
         },
         "filter_type": {
             "one_of": "按值筛选",
+            "one_of_desc": "选择指定的值",
             "range": "按范围筛选",
-            "temporal_range": "按日期范围筛选"
+            "range_desc": "选择范围内的值 [开始, 结束]",
+            "temporal_range": "按日期范围筛选",
+            "temporal_range_desc": "选择日期范围内的值 [开始, 结束]"
         }
     },
     "App": {
@@ -165,7 +168,7 @@
     "filters": {
         "to_edit": "编辑这条规则",
         "empty_rule": "! (空的规则)",
-        "editing": "编辑规则",
+        "editing": "筛选器规则设定",
         "form": {
             "name": "字段",
             "rule": "规则"
@@ -182,6 +185,10 @@
             "reverse": "选择反向",
             "confirm": "确认",
             "cancel": "取消"
+        },
+        "range": {
+            "start_value": "起始值",
+            "end_value": "终止值"
         }
     },
     "explain": {
@@ -203,6 +210,6 @@
         "next": "向后",
         "drop_field": "拖拽字段至此",
         "confirm": "确认",
-        "cencel": "取消"
+        "cancel": "取消"
     }
 }

package/src/store/index.tsx

@@ -1,62 +1,63 @@
-import React, { useContext } from 'react';
-import { CommonStore } from './commonStore'
-import { VizSpecStore } from './visualSpecStore'
+import React, { useContext, useMemo, useEffect } from 'react';
+import { CommonStore } from './commonStore';
+import { VizSpecStore } from './visualSpecStore';
 
 export interface IGlobalStore {
     commonStore: CommonStore;
     vizStore: VizSpecStore;
 }
 
-const commonStore = new CommonStore();
-const vizStore = new VizSpecStore(commonStore);
-
-const initStore: IGlobalStore = {
-    commonStore,
-    vizStore
-}
+const StoreDict: Record<string, IGlobalStore> = {};
+const createStore = () => {
+    const commonStore = new CommonStore();
+    const vizStore = new VizSpecStore(commonStore);
+    return {
+        commonStore,
+        vizStore,
+    };
+};
+const getStore = (key?: string): IGlobalStore => {
+    if (key) {
+        if (!StoreDict[key]) StoreDict[key] = createStore();
+        return StoreDict[key];
+    } else {
+        return createStore();
+    }
+};
 
 const StoreContext = React.createContext<IGlobalStore>(null!);
-
-export function destroyGWStore() {
-    initStore.commonStore.destroy();
-    initStore.vizStore.destroy();
-}
-
-export function rebootGWStore() {
-    const cs = new CommonStore();
-    const vs = new VizSpecStore(cs);
-    initStore.commonStore = cs;
-    initStore.vizStore = vs;
-}
-
 interface StoreWrapperProps {
-    keepAlive?: boolean;
+    keepAlive?: boolean | string;
     storeRef?: React.MutableRefObject<IGlobalStore | null>;
+    children?: React.ReactNode;
 }
-export class StoreWrapper extends React.Component<StoreWrapperProps> {
-    constructor(props: StoreWrapperProps) {
-        super(props)
+
+const noop = () => {};
+
+export const StoreWrapper = (props: StoreWrapperProps) => {
+    const storeKey = props.keepAlive ? `${props.keepAlive}` : '';
+    const store = useMemo(() => getStore(storeKey), [storeKey]);
+    useEffect(() => {
         if (props.storeRef) {
-            props.storeRef.current = initStore;
+            const ref = props.storeRef;
+            ref.current = store;
+            return () => {
+                ref.current = null;
+            };
         }
-        if (props.keepAlive) {
-            rebootGWStore();
-        }
-    }
-    componentWillUnmount() {
-        if (!this.props.keepAlive) {
-            if (this.props.storeRef) {
-                this.props.storeRef.current = null;
-            }
-            destroyGWStore();
+        return noop;
+    }, [props.storeRef]);
+    useEffect(() => {
+        if (!storeKey) {
+            return () => {
+                store.commonStore.destroy();
+                store.vizStore.destroy();
+            };
         }
-    }
-    render() {
-        return <StoreContext.Provider value={initStore}>
-            { this.props.children }
-        </StoreContext.Provider>
-    }
-}
+        return noop;
+    }, [storeKey]);
+    return <StoreContext.Provider value={store}>{props.children}</StoreContext.Provider>;
+};
 
 export function useGlobalStore() {
     return useContext(StoreContext);