fix: 评审问题

antvis · Jan 25, 2024 · 788b342 · 788b342
1 parent 190c88b
commit 788b342
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/packages/li-editor/src/widgets/Export/ExportData/helper.ts b/packages/li-editor/src/widgets/Export/ExportData/helper.ts
@@ -1,10 +1,10 @@
 import type { DatasetField } from '@antv/li-sdk';
 import type { GeometryTypes } from '@turf/turf';
 import { omit } from 'lodash-es';
-import type { EditorDataset } from 'packages/li-editor/src/services/editor-dataset-manager';
 import papaparse from 'papaparse';
 import type { WritingOptions } from 'xlsx';
 import { utils as XLSX_utils, write as XLSX_write } from 'xlsx';
+import type { EditorDataset } from '../../../services/editor-dataset-manager';
 
 // 数据转文本格式处理
 const getTextFormatData = (list: Record<string, any>[]) => {

diff --git a/packages/li-editor/src/widgets/Export/ExportData/index.tsx b/packages/li-editor/src/widgets/Export/ExportData/index.tsx
@@ -1,4 +1,3 @@
-import type { LocalDatasetSchema } from '@antv/li-sdk';
 import { Form, message, Modal, Radio, Select } from 'antd';
 import classNames from 'classnames';
 import { downloadBlob, downloadText } from 'download.js';
@@ -28,6 +27,15 @@ const ExportData = ({ visible, onVisbleChange }: ExportDataProps) => {
     { label: 'GeoJSON', value: 'geojson' },
   ];
 
+  const datasets = localOrRemoteDatasets.length
+    ? [
+        { label: '全部', value: 'all' },
+        ...localOrRemoteDatasets.map((item) => {
+          return { label: item.metadata.name, value: item.id };
+        }),
+      ]
+    : [];
+
   const downLoadDataSource = () => {
     const { dataSourceId, type } = form.getFieldsValue(true);
     const targetDataset = localOrRemoteDatasets.find((item) => item.id === dataSourceId);
@@ -127,18 +135,7 @@ const ExportData = ({ visible, onVisbleChange }: ExportDataProps) => {
           style={{ padding: 20 }}
           initialValue={localOrRemoteDatasets.length ? 'all' : undefined}
         >
-          <Select
-            options={
-              localOrRemoteDatasets.length
-                ? [
-                    { label: '全部', value: 'all' },
-                    ...localOrRemoteDatasets.map((item) => {
-                      return { label: item.metadata.name, value: item.id };
-                    }),
-                  ]
-                : []
-            }
-          />
+          <Select options={datasets} />
         </Form.Item>
         <Form.Item
           name="type"