[improvement][semantic-fe] Added field type and metric type to the metric creation options. (#655)

* [improvement][semantic-fe] Add model alias setting & Add view permission restrictions to the model permission management tab. [improvement][semantic-fe] Add permission control to the action buttons for the main domain; apply high sensitivity filtering to the authorization of metrics/dimensions. [improvement][semantic-fe] Optimize the editing mode in the dimension/metric/datasource components to use the modelId stored in the database for data, instead of relying on the data from the state manager. * [improvement][semantic-fe] Add time granularity setting in the data source configuration. * [improvement][semantic-fe] Dictionary import for dimension values supported in Q&A visibility * [improvement][semantic-fe] Modification of data source creation prompt wording" * [improvement][semantic-fe] metric market experience optimization * [improvement][semantic-fe] enhance the analysis of metric trends * [improvement][semantic-fe] optimize the presentation of metric trend permissions * [improvement][semantic-fe] add metric trend download functionality * [improvement][semantic-fe] fix the dimension initialization issue in metric correlation * [improvement][semantic-fe] Fix the issue of database changes not taking effect when creating based on an SQL data source. * [improvement][semantic-fe] Optimizing pagination logic and some CSS styles * [improvement][semantic-fe] Fixing the API for the indicator list by changing "current" to "pageNum" * [improvement][semantic-fe] Fixing the default value setting for the indicator list * [improvement][semantic-fe] Adding batch operations for indicators/dimensions/models * [improvement][semantic-fe] Replacing the single status update API for indicators/dimensions with a batch update API * [improvement][semantic-fe] Redesigning the indicator homepage to incorporate trend charts and table functionality for indicators * [improvement][semantic-fe] Optimizing the logic for setting dimension values and editing data sources, and adding system settings functionality * [improvement][semantic-fe] Upgrading antd version to 5.x, extracting the batch operation button component, optimizing the interaction for system settings, and expanding the configuration generation types for list-to-select component. * [improvement][semantic-fe] Adding the ability to filter dimensions based on whether they are tags or not. * [improvement][semantic-fe] Adding the ability to edit relationships between models in the canvas. * [improvement][semantic-fe] Updating the datePicker component to use dayjs instead. * [improvement][semantic-fe] Fixing the issue with passing the model ID for dimensions in the indicator market. * [improvement][semantic-fe] Fixing the abnormal state of the popup when creating a model. * [improvement][semantic-fe] Adding permission logic for bulk operations in the indicator market. * [improvement][semantic-fe] Adding the ability to download and transpose data. * [improvement][semantic-fe] Fixing the initialization issue with the date selection component in the indicator details page when switching time granularity. * [improvement][semantic-fe] Fixing the logic error in the dimension value setting. * [improvement][semantic-fe] Fixing the synchronization issue with the question and answer settings information. * [improvement][semantic-fe] Optimizing the canvas functionality for better performance and user experience. * [improvement][semantic-fe] Optimizing the update process for drawing model relationship edges in the canvas. * [improvement][semantic-fe] Changing the line type for canvas connections. * [improvement][semantic-fe] Replacing the initialization variable from "semantic" to "headless". * [improvement][semantic-fe] Fixing the missing migration issue for default drill-down dimension configuration in model editing. Additionally, optimizing the data retrieval method for initializing fields in the model. * [improvement][semantic-fe] Updating the logic for the fieldName. * [improvement][semantic-fe] Adjusting the position of the metrics tab. * [improvement][semantic-fe] Changing the 字段名称 to 英文名称. * [improvement][semantic-fe] Fix metric measurement deletion. * [improvement][semantic-fe] UI optimization for metric details page. * [improvement][semantic-fe] UI optimization for metric details page. * [improvement][semantic-fe] UI adjustment for metric details page. * [improvement][semantic-fe] The granularity field in the time type of model editing now supports setting it as empty. * [improvement][semantic-fe] Added field type and metric type to the metric creation options.
2026-04-22 06:44:18 +08:00 · 2024-01-19 14:46:41 +08:00
parent 0abbd83f51
commit 7af5afc3eb
24 changed files with 625 additions and 393 deletions
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceCreateForm.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceCreateForm.tsx
@@ -9,7 +9,7 @@ import { updateModel, createModel, getColumns } from '../../service';
 import type { Dispatch } from 'umi';
 import type { StateType } from '../../model';
 import { connect } from 'umi';
-import { IDataSource, ISemantic } from '../../data';
+import { ISemantic, IDataSource } from '../../data';

 export type CreateFormProps = {
  domainManger: StateType;
@@ -34,7 +34,7 @@ const initFormVal = {
  description: '', // 模型描述
 };

-const ModelCreateForm: React.FC<CreateFormProps> = ({
+const DataSourceCreateForm: React.FC<CreateFormProps> = ({
  domainManger,
  onCancel,
  createModalVisible,
@@ -72,7 +72,9 @@ const ModelCreateForm: React.FC<CreateFormProps> = ({
    setHasEmptyNameField(hasEmpty);
  }, [fields]);

-  const [fieldColumns, setFieldColumns] = useState(scriptColumns || []);
+  const [fieldColumns, setFieldColumns] = useState<IDataSource.IExecuteSqlColumn[]>(
+    scriptColumns || [],
+  );
  useEffect(() => {
    if (scriptColumns) {
      setFieldColumns(scriptColumns);
@@ -162,6 +164,12 @@ const ModelCreateForm: React.FC<CreateFormProps> = ({
      ...formValRef.current,
      ...fieldsValue,
      ...fieldsClassify,
+      fields: fieldColumns.map((item) => {
+        return {
+          fieldName: item.nameEn,
+          dataType: item.type,
+        };
+      }),
    };
    updateFormVal(submitForm);
    if (!saveState && currentStep < 1) {
@@ -198,25 +206,22 @@ const ModelCreateForm: React.FC<CreateFormProps> = ({
    }
  };

-  const initFields = (fieldsClassifyList: any[], columns: any[]) => {
+  const initFields = (fieldsClassifyList: any[], columns: IDataSource.IExecuteSqlColumn[]) => {
    if (Array.isArray(columns) && columns.length === 0) {
      setFields(fieldsClassifyList || []);
      return;
    }
-    const columnFields: any[] = columns.map((item: any) => {
+    const columnFields: any[] = columns.map((item: IDataSource.IExecuteSqlColumn) => {
      const { type, nameEn } = item;
      const oldItem =
        fieldsClassifyList.find((oItem) => {
-          // if (oItem.type === EnumDataSourceType.MEASURES) {
-          //   return oItem.expr === item.nameEn;
-          // }
          return oItem.fieldName === item.nameEn;
        }) || {};
      return {
        ...oldItem,
        bizName: nameEn,
        fieldName: nameEn,
-        sqlType: type,
+        dataType: type,
      };
    });
    setFields(columnFields || []);
@@ -485,4 +490,4 @@ const ModelCreateForm: React.FC<CreateFormProps> = ({

 export default connect(({ domainManger }: { domainManger: StateType }) => ({
  domainManger,
-}))(ModelCreateForm);
+}))(DataSourceCreateForm);
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceFieldForm.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceFieldForm.tsx
@@ -16,7 +16,7 @@ import styles from '../style.less';
 type FieldItem = {
  expr?: string;
  bizName: string;
-  sqlType: string;
+  dataType: string;
  name: string;
  type: EnumDataSourceType;
  agg?: string;
@@ -47,7 +47,7 @@ const getCreateFieldName = (type: EnumDataSourceType) => {
  return isCreateName;
 };

-const FieldForm: React.FC<Props> = ({ fields, sql, onFieldChange, onSqlChange }) => {
+const DataSourceFieldForm: React.FC<Props> = ({ fields, sql, onFieldChange, onSqlChange }) => {
  const handleFieldChange = (record: FieldItem, fieldName: string, value: any) => {
    onFieldChange(record.bizName, {
      ...record,
@@ -61,13 +61,13 @@ const FieldForm: React.FC<Props> = ({ fields, sql, onFieldChange, onSqlChange })
      dataIndex: 'fieldName',
      width: 100,
    },
-    // {
-    //   title: '数据类型',
-    //   dataIndex: 'sqlType',
-    //   width: 80,
-    // },
    {
      title: '字段类型',
+      dataIndex: 'dataType',
+      width: 80,
+    },
+    {
+      title: '语义类型',
      dataIndex: 'type',
      width: 100,
      render: (_: any, record: FieldItem) => {
@@ -305,9 +305,6 @@ const FieldForm: React.FC<Props> = ({ fields, sql, onFieldChange, onSqlChange })
          <div>
            为了保障同一个模型下维度/指标列表唯一，消除歧义，若本模型下的多个数据源存在相同的字段名并且都勾选了快速创建，系统默认这些相同字段的指标维度是同一个，同时列表中将只显示第一次创建的指标/维度。
          </div>
-          // <Marquee pauseOnHover gradient={false}>
-          //   为了保障同一个主题域下维度/指标列表唯一，消除歧义，若本主题域下的多个数据源存在相同的字段名并且都勾选了快速创建，系统默认这些相同字段的指标维度是同一个，同时列表中将只显示最后一次创建的指标/维度。
-          // </Marquee>
        }
      />
      <Table<FieldItem>
@@ -329,4 +326,4 @@ const FieldForm: React.FC<Props> = ({ fields, sql, onFieldChange, onSqlChange })
  );
 };

-export default FieldForm;
+export default DataSourceFieldForm;