[improvement][headless-fe] Fixed the issue with abnormal comments during model creation. (#1057)

* [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. * [improvement][headless-fe] Added search functionality to model management. * [improvement][headless-fe] Removed field null validation during model editing. * [improvement][headless-fe] Updated the batch operation button component. * [improvement][headless-fe] Optimized the logic for initializing indicators in dimension value settings. * [improvement][headless-fe] Adjusted the length of the input field for model editing names. * [improvement][headless-fe] Lock the version of the @ant-design/pro-table component and replace it with @ant-design/pro-components. * [improvement][headless-fe] Optimized the style of the metrics market and tags market. * [improvement][headless-fe] The quick creation of model fields now defaults to using the "comment" field for filling. * [improvement][headless-fe] The quick creation of model fields now defaults to using the "comment" field for filling * [improvement][headless-fe] The quick creation of model fields now defaults to using the "comment" field for filling. * [improvement][headless-fe] Fixed the issue where the conditions for metric measurement creation were not being saved correctly. * [improvement][headless-fe] Default value setting for hiding dimensions. * [improvement][headless-fe] Updated the file imports in the project. * [improvement][headless-fe] Adjusted the logic for displaying the tab in the theme domain. * [improvement][headless-fe] Added term management functionality. * [improvement][headless-fe] When creating a model, the current metric operator now allows for clearance. * [improvement][headless-fe] Term management interface transformation * [improvement][headless-fe] Migrating scaffold version to @umi/max * [improvement][headless-fe] remove modle column * [improvement][headless-fe] 1.Added configuration for the large language model in the agent; 2.upgraded React version from 17 to 18; 3.modified some UI effects. * [improvement][headless-fe] Added a simplified mode to the question-answering system. * [improvement][headless-fe] remove pnpm-lock * [improvement][headless-fe] add pnpm-lock * [improvement][headless-fe] Fixed the issue with passing the modelId during initialization. * [improvement][headless-fe] Fixed the issue with abnormal comments during model creation.
2025-12-10 11:07:06 +00:00 · 2024-05-30 19:14:40 +08:00
parent d8abc1e492
commit aedabd24f7
8 changed files with 89 additions and 23 deletions
--- a/webapp/packages/chat-sdk/src/ShowCase/service.ts
+++ b/webapp/packages/chat-sdk/src/ShowCase/service.ts
@@ -5,8 +5,9 @@ import { ShowCaseType } from './type';
 const prefix = isMobile ? '/openapi' : '/api';

 export function queryShowCase(agentId: number, current: number, pageSize: number) {
-  return axios.post<ShowCaseType>(
-    `${prefix}/chat/manage/queryShowCase?agentId=${agentId}`,
-    { current, pageSize }
-  );
+  return axios.post<ShowCaseType>(`${prefix}/chat/manage/queryShowCase?agentId=${agentId}`, {
+    current,
+    pageSize,
+    userName: 'jerryjzhang',
+  });
 }
--- a/webapp/packages/chat-sdk/src/components/ChatMsg/index.tsx
+++ b/webapp/packages/chat-sdk/src/components/ChatMsg/index.tsx
@@ -313,7 +313,7 @@ const ChatMsg: React.FC<Props> = ({
      ) : (
        <div>
          {getMsgContent()}
-          {(isMultipleMetric || existDrillDownDimension) && (
+          {(isMultipleMetric || existDrillDownDimension) && !isSimpleMode && (
            <div
              className={`${prefixCls}-bottom-tools ${
                getMsgContentType() === MsgContentTypeEnum.METRIC_CARD
--- a/webapp/packages/supersonic-fe/src/global.less
+++ b/webapp/packages/supersonic-fe/src/global.less
@@ -144,6 +144,11 @@ ol {
    font-size: 30px;
  }
 }
+.ant-form {
+  .ant-spin .ant-spin-dot {
+    font-size: 30px;
+  }
+}

 .ant-menu-root>.ant-menu-item.ant-menu-item-selected {
  color: var(--tme-primary-color);
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelBasicForm.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelBasicForm.tsx
@@ -191,10 +191,7 @@ const ModelBasicForm: React.FC<Props> = ({
      <FormItem name="description" label="模型描述">
        <TextArea placeholder="请输入模型描述" />
      </FormItem>
-      <FormItem
-        name={['ext', 'usId']}
-        label="上游任务ID"
-      >
+      <FormItem name={['ext', 'usId']} label="上游任务ID">
        <Select
          mode="tags"
          placeholder="输入ID后回车确认，多ID输入、复制粘贴支持英文逗号自动分隔"
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelCreateForm.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelCreateForm.tsx
@@ -286,7 +286,7 @@ const ModelCreateForm: React.FC<CreateFormProps> = ({
      return;
    }
    const columnFields: any[] = columns.map((item: IDataSource.IExecuteSqlColumn) => {
-      const { type, nameEn, comment, name } = item;
+      const { type, nameEn, comment } = item;
      const oldItem =
        fieldsClassifyList.find((oItem) => {
          return oItem.fieldName === item.nameEn;
@@ -296,7 +296,6 @@ const ModelCreateForm: React.FC<CreateFormProps> = ({
        bizName: nameEn,
        fieldName: nameEn,
        dataType: type,
-        name: name || comment,
        comment,
      };
    });
@@ -407,9 +406,9 @@ const ModelCreateForm: React.FC<CreateFormProps> = ({
    if (code === 200) {
      const list = data?.resultList || [];
      const columns = list.map((item: any, index: number) => {
-        const { dataType, name } = item;
+        const { dataType, name, comment } = item;
        return {
-          ...item,
+          comment,
          nameEn: name,
          type: dataType,
        };
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelFieldForm.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelFieldForm.tsx
@@ -111,7 +111,6 @@ const ModelFieldForm: React.FC<Props> = ({
              const isCreateName = getCreateFieldName(value);
              const editState = !isUndefined(record[isCreateName]) ? !!record[isCreateName] : true;
              const { name, comment } = record;
-              // handleFieldChange(record, 'type', value);
              onFieldChange(record.bizName, {
                ...record,
                type: value,
@@ -255,8 +254,8 @@ const ModelFieldForm: React.FC<Props> = ({
      dataIndex: 'fastCreate',
      width: 200,
      render: (_: any, record: FieldItem) => {
-        const { type, name, comment } = record;
-        const inputValue = name || comment;
+        const { type, name } = record;
+        const inputValue = name;
        if (
          [
            EnumDataSourceType.PRIMARY,
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/Edit2.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/Edit2.tsx
@@ -0,0 +1,57 @@
+import { message } from 'antd';
+import React, { useState, useEffect } from 'react';
+import { getMetricData } from '../service';
+import { useParams } from '@umijs/max';
+import styles from './style.less';
+import { ISemantic } from '../data';
+import MetricInfoEditSider from './MetricInfoEditSider';
+import MetricInfoCreateForm from './components/MetricInfoCreateForm';
+import { MetricSettingKey } from './constants';
+
+type Props = Record<string, any>;
+
+const MetricDetail: React.FC<Props> = () => {
+  const params: any = useParams();
+  const metricId = params.metricId;
+  const [metircData, setMetircData] = useState<ISemantic.IMetricItem>();
+
+  const [settingKey, setSettingKey] = useState<MetricSettingKey>(MetricSettingKey.BASIC);
+
+  useEffect(() => {
+    if (!metricId) {
+      return;
+    }
+    queryMetricData(metricId);
+  }, [metricId]);
+
+  const queryMetricData = async (metricId: string) => {
+    const { code, data, msg } = await getMetricData(metricId);
+    if (code === 200) {
+      setMetircData({ ...data });
+      return;
+    }
+    message.error(msg);
+  };
+
+  return (
+    <>
+      <div className={styles.metricWrapper}>
+        <div className={styles.metricDetail}>
+          {/* <div className={styles.siderContainer}>
+            <MetricInfoEditSider
+              onSettingKeyChange={(key: string) => {
+                setSettingKey(key);
+              }}
+              metircData={metircData}
+            />
+          </div> */}
+          <div className={styles.tabContainer}>
+            <MetricInfoCreateForm settingKey={settingKey} metricItem={metircData} />
+          </div>
+        </div>
+      </div>
+    </>
+  );
+};
+
+export default MetricDetail;
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/style.less
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/style.less
@@ -1,3 +1,18 @@
+
+.metricWrapper {
+  width: 100%;
+  margin-left: auto;
+  box-sizing: border-box;
+  margin-right: auto;
+  padding-left: 16px;
+  padding-right: 16px;
+  position: relative;
+  min-height: calc(-110px + 100vh);
+  display: flex;
+  flex-direction: column;
+}
+
+
 .metricFilterWrapper {
  margin: 20px;
  padding: 20px;
@@ -169,8 +184,6 @@
 }

 .metricEditWrapper {
-  // height: calc(100vh - 56px);
-  // overflow: scroll;
  .metricDetailTab {
    :global {
      .ant-tabs-nav {
@@ -197,7 +210,6 @@
    height: 100%;
    .tabContainer {
      padding: 24px;
-      // height: 100%;
      min-height: calc(100vh - 78px);
      width: calc(100vw - 350px);
      background-color: #fafafb;
@@ -228,12 +240,8 @@
    .siderContainer {
      width: 350px;
      min-height: calc(100vh - 78px);
-      // margin: 10px 20px 20px 0;
-      // background-color: rgb(255, 255, 255);
      border-radius: 6px;
      padding: 24px 0 24px 24px;
-      // box-shadow: rgba(0, 0, 0, 0.08) 6px 0px 16px 0px, rgba(0, 0, 0, 0.12) 3px 0px 6px -4px,
-      //   rgba(0, 0, 0, 0.05) 9px 0px 28px 8px;
    }
  }
 }