[improvement][headless-fe] Optimized the tag setting system. (#846)

* [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.
2025-12-20 06:34:55 +00:00 · 2024-03-21 00:53:16 +08:00
parent 754902a67e
commit 01bfb57149
45 changed files with 2189 additions and 128 deletions
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDimensionTable.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDimensionTable.tsx
@@ -120,11 +120,15 @@ const ClassDimensionTable: React.FC<Props> = ({ domainManger, dispatch }) => {
      return;
    }
    setLoading(true);
-    const { code, msg } = await batchCreateTag({
-      itemIds: ids,
-      type: TAG_DEFINE_TYPE.DIMENSION,
-      modelId,
-    });
+    const { code, msg } = await batchCreateTag(
+      ids.map((id) => {
+        return {
+          itemId: id,
+          tagDefineType: TAG_DEFINE_TYPE.DIMENSION,
+        };
+      }),
+    );
+
    setLoading(false);
    if (code === 200) {
      queryDimensionList({ ...filterParams, ...defaultPagination });
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx
@@ -73,11 +73,14 @@ const ClassMetricTable: React.FC<Props> = ({ domainManger, dispatch }) => {
      return;
    }
    setLoading(true);
-    const { code, msg } = await batchCreateTag({
-      itemIds: ids,
-      type: TAG_DEFINE_TYPE.METRIC,
-      modelId,
-    });
+    const { code, msg } = await batchCreateTag(
+      ids.map((id) => {
+        return {
+          itemId: id,
+          tagDefineType: TAG_DEFINE_TYPE.METRIC,
+        };
+      }),
+    );
    setLoading(false);
    if (code === 200) {
      queryMetricList({ ...filterParams, ...defaultPagination });
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DimensionInfoModal.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DimensionInfoModal.tsx
@@ -12,7 +12,7 @@ import {
  updateDimension,
  mockDimensionAlias,
  batchCreateTag,
-  batchUpdateTagStatus,
+  batchDeleteTag,
 } from '../service';
 import FormItemTitle from '@/components/FormHelper/FormItemTitle';

@@ -77,11 +77,11 @@ const DimensionInfoModal: React.FC<CreateFormProps> = ({
    }
    const { code, msg, data } = await saveDimensionQuery(queryParams);
    if (code === 200) {
-      if (!queryParams.id && queryParams.isTag) {
-        queryBatchExportTag(data.id);
+      if (queryParams.isTag) {
+        queryBatchExportTag(data.id || dimensionItem?.id);
      }
      if (dimensionItem?.id && !queryParams.isTag) {
-        queryBatchUpdateStatus(dimensionItem.bizName, StatusEnum.DELETED);
+        queryBatchDeleteTag(dimensionItem);
      }
      if (!isSilenceSubmit) {
        message.success('编辑维度成功');
@@ -92,11 +92,10 @@ const DimensionInfoModal: React.FC<CreateFormProps> = ({
    message.error(msg);
  };

-  const queryBatchUpdateStatus = async (bizName: string, status: StatusEnum) => {
-    const { code, msg } = await batchUpdateTagStatus({
-      bizNames: [bizName],
-      modelId: [modelId],
-      status,
+  const queryBatchDeleteTag = async (dimensionItem: ISemantic.IDimensionItem) => {
+    const { code, msg } = await batchDeleteTag({
+      itemIds: [dimensionItem.id],
+      tagDefineType: TAG_DEFINE_TYPE.DIMENSION,
    });
    if (code === 200) {
      return;
@@ -105,11 +104,9 @@ const DimensionInfoModal: React.FC<CreateFormProps> = ({
  };

  const queryBatchExportTag = async (id: number) => {
-    const { code, msg } = await batchCreateTag({
-      itemIds: [id],
-      type: TAG_DEFINE_TYPE.DIMENSION,
-      modelId,
-    });
+    const { code, msg } = await batchCreateTag([
+      { itemId: id, tagDefineType: TAG_DEFINE_TYPE.DIMENSION },
+    ]);

    if (code === 200) {
      return;
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DomainManagerTab.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DomainManagerTab.tsx
@@ -5,13 +5,17 @@ import { connect, history } from 'umi';
 import ClassDimensionTable from './ClassDimensionTable';
 import ClassMetricTable from './ClassMetricTable';
 import PermissionSection from './Permission/PermissionSection';
-import ClassTagTable from '../Insights/components/ClassTagTable';
+// import ClassTagTable from '../Insights/components/ClassTagTable';
+import TagObjectTable from '../Insights/components/TagObjectTable';
+
 import OverView from './OverView';
 import styles from './style.less';
 import type { StateType } from '../model';
 import { HomeOutlined, FundViewOutlined } from '@ant-design/icons';
 import { ISemantic } from '../data';
 import SemanticGraphCanvas from '../SemanticGraphCanvas';
+import HeadlessFlows from '../HeadlessFlows';
+import SemanticFlows from '../SemanticFlows';
 import RecommendedQuestionsSection from '../components/Entity/RecommendedQuestionsSection';
 import View from '../View';
 // import DatabaseTable from '../components/Database/DatabaseTable';
@@ -66,12 +70,18 @@ const DomainManagerTab: React.FC<Props> = ({
        />
      ),
    },
+    {
+      label: '标签对象管理',
+      key: 'tagObjectManange',
+      children: <TagObjectTable />,
+    },
    {
      label: '画布',
      key: 'xflow',
      children: (
        <div style={{ width: '100%' }}>
          <SemanticGraphCanvas />
+          {/* <HeadlessFlows /> */}
        </div>
      ),
    },
@@ -104,11 +114,11 @@ const DomainManagerTab: React.FC<Props> = ({
      key: 'dimenstion',
      children: <ClassDimensionTable />,
    },
-    {
-      label: '标签管理',
-      key: 'tag',
-      children: <ClassTagTable />,
-    },
+    // {
+    //   label: '标签管理',
+    //   key: 'tag',
+    //   children: <ClassTagTable />,
+    // },

    {
      label: '权限管理',
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Entity/DimensionMetricVisibleTableTransfer.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Entity/DimensionMetricVisibleTableTransfer.tsx
@@ -54,7 +54,17 @@ const DimensionMetricVisibleTableTransfer: React.FC<Props> = ({
        return <TransTypeTag type={type} />;
      },
    },
-
+    {
+      dataIndex: 'isTag',
+      title: '是否标签',
+      // hidden: true,
+      render: (isTag) => {
+        if (isTag) {
+          return <span style={{ color: '#0958d9' }}>是</span>;
+        }
+        return '否';
+      },
+    },
    {
      dataIndex: 'modelName',
      title: '所属模型',
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Entity/DimensionMetricVisibleTransfer.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Entity/DimensionMetricVisibleTransfer.tsx
@@ -32,13 +32,14 @@ const DimensionMetricVisibleTransfer: React.FC<Props> = ({

  useEffect(() => {
    setTransferData(
-      sourceList.map(({ key, id, name, bizName, transType, modelName }) => {
+      sourceList.map(({ key, id, name, bizName, transType, modelName, isTag }) => {
        return {
          key,
          name,
          bizName,
          id,
          modelName,
+          isTag,
          type: transType,
        };
      }),
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricInfoCreateForm.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricInfoCreateForm.tsx
@@ -29,7 +29,7 @@ import {
  getModelDetail,
  getDrillDownDimension,
  batchCreateTag,
-  batchUpdateTagStatus,
+  batchDeleteTag,
 } from '../service';
 import MetricMetricFormTable from './MetricMetricFormTable';
 import MetricFieldFormTable from './MetricFieldFormTable';
@@ -381,11 +381,12 @@ const MetricInfoCreateForm: React.FC<CreateFormProps> = ({
    }
    const { code, msg, data } = await saveMetricQuery(queryParams);
    if (code === 200) {
-      if (!queryParams.id && queryParams.isTag) {
-        queryBatchExportTag(data.id);
+      if (queryParams.isTag) {
+        queryBatchExportTag(data.id || metricItem?.id);
      }
+
      if (metricItem?.id && !queryParams.isTag) {
-        queryBatchUpdateStatus(metricItem.bizName, StatusEnum.DELETED);
+        queryBatchDelete(metricItem);
      }
      message.success('编辑指标成功');
      onSubmit?.(queryParams);
@@ -394,11 +395,10 @@ const MetricInfoCreateForm: React.FC<CreateFormProps> = ({
    message.error(msg);
  };

-  const queryBatchUpdateStatus = async (bizName: string, status: StatusEnum) => {
-    const { code, msg } = await batchUpdateTagStatus({
-      bizNames: [bizName],
-      modelId: [modelId],
-      status,
+  const queryBatchDelete = async (metricItem: ISemantic.IMetricItem) => {
+    const { code, msg } = await batchDeleteTag({
+      itemIds: [metricItem.id],
+      tagDefineType: TAG_DEFINE_TYPE.METRIC,
    });
    if (code === 200) {
      return;
@@ -407,11 +407,9 @@ const MetricInfoCreateForm: React.FC<CreateFormProps> = ({
  };

  const queryBatchExportTag = async (id: number) => {
-    const { code, msg } = await batchCreateTag({
-      itemIds: [id],
-      type: TAG_DEFINE_TYPE.METRIC,
-      modelId,
-    });
+    const { code, msg } = await batchCreateTag([
+      { itemId: id, tagDefineType: TAG_DEFINE_TYPE.METRIC },
+    ]);

    if (code === 200) {
      return;