[improvement][headless-fe] Updated the data initialization for model editing to use API requests instead. (#872)

* [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. * [improvement][semantic-fe] The organization structure selection feature has been added to the permission management. * [improvement][semantic-fe] Improved user experience for the metric list. * [improvement][semantic-fe] fix update the metric list. * [improvement][headless-fe] Added view management functionality. * [improvement][headless-fe] The view management functionality has been added. This feature allows users to create, edit, and manage different views within the system. * [improvement][headless-fe] Added model editing side effect detection. * [improvement][headless-fe] Fixed the logic error in view editing. * [improvement][headless-fe] Fixed the issue with initializing dimension associations in metric settings. * [improvement][headless-fe] Added the ability to hide the Q&A settings entry point. * [improvement][headless-fe] Fixed the issue with selecting search results in metric field creation. * [improvement][headless-fe] Added search functionality to the field list in model editing. * [improvement][headless-fe] fix the field list in model editing * [improvement][headless-fe] Restructured the data for the dimension value settings interface. * [improvement][headless-fe] Added dynamic variable functionality to model creation based on SQL scripts. * [improvement][headless-fe] Added support for passing dynamic variables as parameters in the executeSql function. * [improvement][headless-fe] Resolved the issue where users were unable to select all options for dimensions, metrics, and fields in the metric generation process. * [improvement][headless-fe] Replaced the term "view" with "dataset" * [improvement][headless-fe] Added the ability to export metrics and dimensions to a specific target. * [improvement][headless-fe] Enhanced dataset creation to support the tag mode. * [improvement][headless-fe] Added tag value setting. * [improvement][headless-fe] Optimized the tag setting system. * [improvement][headless-fe] Optimized the tag setting system. * [improvement][headless-fe] Updated the data initialization for model editing to use API requests instead.
2025-12-20 06:34:55 +00:00 · 2024-04-02 15:55:46 +08:00
parent 10501b2d86
commit d33e8e0507
13 changed files with 86 additions and 86 deletions
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDataSourceTypeModal.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDataSourceTypeModal.tsx
@@ -3,7 +3,7 @@ import { ConsoleSqlOutlined, CoffeeOutlined } from '@ant-design/icons';
 import React, { useState, useEffect } from 'react';
 import type { Dispatch } from 'umi';
 import { connect } from 'umi';
-import DataSourceCreateForm from '../Datasource/components/DataSourceCreateForm';
+import ModelCreateForm from '../Datasource/components/ModelCreateForm';
 import { excuteSql } from '../service';
 import type { StateType } from '../model';
 import DataSource from '../Datasource';
@@ -146,7 +146,7 @@ const ClassDataSourceTypeModal: React.FC<Props> = ({
      </Modal>

      {dataSourceModalVisible && (
-        <DataSourceCreateForm
+        <ModelCreateForm
          sql={fastModeSql}
          basicInfoFormMode="fast"
          modelItem={dataSourceItem}
@@ -165,7 +165,7 @@ const ClassDataSourceTypeModal: React.FC<Props> = ({
        />
      )}
      {createModalVisible && (
-        <DataSourceCreateForm
+        <ModelCreateForm
          sql={sql}
          databaseId={currentDatabaseId}
          basicInfoFormMode="normal"
@@ -209,7 +209,7 @@ const ClassDataSourceTypeModal: React.FC<Props> = ({
              }}
            />
          </Drawer>
-        </DataSourceCreateForm>
+        </ModelCreateForm>
      )}
    </>
  );
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDimensionTable.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDimensionTable.tsx
@@ -163,21 +163,21 @@ const ClassDimensionTable: React.FC<Props> = ({ domainManger, dispatch }) => {
      dataIndex: 'name',
      title: '维度',
      fixed: 'left',
-      width: 280,
+      // width: 280,
      render: columnsConfig.dimensionInfo.render,
      search: false,
    },
    {
      dataIndex: 'sensitiveLevel',
      title: '敏感度',
-      width: 150,
+      // width: 100,
      valueEnum: SENSITIVE_LEVEL_ENUM,
      render: columnsConfig.sensitiveLevel.render,
    },
    {
      dataIndex: 'isTag',
-      title: '是否为标签',
-      width: 120,
+      title: '是否标签',
+      // width: 90,
      render: (isTag) => {
        switch (isTag) {
          case 0:
@@ -192,39 +192,27 @@ const ClassDimensionTable: React.FC<Props> = ({ domainManger, dispatch }) => {
    {
      dataIndex: 'status',
      title: '状态',
-      width: 150,
+      // width: 100,
      search: false,
      render: columnsConfig.state.render,
    },
-    {
-      dataIndex: 'createdBy',
-      title: '创建人',
-      width: 180,
-      search: false,
-    },

    {
      dataIndex: 'description',
      title: '描述',
-      width: 250,
+      width: 300,
      search: false,
      render: columnsConfig.description.render,
    },

    {
-      dataIndex: 'updatedAt',
-      title: '更新时间',
-      width: 180,
-      search: false,
-      render: (value: any) => {
-        return value && value !== '-' ? moment(value).format('YYYY-MM-DD HH:mm:ss') : '-';
-      },
+      ...columnsConfig.createInfo,
    },
-
    {
      title: '操作',
      dataIndex: 'x',
      valueType: 'option',
+      fixed: 'right',
      width: 250,
      render: (_, record) => {
        return (
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx
@@ -19,7 +19,6 @@ import {
 import MetricInfoCreateForm from './MetricInfoCreateForm';
 import BatchCtrlDropDownButton from '@/components/BatchCtrlDropDownButton';
 import TableHeaderFilter from './TableHeaderFilter';
-import moment from 'moment';
 import styles from './style.less';
 import { ISemantic } from '../data';
 import { ColumnsConfig } from './TableColumnRender';
@@ -165,9 +164,9 @@ const ClassMetricTable: React.FC<Props> = ({ onEmptyMetricData, domainManger, di
    {
      dataIndex: 'name',
      title: '指标',
-      width: 280,
+      // width: 280,
      fixed: 'left',
-      // width: '30%',
+      width: '20%',
      search: false,
      render: columnsConfig.indicatorInfo.render,
    },
@@ -179,15 +178,15 @@ const ClassMetricTable: React.FC<Props> = ({ onEmptyMetricData, domainManger, di
    {
      dataIndex: 'sensitiveLevel',
      title: '敏感度',
-      width: 160,
+      // width: 100,
      valueEnum: SENSITIVE_LEVEL_ENUM,
      render: columnsConfig.sensitiveLevel.render,
    },

    {
      dataIndex: 'isTag',
-      title: '是否为标签',
-      width: 120,
+      title: '是否标签',
+      // width: 90,
      render: (isTag) => {
        switch (isTag) {
          case 0:
@@ -202,7 +201,7 @@ const ClassMetricTable: React.FC<Props> = ({ onEmptyMetricData, domainManger, di
    {
      dataIndex: 'isPublish',
      title: '是否发布',
-      width: 150,
+      // width: 90,
      search: false,
      render: (isPublish) => {
        switch (isPublish) {
@@ -215,6 +214,13 @@ const ClassMetricTable: React.FC<Props> = ({ onEmptyMetricData, domainManger, di
        }
      },
    },
+    {
+      dataIndex: 'status',
+      title: '状态',
+      // width: 100,
+      search: false,
+      render: columnsConfig.state.render,
+    },
    {
      dataIndex: 'description',
      title: '描述',
@@ -223,31 +229,13 @@ const ClassMetricTable: React.FC<Props> = ({ onEmptyMetricData, domainManger, di
      render: columnsConfig.description.render,
    },
    {
-      dataIndex: 'status',
-      title: '状态',
-      width: 160,
-      search: false,
-      render: columnsConfig.state.render,
-    },
-    {
-      dataIndex: 'createdBy',
-      title: '创建人',
-      width: 150,
-      search: false,
-    },
-    {
-      dataIndex: 'updatedAt',
-      title: '更新时间',
-      width: 180,
-      search: false,
-      render: (value: any) => {
-        return value && value !== '-' ? moment(value).format('YYYY-MM-DD HH:mm:ss') : '-';
-      },
+      ...columnsConfig.createInfo,
    },
    {
      title: '操作',
      dataIndex: 'x',
      valueType: 'option',
+      fixed: 'right',
      width: 150,
      render: (_, record) => {
        return (
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ModelCreateFormModal.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ModelCreateFormModal.tsx
@@ -125,7 +125,7 @@ const ModelCreateFormModal: React.FC<ModelCreateFormModalProps> = (props) => {
        >
          <Input placeholder="请输入模型英文名称" />
        </FormItem>
-        <FormItem
+        {/* <FormItem
          name="alias"
          label="别名"
          getValueFromEvent={(value) => {
@@ -143,7 +143,7 @@ const ModelCreateFormModal: React.FC<ModelCreateFormModalProps> = (props) => {
            tokenSeparators={[',']}
            maxTagCount={9}
          />
-        </FormItem>
+        </FormItem> */}
        <FormItem name="description" label="模型描述">
          <Input.TextArea placeholder="模型描述" />
        </FormItem>
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ModelTable.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ModelTable.tsx
@@ -72,13 +72,6 @@ const ModelTable: React.FC<Props> = ({ modelList, disabledEdit = false, onModelC
      hideInTable: true,
      renderFormItem: () => <Input placeholder="请输入ID/模型名称/英文名称/标签" />,
    },
-    {
-      dataIndex: 'alias',
-      title: '别名',
-      width: 150,
-      ellipsis: true,
-      search: false,
-    },
    {
      dataIndex: 'bizName',
      title: '英文名称',
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/TableColumnRender.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/TableColumnRender.tsx
@@ -5,13 +5,14 @@ import { TagsOutlined, ReadOutlined } from '@ant-design/icons';
 import { history } from 'umi';
 import { ISemantic } from '../data';
 import { isString } from 'lodash';
+import dayjs from 'dayjs';
 import { isArrayOfValues } from '@/utils/utils';
 import styles from './style.less';
 import IndicatorStar, { StarType } from '../components/IndicatorStar';

 const { Text, Paragraph } = Typography;

-export const ColumnsConfig = (params?: {
+export const ColumnsConfig: any = (params?: {
  indicatorInfo?: {
    url?: string;
    starType?: StarType;
@@ -332,5 +333,20 @@ export const ColumnsConfig = (params?: {
        );
      },
    },
+    createInfo: {
+      dataIndex: 'updatedAt',
+      title: '创建信息',
+      tooltip: '创建人/更新时间',
+      width: 180,
+      search: false,
+      render: (value: any, record: ISemantic.IMetricItem) => {
+        return (
+          <Space direction="vertical">
+            <span> {record.createdBy}</span>
+            <span>{value && value !== '-' ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : '-'}</span>
+          </Space>
+        );
+      },
+    },
  };
 };