From dd3f844331f0fb8d0a73409038ac1e86d461de6e Mon Sep 17 00:00:00 2001 From: observedobserver <270001151@qq.com> Date: Thu, 1 Sep 2022 21:18:32 +0800 Subject: [PATCH 1/4] fix: geom type bug --- packages/rath-client/src/queries/distribution/bot.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/rath-client/src/queries/distribution/bot.ts b/packages/rath-client/src/queries/distribution/bot.ts index 20cec90f..bcc64a7d 100644 --- a/packages/rath-client/src/queries/distribution/bot.ts +++ b/packages/rath-client/src/queries/distribution/bot.ts @@ -60,9 +60,7 @@ export function autoMark (fields: IFieldMeta[], statFields: IFieldMeta[]= [], or } else if (isSetEqual(semantics, ['quantitative', 'quantitative'])) { return 'area' } else if (isSetEqual(semantics, ['temporal', 'quantitative'])) { - const temporalField = semanticFields.find(s => s.semanticType === 'temporal')!; - if (temporalField.features.unique > 16) return 'line' - return 'bar' + return 'line' } } else { if (isSetEqual(semantics, ['nominal', 'nominal'])) { From 5e1e29129acaacf8bb4cecaa00d51c4e9c24436f Mon Sep 17 00:00:00 2001 From: observedobserver <270001151@qq.com> Date: Fri, 2 Sep 2022 01:06:10 +0800 Subject: [PATCH 2/4] fix: semi-auto segment switch page bug MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在semi-auto有状态时，切换页面，再切回来。pattern部分会变成单变量 --- packages/rath-client/src/pages/semiAutomation/index.tsx | 3 +-- packages/rath-client/src/store/discovery/mainStore.ts | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/rath-client/src/pages/semiAutomation/index.tsx b/packages/rath-client/src/pages/semiAutomation/index.tsx index 7e175ef1..5c90aedf 100644 --- a/packages/rath-client/src/pages/semiAutomation/index.tsx +++ b/packages/rath-client/src/pages/semiAutomation/index.tsx @@ -14,14 +14,13 @@ const PatternPage: React.FC = () => { const { discoveryMainStore } = useGlobalStore(); const { fieldMetas, - dataSource, + dataSource } = discoveryMainStore; useEffect(() => { if (dataSource.length > 1e5) { discoveryMainStore.updateSettings('vizAlgo', 'lite') } - discoveryMainStore.initAssociate(); // eslint-disable-next-line react-hooks/exhaustive-deps }, [fieldMetas, dataSource]) diff --git a/packages/rath-client/src/store/discovery/mainStore.ts b/packages/rath-client/src/store/discovery/mainStore.ts index f5a925a1..863f2a6a 100644 --- a/packages/rath-client/src/store/discovery/mainStore.ts +++ b/packages/rath-client/src/store/discovery/mainStore.ts @@ -68,6 +68,8 @@ export class DiscoveryMainStore { !autoPatt && this.initRenderViews('featViews'); autoFilter && this.filterAssociate(); !autoFilter && this.initRenderViews('filterViews'); + } else { + autoPatt && this.initAssociate(); } })) @@ -99,7 +101,7 @@ export class DiscoveryMainStore { public setShowMiniFloatView (show: boolean) { this.showMiniFloatView = show; } - public hasMainView () { + public get hasMainView () { return this.mainView !== null } public get dataSource () { From 71f07bdf790d2d37c7178af351971500118185a4 Mon Sep 17 00:00:00 2001 From: observedobserver <270001151@qq.com> Date: Fri, 2 Sep 2022 01:28:20 +0800 Subject: [PATCH 3/4] i18n: selection and data amount --- packages/rath-client/public/locales/en-US.json | 8 +++++++- .../src/pages/dataSource/fastSelection/index.tsx | 15 ++++++++------- .../rath-client/src/pages/dataSource/index.tsx | 2 +- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/packages/rath-client/public/locales/en-US.json b/packages/rath-client/public/locales/en-US.json index 1019f595..afae27b3 100644 --- a/packages/rath-client/public/locales/en-US.json +++ b/packages/rath-client/public/locales/en-US.json @@ -133,11 +133,17 @@ "methods": { "dropNull": "drop null records", "useMode": "replace null with mode", - "simpleClean": "simple cleaning", + "simpleClean": "use zero or null", "none": "none(use original data)" }, "tip": "Remember to adjust the fields' types and cleaning strategy before analysis.", "recordCount": "Number of records {count}", + "rowsInViews": "Origin: {origin} rows / Select: ({select}) / Clean: ({clean}) rows", + "selection": { + "title": "Fast Selection Config", + "desc": "Filter based on quantiles to get the main part of your data.", + "syncMode": "sync mode" + }, "upload": { "title": "Upload Your own dataset", "fileTypes": "csv, json are supportted.", diff --git a/packages/rath-client/src/pages/dataSource/fastSelection/index.tsx b/packages/rath-client/src/pages/dataSource/fastSelection/index.tsx index bd85ae1a..4f05482d 100644 --- a/packages/rath-client/src/pages/dataSource/fastSelection/index.tsx +++ b/packages/rath-client/src/pages/dataSource/fastSelection/index.tsx @@ -1,6 +1,7 @@ -import { observer } from 'mobx-react-lite'; -import { DefaultButton, Modal, PrimaryButton, Slider, Stack, Toggle } from 'office-ui-fabric-react'; import React, { useCallback, useEffect, useState } from 'react'; +import { observer } from 'mobx-react-lite'; +import { DefaultButton, Label, Modal, PrimaryButton, Slider, Stack, Toggle } from 'office-ui-fabric-react'; +import intl from 'react-intl-universal'; import { useGlobalStore } from '../../../store'; const FastSelection: React.FC = () => { @@ -30,9 +31,9 @@ const FastSelection: React.FC = () => { dataSourceStore.setShowFastSelection(false); }}>
-

Fast Selection Config

-

Filter based on quantiles to get the main part of your data.

- {intl.get('dataSource.selection.title')} +

{intl.get('dataSource.selection.desc')}

+ { setSyncMode(Boolean(checked)) }} @@ -53,14 +54,14 @@ const FastSelection: React.FC = () => { />) } - { + { dataSourceStore.createBatchFilterByQts( meaFields.map(m => m.fid), ranges ) dataSourceStore.setShowFastSelection(false); }} /> - { + { dataSourceStore.setShowFastSelection(false); }} /> diff --git a/packages/rath-client/src/pages/dataSource/index.tsx b/packages/rath-client/src/pages/dataSource/index.tsx index 5f43396a..c28ef016 100644 --- a/packages/rath-client/src/pages/dataSource/index.tsx +++ b/packages/rath-client/src/pages/dataSource/index.tsx @@ -257,7 +257,7 @@ const DataSourceBoard: React.FC = (props) => { {intl.get('dataSource.recordCount', { count: cleanedData.length })}
- Origin: ({rawData.length}) rows / Selected: ({ filteredData.length }) / Clean: ({cleanedData.length}) rows + {intl.get('dataSource.rowsInViews', { origin: rawData.length, select: filteredData.length, clean: cleanedData.length })} Date: Fri, 2 Sep 2022 10:40:03 +0800 Subject: [PATCH 4/4] Update zh-CN.json --- packages/rath-client/public/locales/zh-CN.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/rath-client/public/locales/zh-CN.json b/packages/rath-client/public/locales/zh-CN.json index ec1437e6..d57bcb70 100644 --- a/packages/rath-client/public/locales/zh-CN.json +++ b/packages/rath-client/public/locales/zh-CN.json @@ -133,11 +133,17 @@ "methods": { "dropNull": "删除空值记录", "useMode": "使用众数代替空", - "simpleClean": "简单的替换", + "simpleClean": "替换为0或null", "none": "无(使用原始数据)" }, "tip": "记得在开始分析前先调整数据的清洗策略并配置字段的属性", "recordCount": "记录数 {count}", + "rowsInViews": "原始数据: {origin} 行 / 筛选后: {select} 行 / 清洗后: {clean} 行", + "selection": { + "title": "快速数据筛选", + "desc": "基于数据中的分位数进行快速筛选", + "syncMode": "分位数同步" + }, "upload": { "title": "连接你的数据集，根据需求调整以下配置", "fileTypes": "支持csv, json文件",