Merge b1dadb4a1a into f05a4b523c

(fix)(supersonic-fe) show tip when register failed and replace icon when login failed and fix metric style issue (#2160 )
[improvement][docker]Facilitate database configuration when running with docker.
2026-04-24 16:34:20 +08:00 · 2025-03-12 08:35:00 +08:00 · 2025-03-12 08:22:46 +08:00 · 2025-03-11 23:14:40 +08:00 · 2025-03-05 10:01:32 +08:00 · 2025-03-04 18:55:31 +08:00
13 changed files with 382 additions and 65 deletions
--- a/assembly/bin/supersonic-docker-compose.sh
+++ b/assembly/bin/supersonic-docker-compose.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+
+export SUPERSONIC_VERSION=latest
+
+docker-compose -f docker-compose.yml -p supersonic up
--- a/assembly/bin/supersonic-docker-run.sh
+++ b/assembly/bin/supersonic-docker-run.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env sh
+
+export SUPERSONIC_VERSION=latest
+
+#### Set below DB configs to connect to your own database
+# Supported DB_TYPE:  h2, mysql, postgres
+export S2_DB_TYPE=h2
+export S2_DB_HOST=
+export S2_DB_PORT=
+export S2_DB_USER=
+export S2_DB_PASSWORD=
+export S2_DB_DATABASE=
+
+docker run --rm -it -d \
+  --name supersonic_standalone \
+  -p 9080:9080 \
+  -e S2_DB_TYPE=${S2_DB_TYPE} \
+  -e S2_DB_HOST=${S2_DB_HOST} \
+  -e S2_DB_PORT=${S2_DB_PORT} \
+  -e S2_DB_USER=${S2_DB_USER} \
+  -e S2_DB_PASSWORD=${S2_DB_PASSWORD} \
+  -e S2_DB_DATABASE=${S2_DB_DATABASE} \
+  supersonicbi/supersonic:${SUPERSONIC_VERSION}
--- a/assembly/bin/supersonic-env.sh
+++ b/assembly/bin/supersonic-env.sh
@@ -1,10 +1,11 @@
 #!/usr/bin/env bash

 #### Set below DB configs to connect to your own database
+# Comment out below exports to config your DB connection
 # Supported DB_TYPE:  h2, mysql, postgres
-export S2_DB_TYPE=h2
-export S2_DB_HOST=
-export S2_DB_PORT=
-export S2_DB_USER=
-export S2_DB_PASSWORD=
-export S2_DB_DATABASE=
+#export S2_DB_TYPE=h2
+#export S2_DB_HOST=
+#export S2_DB_PORT=
+#export S2_DB_USER=
+#export S2_DB_PASSWORD=
+#export S2_DB_DATABASE=
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -27,4 +27,4 @@ WORKDIR /usr/src/app/supersonic-standalone-${SUPERSONIC_VERSION}
 EXPOSE 9080
 # Command to run the supersonic daemon
 RUN chmod +x bin/supersonic-daemon.sh
-CMD ["bash", "-c", "bin/supersonic-daemon.sh restart standalone docker && tail -f /dev/null"]
+CMD ["bash", "-c", "bin/supersonic-daemon.sh restart standalone ${S2_DB_TYPE} && tail -f /dev/null"]
--- a/docker/docker-build.sh
+++ b/docker/docker-build.sh
@@ -2,8 +2,8 @@

 # Function to execute the build script
 execute_build_script() {
-  echo "Executing build script: assembly/bin/supersonic-build.sh"
-  assembly/bin/supersonic-build.sh
+  echo "Executing build script: sh assembly/bin/supersonic-build.sh"
+  sh assembly/bin/supersonic-build.sh
 }

 # Function to build the Docker image
--- a/docker/docker-compose-run.sh
+++ b/docker/docker-compose-run.sh
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-SUPERSONIC_VERSION=latest docker-compose -f docker-compose.yml -p supersonic up
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -30,10 +30,12 @@ services:
    privileged: true
    container_name: supersonic_standalone
    environment:
-      DB_HOST: supersonic_postgres
-      DB_NAME: postgres
-      DB_USERNAME: supersonic_user
-      DB_PASSWORD: supersonic_password
+      S2_DB_TYPE: postgres
+      S2_DB_HOST: supersonic_postgres
+      S2_DB_PORT: 5432
+      S2_DB_DATABASE: postgres
+      S2_DB_USER: supersonic_user
+      S2_DB_PASSWORD: supersonic_password
    ports:
      - "9080:9080"
    depends_on:
--- a/launchers/standalone/src/main/resources/application-docker.yaml
+++ b/launchers/standalone/src/main/resources/application-docker.yaml
@@ -1,26 +0,0 @@
-spring:
-  datasource:
-    driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://${DB_HOST}:${DB_PORT:5432}/${DB_NAME}?stringtype=unspecified
-    username: ${DB_USERNAME}
-    password: ${DB_PASSWORD}
-  sql:
-    init:
-      continue-on-error: true
-      mode: always
-      username: ${DB_USERNAME}
-      password: ${DB_PASSWORD}
-      schema-locations: classpath:db/schema-postgres.sql,classpath:db/schema-postgres-demo.sql
-      data-locations: classpath:db/data-postgres.sql,classpath:db/data-postgres-demo.sql
-
-s2:
-  embedding:
-    store:
-      provider: PGVECTOR
-      base:
-        url: ${DB_HOST}
-      port: ${DB_PORT:5432}
-      databaseName: ${DB_NAME}
-      user: ${DB_USERNAME}
-      password: ${DB_PASSWORD}
-      dimension: 512
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
        <pagehelper.spring.version>2.1.0</pagehelper.spring.version>
        <mybatis.version>3.5.3</mybatis.version>
        <guava.version>32.0.0-jre</guava.version>
-        <hanlp.version>portable-1.8.3</hanlp.version>
+        <hanlp.version>portable-1.8.4</hanlp.version>
        <hadoop.version>2.7.2</hadoop.version>
        <commons.lang.version>2.6</commons.lang.version>
        <commons.lang3.version>3.7</commons.lang3.version>
--- a/webapp/packages/supersonic-fe/src/pages/Login/components/RegisterForm.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/Login/components/RegisterForm.tsx
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { Form, Button, Modal, Input } from 'antd';
+import { Form, Button, Modal, Input, message } from 'antd';

 import type { RegisterFormDetail } from './types';

@@ -37,8 +37,9 @@ const RegisterForm: React.FC<RegisterFormProps> = (props) => {
    try {
      await handleUpdate(formValus);
      setSaveLoading(false);
-    } catch (error) {
+    } catch (error: any) {
      setSaveLoading(false);
+      message.error(error.message);
    }
  };

--- a/webapp/packages/supersonic-fe/src/pages/Login/index.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/Login/index.tsx
@@ -41,8 +41,9 @@ const LoginPage: React.FC = () => {
      }
      history.push('/');
      return;
+    } else {
+      message.error(msg);
    }
