Merge branch 'tencentmusic:master' into master

webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelFieldForm.tsx

@@ -1,19 +1,19 @@
 import React, { useState } from 'react';
-import { Table, Select, Checkbox, Input, Space, Tooltip, Form, Switch, Row, Col } from 'antd';
+import { Checkbox, Form, Input, Select, Space, Switch, Table, Tooltip } from 'antd';
 import TableTitleTooltips from '../../components/TableTitleTooltips';
 import { isUndefined } from 'lodash';
 import { ExclamationCircleOutlined } from '@ant-design/icons';
 import SqlEditor from '@/components/SqlEditor';
 import { ISemantic } from '../../data';
 import {
-  TYPE_OPTIONS,
-  DATE_FORMATTER,
   AGG_OPTIONS,
-  EnumDataSourceType,
+  DATE_FORMATTER,
   DATE_OPTIONS,
   DIM_OPTIONS,
+  EnumDataSourceType,
   EnumModelDataType,
   PARTITION_TIME_FORMATTER,
+  TYPE_OPTIONS,
 } from '../constants';
 import styles from '../style.less';
 
@@ -90,8 +90,7 @@ const ModelFieldForm: React.FC<Props> = ({
       dataIndex: 'type',
       width: 250,
       render: (_: any, record: FieldItem) => {
-        const type = fields.find((field) => field.bizName === record.bizName)?.type;
+        const { type, classType } = record;
-        const classType = fields.find((field) => field.bizName === record.bizName)?.classType;
         const selectTypeValue = [EnumModelDataType.DIMENSION].includes(classType)
           ? classType
           : type;
@@ -229,13 +228,10 @@ const ModelFieldForm: React.FC<Props> = ({
         //   );
         // }
         if (type === EnumDataSourceType.MEASURES) {
-          const agg = record.expr
-            ? fields.find((field) => field.expr === record.expr)?.agg
-            : undefined;
           return (
             <Select
               placeholder="度量算子"
-              value={agg}
+              value={record.agg}
               onChange={(value) => {
                 handleFieldChange(record, 'agg', value);
               }}
@@ -251,7 +247,6 @@ const ModelFieldForm: React.FC<Props> = ({
             </Select>
           );
         }
-
         if (process.env.SHOW_TAG) {
           if (type === EnumDataSourceType.CATEGORICAL) {
             const isTag = fields.find((field) => field.bizName === record.bizName)?.isTag;
@@ -299,10 +294,7 @@ const ModelFieldForm: React.FC<Props> = ({
           }
         }
         if ([EnumDataSourceType.TIME, EnumDataSourceType.PARTITION_TIME].includes(type)) {
-          const dateFormat = fields.find((field) => field.bizName === record.bizName)?.dateFormat;
+          const { dateFormat, timeGranularity } = record;
-          const timeGranularity = fields.find(
-            (field) => field.bizName === record.bizName,
-          )?.timeGranularity;
           const dateFormatterOptions =
             type === EnumDataSourceType.PARTITION_TIME ? PARTITION_TIME_FORMATTER : DATE_FORMATTER;
 

webapp/packages/supersonic-fe/src/pages/SemanticModel/View/components/DataSetTable.tsx

@@ -15,9 +15,10 @@ import ViewSearchFormModal from './ViewSearchFormModal';
 type Props = {
   dataSetList: ISemantic.IDatasetItem[];
   disabledEdit?: boolean;
+  isCurrent: boolean;
 };
 
-const DataSetTable: React.FC<Props> = ({ dataSetList, disabledEdit = false }) => {
+const DataSetTable: React.FC<Props> = ({ dataSetList, disabledEdit = false, isCurrent }) => {
   const domainModel = useModel('SemanticModel.domainData');
   const { selectDomainId } = domainModel;
 
@@ -51,8 +52,8 @@ const DataSetTable: React.FC<Props> = ({ dataSetList, disabledEdit = false }) =>
 
   useEffect(() => {
     // queryDataSetList();
-    queryDomainAllModel();
+    if (isCurrent) queryDomainAllModel();
-  }, [selectDomainId]);
+  }, [selectDomainId, isCurrent]);
 
   const queryDataSetList = async () => {
     setLoading(true);

webapp/packages/supersonic-fe/src/pages/SemanticModel/View/index.tsx

@@ -3,14 +3,15 @@ import { ISemantic } from '../data';
 import DataSetTable from './components/DataSetTable';
 
 type Props = {
+  isCurrent: boolean;
   disabledEdit?: boolean;
   dataSetList: ISemantic.IDatasetItem[];
 };
 
-const View: React.FC<Props> = ({ dataSetList, disabledEdit = false }) => {
+const View: React.FC<Props> = ({ isCurrent, dataSetList, disabledEdit = false }) => {
   return (
     <div style={{ padding: '15px 20px' }}>
-      <DataSetTable disabledEdit={disabledEdit} dataSetList={dataSetList} />
+      <DataSetTable isCurrent={isCurrent} disabledEdit={disabledEdit} dataSetList={dataSetList} />
     </div>
   );
 };

webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DomainManagerTab.tsx

@@ -50,7 +50,7 @@ const DomainManagerTab: React.FC<Props> = ({
       label: '数据集管理',
       key: 'overview',
       hidden: !!domainData?.parentId,
-      children: <View dataSetList={dataSetList} />,
+      children: <View isCurrent={activeKey === 'overview'} dataSetList={dataSetList} />,
     },
     {
       label: '模型管理',