You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hugegraph.apache.org by je...@apache.org on 2023/01/16 06:12:03 UTC

[incubator-hugegraph-toolchain] branch master updated: The vertex style cannot display the color when editing the vertex type (#423)

This is an automated email from the ASF dual-hosted git repository.

jermy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph-toolchain.git


The following commit(s) were added to refs/heads/master by this push:
     new 13888bdc The vertex style cannot display the color when editing the vertex type  (#423)
13888bdc is described below

commit 13888bdc1f792ff4915f4e6652dd9308d24e3e76
Author: wanganjuan <z7...@Outlook.com>
AuthorDate: Mon Jan 16 14:11:57 2023 +0800

    The vertex style cannot display the color when editing the vertex type  (#423)
---
 .../graph-management/data-analyze/DataAnalyze.less       | 16 ++++++++++++++++
 .../data-analyze/ExecLogAndQueryCollections.tsx          |  2 ++
 .../metadata-configs/graph-view/CheckAndEditVertex.tsx   |  2 +-
 .../metadata-configs/vertex-type/NewVertexType.less      |  5 +++++
 .../metadata-configs/vertex-type/VertexTypeList.tsx      |  2 +-
 5 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/hugegraph-hubble/hubble-fe/src/components/graph-management/data-analyze/DataAnalyze.less b/hugegraph-hubble/hubble-fe/src/components/graph-management/data-analyze/DataAnalyze.less
index 76b6994a..d8599394 100644
--- a/hugegraph-hubble/hubble-fe/src/components/graph-management/data-analyze/DataAnalyze.less
+++ b/hugegraph-hubble/hubble-fe/src/components/graph-management/data-analyze/DataAnalyze.less
@@ -1195,3 +1195,19 @@ div.vis-tooltip {
 .data-analyze-graph-node-info .new-fc-one-input-all-container {
   position: relative;
 }
+
+@media screen and (max-width: 1280px) {
+  .ant-table-tbody > tr > td.sql-content-clazz {
+    max-width: 480px;
+  }
+}
+@media screen and (min-width: 1280px) and (max-width: 1920px) {
+  .ant-table-tbody > tr > td.sql-content-clazz {
+    max-width: 600px;
+  }
+}
+@media screen and (min-width: 1920px) {
+  .ant-table-tbody > tr > td.sql-content-clazz {
+    max-width: 800px;
+  }
+}
diff --git a/hugegraph-hubble/hubble-fe/src/components/graph-management/data-analyze/ExecLogAndQueryCollections.tsx b/hugegraph-hubble/hubble-fe/src/components/graph-management/data-analyze/ExecLogAndQueryCollections.tsx
index 10aa4025..1d47b49a 100644
--- a/hugegraph-hubble/hubble-fe/src/components/graph-management/data-analyze/ExecLogAndQueryCollections.tsx
+++ b/hugegraph-hubble/hubble-fe/src/components/graph-management/data-analyze/ExecLogAndQueryCollections.tsx
@@ -114,6 +114,7 @@ const ExecLogAndQueryCollections: React.FC = observer(() => {
     {
       title: t('data-analyze.exec-logs.table-title.content'),
       dataIndex: 'content',
+      className: 'sql-content-clazz',
       width: '30%',
       render(text: string, rowData: ExecutionLogs) {
         return (
@@ -292,6 +293,7 @@ const ExecLogAndQueryCollections: React.FC = observer(() => {
       title: t('addition.operate.favorite-statement'),
       dataIndex: 'content',
       width: '40%',
+      className: 'sql-content-clazz',
       render(text: string, rowData: FavoriteQuery) {
         return (
           <ExecutionContent
diff --git a/hugegraph-hubble/hubble-fe/src/components/graph-management/metadata-configs/graph-view/CheckAndEditVertex.tsx b/hugegraph-hubble/hubble-fe/src/components/graph-management/metadata-configs/graph-view/CheckAndEditVertex.tsx
index 6277339e..17ac5d83 100644
--- a/hugegraph-hubble/hubble-fe/src/components/graph-management/metadata-configs/graph-view/CheckAndEditVertex.tsx
+++ b/hugegraph-hubble/hubble-fe/src/components/graph-management/metadata-configs/graph-view/CheckAndEditVertex.tsx
@@ -437,7 +437,7 @@ const CheckAndEditVertex: React.FC = observer(() => {
               dropdownMatchSelectWidth={false}
               showSearch={false}
               disabled={!isEditVertex}
-              value={vertexTypeStore.editedSelectedVertexType.style.color}
+              value={vertexTypeStore.editedSelectedVertexType.style.color?.toLowerCase()}
               onChange={(value: string) => {
                 vertexTypeStore.mutateEditedSelectedVertexType({
                   ...vertexTypeStore.editedSelectedVertexType,
diff --git a/hugegraph-hubble/hubble-fe/src/components/graph-management/metadata-configs/vertex-type/NewVertexType.less b/hugegraph-hubble/hubble-fe/src/components/graph-management/metadata-configs/vertex-type/NewVertexType.less
index cb59605b..37a0969a 100644
--- a/hugegraph-hubble/hubble-fe/src/components/graph-management/metadata-configs/vertex-type/NewVertexType.less
+++ b/hugegraph-hubble/hubble-fe/src/components/graph-management/metadata-configs/vertex-type/NewVertexType.less
@@ -1613,3 +1613,8 @@ input[type='file'] > input[type='button']::-moz-focus-inner {
 .new-fc-one-select-another-container {
   display: inline-block;
 }
+
+.new-fc-one-select-another-selection-item {
+  position: relative;
+  top: -10px;
+}
diff --git a/hugegraph-hubble/hubble-fe/src/components/graph-management/metadata-configs/vertex-type/VertexTypeList.tsx b/hugegraph-hubble/hubble-fe/src/components/graph-management/metadata-configs/vertex-type/VertexTypeList.tsx
index 5a99c3ca..e1f8c6a2 100644
--- a/hugegraph-hubble/hubble-fe/src/components/graph-management/metadata-configs/vertex-type/VertexTypeList.tsx
+++ b/hugegraph-hubble/hubble-fe/src/components/graph-management/metadata-configs/vertex-type/VertexTypeList.tsx
@@ -747,7 +747,7 @@ const VertexTypeList: React.FC = observer(() => {
                     dropdownMatchSelectWidth={false}
                     showSearch={false}
                     disabled={!isEditVertex}
-                    value={vertexTypeStore.editedSelectedVertexType.style.color}
+                    value={vertexTypeStore.editedSelectedVertexType.style.color?.toLowerCase()}
                     onChange={(value: string) => {
                       vertexTypeStore.mutateEditedSelectedVertexType({
                         ...vertexTypeStore.editedSelectedVertexType,