-    message.success(msg);
  };

  // 处理登录按钮响应
@@ -55,12 +56,14 @@ const LoginPage: React.FC = () => {
  // 处理注册弹窗确定按钮
  const handleRegister = async (values: RegisterFormDetail) => {
    const enCodeValues = { ...values, password: encryptPassword(values.password, encryptKey) };
-    const { code } = await userRegister(enCodeValues);
+    const { code, msg } = await userRegister(enCodeValues);
    if (code === 200) {
      message.success('注册成功');
      setCreateModalVisible(false);
      // 注册完自动帮用户登录
      await loginDone(enCodeValues);
+    } else {
+      message.error(msg);
    }
  };

--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/Detail.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/Detail.tsx
@@ -107,20 +107,8 @@ const MetricDetail: React.FC<Props> = () => {

  return (
    <>
-      <Helmet
-        title={`${metircData?.id ? `[指标]${metircData?.name}-${BASE_TITLE}` : '新建指标'}`}
-      />
      <div className={styles.metricDetailWrapper}>
        <div className={styles.metricDetail}>
-          <div className={styles.siderContainer}>
-            <MetricInfoSider
-              relationDimensionOptions={relationDimensionOptions}
-              metircData={metircData}
-              onDimensionRelationBtnClick={() => {
-                setMetricRelationModalOpenState(true);
-              }}
-            />
-          </div>
          <div className={styles.tabContainer}>
            <Tabs
              defaultActiveKey="metricCaliberInput"
@@ -146,6 +134,15 @@ const MetricDetail: React.FC<Props> = () => {
              className={styles.metricDetailTab}
            />
          </div>
+          <div className={styles.siderContainer}>
+            <MetricInfoSider
+              relationDimensionOptions={relationDimensionOptions}
+              metircData={metircData}
+              onDimensionRelationBtnClick={() => {
+                setMetricRelationModalOpenState(true);
+              }}
+            />
+          </div>
        </div>
        <DimensionAndMetricRelationModal
          metricItem={metircData}
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/style.less
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/style.less
@@ -1,4 +1,3 @@
-
 .metricWrapper {
  width: 100%;
  margin-left: auto;
@@ -12,7 +11,6 @@
  flex-direction: column;
 }

-
 .metricFilterWrapper {
  margin: 20px;
  padding: 20px;
@@ -183,7 +181,68 @@
  }
 }

-
+.metricEditWrapper {
+  .metricDetailTab {
+    :global {
+      .ant-tabs-nav {
+        margin: 10px 20px 0 20px;
+        padding: 0 20px;
+        background-color: rgb(255, 255, 255);
+        border-radius: 8px;
+        transition: box-shadow 300ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;
+      }
+      .ant-tabs-tab {
+        padding: 12px 0;
+        color: #344767;
+        font-weight: 500;
+      }
+    }
+  }
+  .metricDetail {
+    position: relative;
+    display: flex;
+    flex-direction: row;
+    width: 100%;
+    padding: 0px;
+    background-color: transparent;
+    height: 100%;
+    .tabContainer {
+      padding: 24px;
+      min-height: calc(100vh - 78px);
+      width: calc(100vw - 350px);
+      background-color: #fafafb;
+    }
+    .metricInfoContent {
+      padding: 25px;
+      .title {
+        position: relative;
+        margin-bottom: 12px;
+        color: #0e73ff;
+        font-weight: bold;
+        font-size: 16px;
+        &::before {
+          position: absolute;
+          top: 10px;
+          left: -10px;
+          display: block;
+          width: 3px;
+          height: 14px;
+          font-size: 0;
+          background: #0e73ff;
+          border: 1px solid #0e73ff;
+          border-radius: 2px;
+          content: '';
+        }
+      }
+    }
+    .siderContainer {
+      width: 350px;
+      min-height: calc(100vh - 78px);
+      border-radius: 6px;
+      padding: 24px 0 24px 24px;
+    }
+  }
+}

 .metricDetailWrapper {
  height: calc(100vh - 56px);
@@ -215,8 +274,7 @@
    .tabContainer {
      height: 100%;
      min-height: calc(100vh - 78px);
-      // width: calc(100vw - 450px);
-      width: 100%;
+      width: calc(100vw - 450px);
      background-color: #fafafb;
    }
    .metricInfoContent {
@@ -245,8 +303,9 @@
    .siderContainer {
      width: 450px;
      min-height: calc(100vh - 78px);
+      margin: 10px 20px 20px 0;
+      background-color: rgb(255, 255, 255);
      border-radius: 6px;
-      padding: 10px 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;
    }
@@ -265,5 +324,260 @@
  transition: box-shadow 300ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;
 }

+.metricInfoSider {
+  padding: 20px;
+  color: #344767;
+  background-color: #fff;
+  height: 100%;
+  border: 1px solid #e6ebf1;
+  border-radius: 6px;
+  .createTitle {
+    margin-bottom: 10px;
+    color: #344767;
+    font-weight: 500;
+    font-size: 16px;
+    font-family: var(--tencent-font-family);
+  }
+  .gotoMetricListIcon {
+    color: #3182ce;
+    cursor: pointer;
+    &:hover {
+      color: #5493ff;
+    }
+  }
+  .title {
+    margin-bottom: 20px;
+    .name {
+      font-weight: 600;
+      font-size: 18px;
+    }
+    .bizName {
+      margin: 5px 0 0 25px;
+      color: #7b809a;
+      font-weight: 400;
+    }
+  }
+  .desc {
+    display: block;
+    margin-top: 8px;
+    color: #7b809a;
+    font-weight: 500;
+    font-size: 14px;
+    line-height: 1.9;
+  }
+  .subTitle {
+    margin: 0px;
+    color: rgb(123, 128, 154);
+    font-weight: 700;
+    font-size: 14px;
+    line-height: 1.25;
+    letter-spacing: 0.03333em;
+    text-transform: uppercase;
+    text-decoration: none;
+    vertical-align: unset;
+    opacity: 1;
+  }
+  .sectionContainer {
+    width: 100%;
+    height: 100%;
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    overflow: scroll;

+    overflow: hidden;
+    background-image: none;
+    border-radius: 6px;
+    .section {
+      padding: 16px;
+      color: rgb(52, 71, 103);
+      line-height: 1.25;
+      background: transparent;
+      box-shadow: none;
+      opacity: 1;
+      .sectionTitleBox {
+        padding: 8px 0;
+        color: rgb(52, 71, 103);
+        background: transparent;
+        box-shadow: none;
+        opacity: 1;
+        .sectionTitle {
+          margin: 0px;
+          color: rgb(52, 71, 103);
+          font-weight: 600;
+          font-size: 16px;
+          line-height: 1.625;
+          letter-spacing: 0.0075em;
+          text-transform: capitalize;
+          text-decoration: none;
+          vertical-align: unset;
+          opacity: 1;
+        }
+      }

+      .item {
+        display: flex;
+        padding-top: 8px;
+        padding-right: 16px;
+        padding-bottom: 8px;
+        color: rgb(52, 71, 103);
+        background: transparent;
+        box-shadow: none;
+        opacity: 1;
+        .itemLable {
+          min-width: fit-content;
+          margin: 0px;
+          margin-right: 10px;
+          color: #344767;
+          font-weight: 700;
+          font-size: 14px;
+          line-height: 1.5;
+          letter-spacing: 0.02857em;
+          text-transform: capitalize;
+          text-decoration: none;
+          vertical-align: unset;
+          opacity: 1;
+        }
+        .itemValue {
+          margin: 0px;
+          color: #7b809a;
+          font-weight: 400;
+          font-size: 14px;
+          line-height: 1.5;
+          letter-spacing: 0.02857em;
+          text-transform: none;
+          text-decoration: none;
+          vertical-align: unset;
+          opacity: 1;
+        }
+      }
+    }
+    .hr {
+      flex-shrink: 0;
+      margin: 0px;
+      border-color: rgb(242, 244, 247);
+      // border-width: 0px 0px thin;
+      border-style: solid;
+    }
+    .ctrlBox {
+      .ctrlList {
+        position: relative;
+        margin: 0px;
+        padding: 8px 0px;
+        list-style: none;
+        background-color: rgb(249, 250, 251);
+        li {
+          position: relative;
+          display: flex;
+          flex-grow: 1;
+          align-items: center;
+          justify-content: flex-start;
+          box-sizing: border-box;
+          min-width: 0px;
+          margin: 4px;
+          padding: 4px 16px;
+          color: inherit;
+          text-align: left;
+          text-decoration: none;
+          vertical-align: middle;
+          background-color: transparent;
+          border: 0px;
+          border-radius: 0px;
+          outline: 0px;
+          cursor: pointer;
+          transition: background-color 150ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;
+          appearance: none;
+          user-select: none;
+          -webkit-tap-highlight-color: transparent;
+          -webkit-box-flex: 1;
+          -webkit-box-pack: start;
+          -webkit-box-align: center;
+          &:hover {
+            color: #3182ce;
+            text-decoration: none;
+            background-color: rgba(16, 24, 40, 0.04);
+          }
+        }
+        .ctrlItemIcon {
+          flex-shrink: 0;
+          min-width: unset;
+          margin-right: 5px;
+          font-size: 14px;
+        }
+        .styles.ctrlItemLable {
+          display: block;
+          margin: 0px;
+          font-weight: 400;
+          font-size: 14px;
+          line-height: 1.6;
+        }
+      }
+    }
+  }
+}
+
+.settingList {
+  list-style: none;
+  margin: 0px;
+  position: relative;
+  padding: 0px;
+  li {
+    -webkit-tap-highlight-color: transparent;
+    background-color: transparent;
+    outline: 0px;
+    border: 0px;
+    margin: 0px;
+    border-radius: 0px;
+    cursor: pointer;
+    user-select: none;
+    vertical-align: middle;
+    appearance: none;
+    display: flex;
+    flex-grow: 1;
+    justify-content: flex-start;
+    align-items: center;
+    position: relative;
+    text-decoration: none;
+    min-width: 0px;
+    box-sizing: border-box;
+    text-align: left;
+    padding: 8px 16px;
+    transition: background-color 150ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;
+    &.active {
+      background-color: rgba(22, 119, 255, 0.08);
+      .icon {
+        color: rgb(22, 119, 255);
+      }
+      .content {
+        .text {
+          color: rgb(22, 119, 255);
+        }
+      }
+    }
+    .icon {
+      min-width: 32px;
+      color: #344767;
+      flex-shrink: 0;
+      display: inline-flex;
+    }
+    .content {
+      flex: 1 1 auto;
+      min-width: 0px;
+      margin-top: 4px;
+      margin-bottom: 4px;
+      .text {
+        margin: 0px;
+        color: #344767;
+        font-size: 16px;
+        // line-height: 1.57;
+        // font-family: var(--tencent-font-family);
+        font-weight: 600;
+        display: block;
+      }
+    }
+    &:hover {
+      text-decoration: none;
+      background-color: rgba(0, 0, 0, 0.04);
+    }
+  }
+}
Author	SHA1	Message	Date
zyclove	281ffefc75	Merge `b1dadb4a1a` into `f05a4b523c`	2025-03-12 08:35:00 +08:00
williamhliu	f05a4b523c	(fix)(supersonic-fe) show tip when register failed and replace icon when login failed and fix metric style issue (#2160 )	2025-03-12 08:22:46 +08:00
jerryjzhang	b7369abcca	[improvement][docker]Facilitate database configuration when running with docker. Some checks are pending supersonic CentOS CI / build (21) (push) Waiting to run Details supersonic mac CI / build (21) (push) Waiting to run Details supersonic ubuntu CI / build (21) (push) Waiting to run Details supersonic windows CI / build (21) (push) Waiting to run Details	2025-03-11 23:14:40 +08:00
zhaoyingchao	b1dadb4a1a	Merge remote-tracking branch 'origin/master' into hanlp-upgrade	2025-03-05 10:01:32 +08:00
zhaoyingchao	158a0a802a	feat:upgrade 1.8.4	2025-03-04 18:55:31 +08:00